Author: raintang
Date: 2009-05-15 10:16:27 +0200 (Fri, 15 May 2009)
New Revision: 35179
Modified:
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/ChangeProfileInforAction.java
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/ChangeProfileInforForm.java
Log:
CMSC-596 More functionality in My Profile: change name, mail address,
notifications
Modified:
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/ChangeProfileInforAction.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/ChangeProfileInforAction.java
2009-05-15 08:05:12 UTC (rev 35178)
+++
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/ChangeProfileInforAction.java
2009-05-15 08:16:27 UTC (rev 35179)
@@ -24,11 +24,9 @@
/** MMbase logging system */
private static final Logger log =
Logging.getLoggerInstance(ChangeProfileInforAction.class.getName());
-
/**
* @see
org.apache.struts.action.Action#execute(org.apache.struts.action.ActionMapping,
- * org.apache.struts.action.ActionForm,
- * javax.servlet.http.HttpServletRequest,
+ * org.apache.struts.action.ActionForm,
javax.servlet.http.HttpServletRequest,
* javax.servlet.http.HttpServletResponse)
*/
@Override
@@ -45,7 +43,9 @@
ChangeProfileInforForm changeMyprofileInforForm =
(ChangeProfileInforForm) form;
Node userNode = SecurityUtil.getUserNode(userCloud);
userNode.setStringValue("username",
changeMyprofileInforForm.getUsername());
- userNode.setStringValue("password",
changeMyprofileInforForm.getNewpassword());
+ if (changeMyprofileInforForm.getNewpassword().trim().length() !=
0) {
+ userNode.setStringValue("password",
changeMyprofileInforForm.getNewpassword());
+ }
userNode.setStringValue("firstname",
changeMyprofileInforForm.getFirstname());
userNode.setStringValue("prefix",
changeMyprofileInforForm.getPrefix());
userNode.setStringValue("surname",
changeMyprofileInforForm.getSurname());
@@ -58,8 +58,7 @@
ActionForward af = mapping.findForward(SUCCESS);
af = new ActionForward(af.getPath() + "?succeeded=true");
return af;
- }
- else {
+ } else {
return mapping.findForward("cancel");
}
}
Modified:
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/ChangeProfileInforForm.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/ChangeProfileInforForm.java
2009-05-15 08:05:12 UTC (rev 35178)
+++
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/ChangeProfileInforForm.java
2009-05-15 08:16:27 UTC (rev 35179)
@@ -31,153 +31,132 @@
private String department;
private boolean emailSignal;
-
-
@Override
public ActionErrors validate(ActionMapping mapping, HttpServletRequest
request) {
ActionErrors errors = new ActionErrors();
- 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"));
- }
- if (getConfirmnewpassword() == null ||
getConfirmnewpassword().trim().length() < 5
- || getConfirmnewpassword().trim().length() > 15) {
- errors.add("confirmnewpassword", new
ActionMessage("error.password.invalid"));
- }
- if (!getConfirmnewpassword().equals(getNewpassword())) {
- errors.add("newpassword", new
ActionMessage("error.password.nomatch"));
- }
- if (errors.size() == 0) {
- if (getPassword1().equals(getNewpassword())) {
- errors.add("newpassword", new
ActionMessage("error.newpassword.incorrect"));
+ if ((getPassword1() == null || getPassword1().trim().length() == 0)
+ && (getNewpassword() == null || getNewpassword().trim().length()
== 0)
+ && (getNewpassword() == null || getNewpassword().trim().length()
== 0)) {
+ } else {
+ if (getPassword1() == null || getPassword1().trim().length() == 0) {
+ errors.add("password1", new
ActionMessage("error.password.incorrect"));
}
- else {
- try {
- Cloud cloud = MMBaseAction.getCloudFromSession(request);
- HashMap<String, String> user = new HashMap<String, String>();
- user.put("username", cloud.getUser().getIdentifier());
- user.put("password", password1);
-
ContextProvider.getCloudContext(ContextProvider.getDefaultCloudContextName()).getCloud("mmbase",
- "name/password", user);
- }
- catch (java.lang.SecurityException se) {
- 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"));
}
+ if (getConfirmnewpassword() == null ||
getConfirmnewpassword().trim().length() < 5
+ || getConfirmnewpassword().trim().length() > 15) {
+ errors.add("confirmnewpassword", new
ActionMessage("error.password.invalid"));
+ }
+ if (!getConfirmnewpassword().equals(getNewpassword())) {
+ errors.add("newpassword", new
ActionMessage("error.password.nomatch"));
+ }
+ if (errors.size() == 0) {
+ if (getPassword1().equals(getNewpassword())) {
+ errors.add("newpassword", new
ActionMessage("error.newpassword.incorrect"));
+ } else {
+ try {
+ Cloud cloud = MMBaseAction.getCloudFromSession(request);
+ HashMap<String, String> user = new HashMap<String, String>();
+ user.put("username", cloud.getUser().getIdentifier());
+ user.put("password", password1);
+
ContextProvider.getCloudContext(ContextProvider.getDefaultCloudContextName()).getCloud("mmbase",
+ "name/password", user);
+ } catch (java.lang.SecurityException se) {
+ errors.add("password1", new
ActionMessage("error.password.incorrect"));
+ }
+ }
+ }
}
return errors;
}
-
public String getPassword1() {
return password1;
}
-
public void setPassword1(String password) {
this.password1 = password;
}
-
public String getNewpassword() {
return newpassword;
}
-
public void setNewpassword(String newpassword) {
this.newpassword = newpassword;
}
-
public String getConfirmnewpassword() {
return confirmnewpassword;
}
-
public void setConfirmnewpassword(String confirmnewpassword) {
this.confirmnewpassword = confirmnewpassword;
}
-
public void setFirstname(String firstname) {
this.firstname = firstname;
}
-
public String getFirstname() {
return firstname;
}
-
public void setPrefix(String prefix) {
this.prefix = prefix;
}
-
public String getPrefix() {
return prefix;
}
-
public void setSurname(String surname) {
this.surname = surname;
}
-
public String getSurname() {
return surname;
}
-
public void setEmail(String email) {
this.email = email;
}
-
public String getEmail() {
return email;
}
-
public void setCompany(String company) {
this.company = company;
}
-
public String getCompany() {
return company;
}
-
public void setDepartment(String department) {
this.department = department;
}
-
public String getDepartment() {
return department;
}
-
public void setEmailSignal(boolean emailSignal) {
this.emailSignal = emailSignal;
}
-
public boolean isEmailSignal() {
return emailSignal;
}
-
public void setUsername(String username) {
this.username = username;
}
-
public String getUsername() {
return username;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
