portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From morci...@apache.org
Subject cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions JLoginUser.java
Date Fri, 30 Apr 2004 23:34:27 GMT
morciuch    2004/04/30 16:34:27

  Modified:    src/java/org/apache/jetspeed/modules/actions JLoginUser.java
  Log:
  Load anonymous profile upon disabled account login attempt (see JIRA issue# JS1-464)
  
  Revision  Changes    Path
  1.40      +11 -6     jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLoginUser.java
  
  Index: JLoginUser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLoginUser.java,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- JLoginUser.java	23 Feb 2004 02:59:06 -0000	1.39
  +++ JLoginUser.java	30 Apr 2004 23:34:27 -0000	1.40
  @@ -51,11 +51,14 @@
   import org.apache.jetspeed.services.security.AccountExpiredException;
   
   /**
  -    This class is responsible for logging a user into the system. It is also
  -    responsible for making sure that the user has been marked as confirmed. 
  -    If the user is not marked as confirmed, then it will show them the 
  -    
  -*/
  + * This class is responsible for logging a user into the system. It is also
  + * responsible for making sure that the user has been marked as confirmed.
  + * If the user is not marked as confirmed, then it will show them the
  + * confirmation from.
  + *
  + * @author <a href="mailto:mark_orciuch@ngsltd">Mark Orciuch</a>
  + * @version $Id$ 
  + */
   public class JLoginUser extends ActionEvent
   {
   
  @@ -261,6 +264,7 @@
               data.setMessage(Localization.getString(rundata, "JLOGINUSER_ACCOUNT_DISABLED"));
               data.setScreenTemplate(JetspeedResources.getString("logon.disabled.form"));
               data.getUser().setHasLoggedIn(new Boolean (false) );
  +            data.setUser(JetspeedSecurity.getAnonymousUser());            
               return;
           }
   
  @@ -360,7 +364,7 @@
   
       }
   
  -    private boolean disableCheck(JetspeedRunData data)
  +    private boolean disableCheck(JetspeedRunData data) throws Exception
       {
           boolean disabled = false;
           // disable user after a configurable number of strikes
  @@ -373,6 +377,7 @@
                   data.setMessage(Localization.getString(data, "JLOGINUSER_ACCOUNT_DISABLED"));
                   data.setScreenTemplate(JetspeedResources.getString("logon.disabled.form"));
                   data.getUser().setHasLoggedIn(new Boolean (false) );
  +                data.setUser(JetspeedSecurity.getAnonymousUser());                
               }
           }
           return disabled;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message