Changeset 2669 for branches

Timestamp:

04/30/10 09:49:30 (14 years ago)

Author:

niltonneto

Message:

Ticket #1056 - Corrige problema do 'undefined' e outros efeitos colaterais.

File:

• branches/2.0/expressoMail1_2/js/filter.js (modified) (2 diffs)

branches/2.0/expressoMail1_2/js/filter.js

@@ -399 +399 @@
         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;
-                }
-
                 var createFilter = function (param){
+                        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(param)){
+                                if (filter.e_newrule(new_r)){
                                         filter.email_deny.push(param);
                                         write_msg(get_lang("The sender was blocked"));                                                  
@@ -426 +419 @@
                         }
                 };
-                this.load_rules( createFilter, email );
+                if ( filter.rulest.length > 0 )
+                        createFilter(email);
+                else
+                        this.load_rules( createFilter, email );
         }