Index: lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java,v
diff -u -r1.6.2.7 -r1.6.2.8
--- lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java 23 Nov 2016 01:56:17 -0000 1.6.2.7
+++ lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java 30 Nov 2016 02:07:38 -0000 1.6.2.8
@@ -220,12 +220,16 @@
String login = signupForm.getString("usernameTab2");
String password = signupForm.getString("passwordTab2");
User user = SignupAction.signupService.getUserByLogin(login);
- String passwordHash = user.getPassword().length() == HashUtil.SHA1_HEX_LENGTH ? HashUtil.sha1(password)
- : HashUtil.sha256(password, user.getSalt());
-
- if ((user == null) || !user.getPassword().equals(passwordHash)) {
+ if ( user == null ) {
errors.add("usernameTab2", new ActionMessage("error.login.or.password.incorrect",
"", ""));
+ } else {
+ String passwordHash = user.getPassword().length() == HashUtil.SHA1_HEX_LENGTH ? HashUtil.sha1(password)
+ : HashUtil.sha256(password, user.getSalt());
+ if (!user.getPassword().equals(passwordHash)) {
+ errors.add("usernameTab2", new ActionMessage("error.login.or.password.incorrect",
+ "", ""));
+ }
}
}
Index: lams_central/web/passwordChangeContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/passwordChangeContent.jsp,v
diff -u -r1.10.12.9 -r1.10.12.10
--- lams_central/web/passwordChangeContent.jsp 25 Nov 2016 03:33:08 -0000 1.10.12.9
+++ lams_central/web/passwordChangeContent.jsp 30 Nov 2016 02:07:38 -0000 1.10.12.10
@@ -97,7 +97,7 @@
-
+
+
Index: lams_central/web/signup/loginTab.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/signup/loginTab.jsp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_central/web/signup/loginTab.jsp 2 Nov 2016 08:57:56 -0000 1.1.2.2
+++ lams_central/web/signup/loginTab.jsp 30 Nov 2016 02:07:38 -0000 1.1.2.3
@@ -1,6 +1,7 @@
-
-
+
+
Index: lams_central/web/signup/singupTab.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/signup/singupTab.jsp,v
diff -u -r1.3.2.7 -r1.3.2.8
--- lams_central/web/signup/singupTab.jsp 25 Nov 2016 03:40:31 -0000 1.3.2.7
+++ lams_central/web/signup/singupTab.jsp 30 Nov 2016 02:07:38 -0000 1.3.2.8
@@ -145,8 +145,10 @@
});
-
+
+
-
+