Changeset 3407
- Timestamp:
- 10/22/10 17:05:30 (14 years ago)
- Location:
- branches/2.2/expressoMail1_2
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/expressoMail1_2/index.php
r3400 r3407 135 135 $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_command_for_spam'] = $current_config['expressoMail_command_for_spam']; 136 136 $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_use_spam_filter'] = $current_config['expressoMail_use_spam_filter']; 137 echo '<script> var use_spam_filter = \''.$current_config['expressoMail_use_spam_filter'].'\' </script>'; 137 echo '<script> var use_spam_filter = \''.$current_config['expressoMail_use_spam_filter'].'\' 138 var sieve_forward_domains = \''.$current_config['expressoMail_sieve_forward_domains'].'\' </script>'; 138 139 // End Set Anti-Spam options. 139 140 -
branches/2.2/expressoMail1_2/js/filter.js
r3227 r3407 520 520 } 521 521 522 cfilter.prototype.forwardAddressValidation = function(addr) { 523 domains = sieve_forward_domains.replace(/\s/g, "").replace(/\./g, "\\.").replace(/,/g, "|"); 524 domainRegexp = new RegExp("(" + domains +")$"); 525 return domainRegexp.test(addr); 526 } 527 522 528 cfilter.prototype.saved_rules = function(){ 523 529 … … 566 572 } 567 573 if(Element("radio2").checked){ 574 if (this.forwardAddressValidation(Element("field5").value)){ 568 575 mount_rule += "address&&"; 569 576 if(Element("field5").value == ""){ … … 571 578 return false; 572 579 }else{ 573 if(!validateEmail(email)){580 if(validateEmail(Element("field5").value)){ 574 581 mount_rule += Element("field5").value + "&&"; 575 582 }else{ … … 579 586 } 580 587 v_checked = true; 588 } 589 else 590 { 591 alert(get_lang("You can't forward e-mails to this domain: %1", Element("field5").value.split("@")[1])); 592 return false; 593 } 581 594 } 582 595 if(Element("radio3").checked){ -
branches/2.2/expressoMail1_2/setup/phpgw_en.lang
r3352 r3407 13 13 Note: This sharing will take action on all of your folders and messages. expressoMail1_2 en Note: This sharing will take action on all your folders and messages. 14 14 all expressoMail1_2 en all 15 Allowed domains for sieve forwarding admin en Allowed domains for sieve forwarding 15 16 Also check message against next rule expressoMail1_2 en Also check message against next rule 16 17 Always sign message digitally? expressoMail1_2 en Always sign message digitally? … … 51 52 Close expressoMail1_2 en Close 52 53 Coincident expressoMail1_2 en Coincident 54 Comma separated admin en Comma separated 53 55 Command for spam admin en Command for spam 54 56 Command for unmark spam admin en Command for unmark spam … … 406 408 Write message expressoMail1_2 en Write message 407 409 wrote expressoMail1_2 en wrote 410 You can't forward e-mails to this domain: %1 admin en You can't forward e-mails to this domain: %1 408 411 You didn't accepted yet instant_messenger en You didn't accepted yet 409 412 You have %1 new expressoMail1_2 en You have %1 new -
branches/2.2/expressoMail1_2/setup/phpgw_pt-br.lang
r3400 r3407 18 18 all expressoMail1_2 pt-br Todas 19 19 All messages are successfully unarchived expressoMail1_2 pt-br Mensagens desarquivadas com sucesso 20 Allowed domains for sieve forwarding admin pt-br Domínios permitidos para encaminhamento em filtros 20 21 Also check message against next rule expressoMail1_2 pt-br Checar mensagem contra próxima regra também 21 22 Always cipher message digitally? expressoMail1_2 pt-br Sempre cifrar digitalmente a mensagem? … … 77 78 Coincident expressoMail1_2 pt-br Coincidente 78 79 Cols expressoMail1_2 pt-br Colunas 80 Comma separated admin pt-br Separado por vírgula 79 81 Command for spam admin pt-br Comando que será executado ao marcar como spam 80 82 Command for unmark spam admin pt-br Comando que será executado ao marcar como não-spam … … 570 572 Yes expressoMail1_2 pt-br Sim 571 573 Yesterday expressoMail1_2 pt-br Ontem 574 You can't forward e-mails to this domain: %1 admin pt-br Não é permitido encaminhar e-mails para este domínio: %1 572 575 You cant manipulate local messages on search expressoMail1_2 pt-br Impossível manipular mensagens locais a partir de uma busca. Isso é permitido apenas para mensagens não locais. 573 576 you can't move mails from local to server folders expressoMail1_2 pt-br Não é possível mover mensagens de uma pasta local para uma pasta no servidor. -
branches/2.2/expressoMail1_2/templates/classic/config.tpl
r1151 r3407 85 85 </tr> 86 86 <tr bgcolor="{row_on}"> 87 <td>{lang_Allowed_domains_for_sieve_forwarding} ({lang_Comma_separated})</td> 88 <td> 89 <input size="60" name="newsettings[expressoMail_sieve_forward_domains]" value="{value_expressoMail_sieve_forward_domains}"> 90 </td> 91 </tr> 92 <tr bgcolor="{row_off}"> 87 93 <td>{lang_Number_of_dynamic_contacts}</td> 88 94 <td> -
branches/2.2/expressoMail1_2/templates/default/config.tpl
r3226 r3407 83 83 </tr> 84 84 <tr bgcolor="{row_off}"> 85 <td>{lang_Allowed_domains_for_sieve_forwarding} ({lang_Comma_separated})</td> 86 <td> 87 <input size="60" name="newsettings[expressoMail_sieve_forward_domains]" value="{value_expressoMail_sieve_forward_domains}"> 88 </td> 89 </tr> 90 <tr bgcolor="{row_on}"> 85 91 <td>{lang_Number_of_dynamic_contacts}</td> 86 92 <td> … … 88 94 </td> 89 95 </tr> 90 <tr bgcolor="{row_o n}">96 <tr bgcolor="{row_off}"> 91 97 <td>{lang_imap_max_folders}:</td> 92 98 <td> … … 94 100 </td> 95 101 </tr> 96 <tr bgcolor="{row_o ff}">102 <tr bgcolor="{row_on}"> 97 103 <td>{lang_Max_attachment_size}</td> 98 104 <td> … … 101 107 </td> 102 108 </tr> 103 <tr bgcolor="{row_o n}">109 <tr bgcolor="{row_off}"> 104 110 <td>{lang_googlegears_url}</td> 105 111 <td>
Note: See TracChangeset
for help on using the changeset viewer.