Changeset 3961

Timestamp:

04/08/11 08:15:00 (12 years ago)

Author:

thiagoaos

Message:

Ticket #1714 - Adicionado mensagem de erro quando o filtro contém pasta acentuada.

Location:

branches/2.2/expressoMail1_2

Files:

• js/filter.js (modified) (3 diffs)
• setup/phpgw_pt-br.lang (modified) (1 diff)

branches/2.2/expressoMail1_2/js/filter.js

@@ -576 +576 @@
                                 if(!isNumero){
                                         alert(get_lang("Enter a numerical value to the message size!"));
-                                        return false;                           
+                                        return false;
                                 }
                         }
@@ -582 +582 @@
                         var v_checked = false;
                         if(Element("radio1").checked){
+                                if( /[^\x00-\x80]/.test( Element("select_mailboxes").value ) ) {
+                                        alert( get_lang ( 'The selected folder cotain any accented character. The filter dont work with accented folders. Please, rename the folder or choose another folder.' ) );
+                                        return false;
+                                }
+                                
                                 mount_rule += "folder&&";
                                 var sel_nameBox = Element("select_mailboxes");
@@ -588 +593 @@
                         }
                         if(Element("radio2").checked){
-                            if (this.forwardAddressValidation(Element("field5").value)){
-                                mount_rule += "address&&";
-                                if(Element("field5").value == ""){
-                                        alert(get_lang("Inform a forwarding e-mail!"));
-                                        return false;
-                                }else{
-                                    if(validateEmail(Element("field5").value)){
+                                if (this.forwardAddressValidation(Element("field5").value)){
+                                        mount_rule += "address&&";
+                                        if(Element("field5").value == ""){
+                                                alert(get_lang("Inform a forwarding e-mail!"));
+                                                return false;
+                                        }else{
+                                                if(validateEmail(Element("field5").value)){
                                                 mount_rule += Element("field5").value + "&&";
                                         }else{

branches/2.2/expressoMail1_2/setup/phpgw_pt-br.lang

@@ -645 +645 @@
 If you want to install a desktop shortcut for accessing the offline ExpressoMail please confirm it after pressing the Install offline button. </br> The application also can be accessed using the URL: expressoMail1_2 pt-br   Caso deseje instalar um ícone no desktop para acesso ao expressoMail offline, confirme a pergunta que aparecerá após clicar no botão "instalar offline". <br />A aplicação também pode ser acessada pela URL:
 Your rule contains any accented character. The filter may not work. Do you wish to continue?    expressoMail1_2 en      Sua regra contem algum caracter acentuado. O filtro pode nao funcionar. Deseja continuar?
+The selected folder cotain any accented character. The filter dont work with accented folders. Please, rename the folder or choose another folder.      expressoMail1_2 pt-br   A pasta selecionada contém algum caracter acentuado. O filtro não funcionada com pastas acentuadas. Por favor, mude o nome da pasta ou escolha outra.