Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/login
In directory
james.mmbase.org:/tmp/cvs-serv26879/src/java/com/finalist/cmsc/login
Modified Files:
Tag: b1_5
ConfirmAction.java RegisterCleanCronJob.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.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- ConfirmAction.java 6 Nov 2008 08:40:08 -0000 1.1.2.1
+++ ConfirmAction.java 7 Nov 2008 07:02:38 -0000 1.1.2.2
@@ -3,6 +3,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -25,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");
@@ -37,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;
Index: RegisterCleanCronJob.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/login/RegisterCleanCronJob.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- RegisterCleanCronJob.java 7 Nov 2008 01:56:23 -0000 1.1.2.2
+++ RegisterCleanCronJob.java 7 Nov 2008 07:02:38 -0000 1.1.2.3
@@ -30,11 +30,10 @@
Person example = new Person();
example.setActive(RegisterStatus.UNCONFIRMED.getName());
List<Person> persons = personService.getPersons(example);
-
for(Person person:persons) {
if(person.getRegisterDate() != null) {
- Date newDate = DateUtils.addDays(person.getRegisterDate(), 3);
- if(newDate.before(new Date())) {
+ Date expireDate = DateUtils.addDays(person.getRegisterDate(), 3);
+ if(expireDate.before(new Date())) {
Long authId = person.getAuthenticationId();
if (authId > 0) {
personService.deletePersonByAuthenticationId(authId);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
