Thread: [Openinteract-commits] CVS: OpenInteract2/pkg/base_user/OpenInteract2/Action ForgotPassword.pm,1.3,1

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	ForgotPassword.pm NewUser.pm User.pm 
Log Message:
update packages to move as many messages as possible out of code and into message files; use new add_status/add_error shortcuts

Index: ForgotPassword.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_user/OpenInteract2/Action/ForgotPassword.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ForgotPassword.pm	19 Mar 2004 05:57:16 -0000	1.3
--- ForgotPassword.pm	5 Dec 2004 08:51:21 -0000	1.4
***************
*** 29,34 ****
      my $email = $request->param( 'email' );
      unless ( $login or $email ) {
!         $self->param_add(
!             error_msg => $self->_msg( 'base_user.password.enter_one' ) );
          return $self->execute({ task => 'display' });
      }
--- 29,33 ----
      my $email = $request->param( 'email' );
      unless ( $login or $email ) {
!         $self->add_error_key( 'base_user.password.enter_one' );
          return $self->execute({ task => 'display' });
      }
***************
*** 49,54 ****
      if ( $@ ) {
          $log->error( "Failed to fetch user by $fetch_by: $@" );
!         $self->param_add(
!             error_msg => $self->_msg( 'base_user.password.fetch_fail', $@ ) );
          return $self->execute({ task => 'display' });
      }
--- 48,52 ----
      if ( $@ ) {
          $log->error( "Failed to fetch user by $fetch_by: $@" );
!         $self->add_error_key('base_user.password.fetch_fail', $@ );
          return $self->execute({ task => 'display' });
      }
