[popfile-commit] engine/Classifier MailParse.pm,1.133,1.134

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

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

Modified Files:
	MailParse.pm 
Log Message:
Add html:fontcolor pseudoword, fix regular expression in compare_mf so that it's less greedy

Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.133
retrieving revision 1.134
diff -C2 -d -r1.133 -r1.134
*** MailParse.pm	14 Jun 2003 21:10:12 -0000	1.133
--- MailParse.pm	17 Jun 2003 17:21:38 -0000	1.134
***************
*** 66,70 ****
      $self->{quickmagnets__}      = {};
  
!     # These store the current HTML background color and font color to
      # detect "invisible ink" used by spammers
  
--- 66,70 ----
      $self->{quickmagnets__}      = {};
  
!     # These store the current HTML background color2 and font color to
      # detect "invisible ink" used by spammers
  
***************
*** 524,527 ****
--- 524,528 ----
          if ( ( $attribute =~ /^color$/i ) && ( $tag =~ /^font$/i ) ) {
              update_word( $self, $value, $encoded, $quote, $end_quote, '' );
+             $self->update_pseudoword( 'html', "fontcolor$value", $encoded, $original );
              $self->{htmlfontcolor__} = map_color($self, $value);
  			print "Set html font color to $self->{htmlfontcolor__}\n" if ( $self->{debug} );
***************
*** 529,532 ****
--- 530,534 ----
  
          if ( ( $attribute =~ /^text$/i ) && ( $tag =~ /^body$/i ) ) {
+             $self->update_pseudoword( 'html', "fontcolor$value", $encoded, $original );
              update_word( $self, $value, $encoded, $quote, $end_quote, '' );
              $self->{htmlfontcolor__} = map_color($self, $value);
***************
*** 551,554 ****
--- 553,557 ----
          if ( ( $attribute =~ /^(bgcolor|back)$/i ) && ( $tag =~ /^(td|table|body|tr|th|font)$/i ) ) {
              update_word( $self, $value, $encoded, $quote, $end_quote, '' );
+             $self->update_pseudoword( 'html', "backcolor$value" );
              $self->{htmlbackcolor__} = map_color($self, $value);
  			print "Set html back color to $self->{htmlbackcolor__}\n" if ( $self->{debug} );