Changeset 3227 for branches/2.2/expressoMail1_2/js/main.js

Timestamp:

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

Author:

amuller

Message:

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

File:

• branches/2.2/expressoMail1_2/js/main.js (modified) (3 diffs)

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})$");