[popfile-commit] engine/UI HTML.pm,1.365,1.366

[John Graham-C. <jgr...@us...>]

Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29690/UI

Modified Files:
	HTML.pm 
Log Message:
Correct a problem where a failed login followed by a correct login generated a 404 error

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.365
retrieving revision 1.366
diff -C2 -d -r1.365 -r1.366
*** HTML.pm	20 Dec 2005 20:26:04 -0000	1.365
--- HTML.pm	20 Dec 2005 20:34:43 -0000	1.366
***************
*** 624,629 ****
      if ( !defined( $session ) ) {
          my $continue;
!         ($session, $continue) = $self->password_page( $client, $url );
!         $continue = '/' unless defined( $continue );
          if ( defined( $session ) ) {
              $self->http_redirect_( $client, $continue , $session );
--- 624,632 ----
      if ( !defined( $session ) ) {
          my $continue;
!         ( $session, $continue ) = $self->password_page( $client, $url );
!         if ( !defined( $continue ) ||
!              $continue eq '/password' ) {
!             $continue = '/';
!         }
          if ( defined( $session ) ) {
              $self->http_redirect_( $client, $continue , $session );
***************
*** 823,827 ****
  
      my @tab = ( 'menuStandard', 'menuStandard', 'menuStandard', 'menuStandard', 'menuStandard', 'menuStandard' );
!     $tab[$selected] = 'menuSelected' if ( ( $selected <= $#tab ) && ( $selected >= 0 ) );
  
      for my $i (0..$#tab) {
--- 826,831 ----
  
      my @tab = ( 'menuStandard', 'menuStandard', 'menuStandard', 'menuStandard', 'menuStandard', 'menuStandard' );
!     $tab[$selected] = 'menuSelected' if ( ( $selected <= $#tab ) &&
!                                           ( $selected >= 0 ) );
  
      for my $i (0..$#tab) {
***************
*** 835,842 ****
      # CGI.  Also send stats to the same site if that is allowed.
  
!     if ( defined( $session ) && ( $self->{today__} ne $self->user_config_( $self->{sessions__}{$session}{user}, 'last_update_check' ) ) ) {
          $self->calculate_today();
  
!         if ( $self->user_config_( $self->{sessions__}{$session}{user}, 'update_check' ) ) {
              my ( $major_version, $minor_version, $build_version ) =
                  $self->version() =~ /^v([^.]*)\.([^.]*)\.(.*)$/;
--- 839,850 ----
      # CGI.  Also send stats to the same site if that is allowed.
  
!     if ( defined( $session ) &&
!          ( $self->{today__} ne
!            $self->user_config_( $self->{sessions__}{$session}{user},
!                                 'last_update_check' ) ) ) {
          $self->calculate_today();
  
!         if ( $self->user_config_( $self->{sessions__}{$session}{user},
!                                   'update_check' ) ) {
              my ( $major_version, $minor_version, $build_version ) =
                  $self->version() =~ /^v([^.]*)\.([^.]*)\.(.*)$/;
***************
*** 847,851 ****
          }
  
!         if ( defined( $session ) && ( $self->user_config_( $self->{sessions__}{$session}{user}, 'send_stats' ) ) ) {
              $templ->param( 'Common_Middle_If_SendStats' => 1 );
              my @buckets = $self->classifier_()->get_buckets(
--- 855,861 ----
          }
  
!         if ( defined( $session ) &&
!              ( $self->user_config_( $self->{sessions__}{$session}{user},
!                                     'send_stats' ) ) ) {
              $templ->param( 'Common_Middle_If_SendStats' => 1 );
              my @buckets = $self->classifier_()->get_buckets(
***************
*** 853,861 ****
              my $bc      = $#buckets + 1;
              $templ->param( 'Common_Middle_Buckets'  => $bc );
!             $templ->param( 'Common_Middle_Messages' => $self->mcount__( $session ) );
!             $templ->param( 'Common_Middle_Errors'   => $self->ecount__( $session ) );
          }
  
!         $self->user_config_( $self->{sessions__}{$session}{user}, 'last_update_check', $self->{today__}, 1 );
      }
  
--- 863,874 ----
              my $bc      = $#buckets + 1;
              $templ->param( 'Common_Middle_Buckets'  => $bc );
!             $templ->param( 'Common_Middle_Messages' =>
!                            $self->mcount__( $session ) );
!             $templ->param( 'Common_Middle_Errors'   =>
!                            $self->ecount__( $session ) );
          }
  
!         $self->user_config_( $self->{sessions__}{$session}{user},
!                              'last_update_check', $self->{today__}, 1 );
      }
  
***************
*** 905,909 ****
          if ( ( $self->{form_}{page_size} >= 1 ) &&
               ( $self->{form_}{page_size} <= 1000 ) ) {
!             $self->user_config_( $self->{sessions__}{$session}{user}, 'page_size', $self->{form_}{page_size} );
          } else {
              $self->error_message__( $templ,
--- 918,923 ----
          if ( ( $self->{form_}{page_size} >= 1 ) &&
               ( $self->{form_}{page_size} <= 1000 ) ) {
!             $self->user_config_( $self->{sessions__}{$session}{user},
!                                  'page_size', $self->{form_}{page_size} );
          } else {
              $self->error_message__( $templ,
***************
*** 914,924 ****
  
      $templ->param( 'Configuration_Page_Size' =>
!         $self->user_config_( $self->{sessions__}{$session}{user}, 'page_size' ) );
  
      if ( defined($self->{form_}{history_days}) ) {
          if ( ( $self->{form_}{history_days} >= 1 ) &&
               ( $self->{form_}{history_days} <= 366 ) ) {
!             $self->user_module_config_( $self->{sessions__}{$session}{user}, 'history', 'history_days',
!                 $self->{form_}{history_days} );
          } else {
              $self->error_message__( $templ,
--- 928,940 ----
  
      $templ->param( 'Configuration_Page_Size' =>
!                    $self->user_config_( $self->{sessions__}{$session}{user},
!                                         'page_size' ) );
  
      if ( defined($self->{form_}{history_days}) ) {
          if ( ( $self->{form_}{history_days} >= 1 ) &&
               ( $self->{form_}{history_days} <= 366 ) ) {
!             $self->user_module_config_( $self->{sessions__}{$session}{user},
!                                         'history', 'history_days',
!                                         $self->{form_}{history_days} );
          } else {
              $self->error_message__( $templ,