Drag/drop and pasted images should not be uploaded in html signature …

…preview
horde · Apr 14, 2014 · 6b68ca0 · 6b68ca0
1 parent ecfad06
commit 6b68ca0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/imp/js/compose-dimp.js b/imp/js/compose-dimp.js
@@ -540,6 +540,8 @@ var DimpCompose = {
 
     rteInit: function(rte)
     {
+        var config;
+
         if (rte && !ImpComposeBase.rte) {
             if (Object.isUndefined(ImpComposeBase.rte_loaded)) {
                 CKEDITOR.on('instanceReady', function(evt) {
@@ -560,7 +562,10 @@ var DimpCompose = {
                 }.bind(this));
             }
 
-            ImpComposeBase.rte = CKEDITOR.replace('composeMessage', Object.clone(IMP.ckeditor_config));
+            config = Object.clone(IMP.ckeditor_config);
+            config.extraPlugins = 'pasteattachment';
+            ImpComposeBase.rte = CKEDITOR.replace('composeMessage', config);
+
             ImpComposeBase.rte.on('getData', function(evt) {
                 var elt = new Element('SPAN').insert(evt.data.dataValue),
                     elts = elt.select('IMG[dropatc_id]');

diff --git a/imp/js/compose.js b/imp/js/compose.js
@@ -319,7 +319,7 @@ var ImpCompose = {
 
     onDomLoad: function()
     {
-        var handler;
+        var config, handler;
 
         HordeCore.initHandler('click');
 
@@ -350,6 +350,10 @@ var ImpCompose = {
             }
 
             if (ImpComposeBase.editor_on) {
+                config = Object.clone(IMP.ckeditor_config);
+                config.extraPlugins = 'pasteignore';
+                CKEDITOR.replace('composeMessage', config)
+
                 document.observe('SpellChecker:after', this._onAfterSpellCheck.bind(this));
                 document.observe('SpellChecker:before', this._onBeforeSpellCheck.bind(this));
             }

diff --git a/imp/lib/Basic/Compose.php b/imp/lib/Basic/Compose.php
@@ -1064,7 +1064,7 @@ protected function _init()
         }
 
         if ($rtemode && !$redirect) {
-            $injector->getInstance('IMP_Editor')->init('composeMessage');
+            $injector->getInstance('IMP_Editor')->init();
         }
     }
 

diff --git a/imp/lib/Script/Package/ComposeBase.php b/imp/lib/Script/Package/ComposeBase.php
@@ -51,7 +51,6 @@ public function __construct()
             $page_output->addInlineScript(array(
                 'if (window.CKEDITOR) { CKEDITOR.on("loaded", function(e) {' .
                   'CKEDITOR.plugins.addExternal("' . $plugin . '", "' . $js->url->url . '", "");' .
-                  'CKEDITOR.config.extraPlugins = CKEDITOR.config.extraPlugins.split(",").concat("' . $plugin . '").join(",");' .
                   'CKEDITOR.config.filebrowserImageUploadUrl = "' . $upload_url . '";' .
                 '}); };'
             ), true);