roller/src/org/roller/presentation/website/actions UserFormAction.java,1.7,1.8

Update of /cvsroot/roller/roller/src/org/roller/presentation/website/actions
In directory 
sc8-pr-cvs1:/tmp/cvs-serv27080/src/org/roller/presentation/website/actions

Modified Files:
        UserFormAction.java 
Log Message:
Quick fix to ensure that new users are not created when
new users are disabled

Index: UserFormAction.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/website/actions/UserFormAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** UserFormAction.java 3 Sep 2003 21:21:56 -0000       1.7
--- UserFormAction.java 12 Sep 2003 11:37:15 -0000      1.8
***************
*** 55,58 ****
--- 55,65 ----
          {
              RollerRequest rreq = RollerRequest.getRollerRequest(request);
+             ServletContext ctx = rreq.getServletContext();
+             RollerContext rollerContext = RollerContext.getRollerContext(ctx);
+             
+             if ( !rollerContext.getRollerConfig().getNewUserAllowed() ) {
+                 throw new RollerException("New users disabled!");
+             }
+             
              UserData ud = ((UserForm)actionForm).getData();
                        ud.setUserName( 
Utilities.replaceNonAlphanumeric(ud.getUserName()) );
***************
*** 62,69 ****
              UserManager mgr = rreq.getRoller().getUserManager();
  
!             // Figure path to new user data
!             ServletContext ctx = rreq.getServletContext();
!             RollerContext rollerContext = RollerContext.getRollerContext(ctx);
!                             
              HashMap pages = rollerContext.readThemeMacros(theme);
              ud.setId(null); // user is seen as new object
--- 69,73 ----
              UserManager mgr = rreq.getRoller().getUserManager();
  
!             // Figure path to new user data                           
              HashMap pages = rollerContext.readThemeMacros(theme);
              ud.setId(null); // user is seen as new object




-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf