Changeset 246 for trunk/expressoMail1_2/js/filter.js

Timestamp:

03/25/08 15:21:49 (16 years ago)

Author:

niltonneto

Message:

Ver o ticket #161 do Trac.

File:

• trunk/expressoMail1_2/js/filter.js (modified) (3 diffs)

trunk/expressoMail1_2/js/filter.js

@@ -313 +313 @@
                 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);           
-                        this.email_deny.push(email);
-                        write_msg(get_lang("The sender was blocked"));                                                  
+//                      setTimeout("filter.e_newrule('" + new_r + "')",2000);           
+                        if (filter.e_newrule(new_r)){
+                                this.email_deny.push(email);
+                                write_msg(get_lang("This sender was blocked"));                                                 
+                        }else
+                                write_msg(get_lang("You have reached the maximum number of rules"));
                 }
         }
@@ -322 +325 @@
 
                 var new_rl = "";
+                if (this.rulest.length >= rules_limit)
+                        return false;
+                        
                 if(this.rulest.length == 0){
                         new_rl = "#rule&&1" + nw_rule;
@@ -330 +336 @@
                 this.rulest.push(new_rl);
                 this.saved_all();
+                return true;
         }