[popfile-commit] engine/Proxy NNTP.pm, 1.44, 1.45 POP3.pm, 1.120, 1.121 SMTP.pm, 1.45, 1.46

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

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

Modified Files:
	NNTP.pm POP3.pm SMTP.pm 
Log Message:
Change Log

1. Added 'Current active user sessions' section in the administration tab
  ( in the multiuser mode only )
2. New function get_current_sessions()

  UI/HTML.pm
  Classifier/Bayes.pm
  POPFile/API.pm
  skins/default/administration-page.thtml
  languages/English.msg
  languages/Nihongo.msg

  This will allow administrators to check the current users' activities.

  NOTE : The administrator's session ( got by get_administrator_session_key )
         is not be shown.

3. In the multiuser mode, the login user name is shown at the bottom of the UI

  UI/HTML.pm

  The login user name is shown instead of the last login user name.

4. XML-RPC stealth/server setting is now configured correctly

  UI/XMLRPC.pm

5. Add some status messages in the UI

  UI/HTML.pm
  UI/XMLRPC.pm
  Proxy/POP3.pm
  Proxy/SMTP.pm
  Proxy/NNTP.pm
  languages/English.msg
  languages/Nihongo.msg
  tests/TestHTML.script

    Magnet tab
    Administration tab

6. Avoid redirect to logout or shutdown page from the password page

  UI/HTML.pm

7. Password page for the single user mode is restored

  UI/HTML.pm

8. Update language file

  languages/Nihongo.msg

9. Minor changes of the skins

  skins/default/common-bottom.thtml
  skins/default/administration-page.thtml

Current state of the test suite:

    TestBayesScript                 PASS
    TestBayes                       PASS
    TestConfiguration               PASS *
    TestHistory                     PASS
    TestHTML                        PASS *
    TestHTTP                        PASS
    TestIMAP                        PASS
    TestInsertScript                PASS *
    TestLogger                      PASS
    TestMailParse                   PASS
    TestModule                      PASS
    TestMQ                          PASS
    TestMutex                       PASS
    TestPipeScript                  PASS
    TestPOP3                        PASS
    TestProxy                       PASS
    TestWordMangle                  PASS
    TestXMLRPC                      PASS

    * :  TODO : needs to add tests for multi user support

Index: POP3.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/POP3.pm,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** POP3.pm	17 Apr 2008 15:13:05 -0000	1.120
--- POP3.pm	18 Apr 2008 12:41:49 -0000	1.121
***************
*** 762,766 ****
      my ( $self, $name, $templ, $language, $form ) = @_;

!     my ($status_message,$error_message);

      if ( $name eq 'pop3_configuration' ) {
--- 762,766 ----
      my ( $self, $name, $templ, $language, $form ) = @_;

!     my ( $status_message , $error_message );

      if ( $name eq 'pop3_configuration' ) {
***************
*** 768,774 ****
              if ( ( $$form{pop3_port} =~ /^\d+$/ ) && ( $$form{pop3_port} >= 1 ) && ( $$form{pop3_port} < 65536 ) ) {
                  $self->config_( 'port', $$form{pop3_port} );
!                 $status_message = sprintf( $$language{Configuration_POP3Update}, $self->config_( 'port' ) );
              } else {
!                 $error_message .= $$language{Configuration_Error3};
              }
          }
--- 768,774 ----
              if ( ( $$form{pop3_port} =~ /^\d+$/ ) && ( $$form{pop3_port} >= 1 ) && ( $$form{pop3_port} < 65536 ) ) {
                  $self->config_( 'port', $$form{pop3_port} );
!                 $status_message .= sprintf( $$language{Configuration_POP3Update}, $self->config_( 'port' ) ) . "\n";
              } else {
!                 $error_message .= $$language{Configuration_Error3} . "\n";
              }
          }
***************
*** 777,785 ****
              if ( length($$form{pop3_separator}) == 1 ) {
                  $self->config_( 'separator', $$form{pop3_separator} );
!                 $status_message .= "\n" if ( defined( $status_message ) );
!                 $status_message .= sprintf( $$language{Configuration_POP3SepUpdate}, $self->config_( 'separator' ) );
              } else {
!                 $error_message .= "\n" if ( defined( $error_message ) );
!                 $error_message .= $$language{Configuration_Error1};
              }
          }
--- 777,783 ----
              if ( length($$form{pop3_separator}) == 1 ) {
                  $self->config_( 'separator', $$form{pop3_separator} );
!                 $status_message .= sprintf( $$language{Configuration_POP3SepUpdate}, $self->config_( 'separator' ) ) . "\n";
              } else {
!                 $error_message .= $$language{Configuration_Error1} . "\n";
              }
          }
***************
*** 793,797 ****
          }

!         return($status_message, $error_message);
      }

--- 791,798 ----
          }

