Changeset 5474 for trunk/expressoMail1_2/js
- Timestamp:
- 02/06/12 09:16:47 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/filter.js
r5262 r5474 412 412 } 413 413 414 cfilter.prototype.new_rule = function(email){ 415 416 var createFilter = function (param){ 417 if (filter.criticalError){ 418 alert(get_lang('The filters service is out of service, try again later...')); 419 return false; 420 } 421 if(filter.rulest.length > 0){ 422 var blockedReg = new RegExp('#rule&&[0-9]+&&ENABLED&&'+param+'&&&&&&discard&&&&0&&&&&&0'); 423 for(var i=0 ; i < filter.rulest.length; i++){ 424 if(blockedReg.test(filter.rulest[i])){ 425 alert(get_lang("Sender blocked")+"!"); 426 return false; 414 cfilter.prototype.new_rule = function(email){ 415 416 var createFilter = function (param) 417 { 418 if (filter.criticalError){ 419 alert(get_lang('The filters service is out of service, try again later...')); 420 return false; 421 } 422 if(filter.rulest.length > 0){ 423 var blockedReg = new RegExp('#rule&&[0-9]+&&ENABLED&&'+param+'&&&&&&discard&&&&0&&&&&&0'); 424 for(var i=0 ; i < filter.rulest.length; i++){ 425 if(blockedReg.test(filter.rulest[i])){ 426 alert(get_lang("Sender blocked")+"!"); 427 return false; 428 } 427 429 } 428 } 429 } 430 if(confirm(get_lang("Do you want to block this e-mail?"))){ 431 new_r = "&&ENABLED&&" + param + "&&&&&&discard&&&&0&&&&&&0"; 432 //setTimeout("filter.e_newrule('" + new_r + "')",2000); 433 if (filter.e_newrule(new_r)){ 434 filter.email_deny.push(new_r); 435 write_msg(get_lang("The sender was blocked")); 436 }else 437 write_msg(get_lang("You have reached the maximum number of rules")); 438 } 439 }; 440 if ( filter.rulest.length > 0 ) 441 createFilter(email); 442 else 443 this.load_rules( createFilter, email ); 444 } 430 } 431 432 433 var div = document.createElement("div"); 434 div.innerHTML = '<p style="margin:10px 5px 5px 5px;">' + 435 '<span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 20px 0;"></span>'+ 436 get_lang("Do you want to block this e-mail?")+ 437 '</p>'; 438 439 $(div).dialog( 440 { 441 resizable: false, 442 title: get_lang('Block Sender'), 443 position: 'center', 444 width: 350, 445 height:140, 446 modal: true, 447 buttons: [ 448 { 449 text: get_lang("Yes"), 450 click: function() 451 { 452 new_r = "&&ENABLED&&" + param + "&&&&&&discard&&&&0&&&&&&0"; 453 454 if (filter.e_newrule(new_r)) 455 { 456 filter.email_deny.push(new_r); 457 write_msg(get_lang("The sender was blocked")); 458 } 459 else 460 { 461 write_msg(get_lang("You have reached the maximum number of rules")); 462 } 463 464 $( this ).dialog( "close" ); 465 }, 466 style: "margin-top: -2.1em" 467 }, 468 { 469 text: get_lang("No"), 470 click: function() 471 { 472 $( this ).dialog( "close" ); 473 }, 474 style: "margin-top: -2.1em" 475 }, 476 ] 477 }); 478 }; 479 480 if ( filter.rulest.length > 0 ) 481 createFilter(email); 482 else 483 this.load_rules( createFilter, email ); 484 } 445 485 446 486 cfilter.prototype.e_newrule = function(nw_rule)
Note: See TracChangeset
for help on using the changeset viewer.