[popfile-commit] engine/Classifier Bayes.pm,1.369,1.370

[naoki i. <am...@us...>]

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

Modified Files:
	Bayes.pm 
Log Message:
Change Log

1. POP3 proxy no longer returns both '+OK' and '-ERR' when bad account
  is passed

  Proxy/POP3.pm

2. POP3S proxy and POP3 proxy share the POP3 accounts

  Classifier/Bayes.pm

3. Account table is used in the transparent proxy mode too

  Classifier/Bayes.pm

    In the transparent proxy mode, if the specified user is not found
    then POPFile will use the accounts table.

4. Add 'timeout' status message on the Password page
5. Add status messages for changing between Multiuser and Single user
  modes on the Administration page

  UI/HTML.pm
  languages/English.pm
  languages/Nihongo.pm

6. Add multiuser mode tests

  tests/TestPOP3.tst

7. Add some tests

  tests/TestBayes.tst

    tests for copying magnets and corpus
    tests for get_magnet_header_and_value

8. Fix TestHTML to pass on MSWin32

  tests/TestHTML.tst
  tests/TestHTML.script

9. Remove an unwanted comment

  UI/HTML.pm



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: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.369
retrieving revision 1.370
diff -C2 -d -r1.369 -r1.370
*** Bayes.pm	25 Apr 2008 16:26:04 -0000	1.369
--- Bayes.pm	28 Apr 2008 11:17:42 -0000	1.370
***************
*** 1871,1879 ****
      }
  
      # If the this is not the pop3 module then return the administrator
      # session since there is currently no token matching for non-POP3
      # accounts.
  
!     if ( ( $module !~ /^pop3s?|insert$/ ) ) {
          return $self->get_single_user_session_key();
      }
--- 1871,1883 ----
      }
  
+     # If the module is pop3s (POP3 over SSL), treat as pop3
+ 
+     $module = 'pop3' if ( $module eq 'pop3s' );
+ 
      # If the this is not the pop3 module then return the administrator
      # session since there is currently no token matching for non-POP3
      # accounts.
  
!     if ( ( $module !~ /^pop3|insert$/ ) ) {
          return $self->get_single_user_session_key();
      }
***************
*** 1881,1885 ****
      my $user;
  
!     if ( $module =~ /^pop3s?$/ ) {
          my ( $server, $username ) = split( /:/, $token );
  
--- 1885,1889 ----
      my $user;
  
!     if ( $module eq 'pop3' ) {
          my ( $server, $username ) = split( /:/, $token );
  
***************
*** 1898,1903 ****
  
              $user = $self->get_user_id( $session, $username );
  
!         } else {
  
              # Check the token against the associations in the database and
--- 1902,1908 ----
  
              $user = $self->get_user_id( $session, $username );
+         }
  
!         if ( !defined( $user ) ) {
  
              # Check the token against the associations in the database and