Changeset 8157 for branches/2.5

Timestamp:

05/16/13 14:07:12 (11 years ago)

Author:

douglas

Message:

Ticket #3368 - Correção de incompatibilidade entre formatos de assinatura

File:

• branches/2.5/expressoMail1_2/inc/hook_settings.inc.php (modified) (3 diffs)

branches/2.5/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()
 {
     var types = fromJSON( document.getElementById( "signature_types" ).value );
-    var signatures = fromJSON( document.getElementById( "signatures" ).value );
+    var signatures; 
+    if (document.getElementById( "signatures" ).value) 
+    { 
+        signatures = fromJSON(document.getElementById("signatures").value); 
+    } else if (document.getElementById( "signature" ).value) // Caso a assinatura esteja no formato da versão 2.2.10: 
+    { 
+        // TODO: Internazionalizar a string 
+        signatures = {}; 
+        signatures["Assinatura padrão"] = document.getElementById( "signature" ).value; 
+        if (!document.getElementById("signature_default").value) 
+        { 
+            document.getElementById("signature_default").value = "Assinatura padrão"; 
+        } 
+}    
+    
     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;
+
+        signatures = normalizerSignature(signatures); 
+        types = normalizerSignature(types);
 
     for( key in signatures )
@@ -296 +320 @@
 
     if( def_signature !== "" )
-        document.getElementById( "default_signature" + def_signature ).checked = true;
+                document.getElementById( "default_signature" + def_signature ).checked = true;
     else if( noSig && old_signature )
     {
-        addSignature( document.getElementById("type_signature").value !== "html" );
-        document.getElementById( "user_signature" + counter ).value = old_signature;
-    }
-    }
+            var type_signature = document.getElementById("type_signature"); 
+        if (type_signature) 
+        { 
+            addSignature( type_signature.value !== "html" ); 
+            document.getElementById( "user_signature" + counter ).value = old_signature; 
+        }
+        }
+}
 ');
 //}