[Vtigercrm-commits] [vtiger-commits] r10863 - in /vtigercrm/branches/5.0.3: Smarty/templates/UserEditView.tpl include/js/en_us.lang.js include/js/general.js

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Fri May 11 06:59:51 2007
New Revision: 10863

Log:
* Fixed the issue in user name validation, now we can enter - and _ in username, Fixed #3726

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl
    vtigercrm/branches/5.0.3/include/js/en_us.lang.js
    vtigercrm/branches/5.0.3/include/js/general.js

Modified: vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl Fri May 11 06:59:51 2007
@@ -50,7 +50,7 @@
         );
 	{rdelim}
 	else
-            alert(alert_arr.NO_SPECIAL+" in User Name ")
+            alert(alert_arr.NO_SPECIAL+alert_arr.IN_USERNAME)
 {rdelim}
 
 </script>

Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js
==============================================================================
--- vtigercrm/branches/5.0.3/include/js/en_us.lang.js (original)
+++ vtigercrm/branches/5.0.3/include/js/en_us.lang.js Fri May 11 06:59:51 2007
@@ -124,6 +124,7 @@
                                 DATE_SHOULDNOT_PAST :'Current date & time for Activities with status as Planned',
                                 TIME_SHOULDNOT_PAST :'Current Time for Activities with status as Planned',
 				LBL_AND : 'And',
-				LBL_ENTER_VALID_PORT: 'Please enter valid port number'
+				LBL_ENTER_VALID_PORT: 'Please enter valid port number',
+				IN_USERNAME :' in Username '
 
                        };

Modified: vtigercrm/branches/5.0.3/include/js/general.js
==============================================================================
--- vtigercrm/branches/5.0.3/include/js/general.js (original)
+++ vtigercrm/branches/5.0.3/include/js/general.js Fri May 11 06:59:51 2007
@@ -2066,11 +2066,11 @@
 {
 	if(type == 'name')
 	{
-		return (((c >= 'a') && (c <= 'z')) ||((c >= 'A') && (c <= 'Z')) ||((c >= '0') && (c <= '9')) || (c == '.'));
+		return (((c >= 'a') && (c <= 'z')) ||((c >= 'A') && (c <= 'Z')) ||((c >= '0') && (c <= '9')) || (c == '.') || (c == '_') || (c == '-') );
 	}
 	else if(type == 'namespace')
 	{
-		return (((c >= 'a') && (c <= 'z')) ||((c >= 'A') && (c <= 'Z')) ||((c >= '0') && (c <= '9')) || (c == '.')||(c==' '));
+		return (((c >= 'a') && (c <= 'z')) ||((c >= 'A') && (c <= 'Z')) ||((c >= '0') && (c <= '9')) || (c == '.')||(c==' ') || (c == '_') || (c == '-') );
 	}
 }