Index: lams_central/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -rfb993db6ba5defff8a188f0f697f670d332b5351 -r5369e7509307c773bb6b39d57550d0ea303482b6 --- lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision fb993db6ba5defff8a188f0f697f670d332b5351) +++ lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 5369e7509307c773bb6b39d57550d0ea303482b6) @@ -697,6 +697,7 @@ label.password.restrictions =Password must follow the restrictions shown above label.password.must.contain =Password must contain label.password.must.ucase =at least 1 upper case letter +label.password.must.lcase =at least 1 lower case letter label.password.must.number=at least 1 number label.password.must.symbol =at least 1 symbol label.email.send.me.a.copy=Send me a copy Index: lams_central/web/forgotPasswordChange.jsp =================================================================== diff -u -r970546106e9b05a4d1a507b26be2ce96130b4f01 -r5369e7509307c773bb6b39d57550d0ea303482b6 --- lams_central/web/forgotPasswordChange.jsp (.../forgotPasswordChange.jsp) (revision 970546106e9b05a4d1a507b26be2ce96130b4f01) +++ lams_central/web/forgotPasswordChange.jsp (.../forgotPasswordChange.jsp) (revision 5369e7509307c773bb6b39d57550d0ea303482b6) @@ -12,6 +12,7 @@ <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_MINIMUM_CHARACTERS)%> <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_UPPERCASE)%> +<%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_LOWERCASE)%> <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_NUMERICS)%> <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%> @@ -35,18 +36,18 @@ window.location = "index.do"; }; - $.validator.addMethod("pwcheck", function(value) { - return /[a-z]/.test(value) // has a lowercase letter - && /[A-Z]/.test(value) // has uppercase letters - - && /\d/.test(value) // has a digit - - - && /[`~!@#$%^&*\(\)_\-+={}\[\]\\|:\;\"\'\<\>,.?\/]/ - .test(value) //has symbols - - }); + var mustHaveUppercase = ${mustHaveUppercase}, + mustHaveNumerics = ${mustHaveNumerics}, + mustHaveLowercase = ${mustHaveLowercase}, + mustHaveSymbols = ${mustHaveSymbols}; + $.validator.addMethod("pwcheck", function(value) { + return (!mustHaveUppercase || /[A-Z]/.test(value)) && // has uppercase letters + (!mustHaveNumerics || /\d/.test(value)) && // has a digit + (!mustHaveLowercase || /[a-z]/.test(value)) && // has a lower case + (!mustHaveSymbols || /[`~!@#$%^&*\(\)_\-+={}\[\]\\|:\;\"\'\<\>,.?\/]/.test(value)); //has symbols + }); + $.validator .addMethod( "charactersAllowed", @@ -132,6 +133,10 @@
  • + +
  • +
  • Index: lams_central/web/passwordChangeContent.jsp =================================================================== diff -u -rf290dd48e471facda515082e1436faa2235143f2 -r5369e7509307c773bb6b39d57550d0ea303482b6 --- lams_central/web/passwordChangeContent.jsp (.../passwordChangeContent.jsp) (revision f290dd48e471facda515082e1436faa2235143f2) +++ lams_central/web/passwordChangeContent.jsp (.../passwordChangeContent.jsp) (revision 5369e7509307c773bb6b39d57550d0ea303482b6) @@ -13,6 +13,7 @@ <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_MINIMUM_CHARACTERS)%> <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_UPPERCASE)%> +<%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_LOWERCASE)%> <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_NUMERICS)%> <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%> @@ -25,18 +26,17 @@ @@ -23,21 +25,27 @@