Changeset 8161

Timestamp:

05/20/13 17:40:53 (10 years ago)

Author:

douglas

Message:

Ticket #3453 - Problema ao inserir assinatura automaticamente no Expresso Mail

Location:

branches/2.5/expressoMail1_2

Files:

• inc/hook_settings.inc.php (modified) (2 diffs)
• js/rich_text_editor.js (modified) (2 diffs)

branches/2.5/expressoMail1_2/inc/hook_settings.inc.php

@@ -272 +272 @@
         var value = {}; 
         for( key in values ){ 
-                value[decode64(key)] = values[key]; 
+                value[isEncoded64(key) ? decode64(key) : key] = values[key]; 
         } 
         return value; 
+} 
+/*Verifica se a string input esta em Base 64*/ 
+function isEncoded64(input){ 
+        var baseStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; 
+        var encoded = true; 
+        if ( (input.length % 4) != 0) 
+                return false; 
+        for(var i=0; i<input.length; i++){ 
+                if ( baseStr.indexOf(input[i]) < 0 ){ 
+                        encoded = false; 
+                        break; 
+                } 
+        } 
+        return encoded; 
 }
 function loadSignature()
@@ -295 +309 @@
     
     var old_signature = document.getElementById( "signature" ).value; 
-    var def = decode64(document.getElementById( "signature_default" ).value);
+    var def = document.getElementById( "signature_default" ).value; 
+        def = isEncoded64(def) ? decode64(def) : def; 
 
     var counter = 0, ids = [], def_signature = "", noSig = true;

branches/2.5/expressoMail1_2/js/rich_text_editor.js

@@ -147 +147 @@
         var value = {};  
         for (key in values){ 
-                value[RichTextEditor.decode64(key)] = values[key]; 
+                value[RichTextEditor.isEncoded64(key) ? RichTextEditor.decode64(key) : key] = values[key]; 
         } 
         return value;
+
+} 
+ 
+/*Verifica se a string input esta em Base64*/ 
+cRichTextEditor.prototype.isEncoded64 = function(input){ 
+var baseStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; 
+var encoded = true; 
+        if ( (input.length % 4) != 0) 
+                return false; 
+        for(var i=0; i<input.length; i++){ 
+                if ( baseStr.indexOf(input[i]) < 0 ){ 
+                        encoded = false; 
+                        break; 
+                } 
+        } 
+        return encoded; 
 }
 
@@ -156 +172 @@
         if(RichTextEditor.signatures === false){
             RichTextEditor.signatures = RichTextEditor.getSignaturesOptions();
-            preferences.signature_default = RichTextEditor.decode64(preferences.signature_default);
+            preferences.signature_default = preferences.signature;
         }     
          
-        if(!RichTextEditor.signatures ||  
-           !RichTextEditor.signatures[preferences.signature_default || ""])
-        {
+        if(!RichTextEditor.signatures || !preferences.signature_default) 
+        {
           preferences.use_signature = "0"; //Desabilita o uso da assinatura
           return '';
         } 
         
-        return unescape(RichTextEditor.signatures[preferences.signature_default]);
+        return unescape(preferences.signature_default);
 
 }