Changeset 246 for trunk/expressoMail1_2
- Timestamp:
- 03/25/08 15:21:49 (16 years ago)
- Location:
- trunk/expressoMail1_2/js
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/filter.js
r206 r246 313 313 if(confirm(get_lang("Do you want to block this e-mail?"))){ 314 314 new_r = "&&ENABLED&&" + email + "&&&&&&discard&&&&0&&&&&&0"; 315 setTimeout("filter.e_newrule('" + new_r + "')",2000); 316 this.email_deny.push(email); 317 write_msg(get_lang("The sender was blocked")); 315 // setTimeout("filter.e_newrule('" + new_r + "')",2000); 316 if (filter.e_newrule(new_r)){ 317 this.email_deny.push(email); 318 write_msg(get_lang("This sender was blocked")); 319 }else 320 write_msg(get_lang("You have reached the maximum number of rules")); 318 321 } 319 322 } … … 322 325 323 326 var new_rl = ""; 327 if (this.rulest.length >= rules_limit) 328 return false; 329 324 330 if(this.rulest.length == 0){ 325 331 new_rl = "#rule&&1" + nw_rule; … … 330 336 this.rulest.push(new_rl); 331 337 this.saved_all(); 338 return true; 332 339 } 333 340 -
trunk/expressoMail1_2/js/filters.js
r197 r246 1 var rules_limit = 200; 2 1 3 function cfilterSh(){ 2 4 this.filter_Sh = new Array; … … 83 85 list = "<img id='set_rules_img' src='"+this.grp_close_img.src+"' border='0'> <span><b>"+get_lang('list of the filters') + " - ( " + filter.rulest.length + " ) </b></span> - " + "<a href='javascript:filters.n_rule()'>" + get_lang("new rule") + "</a>"; 84 86 }else{ 85 list = "<img id='set_rules_img' src='"+this.grp_open_img.src+"' onclick=filters.hidden(\"set_rules\") border='0'> <span><b>"+get_lang('list of the filters') + " - ( " + filter.rulest.length + " ) </b></span> - " + "<a href='javascript:filters.n_rule()'>" + get_lang("new rule") + "</a>"; 87 if (filter.rulest.length < rules_limit ) //Limit of rules 88 list = "<img id='set_rules_img' src='"+this.grp_open_img.src+"' onclick=filters.hidden(\"set_rules\") border='0'> <span><b>"+get_lang('list of the filters') + " - ( " + filter.rulest.length + " ) </b></span> - " + "<a href='javascript:filters.n_rule()'>" + get_lang("new rule") + "</a>"; 89 else 90 list = "<img id='set_rules_img' src='"+this.grp_open_img.src+"' onclick=filters.hidden(\"set_rules\") border='0'> <span><b>"+get_lang('list of the filters') + " - ( " + filter.rulest.length + " ) </b></span> - " + get_lang("You have reached the maximum number of rules"); 91 86 92 list += "<div id='set_rules'>"; 87 93 for(var i=0; i < filter.rulest.length; i++){
Note: See TracChangeset
for help on using the changeset viewer.