***************
*** 56,61 ****
      unless ( $user ) {
          $self->param( lookup_user_by => ( $login ) ? 'login' : 'email' );
!         $self->param_add(
!             error_msg => $self->_msg( 'base_user.password.no_user' ) );
          $log->warn( "No user found with $fetch_by" );
          return $self->execute({ task => 'display' });
--- 54,58 ----
      unless ( $user ) {
          $self->param( lookup_user_by => ( $login ) ? 'login' : 'email' );
!         $self->add_error_key( 'base_user.password.no_user' );
          $log->warn( "No user found with $fetch_by" );
          return $self->execute({ task => 'display' });
***************
*** 72,77 ****
      if ( $@ ) {
          $log->error( "Failed to save user with new password: $@" );
!         $self->param_add(
!             error_msg => $self->_msg( 'base_user.password.save_fail', $@ ) );
          return $self->execute({ task => 'display' });
      }
--- 69,73 ----
      if ( $@ ) {
          $log->error( "Failed to save user with new password: $@" );
!         $self->add_error_key( 'base_user.password.save_fail', $@ );
          return $self->execute({ task => 'display' });
      }
***************
*** 81,97 ****
      };
      if ( $@ ) {
!         $self->param_add(
!             error_msg => $self->_msg( 'base_user.password.mail_fail', $@ ) );
          $user->{password} = $existing_password;
          eval { $user->save({ skip_security => 1 }) };
          if ( $@ ) {
              my $admin = CTX->lookup_mail_config->{admin_mail};
!             $self->param_add(
!                 error_msg => $self->_msg( 'base_user.password.save_existing_fail', $@, $admin ) );
          }
          return $self->execute({ task => 'display' });
      }
!     $self->param_add(
!         status_msg => $self->_msg( 'base_user.password.mail_ok', $user->{email} ) );
  
      return $self->generate_content(
--- 77,90 ----
      };
      if ( $@ ) {
!         $self->add_error_key( 'base_user.password.mail_fail', $@ );
          $user->{password} = $existing_password;
          eval { $user->save({ skip_security => 1 }) };
          if ( $@ ) {
              my $admin = CTX->lookup_mail_config->{admin_mail};
!             $self->add_error_key( 'base_user.password.save_existing_fail', $@, $admin );
          }
          return $self->execute({ task => 'display' });
      }
!     $self->add_status_key( 'base_user.password.mail_ok', $user->{email} );
  
      return $self->generate_content(

Index: NewUser.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_user/OpenInteract2/Action/NewUser.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** NewUser.pm	1 Dec 2004 05:16:31 -0000	1.20
--- NewUser.pm	5 Dec 2004 08:51:21 -0000	1.21
***************
*** 54,68 ****
  
      unless ( $self->_validate_email( $email ) ) {
!         $self->param_add(
!             error_msg => $self->_msg( 'base_user.new.invalid_email' ) );
          $self->param( requested_login => $login );
!         die $self->execute({ task => 'display' });
      }
  
      unless ( $login ) {
!         $self->param_add(
!             error_msg => $self->_msg( 'base_user.new.no_login' ) );
          $self->param( working_email => $email );
!         die $self->execute({ task => 'display' });
      }
  
--- 54,66 ----
  
      unless ( $self->_validate_email( $email ) ) {
!         $self->add_error_key( 'base_user.new.invalid_email' );
          $self->param( requested_login => $login );
!         die $self->execute({ task => 'display' }), "\n";
      }
  
      unless ( $login ) {
!         $self->add_error_key( 'base_user.new.no_login' );
          $self->param( working_email => $email );
!         die $self->execute({ task => 'display' }), "\n";
      }
  
***************
*** 76,81 ****
      }
      if ( $user ) {
!         $self->param_add(
!             error_msg => $self->_msg( 'base_user.new.name_in_use' ) );
          $self->param( working_email => $email );
          die $self->execute({ task => 'display' }), "\n";
--- 74,78 ----
      }
      if ( $user ) {
!         $self->add_error_key( 'base_user.new.name_in_use' );
          $self->param( working_email => $email );
          die $self->execute({ task => 'display' }), "\n";
***************
*** 90,95 ****
      }
      if ( $user ) {
!         $self->param_add(
!             error_msg => $self->_msg( 'base_user.new.duplicate_email' ) );
          $self->param( working_email => $email );
          die $self->execute({ task => 'display' }), "\n";
--- 87,91 ----
      }
      if ( $user ) {
!         $self->add_error_key( 'base_user.new.duplicate_email' );
          $self->param( working_email => $email );
          die $self->execute({ task => 'display' }), "\n";
***************
*** 119,125 ****
                       "NOT loaded , cannot validate email. (You should ",
                       "not have been able to install this package...)" );
!         $self->param_add(
!             error_msg => $self->_msg( 'base_user.new.no_mailcheck_module' ) );
!         die $self->execute({ task => 'display' });
      }
      return Mail::RFC822::Address::valid( $email );
--- 115,120 ----
                       "NOT loaded , cannot validate email. (You should ",
                       "not have been able to install this package...)" );
!         $self->add_error_key( 'base_user.new.no_mailcheck_module' );
!         die $self->execute({ task => 'display' }), "\n";
      }
      return Mail::RFC822::Address::valid( $email );
***************
*** 146,157 ****
      $new_user->{password}   = $password;
      $new_user->{theme_id}   = CTX->lookup_default_object_id( 'theme' );
!     $new_user->{removal_date} = OpenInteract2::Util->now(
!                                         { time => time + REMOVAL_TIME });
      eval { $new_user->save };
      if ( $@ ) {
          $log->error( "Failure to create new user: $@" );
!         $self->param_add(
!             error_msg => $self->_msg( 'base_user.new.create_failure', $@ ) );
!         die $self->execute({ task => 'display' });
      }
      return $new_user;
--- 141,150 ----
      $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 ( $@ ) {
          $log->error( "Failure to create new user: $@" );
!         $self->add_error_key( 'base_user.new.create_failure', $@ );
!         die $self->execute({ task => 'display' }), "\n";
      }
      return $new_user;
