[popfile-commit] engine/Proxy NNTP.pm,1.41,1.42

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

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

Modified Files:
	NNTP.pm 
Log Message:
Let's not get over-excited. Two templates for the nntp configuration. Keep one extra file for the security option.

Index: NNTP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/NNTP.pm,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** NNTP.pm	2 Mar 2006 09:56:17 -0000	1.41
--- NNTP.pm	2 Mar 2006 10:07:46 -0000	1.42
***************
*** 131,134 ****
--- 131,139 ----
                                           'nntp-configuration.thtml',
                                           $self );
+     
+     $self->register_configuration_item_( 'security',
+                                          'nntp_local',
+                                          'nntp-security-local.thtml',
+                                          $self );                                         
  
      if ( $self->config_( 'welcome_string' ) =~ /^NNTP POPFile \(v\d+\.\d+\.\d+\) server ready$/ ) { # PROFILE BLOCK START
***************
*** 415,421 ****
          $templ->param( 'nntp_port' => $self->config_( 'port' ) );
          $templ->param( 'nntp_separator' => $self->config_( 'separator' ) );
-         $templ->param( 'nntp_if_local' => $self->config_( 'local' ) );
          $templ->param( 'nntp_force_fork_on' => $self->config_( 'force_fork' ) );
      }
  
      $self->SUPER::configure_item( $name, $templ, $language);
--- 420,429 ----
          $templ->param( 'nntp_port' => $self->config_( 'port' ) );
          $templ->param( 'nntp_separator' => $self->config_( 'separator' ) );
          $templ->param( 'nntp_force_fork_on' => $self->config_( 'force_fork' ) );
      }
+     
+     if ( $name eq 'nntp_local' ) {
+         $templ->param( 'nntp_if_local' => $self->config_( 'local' ) );
+     }
  
      $self->SUPER::configure_item( $name, $templ, $language);
***************
*** 460,467 ****
          }
  
-         if ( defined $$form{nntp_local} ) {
-             $self->config_( 'local', $$form{nntp_local} );
-         }
- 
          if ( defined $$form{nntp_force_fork} ) {
              $self->config_( 'force_fork', $$form{nntp_force_fork} );
--- 468,471 ----
***************
*** 470,473 ****
--- 474,485 ----
          return( $status, $error );
      }
+     
+     if ( $name eq 'nntp_local' ) {
+         if ( defined $$form{nntp_local} ) {
+             $self->config_( 'local', $$form{nntp_local} );
+         }
+         return( undef, undef);
+     }    
+ 
      return $self->SUPER::validate_item( $name, $templ, $language, $form );
  }