litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revise the changes on r8934, which affected the default message for bogus requests, instead of just requests to set passwords on non-existent accounts.

Browse source
This commit is contained in:
j2blake 2011-09-13 19:33:41 +00:00
parent 2d4d5feb8e
commit 2f9bb4d460
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsPasswordBasePage.java
View file

@ -24,6 +24,8 @@ public abstract class UserAccountsPasswordBasePage extends UserAccountsPage {
private static final Log log = LogFactory
.getLog(UserAccountsPasswordBasePage.class);
public static final String BOGUS_MESSAGE_NO_SUCH_ACCOUNT = "The account you are trying to set a password on is no longer available. Please contact your system administrator if you think this is an error.";
private static final String PARAMETER_SUBMIT = "submit";
private static final String PARAMETER_USER = "user";
private static final String PARAMETER_KEY = "key";
@ -76,7 +78,7 @@ public abstract class UserAccountsPasswordBasePage extends UserAccountsPage {
if (userAccount == null) {
log.warn("Password request for '" + userEmail
+ "' is bogus: no such user");
bogusMessage = BOGUS_STANDARD_MESSAGE;
bogusMessage = BOGUS_MESSAGE_NO_SUCH_ACCOUNT;
return;
}
@ -98,7 +100,7 @@ public abstract class UserAccountsPasswordBasePage extends UserAccountsPage {
if (expirationDate.before(new Date())) {
log.info("Password request for '" + userEmail
+ "' is bogus: expiration date has passed.");
bogusMessage = BOGUS_STANDARD_MESSAGE;
bogusMessage = passwordChangeNotPendingMessage();
return;
}
@ -107,7 +109,7 @@ public abstract class UserAccountsPasswordBasePage extends UserAccountsPage {
log.warn("Password request for '" + userEmail + "' is bogus: key ("
+ key + ") doesn't match expected key (" + expectedKey
+ ")");
bogusMessage = BOGUS_STANDARD_MESSAGE;
bogusMessage = passwordChangeNotPendingMessage();
return;
}
}

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsUserController.java
View file

@ -25,7 +25,7 @@ public class UserAccountsUserController extends FreemarkerHttpServlet {
private static final Log log = LogFactory
.getLog(UserAccountsUserController.class);
public static final String BOGUS_STANDARD_MESSAGE = "The account you are trying to set a password on is no longer available. Please contact your system administrator if you think this is an error.";
public static final String BOGUS_STANDARD_MESSAGE = "Request failed. Please contact your system administrator.";
private static final String ACTION_CREATE_PASSWORD = "/createPassword";
private static final String ACTION_RESET_PASSWORD = "/resetPassword";