[popfile-commit] engine/Proxy POP3.pm,1.51,1.52

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

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

Modified Files:
	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

Index: POP3.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/POP3.pm,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** POP3.pm	15 Apr 2003 14:48:09 -0000	1.51
--- POP3.pm	26 Apr 2003 09:44:16 -0000	1.52
***************
*** 269,275 ****
                  if ( $self->config_( 'toptoo' ) ) {
                      if ( $self->echo_response_($mail, $client, "RETR $1" ) ) {
!                         my $class = $self->{classifier__}->classify_and_modify( $mail, $client, $download_count, $count, 1, '' );
                          if ( $self->echo_response_($mail, $client, $command ) ) {
!                             $self->{classifier__}->classify_and_modify( $mail, $client, $download_count, $count, 0, $class );
  
                              # Tell the parent that we just handled a mail
--- 269,283 ----
                  if ( $self->config_( 'toptoo' ) ) {
                      if ( $self->echo_response_($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, undef, $download_count, 0, 1, '', 0 );
!                         
                          if ( $self->echo_response_($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