Changeset 6894 for trunk/wp-includes/js/tinymce/tiny_mce_config.php

Timestamp:

02/18/2008 05:11:12 PM (18 years ago)

Author:

ryan

Message:

TinyMCE config enhancements from azaozz. fixes #5896 #5888

File:

• trunk/wp-includes/js/tinymce/tiny_mce_config.php (modified) (12 diffs)

trunk/wp-includes/js/tinymce/tiny_mce_config.php

@@ -48 +48 @@
     
 $baseurl = get_option('siteurl') . '/wp-includes/js/tinymce';
-$baseurl = $https ? str_replace('http://', 'https://', $baseurl) : $baseurl;
+if ( $https ) str_replace('http://', 'https://', $baseurl);
 
 $mce_css = $baseurl . '/wordpress.css';
 $mce_css = apply_filters('mce_css', $mce_css);
-$mce_css = $https ? str_replace('http://', 'https://', $mce_css) : $mce_css;
+if ( $https ) str_replace('http://', 'https://', $mce_css);
 
 $valid_elements = '*[*]';
@@ -73 +73 @@
 foreach ( $mce_external_plugins as $name => $url ) {
     $plugins[] = '-' . $name;
-    $url = $https ? str_replace('http://', 'https://', $url) : $url;
+    if ( $https ) str_replace('http://', 'https://', $url);
     
     $ext_plugins .= 'tinymce.PluginManager.load("' . $name . '", "' . $url . '");' . "\n";
@@ -80 +80 @@
 $plugins = implode($plugins, ',');
 
-$mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', '|', 'bullist', 'numlist', 'outdent', 'indent', '|', 'justifyleft', 'justifycenter', 'justifyright', '|', 'link', 'unlink', 'image', 'wp_more', '|', 'spellchecker', '|', 'wp_help', 'wp_adv' ));
+$mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', '|', 'bullist', 'numlist', 'outdent', 'indent', '|', 'justifyleft', 'justifycenter', 'justifyright', '|', 'link', 'unlink', 'image', 'wp_more', '|', 'spellchecker', 'fullscreen', 'wp_adv' ));
 $mce_buttons = implode($mce_buttons, ',');
 
-$mce_buttons_2 = apply_filters('mce_buttons_2', array('formatselect', 'underline', 'justifyfull', 'forecolor', '|', 'pastetext', 'pasteword', '|', 'removeformat', 'cleanup', '|', 'media', 'charmap', 'blockquote', '|', 'undo', 'redo', 'fullscreen' ));
+$mce_buttons_2 = apply_filters('mce_buttons_2', array('formatselect', 'underline', 'justifyfull', 'forecolor', '|', 'pastetext', 'pasteword', '|', 'removeformat', 'cleanup', '|', 'media', 'charmap', 'blockquote', '|', 'undo', 'redo', 'wp_help' ));
 $mce_buttons_2 = implode($mce_buttons_2, ',');
 
@@ -91 +91 @@
 $mce_buttons_4 = apply_filters('mce_buttons_4', array());
 $mce_buttons_4 = implode($mce_buttons_4, ',');
-
-// all these browsers are now 100% supported, no need for this
-//$mce_browsers = apply_filters('mce_browsers', array('msie', 'gecko', 'opera', 'safari'));
-//$mce_browsers = implode($mce_browsers, ',');
 
 $mce_locale = ( '' == get_locale() ) ? 'en' : strtolower( substr(get_locale(), 0, 2) ); // only ISO 639-1
@@ -115 +111 @@
     'theme_advanced_resizing' => true,
     'theme_advanced_resize_horizontal' => false,
-//  'browsers' => "$mce_browsers",
     'dialog_type' => 'modal',
-    'convert_urls' => false,
     'relative_urls' => false,
     'remove_script_host' => false,
     'fix_list_elements' => true,
-    'fix_table_elements' => true,
+//  'fix_table_elements' => true,
     'gecko_spellcheck' => true,
     'entities' => '38,amp,60,lt,62,gt',
@@ -132 +126 @@
     'disk_cache' => true,
     'compress' => true,
-    'del_old_cache' => true
+    'old_cache_max' => '3' // number of cache files to keep
 );
 
