Changeset 3018 for branches/2.2/expressoMail1_2/js/filter.js

Timestamp:

07/08/10 17:52:20 (14 years ago)

Author:

amuller

Message:

Ticket #1135 - Aplicando alterações do branches 2.0 no branches 2.2

File:

• branches/2.2/expressoMail1_2/js/filter.js (modified) (5 diffs)

branches/2.2/expressoMail1_2/js/filter.js

@@ -11 +11 @@
         function cfilter(){
 
+                this.criticalError = false;
                 this.mode_in   = "";
                 this.rulest              = new Array;
@@ -41 +42 @@
 
         
-        cfilter.prototype.load_rules = function()
+        cfilter.prototype.load_rules = function(posHandler, param)
         {
                 var _this = this;
                 var cont1 = parseInt(0);
                 var cont2 = parseInt(0);
-                                
+        
                 if( _this.rulest.length == 0 )
                 {
                         var handler_sieve = function(data)
                         {
+                                if (data.toString().indexOf('Error:') == 0) 
+                                {
+                                        _this.criticalError = true;
+                                        alert(get_lang('The filters service is out of service, try again later...'));
+                                }
+                                else
+                                try{
                                 if(data.rule.length > 0){
                                         for(var i=0 ; i < data.rule.length; i++)
@@ -64 +72 @@
                                 _this.out_officeR = _this.out_officeR ? trim(_this.out_officeR.toString().replace("\n","")) : "";
                                 if(data.mode.length > 0){_this.mode_in = data.mode[0];}
+                                }
+                                catch(e){
+                                        _this.criticalError = true;
+                                        alert(get_lang('The filters service is out of service, try again later...'));
+                                }
+                                if (typeof(posHandler) == 'function')  
+                                        posHandler(param);  
                         }
                         if(Element('form_status') != null)
@@ -381 +396 @@
                 this.reload_rules();
         }
-        
-        cfilter.prototype.new_rule = function(email){
-
-                if(this.email_deny.length > 0){
-                        for(var i=0 ; i < this.email_deny.length; i++){
-                                if(this.email_deny[i] == email){
-                                        alert(get_lang("Sender blocked")+"!");
-                                        return false;
-                                }
-                        }
-                }
-
-                // Verifica Email
-                var emailReg = /^[a-z][a-z-_0-9\.]+@[a-z-_=>0-9\.]+\.[a-z]{2,3}$/i
-        if(!emailReg.test(email)){
-                        alert(get_lang("Inform a valid e-mail!"));
-                        return false;
-                }
-
-                this.load_rules();
-                if(confirm(get_lang("Do you want to block this e-mail?"))){
-                        new_r = "&&ENABLED&&" + email + "&&&&&&discard&&&&0&&&&&&0";
-//                      setTimeout("filter.e_newrule('" + new_r + "')",2000);           
-                        if (filter.e_newrule(new_r)){
-                                this.email_deny.push(email);
-                                write_msg(get_lang("The sender was blocked"));                                                  
-                        }else
-                                write_msg(get_lang("You have reached the maximum number of rules"));
-                }
-        }
-        
+
+cfilter.prototype.new_rule = function(email){
+
+        var createFilter = function (param){ 
+                if (filter.criticalError){ 
+                        alert(get_lang('The filters service is out of service, try again later...')); 
+                        return false; 
+                } 
+                if(filter.rulest.length > 0){ 
+                        var blockedReg = new RegExp('#rule&&[0-9]+&&ENABLED&&'+param+'&&&&&&discard&&&&0&&&&&&0'); 
+                        for(var i=0 ; i < filter.rulest.length; i++){ 
+                                if(blockedReg.test(filter.rulest[i])){ 
+                                        alert(get_lang("Sender blocked")+"!"); 
+                                        return false; 
+                                } 
+                        } 
+                }                        
+                if(confirm(get_lang("Do you want to block this e-mail?"))){ 
+                        new_r = "&&ENABLED&&" + param + "&&&&&&discard&&&&0&&&&&&0"; 
+                        //setTimeout("filter.e_newrule('" + new_r + "')",2000);          
+                        if (filter.e_newrule(new_r)){ 
+                                filter.email_deny.push(new_r); 
+                                write_msg(get_lang("The sender was blocked"));                                                   
+                        }else 
+                                write_msg(get_lang("You have reached the maximum number of rules")); 
+                } 
+        }; 
+        if ( filter.rulest.length > 0 ) 
+                createFilter(email); 
+        else 
+                this.load_rules( createFilter, email ); 
+}
+
         cfilter.prototype.e_newrule = function(nw_rule)
         {
@@ -747 +764 @@
                 var args   = "$this.ScriptS.rec_rules";
                 var params = "arfilter="+aux_rul;
-                cExecute(args,h_filter,params);
+                if(!_this.criticalError)
+                        cExecute(args,h_filter,params);
         }