***************
*** 165,175 ****
  
      eval {
!         $new_user->set_item_security(
!             { class     => ref( $new_user ),
!               object_id => $new_user->id,
!               scope     => SEC_SCOPE_USER,
!               scope_id  => $new_user->id,
!               level     => SEC_LEVEL_WRITE })
!        };
  
      # Log the failed security set, if it happens...
--- 158,169 ----
  
      eval {
!         $new_user->set_item_security({
!             class     => ref( $new_user ),
!             object_id => $new_user->id,
!             scope     => SEC_SCOPE_USER,
!             scope_id  => $new_user->id,
!             level     => SEC_LEVEL_WRITE
!         })
!     };
  
      # Log the failed security set, if it happens...
***************
*** 178,183 ****
          $log->error( "Failed to set security so that new user ",
                       "'$new_user->{login_name}' can see her record: $@" );
!         $self->param_add(
!             error_msg => $self->_msg( 'base_user.new.security_failure', $@ ) );
          die $self->execute({ task => 'display' }), "\n";
      }
--- 172,176 ----
          $log->error( "Failed to set security so that new user ",
                       "'$new_user->{login_name}' can see her record: $@" );
!         $self->add_error_key( 'base_user.new.security_failure', $@ );
          die $self->execute({ task => 'display' }), "\n";
      }
***************
*** 199,205 ****
      my $server_name = $request->server_name;
  
!     my %email_params = ( login       => $new_user->{login_name},
!                          password    => $plain_password,
!                          server_name => $server_name );
      $log->info( "Sending email to '$email_params{login}' for server ",
                  "'$email_params{server_name}'" );
--- 192,200 ----
      my $server_name = $request->server_name;
  
!     my %email_params = (
!         login       => $new_user->{login_name},
!         password    => $plain_password,
!         server_name => $server_name,
!     );
      $log->info( "Sending email to '$email_params{login}' for server ",
                  "'$email_params{server_name}'" );
***************
*** 217,222 ****
      if ( $@ ) {
          $log->error( "Cannot send email! $@" );
!         $self->param_add(
!             error_msg => $self->_msg( 'base_user.new.mail_failure', $@ ) );
          die $self->execute({ task => 'display' }), "\n";
      }
--- 212,216 ----
      if ( $@ ) {
          $log->error( "Cannot send email! $@" );
!         $self->add_error_key( 'base_user.new.mail_failure', $@ );
          die $self->execute({ task => 'display' }), "\n";
      }

Index: User.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_user/OpenInteract2/Action/User.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** User.pm	1 Dec 2004 05:18:16 -0000	1.18
--- User.pm	5 Dec 2004 08:51:21 -0000	1.19
***************
*** 30,35 ****
      };
      if ( $@ ) {
!         $self->param_add(
!             error_msg => $self->_msg( 'base_user.user.search_error', $@ ) );
      }
      return $self->generate_content({ user_iterator => $iter });
--- 30,34 ----
      };
      if ( $@ ) {
!         $self->add_error_key( 'base_user.user.search_error', $@ );
      }
      return $self->generate_content({ user_iterator => $iter });
***************
*** 112,117 ****
      };
      if ( $@ ) {
!         $self->param_add(
!             error_msg => $self->_msg( 'base_user.user.group_fetch_fail', $@ ) );
      }
  }
--- 111,115 ----
      };
      if ( $@ ) {
!         $self->add_error_key( 'base_user.user.group_fetch_fail', $@ );
      }
  }
***************
*** 124,129 ****
      };
      if ( $@ ) {
!         $self->param_add(
!             error_msg => $self->_msg( 'base_user.user.lang_fetch_fail', $@ ) );
      }
  }
--- 122,126 ----
      };
      if ( $@ ) {
!         $self->add_error_key( 'base_user.user.lang_fetch_fail', $@ );
      }
  }
***************
*** 132,137 ****
      my ( $self ) = @_;
      my $original_task = $self->param( 'c_task' );
