Changeset 8077 for trunk

Timestamp:

04/03/13 16:03:00 (10 years ago)

Author:

douglasz

Message:

Ticket #3418 - Problema ao salvar assinatura com titulo contendo acentos.

Location:

trunk/expressoMail1_2

Files:

• inc/hook_settings.inc.php (modified) (3 diffs)
• js/rich_text_editor.js (modified) (1 diff)

trunk/expressoMail1_2/inc/hook_settings.inc.php

@@ -87 +87 @@
         if( !document.getElementById( "_signature" + i ) ) continue;
 
-        var key = document.getElementById( "title_signature" + i ).value;
+        var key = encode64(document.getElementById( "title_signature" + i ).value);
         var edit = !!document.getElementById( "edit_signature" + i ).checked;
 
@@ -269 +269 @@
         return output.toString();
 }
+function normalizerSignature(values){
+
+    var value = {};
+
+    for( key in values ){
+
+        value[decode64(key)] = values[key];
+
+    }
+
+    return value;
+}
 function loadSignature()
 {
@@ -287 +299 @@
     }
 
+    signatures = normalizerSignature(signatures);
+    types = normalizerSignature(types);
+
     var old_signature = document.getElementById( "signature" ).value; 
-    var def = document.getElementById( "signature_default" ).value;
+    var def = decode64(document.getElementById( "signature_default" ).value);
 
     var counter = 0, ids = [], def_signature = "", noSig = true;

trunk/expressoMail1_2/js/rich_text_editor.js

@@ -130 +130 @@
 cRichTextEditor.prototype.getSignaturesOptions = function() {
         
-        if(RichTextEditor.signatures !== false)
-            return RichTextEditor.signatures;
+    if(RichTextEditor.signatures !== false)
+        return RichTextEditor.signatures;
                 
-        var signatures = this.fromJSON( preferences.signatures );
-        var signature_types = this.fromJSON( preferences.signature_types );
+        var signatures = RichTextEditor.normalizerSignature(this.fromJSON( preferences.signatures ));
+        var signature_types = RichTextEditor.normalizerSignature(this.fromJSON( preferences.signature_types ));
 
         for( key in signatures )
             if( !signature_types[key] )
-                signatures[key] = signatures[key].replace( /\n/g, "<br>" );
-                 
-        RichTextEditor.signatures = signatures;
-        return signatures;
+                    signatures[key] = signatures[key].replace( /\n/g, "<br>" );
+
+    RichTextEditor.signatures = signatures;
+    return signatures;
+
+}
+cRichTextEditor.prototype.normalizerSignature = function(values) {
+
+    var value = {};
+
+    for (key in values){
+
+        value[RichTextEditor.decode64(key)] = values[key];
+    }
+
+    return value;
 
 }
 
 cRichTextEditor.prototype.getSignatureDefault = function() {
-         
-        if(RichTextEditor.signatures === false)
-            RichTextEditor.signatures = RichTextEditor.getSignaturesOptions(); 
+
+    if(RichTextEditor.signatures === false){
+        RichTextEditor.signatures = RichTextEditor.getSignaturesOptions();
+        preferences.signature_default = RichTextEditor.decode64(preferences.signature_default);
+    }
          
-        if(!RichTextEditor.signatures ||  
-           !RichTextEditor.signatures[preferences.signature_default || ""])
-        {
-          preferences.use_signature = "0"; //Desabilita o uso da assinatura
-          return '';
-        } 
-        
-        return unescape(RichTextEditor.signatures[preferences.signature_default]);
-
-}
-
+    if(!RichTextEditor.signatures ||
+       !RichTextEditor.signatures[preferences.signature_default || ""])
+    {
+      preferences.use_signature = "0"; //Desabilita o uso da assinatura
+      return '';
+    }
+
+    return unescape(RichTextEditor.signatures[preferences.signature_default]);
+
+}