Changeset 8232 for branches/2.5/expressoMail1_2/inc/hook_settings.inc.php

Timestamp:

10/08/13 16:20:46 (11 years ago)

Author:

douglas

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final 2.5.1.

File:

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

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

@@ -150 +150 @@
                                                                     signatures[default_signature].replace( /\\n/g, "<br>" );
     }
-    if (document.getElementById( "signature" ).value != "") 
-        document.getElementById( "signature" ).value = encode64(document.getElementById( "signature" ).value); 
+    if (document.getElementById( "signature" ).value != "")
+        document.getElementById( "signature" ).value = encode64(document.getElementById( "signature" ).value);
     document.getElementById( "signatures" ).value = toJSON( signatures );
     document.getElementById( "signature_types" ).value = toJSON( types );
@@ -270 +270 @@
         return output.toString();
 }
-function normalizerSignature(values){ 
-        var value = {}; 
-        for( key in values ){ 
-                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 normalizerSignature(values){
+
+    var value = {};
+
+    for( key in values ){
+
+        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()
 {
     var types = fromJSON( document.getElementById( "signature_types" ).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; 
-        def = isEncoded64(def) ? decode64(def) : def; 
+    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";
+        }
+    }
+
+    signatures = normalizerSignature(signatures);
+    types = normalizerSignature(types);
+
+    var old_signature = document.getElementById( "signature" ).value;
+    var def = document.getElementById( "signature_default" ).value;
+        def = isEncoded64(def) ? decode64(def) : def;
 
     var counter = 0, ids = [], def_signature = "", noSig = true;
-
-        signatures = normalizerSignature(signatures); 
-        types = normalizerSignature(types);
 
     for( key in signatures )
@@ -336 +341 @@
 
     if( def_signature !== "" )
-                document.getElementById( "default_signature" + def_signature ).checked = true;
+        document.getElementById( "default_signature" + def_signature ).checked = true;
     else if( noSig && 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; 
-        }
-        }
+        var type_signature = document.getElementById("type_signature");
+        if (type_signature)
+        {
+            addSignature( type_signature.value !== "html" );
+            document.getElementById( "user_signature" + counter ).value = old_signature;
+        }
+    }
 }
 ');
@@ -364 +369 @@
 
 create_check_box('View the user name in the header of the messages printed?', 'show_name_print_messages', 'Displays the user name in the header print email');
+
+create_check_box('Habilitar funcionalidade de notificar ao receber mensagens filtradas por remetente ?', 'use_alert_filter_criteria', '');
+create_check_box('Habilitar sinalizadores e marcadores em mensagens', 'use_followupflags_and_labels', '');
 
 //$default = 0;