[Vtigercrm-commits] [vtiger-commits] r10960 - in /vtigercrm/branches/5.0.3: include/language/en_us.lang.php modules/Users/Forms.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: jerrydgeorge
Date: Tue May 22 07:01:44 2007
New Revision: 10960

Log:
Yahoo Id accepts any mail id. Issue has been fixed

Modified:
    vtigercrm/branches/5.0.3/include/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Users/Forms.php

Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Tue May 22 07:01:44 2007
@@ -183,6 +183,7 @@
 'ERR_CREATING_FIELDS' => 'Error filling in additional detail fields: ',
 'ERR_MISSING_REQUIRED_FIELDS' => 'Missing required fields:',
 'ERR_INVALID_EMAIL_ADDRESS' => 'not a valid email address.',
+'ERR_INVALID_YAHOO_EMAIL_ADDRESS' => 'not a valid yahoo email address.',
 'ERR_INVALID_DATE_FORMAT' => 'The date format must be: yyyy-mm-dd',
 'ERR_INVALID_MONTH' => 'Please enter a valid month.',
 'ERR_INVALID_DAY' => 'Please enter a valid day.',

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 07:01:44 2007
@@ -40,11 +40,12 @@
 $lbl_user_email1 = $mod_strings['LBL_LIST_EMAIL'];
 $err_missing_required_fields = $app_strings['ERR_MISSING_REQUIRED_FIELDS'];
 $err_invalid_email_address = $app_strings['ERR_INVALID_EMAIL_ADDRESS'];
+$err_invalid_yahoo_email_address = $app_strings['ERR_INVALID_YAHOO_EMAIL_ADDRESS'];
 $lbl_user_image=$mod_strings['User Image'];
 $the_emailid = $app_strings['THE_EMAILID'];
 $email_field_is = $app_strings['EMAIL_FILED_IS'].$err_invalid_email_address;
 $other_email_field_is = $app_strings['OTHER_EMAIL_FILED_IS'].$err_invalid_email_address;
-$yahoo_email_field_is = $app_strings['YAHOO_EMAIL_FILED_IS'].$err_invalid_email_address;
+$yahoo_email_field_is = $app_strings['YAHOO_EMAIL_FILED_IS'].$err_invalid_yahoo_email_address;
 
 $the_script  = <<<EOQ
 
@@ -109,10 +110,10 @@
 		form.email2.focus();
 		exit();
 	}
-	if (trim(form.yahoo_id.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.yahoo_id.value)) {
+	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");
 		form.yahoo_id.focus();
-		exit();
+		return false;
 	}