[Openinteract-commits] CVS: SPOPS/eg stock_user_group.pl,1.2,1.3

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

Update of /cvsroot/openinteract/SPOPS/eg
In directory usw-pr-cvs1:/tmp/cvs-serv28349

Modified Files:
	stock_user_group.pl 
Log Message:
updated script and object class for user/group/security samples


Index: stock_user_group.pl
===================================================================
RCS file: /cvsroot/openinteract/SPOPS/eg/stock_user_group.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** stock_user_group.pl	2001/10/08 02:32:52	1.2
--- stock_user_group.pl	2001/10/15 04:25:35	1.3
***************
*** 11,38 ****
  use Data::Dumper qw( Dumper );
  
- my $USER_CLASS  = 'My::User';
- my $GROUP_CLASS = 'My::Group';
- 
- eval "require $USER_CLASS";
- eval "require $GROUP_CLASS";
  require My::Security;
  
  my @USER_FIELD  = qw( email last_name first_name password login_name );
  my @USER_DATA   = (
                     [ 'sup...@my...', 'user', 'super', 'password', 'superuser' ],
!                    map { [ "$_\@myco.com", "$_", 'User', "password$_", "User$_" ] }
!                        ( 'A' .. 'G' )
  );
  
! my @GROUP_FIELD = qw( name notes );
  my @GROUP_DATA  = (
!      [ 'admin',      'The all-powerful group' ],
!      [ 'public',     'All users should belong' ],
!      [ 'managers',   'PHB' ],
! );
! 
! my %GROUP_USER = (
!      'admin'    => { map { $_ => 1 } qw( UserA UserD UserG ) },
!      'managers' => { map { $_ => 1 } qw( UserB UserC ) },
  );
  
--- 11,30 ----
  use Data::Dumper qw( Dumper );
  
  require My::Security;
+ require My::User;
  
  my @USER_FIELD  = qw( email last_name first_name password login_name );
  my @USER_DATA   = (
                     [ 'sup...@my...', 'user', 'super', 'password', 'superuser' ],
!                    ( map { [ "$_\@myco.com", "$_", 'User', "password$_", "User$_" ] } qw( A B ) ),
!                    ( map { [ "$_\@myco.com", "$_", 'Manager', "password$_", "Manager$_" ] } qw( C D ) ),
!                    ( map { [ "$_\@myco.com", "$_", 'Admin', "password$_", "Admin$_" ] } qw( E F ) ),
  );
  
! my @GROUP_FIELD = qw( group_id name notes );
  my @GROUP_DATA  = (
!      [ 1, 'admin',    'The all-powerful group' ],
!      [ 2, 'public',   'All users should belong' ],
!      [ 3, 'managers', 'PHB' ],
  );
  
***************
*** 41,49 ****
  
      foreach my $data ( @USER_DATA ) {
!         my $user = $USER_CLASS->new;
          for ( my $i = 0; $i < scalar @USER_FIELD; $i++ ) {
              $user->{ $USER_FIELD[ $i ] } = $data->[ $i ];
          }
!         $user->save({ skip_log => 1, skip_cache => 1 });
          print "Created user with ID: ", $user->id, "\n";
      }
--- 33,41 ----
  
      foreach my $data ( @USER_DATA ) {
!         my $user = My::User->new;
          for ( my $i = 0; $i < scalar @USER_FIELD; $i++ ) {
              $user->{ $USER_FIELD[ $i ] } = $data->[ $i ];
          }
!         $user->save({ skip_cache => 1 });
          print "Created user with ID: ", $user->id, "\n";
      }
***************
*** 51,61 ****
      # Next the groups
  
-     my $user_list = $USER_CLASS->fetch_group({ skip_security => 1 });
      foreach my $data ( @GROUP_DATA ) {
!         my $group = $GROUP_CLASS->new;
          for ( my $i = 0;  $i < scalar @GROUP_FIELD; $i++ ) {
              $group->{ $GROUP_FIELD[ $i ] } = $data->[ $i ];
          }
!         $group->save({ skip_log => 1, skip_cache => 1 });
          print "Created group with ID: ", $group->id, "\n";
      }
--- 43,52 ----
      # Next the groups
  
      foreach my $data ( @GROUP_DATA ) {
!         my $group = My::Group->new;
          for ( my $i = 0;  $i < scalar @GROUP_FIELD; $i++ ) {
              $group->{ $GROUP_FIELD[ $i ] } = $data->[ $i ];
          }
!         $group->save({ skip_cache => 1 });
          print "Created group with ID: ", $group->id, "\n";
      }
***************
*** 63,84 ****
      # Finally the memberships
  
!     my $public_group = $GROUP_CLASS->fetch_by_name( 'public',
!                                                     { skip_security => 1 } )->[0];
!     my $admin_group  = $GROUP_CLASS->fetch_by_name( 'admin',
!                                                     { skip_security => 1 } )->[0];
!     my $mgr_group    = $GROUP_CLASS->fetch_by_name( 'managers',
!                                                     { skip_security => 1 } )->[0];
!     my $user_list = $USER_CLASS->fetch_group({ skip_security => 1 });
      foreach my $user ( @{ $user_list } ) {
          eval {
!             $user->group_add( $public_group->id,
!                               { skip_security => 1 } );
!             if ( $GROUP_USER{admin}->{ $user->{login_name} } ) {
!                 $user->group_add( $admin_group->id,
!                                   { skip_security => 1 } );
              }
!             if ( $GROUP_USER{managers}->{ $user->{login_name} } ) {
!                 $user->group_add( $mgr_group->id,
!                                   { skip_security => 1 } );
              }
          };
--- 54,69 ----
      # Finally the memberships
  
!     my $public_group = My::Group->fetch_by_name( 'public', { return_single => 1 } );
!     my $admin_group  = My::Group->fetch_by_name( 'admin', { return_single => 1 } );
!     my $mgr_group    = My::Group->fetch_by_name( 'managers', { return_single => 1 } );
!     my $user_list = My::User->fetch_group();
      foreach my $user ( @{ $user_list } ) {
          eval {
!             $user->group_add( $public_group->id );
!             if ( $user->{login_name} =~ /^Admin/ ) {
!                 $user->group_add( $admin_group->id );
              }
!             if ( $user->{login_name} =~ /^Manager/ ) {
!                 $user->group_add( $mgr_group->id );
              }
          };