!         $status_message =~ s/\n$// if ( defined( $status_message ) );
!         $error_message =~ s/\n// if ( defined( $error_message) );
! 
!         return( $status_message, $error_message );
      }

***************
*** 799,808 ****
          if ( $$form{serveropt_pop3} ) {
              $self->config_( 'local', 0 );
          }
          else {
              $self->config_( 'local', 1 );
          }

!         return(undef, undef);
      }

--- 800,811 ----
          if ( $$form{serveropt_pop3} ) {
              $self->config_( 'local', 0 );
+             $status_message = $$language{Security_ServerModeUpdatePOP3};
          }
          else {
              $self->config_( 'local', 1 );
+             $status_message = $$language{Security_StealthModeUpdatePOP3};
          }

!         return( $status_message, $error_message );
      }

***************
*** 810,815 ****
          if ( defined( $$form{server} ) ) {
              $self->config_( 'secure_server', $$form{server} );
!             $status_message .= "\n" if ( defined( $status_message ) );
!             $status_message .= sprintf( $$language{Security_SecureServerUpdate}, $self->config_( 'secure_server' ) );
         }

--- 813,817 ----
          if ( defined( $$form{server} ) ) {
              $self->config_( 'secure_server', $$form{server} );
!             $status_message .= sprintf( $$language{Security_SecureServerUpdate}, $self->config_( 'secure_server' ) ) . "\n";
         }

***************
*** 817,822 ****
              if ( ( $$form{sport} =~ /^\d+$/ ) && ( $$form{sport} >= 1 ) && ( $$form{sport} < 65536 ) ) {
                  $self->config_( 'secure_port', $$form{sport} );
!                 $status_message .= "\n" if ( defined( $status_message ) );
!                 $status_message .= sprintf( $$language{Security_SecurePortUpdate}, $self->config_( 'secure_port' ) );
              } else {
                  $error_message .= $$language{Security_Error1};
--- 819,823 ----
              if ( ( $$form{sport} =~ /^\d+$/ ) && ( $$form{sport} >= 1 ) && ( $$form{sport} < 65536 ) ) {
                  $self->config_( 'secure_port', $$form{sport} );
!                 $status_message .= sprintf( $$language{Security_SecurePortUpdate}, $self->config_( 'secure_port' ) ) . "\n";
              } else {
                  $error_message .= $$language{Security_Error1};
***************
*** 827,839 ****
              if ( $$form{sssl} ) {
                  $self->config_( 'secure_ssl', 1 );
!                 $status_message .= "\n" if ( defined( $status_message ) );
!                 $status_message .= $$language{Security_SecureServerUseSSLOn};
              } else {
                  $self->config_( 'secure_ssl', 0 );
!                 $status_message .= "\n" if ( defined( $status_message ) );
!                 $status_message .= $$language{Security_SecureServerUseSSLOff};
              }
          }

          return( $status_message, $error_message );
      }
--- 828,841 ----
              if ( $$form{sssl} ) {
                  $self->config_( 'secure_ssl', 1 );
!                 $status_message .= $$language{Security_SecureServerUseSSLOn} . "\n";
              } else {
                  $self->config_( 'secure_ssl', 0 );
!                 $status_message .= $$language{Security_SecureServerUseSSLOff} . "\n";
              }
          }

+         $status_message =~ s/\n$// if ( defined( $status_message ) );
+         $error_message =~ s/\n// if ( defined( $error_message) );
+ 
          return( $status_message, $error_message );
      }

Index: NNTP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/NNTP.pm,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** NNTP.pm	17 Apr 2008 15:13:05 -0000	1.44
--- NNTP.pm	18 Apr 2008 12:41:49 -0000	1.45
***************
*** 487,494 ****
          if ( $form->{serveropt_nntp} ) {
              $self->config_( 'local', 0 );
          } else {
              $self->config_( 'local', 1 );
          }
!         return( undef, undef);
      }    

--- 487,496 ----
          if ( $form->{serveropt_nntp} ) {
              $self->config_( 'local', 0 );
+             $status = $$language{Security_ServerModeUpdateNNTP};
          } else {
              $self->config_( 'local', 1 );
+             $status = $$language{Security_StealthModeUpdateNNTP};
          }
!         return( $status, $error );
      }    

Index: SMTP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/SMTP.pm,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** SMTP.pm	17 Apr 2008 15:13:05 -0000	1.45
--- SMTP.pm	18 Apr 2008 12:41:49 -0000	1.46
***************
*** 403,408 ****
--- 403,410 ----
          if ( $form->{serveropt_smtp} ) {
              $self->config_( 'local', 0 );
+             $status = $$language{Security_ServerModeUpdateSMTP};
          } else {
              $self->config_( 'local', 1 );
+             $status = $$language{Security_StealthModeUpdateSMTP};
          }
          return ( $status, $error );