Ticket #1485061: tinypatch.diff

program/js/editor.js

@@ -15 +15 @@
 
 // Initialize the message editor
 
-function rcmail_editor_init(skin_path, editor_lang)
+function rcmail_editor_init_gzip(editor_lang)
   {
+  tinyMCE_GZ.init({ plugins : "emotions,media,nonbreaking,table,searchreplace,visualchars,directionality",
+                    themes : "advanced",
+                    languages : editor_lang,
+                    disk_cache : true,
+                    debug : false
+                  });
+  }
+
+function rcmail_editor_init(skin_path, editor_lang, compact)
+  {
+  var buttons1 = "bold,italic,underline,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,bullist,numlist,outdent,indent,separator,link,unlink,emotions,charmap,code,forecolor,backcolor,fontselect,fontsizeselect, separator,undo,redo,image,media,ltr,rtl";
+  var buttons2 = "";
+  if(compact)
+    {
+    buttons1 = "bold,italic,underline,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,separator,outdent,indent,charmap,hr";
+    buttons2 = "link,unlink,code,forecolor,fontselect,fontsizeselect";
+    }
   tinyMCE.init({ mode : "textareas",
                  editor_selector : "mce_editor",
                  accessibility_focus : false,
@@ -24 +41 @@
                  theme : "advanced",
                  language : editor_lang,
                  plugins : "emotions,media,nonbreaking,table,searchreplace,visualchars,directionality",
-                 theme_advanced_buttons1 : "bold,italic,underline,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,bullist,numlist,outdent,indent,separator,link,unlink,emotions,charmap,code,forecolor,backcolor,fontselect,fontsizeselect, separator,undo,redo,image,media,ltr,rtl",
-                 theme_advanced_buttons2 : "",
+                 theme_advanced_buttons1 : buttons1,
+                 theme_advanced_buttons2 : buttons2,
                  theme_advanced_buttons3 : "",
                  theme_advanced_toolbar_location : "top",
                  theme_advanced_toolbar_align : "left",

program/js/tiny_mce/tiny_mce_gzip.js

@@ +1 @@
+var tinyMCE_GZ = {
+        settings : {
+                themes : '',
+                plugins : '',
+                languages : '',
+                disk_cache : true,
+                page_name : 'tiny_mce_gzip.php',
+                debug : false,
+                suffix : ''
+        },
+
+        init : function(s, cb, sc) {
+                var t = this, n, i, nl = document.getElementsByTagName('script');
+
+                for (n in s)
+                        t.settings[n] = s[n];
+
+                s = t.settings;
+
+                for (i=0; i<nl.length; i++) {
+                        n = nl[i];
+
+                        if (n.src && n.src.indexOf('tiny_mce') != -1)
+                                t.baseURL = n.src.substring(0, n.src.lastIndexOf('/'));
+                }
+
+                if (!t.coreLoaded)
+                        t.loadScripts(1, s.themes, s.plugins, s.languages, cb, sc);
+        },
+
+        loadScripts : function(co, th, pl, la, cb, sc) {
+                var t = this, x, w = window, q, c = 0, ti, s = t.settings;
+
+                function get(s) {
+                        x = 0;
+
+                        try {
+                                x = new ActiveXObject(s);
+                        } catch (s) {
+                        }
+
+                        return x;
+                };
+
+                // Build query string
+                q = 'js=true&diskcache=' + (s.disk_cache ? 'true' : 'false') + '&core=' + (co ? 'true' : 'false') + '&suffix=' + escape(s.suffix) + '&themes=' + escape(th) + '&plugins=' + escape(pl) + '&languages=' + escape(la);
+
+                if (co)
+                        t.coreLoaded = 1;
+
+                // Send request
+                x = w.XMLHttpRequest ? new XMLHttpRequest() : get('Msxml2.XMLHTTP') || get('Microsoft.XMLHTTP');
+                x.overrideMimeType && x.overrideMimeType('text/javascript');
+                x.open('GET', t.baseURL + '/' + s.page_name + '?' + q, !!cb);
+//              x.setRequestHeader('Content-Type', 'text/javascript');
+                x.send('');
+
+                // Handle asyncronous loading
+                if (cb) {
+                        // Wait for response
+                        ti = w.setInterval(function() {
+                                if (x.readyState == 4 || c++ > 10000) {
+                                        w.clearInterval(ti);
+
+                                        if (c < 10000 && x.status == 200) {
+                                                t.loaded = 1;
+                                                t.eval(x.responseText);
+                                                tinymce.dom.Event.domLoaded = true;
+                                                cb.call(sc || t, x);
+                                        }
+
+                                        ti = x = null;
+                                }
+                        }, 10);
+                } else
+                        t.eval(x.responseText);
+        },
+
+        start : function() {
+                var t = this, each = tinymce.each, s = t.settings, sl, ln = s.languages.split(',');
+
+                tinymce.suffix = s.suffix;
+
+                // Extend script loader
+                tinymce.create('tinymce.compressor.ScriptLoader:tinymce.dom.ScriptLoader', {
+                        loadScripts : function(sc, cb, s) {
+                                var ti = this, th = [], pl = [], la = [];
+
+                                each(sc, function(o) {
+                                        var u = o.url;
+
+                                        if ((!ti.lookup[u] || ti.lookup[u].state != 2) && u.indexOf(t.baseURL) === 0) {
+                                                // Collect theme
+                                                if (u.indexOf('editor_template') != -1) {
+                                                        th.push(/\/themes\/([^\/]+)/.exec(u)[1]);
+                                                        load(u, 1);
+                                                }
+
+                                                // Collect plugin
+                                                if (u.indexOf('editor_plugin') != -1) {
+                                                        pl.push(/\/plugins\/([^\/]+)/.exec(u)[1]);
+                                                        load(u, 1);
+                                                }
+
+                                                // Collect language
+                                                if (u.indexOf('/langs/') != -1) {
+                                                        la.push(/\/langs\/([^.]+)/.exec(u)[1]);
+                                                        load(u, 1);
+                                                }
+                                        }
+                                });
+
+                                if (th.length + pl.length + la.length > 0) {
+                                        if (sl.settings.strict_mode) {
+                                                // Async
+                                                t.loadScripts(0, th.join(','), pl.join(','), la.join(','), cb, s);
+                                                return;
+                                        } else
+                                                t.loadScripts(0, th.join(','), pl.join(','), la.join(','), cb, s);
+                                }
+
+                                return ti.parent(sc, cb, s);
+                        }
+                });
+
+                sl = tinymce.ScriptLoader = new tinymce.compressor.ScriptLoader();
+
+                function load(u, sp) {
+                        var o;
+
+                        if (!sp)
+                                u = t.baseURL + u;
+
+                        o = {url : u, state : 2};
+                        sl.queue.push(o);
+                        sl.lookup[o.url] = o;
+                };
+
+                // Add core languages
+                each (ln, function(c) {
+                        if (c)
+                                load('/langs/' + c + '.js');
+                });
+
+                // Add themes with languages
+                each(s.themes.split(','), function(n) {
+                        if (n) {
+                                load('/themes/' + n + '/editor_template' + s.suffix + '.js');
+
+                                each (ln, function(c) {
+                                        if (c)
+                                                load('/themes/' + n + '/langs/' + c + '.js');
+                                });
+                        }
+                });
+
+                // Add plugins with languages
+                each(s.plugins.split(','), function(n) {
+                        if (n) {
+                                load('/plugins/' + n + '/editor_plugin' + s.suffix + '.js');
+
+                                each (ln, function(c) {
+                                        if (c)
+                                                load('/plugins/' + n + '/langs/' + c + '.js');
+                                });
+                        }
+                });
+        },
+
+        end : function() {
+        },
+
+        eval : function(co) {
+                var w = window;
+
+                // Evaluate script
+                if (!w.execScript) {
+                        if (/Gecko/.test(navigator.userAgent))
+                                eval(co, w); // Firefox 3.0
+                        else
+                                eval.call(w, co);
+                } else
+                        w.execScript(co); // IE
+        }
+};

program/js/tiny_mce/tiny_mce_gzip.php

@@ +1 @@
+<?php
+/**
+ * $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 and
+ * enables the browser to do two requests instead of one for each .js file.
+ * Notice: This script defaults the button_tile_map option to true for extra performance.
+ */
+
+        // Set the error reporting to minimal.
+        @error_reporting(E_ERROR | E_WARNING | E_PARSE);
+
+        // Get input
+        $plugins = explode(',', getParam("plugins", ""));
+        $languages = explode(',', getParam("languages", ""));
+        $themes = explode(',', getParam("themes", ""));
+        $diskCache = getParam("diskcache", "") == "true";
+        $isJS = getParam("js", "") == "true";
+        $compress = getParam("compress", "true") == "true";
+        $core = getParam("core", "true") == "true";
+        $suffix = getParam("suffix", "_src") == "_src" ? "_src" : "";
+        $cachePath = realpath("./../../../cache"); // Cache path, this is where the .gz files will be stored
+        $expiresOffset = 3600 * 24 * 10; // Cache for 10 days in browser cache
+        $content = "";
+        $encodings = array();
+        $supportsGzip = false;
+        $enc = "";
+        $cacheKey = "";
+
+        // Custom extra javascripts to pack
+        $custom = array(/*
+                "some custom .js file",
+                "some custom .js file"
+        */);
+
+        // Headers
+        header("Content-type: text/javascript");
+        header("Vary: Accept-Encoding");  // Handle proxies
+        header("Expires: " . gmdate("D, d M Y H:i:s", time() + $expiresOffset) . " GMT");
+
+        // Is called directly then auto init with default settings
+        if (!$isJS) {
+                echo getFileContents("tiny_mce_gzip.js");
+                echo "tinyMCE_GZ.init({});";
+                die();
+        }
+
+        // Setup cache info
+        if ($diskCache) {
+                if (!$cachePath)
+                        die("alert('Real path failed.');");
+
+                $cacheKey = getParam("plugins", "") . getParam("languages", "") . getParam("themes", "") . $suffix;
+
+                foreach ($custom as $file)
+                        $cacheKey .= $file;
+
+                $cacheKey = md5($cacheKey);
+
+                if ($compress)
+                        $cacheFile = $cachePath . "/tiny_mce_" . $cacheKey . ".gz";
+                else
+                        $cacheFile = $cachePath . "/tiny_mce_" . $cacheKey . ".js";
+        }
+
+        // Check if it supports gzip
+        if (isset($_SERVER['HTTP_ACCEPT_ENCODING']))
+                $encodings = explode(',', strtolower(preg_replace("/\s+/", "", $_SERVER['HTTP_ACCEPT_ENCODING'])));
+
+        if ((in_array('gzip', $encodings) || in_array('x-gzip', $encodings) || isset($_SERVER['---------------'])) && function_exists('ob_gzhandler') && !ini_get('zlib.output_compression')) {
+                $enc = in_array('x-gzip', $encodings) ? "x-gzip" : "gzip";
+                $supportsGzip = true;
+        }
+
+        // Use cached file disk cache
+        if ($diskCache && $supportsGzip && file_exists($cacheFile)) {
+                if ($compress)
+                        header("Content-Encoding: " . $enc);
+
+                echo getFileContents($cacheFile);
+                die();
+        }
+
+        // Add core
+        if ($core == "true") {
+                $content .= getFileContents("tiny_mce" . $suffix . ".js");
+
+                // Patch loading functions
+                $content .= "tinyMCE_GZ.start();";
+        }
+
+        // Add core languages
+        foreach ($languages as $lang)
+                $content .= getFileContents("langs/" . $lang . ".js");
+
+        // Add themes
+        foreach ($themes as $theme) {
+                $content .= getFileContents( "themes/" . $theme . "/editor_template" . $suffix . ".js");
+
+                foreach ($languages as $lang)
+                        $content .= getFileContents("themes/" . $theme . "/langs/" . $lang . ".js");
+        }
+
+        // Add plugins
+        foreach ($plugins as $plugin) {
+                $content .= getFileContents("plugins/" . $plugin . "/editor_plugin" . $suffix . ".js");
+
+                foreach ($languages as $lang)
+                        $content .= getFileContents("plugins/" . $plugin . "/langs/" . $lang . ".js");
+        }
+
+        // Add custom files
+        foreach ($custom as $file)
+                $content .= getFileContents($file);
+
+        // Restore loading functions
+        if ($core == "true")
+                $content .= "tinyMCE_GZ.end();";
+
+        // Generate GZIP'd content
+        if ($supportsGzip) {
+                if ($compress) {
+                        header("Content-Encoding: " . $enc);
+                        $cacheData = gzencode($content, 9, FORCE_GZIP);
+                } else
+                        $cacheData = $content;
+
+                // Write gz file
+                if ($diskCache && $cacheKey != "")
+                        putFileContents($cacheFile, $cacheData);
+
+                // Stream to client
+                echo $cacheData;
+        } else {
+                // Stream uncompressed content
+                echo $content;
+        }
+
+        /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+        function getParam($name, $def = false) {
+                if (!isset($_GET[$name]))
+                        return $def;
+
+                return preg_replace("/[^0-9a-z\-_,]+/i", "", $_GET[$name]); // Remove anything but 0-9,a-z,-_
+        }
+
+        function getFileContents($path) {
+                $path = realpath($path);
+
+                if (!$path || !@is_file($path))
+                        return "";
+
+                if (function_exists("file_get_contents"))
+                        return @file_get_contents($path);
+
+                $content = "";
+                $fp = @fopen($path, "r");
+                if (!$fp)
+                        return "";
+
+                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);
+
+                $fp = @fopen($path, "wb");
+                if ($fp) {
+                        fwrite($fp, $content);
+                        fclose($fp);
+                }
+        }
+?>

program/steps/mail/compose.inc

@@ -416 +416 @@
     $tinylang = 'en'; 
     } 
 
-  $OUTPUT->include_script('tiny_mce/tiny_mce.js');
+  $OUTPUT->include_script('tiny_mce/tiny_mce_gzip.js');
   $OUTPUT->include_script("editor.js");
-  $OUTPUT->add_script('rcmail_editor_init("$__skin_path", "'.$tinylang.'");');
+  $OUTPUT->add_script('rcmail_editor_init_gzip("'.$tinylang.'");');
+  $OUTPUT->add_script('rcmail_editor_init("$__skin_path", "'.$tinylang.'", false);');
 
   $out = $form_start ? "$form_start\n" : '';
 

program/steps/settings/edit_identity.inc

@@ -45 +45 @@
       $tinylang = 'en';
     }
 
