Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.138.2.33 -r1.138.2.34
--- lams_central/conf/language/lams/ApplicationResources.properties 23 Nov 2016 01:56:16 -0000 1.138.2.33
+++ lams_central/conf/language/lams/ApplicationResources.properties 25 Nov 2016 03:37:00 -0000 1.138.2.34
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/forgotPasswordChange.jsp,v
diff -u -r1.5.2.6 -r1.5.2.7
--- lams_central/web/forgotPasswordChange.jsp 31 Oct 2016 16:16:34 -0000 1.5.2.6
+++ lams_central/web/forgotPasswordChange.jsp 25 Nov 2016 03:33:25 -0000 1.5.2.7
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/passwordChangeContent.jsp,v
diff -u -r1.10.12.8 -r1.10.12.9
--- lams_central/web/passwordChangeContent.jsp 7 Nov 2016 09:32:08 -0000 1.10.12.8
+++ lams_central/web/passwordChangeContent.jsp 25 Nov 2016 03:33:08 -0000 1.10.12.9
@@ -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 @@