@@ -149 +143 @@
 
 /*
-// Do we need to support this? Most likely will breal TinyMCE 3...
+// Do we need to support this? Most likely will break TinyMCE 3...
 ob_start();
 do_action('tinymce_before_init');
@@ -162 +156 @@
 $disk_cache = ( ! isset($initArray['disk_cache']) || false == $initArray['disk_cache'] ) ? false : true;
 $compress = ( ! isset($initArray['compress']) || false == $initArray['compress'] ) ? false : true;
-$del_old_cache = ( ! isset($initArray['del_old_cache']) || false == $initArray['del_old_cache'] ) ? false : true;
-
-$initArray['disk_cache'] = $initArray['compress'] = $initArray['del_old_cache'] = null;
-unset( $initArray['disk_cache'], $initArray['compress'], $initArray['del_old_cache'] );
+$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'] );
 
 $plugins = explode( ',', $initArray['plugins'] );
@@ -189 +183 @@
 
     $ver = isset($_GET['ver']) ? (int) $_GET['ver'] : '';
-    $cacheKey = $initArray['plugins'] . $language . $theme . $suffix . $ver;
-
+    $cacheKey = $suffix . $ver;
+
+    foreach ( $initArray as $v )
+        $cacheKey .= $v;
+    
     foreach ( $custom_js as $file )
         $cacheKey .= $file;
 
     $cacheKey = md5( $cacheKey );
-    $cache_file = $cache_path . '/tiny_mce_' . $cacheKey . $cache_ext;
+    $cache_file = $cache_path . '/tinymce_' . $cacheKey . $cache_ext;
 }
 
@@ -210 +207 @@
 
 foreach ( $initArray as $k => $v ) 
-    $mce_options .= $k . ':"' . $v . '", ';
+    $mce_options .= $k . ':"' . $v . '",';
 
 $mce_options .= $mce_deprecated1;
 $mce_options = rtrim( trim($mce_options), '\n\r,' );
 
-$content = 'var tinyMCEPreInit = { suffix : "' . $suffix . '", base : "' . $baseurl . '" };';
-$content .= 'var tinyMCE_GZ = { settings : { themes : "' . $theme . '", plugins : "' . $initArray['plugins'] . '", languages : "' . $language . '", debug : false, suffix : "' . $suffix . '" }, baseURL : "' . $baseurl . '" };';
+$content .= 'var tinyMCEPreInit = { settings : { themes : "' . $theme . '", plugins : "' . $initArray['plugins'] . '", languages : "' . $language . '", debug : false }, base : "' . $baseurl . '", suffix : "' . $suffix . '" };';
 
 // Load patch
@@ -225 +221 @@
 
 // Patch loading functions
-$content .= 'tinyMCE_GZ.start();';
+$content .= 'tinyMCEPreInit.start();';
 
 // Add all languages (WP)
@@ -248 +244 @@
 if ( '.gz' == $cache_ext ) {
     header('Content-Encoding: ' . $enc);
-    $cache_data = gzencode( $content, 9, FORCE_GZIP );
-} else
-    $cache_data = $content;
+    $content = gzencode( $content, 9, FORCE_GZIP );
+}
 
 // Stream to client
-echo $cache_data;
+echo $content;
 
 // Write file
-if ( '' != $cacheKey ) {
-    if ( $del_old_cache ) {
-        $old_key = getFileContents('tiny_mce_compressed_key');
-            
-        if ( '' != $old_key ) { //  && $old_key != $cacheKey
-            $old_cache = $cache_path . '/tiny_mce_' . $old_key . $cache_ext;
-            @unlink($old_cache);
+if ( '' != $cacheKey && $cache_path ) {
+    if ( $old_cache_max ) {
+        $old_keys = getFileContents('tinymce_compressed_key' . $cache_ext);
+            
+        if ( '' != $old_keys ) {
+            $keys_ar = explode( "\n", $old_keys );
+            if ( ($old_cache_max - 1) > count($old_keys_ar) )
+                $old_keys_rem = array_slice( $keys_ar, ($old_cache_max - 1) );
+            
+            foreach ( $old_keys_rem as $key ) {
+                $key = trim($key);
+                if ( 32 != strlen($key) ) continue;
+                $old_cache = $cache_path . '/tinymce_' . $key . $cache_ext;
+                @unlink($old_cache);
+            }
+            
+            array_unshift( $keys_ar, $cacheKey );
+            $keys_ar = array_slice( $keys_ar, 0, $old_cache_max );
+            $cacheKey = trim( implode( "\n", $keys_ar ) );
+            
         }
-            
-        putFileContents( 'tiny_mce_compressed_key', $cacheKey );
+        
+        putFileContents( 'tinymce_compressed_key' . $cache_ext, $cacheKey );
     }
-        
-    putFileContents( $cache_file, $cache_data );
+    
+    putFileContents( $cache_file, $content );
 }
 ?>