Changeset 2668 for trunk/expressoMail1_2/js/jscode/filter.js
- Timestamp:
- 04/30/10 09:10:43 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/jscode/filter.js
r2663 r2668 398 398 399 399 cfilter.prototype.new_rule = function(email){ 400 401 if(this.email_deny.length > 0){402 for(var i=0 ; i < this.email_deny.length; i++){403 if(this.email_deny[i] == email){404 alert(get_lang("Sender blocked")+"!");405 return false;406 }407 }408 }409 410 if(!validateEmail(email)){411 alert(get_lang("Inform a valid e-mail!"));412 return false;413 }414 415 400 var createFilter = function (param){ 401 if(filter.rulest.length > 0){ 402 var blockedReg = new RegExp('#rule&&[0-9]+&&ENABLED&&'+param+'&&&&&&discard&&&&0&&&&&&0'); 403 for(var i=0 ; i < filter.rulest.length; i++){ 404 if(blockedReg.test(filter.rulest[i])){ 405 alert(get_lang("Sender blocked")+"!"); 406 return false; 407 } 408 } 409 } 416 410 if(confirm(get_lang("Do you want to block this e-mail?"))){ 417 411 new_r = "&&ENABLED&&" + param + "&&&&&&discard&&&&0&&&&&&0"; 418 412 //setTimeout("filter.e_newrule('" + new_r + "')",2000); 419 if (filter.e_newrule( param)){413 if (filter.e_newrule(new_r)){ 420 414 filter.email_deny.push(param); 421 415 write_msg(get_lang("The sender was blocked")); … … 424 418 } 425 419 }; 426 this.load_rules( createFilter, email ); 420 if ( filter.rulest.length > 0 ) 421 createFilter(email); 422 else 423 this.load_rules( createFilter, email ); 427 424 } 428 425
Note: See TracChangeset
for help on using the changeset viewer.