-  $OUTPUT->include_script('tiny_mce/tiny_mce.js');
-  $OUTPUT->add_script("tinyMCE.init({ mode : 'textareas'," .
-                                    "editor_selector : 'mce_editor'," .
-                                    "apply_source_formatting : true," .
-                                    "language : '$tinylang'," .
-                                    "content_css : '\$__skin_path' + '/editor_content.css'," .
-                                    "theme : 'advanced'," .
-                                    "theme_advanced_toolbar_location : 'top'," .
-                                    "theme_advanced_toolbar_align : 'left'," .
-                                    "theme_advanced_buttons1 : 'bold,italic,underline,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,separator,outdent,indent,charmap,hr'," .
-                                    "theme_advanced_buttons2 : 'link,unlink,code,forecolor,fontselect,fontsizeselect'," .
-                                    "theme_advanced_buttons3 : '' });");
+  $OUTPUT->include_script('tiny_mce/tiny_mce_gzip.js');
+  $OUTPUT->include_script("editor.js");
+  $OUTPUT->add_script('rcmail_editor_init_gzip("'.$tinylang.'");');
+  $OUTPUT->add_script('rcmail_editor_init("$__skin_path", "'.$tinylang.'", true);');
 
   if (!$IDENTITY_RECORD && $RCMAIL->action != 'add-identity')
     return rcube_label('notfound');