Merged with WordPress 2.5, unstable, only for testing

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1218 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 311 insertions, 78 deletions

diff --git a/wp-includes/js/tinymce/tiny_mce_config.php b/wp-includes/js/tinymce/tiny_mce_config.php
index 22a194d..a56f6e5 100644
--- a/wp-includes/js/tinymce/tiny_mce_config.php
+++ b/wp-includes/js/tinymce/tiny_mce_config.php
@@ -1,96 +1,329 @@
-<?php
-	@ require('../../../wp-config.php');
-	cache_javascript_headers();
+<?php 
+// some code below is from:
+/**
+ * $Id: tiny_mce_gzip.php 315 2007-10-25 14:03:43Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2005-2006, Moxiecode Systems AB, All rights reserved.
+ *
+ * This file compresses the TinyMCE JavaScript using GZip.
+ **/
+  
+@ require('../../../wp-config.php');
 
-	function wp_translate_tinymce_lang($text) {
-		if ( ! function_exists('__') ) {
-			return $text;
-		} else {
-			$search1 = "/^tinyMCELang\\[(['\"])(.*)\\1\]( ?= ?)(['\"])(.*)\\4/Uem";
-			$replace1 = "'tinyMCELang[\\1\\2\\1]\\3'.stripslashes('\\4').__('\\5').stripslashes('\\4')";
+function getFileContents($path) {
+	$path = realpath($path);
 
-			$search2 = "/ : (['\"])(.*)\\1/Uem";
-			$replace2 = "' : '.stripslashes('\\1').__('\\2').stripslashes('\\1')";
+	if ( ! $path || ! @is_file($path) )
+		return '';
 
-			$search = array($search1, $search2);
-			$replace = array($replace1, $replace2);
+	if ( function_exists('file_get_contents') )
+		return @file_get_contents($path);
 
-			$text = preg_replace($search, $replace, $text);
+	$content = '';
+	$fp = @fopen($path, 'r');
+	if ( ! $fp )
+		return '';
 
-			return $text;
+	while ( ! feof($fp) )
+		$content .= fgets($fp);
+
+	fclose($fp);
+	return $content;
+}
+
+function putFileContents( $path, $content ) {
+	if ( function_exists('file_put_contents') )
+		return @file_put_contents( $path, $content );
+
+	$newfile = false;
+	$fp = @fopen( $path, 'wb' );
+	if ($fp) {
+		$newfile = fwrite( $fp, $content );
+		fclose($fp);
+	}
+	return $newfile;
+}
+
+// Set up init variables
+$https = ( isset($_SERVER['HTTPS']) && 'on' == strtolower($_SERVER['HTTPS']) ) ? true : false;
+	
+$baseurl = get_option('siteurl') . '/wp-includes/js/tinymce';
+if ( $https ) str_replace('http://', 'https://', $baseurl);
+
+$mce_css = $baseurl . '/wordpress.css';
+$mce_css = apply_filters('mce_css', $mce_css);
+if ( $https ) str_replace('http://', 'https://', $mce_css);
+
+$mce_locale = ( '' == get_locale() ) ? 'en' : strtolower( substr(get_locale(), 0, 2) ); // only ISO 639-1
+
+/*
+The following filter allows localization scripts to change the languages displayed in the spellchecker's drop-down menu.
+By default it uses Google's spellchecker API, but can be configured to use PSpell/ASpell if installed on the server.
+The + sign marks the default language. More information:
+http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/spellchecker
+*/
+$mce_spellchecker_languages = apply_filters('mce_spellchecker_languages', '+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv');
+
+$plugins = array( 'safari', 'inlinepopups', 'autosave', 'spellchecker', 'paste', 'wordpress', 'media', 'fullscreen' );
+
+/* 
+The following filter takes an associative array of external plugins for TinyMCE in the form 'plugin_name' => 'url'.
+It adds the plugin's name to TinyMCE's plugins init and the call to PluginManager to load the plugin. 
+The url should be absolute and should include the js file name to be loaded. Example: 
+array( 'myplugin' => 'http://my-site.com/wp-content/plugins/myfolder/mce_plugin.js' )
+If the plugin uses a button, it should be added with one of the "$mce_buttons" filters.
+*/
+$mce_external_plugins = apply_filters('mce_external_plugins', array());
+
+$ext_plugins = "\n";
+if ( ! empty($mce_external_plugins) ) {
+	
+	/*
+	The following filter loads external language files for TinyMCE plugins.
+	It takes an associative array 'plugin_name' => 'path', where path is the 
+	include path to the file. The language file should follow the same format as 
+	/tinymce/langs/wp-langs.php and should define a variable $strings that 
+	holds all translated strings. Example: 
+	$strings = 'tinyMCE.addI18n("' . $mce_locale . '.mypluginname_dlg",{tab_general:"General", ... })';
+	*/
+	$mce_external_languages = apply_filters('mce_external_languages', array()); 
+	
+	$loaded_langs = array();
+	$strings = '';
+	
+	if ( ! empty($mce_external_languages) ) {
+		foreach ( $mce_external_languages as $name => $path ) {
+			if ( is_file($path) && is_readable($path) ) { 
+				include_once($path);
+				$ext_plugins .= $strings;
+				$loaded_langs[] = $name;
+			}
 		}
 	}
 
-	// Set up init variables
-	$valid_elements = 'p/-div[*],-strong/-b[*],-em/-i[*],-font[*],-ul[*],-ol[*],-li[*],*[*]';
-	$valid_elements = apply_filters('mce_valid_elements', $valid_elements);
+	foreach ( $mce_external_plugins as $name => $url ) {
+		
+		if ( $https ) str_replace('http://', 'https://', $url);
+		
+		$plugins[] = '-' . $name;
+
+		if ( in_array($name, $loaded_langs) ) {
+			$plugurl = dirname($url);
+			$ext_plugins .= 'tinyMCEPreInit.load_ext("' . $plugurl . '", "' . $mce_locale . '");' . "\n";
+		}
+		$ext_plugins .= 'tinymce.PluginManager.load("' . $name . '", "' . $url . '");' . "\n";
+	}
+}
+$plugins = implode($plugins, ',');
 
-	$plugins = array('inlinepopups', 'autosave', 'spellchecker', 'paste', 'wordpress');
-	$plugins = apply_filters('mce_plugins', $plugins);
-	$plugins = implode($plugins, ',');
+$mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', '|', 'bullist', 'numlist', 'blockquote', '|', 'justifyleft', 'justifycenter', 'justifyright', '|', 'link', 'unlink', 'image', 'wp_more', '|', 'spellchecker', 'fullscreen', 'wp_adv' ));
+$mce_buttons = implode($mce_buttons, ',');
 
-	$mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', 'separator', 'bullist', 'numlist', 'outdent', 'indent', 'separator', 'justifyleft', 'justifycenter', 'justifyright', 'separator', 'link', 'unlink', 'image', 'wp_more', 'separator', 'spellchecker', 'separator', 'wp_help', 'wp_adv', 'wp_adv_start', 'formatselect', 'underline', 'justifyfull', 'forecolor', 'separator', 'pastetext', 'pasteword', 'separator', 'removeformat', 'cleanup', 'separator', 'charmap', 'separator', 'undo', 'redo', 'wp_adv_end'));
-	$mce_buttons = implode($mce_buttons, ',');
+$mce_buttons_2 = apply_filters('mce_buttons_2', array('formatselect', 'underline', 'justifyfull', 'forecolor', '|', 'pastetext', 'pasteword', 'removeformat', '|', 'media', 'charmap', '|', 'outdent', 'indent', '|', 'undo', 'redo', 'wp_help' ));
+$mce_buttons_2 = implode($mce_buttons_2, ',');
 
-	$mce_buttons_2 = apply_filters('mce_buttons_2', array());
-	$mce_buttons_2 = implode($mce_buttons_2, ',');
+$mce_buttons_3 = apply_filters('mce_buttons_3', array());
+$mce_buttons_3 = implode($mce_buttons_3, ',');
+	
+$mce_buttons_4 = apply_filters('mce_buttons_4', array());
+$mce_buttons_4 = implode($mce_buttons_4, ',');
 
-	$mce_buttons_3 = apply_filters('mce_buttons_3', array());
-	$mce_buttons_3 = implode($mce_buttons_3, ',');
+// TinyMCE init settings
+$initArray = array (
+	'mode' => 'none',
+	'onpageload' => 'wpEditorInit',
+	'width' => '100%',
+	'theme' => 'advanced',
+	'skin' => 'wp_theme',
+	'theme_advanced_buttons1' => "$mce_buttons",
+	'theme_advanced_buttons2' => "$mce_buttons_2",
+	'theme_advanced_buttons3' => "$mce_buttons_3",
+	'theme_advanced_buttons4' => "$mce_buttons_4",
+	'language' => "$mce_locale",
+	'spellchecker_languages' => "$mce_spellchecker_languages",
+	'theme_advanced_toolbar_location' => 'top',
+	'theme_advanced_toolbar_align' => 'left',
+	'theme_advanced_statusbar_location' => 'bottom',
+	'theme_advanced_resizing' => true,
+	'theme_advanced_resize_horizontal' => false,
+	'dialog_type' => 'modal',
+	'relative_urls' => false,
+	'remove_script_host' => false,
+	'apply_source_formatting' => false,
+	'remove_linebreaks' => true,
+	'paste_convert_middot_lists' => true,
+	'paste_remove_spans' => true,
+	'paste_remove_styles' => true,
+	'gecko_spellcheck' => true,
+	'entities' => '38,amp,60,lt,62,gt',
+	'accessibility_focus' => false,
+	'tab_focus' => ':next',
+	'content_css' => "$mce_css",
+	'save_callback' => 'switchEditors.saveCallback',
+	'plugins' => "$plugins",
+	// pass-through the settings for compression and caching, so they can be changed with "tiny_mce_before_init"
+	'disk_cache' => true,
+	'compress' => true,
+	'old_cache_max' => '1' // number of cache files to keep
+);
 
-	$mce_browsers = apply_filters('mce_browsers', array('msie', 'gecko', 'opera', 'safari'));
-	$mce_browsers = implode($mce_browsers, ',');
+// For people who really REALLY know what they're doing with TinyMCE
+// You can modify initArray to add, remove, change elements of the config before tinyMCE.init (changed from action to filter)
+$initArray = apply_filters('tiny_mce_before_init', $initArray);
 
-	$mce_popups_css = get_option('siteurl') . '/wp-includes/js/tinymce/plugins/wordpress/popups.css';
-	$mce_css = get_option('siteurl') . '/wp-includes/js/tinymce/plugins/wordpress/wordpress.css';
-	$mce_css = apply_filters('mce_css', $mce_css);
-	if ( $_SERVER['HTTPS'] == 'on' ) {
-		$mce_css = str_replace('http://', 'https://', $mce_css);
-		$mce_popups_css = str_replace('http://', 'https://', $mce_popups_css);
+// Setting "valid_elements", "invalid_elements" and "extended_valid_elements" can be done through "tiny_mce_before_init".
+// Best is to use the default cleanup by not specifying valid_elements, as TinyMCE contains full set of XHTML 1.0.
+
+// support for deprecated actions
+ob_start();
+do_action('mce_options');
+$mce_deprecated = ob_get_contents();
+ob_end_clean();
+
+$mce_deprecated = (string) $mce_deprecated;
+if ( strlen( $mce_deprecated ) < 10 || ! strpos( $mce_deprecated, ':' ) || ! strpos( $mce_deprecated, ',' ) )	
+	$mce_deprecated = '';
+
+// Settings for the gzip compression and cache
+$disk_cache = ( ! isset($initArray['disk_cache']) || false == $initArray['disk_cache'] ) ? false : true;
+$compress = ( ! isset($initArray['compress']) || false == $initArray['compress'] ) ? false : true;
+$old_cache_max = ( isset($initArray['old_cache_max']) ) ? (int) $initArray['old_cache_max'] : 0;
+
+$initArray['disk_cache'] = $initArray['compress'] = $initArray['old_cache_max'] = null;
+unset( $initArray['disk_cache'], $initArray['compress'], $initArray['old_cache_max'] );
+
+// Anybody still using IE5/5.5? It can't handle gzip compressed js well.
+if ( $msie = strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') ) {
+	$ie_ver = (int) substr( $_SERVER['HTTP_USER_AGENT'] , $msie + 5, 3 );
+	if ( $ie_ver && $ie_ver < 6 ) $compress = false;
+}
+
+// Cache path, this is where the .gz files will be stored
+$cache_path = ABSPATH . 'wp-content/uploads/js_cache'; 
+if ( $disk_cache && ! is_dir($cache_path) )
+	$disk_cache = wp_mkdir_p($cache_path);
+
+$cache_ext = '.js';
+$plugins = explode( ',', $initArray['plugins'] );
+$theme = ( 'simple' == $initArray['theme'] ) ? 'simple' : 'advanced';
+$language = isset($initArray['language']) ? substr( $initArray['language'], 0, 2 ) : 'en';
+$cacheKey = $mce_options = '';	
+
+// Check if browser supports gzip
+if ( $compress && isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) {
+	if ( ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'gzip') || isset($_SERVER['---------------']) ) && function_exists('gzencode') && ! ini_get('zlib.output_compression') ) {
+		$cache_ext = '.gz';
 	}
+}
 
-	$mce_locale = ( '' == get_locale() ) ? 'en' : strtolower(get_locale());
-?>
+// Setup cache info
+if ( $disk_cache ) {
 
-initArray = {
-	mode : "specific_textareas",
-	editor_selector : "mceEditor",
-	width : "100%",
-	theme : "advanced",
-	theme_advanced_buttons1 : "<?php echo $mce_buttons; ?>",
-	theme_advanced_buttons2 : "<?php echo $mce_buttons_2; ?>",
-	theme_advanced_buttons3 : "<?php echo $mce_buttons_3; ?>",
-	language : "<?php echo $mce_locale; ?>",
-	theme_advanced_toolbar_location : "top",
-	theme_advanced_toolbar_align : "left",
-	theme_advanced_path_location : "bottom",
-	theme_advanced_resizing : true,
-	browsers : "<?php echo $mce_browsers; ?>",
-	dialog_type : "modal",
-	theme_advanced_resize_horizontal : false,
-	convert_urls : false,
-	relative_urls : false,
-	remove_script_host : false,
-	force_p_newlines : true,
-	force_br_newlines : false,
-	convert_newlines_to_brs : false,
-	remove_linebreaks : false,
-	fix_list_elements : true,
-	gecko_spellcheck : true,
-	entities : "38,amp,60,lt,62,gt",
-	button_tile_map : true,
-	content_css : "<?php echo $mce_css; ?>",
-	valid_elements : "<?php echo $valid_elements; ?>",
-	save_callback : 'TinyMCE_wordpressPlugin.saveCallback',
-	imp_version : "<?php echo intval($_GET['ver']); ?>",
-<?php do_action('mce_options'); ?>
-	plugins : "<?php echo $plugins; ?>"
-};
-
-<?php
-	// For people who really REALLY know what they're doing with TinyMCE
-	// You can modify initArray to add, remove, change elements of the config before tinyMCE.init
-	do_action('tinymce_before_init');
-?>
+	$cacheKey = apply_filters('tiny_mce_version', '20080327');
+
+	foreach ( $initArray as $v )
+		$cacheKey .= $v;
+
+	if ( ! empty($mce_external_plugins) ) {
+		foreach ( $mce_external_plugins as $n => $v )
+			$cacheKey .= $n;
+	}
+	
+	$cacheKey = md5( $cacheKey );
+	$cache_file = $cache_path . '/tinymce_' . $cacheKey . $cache_ext;
+}
 
-tinyMCE.init(initArray);
+$expiresOffset = 864000; // 10 days
+header( 'Content-Type: application/x-javascript; charset=UTF-8' );
+header( 'Vary: Accept-Encoding' ); // Handle proxies
+header( 'Expires: ' . gmdate( "D, d M Y H:i:s", time() + $expiresOffset ) . ' GMT' );
+
+// Use cached file if exists
+if ( $disk_cache && is_file($cache_file) && is_readable($cache_file) ) {
+
+	$mtime = gmdate("D, d M Y H:i:s", filemtime($cache_file)) . " GMT";
+	
+	if ( isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && $_SERVER['HTTP_IF_MODIFIED_SINCE'] == $mtime ) {
+		header('HTTP/1.1 304 Not Modified');
+		exit;
+	}
+	header("Last-Modified: " . $mtime);
+	header("Cache-Control: must-revalidate", false);
+
+	$content = getFileContents( $cache_file );
+	
+	if ( '.gz' == $cache_ext )
+		header( 'Content-Encoding: gzip' );
+
+	header( 'Content-Length: ' . strlen($content) );
+
+	echo $content;
+	exit;
+}
+
+foreach ( $initArray as $k => $v ) 
+    $mce_options .= $k . ':"' . $v . '",';
+
+if ( $mce_deprecated ) $mce_options .= $mce_deprecated;
+
+$mce_options = rtrim( trim($mce_options), '\n\r,' );
+
+$content = 'var tinyMCEPreInit = { settings : { themes : "' . $theme . '", plugins : "' . $initArray['plugins'] . '", languages : "' . $language . '", debug : false }, base : "' . $baseurl . '", suffix : "" };';
+
+// Load patch
+$content .= getFileContents( 'tiny_mce_ext.js' );
+
+// Add core
+$content .= getFileContents( 'tiny_mce.js' );
+
+// Patch loading functions
+$content .= 'tinyMCEPreInit.start();';
+
+// Add all languages (WP)
+include_once( dirname(__FILE__).'/langs/wp-langs.php' );
+$content .= $strings;
+
+// Add themes
+$content .= getFileContents( 'themes/' . $theme . '/editor_template.js' );
+
+// Add plugins
+foreach ( $plugins as $plugin ) 
+	$content .= getFileContents( 'plugins/' . $plugin . '/editor_plugin.js' );
+
+// Add external plugins and init 
+$content .= $ext_plugins . 'tinyMCE.init({' . $mce_options . '});';
+
+// Generate GZIP'd content
+if ( '.gz' == $cache_ext ) {
+	header('Content-Encoding: gzip');
+	$content = gzencode( $content, 9, FORCE_GZIP );
+}
+
+// Stream to client
+header( 'Content-Length: ' . strlen($content) );
+echo $content;
+
+// Write file
+if ( '' != $cacheKey && is_dir($cache_path) && is_readable($cache_path) ) {	
+
+	$old_cache = array();
+	$handle = opendir($cache_path);
+	while ( false !== ( $file = readdir($handle) ) ) {
+		if ( $file == '.' || $file == '..' ) continue;
+        $saved = filectime("$cache_path/$file");
+		if ( strpos($file, 'tinymce_') !== false && substr($file, -3) == $cache_ext ) $old_cache["$saved"] = $file;
+	}
+	closedir($handle);
+			
+	krsort($old_cache);
+	if ( 1 >= $old_cache_max ) $del_cache = $old_cache;
+	else $del_cache = array_slice( $old_cache, ($old_cache_max - 1) );
+
+	foreach ( $del_cache as $key )
+		@unlink("$cache_path/$key");
+
+	putFileContents( $cache_file, $content );
+}
+
+?>