Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r05bb575bbc4f522edda6c5f5b5652fa3ddcf0ae1 -rbffa8b2fb1fb58faf9e15e24aae8f0d58313de3f --- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 05bb575bbc4f522edda6c5f5b5652fa3ddcf0ae1) +++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision bffa8b2fb1fb58faf9e15e24aae8f0d58313de3f) @@ -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 =================================================================== diff -u -r57d113d1ae6a7cc6e755098d871edab63d5324a3 -rbffa8b2fb1fb58faf9e15e24aae8f0d58313de3f --- lams_common/db/sql/insert_lams_unix_config_data.sql (.../insert_lams_unix_config_data.sql) (revision 57d113d1ae6a7cc6e755098d871edab63d5324a3) +++ lams_common/db/sql/insert_lams_unix_config_data.sql (.../insert_lams_unix_config_data.sql) (revision bffa8b2fb1fb58faf9e15e24aae8f0d58313de3f) @@ -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 =================================================================== diff -u -r57d113d1ae6a7cc6e755098d871edab63d5324a3 -rbffa8b2fb1fb58faf9e15e24aae8f0d58313de3f --- lams_common/db/sql/insert_lams_windows_config_data.sql (.../insert_lams_windows_config_data.sql) (revision 57d113d1ae6a7cc6e755098d871edab63d5324a3) +++ lams_common/db/sql/insert_lams_windows_config_data.sql (.../insert_lams_windows_config_data.sql) (revision bffa8b2fb1fb58faf9e15e24aae8f0d58313de3f) @@ -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 =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040027.sql (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040027.sql (revision bffa8b2fb1fb58faf9e15e24aae8f0d58313de3f) @@ -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 =================================================================== diff -u -r606581007abbdaee5483777096f32ffac1c3e3eb -rbffa8b2fb1fb58faf9e15e24aae8f0d58313de3f --- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java (.../ConfigurationKeys.java) (revision 606581007abbdaee5483777096f32ffac1c3e3eb) +++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java (.../ConfigurationKeys.java) (revision bffa8b2fb1fb58faf9e15e24aae8f0d58313de3f) @@ -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 =================================================================== diff -u -rce1b0df55af2e2b79c1fec64c9d639333817539b -rbffa8b2fb1fb58faf9e15e24aae8f0d58313de3f --- lams_common/src/java/org/lamsfoundation/lams/util/ValidationUtil.java (.../ValidationUtil.java) (revision ce1b0df55af2e2b79c1fec64c9d639333817539b) +++ lams_common/src/java/org/lamsfoundation/lams/util/ValidationUtil.java (.../ValidationUtil.java) (revision bffa8b2fb1fb58faf9e15e24aae8f0d58313de3f) @@ -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; } /**