[Openinteract-commits] CVS: OpenInteract2/pkg/base_user/OpenInteract2/Action NewUser.pm,1.21,1.22

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/pkg/base_user/OpenInteract2/Action
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28850/pkg/base_user/OpenInteract2/Action

Modified Files:
	NewUser.pm 
Log Message:
OIN-91: add management task to cleanup orphaned users and modify the newuser action to read waittime from server configuration

Index: NewUser.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_user/OpenInteract2/Action/NewUser.pm,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** NewUser.pm	5 Dec 2004 08:51:21 -0000	1.21
--- NewUser.pm	26 Feb 2005 05:52:18 -0000	1.22
***************
*** 15,19 ****
  my ( $log );
  
! use constant REMOVAL_TIME => 60 * 60 * 24; # 1 day
  
  sub display {
--- 15,19 ----
  my ( $log );
  
! use constant DEFAULT_REMOVAL_TIME => 60 * 60 * 24; # 1 day
  
  sub display {
***************
*** 133,139 ****
      $log ||= get_logger( LOG_APP );
  
-     # Now, create an entry in the user table; note that we set the removal
-     # date to now plus whatever REMOVAL_TIME is set to
- 
      my $new_user = CTX->lookup_object( 'user' )->new;
      $new_user->{login_name} = $login;
--- 133,136 ----
***************
*** 141,145 ****
      $new_user->{password}   = $password;
      $new_user->{theme_id}   = CTX->lookup_default_object_id( 'theme' );
!     $new_user->{removal_date} = CTX->create_date({ epoch => time + REMOVAL_TIME });
      eval { $new_user->save };
      if ( $@ ) {
--- 138,148 ----
      $new_user->{password}   = $password;
      $new_user->{theme_id}   = CTX->lookup_default_object_id( 'theme' );
!     my $removal_deadline = time + DEFAULT_REMOVAL_TIME;
!     my $login_info = CTX->lookup_login_config();
!     if ( my $time_spec = $login_info->{initial_login_expires} ) {
!         $removal_deadline = time + OpenInteract2::Util
!                                        ->time_duration_as_seconds( $time_spec );
!     }
!     $new_user->{removal_date} = CTX->create_date({ epoch => $removal_deadline });
      eval { $new_user->save };
      if ( $@ ) {