Index: lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java
===================================================================
diff -u -rfb993db6ba5defff8a188f0f697f670d332b5351 -rc3144927ac832354eead946816eb784865bbd95f
--- lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java (.../SignupAction.java) (revision fb993db6ba5defff8a188f0f697f670d332b5351)
+++ lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java (.../SignupAction.java) (revision c3144927ac832354eead946816eb784865bbd95f)
@@ -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
===================================================================
diff -u -r5369e7509307c773bb6b39d57550d0ea303482b6 -rc3144927ac832354eead946816eb784865bbd95f
--- lams_central/web/passwordChangeContent.jsp (.../passwordChangeContent.jsp) (revision 5369e7509307c773bb6b39d57550d0ea303482b6)
+++ lams_central/web/passwordChangeContent.jsp (.../passwordChangeContent.jsp) (revision c3144927ac832354eead946816eb784865bbd95f)
@@ -97,7 +97,7 @@
-
+
+
Index: lams_central/web/signup/loginTab.jsp
===================================================================
diff -u -r8c57090d8d02a92b5c688c941c2705eb84344176 -rc3144927ac832354eead946816eb784865bbd95f
--- lams_central/web/signup/loginTab.jsp (.../loginTab.jsp) (revision 8c57090d8d02a92b5c688c941c2705eb84344176)
+++ lams_central/web/signup/loginTab.jsp (.../loginTab.jsp) (revision c3144927ac832354eead946816eb784865bbd95f)
@@ -1,6 +1,7 @@
-
-
+
+
Index: lams_central/web/signup/singupTab.jsp
===================================================================
diff -u -rbd30f5a8e78ff709fc1b5d0211424030ecc26753 -rc3144927ac832354eead946816eb784865bbd95f
--- lams_central/web/signup/singupTab.jsp (.../singupTab.jsp) (revision bd30f5a8e78ff709fc1b5d0211424030ecc26753)
+++ lams_central/web/signup/singupTab.jsp (.../singupTab.jsp) (revision c3144927ac832354eead946816eb784865bbd95f)
@@ -145,8 +145,10 @@
});
-
+
+
-
+