[popfile-commit] engine/UI HTML.pm,1.377,1.378

[Manni H. <man...@us...>]

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

Modified Files:
	HTML.pm 
Log Message:
Start repair of Administration Tab.

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.377
retrieving revision 1.378
diff -C2 -d -r1.377 -r1.378
*** HTML.pm	27 Nov 2007 14:46:49 -0000	1.377
--- HTML.pm	2 Dec 2007 12:07:23 -0000	1.378
***************
*** 620,624 ****
      # log in, or check the username and password for validity, if they
      # are valid then create the session now.  In single user mode get
!     # the key 
  
      if ( !defined( $session ) ) {
--- 620,624 ----
      # log in, or check the username and password for validity, if they
      # are valid then create the session now.  In single user mode get
!     # the key
  
      if ( !defined( $session ) ) {
***************
*** 739,745 ****
  
          my $templ = $self->load_template__( $template, $url, $session );
-         if ( $self->global_config_( 'single_user' ) ) {
-             $templ->param( 'Header_If_SingleUser' => 1 );
-         }
  
          &{$method}( $self, $client, $templ,
--- 739,742 ----
***************
*** 1168,1186 ****
      my $port_error   = '';
  
!     # Handle single user mode
  
!     if ( defined( $self->{form_}{usermode} ) ) {
!         $self->global_config_( 'single_user', $self->{form_}{singleuser} );
      }
!     $templ->param( 'Users_If_Single' => $self->global_config_( 'single_user' ) );
  
!     $self->config_( 'local', $self->{form_}{localui}-1 )      if ( defined($self->{form_}{localui}) );
!     $self->user_config_( $self->{sessions__}{$session}{user}, 'update_check', $self->{form_}{update_check}-1 ) if ( defined($self->{form_}{update_check}) );
!     $self->user_config_( $self->{sessions__}{$session}{user}, 'send_stats', $self->{form_}{send_stats}-1 )   if ( defined($self->{form_}{send_stats}) );
  
!     $templ->param( 'Security_If_Local' => ( $self->config_( 'local' ) == 1 ) );
      #$templ->param( 'Security_If_Password_Updated' => ( defined($self->{form_}{password} ) ) );
!     $templ->param( 'Security_If_Update_Check' => ( $self->user_config_( $self->{sessions__}{$session}{user}, 'update_check' ) == 1 ) );
!     $templ->param( 'Security_If_Send_Stats' => ( $self->user_config_( $self->{sessions__}{$session}{user}, 'send_stats' ) == 1 ) );
  
      my ($status_message, $error_message);
--- 1165,1228 ----
      my $port_error   = '';
  
!     # TODO: add status messages
  
!     # Server / Stealth mode
!     if ( defined $self->{form_}->{apply_stealth} ) {
!         $self->global_config_( 'single_user', $self->{form_}->{usermode} ? 1 : 0 );
! 
!         if ( $self->{form_}->{servermode} eq 'ServerMode' ) {
!             $self->config_( 'local', $self->{form_}->{serveropt_http} ? 0 : 1 );
!         }
      }
!     # Privacy options
!     elsif ( $self->{form_}->{privacy} ) {
!         $self->user_config_( $self->{sessions__}{$session}{user}, 'send_stats', $self->{form_}->{send_stats} ? 1 : 0 );
!         $self->user_config_( $self->{sessions__}{$session}{user}, 'update_check', $self->{form_}->{update_check} ? 1 : 0 );
!     }
!     # Logger options
!     elsif ( $self->{form_}->{submit_debug} ) {
!         $self->module_config_( 'logger', 'level', $self->{form_}->{level} );
  
!         if ( ( defined($self->{form_}->{debug}) ) &&
!             ( ( $self->{form_}{debug} >= 1 ) &&
!             ( $self->{form_}{debug} <= 4 ) ) ) {
!            $self->global_config_( 'debug', $self->{form_}{debug}-1 );
!         }
!     }
!     # HTML module options
!     elsif ( $self->{form_}->{update_modules} ) {
!         if ( defined($self->{form_}{ui_port}) ) {
!             if ( ( $self->{form_}{ui_port} >= 1 ) &&
!                  ( $self->{form_}{ui_port} < 65536 ) ) {
!                 $self->config_( 'port', $self->{form_}{ui_port} );
!                 $self->status_message__( $templ, sprintf( $self->{language__}{Configuration_UIUpdate},
!                     $self->config_( 'port' ) ) );
!             } else {
!                 $self->error_message__( $templ, $self->{language__}{Configuration_Error2} );
!                 delete $self->{form_}{ui_port};
!             }
!         }
  
!         if ( defined($self->{form_}{timeout}) ) {
!             if ( ( $self->{form_}{timeout} >= 10 ) && ( $self->{form_}{timeout} <= 300 ) ) {
!                 $self->global_config_( 'timeout', $self->{form_}{timeout} );
!             }
!             else {
!                 $self->error_message__( $self->{language__}{Configuration_Error6} );
!                 delete $self->{form_}{timeout};
!             }
!         }
! 
! 
!     }
      #$templ->param( 'Security_If_Password_Updated' => ( defined($self->{form_}{password} ) ) );
!     $templ->param( 'Configuration_UI_Port' => $self->config_( 'port' ) );
!     $templ->param( 'If_Single_User' => $self->global_config_( 'single_user' ) );
!     $templ->param( Security_If_Local_Http => $self->config_( 'local') );
!     $templ->param( 'Security_If_Send_Stats' => $self->user_config_( $self->{sessions__}{$session}{user}, 'send_stats' ) );
!     $templ->param( 'Security_If_Update_Check' => $self->user_config_( $self->{sessions__}{$session}{user}, 'update_check' ) );
!     $templ->param( 'logger_level_selected_' . $self->module_config_( 'logger', 'level' ), 'selected="selected"' );
!     $templ->param ( 'Configuration_Debug_' . ( $self->global_config_( 'debug' ) + 1 ) . '_Selected', 'selected="selected"' );
! 
  
      my ($status_message, $error_message);
***************
*** 1235,1243 ****
      $templ->param( 'Security_Dynamic_Chain'    => $chain_html    );
  
!    if ( ( defined($self->{form_}{debug}) ) &&
!         ( ( $self->{form_}{debug} >= 1 ) &&
!         ( $self->{form_}{debug} <= 4 ) ) ) {
!        $self->global_config_( 'debug', $self->{form_}{debug}-1 );
!    }
  
      # Load all of the templates that are needed for the dynamic parts of
--- 1277,1281 ----
      $templ->param( 'Security_Dynamic_Chain'    => $chain_html    );
  
! 
  
      # Load all of the templates that are needed for the dynamic parts of
***************
*** 1268,1297 ****
      }
  
-     if ( defined($self->{form_}{ui_port}) ) {
-         if ( ( $self->{form_}{ui_port} >= 1 ) &&
-              ( $self->{form_}{ui_port} < 65536 ) ) {
-             $self->config_( 'port', $self->{form_}{ui_port} );
-         } else {
-             $self->error_message__( $templ, $self->{language__}{Configuration_Error2} );
-             delete $self->{form_}{ui_port};
-         }
-     }
- 
-     if ( defined($self->{form_}{ui_port} ) ) {
-         $self->status_message__( $templ, sprintf( $self->{language__}{Configuration_UIUpdate},
-                 $self->config_( 'port' ) ) );
-     }
-     $templ->param( 'Configuration_UI_Port' => $self->config_( 'port' ) );
  
!     if ( defined($self->{form_}{timeout}) ) {
!         if ( ( $self->{form_}{timeout} >= 10 ) && ( $self->{form_}{timeout} <= 300 ) ) {
!             $self->global_config_( 'timeout', $self->{form_}{timeout} );
!         } else {
!             $self->error_message__( $self->{language__}{Configuration_Error6} );
!             delete $self->{form_}{timeout};
!         }
!     }
! 
!     $self->status_message__( sprintf( $self->{language__}{Configuration_TCPTimeoutUpdate}, $self->global_config_( 'timeout' ) ) ) if ( defined($self->{form_}{timeout} ) );
      $templ->param( 'Configuration_TCP_Timeout' => $self->global_config_( 'timeout' ) );
  
--- 1306,1311 ----
      }
  
  
!     $self->status_message__( $templ, sprintf( $self->{language__}{Configuration_TCPTimeoutUpdate}, $self->global_config_( 'timeout' ) ) ) if ( defined($self->{form_}{timeout} ) );
      $templ->param( 'Configuration_TCP_Timeout' => $self->global_config_( 'timeout' ) );
  
***************
*** 3013,3017 ****
                   if ($header eq 'subject') {
                       $col_data{History_If_Subject_Column} = 1;
!                      
                       if ( $language_for_user eq 'Nihongo' ) {
                           # Remove wrong characters as euc-jp.
--- 3027,3031 ----
                   if ($header eq 'subject') {
                       $col_data{History_If_Subject_Column} = 1;
! 
                       if ( $language_for_user eq 'Nihongo' ) {
                           # Remove wrong characters as euc-jp.
***************
*** 3095,3099 ****
                                                    300 );
              }
!             # we set this here so feedback lines will also 
              # get the correct colspan:
              $row_data{History_Colspan} = $colspan+1;
--- 3109,3113 ----
                                                    300 );
              }
!             # we set this here so feedback lines will also
              # get the correct colspan:
              $row_data{History_Colspan} = $colspan+1;
***************
*** 3502,3506 ****
                     'If_Language_RTL'         =>
                         ( $self->{language__}{LanguageDirection} eq 'rtl' ),
!                    'Configuration_Action'    => $page );
  
      $self->{skin_root} = $root;
--- 3516,3523 ----
                     'If_Language_RTL'         =>
                         ( $self->{language__}{LanguageDirection} eq 'rtl' ),
!                    'Configuration_Action'    => $page,
!                    'Header_If_SingleUser'    =>
!                        $self->global_config_( 'single_user' ),
!                    );
  
      $self->{skin_root} = $root;