[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java

[jkoster]

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory 
james.mmbase.org:/tmp/cvs-serv17740/portlets-login/src/java/com/finalist/cmsc/portlets

Modified Files:
      Tag: b1_6
        LoginPortlet.java 
Log Message:
CMSC-1375 - LoginPortlet does not return error message for existing users who 
entered an incorrect password


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-1375


Index: LoginPortlet.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.15.2.5
retrieving revision 1.15.2.6
diff -u -b -r1.15.2.5 -r1.15.2.6
--- LoginPortlet.java   6 Apr 2009 14:25:56 -0000       1.15.2.5
+++ LoginPortlet.java   8 Apr 2009 12:05:19 -0000       1.15.2.6
@@ -101,15 +101,14 @@
                PersonService personHibernateService = (PersonService) 
ApplicationContextFactory.getBean("personService");
                Person person = 
personHibernateService.getPersonByUserId(userName);
                
-               if (person == null) {
-                  log.info(String.format("Login failed for user %s", 
userName));
-                  response.setRenderParameter(ERRORMESSAGE, "login.failed");
-               }
-               else if 
(RegisterStatus.UNCONFIRMED.getName().equalsIgnoreCase(person.getActive())) {
+               if (person != null && 
RegisterStatus.UNCONFIRMED.getName().equalsIgnoreCase(person.getActive())) {
                   response.setRenderParameter(ERRORMESSAGE, 
"view.account.unconfirmed");
                }
-               else if 
(RegisterStatus.BLOCKED.getName().equalsIgnoreCase(person.getActive())) {
+               else if (person != null && 
RegisterStatus.BLOCKED.getName().equalsIgnoreCase(person.getActive())) {
                   response.setRenderParameter(ERRORMESSAGE, 
"view.account.blocked");
+               } else {
+                  log.info(String.format("Login failed for user %s", 
userName));
+                  response.setRenderParameter(ERRORMESSAGE, "login.failed");
                }
             }
          }
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs