[popfile-commit] engine/UI HTML.pm,1.231,1.232

[<jgr...@pr...>]

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

Modified Files:
	HTML.pm 
Log Message:
Only get a session key when we are about to handle a real page in the UI

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.231
retrieving revision 1.232
diff -C2 -d -r1.231 -r1.232
*** HTML.pm	31 Jan 2004 23:39:00 -0000	1.231
--- HTML.pm	1 Feb 2004 23:53:11 -0000	1.232
***************
*** 380,390 ****
      my ( $self, $client, $url, $command, $content ) = @_;
  
-     $self->{api_session__} = $self->{classifier__}->get_session_key( 'admin', '' );
- 
-     if ( !defined( $self->{api_session__} ) ) {
-         $self->http_error_( $client, 500 );
-         return;
-     }
- 
      # See if there are any form parameters and if there are parse them into the %form hash
  
--- 380,383 ----
***************
*** 417,421 ****
      if ( $url =~ /\/(.+\.gif)/ ) {
          $self->http_file_( $client, $self->get_root_path_( $1 ), 'image/gif' );
-         $self->{classifier__}->release_session_key( $self->{api_session__} );
          return 1;
      }
--- 410,413 ----
***************
*** 423,427 ****
      if ( $url =~ /\/(.+\.png)/ ) {
          $self->http_file_( $client, $self->get_root_path_( $1 ), 'image/png' );
-         $self->{classifier__}->release_session_key( $self->{api_session__} );
          return 1;
      }
--- 415,418 ----
***************
*** 429,433 ****
      if ( $url =~ /\/(.+\.ico)/ ) {
          $self->http_file_( $client, $self->get_root_path_( $1 ), 'image/x-icon' );
-         $self->{classifier__}->release_session_key( $self->{api_session__} );
          return 1;
      }
--- 420,423 ----
***************
*** 435,439 ****
      if ( $url =~ /(skins\/.+\.css)/ ) {
          $self->http_file_( $client, $self->get_root_path_( $1 ), 'text/css' );
-         $self->{classifier__}->release_session_key( $self->{api_session__} );
          return 1;
      }
--- 425,428 ----
***************
*** 441,445 ****
      if ( $url =~ /(manual\/.+\.html)/ ) {
          $self->http_file_( $client, $self->get_root_path_( $1 ), 'text/html' );
-         $self->{classifier__}->release_session_key( $self->{api_session__} );
          return 1;
      }
--- 430,433 ----
***************
*** 460,464 ****
          } else {
              $self->password_page( $client, 1, '/' );
-             $self->{classifier__}->release_session_key( $self->{api_session__} );
              return 1;
          }
--- 448,451 ----
***************
*** 502,506 ****
  
          $self->password_page( $client, 0, $redirect_url );
-         $self->{classifier__}->release_session_key( $self->{api_session__} );
  
          return 1;
--- 489,492 ----
***************
*** 532,536 ****
          }
  
-         $self->{classifier__}->release_session_key( $self->{api_session__} );
          return 1;
      }
--- 518,521 ----
***************
*** 538,542 ****
      if ( $url =~ /(popfile.*\.log)/ ) {
          $self->http_file_( $client, $self->get_user_path_( $self->module_config_( 'logger', 'logdir' ) . $1 ), 'text/plain' );
-         $self->{classifier__}->release_session_key( $self->{api_session__} );
          return 1;
      }
--- 523,526 ----
***************
*** 544,548 ****
      if ( ( defined($self->{form_}{session}) ) && ( $self->{form_}{session} ne $self->{session_key__} ) ) {
          $self->session_page( $client, 0, $url );
-         $self->{classifier__}->release_session_key( $self->{api_session__} );
          return 1;
      }
--- 528,531 ----
***************
*** 554,558 ****
      if ( $url eq '/shutdown' )  {
          $self->http_ok( $client, "POPFile shutdown", -1 );
-         $self->{classifier__}->release_session_key( $self->{api_session__} );
          return 0;
      }
--- 537,540 ----
***************
*** 571,574 ****
--- 553,563 ----
  
      if ( defined($url_table{$url}) )  {
+         $self->{api_session__} = $self->{classifier__}->get_session_key( 'admin', '' );
+ 
+         if ( !defined( $self->{api_session__} ) ) {
+             $self->http_error_( $client, 500 );
+             return;
+         }
+ 
          &{$url_table{$url}}($self, $client);
          $self->{classifier__}->release_session_key( $self->{api_session__} );
***************
*** 577,581 ****
  
      $self->http_error_( $client, 404 );
-     $self->{classifier__}->release_session_key( $self->{api_session__} );
      return 1;
  }
--- 566,569 ----