!     return 'display_add'    if ( $original_task eq 'add' );
!     return 'display_update' if ( $original_task eq 'update' );
      return undef;
  }
--- 129,134 ----
      my ( $self ) = @_;
      my $original_task = $self->param( 'c_task' );
!     return 'display_add'  if ( $original_task eq 'add' );
!     return 'display_form' if ( $original_task eq 'update' );
      return undef;
  }
***************
*** 149,165 ****
  sub on_modify_fail {
      my ( $self ) = @_;
!     my $original_task = $self->_get_modify_fail_task;
!     unless ( $original_task ) {
          return "This task cannot be called directly, only from an internal action.";
      }
!     $self->param_clear( 'status_msg' ); # get rid of any 'Password changed...' messages
!     my $original_fail_task = ( $original_task eq 'update' )
!                                ? 'display_form' : 'display_add';
!     return $self->execute({ task => $original_fail_task });
  }
  
  
  sub _check_password_change {
!     my ( $self, $user, $fail_task ) = @_;
      $log ||= get_logger( LOG_APP );
  
--- 146,159 ----
  sub on_modify_fail {
      my ( $self ) = @_;
!     unless ( $self->param( 'c_task' ) ) {
          return "This task cannot be called directly, only from an internal action.";
      }
!     $self->clear_status(); # get rid of any 'Password changed...' messages
!     return $self->execute({ task => $self->_get_modify_fail_task });
  }
  
  
  sub _check_password_change {
!     my ( $self, $user ) = @_;
      $log ||= get_logger( LOG_APP );
  
***************
*** 167,180 ****
      my $password = $request->param( 'password' );
      unless ( $password ) {
!         $log->is_debug &&
!             $log->debug( "User DID NOT ask to change password" );
          return;
      }
      my $password_confirm = $request->param( 'password_conf' );
      unless ( $password eq $password_confirm ) {
!         $self->param_add(
!                error_msg => $self->_msg( 'base_user.user.password_mismatch' ) );
          my $fail_task = $self->_get_modify_fail_task || 'display_add'; # just in case...
!         die $self->execute({ task => $fail_task });
      }
      $log->is_debug &&
--- 161,172 ----
      my $password = $request->param( 'password' );
      unless ( $password ) {
!         $log->is_debug && $log->debug( "User DID NOT change password" );
          return;
      }
      my $password_confirm = $request->param( 'password_conf' );
      unless ( $password eq $password_confirm ) {
!         $self->add_error_key( 'base_user.user.password_mismatch' );
          my $fail_task = $self->_get_modify_fail_task || 'display_add'; # just in case...
!         die $self->execute({ task => $fail_task }), "\n";
      }
      $log->is_debug &&
***************
*** 184,189 ****
      }
      $user->{password} = $password;
!     $self->param_add(
!         status_msg => $self->_msg( 'base_user.user.password_changed' ) );
      return undef;
  }
--- 176,180 ----
      }
      $user->{password} = $password;
!     $self->add_status_key( 'base_user.user.password_changed' );
      return undef;
  }
***************
*** 207,215 ****
      if ( $@ ) {
          $log->error( "Error modifying group membership: $@" );
!         $self->param_add(
!                 error_msg => $self->_msg( 'base_user.user.group_add_fail' ) );
      }
!     $self->param_add(
!         status_msg => $self->_msg( 'base_user.user.group_add_ok' ) );
      return undef;
  }
--- 198,204 ----
      if ( $@ ) {
          $log->error( "Error modifying group membership: $@" );
!         $self->add_error_key( 'base_user.user.group_add_fail' );
      }
!     $self->add_status_key( 'base_user.user.group_add_ok' );
      return undef;
  }

Thread: [Openinteract-commits] CVS: OpenInteract2/pkg/base_user/OpenInteract2/Action ForgotPassword.pm,1.3,1

openinteract-commits