Update of /var/cvs/contributions/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms In directory james.mmbase.org:/tmp/cvs-serv28724/cmsc/security/src/java/com/finalist/cmsc/security/forms
Modified Files: ChangePasswordForm.java Log Message: CMSC-570 Password Manager fills in password text at input field See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms See also: http://www.mmbase.org/jira/browse/CMSC-570 Index: ChangePasswordForm.java =================================================================== RCS file: /var/cvs/contributions/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/ChangePasswordForm.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- ChangePasswordForm.java 26 Nov 2007 11:43:43 -0000 1.4 +++ ChangePasswordForm.java 28 Jan 2008 22:11:19 -0000 1.5 @@ -18,7 +18,7 @@ @SuppressWarnings("serial") public class ChangePasswordForm extends ActionForm { - private String password; + private String password1; private String newpassword; private String confirmnewpassword; @@ -27,8 +27,8 @@ public ActionErrors validate(ActionMapping mapping, HttpServletRequest request) { ActionErrors errors = new ActionErrors(); - if (getPassword() == null || getPassword().trim().length() == 0) { - errors.add("password", new ActionMessage("error.password.incorrect")); + if (getPassword1() == null || getPassword1().trim().length() == 0) { + errors.add("password1", new ActionMessage("error.password.incorrect")); } if (getNewpassword() == null || getNewpassword().trim().length() < 5 || getNewpassword().trim().length() > 15) { errors.add("newpassword", new ActionMessage("error.password.invalid")); @@ -41,7 +41,7 @@ errors.add("newpassword", new ActionMessage("error.password.nomatch")); } if (errors.size() == 0) { - if (getPassword().equals(getNewpassword())) { + if (getPassword1().equals(getNewpassword())) { errors.add("newpassword", new ActionMessage("error.newpassword.incorrect")); } else { @@ -49,12 +49,12 @@ Cloud cloud = MMBaseAction.getCloudFromSession(request); HashMap<String, String> user = new HashMap<String, String>(); user.put("username", cloud.getUser().getIdentifier()); - user.put("password", password); + user.put("password", password1); ContextProvider.getCloudContext(ContextProvider.getDefaultCloudContextName()).getCloud("mmbase", "name/password", user); } catch (java.lang.SecurityException se) { - errors.add("password", new ActionMessage("error.password.incorrect")); + errors.add("password1", new ActionMessage("error.password.incorrect")); } } @@ -63,13 +63,13 @@ } - public String getPassword() { - return password; + public String getPassword1() { + return password1; } - public void setPassword(String password) { - this.password = password; + public void setPassword1(String password) { + this.password1 = password; } _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs