Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.89 -r1.90 --- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties 6 Apr 2014 19:44:54 -0000 1.89 +++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties 18 Apr 2014 21:53:04 -0000 1.90 @@ -501,6 +501,10 @@ error.firstname.invalid.characters =First name contains invalid characters error.lastname.invalid.characters =Last name contains invalid characters error.username.invalid.characters =Username can only contain alphanumeric characters and no spaces +config.header.user.validation =User validation +config.user.validation.username =Enforce username validation (only alphanumeric and hyphen (-), period (.), at sign (@) and single quote (') allowed) +config.user.validation.first.last.name =Enforce first and last name validation (only letters and hypen (-), space ( ) and single quote characters allowed) +config.user.validation.emails =Enforce properly formatted emails #======= End labels: Exported 495 labels for en AU ===== Index: lams_common/db/sql/insert_lams_unix_config_data.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_lams_unix_config_data.sql,v diff -u -r1.69 -r1.70 --- lams_common/db/sql/insert_lams_unix_config_data.sql 26 Jan 2014 14:55:15 -0000 1.69 +++ lams_common/db/sql/insert_lams_unix_config_data.sql 18 Apr 2014 21:53:07 -0000 1.70 @@ -291,3 +291,12 @@ insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('KalturaKDPUiConfId','6308762', 'config.kaltura.kdp.uiconfid', 'config.header.kaltura', 'STRING', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('UserValidationUsername','true', 'config.user.validation.username', 'config.header.user.validation', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('UserValidationFirstLastName','true', 'config.user.validation.first.last.name', 'config.header.user.validation', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('UserValidationEmail','true', 'config.user.validation.emails', 'config.header.user.validation', 'BOOLEAN', 0); Index: lams_common/db/sql/insert_lams_windows_config_data.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_lams_windows_config_data.sql,v diff -u -r1.62 -r1.63 --- lams_common/db/sql/insert_lams_windows_config_data.sql 26 Jan 2014 14:53:43 -0000 1.62 +++ lams_common/db/sql/insert_lams_windows_config_data.sql 18 Apr 2014 21:53:07 -0000 1.63 @@ -291,3 +291,12 @@ insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('KalturaKDPUiConfId','6308762', 'config.kaltura.kdp.uiconfid', 'config.header.kaltura', 'STRING', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('UserValidationUsername','true', 'config.user.validation.username', 'config.header.user.validation', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('UserValidationFirstLastName','true', 'config.user.validation.first.last.name', 'config.header.user.validation', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('UserValidationEmail','true', 'config.user.validation.emails', 'config.header.user.validation', 'BOOLEAN', 0); Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040027.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040027.sql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040027.sql 18 Apr 2014 21:53:07 -0000 1.1 @@ -0,0 +1,16 @@ +SET AUTOCOMMIT = 0; +set FOREIGN_KEY_CHECKS = 0; + +-- LDEV-3219 Adding option to turn validation off for user details +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('UserValidationUsername','true', 'config.user.validation.username', 'config.header.user.validation', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('UserValidationFirstLastName','true', 'config.user.validation.first.last.name', 'config.header.user.validation', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('UserValidationEmail','true', 'config.user.validation.emails', 'config.header.user.validation', 'BOOLEAN', 0); + +COMMIT; +SET AUTOCOMMIT = 1; +set FOREIGN_KEY_CHECKS = 1; Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java,v diff -u -r1.51 -r1.52 --- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java 3 Sep 2013 10:55:36 -0000 1.51 +++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java 18 Apr 2014 21:53:07 -0000 1.52 @@ -269,6 +269,12 @@ public static String KALTURA_KCW_UI_CONF_ID = "KalturaKCWUiConfId"; public static String KALTURA_KDP_UI_CONF_ID = "KalturaKDPUiConfId"; + + public static String USER_VALIDATION_REQUIRED_USERNAME = "UserValidationUsername"; + + public static String USER_VALIDATION_REQUIRED_FIRST_LAST_NAME = "UserValidationFirstLastName"; + + public static String USER_VALIDATION_REQUIRED_EMAIL = "UserValidationEmail"; // LDEV-2747 public static String ENABLE_SERVER_REGISTRATION = "EnableServerRegistration"; Index: lams_common/src/java/org/lamsfoundation/lams/util/ValidationUtil.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/ValidationUtil.java,v diff -u -r1.3 -r1.4 --- lams_common/src/java/org/lamsfoundation/lams/util/ValidationUtil.java 16 Apr 2014 23:57:17 -0000 1.3 +++ lams_common/src/java/org/lamsfoundation/lams/util/ValidationUtil.java 18 Apr 2014 21:53:07 -0000 1.4 @@ -44,8 +44,12 @@ * Checks whether supplied username is valid. Username can only contain alphanumeric characters and no spaces. */ public static boolean isUserNameValid(String userName) { - boolean isUserNameValid = ValidationUtil.isRegexMatches(ValidationUtil.REGEX_USER_NAME, userName); - return isUserNameValid; + + boolean isValidationRequired = Configuration.getAsBoolean(ConfigurationKeys.USER_VALIDATION_REQUIRED_USERNAME); + if (isValidationRequired) { + return ValidationUtil.isRegexMatches(ValidationUtil.REGEX_USER_NAME, userName); + } + return true; } /** @@ -55,17 +59,24 @@ * @return */ public static boolean isFirstLastNameValid(String name) { - - boolean isNameValid = ValidationUtil.isRegexMatches(ValidationUtil.REGEX_FIRST_LAST_NAME, name); - return isNameValid; + + boolean isValidationRequired = Configuration.getAsBoolean(ConfigurationKeys.USER_VALIDATION_REQUIRED_FIRST_LAST_NAME); + if (isValidationRequired) { + return ValidationUtil.isRegexMatches(ValidationUtil.REGEX_FIRST_LAST_NAME, name); + } + return true; } /** * Checks whether supplied email address is valid. */ public static boolean isEmailValid(String email) { - boolean isEmailValid = ValidationUtil.isRegexMatches(ValidationUtil.REGEX_EMAIL, email); - return isEmailValid; + + boolean isValidationRequired = Configuration.getAsBoolean(ConfigurationKeys.USER_VALIDATION_REQUIRED_EMAIL); + if (isValidationRequired) { + return ValidationUtil.isRegexMatches(ValidationUtil.REGEX_EMAIL, email); + } + return true; } /**