[Vtigercrm-commits] [vtiger-commits] r10964 - /vtigercrm/branches/5.0.3/modules/Users/Forms.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: jerrydgeorge
Date: Tue May 22 08:03:08 2007
New Revision: 10964

Log:
Email validation in new user creation has been fixed

Modified:
    vtigercrm/branches/5.0.3/modules/Users/Forms.php

Modified: vtigercrm/branches/5.0.3/modules/Users/Forms.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/Forms.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/Forms.php Tue May 22 08:03:08 2007
@@ -103,12 +103,12 @@
 	if (trim(form.email1.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.email1.value)) {
 		alert("$the_emailid"+form.email1.value+"$email_field_is");
 		form.email1.focus();
-		exit();
+		return false;
 	}
 	if (trim(form.email2.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.email2.value)) {
-		alert("$the_emailid"+form.email1.value+"$other_email_field_is");
+		alert("$the_emailid"+form.email2.value+"$other_email_field_is");
 		form.email2.focus();
-		exit();
+		return false;
 	}
 	if (trim(form.yahoo_id.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.yahoo_id.value) || (!(form.yahoo_id.value.indexOf('yahoo') > -1))) {
 		alert("$the_emailid"+form.yahoo_id.value+"$yahoo_email_field_is");