Author: raintang
Date: 2009-05-14 08:59:00 +0200 (Thu, 14 May 2009)
New Revision: 35154
Removed:
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/ChangeMyprofileInforAction.java
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/ChangeMyprofileInforForm.java
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/ChangeMyprofileInitAction.java
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/ChangePasswordAction.java
Log:
CMSC-596 More functionality in My Profile: change name, mail address,
notifications
Deleted:
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/ChangeMyprofileInforAction.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/ChangeMyprofileInforAction.java
2009-05-14 06:54:58 UTC (rev 35153)
+++
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/ChangeMyprofileInforAction.java
2009-05-14 06:59:00 UTC (rev 35154)
@@ -1,67 +0,0 @@
-package com.finalist.cmsc.security.forms;
-
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionForm;
-import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Node;
-import org.mmbase.util.logging.Logger;
-import org.mmbase.util.logging.Logging;
-
-import com.finalist.cmsc.security.SecurityUtil;
-import com.finalist.cmsc.struts.MMBaseAction;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * ChangePasswordAction
- *
- * @author Nico Klasens
- */
-public class ChangeMyprofileInforAction extends MMBaseAction {
-
- /** MMbase logging system */
- private static final Logger log =
Logging.getLoggerInstance(ChangeMyprofileInforAction.class.getName());
-
-
- /**
- * @see
org.apache.struts.action.Action#execute(org.apache.struts.action.ActionMapping,
- * org.apache.struts.action.ActionForm,
- * javax.servlet.http.HttpServletRequest,
- * javax.servlet.http.HttpServletResponse)
- */
- @Override
- public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
- HttpServletResponse response, Cloud cloud) throws Exception {
-
- if (!isCancelled(request)) {
- // Make sure we have the logged in user and not a user from a
- // cloudprovider
- Cloud userCloud = getCloudFromSession(request);
-
- log.debug("ChangePasswordAction - doPerform()");
- if (!isCancelled(request)) {
- ChangeMyprofileInforForm changeMyprofileInforForm =
(ChangeMyprofileInforForm) form;
- Node userNode = SecurityUtil.getUserNode(userCloud);
- userNode.setStringValue("username",
changeMyprofileInforForm.getUsername());
- userNode.setStringValue("password",
changeMyprofileInforForm.getNewpassword());
- userNode.setStringValue("firstname",
changeMyprofileInforForm.getFirstname());
- userNode.setStringValue("prefix",
changeMyprofileInforForm.getPrefix());
- userNode.setStringValue("surname",
changeMyprofileInforForm.getSurname());
- userNode.setStringValue("company",
changeMyprofileInforForm.getCompany());
- userNode.setStringValue("department",
changeMyprofileInforForm.getDepartment());
- userNode.setBooleanValue("emailsignal",
changeMyprofileInforForm.isEmailSignal());
- userNode.setStringValue("emailaddress",
changeMyprofileInforForm.getEmail());
- userNode.commit();
- }
- ActionForward af = mapping.findForward(SUCCESS);
- af = new ActionForward(af.getPath() + "?succeeded=true");
- return af;
- }
- else {
- return mapping.findForward("cancel");
- }
- }
-
-}
\ No newline at end of file
Deleted:
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/ChangeMyprofileInforForm.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/ChangeMyprofileInforForm.java
2009-05-14 06:54:58 UTC (rev 35153)
+++
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/ChangeMyprofileInforForm.java
2009-05-14 06:59:00 UTC (rev 35154)
@@ -1,184 +0,0 @@
-package com.finalist.cmsc.security.forms;
-
-import java.util.HashMap;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.struts.action.*;
-import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.ContextProvider;
-
-import com.finalist.cmsc.struts.MMBaseAction;
-
-/**
- * Form bean for the ChangePasswordForm page.
- *
- * @author Nico Klasens
- */
-...@suppresswarnings("serial")
-public class ChangeMyprofileInforForm extends ActionForm {
-
- private String username;
- private String password1;
- private String newpassword;
- private String confirmnewpassword;
- private String firstname;
- private String prefix;
- private String surname;
-
- private String email;
- private String company;
- 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"));
- }
- 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;
- }
-}
\ No newline at end of file
Deleted:
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/ChangeMyprofileInitAction.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/ChangeMyprofileInitAction.java
2009-05-14 06:54:58 UTC (rev 35153)
+++
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/ChangeMyprofileInitAction.java
2009-05-14 06:59:00 UTC (rev 35154)
@@ -1,36 +0,0 @@
-package com.finalist.cmsc.security.forms;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Node;
-
-import com.finalist.cmsc.security.SecurityUtil;
-import com.finalist.cmsc.struts.MMBaseAction;
-
-/**
- * @author Nico Klasens
- */
-public class ChangeMyprofileInitAction extends MMBaseAction {
-
- @Override
- public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
- HttpServletResponse response, Cloud cloud) throws Exception {
- Cloud userCloud = getCloudFromSession(request);
- Node node = SecurityUtil.getUserNode(userCloud);
- ChangeMyprofileInforForm changeMyprofileInforForm =
(ChangeMyprofileInforForm) form;
- changeMyprofileInforForm.setUsername(node.getStringValue("username"));
- changeMyprofileInforForm.setSurname(node.getStringValue("surname"));
- changeMyprofileInforForm.setFirstname(node.getStringValue("firstname"));
- changeMyprofileInforForm.setPrefix(node.getStringValue("prefix"));
- changeMyprofileInforForm.setCompany(node.getStringValue("company"));
-
changeMyprofileInforForm.setDepartment(node.getStringValue("department"));
- changeMyprofileInforForm.setEmail(node.getStringValue("emailaddress"));
-
changeMyprofileInforForm.setEmailSignal(node.getBooleanValue("emailsignal"));
- return mapping.findForward(SUCCESS);
- }
-}
\ No newline at end of file
Deleted:
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/ChangePasswordAction.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/ChangePasswordAction.java
2009-05-14 06:54:58 UTC (rev 35153)
+++
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/ChangePasswordAction.java
2009-05-14 06:59:00 UTC (rev 35154)
@@ -1,59 +0,0 @@
-package com.finalist.cmsc.security.forms;
-
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionForm;
-import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Node;
-import org.mmbase.util.logging.Logger;
-import org.mmbase.util.logging.Logging;
-
-import com.finalist.cmsc.security.SecurityUtil;
-import com.finalist.cmsc.struts.MMBaseAction;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * ChangePasswordAction
- *
- * @author Nico Klasens
- */
-public class ChangePasswordAction extends MMBaseAction {
-
- /** MMbase logging system */
- private static final Logger log =
Logging.getLoggerInstance(ChangePasswordAction.class.getName());
-
-
- /**
- * @see
org.apache.struts.action.Action#execute(org.apache.struts.action.ActionMapping,
- * org.apache.struts.action.ActionForm,
- * javax.servlet.http.HttpServletRequest,
- * javax.servlet.http.HttpServletResponse)
- */
- @Override
- public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
- HttpServletResponse response, Cloud cloud) throws Exception {
-
- if (!isCancelled(request)) {
- // Make sure we have the logged in user and not a user from a
- // cloudprovider
- Cloud userCloud = getCloudFromSession(request);
-
- log.debug("ChangePasswordAction - doPerform()");
- if (!isCancelled(request)) {
- ChangePasswordForm changePasswordForm = (ChangePasswordForm) form;
- Node userNode = SecurityUtil.getUserNode(userCloud);
- String newpassword = changePasswordForm.getNewpassword();
- SecurityUtil.changePassword(userNode, newpassword);
- }
- ActionForward af = mapping.findForward(SUCCESS);
- af = new ActionForward(af.getPath() + "?succeeded=true");
- return af;
- }
- else {
- return mapping.findForward("cancel");
- }
- }
-
-}
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
