Changeset 3227

Timestamp:

09/10/10 10:30:34 (14 years ago)

Author:

amuller

Message:

Ticket #1024 - Unifica validação do email no js

Location:

branches/2.2/expressoMail1_2/js

Files:

• ccQuickAdd.js (modified) (1 diff)
• common_functions.js (modified) (1 diff)
• filter.js (modified) (1 diff)
• main.js (modified) (3 diffs)

branches/2.2/expressoMail1_2/js/ccQuickAdd.js

@@ -128 +128 @@
 
                 var full_name = trim(sdata[1]) + ' ' + trim(sdata[2]);
-                var email = trim(sdata[4]);                             
-                //Utiliza expressão regular para validar email
-                var reEmail = /^[A-Za-z\d_-]+(\.[A-Za-z\d_-]+)*@(([A-Za-z\d][A-Za-z\d-]{0,61}[A-Za-z\d]\.)+[A-Za-z]{2,6}|\[\d{1,3}(\.\d{1,3}){3}\])$/;
-
-                if(!reEmail.test(email)){
-                        alert("O endereco de email '" + email + "' nao e valido!\n" +
-                        "Por favor informe um endereco valido.");
+                var email = trim(sdata[4]);
+                if(!validateEmail(email)){
+                        alert(get_lang("The email address %1 is not valid, please use a valid address.",email));
                         return false;
                 }
-                
+
                 var sdata = 'add='+escape(connector.serialize(sdata));
                 var CC_url = '../index.php?menuaction=contactcenter.ui_data.data_manager&method=';

branches/2.2/expressoMail1_2/js/common_functions.js

@@ -480 +480 @@
 }
 
+function validateEmail(email){
+        if (typeof(email) != 'string')
+                return false;
+        var validName = /^[a-z][a-z-_0-9\.]*/i;
+        emailParts = email.split('@');
+        return (validName.test(emailParts[0]) && validateDomain(emailParts[1]));
+}
+function validateDomain(domain){
+        var domainReg = /^(([A-Za-z\d][A-Za-z\d-]{0,61}[A-Za-z\d]\.)+[A-Za-z]{2,6}|\[\d{1,3}(\.\d{1,3}){3}\])$/i;
+        return (domainReg.test(domain));
+}
+
+function validateUrl(url){
+        var urlReg = /([A-Za-z]{2,7}:\/\/)(.*)/i;
+        urlParts = url.split(urlReg);
+        return (urlParts[1].length > 4 &&  validateDomain(urlParts[2]));
+}
 function emQuickSearch(emailList, field, ID){
         var quickSearchKeyBegin;

branches/2.2/expressoMail1_2/js/filter.js

@@ -571 +571 @@
                                         return false;
                                 }else{
-                                        var emailReg = /^[a-z][a-z-_0-9\.]+@[a-z-_=>0-9\.]+\.[a-z]{2,3}$/i
-                                if(emailReg.test(Element("field5").value)){
+                                if(!validateEmail(email)){
                                                 mount_rule += Element("field5").value + "&&";
                                         }else{

branches/2.2/expressoMail1_2/js/main.js

@@ -1653 +1653 @@
                 stringEmail += Element("cco_"+ID).value =='' ? "":", "+Element("cco_"+ID).value;
                 stringEmail += Element("cc_"+ID).value =='' ? "":", "+Element("cc_"+ID).value;
-                var invalidEmail = validateEmail(stringEmail);
+                var invalidEmail = searchEmail(stringEmail);
                 if(Element("to_"+ID).value=="" && Element("cco_"+ID).value=="" && Element("cc_"+ID).value=="") {
                         write_msg(get_lang("message without receiver."));
@@ -2543 +2543 @@
 }
 
-function validateEmail(emailString){
+function searchEmail(emailString){
                 var arrayInvalidEmails = new  Array();
                 arrayInvalidEmails[1] = '';
@@ -2549 +2549 @@
                 var arrayEmailsFull = new Array();
                 arrayEmailsFull = emailString.split(',');
-                var er_Email =  new RegExp("<(.*?)>");
+                var er_Email =  new RegExp("<(.*?)>"); 
+                // TODO Use validateEmail of common functions !
                 var er_ValidaEmail = new RegExp("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$");