Changeset 8167 for trunk/prototype/modules/filters/filters.js

Timestamp:

05/31/13 18:50:29 (11 years ago)

Author:

cristiano

Message:

Ticket #3456 - Otimizacao e implementacao de habilitar/desabilitar funcionalidades no ExpressoMail?

File:

• trunk/prototype/modules/filters/filters.js (modified) (3 diffs)

trunk/prototype/modules/filters/filters.js

@@ -2 +2 @@
  * Retorna as regras por remetente e que o usuário deseja ser avisado 
  */
-function getFromAlertRules() { 
-        var filters = DataLayer.get("filter");
-        fromRules = [];
-        var alertMessage;
-        var active;
-        for (var index in filters) {
-                alertMessage = filters[index]['alertMessage'];          
-                active = filters[index]['enabled'];
-                for(var criterias in filters[index]['actions']) {
-                        if (filters[index]['actions'][criterias]['type'] == 'fileinto' && alertMessage == 'true' && active == 'true')
-                                fromRules[fromRules.length] = filters[index]['actions'][criterias]['parameter'];
-                }
-        }
-        return fromRules;
+function getFromAlertRules() {
+    fromRules = [];
+    if(preferences['use_alert_filter_criteria'] == "1")
+    {
+        var filters = DataLayer.get("filter");
+        var alertMessage;
+        var active;
+        for (var index in filters) {
+            alertMessage = filters[index]['alertMessage'];
+            active = filters[index]['enabled'];
+            for(var criterias in filters[index]['actions']) {
+                if (filters[index]['actions'][criterias]['type'] == 'fileinto' && alertMessage == 'true' && active == 'true')
+                    fromRules[fromRules.length] = filters[index]['actions'][criterias]['parameter'];
+            }
+        }
+
+    }
+    return fromRules;
 }
 
@@ -401 +405 @@
 });
 
-
-fromRules = getFromAlertRules();
+if(preferences['use_alert_filter_criteria'] == "1")
+{
+    fromRules = getFromAlertRules();
+}
 
 var BASE_PATH = '../prototype/';
@@ -1042 +1048 @@
                 }
         }
-        $.each(fromRules, function(index, value) {
-                if(value == folder){
-                        for(var i=0; i < filters_c['criteria'].length; i++){
-                                if(filters_c['criteria'][i].field == 'from'){
-                                        from = filters_c['criteria'][i].value;
-                                }
-                        }
-                        cExecute ("$this.imap_functions.removeFlagMessagesFilter&folder="+folder+"&from="+from, function(){}); 
-                        return false;
-                }
-        });
-}
+
+    if(preferences['use_alert_filter_criteria'] == "1")
+    {
+        $.each(fromRules, function(index, value) {
+            if(value == folder){
+                for(var i=0; i < filters_c['criteria'].length; i++){
+                    if(filters_c['criteria'][i].field == 'from'){
+                        from = filters_c['criteria'][i].value;
+                    }
+                }
+                cExecute ("$this.imap_functions.removeFlagMessagesFilter&folder="+folder+"&from="+from, function(){});
+                return false;
+            }
+        });
+    }
+}