Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/login
In directory
james.mmbase.org:/tmp/cvs-serv24145/src/java/com/finalist/cmsc/login
Modified Files:
Tag: b1_5
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.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- ConfirmAction.java 27 Nov 2008 08:31:13 -0000 1.1.2.4
+++ ConfirmAction.java 28 Nov 2008 11:57:46 -0000 1.1.2.5
@@ -15,6 +15,7 @@
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.sitemanagement.SiteManagement;
import com.finalist.cmsc.util.HttpUtil;
public class ConfirmAction extends Action{
@@ -22,19 +23,25 @@
public ActionForward execute(ActionMapping actionMapping, ActionForm
actionForm,
HttpServletRequest httpServletRequest, HttpServletResponse
httpServletResponse) throws Exception {
- String emailAddress = httpServletRequest.getParameter("s");
- String returnUrl = httpServletRequest.getParameter("url");
- Encode encoder = new org.mmbase.util.Encode("BASE64");
- emailAddress = encoder.decode(emailAddress);
+ String authId = httpServletRequest.getParameter("s");
+ String pageNumber = httpServletRequest.getParameter("pn");
+ String name = httpServletRequest.getParameter("nm");
+ String returnUrl = "";
+ //emailAddress = encoder.decode(emailAddress);
+// emailAddress = encoder.decode(emailAddress);
String target = "failure";
- if (StringUtils.isNotBlank(returnUrl)) {
- returnUrl = encoder.decode(returnUrl);
- }
+// if (StringUtils.isNotBlank(returnUrl)) {
+// returnUrl = encoder.decode(returnUrl);
+// }
// Cloud cloud = getCloudForAnonymousUpdate(false);
- if (emailAddress != null) {
- AuthenticationService authenticationService =
(AuthenticationService)ApplicationContextFactory.getBean("authenticationService");
+ if (StringUtils.isBlank(pageNumber)) {
+ throw new NullPointerException("The page number is null");
+ }
+ returnUrl = SiteManagement.getPath(Integer.parseInt(pageNumber), true);
+ returnUrl +=
"/_rp_".concat(name).concat("_").concat("active").concat("/1_");
+ if (authId != null) {
PersonService personService =
(PersonService)ApplicationContextFactory.getBean("personService");
- Long authenticationId =
authenticationService.getAuthenticationIdForUserId(emailAddress);
+ Long authenticationId =Long.parseLong(authId);
if(authenticationId > 0) {
Person person =
personService.getPersonByAuthenticationId(authenticationId);
if(person != null) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
