[popfile-commit] engine/Classifier MailParse.pm,1.83,1.84

[<jgr...@us...>]

Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv28087

Modified Files:
	MailParse.pm 
Log Message:
Merged pkarlin patch that fixes bug 683379

Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** MailParse.pm	17 Feb 2003 10:07:02 -0000	1.83
--- MailParse.pm	18 Feb 2003 12:37:27 -0000	1.84
***************
*** 164,168 ****
                  }
              } else {
!                 $self->{ut} .= "Found in encoded data <font color=\"$color\">$word<\/font>\r\n";
              }
          } else {
--- 164,168 ----
                  }
              } else {
!                 $self->{ut} .= "<font color=\"$color\">$word<\/font> ";
              }
          } else {
***************
*** 920,928 ****
              
              if ( ( $mime ne '' ) && ( $line =~ /^\-\-($mime)(\-\-)?/ ) ) {
-                 $colorized .= clear_out_base64( $self );
                  
                  # approach each mime part with fresh eyes
-                 $encoding = '';
                  
                  
                  if (!defined $2) {
--- 920,927 ----
              
              if ( ( $mime ne '' ) && ( $line =~ /^\-\-($mime)(\-\-)?/ ) ) {
                  
                  # approach each mime part with fresh eyes
                  
+                 $encoding = '';
                  
                  if (!defined $2) {
***************
*** 1049,1060 ****
          parse_html( $self, $decoded, 1 );
  
!         if ( $decoded =~ /[^[:alpha:]\-\.]$/ )  {
!             if ( $self->{color} ) {
!                 my $splitline = $self->{base64};    
!                 $splitline =~ s/([^\r\n]{120})/$1\r\n/g;
!                 $self->{ut} = $splitline;
!             }
  
!             $decoded = '';
  
              if ( $self->{color} )  {
--- 1048,1054 ----
          parse_html( $self, $decoded, 1 );
  
!         print "Decoded: " . $decoded . "\n" if ($self->{debug});
  
!         $self->{ut} = "<b>Found in encoded data:</b> " . $self->{ut} if ( $self->{color} );
  
              if ( $self->{color} )  {
***************
*** 1062,1066 ****
                      $colorized  = $self->{ut};
                      $self->{ut} = '';
-                 }
              }
          }
--- 1056,1059 ----