[popfile-commit] engine/Proxy POP3.pm,1.40.2.1,1.40.2.2

[<ssc...@us...>]

Update of /cvsroot/popfile/engine/Proxy
In directory sc8-pr-cvs1:/tmp/cvs-serv11282

Modified Files:
      Tag: v0/18/1
	POP3.pm 
Log Message:
prevent duplicates, header saving and message over-writing when toptoo is enabled
[ 701390 ] -toptoo 1 results in duplicates in history
[ 705448 ] Right Classification, Wrong Headers
[ 694002 ] email scored as spam but classified as real

Index: POP3.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/POP3.pm,v
retrieving revision 1.40.2.1
retrieving revision 1.40.2.2
diff -C2 -d -r1.40.2.1 -r1.40.2.2
*** POP3.pm	2 Mar 2003 19:26:53 -0000	1.40.2.1
--- POP3.pm	27 Apr 2003 21:05:23 -0000	1.40.2.2
***************
*** 525,531 ****
                  if ( $self->{configuration}->{configuration}{toptoo} ) {
                      if ( echo_response( $self, $mail, $client, "RETR $1" ) ) {
!                         my $class = $self->{classifier}->classify_and_modify( $mail, $client, $download_count, $count, 1, '' );
                          if ( echo_response( $self, $mail, $client, $command ) ) {
!                             $self->{classifier}->classify_and_modify( $mail, $client, $download_count, $count, 0, $class );
  
                              # Tell the parent that we just handled a mail                            
--- 525,539 ----
                  if ( $self->{configuration}->{configuration}{toptoo} ) {
                      if ( echo_response( $self, $mail, $client, "RETR $1" ) ) {
! 
!                         # Classify without echoing to client, without saving 
!                         # and without over-writing any files ($mcount overriden to 0) 
! 
!                         my $class = $self->{classifier}->classify_and_modify( $mail, $client, $download_count, 0, 1, '', 0 );
! 
                          if ( echo_response( $self, $mail, $client, $command ) ) {
! 
!                             # Classify with pre-defined class, without saving, echoing to client
! 
!                             $self->{classifier}->classify_and_modify( $mail, $client, $download_count, 0, 1, $class, 1 );
  
                              # Tell the parent that we just handled a mail