Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/login
In directory
james.mmbase.org:/tmp/cvs-serv26722/src/java/com/finalist/cmsc/login
Modified Files:
ConfirmAction.java
Log Message:
CMSC-948 Registration portlet for CMS container
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/login
See also: http://www.mmbase.org/jira/browse/CMSC-948
Index: ConfirmAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/login/ConfirmAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ConfirmAction.java 6 Nov 2008 07:21:44 -0000 1.1
+++ ConfirmAction.java 7 Nov 2008 06:56:27 -0000 1.2
@@ -3,13 +3,11 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
-
+import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.Action;
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.util.Encode;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
@@ -19,7 +17,6 @@
import com.finalist.cmsc.services.community.person.PersonService;
import com.finalist.cmsc.services.community.person.RegisterStatus;
import com.finalist.cmsc.services.community.security.AuthenticationService;
-import com.finalist.cmsc.services.publish.Publish;
import com.finalist.cmsc.util.HttpUtil;
public class ConfirmAction extends Action{
@@ -29,10 +26,13 @@
HttpServletRequest httpServletRequest, HttpServletResponse
httpServletResponse) throws Exception {
String emailAddress = httpServletRequest.getParameter("s");
+ String returnUrl = httpServletRequest.getParameter("returnurl");
Encode encoder = new org.mmbase.util.Encode("BASE64");
emailAddress = encoder.decode(emailAddress);
-
- String returnUrl = "";
+ String target = "failure";
+ if (StringUtils.isNotBlank(returnUrl)) {
+ returnUrl = encoder.decode(returnUrl);
+ }
// Cloud cloud = getCloudForAnonymousUpdate(false);
if (emailAddress != null) {
AuthenticationService authenticationService =
(AuthenticationService)ApplicationContextFactory.getBean("authenticationService");
@@ -41,16 +41,18 @@
if(authenticationId > 0) {
Person person =
personService.getPersonByAuthenticationId(authenticationId);
if(person != null) {
+ if (person.getActive().equals(RegisterStatus.ACTIVE.getName()))
{
+ target = "actived";
+ }
+ else {
person.setActive(RegisterStatus.ACTIVE.getName());
personService.updatePerson(person);
+ target = "success";
}
}
}
-
-// if (returnUrl == null) {
-// Node page404 = SearchUtil.findNode(cloud, "page", "urlfragment",
"404");
-// returnUrl = "/content/" + page404.getNumber();
-// }
+ }
+ returnUrl += target;
returnUrl = HttpUtil.getWebappUri(httpServletRequest) + returnUrl;
httpServletResponse.sendRedirect(httpServletResponse.encodeRedirectURL(returnUrl));
return null;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
