popfile-commit — CVS commit list messages

[popfile-commit] engine/UI HTML.pm,1.138,1.139

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

Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv5650

Modified Files:
	HTML.pm 
Log Message:
add unmagnetized filter (RFE 683007)

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.138
retrieving revision 1.139
diff -C2 -d -r1.138 -r1.139
*** HTML.pm	19 Apr 2003 10:00:35 -0000	1.138
--- HTML.pm	19 Apr 2003 12:30:04 -0000	1.139
***************
*** 2017,2021 ****
              if ( ( $filter eq '' ) ||
                   ( $self->{history__}{$file}{bucket} eq $filter ) ||
!                  ( ( $filter eq '__filter__magnet' ) && ( $self->{history__}{$file}{magnet} ne '' ) ) ) {
                  if ( ( $search eq '' ) ||
                     ( $self->{history__}{$file}{from}    =~ /\Q$search\E/i ) ||
--- 2017,2022 ----
              if ( ( $filter eq '' ) ||
                   ( $self->{history__}{$file}{bucket} eq $filter ) ||
!                  ( ( $filter eq '__filter__magnet' ) && ( $self->{history__}{$file}{magnet} ne '' ) ) || 
!                  ( ( $filter eq '__filter__no__magnet' ) && ( $self->{history__}{$file}{magnet} eq '' ) ) ) {
                  if ( ( $search eq '' ) ||
                     ( $self->{history__}{$file}{from}    =~ /\Q$search\E/i ) ||
***************
*** 2543,2546 ****
--- 2544,2548 ----
      }
      $body .= "<option value=\"__filter__magnet\"" . ($self->{form_}{filter} eq '__filter__magnet'?' selected':'') . ">&lt;$self->{language__}{History_ShowMagnet}&gt;</option>\n";
+     $body .= "<option value=\"__filter__no__magnet\"" . ($self->{form_}{filter} eq '__filter__no__magnet'?' selected':'') . ">&lt;$self->{language__}{History_ShowNoMagnet}&gt;</option>\n";
      $body .= "<option value=\"unclassified\"" . ($self->{form_}{filter} eq 'unclassified'?' selected':'') . ">&lt;unclassified&gt;</option>\n";
      $body .= "</select>\n<input type=\"submit\" class=\"submit\" name=\"setfilter\" value=\"$self->{language__}{Filter}\" />\n";
***************
*** 2599,2606 ****
      # indicating the current filter and search settings
  
      my $filtered = '';
!     if ( !( $self->{form_}{filter} eq '' ) ) {
!         if ( $self->{form_}{filter} eq '__filter__magnet' ) {
              $filtered .= $self->{language__}{History_Magnet};
          } else {
              $filtered = sprintf( $self->{language__}{History_Filter}, $self->{classifier__}->get_bucket_color($self->{form_}{filter}), $self->{form_}{filter} ) if ( $self->{form_}{filter} ne '' );
--- 2601,2611 ----
      # indicating the current filter and search settings
  
+     my $filter = $self->{form_}{filter};
      my $filtered = '';
!     if ( !( $filter eq '' ) ) {
!         if ( $filter eq '__filter__magnet' ) {
              $filtered .= $self->{language__}{History_Magnet};
+         } elsif ( $filter eq '__filter__no__magnet' ) {
+             $filtered .= $self->{language__}{History_NoMagnet};
          } else {
              $filtered = sprintf( $self->{language__}{History_Filter}, $self->{classifier__}->get_bucket_color($self->{form_}{filter}), $self->{form_}{filter} ) if ( $self->{form_}{filter} ne '' );

[popfile-commit] engine/Classifier Bayes.pm,1.107.2.3,1.107.2.4

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

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

Modified Files:
      Tag: v0/18/1
	Bayes.pm 
Log Message:
fix odd return value from classify_file for some messages: "unclassified "
No idea where that came from

Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.107.2.3
retrieving revision 1.107.2.4
diff -C2 -d -r1.107.2.3 -r1.107.2.4
*** Bayes.pm	19 Apr 2003 11:22:46 -0000	1.107.2.3
--- Bayes.pm	19 Apr 2003 11:53:55 -0000	1.107.2.4
***************
*** 438,442 ****
          close PARAMS;
      } else {
!         write_parameters();
      }
      
--- 438,442 ----
          close PARAMS;
      } else {
!         $self->write_parameters();
      }
      
***************
*** 596,600 ****
  
      # If the user has not defined any buckets then we escape here return unclassified
!     return "unclassified " if ( $#buckets == -1 );
  
      # The score hash will contain the likelihood that the given message is in each
--- 596,600 ----
  
      # If the user has not defined any buckets then we escape here return unclassified
!     return "unclassified" if ( $#buckets == -1 );
  
      # The score hash will contain the likelihood that the given message is in each

[popfile-commit] engine/Classifier Bayes.pm,1.107.2.2,1.107.2.3

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

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

Modified Files:
      Tag: v0/18/1
	Bayes.pm 
Log Message:
fix warning on unclassified message (bug 697278) and save new bucket default parameters

Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.107.2.2
retrieving revision 1.107.2.3
diff -C2 -d -r1.107.2.2 -r1.107.2.3
*** Bayes.pm	8 Apr 2003 04:23:19 -0000	1.107.2.2
--- Bayes.pm	19 Apr 2003 11:22:46 -0000	1.107.2.3
***************
*** 215,223 ****
  
      for my $bucket (keys %{$self->{total}})  {
!         open PARAMS, ">$self->{configuration}->{configuration}{corpus}/$bucket/params";
!         for my $param (keys %{$self->{parameters}{$bucket}}) {
!             print PARAMS "$param $self->{parameters}{$bucket}{$param}\n";
          }
-         close PARAMS;
      }
  }
--- 215,224 ----
  
      for my $bucket (keys %{$self->{total}})  {
!         if (open PARAMS, ">$self->{configuration}->{configuration}{corpus}/$bucket/params") {
!             for my $param (keys %{$self->{parameters}{$bucket}}) {
!                 print PARAMS "$param $self->{parameters}{$bucket}{$param}\n";
!             }
!             close PARAMS;
          }
      }
  }
***************
*** 389,392 ****
--- 390,401 ----
      
      $self->{colors}{unclassified} = 'black';
+ 
+     # SLM for unclassified "bucket" will always match the global setting
+ 
+     $self->{parameters}{unclassified}{subject} = $self->{configuration}->{configuration}{subject};
+ 
+     # Quarantine for unclassified will be off:
+ 
+     $self->{parameters}{unclassified}{quarantine} = 0;
      
      print "Corpus loaded with $self->{full_total} entries\n" if $self->{debug};
***************
*** 428,432 ****
--- 437,444 ----
          }
          close PARAMS;
+     } else {
+         write_parameters();
      }
+     
  
      # See if there are magnets defined

[popfile-commit] engine/Classifier Bayes.pm,1.128,1.129

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

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

Modified Files:
	Bayes.pm 
Log Message:
fix warning on unclassified message (bug 697278) and save new bucket default parameters

Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.128
retrieving revision 1.129
diff -C2 -d -r1.128 -r1.129
*** Bayes.pm	18 Apr 2003 18:58:22 -0000	1.128
--- Bayes.pm	19 Apr 2003 11:07:13 -0000	1.129
***************
*** 340,343 ****
--- 340,352 ----
  
      $self->{colors__}{unclassified} = 'black';
+ 
+     # SLM for unclassified "bucket" will always match the global setting
+ 
+     $self->{parameters__}{unclassified}{subject} = $self->global_config_('subject');
+ 
+     # Quarantine for unclassified will be off:
+ 
+     $self->{parameters__}{unclassified}{quarantine} = 0;
+ 
  }
  
***************
*** 375,378 ****
--- 384,389 ----
          }
          close PARAMS;
+     } else {
+         $self->write_parameters();        
      }
  

[popfile-commit] engine/UI HTML.pm,1.137,1.138

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

Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv30703

Modified Files:
	HTML.pm 
Log Message:
next + previous buttons on single-message view, some html tidying

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.137
retrieving revision 1.138
diff -C2 -d -r1.137 -r1.138
*** HTML.pm	18 Apr 2003 21:05:21 -0000	1.137
--- HTML.pm	19 Apr 2003 10:00:35 -0000	1.138
***************
*** 2862,2869 ****
      $self->{form_}{search} = '' if ( !defined( $self->{form_}{search} ) );
      $self->{form_}{filter} = '' if ( !defined( $self->{form_}{filter} ) );
  
!     my $body = "<h2 class=\"buckets\">$self->{language__}{View_Title}</h2>\n";
  
      $body .= "<table class=\"openMessageTable\" cellpadding=\"10%\" cellspacing=\"0\" width=\"100%\" summary=\"$self->{language__}{History_OpenMessageSummary}\">\n";
  
      $body .= "<tr><td>";
--- 2862,2910 ----
      $self->{form_}{search} = '' if ( !defined( $self->{form_}{search} ) );
      $self->{form_}{filter} = '' if ( !defined( $self->{form_}{filter} ) );
+     
+     my $index;
+     foreach my $i ( $start_message  .. $start_message + $self->config_( 'page_size' ) - 1) {
+         if ( $self->{history_keys__}[$i] eq $mail_file ) {
+             $index = $i;
+             last;
+         }
+     }
  
!     my $body = "<table width=\"100%\" summary=\"\">\n<tr>\n<td align=\"left\">\n";
! 
!     # title
!     $body .= "<h2 class=\"buckets\">$self->{language__}{View_Title}</h2>\n</td>\n";
! 
!     # navigator
!     $body .= "<td>\n";
! 
!     if ( $index > 0 ) {
!         $body .= "<a href=\"/view?view=" . $self->{history_keys__}[ $index - 1 ];
!         $body .= "&start_message=". ((( $index - 1 ) >= $start_message )?$start_message:($start_message - $self->config_( 'page_size' )));
!         $body .= "&session=$self->{session_key__}&sort=$self->{form_}{sort}&filter=$self->{form_}{filter}&search=$self->{form_}{search}\">&lt;&lt;";
!         $body .= $self->{language__}{Previous};
!         $body .= "</a> ";
!     }
! 
!     if ( $index < ( $self->history_size() - 1 ) ) {
!         $body .= "<a href=\"/view?view=" . $self->{history_keys__}[ $index + 1 ];
!         $body .= "&start_message=". ((( $index + 1 ) < ( $start_message + $self->config_( 'page_size' ) ) )?$start_message:($start_message + $self->config_( 'page_size' )));
!         $body .= "&session=$self->{session_key__}&sort=$self->{form_}{sort}&filter=$self->{form_}{filter}&search=$self->{form_}{search}\"> ";
!         $body .= $self->{language__}{Next};
!         $body .= "&gt;&gt;</a>";
!     }
! 
!     $body .= "</td>\n</tr>\n</table>\n";
! 
!     # message
  
      $body .= "<table class=\"openMessageTable\" cellpadding=\"10%\" cellspacing=\"0\" width=\"100%\" summary=\"$self->{language__}{History_OpenMessageSummary}\">\n";
+     
+     # Close button
+ 
+     $body .= "<tr>\n<td class=\"openMessageCloser\">";
+     $body .= "<a class=\"messageLink\" href=\"/history?start_message=$start_message&amp;session=$self->{session_key__}&amp;sort=$self->{form_}{sort}&amp;search=$self->{form_}{search}&amp;filter=$self->{form_}{filter}\">\n";
+     $body .= "<span class=\"historyLabel\">$self->{language__}{Close}</span>\n</a>\n";
+     $body .= "</td>\n</tr>\n";
  
      $body .= "<tr><td>";
***************
*** 2874,2914 ****
      $body .= "<input type=\"hidden\" name=\"start_message\" value=\"$start_message\" />\n";
      $body .= "<input type=\"hidden\" name=\"filter\" value=\"$self->{form_}{filter}\" />\n";    
!     $body .= "<table><tr><td><font size=+1><p><b>$self->{language__}{From}</b>: </td><td>$self->{history__}{$mail_file}{from}</font></td></tr>";
!     $body .= "<tr><td><font size=+1><b>$self->{language__}{Subject}</b>: </td><td>$self->{history__}{$mail_file}{subject}</font></td></tr>";
!     $body .= "<tr><td><font size=+1><b>$self->{language__}{Classification}</b>: </td><td><font color=\"$color\">$self->{history__}{$mail_file}{bucket}</font></font></td></tr>";
! 
!     $body .= "<tr><td><font size=+1>";
  
!     my $index;
!     foreach my $i ( $start_message  .. $start_message + $self->config_( 'page_size' ) - 1) {
!         if ( $self->{history_keys__}[$i] eq $mail_file ) {
!             $index = $i;
!             last;
!         }
!     }
  
      if ( $reclassified ) {
!       $body .= sprintf( $self->{language__}{History_Already}, ($color || ''), ($bucket || '') );
!       $body .= " <input type=\"submit\" class=\"undoButton\" name=\"undo_$index\" value=\"$self->{language__}{Undo}\">\n";
      } else {
!       if ( $self->{history__}{$mail_file}{magnet} eq '' ) {
! 	$body .= "\n$self->{language__}{History_ShouldBe}: <select name=\"$index\">\n";
! 
! 	# Show a blank bucket field
! 	$body .= "<option selected=\"selected\"></option>\n";
! 
! 	foreach my $abucket ($self->{classifier__}->get_buckets()) {
! 	  $body .= "<option value=\"$abucket\">$abucket</option>\n";
! 	}
! 	$body .= "</select>\n<input type=\"submit\" class=\"reclassifyButton\" name=\"change\" value=\"$self->{language__}{Reclassify}\" />";
!       } else {
! 	$body .= " ($self->{language__}{History_MagnetUsed}: $self->{history__}{$mail_file}{magnet})";
!       }
      }
  
      $body .= "</font></td></tr>";
  
      # Message body
!     $body .= "</table></form></td></tr><tr>\n<td class=\"openMessageBody\"><hr><p>";
  
      if ( $self->{history__}{$mail_file}{magnet} eq '' ) {
--- 2915,2950 ----
      $body .= "<input type=\"hidden\" name=\"start_message\" value=\"$start_message\" />\n";
      $body .= "<input type=\"hidden\" name=\"filter\" value=\"$self->{form_}{filter}\" />\n";    
!     $body .= "<table align=left>";    
!     $body .= "<tr><td><font size=+1><b>$self->{language__}{From}</b>: </font></td><td><font size=+1>$self->{history__}{$mail_file}{from}</font></td></tr>";
!     $body .= "<tr><td><font size=+1><b>$self->{language__}{Subject}</b>: </font></td><td><font size=+1>$self->{history__}{$mail_file}{subject}</font></td></tr>";
!     $body .= "<tr><td><font size=+1><b>$self->{language__}{Classification}</b>: </font></td><td><font size=+1><font color=\"$color\">$self->{history__}{$mail_file}{bucket}</font></font></td></tr>";
  
!     $body .= "<tr><td colspan=2><font size=+1>";
  
      if ( $reclassified ) {
!         $body .= sprintf( $self->{language__}{History_Already}, ($color || ''), ($bucket || '') );
!         $body .= " <input type=\"submit\" class=\"undoButton\" name=\"undo_$index\" value=\"$self->{language__}{Undo}\">\n";
      } else {
!         if ( $self->{history__}{$mail_file}{magnet} eq '' ) {
!         	$body .= "\n$self->{language__}{History_ShouldBe}: <select name=\"$index\">\n";
!         
!         	# Show a blank bucket field
!         	$body .= "<option selected=\"selected\"></option>\n";
!         
!         	foreach my $abucket ($self->{classifier__}->get_buckets()) {
!         	    $body .= "<option value=\"$abucket\">$abucket</option>\n";
!         	}
!         	$body .= "</select>\n<input type=\"submit\" class=\"reclassifyButton\" name=\"change\" value=\"$self->{language__}{Reclassify}\" />";
!         } else {
! 	        $body .= " ($self->{language__}{History_MagnetUsed}: $self->{history__}{$mail_file}{magnet})";
!         }
      }
  
      $body .= "</font></td></tr>";
+     $body .= "</table></form>";    
+     $body .= "</td></tr>";
  
      # Message body
!     $body .= "<tr>\n<td class=\"openMessageBody\"><hr><p>";
  
      if ( $self->{history__}{$mail_file}{magnet} eq '' ) {
***************
*** 2974,2978 ****
      $body .= "</td>\n</tr>\n";
  
!     $body .= "</tr></table>";
  
      $self->http_ok( $client, $body, 2 );
--- 3010,3014 ----
      $body .= "</td>\n</tr>\n";
  
!     $body .= "</table>";
  
      $self->http_ok( $client, $body, 2 );

[popfile-commit] engine/UI HTML.pm,1.136,1.137

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

Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv2914/UI

Modified Files:
	HTML.pm 
Log Message:
Add Reclassify and Remove buttons to top of History list

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.136
retrieving revision 1.137
diff -C2 -d -r1.136 -r1.137
*** HTML.pm	18 Apr 2003 21:02:00 -0000	1.136
--- HTML.pm	18 Apr 2003 21:05:21 -0000	1.137
***************
*** 2741,2746 ****
  
  
!         $body .= "<th class=\"historyLabel\" scope=\"col\">$self->{language__}{History_ShouldBe}</th>\n";
!         $body .= "<th class=\"historyLabel\" scope=\"col\">$self->{language__}{Remove}</th>\n</tr>\n";
  
          my $stripe = 0;
--- 2741,2746 ----
  
  
!         $body .= "<th class=\"historyLabel\" scope=\"col\"><input type=\"submit\" class=\"reclassifyButton\" name=\"change\" value=\"$self->{language__}{Reclassify}\" /></th>\n";
!         $body .= "<th class=\"historyLabel\" scope=\"col\"><input type=\"submit\" class=\"deleteButton\" name=\"deletemessage\" value=\"$self->{language__}{Remove}\" /></th>\n</tr>\n";
  
          my $stripe = 0;

[popfile-commit] engine/POPFile Logger.pm,1.13,1.14

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

Update of /cvsroot/popfile/engine/POPFile
In directory sc8-pr-cvs1:/tmp/cvs-serv1421/POPFile

Modified Files:
	Logger.pm 
Log Message:
Create link for log file on Configuration page and enable downloading of log files

Index: Logger.pm
===================================================================
RCS file: /cvsroot/popfile/engine/POPFile/Logger.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Logger.pm	5 Mar 2003 21:21:40 -0000	1.13
--- Logger.pm	18 Apr 2003 21:01:59 -0000	1.14
***************
*** 155,157 ****
--- 155,166 ----
  }
  
+ # GETTERS/SETTERS
+ 
+ sub debug_filename
+ {
+     my ( $self ) = @_;
+ 
+     return $self->{debug_filename__};
+ }
+ 
  1;

[popfile-commit] engine/languages English.msg,1.26,1.27

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

Update of /cvsroot/popfile/engine/languages
In directory sc8-pr-cvs1:/tmp/cvs-serv1421/languages

Modified Files:
	English.msg 
Log Message:
Create link for log file on Configuration page and enable downloading of log files

Index: English.msg
===================================================================
RCS file: /cvsroot/popfile/engine/languages/English.msg,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** English.msg	18 Apr 2003 18:58:24 -0000	1.26
--- English.msg	18 Apr 2003 21:02:02 -0000	1.27
***************
*** 112,115 ****
--- 112,116 ----
  Configuration_SmallSkins                Small Skins
  Configuration_TinySkins                 Tiny Skins
+ Configuration_CurrentLogFile            <current log file>
  
  Advanced_Error1                         '%s' already in the Ignored Words list

[popfile-commit] engine/UI HTML.pm,1.135,1.136

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

Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv1421/UI

Modified Files:
	HTML.pm 
Log Message:
Create link for log file on Configuration page and enable downloading of log files

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -d -r1.135 -r1.136
*** HTML.pm	18 Apr 2003 18:58:23 -0000	1.135
--- HTML.pm	18 Apr 2003 21:02:00 -0000	1.136
***************
*** 304,307 ****
--- 304,312 ----
      }
  
+     if ( $url =~ /(popfile.*\.log)/ ) {
+         $self->http_file_( $client, $1, 'text/plain' );
+         return 1;
+     }
+ 
      if ( $url =~ /\/(.+\.gif)/ ) {
          $self->http_file_( $client, $1, 'image/gif' );
***************
*** 926,930 ****
      $body .= ">$self->{language__}{Configuration_ToScreenFile}</option>\n";
      $body .= "</select>\n<input type=\"submit\" class=\"submit\" name=\"submit_debug\" value=\"$self->{language__}{Apply}\" />\n";
!     $body .= "</form>\n</td>\n</tr>\n</table>\n";
  
      http_ok($self, $client,$body,0);
--- 931,941 ----
      $body .= ">$self->{language__}{Configuration_ToScreenFile}</option>\n";
      $body .= "</select>\n<input type=\"submit\" class=\"submit\" name=\"submit_debug\" value=\"$self->{language__}{Apply}\" />\n";
!     $body .= "</form>\n";
! 
!     if ( $self->global_config_( 'debug' ) & 1 ) {
!         $body .= "<p><a href=\"" . $self->logger()->debug_filename() . "\">$self->{language__}{Configuration_CurrentLogFile}</a>";
!     }
! 
!     $body .= "</td>\n</tr>\n</table>\n";
  
      http_ok($self, $client,$body,0);

[popfile-commit] engine/languages English.msg,1.25,1.26

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

Update of /cvsroot/popfile/engine/languages
In directory sc8-pr-cvs1:/tmp/cvs-serv7209/languages

Modified Files:
	English.msg 
Log Message:
Completed the implementation of QuickMagnets, moved the viewing of a message to its own page (/view)

Index: English.msg
===================================================================
RCS file: /cvsroot/popfile/engine/languages/English.msg,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** English.msg	12 Apr 2003 21:16:54 -0000	1.25
--- English.msg	18 Apr 2003 18:58:24 -0000	1.26
***************
*** 238,241 ****
--- 238,242 ----
  Session_Error                           Your POPFile session has expired.  This could have been caused by starting and stopping POPFile but leaving your web browser open.  Please click one of the links above to continue using POPFile.
  
+ View_Title                              Single Message View
  
  Header_MenuSummary                      This table is the navigation menu which allows access to each of the different pages of the control center.

[popfile-commit] engine/Classifier Bayes.pm,1.127,1.128 MailParse.pm,1.113,1.114

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

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

Modified Files:
	Bayes.pm MailParse.pm 
Log Message:
Completed the implementation of QuickMagnets, moved the viewing of a message to its own page (/view)

Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.127
retrieving revision 1.128
diff -C2 -d -r1.127 -r1.128
*** Bayes.pm	16 Apr 2003 23:52:28 -0000	1.127
--- Bayes.pm	18 Apr 2003 18:58:22 -0000	1.128
***************
*** 592,631 ****
      # less than 2 ** -54 is insignificant, and need not be computed.
  
      foreach my $b (@ranking) {
          $raw_score{$b} = $score{$b};
          $score{$b} -= $base_score;
!         
!         # ln(2) =~ 0.693147180559945309417232121458177
!         
!         $total += exp($score{$b}) if ($score{$b} > ( -54 * 0.693147180559945309417232121458177 ) );
      }
  
      if ($self->{wordscores__} && defined($ui) ) {
          my @qm = @{$self->{parser__}->quickmagnets()};
!         my %language = $ui->language();
          my $session_key = $ui->session_key();
  
          if ( $#qm >= 0 ) {
!             $self->{scores__} = "<p><b>$language{QuickMagnets}</b><p>\n<table class=\"top20Words\">\n<tr>\n<th scope=\"col\">$language{Magnet}</th>\n<th>$language{Magnet_Always}</th>\n";
! 
!             foreach my $m (@qm) {
!                 $self->{scores__} .= "<tr><td scope=\"col\">$m</td><td>";
  
!                 $self->{scores__} .= "<form action=\"/magnets\">\n";
!                 $self->{scores__} .= "<input type=\"hidden\" name=\"session\" value=\"$session_key\" />";
!                 $self->{scores__} .= "<input type=\"hidden\" name=\"type\" id=\"magnetsAddType\" />";
!                 $self->{scores__} .= "<input type=\"hidden\" name=\"text\" id=\"magnetsAddText\" />";
  
!                 $self->{scores__} .= "<select name=\"bucket\" id=\"magnetsAddBucket\">\n<option value=\"\"></option>\n";
  
-                 my @buckets = $self->get_buckets();
                  foreach my $bucket (@buckets) {
                      $self->{scores__} .= "<option value=\"$bucket\">$bucket</option>\n";
                  }
  
!                 $self->{scores__} .= "</select><input type=\"submit\" class=\"submit\" name=\"create\" value=\"$language{Create}\" /></form></td></tr>";
  	    }
  
!             $self->{scores__} .= "</table>";
  	}
  
--- 592,635 ----
      # less than 2 ** -54 is insignificant, and need not be computed.
  
+     my $ln2 = log(2);
+ 
      foreach my $b (@ranking) {
          $raw_score{$b} = $score{$b};
          $score{$b} -= $base_score;
! 
!         $total += exp($score{$b}) if ($score{$b} > ( -54 * $ln2 ) );
      }
  
      if ($self->{wordscores__} && defined($ui) ) {
          my @qm = @{$self->{parser__}->quickmagnets()};
!         my %language    = $ui->language();
          my $session_key = $ui->session_key();
  
          if ( $#qm >= 0 ) {
!             my @buckets = $self->get_buckets();
!             my $i = 0;
!             $self->{scores__} .= "<form action=\"/magnets\" method=\"POST\">\n";
!             $self->{scores__} .= "<input type=\"hidden\" name=\"session\" value=\"$session_key\" />";
!             $self->{scores__} .= "<input type=\"hidden\" name=\"count\" value=\"" . ($#qm+1) . "\" />";
!             $self->{scores__} .= "<hr><b>$language{QuickMagnets}</b><p>\n<table class=\"top20Words\">\n<tr>\n<th scope=\"col\">$language{Magnet}</th>\n<th>$language{Magnet_Always}</th>\n";
  
!             while ( $#qm >= 0 ) {
!                 my $type = shift @qm;
!                 my $text = shift @qm;
!                 $i += 1;
  
!                 $self->{scores__} .= "<tr><td scope=\"col\">$type: $text</td><td>";
!                 $self->{scores__} .= "<input type=\"hidden\" name=\"type$i\" id=\"magnetsAddType\" value=\"$type\"/>";
!                 $self->{scores__} .= "<input type=\"hidden\" name=\"text$i\" id=\"magnetsAddText\" value=\"$text\"/>";
!                 $self->{scores__} .= "<select name=\"bucket$i\" id=\"magnetsAddBucket\">\n<option value=\"\"></option>\n";
  
                  foreach my $bucket (@buckets) {
                      $self->{scores__} .= "<option value=\"$bucket\">$bucket</option>\n";
                  }
  
!                 $self->{scores__} .= "</select></td></tr>";
  	    }
  
!             $self->{scores__} .= "<tr><td></td><td><input type=\"submit\" class=\"submit\" name=\"create\" value=\"$language{Create}\" /></td></tr></table></form>";
  	}
  
***************
*** 647,651 ****
  
          $self->{scores__} .= "</table><hr>";
!         $self->{scores__} .= "<table class=\"top20Words\">\n<tr><td colspan=\"4\">&nbsp;</td></tr>\n";
          $self->{scores__} .= "<tr>\n<th scope=\"col\">$language{Word}</th><th>&nbsp;</th><th scope=\"col\">$language{Count}</th><th>&nbsp;</th>\n";
  
--- 651,655 ----
  
          $self->{scores__} .= "</table><hr>";
!         $self->{scores__} .= "<table class=\"top20Words\">\n";
          $self->{scores__} .= "<tr>\n<th scope=\"col\">$language{Word}</th><th>&nbsp;</th><th scope=\"col\">$language{Count}</th><th>&nbsp;</th>\n";
  

Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** MailParse.pm	12 Apr 2003 22:52:57 -0000	1.113
--- MailParse.pm	18 Apr 2003 18:58:23 -0000	1.114
***************
*** 181,185 ****
  
          if ( $prefix =~ /(from|to|cc|subject)/i ) {
!             push @{$self->{quickmagnets__}}, ("$prefix: $word");
          }
  
--- 181,185 ----
  
          if ( $prefix =~ /(from|to|cc|subject)/i ) {
!             push @{$self->{quickmagnets__}}, ($prefix, $word);
          }
  

[popfile-commit] engine/UI HTML.pm,1.134,1.135

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

Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv7209/UI

Modified Files:
	HTML.pm 
Log Message:
Completed the implementation of QuickMagnets, moved the viewing of a message to its own page (/view)

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -d -r1.134 -r1.135
*** HTML.pm	16 Apr 2003 23:48:31 -0000	1.134
--- HTML.pm	18 Apr 2003 18:58:23 -0000	1.135
***************
*** 190,194 ****
  
      # This needs to occur at launch, but after initialization
!     
      $self->remove_mail_files();
      $self->calculate_today();
--- 190,194 ----
  
      # This needs to occur at launch, but after initialization
! 
      $self->remove_mail_files();
      $self->calculate_today();
***************
*** 299,304 ****
          # true if the file exists).
  
!         $self->invalidate_history_cache() if ( !$found && ( -e ($self->global_config_( 'msgdir' ) . "$file") ) );
!         $self->http_redirect_( $client, "/history?session=$self->{session_key__}&start_message=0&view=$self->{form_}{view}#$self->{form_}{view}" );
          return 1;
      }
--- 299,304 ----
          # true if the file exists).
  
!         $self->invalidate_history_cache() if ( !$found && ( -e ( $self->global_config_( 'msgdir' ) . $file ) ) );
!         $self->http_redirect_( $client, "/view?session=$self->{session_key__}&view=$self->{form_}{view}&start_message=$self->{form_}{start_message}" );
          return 1;
      }
***************
*** 363,366 ****
--- 363,367 ----
                          '/advanced'      => \&advanced_page,
                          '/history'       => \&history_page,
+                         '/view'          => \&view_page,
                          '/'              => \&history_page );
  
***************
*** 1211,1250 ****
  
      my $magnet_message = '';
!     if ( ( defined($self->{form_}{type}) ) && ( $self->{form_}{bucket} ne '' ) && ( $self->{form_}{text} ne '' ) ) {
!         my $found = 0;
!         for my $bucket ($self->{classifier__}->get_buckets_with_magnets()) {
!             my %magnets = $self->{classifier__}->get_magnets( $bucket, $self->{form_}{type} );
!             if ( defined( $magnets{$self->{form_}{text}}) ) {
!                 $found  = 1;
!                 $magnet_message = "<blockquote>\n<div class=\"error02\">\n<b>";
!                 $magnet_message .= sprintf( $self->{language__}{Magnet_Error1}, "$self->{form_}{type}: $self->{form_}{text}", $bucket );
!                 $magnet_message .= "</b>\n</div>\n</blockquote>\n";
!             }
!         }
  
!         if ( $found == 0 )  {
!             for my $bucket ($self->{classifier__}->get_buckets_with_magnets()) {
!             my %magnets = $self->{classifier__}->get_magnets( $bucket, $self->{form_}{type} );
!                 for my $from (keys %magnets)  {
!                     if ( ( $self->{form_}{text} =~ /\Q$from\E/ ) || ( $from =~ /\Q$self->{form_}{text}\E/ ) )  {
!                         $found = 1;
!                         $magnet_message = "<blockquote><div class=\"error02\"><b>" . sprintf( $self->{language__}{Magnet_Error2}, "$self->{form_}{type}: $self->{form_}{text}", "$self->{form_}{type}: $from", $bucket ) . "</b></div></blockquote>";
                      }
                  }
-             }
-         }
  
!         if ( $found == 0 ) {
  
!             # It is possible to type leading or trailing white space in a magnet definition
!             # which can later cause mysterious failures because the whitespace is eaten by
!             # the browser when the magnet is displayed but is matched in the regular expression
!             # that does the magnet matching and will cause failures... so strip off the whitespace
  
!             $self->{form_}{text} =~ s/^[ \t]+//;
!             $self->{form_}{text} =~ s/[ \t]+$//;
  
!             $self->{classifier__}->create_magnet( $self->{form_}{bucket}, $self->{form_}{type}, $self->{form_}{text});
!             $magnet_message = "<blockquote>" . sprintf( $self->{language__}{Magnet_Error3}, "$self->{form_}{type}: $self->{form_}{text}", $self->{form_}{bucket} ) . "</blockquote>";
          }
      }
--- 1212,1264 ----
  
      my $magnet_message = '';
!     if ( defined( $self->{form_}{count} ) ) {
!         for my $i ( 1 .. $self->{form_}{count} ) {
!             my $mtype   = $self->{form_}{"type$i"};
!             my $mtext   = $self->{form_}{"text$i"};
!             my $mbucket = $self->{form_}{"bucket$i"};
  
!             if ( ( defined($mbucket) ) && ( $mbucket ne '' ) && ( $mtext ne '' ) ) {
!                 my $found = 0;
! 
!                 for my $bucket ($self->{classifier__}->get_buckets_with_magnets()) {
!                     my %magnets = $self->{classifier__}->get_magnets( $bucket, $mtype );
! 
!                     if ( defined( $magnets{$mtext} ) ) {
!                         $found  = 1;
!                         $magnet_message .= "<blockquote>\n<div class=\"error02\">\n<b>";
!                         $magnet_message .= sprintf( $self->{language__}{Magnet_Error1}, "$mtype: $mtext", $bucket );
!                         $magnet_message .= "</b>\n</div>\n</blockquote>\n";
!                         last;
                      }
                  }
  
!                 if ( $found == 0 )  {
!                     for my $bucket ($self->{classifier__}->get_buckets_with_magnets()) {
!                         my %magnets = $self->{classifier__}->get_magnets( $bucket, $mtype );
  
!                         for my $from (keys %magnets)  {
!                             if ( ( $mtext =~ /\Q$from\E/ ) || ( $from =~ /\Q$mtext\E/ ) )  {
!                                 $found = 1;
!                                 $magnet_message .= "<blockquote><div class=\"error02\"><b>" . sprintf( $self->{language__}{Magnet_Error2}, "$mtype: $mtext", "$mtype: $from", $bucket ) . "</b></div></blockquote>";
!                                 last;
!                             }
!                         }
!                     }
! 		}
  
!                 if ( $found == 0 ) {
  
!                     # It is possible to type leading or trailing white space in a magnet definition
!                     # which can later cause mysterious failures because the whitespace is eaten by
!                     # the browser when the magnet is displayed but is matched in the regular expression
!                     # that does the magnet matching and will cause failures... so strip off the whitespace
! 
!                     $mtext =~ s/^[ \t]+//;
!                     $mtext =~ s/[ \t]+$//;
! 
!                     $self->{classifier__}->create_magnet( $mbucket, $mtype, $mtext );
!                     $magnet_message .= "<blockquote>" . sprintf( $self->{language__}{Magnet_Error3}, "$mtype: $mtext", $mbucket ) . "</blockquote>";
! 		}
!             }
          }
      }
***************
*** 1316,1331 ****
      # Magnet Type widget
      $body .= "<label class=\"magnetsLabel\" for=\"magnetsAddType\">$self->{language__}{Magnet_MagnetType}:</label><br />\n";
!     $body .= "<select name=\"type\" id=\"magnetsAddType\">\n<option value=\"from\">\n$self->{language__}{From}</option>\n";
      $body .= "<option value=\"to\">\n$self->{language__}{To}</option>\n";
      $body .= "<option value=\"subject\">\n$self->{language__}{Subject}</option>\n</select>\n";
      $body .= "<input type=\"hidden\" name=\"session\" value=\"$self->{session_key__}\" />\n<br /><br />\n";
  
      # Value widget
      $body .= "<label class=\"magnetsLabel\" for=\"magnetsAddText\">$self->{language__}{Magnet_Value}:</label><br />\n";
!     $body .= "<input type=\"text\" name=\"text\" id=\"magnetsAddText\" />\n<br /><br />\n";
  
      # Always Goes to Bucket widget
      $body .= "<label class=\"magnetsLabel\" for=\"magnetsAddBucket\">$self->{language__}{Magnet_Always}:</label><br />\n";
!     $body .= "<select name=\"bucket\" id=\"magnetsAddBucket\">\n<option value=\"\"></option>\n";
  
      my @buckets = $self->{classifier__}->get_buckets();
--- 1330,1346 ----
      # Magnet Type widget
      $body .= "<label class=\"magnetsLabel\" for=\"magnetsAddType\">$self->{language__}{Magnet_MagnetType}:</label><br />\n";
!     $body .= "<select name=\"type1\" id=\"magnetsAddType\">\n<option value=\"from\">\n$self->{language__}{From}</option>\n";
      $body .= "<option value=\"to\">\n$self->{language__}{To}</option>\n";
      $body .= "<option value=\"subject\">\n$self->{language__}{Subject}</option>\n</select>\n";
      $body .= "<input type=\"hidden\" name=\"session\" value=\"$self->{session_key__}\" />\n<br /><br />\n";
+     $body .= "<input type=\"hidden\" name=\"count\" value=\"1\" />\n";
  
      # Value widget
      $body .= "<label class=\"magnetsLabel\" for=\"magnetsAddText\">$self->{language__}{Magnet_Value}:</label><br />\n";
!     $body .= "<input type=\"text\" name=\"text1\" id=\"magnetsAddText\" />\n<br /><br />\n";
  
      # Always Goes to Bucket widget
      $body .= "<label class=\"magnetsLabel\" for=\"magnetsAddBucket\">$self->{language__}{Magnet_Always}:</label><br />\n";
!     $body .= "<select name=\"bucket1\" id=\"magnetsAddBucket\">\n<option value=\"\"></option>\n";
  
      my @buckets = $self->{classifier__}->get_buckets();
***************
*** 2647,2678 ****
          $start_message = $self->{form_}{start_message} if ( ( defined($self->{form_}{start_message}) ) && ($self->{form_}{start_message} > 0 ) );
          my $stop_message  = $start_message + $self->config_( 'page_size' ) - 1;
- 
-         # Verify that a message we are being asked to view (perhaps from a /jump_to_message URL) is actually between
-         # the $start_message and $stop_message, if it is not then move to that message
- 
-         if ( defined($self->{form_}{view}) ) {
-             my $found = 0;
-             foreach my $i ($start_message ..  $stop_message) {
-                 if ( defined ( $self->{history_keys__}[$i] ) ) {
-                     my $mail_file = $self->{history_keys__}[$i];
-                     if ( $self->{form_}{view} eq $mail_file )  {
-                         $found = 1;
-                         last;
-                     }
-                 }
-             }
- 
-             if ( $found == 0 ) {
-                 foreach my $i ( 0 .. ( $self->history_size() - 1 ) )  {
-                     my $mail_file = $self->{history_keys__}[$i];
-                     if ( $self->{form_}{view} eq $mail_file ) {
-                         $start_message = $i;
-                         $stop_message  = $i + $self->config_( 'page_size' ) - 1;
-                         last;
-                     }
-                 }
-             }
-         }
- 
          $stop_message = $self->history_size() - 1 if ( $stop_message >= $self->history_size() );
  
--- 2662,2665 ----
***************
*** 2759,2763 ****
  
              $body .= "<tr";
!             if ( ( ( defined($self->{form_}{view}) ) && ( $self->{form_}{view} eq $mail_file ) ) || ( ( defined($self->{form_}{file}) && ( $self->{form_}{file} eq $mail_file ) ) ) || ( $highlight_message eq $mail_file ) ) {
                  $body .= " class=\"rowHighlighted\"";
              } else {
--- 2746,2750 ----
  
              $body .= "<tr";
!             if ( ( ( defined($self->{form_}{file}) && ( $self->{form_}{file} eq $mail_file ) ) ) || ( $highlight_message eq $mail_file ) ) {
                  $body .= " class=\"rowHighlighted\"";
              } else {
***************
*** 2773,2777 ****
              $mail_file =~ /popfile\d+=(\d+)\.msg$/;
              $body .= "<a title=\"$from\">$short_from</a></td>\n";
!             $body .= "<td><a class=\"messageLink\" title=\"$subject\" href=\"/history?view=$mail_file&amp;start_message=$start_message&amp;session=$self->{session_key__}&amp;sort=$self->{form_}{sort}&amp;filter=$self->{form_}{filter}&amp;search=$self->{form_}{search}#$mail_file\">";
              $body .= "$short_subject</a></td>\n<td>";
              if ( $reclassified )  {
--- 2760,2764 ----
              $mail_file =~ /popfile\d+=(\d+)\.msg$/;
              $body .= "<a title=\"$from\">$short_from</a></td>\n";
!             $body .= "<td><a class=\"messageLink\" title=\"$subject\" href=\"/view?view=$mail_file&amp;start_message=$start_message&amp;session=$self->{session_key__}&amp;sort=$self->{form_}{sort}&amp;filter=$self->{form_}{filter}&amp;search=$self->{form_}{search}\">";
              $body .= "$short_subject</a></td>\n<td>";
              if ( $reclassified )  {
***************
*** 2796,2803 ****
                      }
                      $body .= "</select>\n";
- 
-                     if ( ( defined($self->{form_}{view}) ) && ( $self->{form_}{view} eq $mail_file ) ) {
-                         $body .= "<input type=\"submit\" class=\"reclassifyButton\" name=\"change\" value=\"$self->{language__}{Reclassify}\" />";
-                     }
                  } else {
                      $body .= " ($self->{language__}{History_MagnetUsed}: $self->{history__}{$mail_file}{magnet})";
--- 2783,2786 ----
***************
*** 2811,2898 ****
  
  
-             # Check to see if we want to view a message
-             if ( ( defined($self->{form_}{view}) ) && ( $self->{form_}{view} eq $mail_file ) ) {
-                 $body .= "<tr>\n<td></td>\n<td colspan=\"5\" valign=\"top\">\n";
-                 $body .= "<table class=\"openMessageTable\" cellpadding=\"10%\" cellspacing=\"0\" width=\"100%\" summary=\"$self->{language__}{History_OpenMessageSummary}\">\n";
- 
-                 # Close button
-                 $body .= "<tr>\n<td class=\"openMessageCloser\">\n";
-                 $body .= "<a class=\"messageLink\" href=\"/history?start_message=$start_message&amp;session=$self->{session_key__}&amp;sort=$self->{form_}{sort}&amp;search=$self->{form_}{search}&amp;filter=$self->{form_}{filter}\">\n";
-                 $body .= "<span class=\"historyLabel\">$self->{language__}{Close}</span></a>\n";
-                 $body .= "<br /><br />\n</td>\n</tr>\n";
- 
-                 # Message body
-                 $body .= "<tr>\n<td class=\"openMessageBody\">";
- 
-                 if ( $self->{history__}{$mail_file}{magnet} eq '' )  {
-                     $body .= $self->{classifier__}->get_html_colored_message($self->global_config_( 'msgdir' ) . $self->{form_}{view});
-                 } else {
-                     $self->{history__}{$mail_file}{magnet} =~ /(.+): ([^\r\n]+)/;
-                     my $header = $1;
-                     my $text   = $2;
-                     $body .= "<tt>";
- 
-                     open MESSAGE, '<' . $self->global_config_( 'msgdir' ) . "$self->{form_}{view}";
-                     my $line;
-                     # process each line of the message
-                     while ($line = <MESSAGE>) {
-                         $line =~ s/</&lt;/g;
-                         $line =~ s/>/&gt;/g;
- 
-                         $line =~ s/([^\r\n]{100,150} )/$1<br \/>/g;
-                         $line =~ s/([^ \r\n]{150})/$1<br \/>/g;
-                         $line =~ s/[\r\n]+/<br \/>/g;
- 
-                         if ( $line =~ /^([A-Za-z-]+): ?([^\n\r]*)/ ) {
-                             my $head = $1;
-                             my $arg  = $2;
- 
-                             if ( $head =~ /\Q$header\E/i )  {
-                                 if ( $arg =~ /\Q$text\E/i )  {
-                                     my $new_color = $self->{classifier__}->get_bucket_color($self->{history__}{$mail_file}{bucket});
-                                     $line =~ s/(\Q$text\E)/<b><font color=\"$new_color\">$1<\/font><\/b>/;
-                                 }
-                             }
-                         }
- 
-                         $body .= $line;
-                     }
-                     close MESSAGE;
-                     $body .= "</tt>\n";
-                 }
- 
-                 $body .= "</td>\n</tr>\n";
- 
-                 # Close button
-                 $body .= "<tr>\n<td class=\"openMessageCloser\">";
-                 $body .= "<a class=\"messageLink\" href=\"/history?start_message=$start_message&amp;session=$self->{session_key__}&amp;sort=$self->{form_}{sort}&amp;search=$self->{form_}{search}&amp;filter=$self->{form_}{filter}\">\n";
-                 $body .= "<span class=\"historyLabel\">$self->{language__}{Close}</span>\n</a>\n";
-                 $body .= "</td>\n</tr>\n</table>\n";
- 
-                 $body .= "<table><tr><td class=\"top20\" valign=\"top\">\n";
- 
-                 # Enable saving of word-scores
- 
-                 $self->{classifier__}->wordscores( 1 );
- 
-                 # Build the scores by classifying the message
- 
-                 $self->{classifier__}->classify_file($self->global_config_( 'msgdir' ) . "$self->{form_}{view}", $self);
-                 
-                 # Disable, print, and clear saved word-scores
-                 
-                 $self->{classifier__}->wordscores( 0 );
-                 $body .= $self->{classifier__}->get_scores();
-                 $self->{classifier__}->clear_scores();
-                 
-                 $body .= "</tr></table></td>\n</tr>\n";
-             }
- 
              if ( defined $self->{feedback}{$mail_file} ) {
                  $body .= "<tr class=\"rowHighlighted\"><td>&nbsp;</td><td>$self->{feedback}{$mail_file}</td>\n";
                  delete $self->{feedback}{$mail_file};
              }
- 
-             # $body .= "<tr class=\"rowHighlighted\"><td><td>" . sprintf( $self->{language__}{History_ChangedTo}, " . $self->{classifier__}->get_bucket_color($self->{form_}{shouldbe}) . ", $self->{form_}{shouldbe} ) if ( ( defined($self->{form_}{file}) ) && ( $self->{form_}{file} eq $mail_file ) );
          }
  
--- 2794,2801 ----
***************
*** 2926,2929 ****
--- 2829,2969 ----
  
      http_ok($self, $client,$body,2);
+ }
+ 
+ # ---------------------------------------------------------------------------------------------
+ #
+ # view_page - Shows a single email
+ #
+ # $client     The web browser to send the results to
+ #
+ # ---------------------------------------------------------------------------------------------
+ sub view_page
+ {
+     my ( $self, $client ) = @_;
+ 
+     my $mail_file     = $self->{form_}{view};
+     my $start_message = $self->{form_}{start_message};
+     my $reclassified  = $self->{history__}{$mail_file}{reclassified};
+     my $bucket        = $self->{history__}{$mail_file}{bucket};
+     my $color         = $self->{classifier__}->get_bucket_color($bucket);
+ 
+     $self->{form_}{sort}   = '' if ( !defined( $self->{form_}{sort}   ) );
+     $self->{form_}{search} = '' if ( !defined( $self->{form_}{search} ) );
+     $self->{form_}{filter} = '' if ( !defined( $self->{form_}{filter} ) );
+ 
+     my $body = "<h2 class=\"buckets\">$self->{language__}{View_Title}</h2>\n";
+ 
+     $body .= "<table class=\"openMessageTable\" cellpadding=\"10%\" cellspacing=\"0\" width=\"100%\" summary=\"$self->{language__}{History_OpenMessageSummary}\">\n";
+ 
+     $body .= "<tr><td>";
+     $body .= "<form id=\"HistoryMainForm\" action=\"/history\" method=\"POST\">\n";
+     $body .= "<input type=\"hidden\" name=\"search\" value=\"$self->{form_}{search}\" />\n";
+     $body .= "<input type=\"hidden\" name=\"sort\" value=\"$self->{form_}{sort}\" />\n";
+     $body .= "<input type=\"hidden\" name=\"session\" value=\"$self->{session_key__}\" />\n";
+     $body .= "<input type=\"hidden\" name=\"start_message\" value=\"$start_message\" />\n";
+     $body .= "<input type=\"hidden\" name=\"filter\" value=\"$self->{form_}{filter}\" />\n";    
+     $body .= "<table><tr><td><font size=+1><p><b>$self->{language__}{From}</b>: </td><td>$self->{history__}{$mail_file}{from}</font></td></tr>";
+     $body .= "<tr><td><font size=+1><b>$self->{language__}{Subject}</b>: </td><td>$self->{history__}{$mail_file}{subject}</font></td></tr>";
+     $body .= "<tr><td><font size=+1><b>$self->{language__}{Classification}</b>: </td><td><font color=\"$color\">$self->{history__}{$mail_file}{bucket}</font></font></td></tr>";
+ 
+     $body .= "<tr><td><font size=+1>";
+ 
+     my $index;
+     foreach my $i ( $start_message  .. $start_message + $self->config_( 'page_size' ) - 1) {
+         if ( $self->{history_keys__}[$i] eq $mail_file ) {
+             $index = $i;
+             last;
+         }
+     }
+ 
+     if ( $reclassified ) {
+       $body .= sprintf( $self->{language__}{History_Already}, ($color || ''), ($bucket || '') );
+       $body .= " <input type=\"submit\" class=\"undoButton\" name=\"undo_$index\" value=\"$self->{language__}{Undo}\">\n";
+     } else {
+       if ( $self->{history__}{$mail_file}{magnet} eq '' ) {
+ 	$body .= "\n$self->{language__}{History_ShouldBe}: <select name=\"$index\">\n";
+ 
+ 	# Show a blank bucket field
+ 	$body .= "<option selected=\"selected\"></option>\n";
+ 
+ 	foreach my $abucket ($self->{classifier__}->get_buckets()) {
+ 	  $body .= "<option value=\"$abucket\">$abucket</option>\n";
+ 	}
+ 	$body .= "</select>\n<input type=\"submit\" class=\"reclassifyButton\" name=\"change\" value=\"$self->{language__}{Reclassify}\" />";
+       } else {
+ 	$body .= " ($self->{language__}{History_MagnetUsed}: $self->{history__}{$mail_file}{magnet})";
+       }
+     }
+ 
+     $body .= "</font></td></tr>";
+ 
+     # Message body
+     $body .= "</table></form></td></tr><tr>\n<td class=\"openMessageBody\"><hr><p>";
+ 
+     if ( $self->{history__}{$mail_file}{magnet} eq '' ) {
+       $body .= $self->{classifier__}->get_html_colored_message($self->global_config_( 'msgdir' ) . $mail_file);
+     } else {
+       $self->{history__}{$mail_file}{magnet} =~ /(.+): ([^\r\n]+)/;
+       my $header = $1;
+       my $text   = $2;
+       $body .= "<tt>";
+ 
+       open MESSAGE, '<' . $self->global_config_( 'msgdir' ) . $mail_file;
+       my $line;
+       # process each line of the message
+       while ($line = <MESSAGE>) {
+ 	$line =~ s/</&lt;/g;
+ 	$line =~ s/>/&gt;/g;
+ 
+ 	$line =~ s/([^\r\n]{100,150} )/$1<br \/>/g;
+ 	$line =~ s/([^ \r\n]{150})/$1<br \/>/g;
+ 	$line =~ s/[\r\n]+/<br \/>/g;
+ 
+ 	if ( $line =~ /^([A-Za-z-]+): ?([^\n\r]*)/ ) {
+ 	  my $head = $1;
+ 	  my $arg  = $2;
+ 
+ 	  if ( $head =~ /\Q$header\E/i ) {
+ 	    if ( $arg =~ /\Q$text\E/i ) {
+ 	      my $new_color = $self->{classifier__}->get_bucket_color($self->{history__}{$mail_file}{bucket});
+ 	      $line =~ s/(\Q$text\E)/<b><font color=\"$new_color\">$1<\/font><\/b>/;
+ 	    }
+ 	  }
+ 	}
+ 
+ 	$body .= $line;
+       }
+       close MESSAGE;
+       $body .= "</tt>\n";
+     }
+ 
+     $body .= "</td>\n</tr>\n";
+ 
+     $body .= "<tr><td class=\"top20\" valign=\"top\">\n";
+ 
+     # Enable saving of word-scores
+ 
+     $self->{classifier__}->wordscores( 1 );
+ 
+     # Build the scores by classifying the message
+ 
+     $self->{classifier__}->classify_file($self->global_config_( 'msgdir' ) . $mail_file, $self);
+ 
+     # Disable, print, and clear saved word-scores
+ 
+     $self->{classifier__}->wordscores( 0 );
+     $body .= $self->{classifier__}->get_scores();
+     $self->{classifier__}->clear_scores();
+ 
+     # Close button
+ 
+     $body .= "<tr>\n<td class=\"openMessageCloser\">";
+     $body .= "<a class=\"messageLink\" href=\"/history?start_message=$start_message&amp;session=$self->{session_key__}&amp;sort=$self->{form_}{sort}&amp;search=$self->{form_}{search}&amp;filter=$self->{form_}{filter}\">\n";
+     $body .= "<span class=\"historyLabel\">$self->{language__}{Close}</span>\n</a>\n";
+     $body .= "</td>\n</tr>\n";
+ 
+     $body .= "</tr></table>";
+ 
+     $self->http_ok( $client, $body, 2 );
  }
  

[popfile-commit] engine/Classifier Bayes.pm,1.126,1.127

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

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

Modified Files:
	Bayes.pm 
Log Message:
clear {words__} when returning a colorized message

Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -d -r1.126 -r1.127
*** Bayes.pm	16 Apr 2003 23:20:12 -0000	1.126
--- Bayes.pm	16 Apr 2003 23:52:28 -0000	1.127
***************
*** 1120,1123 ****
--- 1120,1124 ----
      my $result = $self->{parser__}->parse_stream($file);
      $self->{parser__}->{color__} = 0;
+     $self->{parser__}->{words__} = {};
  
      return $result;

[popfile-commit] engine/UI HTML.pm,1.132,1.133

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

Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv17118

Modified Files:
	HTML.pm 
Log Message:
change new function to match POPFile specification (In POPFile::Module)

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -d -r1.132 -r1.133
*** HTML.pm	16 Apr 2003 00:59:57 -0000	1.132
--- HTML.pm	16 Apr 2003 23:21:05 -0000	1.133
***************
*** 2874,2883 ****
                  # Enable saving of word-scores
  
!                 $self->{classifier__}->toggle_score( 1 );
                  
                  $self->{classifier__}->classify_file($self->global_config_( 'msgdir' ) . "$self->{form_}{view}", $self);
                                  
                  
!                 $self->{classifier__}->toggle_score( 0 );
                  $body .= $self->{classifier__}->get_scores();
                  $self->{classifier__}->clear_scores();
--- 2874,2883 ----
                  # Enable saving of word-scores
  
!                 $self->{classifier__}->wordscores( 1 );
                  
                  $self->{classifier__}->classify_file($self->global_config_( 'msgdir' ) . "$self->{form_}{view}", $self);
                                  
                  
!                 $self->{classifier__}->wordscores( 0 );
                  $body .= $self->{classifier__}->get_scores();
                  $self->{classifier__}->clear_scores();

[popfile-commit] engine/Classifier Bayes.pm,1.125,1.126

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

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

Modified Files:
	Bayes.pm 
Log Message:
change new function to match POPFile specification (In POPFile::Module)

Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.125
retrieving revision 1.126
diff -C2 -d -r1.125 -r1.126
*** Bayes.pm	16 Apr 2003 00:59:57 -0000	1.125
--- Bayes.pm	16 Apr 2003 23:20:12 -0000	1.126
***************
*** 1498,1502 ****
  # ---------------------------------------------------------------------------------------------
  #
! # toggle_score - Enables and disables the saving of word scores
  #
  # $value        1 for enabled, 0 for disabled
--- 1498,1502 ----
  # ---------------------------------------------------------------------------------------------
  #
! # wordscores - Enables and disables the saving of word scores
  #
  # $value        1 for enabled, 0 for disabled
***************
*** 1504,1512 ****
  # ---------------------------------------------------------------------------------------------
  
! sub toggle_score
  {
      my ( $self, $value ) = @_;
      
!     $self->{wordscores__} = $value;
  }
  
--- 1504,1514 ----
  # ---------------------------------------------------------------------------------------------
  
! sub wordscores
  {
      my ( $self, $value ) = @_;
      
!     $self->{wordscores__} = $value if (defined $value);
!     
!     return $self->{wordscores__};
  }
  

[popfile-commit] engine/tests TestBayes.tst,1.8,1.9 TestMailParse001.cam,1.3,1.4 TestMailParse002.cam,1.3,1.4 TestMailParse003.cam,1.3,1.4 TestMailParse004.cam,1.3,1.4 TestMailParse005.cam,1.3,1.4 TestMailParse006.cam,1.3,1.4 TestMailParse007.cam,1.3,1.4 TestMailParse008.cam,1.3,1.4 TestMailParse009.cam,1.3,1.4 TestMailParse010.cam,1.3,1.4 TestMailParse011.cam,1.3,1.4 TestMailParse011.msg,1.2,1.3 TestMailParse012.cam,1.3,1.4 TestMailParse013.cam,1.3,1.4 TestMailParse014.cam,1.3,1.4 TestMailParse015.cam,1.3,1.4 TestMailParse016.cam,1.3,1.4 TestMailParse017.cam,1.3,1.4 TestMailParse018.cam,1.3,1.4 TestMailParse020.cam,1.3,1.4 TestMailParse021.cam,1.3,1.4

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

Update of /cvsroot/popfile/engine/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv29496

Modified Files:
	TestBayes.tst TestMailParse001.cam TestMailParse002.cam 
	TestMailParse003.cam TestMailParse004.cam TestMailParse005.cam 
	TestMailParse006.cam TestMailParse007.cam TestMailParse008.cam 
	TestMailParse009.cam TestMailParse010.cam TestMailParse011.cam 
	TestMailParse011.msg TestMailParse012.cam TestMailParse013.cam 
	TestMailParse014.cam TestMailParse015.cam TestMailParse016.cam 
	TestMailParse017.cam TestMailParse018.cam TestMailParse020.cam 
	TestMailParse021.cam 
Log Message:
backout unintentional portion of commit

Index: TestBayes.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestBayes.tst,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TestBayes.tst	16 Apr 2003 00:59:58 -0000	1.8
--- TestBayes.tst	16 Apr 2003 01:26:45 -0000	1.9
***************
*** 68,72 ****
  for my $modify_file (@modify_tests) {
      if ( ( open MSG, "<$modify_file" ) && ( open OUTPUT, ">tests/temp.out" ) ) {
- 		binmode OUTPUT;
  	    $b->classify_and_modify( \*MSG, \*OUTPUT, 0, 0, 0, '' );
  	    close MSG;
--- 68,71 ----
***************
*** 90,94 ****
  		unlink( 'tests/popfile0=0.msg' );
  		unlink( 'tests/popfile0=0.cls' );
- #		rename( 'tests/temp.out', $output_file);
  		unlink( 'tests/temp.out' );
      }
--- 89,92 ----

Index: TestMailParse001.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse001.cam,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestMailParse001.cam	16 Apr 2003 00:59:58 -0000	1.3
--- TestMailParse001.cam	16 Apr 2003 01:26:45 -0000	1.4
***************
*** 1,7 ****
! From: blank
  Subject: [spam]
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! Testing S P A C E D out words spaced out in a document.
  .
--- 1,7 ----
! From: blank
  Subject: [spam]
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! Testing S P A C E D out words spaced out in a document.
  .

Index: TestMailParse002.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse002.cam,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestMailParse002.cam	16 Apr 2003 00:59:58 -0000	1.3
--- TestMailParse002.cam	16 Apr 2003 01:26:45 -0000	1.4
***************
*** 1,6 ****
! From: blank
  Subject: [spam]
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! who wants to be a millionaire milli<!---->onaire mi<!-- testing -->llionaire millionair<!-- -->e
--- 1,6 ----
! From: blank
  Subject: [spam]
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! who wants to be a millionaire milli<!---->onaire mi<!-- testing -->llionaire millionair<!-- -->e

Index: TestMailParse003.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse003.cam,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestMailParse003.cam	16 Apr 2003 00:59:58 -0000	1.3
--- TestMailParse003.cam	16 Apr 2003 01:26:45 -0000	1.4
***************
*** 1,34 ****
  Subject: [spam] from: Leandro
! To: jI7...@ao...
! Message-ID: <200...@8S...>
! From: "serafina venter"<j23...@ea...>
! Date: Sun, 12 Jan 2003 19:49:36 -0400
! X-Priority: 3 (Normal)
! Importance: Normal
! X-Accept-Language: en
! Errors-To: <j23...@ea...>
! MIME-Version: 1.0
! Content-Type: multipart/alternative;
!     boundary="=gs6mlah1knva3tk5nbs4422k3570q7m3k=="
! Content-Transfer-Encoding: 7bit
! Return-Path: j23...@ea...
! X-OriginalArrivalTime: 13 Jan 2003 00:49:31.0608 (UTC) FILETIME=[A257A580:01C2BA9D]
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
- --=gs6mlah1knva3tk5nbs4422k3570q7m3k==
- Content-Transfer-Encoding: base64
- Content-Type: text/html; charset="US-ASCII"
- 
- PGh0bWw+DQo8YSBocmVmPSJodHRwOi8vJTc3JTc3dy5wJTYxJTczJTczNCU2NiU3MmUlNjUlMkVuZXQvcGIzLyIgVDhJPjxGT05UIFNJWkU9NT48Qj4mIzg3
- OyYjOTc7PCFLND50PCE0YTQ1PmMmIzEwNDs8IVBKMHV1PiAmIzY4OzwhT1UxMGRRPm88IWgzMj5nPCFOWDc4PnM8IUY0NzZ0PiAmIzExNTsmIzEwODs8IXkw
- eDY+dSYjMTE0OzwhV1ZRPnAmIzMyOzwhMW0+eTwhS1NrUD5vPCFvMzVBZT51JiMxMTA7JiMxMDM7PCE0N2ViVTM+ICYjMTAzOyYjMTA1OyYjMTE0OyYjMTA4
- OyYjMTE1OyYjMzI7PCF5MjU+cCYjMTE3OzwhOFljPnMmIzExNTsmIzEyMTs8ITVSaTQ+JzwhcEdTNj5zJiMzMjsmIzk3OzwhQWgxPnMmIzMyOyYjMTE2OyYj
- MTA0OzwhMXJKM1JIPmU8IW84V1h1PnkmIzMyOzwhMzU+czwhMFE3ND5jJiMxMTQ7PCFSZnA+ZTwhUGw+YTwhSzQ+bTwhNGE0NT4gJiMxMDI7PCFQSjB1dT5v
- JiMxMTQ7PCFPVTEwZFE+IDwhaDMyPm08IU5YNzg+bzwhRjQ3NnQ+ciYjMTAxOyYjMzM7PC9mb250PjwvYT48QlI+DQo8QlIgck0wc1JhUHE+PGEgaHJlZj0i
- aHR0cDovL3d3dyUyRSU3MCU2MSU3MyU3MyUzNGZyZWUlMkUlNkUlNjV0L3BiMy8iIDFySjNSSEJvOFcgdW5TVlQ3PjxGT05UIFNJWkU9ND48Qj48IXkweDY+
- QyYjMTA4OzwhV1ZRPmkmIzk5OzwhMW0+azwhS1NrUD4gPCFvMzVBZT5IJiMxMDE7JiMxMTQ7PCE0N2ViVTM+ZTwvZm9udD48L2E+PEJSPjxCUj48QlI+PEJS
- PjxCUj48QlI+PEJSPiYjMTM7JiMxMDsmIzY5OyYjMTA5OyYjOTc7JiMxMDU7PCF5MjU+bCYjMzI7PCE4WWM+QiYjOTc7JiMxMDA7PCE1Umk0Pj88QlIgUlIg
- Mk1PZHZjTT4NCm5vIG1vcmUgPGEgaHJlZj0iaHR0cDovL3JlbW92ZSUyRSU2RGUlNzMlNzNhJTY3JTY1bSU2NW4lNkYlNzcuJTZFZXQvIiBSZnBOUD5DbGlj
- ayBIZXJlPC9hPjxCUj4NCjxCUj48L2h0bWw+DQoNCmFQcTgyTU9kICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjTUo=
- --=gs6mlah1knva3tk5nbs4422k3570q7m3k==--
--- 1,34 ----
  Subject: [spam] from: Leandro
! To: jI7...@ao...
! Message-ID: <200...@8S...>
! From: "serafina venter"<j23...@ea...>
! Date: Sun, 12 Jan 2003 19:49:36 -0400
! X-Priority: 3 (Normal)
! Importance: Normal
! X-Accept-Language: en
! Errors-To: <j23...@ea...>
! MIME-Version: 1.0
! Content-Type: multipart/alternative;
!     boundary="=gs6mlah1knva3tk5nbs4422k3570q7m3k=="
! Content-Transfer-Encoding: 7bit
! Return-Path: j23...@ea...
! X-OriginalArrivalTime: 13 Jan 2003 00:49:31.0608 (UTC)
! FILETIME=[A257A580:01C2BA9D]
! --=gs6mlah1knva3tk5nbs4422k3570q7m3k==
! Content-Transfer-Encoding: base64
! Content-Type: text/html; charset="US-ASCII"
! PGh0bWw+DQo8YSBocmVmPSJodHRwOi8vJTc3JTc3dy5wJTYxJTczJTczNCU2NiU3MmUlNjUlMkVuZXQvcGIzLyIgVDhJPjxGT05UIFNJWkU9NT48Qj4mIzg3
! OyYjOTc7PCFLND50PCE0YTQ1PmMmIzEwNDs8IVBKMHV1PiAmIzY4OzwhT1UxMGRRPm88IWgzMj5nPCFOWDc4PnM8IUY0NzZ0PiAmIzExNTsmIzEwODs8IXkw
! eDY+dSYjMTE0OzwhV1ZRPnAmIzMyOzwhMW0+eTwhS1NrUD5vPCFvMzVBZT51JiMxMTA7JiMxMDM7PCE0N2ViVTM+ICYjMTAzOyYjMTA1OyYjMTE0OyYjMTA4
! OyYjMTE1OyYjMzI7PCF5MjU+cCYjMTE3OzwhOFljPnMmIzExNTsmIzEyMTs8ITVSaTQ+JzwhcEdTNj5zJiMzMjsmIzk3OzwhQWgxPnMmIzMyOyYjMTE2OyYj
! MTA0OzwhMXJKM1JIPmU8IW84V1h1PnkmIzMyOzwhMzU+czwhMFE3ND5jJiMxMTQ7PCFSZnA+ZTwhUGw+YTwhSzQ+bTwhNGE0NT4gJiMxMDI7PCFQSjB1dT5v
! JiMxMTQ7PCFPVTEwZFE+IDwhaDMyPm08IU5YNzg+bzwhRjQ3NnQ+ciYjMTAxOyYjMzM7PC9mb250PjwvYT48QlI+DQo8QlIgck0wc1JhUHE+PGEgaHJlZj0i
! aHR0cDovL3d3dyUyRSU3MCU2MSU3MyU3MyUzNGZyZWUlMkUlNkUlNjV0L3BiMy8iIDFySjNSSEJvOFcgdW5TVlQ3PjxGT05UIFNJWkU9ND48Qj48IXkweDY+
! QyYjMTA4OzwhV1ZRPmkmIzk5OzwhMW0+azwhS1NrUD4gPCFvMzVBZT5IJiMxMDE7JiMxMTQ7PCE0N2ViVTM+ZTwvZm9udD48L2E+PEJSPjxCUj48QlI+PEJS
! PjxCUj48QlI+PEJSPiYjMTM7JiMxMDsmIzY5OyYjMTA5OyYjOTc7JiMxMDU7PCF5MjU+bCYjMzI7PCE4WWM+QiYjOTc7JiMxMDA7PCE1Umk0Pj88QlIgUlIg
! Mk1PZHZjTT4NCm5vIG1vcmUgPGEgaHJlZj0iaHR0cDovL3JlbW92ZSUyRSU2RGUlNzMlNzNhJTY3JTY1bSU2NW4lNkYlNzcuJTZFZXQvIiBSZnBOUD5DbGlj
! ayBIZXJlPC9hPjxCUj4NCjxCUj48L2h0bWw+DQoNCmFQcTgyTU9kICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjTUo=
! --=gs6mlah1knva3tk5nbs4422k3570q7m3k==--
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  

Index: TestMailParse004.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse004.cam,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestMailParse004.cam	16 Apr 2003 00:59:58 -0000	1.3
--- TestMailParse004.cam	16 Apr 2003 01:26:45 -0000	1.4
***************
*** 1,23 ****
! Return-Path: <hot...@ya...>
! From: hot...@ya...
! Message-ID: <000048874f7b$00000e95$000...@mx...>
! To: <Und...@va...>
  Subject: [spam]   
! Date: Sat, 18 Jan 2003 19:50:57 01900
! MIME-Version: 1.0
! Content-Type: multipart/mixed;
!     boundary="----=_NextPart_000_60BF_00005753.000048CC"
! X-UIDL: B<E!!^8S!!0'="!J;6"!
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! ------=_NextPart_000_60BF_00005753.000048CC
! Content-Type: text/html;
!     charset="iso-8859-1"
! Content-Transfer-Encoding: base64
! 
! PEhUTUw+PEJPRFkgQkdDT0xPUj0iIzAwMDAwMCI+PC9QPjxQIEFMSUdOPUNFTlRFUj48Rk9OVCAgQ09MT1I9IiNmZjAwMDAiIEJBQ0s9IiMwMDAwMDAiIHN0eWxlPSJCQUNLR1JPVU5ELUNPTE9SOiAjMDAwMDAwIiBTSVpFPTYgUFRTSVpFPTI0PlRoZSBob3R0ZXN0IEdpcmxzIE9ubGluZSE8QlI+DQpTdG9wIHdhc3RpbmcgeW91ciB0aW1lIHdpdGggNSBzZWM8QlI+DQp2aWRlbyBjbGlwcyEgQ29tZSB0byBvdXIgc2l0ZSBmb3I8QlI+DQpGcmVlIEZ1bGwgTGVuZ3RoIE1vdmllcyE8QlI+DQo8QSBIUkVGPSJodHRwOi8vd2NhbWF0ZXVycy5jb20vbC9ibCI+V2h5IHdhaXQsIHNlZSBmb3IgRnJlZTwvQT48L0ZPTlQ+PEZPTlQgIENPTE9SPSIjZmYwMDAwIiBCQUNLPSIjMDAwMDAwIiBzdHlsZT0iQkFDS0dST1VORC1DT0xPUjogIzAwMDAwMCIgU0laRT02IFBUU0laRT0yNCBGQU1JTFk9IlNBTlNTRVJJRiIgRkFDRT0iQXJpYWwiIExBTkc9IjAiPjxCUj4NCjwvUD48UCBBTElHTj1MRUZUPjwvRk9OVD48Rk9OVCAgQ09MT1I9IiNmZjAwMDAiIEJBQ0s9IiMwMDAwMDAiIHN0eWxlPSJCQUNLR1JPVU5ELUNPTE9SOiAjMDAwMDAwIiBTSVpFPTMgUFRTSVpFPTExIEZBTUlMWT0iU0FOU1NFUklGIiBGQUNFPSJBcmlhbCIgTEFORz0iMCI+PEJSPg0KPC9GT05UPjxGT05UICBDT0xPUj0iIzAwMDBmZiIgQkFDSz0iIzAwMDAwMCIgc3R5bGU9IkJBQ0tHUk9VTkQtQ09MT1I6ICMwMDAwMDAiIFNJWkU9NiBQVFNJWkU9MjQgR!
!  kFNSUxZPSJTQU5TU0VSSUYiIEZBQ0U9IkFyaWFsIiBMQU5HPSIwIj48QSBIUkVGPSJodHRwOi8vd2NhbWF0ZXVycy5jb20vbC9yIj5ObyBtb3JlIG1haWwgaGVyZTwvQT48L0ZPTlQ+PC9IVE1MPg0K
! 
! ------=_NextPart_000_60BF_00005753.000048CC--
! 
--- 1,23 ----
! Return-Path: <hot...@ya...>
! From: hot...@ya...
! Message-ID: <000048874f7b$00000e95$000...@mx...>
! To: <Und...@va...>
  Subject: [spam]   
! Date: Sat, 18 Jan 2003 19:50:57 01900
! MIME-Version: 1.0
! Content-Type: multipart/mixed;
!     boundary="----=_NextPart_000_60BF_00005753.000048CC"
! X-UIDL: B<E!!^8S!!0'="!J;6"!
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! ------=_NextPart_000_60BF_00005753.000048CC
! Content-Type: text/html;
!     charset="iso-8859-1"
! Content-Transfer-Encoding: base64
! 
! PEhUTUw+PEJPRFkgQkdDT0xPUj0iIzAwMDAwMCI+PC9QPjxQIEFMSUdOPUNFTlRFUj48Rk9OVCAgQ09MT1I9IiNmZjAwMDAiIEJBQ0s9IiMwMDAwMDAiIHN0eWxlPSJCQUNLR1JPVU5ELUNPTE9SOiAjMDAwMDAwIiBTSVpFPTYgUFRTSVpFPTI0PlRoZSBob3R0ZXN0IEdpcmxzIE9ubGluZSE8QlI+DQpTdG9wIHdhc3RpbmcgeW91ciB0aW1lIHdpdGggNSBzZWM8QlI+DQp2aWRlbyBjbGlwcyEgQ29tZSB0byBvdXIgc2l0ZSBmb3I8QlI+DQpGcmVlIEZ1bGwgTGVuZ3RoIE1vdmllcyE8QlI+DQo8QSBIUkVGPSJodHRwOi8vd2NhbWF0ZXVycy5jb20vbC9ibCI+V2h5IHdhaXQsIHNlZSBmb3IgRnJlZTwvQT48L0ZPTlQ+PEZPTlQgIENPTE9SPSIjZmYwMDAwIiBCQUNLPSIjMDAwMDAwIiBzdHlsZT0iQkFDS0dST1VORC1DT0xPUjogIzAwMDAwMCIgU0laRT02IFBUU0laRT0yNCBGQU1JTFk9IlNBTlNTRVJJRiIgRkFDRT0iQXJpYWwiIExBTkc9IjAiPjxCUj4NCjwvUD48UCBBTElHTj1MRUZUPjwvRk9OVD48Rk9OVCAgQ09MT1I9IiNmZjAwMDAiIEJBQ0s9IiMwMDAwMDAiIHN0eWxlPSJCQUNLR1JPVU5ELUNPTE9SOiAjMDAwMDAwIiBTSVpFPTMgUFRTSVpFPTExIEZBTUlMWT0iU0FOU1NFUklGIiBGQUNFPSJBcmlhbCIgTEFORz0iMCI+PEJSPg0KPC9GT05UPjxGT05UICBDT0xPUj0iIzAwMDBmZiIgQkFDSz0iIzAwMDAwMCIgc3R5bGU9IkJBQ0tHUk9VTkQtQ09MT1I6ICMwMDAwMDAiIFNJWkU9NiBQVFNJWkU9MjQgR!
!  kFNSUxZPSJTQU5TU0VSSUYiIEZBQ0U9IkFyaWFsIiBMQU5HPSIwIj48QSBIUkVGPSJodHRwOi8vd2NhbWF0ZXVycy5jb20vbC9yIj5ObyBtb3JlIG1haWwgaGVyZTwvQT48L0ZPTlQ+PC9IVE1MPg0K
! 
! ------=_NextPart_000_60BF_00005753.000048CC--
! 

Index: TestMailParse005.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse005.cam,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestMailParse005.cam	16 Apr 2003 00:59:58 -0000	1.3
--- TestMailParse005.cam	16 Apr 2003 01:26:45 -0000	1.4
***************
*** 1,30 ****
! Return-Path: <ano...@ns...>
! Date: 19 Jan 2003 15:13:43 -0000
! Message-ID: <200...@ns...>
! From: XoS...@ho... (XoS...@ho...)
  Subject: [spam]  Re: screename change again lol
! X-UIDL: ll'"!$DC!!7ld"!85K!!
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! Below is the result of your feedback form.  It was submitted by
! XoS...@ho... (XoS...@ho...) on Monday, January 20, 2003 at 00:13:42
! ---------------------------------------------------------------------------
! 
! ze: 
! 
! Hey!! What's Up? I'm *Jenny* 20/F/San Diego/Webcam & Pics. I'm *LIVE* on my *FREE* Webcam mostly 24/7 so if you wanna come in and chat or see me go to my Personal Homepage at http://www.freelivecamgirls.net and i'll talk to you in a bit hun! If you join and the webchat is already full im sorry, just wait like 5 minutes and then you'll be able to see me LIVE!! *Remember* this is my Personal Homepage so of course its *FREE* =)
! <333 *Jenny* <333
! 
! PS.Remember my Personal Homepage is http://www.freelivecamgirls.net and hopefully I can chat with you soon!! oh yah!! If you don't have a webcam of your own its ok!! You can still watch and chat with me then!! ok!!  ByE!!
! <333 *Jenny* <333
! 
! 
! 
! 
! 
! 
! 
! 3e
! 
! ---------------------------------------------------------------------------
--- 1,30 ----
! Return-Path: <ano...@ns...>
! Date: 19 Jan 2003 15:13:43 -0000
! Message-ID: <200...@ns...>
! From: XoS...@ho... (XoS...@ho...)
  Subject: [spam]  Re: screename change again lol
! X-UIDL: ll'"!$DC!!7ld"!85K!!
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! Below is the result of your feedback form.  It was submitted by
! XoS...@ho... (XoS...@ho...) on Monday, January 20, 2003 at 00:13:42
! ---------------------------------------------------------------------------
! 
! ze: 
! 
! Hey!! What's Up? I'm *Jenny* 20/F/San Diego/Webcam & Pics. I'm *LIVE* on my *FREE* Webcam mostly 24/7 so if you wanna come in and chat or see me go to my Personal Homepage at http://www.freelivecamgirls.net and i'll talk to you in a bit hun! If you join and the webchat is already full im sorry, just wait like 5 minutes and then you'll be able to see me LIVE!! *Remember* this is my Personal Homepage so of course its *FREE* =)
! <333 *Jenny* <333
! 
! PS.Remember my Personal Homepage is http://www.freelivecamgirls.net and hopefully I can chat with you soon!! oh yah!! If you don't have a webcam of your own its ok!! You can still watch and chat with me then!! ok!!  ByE!!
! <333 *Jenny* <333
! 
! 
! 
! 
! 
! 
! 
! 3e
! 
! ---------------------------------------------------------------------------

Index: TestMailParse006.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse006.cam,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestMailParse006.cam	16 Apr 2003 00:59:58 -0000	1.3
--- TestMailParse006.cam	16 Apr 2003 01:26:45 -0000	1.4
***************
*** 1,14 ****
! From: blank
  Subject: [spam]
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! We're so sure about the quality and effectiveness of our p.roducts, we
! offer a full 90 day m.oney b.ack g.uarantee.  If any customer is not
! satisfied with our products, for any reason whatsoever, simply return the
! u.nused p.ortion within 90 days for a 100% r.efund.  NO QUESTIONS ASKED.  
!   
! Our goal is to educate you and make you aware of our new and absolutely
! miraculous Internationally Patented Nobel Prize Validated Biotechnology.
!   
! C.lick b.elow f.or m.ore i.nformation, it's f.r.e.e.
--- 1,14 ----
! From: blank
  Subject: [spam]
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! We're so sure about the quality and effectiveness of our p.roducts, we
! offer a full 90 day m.oney b.ack g.uarantee.  If any customer is not
! satisfied with our products, for any reason whatsoever, simply return the
! u.nused p.ortion within 90 days for a 100% r.efund.  NO QUESTIONS ASKED.  
!   
! Our goal is to educate you and make you aware of our new and absolutely
! miraculous Internationally Patented Nobel Prize Validated Biotechnology.
!   
! C.lick b.elow f.or m.ore i.nformation, it's f.r.e.e.

Index: TestMailParse007.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse007.cam,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestMailParse007.cam	16 Apr 2003 00:59:58 -0000	1.3
--- TestMailParse007.cam	16 Apr 2003 01:26:45 -0000	1.4
***************
*** 1,84 ****
! Return-Path: <mov...@ea...>
! Received: from mail126.ninodw.com ([204.117.162.126])
! 	by priv-edtnes62.telusplanet.net (InterMail vM.5.01.05.17 201-253-122-126-117-20021021) with SMTP
! 	id <200...@ma...> for <jo...@te...>; Sat, 11 Jan 2003 06:04:06 -0700
! To: jo...@te...
! Date: Sat, 11 Jan 2003 07:05:44 -0500
! Message-ID: <104...@ma...>
! X-Mailer: Gnus/5.090001 (Oort Gnus v0.01) XEmacs/21.2 (Terspichore)
! From: mov...@ea...
! Reply-To: <mov...@ea...>
  Subject: [spam] Think you've seen porn? How about a dog giving 5+ girls oral sex till they cum?
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! So you think you've seen some crazy porn? 
! Think you've seen all the crazy stuff out there? 
! YOU HAVEN'T SEEN SHIT!!! I saw the most un fuckin 
! believable video clip thats ever been on our sick 
! and twisted internet! Know this I've been surfing 
! porn and the internet since it began! I have seen 
! it all..and this shocked the shit out of me even!!! 
! READ BELOW ABOUT THIS CLIP!
! THE FOOTAGE OF HARVEY THE PUSSY EATING WONDER DOG!
! It takes place on a farm somewhere within the u.s. 
! I would say the clip is just shy of 9 minutes long 
! and seems to be shot by a home cam recorder. In 
! this nine minutes you see a group of 5+ girls in 
! a barn looking building..at first they are having 
! light sex with each other..this is nothing..then 
! jackpot. Another girl comes in with a dog that we 
! now know is named harvey. She brings the dog in 
! and leads him to one of her friends who is already 
! naked and spreading her legs. The dog goes right 
! to work..eats her pussy like he's done it a hundred 
! times before..and folks he has. 
! http://www.nfogroup.net/ral/
! She takes him to her next friend and the next and 
! the friend after that. By this point we got why 
! this clip of was being taken..these farm girl sluts 
! have been doing this regularly. They get together 
! and this dog, harvey, gives them all head..i'm 
! talking like a pro here..if you or I could satisfy 
! half the women this dog can we would have it made. 
! This dog is amazing..hes just pussy eating machine..
! and these slutty farm girls love it to death. I've 
! seen animal sites and so on but i've never seen actual 
! amature footage like this in my life. 
! HOW AND WHY THE FOOTAGE WAS FILMED?
! It was the little brother of one of the girls..whichever 
! girl actually lived at this place. This little brother 
! sneaks into the barn and films his slutty sister and 
! all her friends doing this ..then puts in on the internet!!!! 
! How hilarious is that..I can't imagine how those girls feel 
! now..there will be definite lawsuits over this one. Maybe 
! he didn't like what they were doing to his dog or maybe 
! he just hated his sister like all siblings but either 
! way the little bastard filmed it then put it on the net! 
! http://www.nfogroup.net/ral/
! HERE'S THE GOOD PART
! The guys that now have this footage aren't normal porn site guys..
! they are just guys that get off on posting extreme shit to the 
! public. That means they don't want any money from us surfers 
! to watch the show. What they do instead is make you play this 
! little game that asks how many girls did harvey give an 
! orgasm to in one session and you have to pick one of three 
! answers. IF you win you're in and get to watch..if you 
! lose you're out. The reason they do this is I guess if we 
! play the game we willingly went and tried to watch it..we 
! are not some government agent who is trying to get them in 
! trouble. I think because of nature of they content they just 
! wanna make sure you are into this stuff..but hell if you're 
! like me and don't know dick about this stuff then just guess..
! thats what I did and it resulted in the most shocking movie 
! clip of i've seen to date!
! MY STRONGEST RECOMMENDATION
! If you're like me and like seeing this kind if bizarre stuff..
! get in there and see it now while its still up. Before somebody
! gets it taken offline...but even more important that that, 
! DO NOT FUCKING FORGET TO SAVE IT TO DISK!YOU'RE FRIENDS WILL NOT 
! BELIEVE YOU WITHOUT PROOF..TRUST ME ON THIS. SAVE IT SO THAT 
! WHEN YOU TELL THEM YOU CAN ALSO SHOW THEM.
! http://www.nfogroup.net/ral/
! CLICK HERE TO WATCH HARVEY GIVE HEAD TO GROUP OF 18 year old FARM SLUTS!!!!}
! wbcng^gryhfcynarg(arg
--- 1,84 ----
! Return-Path: <mov...@ea...>
! Received: from mail126.ninodw.com ([204.117.162.126])
! 	by priv-edtnes62.telusplanet.net (InterMail vM.5.01.05.17 201-253-122-126-117-20021021) with SMTP
! 	id <200...@ma...> for <jo...@te...>; Sat, 11 Jan 2003 06:04:06 -0700
! To: jo...@te...
! Date: Sat, 11 Jan 2003 07:05:44 -0500
! Message-ID: <104...@ma...>
! X-Mailer: Gnus/5.090001 (Oort Gnus v0.01) XEmacs/21.2 (Terspichore)
! From: mov...@ea...
! Reply-To: <mov...@ea...>
  Subject: [spam] Think you've seen porn? How about a dog giving 5+ girls oral sex till they cum?
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! So you think you've seen some crazy porn? 
! Think you've seen all the crazy stuff out there? 
! YOU HAVEN'T SEEN SHIT!!! I saw the most un fuckin 
! believable video clip thats ever been on our sick 
! and twisted internet! Know this I've been surfing 
! porn and the internet since it began! I have seen 
! it all..and this shocked the shit out of me even!!! 
! READ BELOW ABOUT THIS CLIP!
! THE FOOTAGE OF HARVEY THE PUSSY EATING WONDER DOG!
! It takes place on a farm somewhere within the u.s. 
! I would say the clip is just shy of 9 minutes long 
! and seems to be shot by a home cam recorder. In 
! this nine minutes you see a group of 5+ girls in 
! a barn looking building..at first they are having 
! light sex with each other..this is nothing..then 
! jackpot. Another girl comes in with a dog that we 
! now know is named harvey. She brings the dog in 
! and leads him to one of her friends who is already 
! naked and spreading her legs. The dog goes right 
! to work..eats her pussy like he's done it a hundred 
! times before..and folks he has. 
! http://www.nfogroup.net/ral/
! She takes him to her next friend and the next and 
! the friend after that. By this point we got why 
! this clip of was being taken..these farm girl sluts 
! have been doing this regularly. They get together 
! and this dog, harvey, gives them all head..i'm 
! talking like a pro here..if you or I could satisfy 
! half the women this dog can we would have it made. 
! This dog is amazing..hes just pussy eating machine..
! and these slutty farm girls love it to death. I've 
! seen animal sites and so on but i've never seen actual 
! amature footage like this in my life. 
! HOW AND WHY THE FOOTAGE WAS FILMED?
! It was the little brother of one of the girls..whichever 
! girl actually lived at this place. This little brother 
! sneaks into the barn and films his slutty sister and 
! all her friends doing this ..then puts in on the internet!!!! 
! How hilarious is that..I can't imagine how those girls feel 
! now..there will be definite lawsuits over this one. Maybe 
! he didn't like what they were doing to his dog or maybe 
! he just hated his sister like all siblings but either 
! way the little bastard filmed it then put it on the net! 
! http://www.nfogroup.net/ral/
! HERE'S THE GOOD PART
! The guys that now have this footage aren't normal porn site guys..
! they are just guys that get off on posting extreme shit to the 
! public. That means they don't want any money from us surfers 
! to watch the show. What they do instead is make you play this 
! little game that asks how many girls did harvey give an 
! orgasm to in one session and you have to pick one of three 
! answers. IF you win you're in and get to watch..if you 
! lose you're out. The reason they do this is I guess if we 
! play the game we willingly went and tried to watch it..we 
! are not some government agent who is trying to get them in 
! trouble. I think because of nature of they content they just 
! wanna make sure you are into this stuff..but hell if you're 
! like me and don't know dick about this stuff then just guess..
! thats what I did and it resulted in the most shocking movie 
! clip of i've seen to date!
! MY STRONGEST RECOMMENDATION
! If you're like me and like seeing this kind if bizarre stuff..
! get in there and see it now while its still up. Before somebody
! gets it taken offline...but even more important that that, 
! DO NOT FUCKING FORGET TO SAVE IT TO DISK!YOU'RE FRIENDS WILL NOT 
! BELIEVE YOU WITHOUT PROOF..TRUST ME ON THIS. SAVE IT SO THAT 
! WHEN YOU TELL THEM YOU CAN ALSO SHOW THEM.
! http://www.nfogroup.net/ral/
! CLICK HERE TO WATCH HARVEY GIVE HEAD TO GROUP OF 18 year old FARM SLUTS!!!!}
! wbcng^gryhfcynarg(arg

Index: TestMailParse008.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse008.cam,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestMailParse008.cam	16 Apr 2003 00:59:58 -0000	1.3
--- TestMailParse008.cam	16 Apr 2003 01:26:45 -0000	1.4
***************
*** 1,45 ****
! Return-Path: <sy...@ya...>
! Received: from N1N ([218.0.119.123]) by priv-edtnes27.telusplanet.net
! 	(InterMail vM.5.01.05.17 201-253-122-126-117-20021021) with ESMTP
! 	id <20030112013444.RTJR4607.priv-edtnes27.telusplanet.net@N1N>
! 	for <jo...@te...>; Sat, 11 Jan 2003 18:34:44 -0700
! From: "Alice" <sy...@ya...>
  Subject: [spam] Hello,Let us enjoy life!
! To: jo...@te...
! Content-Type: text/html;
!     charset="us-ascii"
! Date: Sun, 12 Jan 2003 09:34:46 +0800
! X-Priority: 3
! X-Mailer: jpfree Group Mail Express V1.0
! Message-Id: <20030112013444.RTJR4607.priv-edtnes27.telusplanet.net@N1N>
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! <HTML><HEAD><TITLE></TITLE>
! <META content="Microsoft FrontPage 4.0" name=GENERATOR></HEAD> 
! <BODY text=#000000 bgColor=#EFEBE7>
! <table border="0" width="500" cellspacing="0" cellpadding="5">
! <tr>
! <td valign="top">
! <h1 align=left><FONT size=4><B>Hello friends.</B></FONT></h1> 
! <h1 align=left><B><FONT size=4 face="Arial Narrow">I bet you would just love
! to<a href="http://www.apple999.com/xy1.htm">
! see me naked</a>, spreading my candy for ya. I can not even tell 
! you how much it turns me on to have people <a
! href="http://www.apple999.com/xy1.htm">get
! off to my naked sexy body</a>. I've left you a tiny sample of 
! my gorgeousness just to give you a itty- bitty taste of what's 
! inside if you join. So when you are done checking out my different 
! pics- it's time for you to join!!</FONT></B></h1>
! <P align=left><B><FONT size=4 face="Arial"><a
! href="http://www.apple999.com/xy1.htm">See
! you inside...</a></FONT></B></P>
! <P align=left><B><FONT size=4 face="Arial"><a
! href="http://www.apple999.com/xy1.htm">Hugs
! &amp; Kisses,</a><BR>
! Kurious</FONT></B></P>
! </td>
! <td><a href="http://www.apple999.com/xy1.htm">
! </tr>
! </table>
! </BODY></HTML>
--- 1,45 ----
! Return-Path: <sy...@ya...>
! Received: from N1N ([218.0.119.123]) by priv-edtnes27.telusplanet.net
! 	(InterMail vM.5.01.05.17 201-253-122-126-117-20021021) with ESMTP
! 	id <20030112013444.RTJR4607.priv-edtnes27.telusplanet.net@N1N>
! 	for <jo...@te...>; Sat, 11 Jan 2003 18:34:44 -0700
! From: "Alice" <sy...@ya...>
  Subject: [spam] Hello,Let us enjoy life!
! To: jo...@te...
! Content-Type: text/html;
!     charset="us-ascii"
! Date: Sun, 12 Jan 2003 09:34:46 +0800
! X-Priority: 3
! X-Mailer: jpfree Group Mail Express V1.0
! Message-Id: <20030112013444.RTJR4607.priv-edtnes27.telusplanet.net@N1N>
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! <HTML><HEAD><TITLE></TITLE>
! <META content="Microsoft FrontPage 4.0" name=GENERATOR></HEAD> 
! <BODY text=#000000 bgColor=#EFEBE7>
! <table border="0" width="500" cellspacing="0" cellpadding="5">
! <tr>
! <td valign="top">
! <h1 align=left><FONT size=4><B>Hello friends.</B></FONT></h1> 
! <h1 align=left><B><FONT size=4 face="Arial Narrow">I bet you would just love
! to<a href="http://www.apple999.com/xy1.htm">
! see me naked</a>, spreading my candy for ya. I can not even tell 
! you how much it turns me on to have people <a
! href="http://www.apple999.com/xy1.htm">get
! off to my naked sexy body</a>. I've left you a tiny sample of 
! my gorgeousness just to give you a itty- bitty taste of what's 
! inside if you join. So when you are done checking out my different 
! pics- it's time for you to join!!</FONT></B></h1>
! <P align=left><B><FONT size=4 face="Arial"><a
! href="http://www.apple999.com/xy1.htm">See
! you inside...</a></FONT></B></P>
! <P align=left><B><FONT size=4 face="Arial"><a
! href="http://www.apple999.com/xy1.htm">Hugs
! &amp; Kisses,</a><BR>
! Kurious</FONT></B></P>
! </td>
! <td><a href="http://www.apple999.com/xy1.htm">
! </tr>
! </table>
! </BODY></HTML>

Index: TestMailParse009.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse009.cam,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestMailParse009.cam	16 Apr 2003 00:59:58 -0000	1.3
--- TestMailParse009.cam	16 Apr 2003 01:26:45 -0000	1.4
***************
*** 1,98 ****
! Return-Path: <bri...@po...>
! Received: from 200.204.91.79 (200.204.91.79)
!   by mta564.mail.yahoo.com with SMTP; 09 Jan 2003 05:15:37 -0800 (PST)
! From: "Luke Perry" <bri...@po...>
! Reply-To: "Luke Perry" <bri...@po...>
! CC: big...@ya..., sta...@ya...
! Date: Thu, 9 Jan 2003 05:14:46 -0800
  Subject: [spam] FánTástìç!! ^ comman6853 ^ »»» Eárn Mõnéy thrôuGh UnçõLLeçted Judgments! «««
! X-Priority: 1
! MIME-Version: 1.0
! X-Mailer: Microsoft Outlook Express 6.00.2600.0000
! X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000
! Content-Type: text/html; charset=us-ascii
! Content-Transfer-Encoding: 7bit
! Content-Length: 1094
! Message-ID: <avj...@FQ...valid>
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! <font color=white>*-*-**-*-*-*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*
! *-*-*-*-*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*****-----*-**-*-*-*--*-*--*-*-*-*-*-***-
! <BR>¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤<BR> comman6853
! *--*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**</font><br>
! 
! <HTML>
! <font color=white
! size=1>comman6853YHERKHSDKJFHSDKJFHKSJDFHKJSDHFIUWEYRKHSDKFJHSDKJFHSRHFKSDJHFKJS
! DHFKSHDFKJSDHFUIWEYRIHWSFKJSDHKFJWIEURYKSJDHFKJSDHFKJSDHFKSHDFIWUEYRWHSFKJSDHFKH
! WEKRHKSJDFHWEYHFK^#$*#^^!*^*^$*^!^%^*^*^$&%^%(!@</font><br><!-- <REM: <URL2#####>>
! -->
! 
! 
! 
! 
! 
! 
! 
! 
! <HEAD></HEAD>
! <body>
! <P align=left>
! &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<IMG
! src="http://202.108.221.16/HTTP/ben/MBTY.jpg" border=0>&nbsp;&nbsp;&nbsp;<img
! src="http://202.108.221.16/HTTP/ben/EmailOffersOndemand.jpg" border="0">
! <BR><BR>
! 
! 
! 
! 
! 
! 
! 
! 
! <IMG src="http://202.108.221.16/HTTP/ben/sinko.gif" border=0>
! <BR><BR>
! <a href="mailto:28...@28..."><img
! src="http://202.108.221.16/HTTP/ben/clhere.gif" border="0"
! onMouseOver="window.status='283245'; return true"
! onMouseOut="window.status='283245'"></a>
! </P>
! 
! 
! 
! 
! 
! 
! 
! 
! <BR><BR><BR><BR><BR><BR><BR>
! 283245
! </body>
! <BR>
! <BR>
! <BR>
! <BR>
! <BR><font color=fuchsia face="tempus sans itc" ><b>LYK 01'08''03 C24
! <BR><BR><BR><BR>00066©<BR><BR>
! <BR>
! <BR>
! <BR><font color=white size=1>Current alternatives for recovering judgments
! inadequate-learn moreSecure Your Future Tod...@ya...Work at home-
! unlimited potentialHave you heard about this?com...@ya...Thriving Business
! needs your help!!!!We have the most advanced asset tracking services in the
! world!com...@ya...New career in legal profession gives you fresh outlook
! on your lifeHere's your chance for the American Dre...@ya...New
! methods for recovering judicial judgmentsRead Thi...@ya...Feel the
! need to succeedHave you heard about this?com...@ya...Everyone needs
! a Home-Based BusinessTraining in the Judgment business -A great new business
! idea!com...@ya...Feel the need to succeedHelp people who are awarded
! judgments - work from your hom...@ya...Love your job- work from
! homeSeeking Justice-Minded People for Business Opp...@ya...Work
! at home- unlimited potentialSuccessful judgment recovery
! bus...@ya...Enjoy the fruits of your laborDedicated, Hard-Working
! People Nee...@ya...</FONT>
! <BR>
! <BR></HTML>
! 
!  [@^*#@*%_#%*#_$%*_#_]
--- 1,98 ----
! Return-Path: <bri...@po...>
! Received: from 200.204.91.79 (200.204.91.79)
!   by mta564.mail.yahoo.com with SMTP; 09 Jan 2003 05:15:37 -0800 (PST)
! From: "Luke Perry" <bri...@po...>
! Reply-To: "Luke Perry" <bri...@po...>
! CC: big...@ya..., sta...@ya...
! Date: Thu, 9 Jan 2003 05:14:46 -0800
  Subject: [spam] FánTástìç!! ^ comman6853 ^ »»» Eárn Mõnéy thrôuGh UnçõLLeçted Judgments! «««
! X-Priority: 1
! MIME-Version: 1.0
! X-Mailer: Microsoft Outlook Express 6.00.2600.0000
! X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000
! Content-Type: text/html; charset=us-ascii
! Content-Transfer-Encoding: 7bit
! Content-Length: 1094
! Message-ID: <avj...@FQ...valid>
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! <font color=white>*-*-**-*-*-*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*
! *-*-*-*-*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*****-----*-**-*-*-*--*-*--*-*-*-*-*-***-
! <BR>¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤<BR> comman6853
! *--*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**</font><br>
! 
! <HTML>
! <font color=white
! size=1>comman6853YHERKHSDKJFHSDKJFHKSJDFHKJSDHFIUWEYRKHSDKFJHSDKJFHSRHFKSDJHFKJS
! DHFKSHDFKJSDHFUIWEYRIHWSFKJSDHKFJWIEURYKSJDHFKJSDHFKJSDHFKSHDFIWUEYRWHSFKJSDHFKH
! WEKRHKSJDFHWEYHFK^#$*#^^!*^*^$*^!^%^*^*^$&%^%(!@</font><br><!-- <REM: <URL2#####>>
! -->
! 
! 
! 
! 
! 
! 
! 
! 
! <HEAD></HEAD>
! <body>
! <P align=left>
! &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<IMG
! src="http://202.108.221.16/HTTP/ben/MBTY.jpg" border=0>&nbsp;&nbsp;&nbsp;<img
! src="http://202.108.221.16/HTTP/ben/EmailOffersOndemand.jpg" border="0">
! <BR><BR>
! 
! 
! 
! 
! 
! 
! 
! 
! <IMG src="http://202.108.221.16/HTTP/ben/sinko.gif" border=0>
! <BR><BR>
! <a href="mailto:28...@28..."><img
! src="http://202.108.221.16/HTTP/ben/clhere.gif" border="0"
! onMouseOver="window.status='283245'; return true"
! onMouseOut="window.status='283245'"></a>
! </P>
! 
! 
! 
! 
! 
! 
! 
! 
! <BR><BR><BR><BR><BR><BR><BR>
! 283245
! </body>
! <BR>
! <BR>
! <BR>
! <BR>
! <BR><font color=fuchsia face="tempus sans itc" ><b>LYK 01'08''03 C24
! <BR><BR><BR><BR>00066©<BR><BR>
! <BR>
! <BR>
! <BR><font color=white size=1>Current alternatives for recovering judgments
! inadequate-learn moreSecure Your Future Tod...@ya...Work at home-
! unlimited potentialHave you heard about this?com...@ya...Thriving Business
! needs your help!!!!We have the most advanced asset tracking services in the
! world!com...@ya...New career in legal profession gives you fresh outlook
! on your lifeHere's your chance for the American Dre...@ya...New
! methods for recovering judicial judgmentsRead Thi...@ya...Feel the
! need to succeedHave you heard about this?com...@ya...Everyone needs
! a Home-Based BusinessTraining in the Judgment business -A great new business
! idea!com...@ya...Feel the need to succeedHelp people who are awarded
! judgments - work from your hom...@ya...Love your job- work from
! homeSeeking Justice-Minded People for Business Opp...@ya...Work
! at home- unlimited potentialSuccessful judgment recovery
! bus...@ya...Enjoy the fruits of your laborDedicated, Hard-Working
! People Nee...@ya...</FONT>
! <BR>
! <BR></HTML>
! 
!  [@^*#@*%_#%*#_$%*_#_]

Index: TestMailParse010.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse010.cam,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestMailParse010.cam	16 Apr 2003 00:59:58 -0000	1.3
--- TestMailParse010.cam	16 Apr 2003 01:26:45 -0000	1.4
***************
*** 1,30 ****
! X-Auth-No: 
! Return-Path: <cs...@my...>
! Received: from digitalme.com not authenticated [193.97.97.75]
!         by smtp-send.myrealbox.com with NetMail SMTP Agent $Revision$ on Novell NetWare;
!         Sat, 11 Jan 2003 22:03:10 -0700
! Received: from 65.100.247.142 not authenticated [65.100.247.142]
!         by digitalme.com with Novell NIMS $Revision$ on Novell NetWare;
!         Sat, 11 Jan 2003 21:03:05 -0800
! Message-ID: <44747.22535@>
! From: U'S'A  L'o't't'e'r'y  L'T'D <iplvwq@>
  Subject: [spam] Re[4]:  Regarding your activation
! To: ar...@my...
! Date: Sun, 12 Jan 2003 07:03:25 
! MIME-Version: 1.0
! Content-Type: text/plain;
!         charset="windows-1252"
! Content-Transfer-Encoding: base64
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! Q29uZ3JhdHVsYXRpb25zIQ0KDQpZb3UgaGF2ZSBiZWVuIHNlbGVjdGVkIHRvIHJlY2lldmUgbWVt
! YmVyc2hpcCB0byB0aGUgYmVzdCBBYERgVWBMYFQgc2l0ZSBvZg0KeW91ciBjaG9pY2UgZm9yIEZe
! Ul5FXkUhDQoNCiogV2UgaGF2ZSBldmVyeSBuaWNoZSB5b3UgY2FuIGltYWdpbmUhDQoqIEFsbCBv
! ZiBvdXIgc2l0ZXMgaGFzIGhpZ2ggcXVhbGl0eSBjb250YW50IQ0KKiBZb3UgY2FuIGJlIGluIG1l
! bWJlciBzZWN0aW9uIGluIGxlc3MgdGhhbiAxIG1pbiENCiogQW5kIGJlc3Qgb2YgYWxsOiBOYE9g
! IENgUmBFYERgSWBUYCBDYEFgUmBEYCBOYEVgRWBEYEVgRGANCg0KKiAqICogKiBDYExgSWBDYEsg
! SGBFYFJgRSAqICogKiAqDQpodHRwOi8vYmVzdHBvcm5ob3N0LmNvbS92YXN5YS8/aW5zdGFudGhv
! bWUNCg0KSWYgeW91IGhhdmUgcmVjZWl2ZWQgdGhpcyBtYWlsaW5nIGluIGVycm9yLCBvciBkbyBu
! b3Qgd2lzaCB0byByZWNlaXZlIGFueQ0KZnVydGhlciBvZmZlcnMgb3Igbm90aWNlcyBmcm9tIHVz
! LCBzaW1wbHkNCmdvIGhlcmU6IHJtX21lX25vd0BtYWlsLmNvbT9zdWJqZWN0PURy
--- 1,30 ----
! X-Auth-No: 
! Return-Path: <cs...@my...>
! Received: from digitalme.com not authenticated [193.97.97.75]
!         by smtp-send.myrealbox.com with NetMail SMTP Agent $Revision$ on Novell NetWare;
!         Sat, 11 Jan 2003 22:03:10 -0700
! Received: from 65.100.247.142 not authenticated [65.100.247.142]
!         by digitalme.com with Novell NIMS $Revision$ on Novell NetWare;
!         Sat, 11 Jan 2003 21:03:05 -0800
! Message-ID: <44747.22535@>
! From: U'S'A  L'o't't'e'r'y  L'T'D <iplvwq@>
  Subject: [spam] Re[4]:  Regarding your activation
! To: ar...@my...
! Date: Sun, 12 Jan 2003 07:03:25 
! MIME-Version: 1.0
! Content-Type: text/plain;
!         charset="windows-1252"
! Content-Transfer-Encoding: base64
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! Q29uZ3JhdHVsYXRpb25zIQ0KDQpZb3UgaGF2ZSBiZWVuIHNlbGVjdGVkIHRvIHJlY2lldmUgbWVt
! YmVyc2hpcCB0byB0aGUgYmVzdCBBYERgVWBMYFQgc2l0ZSBvZg0KeW91ciBjaG9pY2UgZm9yIEZe
! Ul5FXkUhDQoNCiogV2UgaGF2ZSBldmVyeSBuaWNoZSB5b3UgY2FuIGltYWdpbmUhDQoqIEFsbCBv
! ZiBvdXIgc2l0ZXMgaGFzIGhpZ2ggcXVhbGl0eSBjb250YW50IQ0KKiBZb3UgY2FuIGJlIGluIG1l
! bWJlciBzZWN0aW9uIGluIGxlc3MgdGhhbiAxIG1pbiENCiogQW5kIGJlc3Qgb2YgYWxsOiBOYE9g
! IENgUmBFYERgSWBUYCBDYEFgUmBEYCBOYEVgRWBEYEVgRGANCg0KKiAqICogKiBDYExgSWBDYEsg
! SGBFYFJgRSAqICogKiAqDQpodHRwOi8vYmVzdHBvcm5ob3N0LmNvbS92YXN5YS8/aW5zdGFudGhv
! bWUNCg0KSWYgeW91IGhhdmUgcmVjZWl2ZWQgdGhpcyBtYWlsaW5nIGluIGVycm9yLCBvciBkbyBu
! b3Qgd2lzaCB0byByZWNlaXZlIGFueQ0KZnVydGhlciBvZmZlcnMgb3Igbm90aWNlcyBmcm9tIHVz
! LCBzaW1wbHkNCmdvIGhlcmU6IHJtX21lX25vd0BtYWlsLmNvbT9zdWJqZWN0PURy

Index: TestMailParse011.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse011.cam,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestMailParse011.cam	16 Apr 2003 00:59:58 -0000	1.3
--- TestMailParse011.cam	16 Apr 2003 01:26:45 -0000	1.4
***************
*** 1,44 ****
! Return-Path: <hor...@fr...>
! Delivered-To: myrealemailaddress@domain
! Received: (qmail 26261 invoked by uid 609); 18 Jan 2003 06:22:49 -0000
! Delivered-To: spam-address-ccbill@domain
! Received: (qmail 26258 invoked by uid 421); 18 Jan 2003 06:22:49 -0000 blah blah
!  by ekardia with Microsoft SMTPSVC(5.0.2122.2262);
! Sat, 18 Jan 2003 15:26:39 +0900
! Date: Sat, 18 Jan 2003 06:25:35 GMT
! From: "Acaynya"<hor...@fr...>
! X-Priority: 3
! To: spamaddy@domain
  Subject: [spam] spamaddy,what ?
! Mime-Version: 1.0
! Content-Type: text/plain; charset=us-ascii
! Content-Transfer-Encoding: 7bit
! Message-ID: <EKARDIAX6Mmasdf78970016@ekardia>
! X-OriginalArrivalTime: 18 Jan 2003 06:26:40.0656 (UTC)
!  FILETIME=[8FDC2900:01BAAAABA]
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! I think you answered my ad longtime ago if it was not you I am sorry.
! If it was I could not answer
! you because my Eudora died and I could not get it to work but my friend got
! the emails address out for me ..:)
! I hope it was you and you are still interested,
! as I realize lots of time has past.
! I really don't know where to start ....
! Maybe you can tell me little more about yourself since I lost your first email
! ,
! what you look like,age,and are you still looking ?
! If you are interested learning more about me, I have a profile at :
! 
! http://www.hiddenmatch.com
! 
! I am NOT a Porn Chick ..:-)
! I just chose it because you don't have to pay,
! And they allow any pictures I want .:).
! Oh yea , My username is darla1792 .
! Don't really know what else to say for now I hope this is the right address .
! Let me know if you are interested, And I hope
! you don't run when you see my picture :-)
! 
! Bye ..... D
--- 1,44 ----
! Return-Path: <hor...@fr...>
! Delivered-To: myrealemailaddress@domain
! Received: (qmail 26261 invoked by uid 609); 18 Jan 2003 06:22:49 -0000
! Delivered-To: spam-address-ccbill@domain
! Received: (qmail 26258 invoked by uid 421); 18 Jan 2003 06:22:49 -0000 blah blah
! by ekardia with Microsoft SMTPSVC(5.0.2122.2262);
! Sat, 18 Jan 2003 15:26:39 +0900
! Date: Sat, 18 Jan 2003 06:25:35 GMT
! From: "Acaynya"<hor...@fr...>
! X-Priority: 3
! To: spamaddy@domain
  Subject: [spam] spamaddy,what ?
! Mime-Version: 1.0
! Content-Type: text/plain; charset=us-ascii
! Content-Transfer-Encoding: 7bit
! Message-ID: <EKARDIAX6Mmasdf78970016@ekardia>
! X-OriginalArrivalTime: 18 Jan 2003 06:26:40.0656 (UTC)
! FILETIME=[8FDC2900:01BAAAABA]
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! I think you answered my ad longtime ago if it was not you I am sorry.
! If it was I could not answer
! you because my Eudora died and I could not get it to work but my friend got
! the emails address out for me ..:)
! I hope it was you and you are still interested,
! as I realize lots of time has past.
! I really don't know where to start ....
! Maybe you can tell me little more about yourself since I lost your first email
! ,
! what you look like,age,and are you still looking ?
! If you are interested learning more about me, I have a profile at :
! 
! http://www.hiddenmatch.com
! 
! I am NOT a Porn Chick ..:-)
! I just chose it because you don't have to pay,
! And they allow any pictures I want .:).
! Oh yea , My username is darla1792 .
! Don't really know what else to say for now I hope this is the right address .
! Let me know if you are interested, And I hope
! you don't run when you see my picture :-)
! 
! Bye ..... D

Index: TestMailParse011.msg
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse011.msg,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse011.msg	16 Apr 2003 00:59:58 -0000	1.2
--- TestMailParse011.msg	16 Apr 2003 01:26:45 -0000	1.3
***************
*** 4,8 ****
  Delivered-To: spam-address-ccbill@domain
  Received: (qmail 26258 invoked by uid 421); 18 Jan 2003 06:22:49 -0000 blah blah
!  by ekardia with Microsoft SMTPSVC(5.0.2122.2262);
  Sat, 18 Jan 2003 15:26:39 +0900
  Date: Sat, 18 Jan 2003 06:25:35 GMT
--- 4,8 ----
  Delivered-To: spam-address-ccbill@domain
  Received: (qmail 26258 invoked by uid 421); 18 Jan 2003 06:22:49 -0000 blah blah
! by ekardia with Microsoft SMTPSVC(5.0.2122.2262);
  Sat, 18 Jan 2003 15:26:39 +0900
  Date: Sat, 18 Jan 2003 06:25:35 GMT
***************
*** 16,20 ****
  Message-ID: <EKARDIAX6Mmasdf78970016@ekardia>
  X-OriginalArrivalTime: 18 Jan 2003 06:26:40.0656 (UTC)
!  FILETIME=[8FDC2900:01BAAAABA]
  
  I think you answered my ad longtime ago if it was not you I am sorry.
--- 16,20 ----
  Message-ID: <EKARDIAX6Mmasdf78970016@ekardia>
  X-OriginalArrivalTime: 18 Jan 2003 06:26:40.0656 (UTC)
! FILETIME=[8FDC2900:01BAAAABA]
  
  I think you answered my ad longtime ago if it was not you I am sorry.

Index: TestMailParse012.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse012.cam,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestMailParse012.cam	16 Apr 2003 00:59:58 -0000	1.3
--- TestMailParse012.cam	16 Apr 2003 01:26:45 -0000	1.4
***************
*** 1,54 ****
! Return-Path: <Bri...@ao...>
! Received: from sunsinger.herald.co.uk (sunsinger.herald.co.uk [213.38.80.4]) by walnut.he.net (8.8.6/8.8.2) with ESMTP id RAA04728 for <jg...@ex...>; Mon, 20 Jan 2003 17:08:29 -0800
! Received: from mailin-03.mx.aol.com (CacheFlowServer@[200.215.97.82])
! 	by sunsinger.herald.co.uk (8.9.3/8.9.3/Debian/GNU) with SMTP id BAA08887
! 	for <web...@jg...>; Tue, 21 Jan 2003 01:08:19 GMT
! Date: Tue, 21 Jan 2003 01:08:19 GMT
! Message-Id: <200...@su...>
! X-Authentication-Warning: sunsinger.herald.co.uk: Host CacheFlowServer@[200.215.97.82] claimed to be mailin-03.mx.aol.com
! From: Brianna121 <Bri...@ao...>
! To: <web...@jg...>
  Subject: [spam] Want to see a huge horse c*ck in a tiny teen c*nt?
! MIME-Version: 1.0
! Content-Type: text/html; charset="US-ASCII"
! Content-transfer-encoding: 7bit
! X-UIDL: M-$"!c:b"!57:!!i#1!!
! X-POPFile-Link: <http://127.0.0.1:9090/jump_to_message?view=popfile2146=1.msg>
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! <html>
! 
! <head>
! <title>get it now</title>
! <base target="_blank">
! </head>
! <body alink="Blue" link="Blue" vlink="Blue">
! <a href="http://pc.x-x-xfreehosting.com/pc">
! You think you have seen some pretty crazy porn on the internet? YOU HAVEN'T SEEN SHIT! I saw the most unbelievable movie clip ever to grace the internet! These guys put up a clip of a beautiful teen farm girl who actually fucks her horse!
! <br>
! NO BULLSHIT, SHE ACTUALLY FUCKS A HORSE WITH A 25 INCH COCK! 
! THE MOVIE QUALITY IS GREAT AND HAS SOUND TOO! IT IS UNBELIEVABLE!
! <br><br>
! THIS LITTLE SLUTS CAN REALLY HANDLE A GIANT HORSE COCK IN HER TIGHT LITTLE TEEN PUSSY LIKE YOU WOULD NOT BELIEVE! YOU HAV TO WATCH THIS CLIP BEFORE SOMEONE FINDS IT AND TAKE IT OFF.
! <br><br>
! HERES THE GOOD PART. THESE GUYS AREN'T A NORMAL PORN SITE SO THEY DON'T WANT MONEY TO LET US WATCH SO ITS FREE. BUT WHAT THEY DO IS MAKE YOU TAKE THIS TEST THAT ASKS HOW BIG A HORSE DICK IS. THAT'S SOMETHING  THAT ONLY PEOPLE INTO ANIMAL SEX WOULD KNOW. SO I THINK THEY ARE JUST TRYING TO MAKE SURE YOU ARE SOMEONE WHOS INTO THIS STUFF..NOT SOMEONE WHO WANTS TO BUST THEM. SO IF YOU'RE LIKE ME AND DON'T KNOW ANYTHING ABOUT ANIMALS JUST GUESS THE SIZE. THERE ARE ONLY 3 CHOICES AND IF YOU GET IT RIGHT YOU'RE IN. YOU GET TO WATCH THE WHOLE CLIP..AND HEY DO NOT FORGET TO SAVE IT CUZ  YOU'LL WANT TO WATCH IT AGAIN OR SHOW IT TO YOUR FRIENDS LATER! 
! <br><br>
! CLICK HERE TO WATCH THIS LITTLE SLUT FUCK HER HORSE FOR 8 MINUTES! DO NOT FORGET TO SAVE IT SO YOU CAN WATCH IT AGAIN LATER!</a>
! <p> </p>
! <p> </p>
! <p> </p>
! <p> </p>
! <p> </p>
! <p> </p>
! <p> </p>
! <p> </p>
! <br>
! <br>
! <br>
! <br>
! <br>
! <br>
! <div align="center">
!   <div>
!   <p align="left"><a href="http://6.x-x-xfreehosting.com/index.php?cid=291&eid=d2VibWFzdGVyQGpnYy5vcmc=">Go Here to Stop</a></p>
--- 1,54 ----
! Return-Path: <Bri...@ao...>
! Received: from sunsinger.herald.co.uk (sunsinger.herald.co.uk [213.38.80.4]) by walnut.he.net (8.8.6/8.8.2) with ESMTP id RAA04728 for <jg...@ex...>; Mon, 20 Jan 2003 17:08:29 -0800
! Received: from mailin-03.mx.aol.com (CacheFlowServer@[200.215.97.82])
! 	by sunsinger.herald.co.uk (8.9.3/8.9.3/Debian/GNU) with SMTP id BAA08887
! 	for <web...@jg...>; Tue, 21 Jan 2003 01:08:19 GMT
! Date: Tue, 21 Jan 2003 01:08:19 GMT
! Message-Id: <200...@su...>
! X-Authentication-Warning: sunsinger.herald.co.uk: Host CacheFlowServer@[200.215.97.82] claimed to be mailin-03.mx.aol.com
! From: Brianna121 <Bri...@ao...>
! To: <web...@jg...>
  Subject: [spam] Want to see a huge horse c*ck in a tiny teen c*nt?
! MIME-Version: 1.0
! Content-Type: text/html; charset="US-ASCII"
! Content-transfer-encoding: 7bit
! X-UIDL: M-$"!c:b"!57:!!i#1!!
! X-POPFile-Link: <http://127.0.0.1:9090/jump_to_message?view=popfile2146=1.msg>
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! <html>
! 
! <head>
! <title>get it now</title>
! <base target="_blank">
! </head>
! <body alink="Blue" link="Blue" vlink="Blue">
! <a href="http://pc.x-x-xfreehosting.com/pc">
! You think you have seen some pretty crazy porn on the internet? YOU HAVEN'T SEEN SHIT! I saw the most unbelievable movie clip ever to grace the internet! These guys put up a clip of a beautiful teen farm girl who actually fucks her horse!
! <br>
! NO BULLSHIT, SHE ACTUALLY FUCKS A HORSE WITH A 25 INCH COCK! 
! THE MOVIE QUALITY IS GREAT AND HAS SOUND TOO! IT IS UNBELIEVABLE!
! <br><br>
! THIS LITTLE SLUTS CAN REALLY HANDLE A GIANT HORSE COCK IN HER TIGHT LITTLE TEEN PUSSY LIKE YOU WOULD NOT BELIEVE! YOU HAV TO WATCH THIS CLIP BEFORE SOMEONE FINDS IT AND TAKE IT OFF.
! <br><br>
! HERES THE GOOD PART. THESE GUYS AREN'T A NORMAL PORN SITE SO THEY DON'T WANT MONEY TO LET US WATCH SO ITS FREE. BUT WHAT THEY DO IS MAKE YOU TAKE THIS TEST THAT ASKS HOW BIG A HORSE DICK IS. THAT'S SOMETHING  THAT ONLY PEOPLE INTO ANIMAL SEX WOULD KNOW. SO I THINK THEY ARE JUST TRYING TO MAKE SURE YOU ARE SOMEONE WHOS INTO THIS STUFF..NOT SOMEONE WHO WANTS TO BUST THEM. SO IF YOU'RE LIKE ME AND DON'T KNOW ANYTHING ABOUT ANIMALS JUST GUESS THE SIZE. THERE ARE ONLY 3 CHOICES AND IF YOU GET IT RIGHT YOU'RE IN. YOU GET TO WATCH THE WHOLE CLIP..AND HEY DO NOT FORGET TO SAVE IT CUZ  YOU'LL WANT TO WATCH IT AGAIN OR SHOW IT TO YOUR FRIENDS LATER! 
! <br><br>
! CLICK HERE TO WATCH THIS LITTLE SLUT FUCK HER HORSE FOR 8 MINUTES! DO NOT FORGET TO SAVE IT SO YOU CAN WATCH IT AGAIN LATER!</a>
! <p> </p>
! <p> </p>
! <p> </p>
! <p> </p>
! <p> </p>
! <p> </p>
! <p> </p>
! <p> </p>
! <br>
! <br>
! <br>
! <br>
! <br>
! <br>
! <div align="center">
!   <div>
!   <p align="left"><a href="http://6.x-x-xfreehosting.com/index.php?cid=291&eid=d2VibWFzdGVyQGpnYy5vcmc=">Go Here to Stop</a></p>

Index: TestMailParse013.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse013.cam,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestMailParse013.cam	16 Apr 2003 00:59:58 -0000	1.3
--- TestMailParse013.cam	16 Apr 2003 01:26:45 -0000	1.4
***************
*** 1,62 ****
! From rr...@nn... Mon Jan 06 05:00:37 2003
! Received: from palm.lyris.net [216.91.57.210] by ajw.com [127.0.0.1] with SMTP (MDaemon.v2.7.SP4.R) for <Ar...@aj...>; Mon, 06 Jan 2003 05:00:43 -0500
! Mime-Version: 1.0
! X-Sender: rR...@po...
! Message-Id: <LYRIS-57933-146278-2003.01.06-02.00.42--alan#aj...@ne...>
! In-Reply-To: 
!  <LYRIS-54343-146225-2003.01.06-00.00.02--rrr#nnn...@ne...
!  >
! Date: Mon, 6 Jan 2003 02:00:37 -0800
! To: "Armlet Forum" <arm...@ne...>
! From: RN <rr...@nn...>
  Subject: [spam] (Archive Copy) RE: CW v9 and armlets...
! Content-Type: text/plain; charset="us-ascii" ; format="flowed"
! List-Unsubscribe: <mailto:lea...@ne...>
! List-Owner: <mailto:own...@ne...>
! Reply-To: "Armlet Forum" <arm...@ne...>
! X-Message-Id: <p05111a00ba3efa6a0686@[192.168.1.100]>
! Sender: bou...@ne...
! X-Palm-Dev-Forum: armlet-forum
! X-MDArchive-Copy: 1
! X-MDaemon-Deliver-To: Ar...@aj...
! X-Return-Path: bou...@ne...
! X-MBF-FILE: MDaemon Gateway to RFC822 (RFC822.MBF v1.0)
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! On Sun, 5 Jan 2003 22:46:10 -0800,
! "BF" <bff...@ss...> wrote:
! >I tried many variations of your code to setup r10 for writable global
! >variables.  Unfortunately I can't get it to compile under CW9.  Here are
! >the errors, followed by the code.  Of course the code below won't run,
! >but I don't understand why I can't get your sample to build:
! >  ... [ examples and errors deleted] ...
! 
! Maybe the  "asm { mov r10, r4; }"  is required before the return
! to balance the register usage?
! 
! I can only get the code to compile with thumb mode on (default) and
! optimizations off.  When it does compile, it seems to work just fine
! (e.g. a 40k armlet functions correctly while using lots of read/write
! global variables and callbacks...)
! 
! >It looks like the variable R5 and the register r5 aren't related.
! 
! ( Heh!  :-)  I just kept renaming the variable until it matched the
! register that the disassembly said the compiler was actually using
! (for my sanity).   But I would like to find some clean syntax that
! will safely survive compiler optimizations (the code I posted
! obviously won't!).
! 
! I'm almost ready to try using gcc-arm-elf to build my armlet
! entry point and concatenate that in front of the CW v9 output.
! Messy...
! 
! RN
! HHHHHH
!     <http://www.hhhhhh.com/rrr/hhhhhh>
! 
! -- 
! For information on using the Palm Developer Forums, or to unsubscribe, please see http://www.palmos.com/dev/support/forums/
! 
! 
--- 1,62 ----
! From rr...@nn... Mon Jan 06 05:00:37 2003
! Received: from palm.lyris.net [216.91.57.210] by ajw.com [127.0.0.1] with SMTP (MDaemon.v2.7.SP4.R) for <Ar...@aj...>; Mon, 06 Jan 2003 05:00:43 -0500
! Mime-Version: 1.0
! X-Sender: rR...@po...
! Message-Id: <LYRIS-57933-146278-2003.01.06-02.00.42--alan#aj...@ne...>
! In-Reply-To: 
!  <LYRIS-54343-146225-2003.01.06-00.00.02--rrr#nnn...@ne...
!  >
! Date: Mon, 6 Jan 2003 02:00:37 -0800
! To: "Armlet Forum" <arm...@ne...>
! From: RN <rr...@nn...>
  Subject: [spam] (Archive Copy) RE: CW v9 and armlets...
! Content-Type: text/plain; charset="us-ascii" ; format="flowed"
! List-Unsubscribe: <mailto:lea...@ne...>
! List-Owner: <mailto:own...@ne...>
! Reply-To: "Armlet Forum" <arm...@ne...>
! X-Message-Id: <p05111a00ba3efa6a0686@[192.168.1.100]>
! Sender: bou...@ne...
! X-Palm-Dev-Forum: armlet-forum
! X-MDArchive-Copy: 1
! X-MDaemon-Deliver-To: Ar...@aj...
! X-Return-Path: bou...@ne...
! X-MBF-FILE: MDaemon Gateway to RFC822 (RFC822.MBF v1.0)
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! On Sun, 5 Jan 2003 22:46:10 -0800,
! "BF" <bff...@ss...> wrote:
! >I tried many variations of your code to setup r10 for writable global
! >variables.  Unfortunately I can't get it to compile under CW9.  Here are
! >the errors, followed by the code.  Of course the code below won't run,
! >but I don't understand why I can't get your sample to build:
! >  ... [ examples and errors deleted] ...
! 
! Maybe the  "asm { mov r10, r4; }"  is required before the return
! to balance the register usage?
! 
! I can only get the code to compile with thumb mode on (default) and
! optimizations off.  When it does compile, it seems to work just fine
! (e.g. a 40k armlet functions correctly while using lots of read/write
! global variables and callbacks...)
! 
! >It looks like the variable R5 and the register r5 aren't related.
! 
! ( Heh!  :-)  I just kept renaming the variable until it matched the
! register that the disassembly said the compiler was actually using
! (for my sanity).   But I would like to find some clean syntax that
! will safely survive compiler optimizations (the code I posted
! obviously won't!).
! 
! I'm almost ready to try using gcc-arm-elf to build my armlet
! entry point and concatenate that in front of the CW v9 output.
! Messy...
! 
! RN
! HHHHHH
!     <http://www.hhhhhh.com/rrr/hhhhhh>
! 
! -- 
! For information on using the Palm Developer Forums, or to unsubscribe, please see http://www.palmos.com/dev/support/forums/
! 
! 

Index: TestMailParse014.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse014.cam,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestMailParse014.cam	16 Apr 2003 00:59:58 -0000	1.3
--- TestMailParse014.cam	16 Apr 2003 01:26:45 -0000	1.4
***************
*** 1,40 ****
! Received: from msely.prodigy.net ([213.70.63.68]) by mc4-f37.law16.hotmail.com with Microsoft SMTPSVC(5.0.2195.5600);
! 	 Mon, 25 Nov 2002 20:51:23 -0800
  Subject: [spam] 5uj9s
! To: cfz...@wo...
! From: Douglas Arnold <0n...@wo...>
! Date: Tue Nov 26 12:53:20 2002 -0400
! Content-Type: text/html; charset="US-ASCII"
! Message-ID: <8h2...@wo...>
! Return-Path: 0n...@wo...
! X-OriginalArrivalTime: 26 Nov 2002 04:51:23.0664 (UTC) FILETIME=[785FA900:01C29507]
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! <BODY BGCOLOR="WHITE">
!  <TABLE WIDTH=550><TR><TD><FONT SIZE=4 FACE="VERDANA" COLOR="#333366">
!  <CENTER>W&#105;&#112;&#101; O&#117;t T&#97;x D&#101;&#98;t, E&#110;d y&#111;&#117;r IRS t&#97;x &#112;r&#111;&#98;l&#101;m&#115;!</CENTER><BR>
!  W&#111;&#117;ld y&#111;&#117; l&#105;k&#101; t&#111; r&#101;&#115;&#111;lv&#101...
 
[truncated message content]

[popfile-commit] engine/tests TestBayes.tst,1.7,1.8 TestMailParse001.cam,1.2,1.3 TestMailParse002.cam,1.2,1.3 TestMailParse003.cam,1.2,1.3 TestMailParse004.cam,1.2,1.3 TestMailParse005.cam,1.2,1.3 TestMailParse006.cam,1.2,1.3 TestMailParse007.cam,1.2,1.3 TestMailParse008.cam,1.2,1.3 TestMailParse009.cam,1.2,1.3 TestMailParse010.cam,1.2,1.3 TestMailParse011.cam,1.2,1.3 TestMailParse011.msg,1.1,1.2 TestMailParse012.cam,1.2,1.3 TestMailParse013.cam,1.2,1.3 TestMailParse014.cam,1.2,1.3 TestMailParse015.cam,1.2,1.3 TestMailParse016.cam,1.2,1.3 TestMailParse017.cam,1.2,1.3 TestMailParse018.cam,1.2,1.3 TestMailParse020.cam,1.2,1.3 TestMailParse021.cam,1.2,1.3

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

Update of /cvsroot/popfile/engine/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv17280/tests

Modified Files:
	TestBayes.tst TestMailParse001.cam TestMailParse002.cam 
	TestMailParse003.cam TestMailParse004.cam TestMailParse005.cam 
	TestMailParse006.cam TestMailParse007.cam TestMailParse008.cam 
	TestMailParse009.cam TestMailParse010.cam TestMailParse011.cam 
	TestMailParse011.msg TestMailParse012.cam TestMailParse013.cam 
	TestMailParse014.cam TestMailParse015.cam TestMailParse016.cam 
	TestMailParse017.cam TestMailParse018.cam TestMailParse020.cam 
	TestMailParse021.cam 
Log Message:
change handling of bayes::{scores__} to reduce burden on forking
(Disables saving of scores where not needed, clears scores after where enabled)

Index: TestBayes.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestBayes.tst,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TestBayes.tst	28 Mar 2003 23:57:34 -0000	1.7
--- TestBayes.tst	16 Apr 2003 00:59:58 -0000	1.8
***************
*** 68,71 ****
--- 68,72 ----
  for my $modify_file (@modify_tests) {
      if ( ( open MSG, "<$modify_file" ) && ( open OUTPUT, ">tests/temp.out" ) ) {
+ 		binmode OUTPUT;
  	    $b->classify_and_modify( \*MSG, \*OUTPUT, 0, 0, 0, '' );
  	    close MSG;
***************
*** 89,92 ****
--- 90,94 ----
  		unlink( 'tests/popfile0=0.msg' );
  		unlink( 'tests/popfile0=0.cls' );
+ #		rename( 'tests/temp.out', $output_file);
  		unlink( 'tests/temp.out' );
      }

Index: TestMailParse001.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse001.cam,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse001.cam	28 Feb 2003 01:57:23 -0000	1.2
--- TestMailParse001.cam	16 Apr 2003 00:59:58 -0000	1.3
***************
*** 1,7 ****
! From: blank
  Subject: [spam]
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! Testing S P A C E D out words spaced out in a document.
  .
--- 1,7 ----
! From: blank
  Subject: [spam]
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! Testing S P A C E D out words spaced out in a document.
  .

Index: TestMailParse002.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse002.cam,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse002.cam	28 Feb 2003 01:57:23 -0000	1.2
--- TestMailParse002.cam	16 Apr 2003 00:59:58 -0000	1.3
***************
*** 1,6 ****
! From: blank
  Subject: [spam]
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! who wants to be a millionaire milli<!---->onaire mi<!-- testing -->llionaire millionair<!-- -->e
--- 1,6 ----
! From: blank
  Subject: [spam]
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! who wants to be a millionaire milli<!---->onaire mi<!-- testing -->llionaire millionair<!-- -->e

Index: TestMailParse003.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse003.cam,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse003.cam	28 Feb 2003 01:57:23 -0000	1.2
--- TestMailParse003.cam	16 Apr 2003 00:59:58 -0000	1.3
***************
*** 1,34 ****
  Subject: [spam] from: Leandro
! To: jI7...@ao...
! Message-ID: <200...@8S...>
! From: "serafina venter"<j23...@ea...>
! Date: Sun, 12 Jan 2003 19:49:36 -0400
! X-Priority: 3 (Normal)
! Importance: Normal
! X-Accept-Language: en
! Errors-To: <j23...@ea...>
! MIME-Version: 1.0
! Content-Type: multipart/alternative;
!     boundary="=gs6mlah1knva3tk5nbs4422k3570q7m3k=="
! Content-Transfer-Encoding: 7bit
! Return-Path: j23...@ea...
! X-OriginalArrivalTime: 13 Jan 2003 00:49:31.0608 (UTC)
! FILETIME=[A257A580:01C2BA9D]
! --=gs6mlah1knva3tk5nbs4422k3570q7m3k==
! Content-Transfer-Encoding: base64
! Content-Type: text/html; charset="US-ASCII"
! PGh0bWw+DQo8YSBocmVmPSJodHRwOi8vJTc3JTc3dy5wJTYxJTczJTczNCU2NiU3MmUlNjUlMkVuZXQvcGIzLyIgVDhJPjxGT05UIFNJWkU9NT48Qj4mIzg3
! OyYjOTc7PCFLND50PCE0YTQ1PmMmIzEwNDs8IVBKMHV1PiAmIzY4OzwhT1UxMGRRPm88IWgzMj5nPCFOWDc4PnM8IUY0NzZ0PiAmIzExNTsmIzEwODs8IXkw
! eDY+dSYjMTE0OzwhV1ZRPnAmIzMyOzwhMW0+eTwhS1NrUD5vPCFvMzVBZT51JiMxMTA7JiMxMDM7PCE0N2ViVTM+ICYjMTAzOyYjMTA1OyYjMTE0OyYjMTA4
! OyYjMTE1OyYjMzI7PCF5MjU+cCYjMTE3OzwhOFljPnMmIzExNTsmIzEyMTs8ITVSaTQ+JzwhcEdTNj5zJiMzMjsmIzk3OzwhQWgxPnMmIzMyOyYjMTE2OyYj
! MTA0OzwhMXJKM1JIPmU8IW84V1h1PnkmIzMyOzwhMzU+czwhMFE3ND5jJiMxMTQ7PCFSZnA+ZTwhUGw+YTwhSzQ+bTwhNGE0NT4gJiMxMDI7PCFQSjB1dT5v
! JiMxMTQ7PCFPVTEwZFE+IDwhaDMyPm08IU5YNzg+bzwhRjQ3NnQ+ciYjMTAxOyYjMzM7PC9mb250PjwvYT48QlI+DQo8QlIgck0wc1JhUHE+PGEgaHJlZj0i
! aHR0cDovL3d3dyUyRSU3MCU2MSU3MyU3MyUzNGZyZWUlMkUlNkUlNjV0L3BiMy8iIDFySjNSSEJvOFcgdW5TVlQ3PjxGT05UIFNJWkU9ND48Qj48IXkweDY+
! QyYjMTA4OzwhV1ZRPmkmIzk5OzwhMW0+azwhS1NrUD4gPCFvMzVBZT5IJiMxMDE7JiMxMTQ7PCE0N2ViVTM+ZTwvZm9udD48L2E+PEJSPjxCUj48QlI+PEJS
! PjxCUj48QlI+PEJSPiYjMTM7JiMxMDsmIzY5OyYjMTA5OyYjOTc7JiMxMDU7PCF5MjU+bCYjMzI7PCE4WWM+QiYjOTc7JiMxMDA7PCE1Umk0Pj88QlIgUlIg
! Mk1PZHZjTT4NCm5vIG1vcmUgPGEgaHJlZj0iaHR0cDovL3JlbW92ZSUyRSU2RGUlNzMlNzNhJTY3JTY1bSU2NW4lNkYlNzcuJTZFZXQvIiBSZnBOUD5DbGlj
! ayBIZXJlPC9hPjxCUj4NCjxCUj48L2h0bWw+DQoNCmFQcTgyTU9kICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjTUo=
! --=gs6mlah1knva3tk5nbs4422k3570q7m3k==--
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
--- 1,34 ----
  Subject: [spam] from: Leandro
! To: jI7...@ao...
! Message-ID: <200...@8S...>
! From: "serafina venter"<j23...@ea...>
! Date: Sun, 12 Jan 2003 19:49:36 -0400
! X-Priority: 3 (Normal)
! Importance: Normal
! X-Accept-Language: en
! Errors-To: <j23...@ea...>
! MIME-Version: 1.0
! Content-Type: multipart/alternative;
!     boundary="=gs6mlah1knva3tk5nbs4422k3570q7m3k=="
! Content-Transfer-Encoding: 7bit
! Return-Path: j23...@ea...
! X-OriginalArrivalTime: 13 Jan 2003 00:49:31.0608 (UTC) FILETIME=[A257A580:01C2BA9D]
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
+ --=gs6mlah1knva3tk5nbs4422k3570q7m3k==
+ Content-Transfer-Encoding: base64
+ Content-Type: text/html; charset="US-ASCII"
+ 
+ PGh0bWw+DQo8YSBocmVmPSJodHRwOi8vJTc3JTc3dy5wJTYxJTczJTczNCU2NiU3MmUlNjUlMkVuZXQvcGIzLyIgVDhJPjxGT05UIFNJWkU9NT48Qj4mIzg3
+ OyYjOTc7PCFLND50PCE0YTQ1PmMmIzEwNDs8IVBKMHV1PiAmIzY4OzwhT1UxMGRRPm88IWgzMj5nPCFOWDc4PnM8IUY0NzZ0PiAmIzExNTsmIzEwODs8IXkw
+ eDY+dSYjMTE0OzwhV1ZRPnAmIzMyOzwhMW0+eTwhS1NrUD5vPCFvMzVBZT51JiMxMTA7JiMxMDM7PCE0N2ViVTM+ICYjMTAzOyYjMTA1OyYjMTE0OyYjMTA4
+ OyYjMTE1OyYjMzI7PCF5MjU+cCYjMTE3OzwhOFljPnMmIzExNTsmIzEyMTs8ITVSaTQ+JzwhcEdTNj5zJiMzMjsmIzk3OzwhQWgxPnMmIzMyOyYjMTE2OyYj
+ MTA0OzwhMXJKM1JIPmU8IW84V1h1PnkmIzMyOzwhMzU+czwhMFE3ND5jJiMxMTQ7PCFSZnA+ZTwhUGw+YTwhSzQ+bTwhNGE0NT4gJiMxMDI7PCFQSjB1dT5v
+ JiMxMTQ7PCFPVTEwZFE+IDwhaDMyPm08IU5YNzg+bzwhRjQ3NnQ+ciYjMTAxOyYjMzM7PC9mb250PjwvYT48QlI+DQo8QlIgck0wc1JhUHE+PGEgaHJlZj0i
+ aHR0cDovL3d3dyUyRSU3MCU2MSU3MyU3MyUzNGZyZWUlMkUlNkUlNjV0L3BiMy8iIDFySjNSSEJvOFcgdW5TVlQ3PjxGT05UIFNJWkU9ND48Qj48IXkweDY+
+ QyYjMTA4OzwhV1ZRPmkmIzk5OzwhMW0+azwhS1NrUD4gPCFvMzVBZT5IJiMxMDE7JiMxMTQ7PCE0N2ViVTM+ZTwvZm9udD48L2E+PEJSPjxCUj48QlI+PEJS
+ PjxCUj48QlI+PEJSPiYjMTM7JiMxMDsmIzY5OyYjMTA5OyYjOTc7JiMxMDU7PCF5MjU+bCYjMzI7PCE4WWM+QiYjOTc7JiMxMDA7PCE1Umk0Pj88QlIgUlIg
+ Mk1PZHZjTT4NCm5vIG1vcmUgPGEgaHJlZj0iaHR0cDovL3JlbW92ZSUyRSU2RGUlNzMlNzNhJTY3JTY1bSU2NW4lNkYlNzcuJTZFZXQvIiBSZnBOUD5DbGlj
+ ayBIZXJlPC9hPjxCUj4NCjxCUj48L2h0bWw+DQoNCmFQcTgyTU9kICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjTUo=
+ --=gs6mlah1knva3tk5nbs4422k3570q7m3k==--

Index: TestMailParse004.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse004.cam,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse004.cam	28 Feb 2003 01:57:23 -0000	1.2
--- TestMailParse004.cam	16 Apr 2003 00:59:58 -0000	1.3
***************
*** 1,23 ****
! Return-Path: <hot...@ya...>
! From: hot...@ya...
! Message-ID: <000048874f7b$00000e95$000...@mx...>
! To: <Und...@va...>
  Subject: [spam]   
! Date: Sat, 18 Jan 2003 19:50:57 01900
! MIME-Version: 1.0
! Content-Type: multipart/mixed;
!     boundary="----=_NextPart_000_60BF_00005753.000048CC"
! X-UIDL: B<E!!^8S!!0'="!J;6"!
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! ------=_NextPart_000_60BF_00005753.000048CC
! Content-Type: text/html;
!     charset="iso-8859-1"
! Content-Transfer-Encoding: base64
! 
! PEhUTUw+PEJPRFkgQkdDT0xPUj0iIzAwMDAwMCI+PC9QPjxQIEFMSUdOPUNFTlRFUj48Rk9OVCAgQ09MT1I9IiNmZjAwMDAiIEJBQ0s9IiMwMDAwMDAiIHN0eWxlPSJCQUNLR1JPVU5ELUNPTE9SOiAjMDAwMDAwIiBTSVpFPTYgUFRTSVpFPTI0PlRoZSBob3R0ZXN0IEdpcmxzIE9ubGluZSE8QlI+DQpTdG9wIHdhc3RpbmcgeW91ciB0aW1lIHdpdGggNSBzZWM8QlI+DQp2aWRlbyBjbGlwcyEgQ29tZSB0byBvdXIgc2l0ZSBmb3I8QlI+DQpGcmVlIEZ1bGwgTGVuZ3RoIE1vdmllcyE8QlI+DQo8QSBIUkVGPSJodHRwOi8vd2NhbWF0ZXVycy5jb20vbC9ibCI+V2h5IHdhaXQsIHNlZSBmb3IgRnJlZTwvQT48L0ZPTlQ+PEZPTlQgIENPTE9SPSIjZmYwMDAwIiBCQUNLPSIjMDAwMDAwIiBzdHlsZT0iQkFDS0dST1VORC1DT0xPUjogIzAwMDAwMCIgU0laRT02IFBUU0laRT0yNCBGQU1JTFk9IlNBTlNTRVJJRiIgRkFDRT0iQXJpYWwiIExBTkc9IjAiPjxCUj4NCjwvUD48UCBBTElHTj1MRUZUPjwvRk9OVD48Rk9OVCAgQ09MT1I9IiNmZjAwMDAiIEJBQ0s9IiMwMDAwMDAiIHN0eWxlPSJCQUNLR1JPVU5ELUNPTE9SOiAjMDAwMDAwIiBTSVpFPTMgUFRTSVpFPTExIEZBTUlMWT0iU0FOU1NFUklGIiBGQUNFPSJBcmlhbCIgTEFORz0iMCI+PEJSPg0KPC9GT05UPjxGT05UICBDT0xPUj0iIzAwMDBmZiIgQkFDSz0iIzAwMDAwMCIgc3R5bGU9IkJBQ0tHUk9VTkQtQ09MT1I6ICMwMDAwMDAiIFNJWkU9NiBQVFNJWkU9MjQgR!
!  kFNSUxZPSJTQU5TU0VSSUYiIEZBQ0U9IkFyaWFsIiBMQU5HPSIwIj48QSBIUkVGPSJodHRwOi8vd2NhbWF0ZXVycy5jb20vbC9yIj5ObyBtb3JlIG1haWwgaGVyZTwvQT48L0ZPTlQ+PC9IVE1MPg0K
! 
! ------=_NextPart_000_60BF_00005753.000048CC--
! 
--- 1,23 ----
! Return-Path: <hot...@ya...>
! From: hot...@ya...
! Message-ID: <000048874f7b$00000e95$000...@mx...>
! To: <Und...@va...>
  Subject: [spam]   
! Date: Sat, 18 Jan 2003 19:50:57 01900
! MIME-Version: 1.0
! Content-Type: multipart/mixed;
!     boundary="----=_NextPart_000_60BF_00005753.000048CC"
! X-UIDL: B<E!!^8S!!0'="!J;6"!
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! ------=_NextPart_000_60BF_00005753.000048CC
! Content-Type: text/html;
!     charset="iso-8859-1"
! Content-Transfer-Encoding: base64
! 
! PEhUTUw+PEJPRFkgQkdDT0xPUj0iIzAwMDAwMCI+PC9QPjxQIEFMSUdOPUNFTlRFUj48Rk9OVCAgQ09MT1I9IiNmZjAwMDAiIEJBQ0s9IiMwMDAwMDAiIHN0eWxlPSJCQUNLR1JPVU5ELUNPTE9SOiAjMDAwMDAwIiBTSVpFPTYgUFRTSVpFPTI0PlRoZSBob3R0ZXN0IEdpcmxzIE9ubGluZSE8QlI+DQpTdG9wIHdhc3RpbmcgeW91ciB0aW1lIHdpdGggNSBzZWM8QlI+DQp2aWRlbyBjbGlwcyEgQ29tZSB0byBvdXIgc2l0ZSBmb3I8QlI+DQpGcmVlIEZ1bGwgTGVuZ3RoIE1vdmllcyE8QlI+DQo8QSBIUkVGPSJodHRwOi8vd2NhbWF0ZXVycy5jb20vbC9ibCI+V2h5IHdhaXQsIHNlZSBmb3IgRnJlZTwvQT48L0ZPTlQ+PEZPTlQgIENPTE9SPSIjZmYwMDAwIiBCQUNLPSIjMDAwMDAwIiBzdHlsZT0iQkFDS0dST1VORC1DT0xPUjogIzAwMDAwMCIgU0laRT02IFBUU0laRT0yNCBGQU1JTFk9IlNBTlNTRVJJRiIgRkFDRT0iQXJpYWwiIExBTkc9IjAiPjxCUj4NCjwvUD48UCBBTElHTj1MRUZUPjwvRk9OVD48Rk9OVCAgQ09MT1I9IiNmZjAwMDAiIEJBQ0s9IiMwMDAwMDAiIHN0eWxlPSJCQUNLR1JPVU5ELUNPTE9SOiAjMDAwMDAwIiBTSVpFPTMgUFRTSVpFPTExIEZBTUlMWT0iU0FOU1NFUklGIiBGQUNFPSJBcmlhbCIgTEFORz0iMCI+PEJSPg0KPC9GT05UPjxGT05UICBDT0xPUj0iIzAwMDBmZiIgQkFDSz0iIzAwMDAwMCIgc3R5bGU9IkJBQ0tHUk9VTkQtQ09MT1I6ICMwMDAwMDAiIFNJWkU9NiBQVFNJWkU9MjQgR!
!  kFNSUxZPSJTQU5TU0VSSUYiIEZBQ0U9IkFyaWFsIiBMQU5HPSIwIj48QSBIUkVGPSJodHRwOi8vd2NhbWF0ZXVycy5jb20vbC9yIj5ObyBtb3JlIG1haWwgaGVyZTwvQT48L0ZPTlQ+PC9IVE1MPg0K
! 
! ------=_NextPart_000_60BF_00005753.000048CC--
! 

Index: TestMailParse005.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse005.cam,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse005.cam	28 Feb 2003 01:57:23 -0000	1.2
--- TestMailParse005.cam	16 Apr 2003 00:59:58 -0000	1.3
***************
*** 1,30 ****
! Return-Path: <ano...@ns...>
! Date: 19 Jan 2003 15:13:43 -0000
! Message-ID: <200...@ns...>
! From: XoS...@ho... (XoS...@ho...)
  Subject: [spam]  Re: screename change again lol
! X-UIDL: ll'"!$DC!!7ld"!85K!!
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! Below is the result of your feedback form.  It was submitted by
! XoS...@ho... (XoS...@ho...) on Monday, January 20, 2003 at 00:13:42
! ---------------------------------------------------------------------------
! 
! ze: 
! 
! Hey!! What's Up? I'm *Jenny* 20/F/San Diego/Webcam & Pics. I'm *LIVE* on my *FREE* Webcam mostly 24/7 so if you wanna come in and chat or see me go to my Personal Homepage at http://www.freelivecamgirls.net and i'll talk to you in a bit hun! If you join and the webchat is already full im sorry, just wait like 5 minutes and then you'll be able to see me LIVE!! *Remember* this is my Personal Homepage so of course its *FREE* =)
! <333 *Jenny* <333
! 
! PS.Remember my Personal Homepage is http://www.freelivecamgirls.net and hopefully I can chat with you soon!! oh yah!! If you don't have a webcam of your own its ok!! You can still watch and chat with me then!! ok!!  ByE!!
! <333 *Jenny* <333
! 
! 
! 
! 
! 
! 
! 
! 3e
! 
! ---------------------------------------------------------------------------
--- 1,30 ----
! Return-Path: <ano...@ns...>
! Date: 19 Jan 2003 15:13:43 -0000
! Message-ID: <200...@ns...>
! From: XoS...@ho... (XoS...@ho...)
  Subject: [spam]  Re: screename change again lol
! X-UIDL: ll'"!$DC!!7ld"!85K!!
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! Below is the result of your feedback form.  It was submitted by
! XoS...@ho... (XoS...@ho...) on Monday, January 20, 2003 at 00:13:42
! ---------------------------------------------------------------------------
! 
! ze: 
! 
! Hey!! What's Up? I'm *Jenny* 20/F/San Diego/Webcam & Pics. I'm *LIVE* on my *FREE* Webcam mostly 24/7 so if you wanna come in and chat or see me go to my Personal Homepage at http://www.freelivecamgirls.net and i'll talk to you in a bit hun! If you join and the webchat is already full im sorry, just wait like 5 minutes and then you'll be able to see me LIVE!! *Remember* this is my Personal Homepage so of course its *FREE* =)
! <333 *Jenny* <333
! 
! PS.Remember my Personal Homepage is http://www.freelivecamgirls.net and hopefully I can chat with you soon!! oh yah!! If you don't have a webcam of your own its ok!! You can still watch and chat with me then!! ok!!  ByE!!
! <333 *Jenny* <333
! 
! 
! 
! 
! 
! 
! 
! 3e
! 
! ---------------------------------------------------------------------------

Index: TestMailParse006.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse006.cam,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse006.cam	28 Feb 2003 01:57:23 -0000	1.2
--- TestMailParse006.cam	16 Apr 2003 00:59:58 -0000	1.3
***************
*** 1,14 ****
! From: blank
  Subject: [spam]
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! We're so sure about the quality and effectiveness of our p.roducts, we
! offer a full 90 day m.oney b.ack g.uarantee.  If any customer is not
! satisfied with our products, for any reason whatsoever, simply return the
! u.nused p.ortion within 90 days for a 100% r.efund.  NO QUESTIONS ASKED.  
!   
! Our goal is to educate you and make you aware of our new and absolutely
! miraculous Internationally Patented Nobel Prize Validated Biotechnology.
!   
! C.lick b.elow f.or m.ore i.nformation, it's f.r.e.e.
--- 1,14 ----
! From: blank
  Subject: [spam]
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! We're so sure about the quality and effectiveness of our p.roducts, we
! offer a full 90 day m.oney b.ack g.uarantee.  If any customer is not
! satisfied with our products, for any reason whatsoever, simply return the
! u.nused p.ortion within 90 days for a 100% r.efund.  NO QUESTIONS ASKED.  
!   
! Our goal is to educate you and make you aware of our new and absolutely
! miraculous Internationally Patented Nobel Prize Validated Biotechnology.
!   
! C.lick b.elow f.or m.ore i.nformation, it's f.r.e.e.

Index: TestMailParse007.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse007.cam,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse007.cam	28 Feb 2003 01:57:23 -0000	1.2
--- TestMailParse007.cam	16 Apr 2003 00:59:58 -0000	1.3
***************
*** 1,84 ****
! Return-Path: <mov...@ea...>
! Received: from mail126.ninodw.com ([204.117.162.126])
! 	by priv-edtnes62.telusplanet.net (InterMail vM.5.01.05.17 201-253-122-126-117-20021021) with SMTP
! 	id <200...@ma...> for <jo...@te...>; Sat, 11 Jan 2003 06:04:06 -0700
! To: jo...@te...
! Date: Sat, 11 Jan 2003 07:05:44 -0500
! Message-ID: <104...@ma...>
! X-Mailer: Gnus/5.090001 (Oort Gnus v0.01) XEmacs/21.2 (Terspichore)
! From: mov...@ea...
! Reply-To: <mov...@ea...>
  Subject: [spam] Think you've seen porn? How about a dog giving 5+ girls oral sex till they cum?
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! So you think you've seen some crazy porn? 
! Think you've seen all the crazy stuff out there? 
! YOU HAVEN'T SEEN SHIT!!! I saw the most un fuckin 
! believable video clip thats ever been on our sick 
! and twisted internet! Know this I've been surfing 
! porn and the internet since it began! I have seen 
! it all..and this shocked the shit out of me even!!! 
! READ BELOW ABOUT THIS CLIP!
! THE FOOTAGE OF HARVEY THE PUSSY EATING WONDER DOG!
! It takes place on a farm somewhere within the u.s. 
! I would say the clip is just shy of 9 minutes long 
! and seems to be shot by a home cam recorder. In 
! this nine minutes you see a group of 5+ girls in 
! a barn looking building..at first they are having 
! light sex with each other..this is nothing..then 
! jackpot. Another girl comes in with a dog that we 
! now know is named harvey. She brings the dog in 
! and leads him to one of her friends who is already 
! naked and spreading her legs. The dog goes right 
! to work..eats her pussy like he's done it a hundred 
! times before..and folks he has. 
! http://www.nfogroup.net/ral/
! She takes him to her next friend and the next and 
! the friend after that. By this point we got why 
! this clip of was being taken..these farm girl sluts 
! have been doing this regularly. They get together 
! and this dog, harvey, gives them all head..i'm 
! talking like a pro here..if you or I could satisfy 
! half the women this dog can we would have it made. 
! This dog is amazing..hes just pussy eating machine..
! and these slutty farm girls love it to death. I've 
! seen animal sites and so on but i've never seen actual 
! amature footage like this in my life. 
! HOW AND WHY THE FOOTAGE WAS FILMED?
! It was the little brother of one of the girls..whichever 
! girl actually lived at this place. This little brother 
! sneaks into the barn and films his slutty sister and 
! all her friends doing this ..then puts in on the internet!!!! 
! How hilarious is that..I can't imagine how those girls feel 
! now..there will be definite lawsuits over this one. Maybe 
! he didn't like what they were doing to his dog or maybe 
! he just hated his sister like all siblings but either 
! way the little bastard filmed it then put it on the net! 
! http://www.nfogroup.net/ral/
! HERE'S THE GOOD PART
! The guys that now have this footage aren't normal porn site guys..
! they are just guys that get off on posting extreme shit to the 
! public. That means they don't want any money from us surfers 
! to watch the show. What they do instead is make you play this 
! little game that asks how many girls did harvey give an 
! orgasm to in one session and you have to pick one of three 
! answers. IF you win you're in and get to watch..if you 
! lose you're out. The reason they do this is I guess if we 
! play the game we willingly went and tried to watch it..we 
! are not some government agent who is trying to get them in 
! trouble. I think because of nature of they content they just 
! wanna make sure you are into this stuff..but hell if you're 
! like me and don't know dick about this stuff then just guess..
! thats what I did and it resulted in the most shocking movie 
! clip of i've seen to date!
! MY STRONGEST RECOMMENDATION
! If you're like me and like seeing this kind if bizarre stuff..
! get in there and see it now while its still up. Before somebody
! gets it taken offline...but even more important that that, 
! DO NOT FUCKING FORGET TO SAVE IT TO DISK!YOU'RE FRIENDS WILL NOT 
! BELIEVE YOU WITHOUT PROOF..TRUST ME ON THIS. SAVE IT SO THAT 
! WHEN YOU TELL THEM YOU CAN ALSO SHOW THEM.
! http://www.nfogroup.net/ral/
! CLICK HERE TO WATCH HARVEY GIVE HEAD TO GROUP OF 18 year old FARM SLUTS!!!!}
! wbcng^gryhfcynarg(arg
--- 1,84 ----
! Return-Path: <mov...@ea...>
! Received: from mail126.ninodw.com ([204.117.162.126])
! 	by priv-edtnes62.telusplanet.net (InterMail vM.5.01.05.17 201-253-122-126-117-20021021) with SMTP
! 	id <200...@ma...> for <jo...@te...>; Sat, 11 Jan 2003 06:04:06 -0700
! To: jo...@te...
! Date: Sat, 11 Jan 2003 07:05:44 -0500
! Message-ID: <104...@ma...>
! X-Mailer: Gnus/5.090001 (Oort Gnus v0.01) XEmacs/21.2 (Terspichore)
! From: mov...@ea...
! Reply-To: <mov...@ea...>
  Subject: [spam] Think you've seen porn? How about a dog giving 5+ girls oral sex till they cum?
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! So you think you've seen some crazy porn? 
! Think you've seen all the crazy stuff out there? 
! YOU HAVEN'T SEEN SHIT!!! I saw the most un fuckin 
! believable video clip thats ever been on our sick 
! and twisted internet! Know this I've been surfing 
! porn and the internet since it began! I have seen 
! it all..and this shocked the shit out of me even!!! 
! READ BELOW ABOUT THIS CLIP!
! THE FOOTAGE OF HARVEY THE PUSSY EATING WONDER DOG!
! It takes place on a farm somewhere within the u.s. 
! I would say the clip is just shy of 9 minutes long 
! and seems to be shot by a home cam recorder. In 
! this nine minutes you see a group of 5+ girls in 
! a barn looking building..at first they are having 
! light sex with each other..this is nothing..then 
! jackpot. Another girl comes in with a dog that we 
! now know is named harvey. She brings the dog in 
! and leads him to one of her friends who is already 
! naked and spreading her legs. The dog goes right 
! to work..eats her pussy like he's done it a hundred 
! times before..and folks he has. 
! http://www.nfogroup.net/ral/
! She takes him to her next friend and the next and 
! the friend after that. By this point we got why 
! this clip of was being taken..these farm girl sluts 
! have been doing this regularly. They get together 
! and this dog, harvey, gives them all head..i'm 
! talking like a pro here..if you or I could satisfy 
! half the women this dog can we would have it made. 
! This dog is amazing..hes just pussy eating machine..
! and these slutty farm girls love it to death. I've 
! seen animal sites and so on but i've never seen actual 
! amature footage like this in my life. 
! HOW AND WHY THE FOOTAGE WAS FILMED?
! It was the little brother of one of the girls..whichever 
! girl actually lived at this place. This little brother 
! sneaks into the barn and films his slutty sister and 
! all her friends doing this ..then puts in on the internet!!!! 
! How hilarious is that..I can't imagine how those girls feel 
! now..there will be definite lawsuits over this one. Maybe 
! he didn't like what they were doing to his dog or maybe 
! he just hated his sister like all siblings but either 
! way the little bastard filmed it then put it on the net! 
! http://www.nfogroup.net/ral/
! HERE'S THE GOOD PART
! The guys that now have this footage aren't normal porn site guys..
! they are just guys that get off on posting extreme shit to the 
! public. That means they don't want any money from us surfers 
! to watch the show. What they do instead is make you play this 
! little game that asks how many girls did harvey give an 
! orgasm to in one session and you have to pick one of three 
! answers. IF you win you're in and get to watch..if you 
! lose you're out. The reason they do this is I guess if we 
! play the game we willingly went and tried to watch it..we 
! are not some government agent who is trying to get them in 
! trouble. I think because of nature of they content they just 
! wanna make sure you are into this stuff..but hell if you're 
! like me and don't know dick about this stuff then just guess..
! thats what I did and it resulted in the most shocking movie 
! clip of i've seen to date!
! MY STRONGEST RECOMMENDATION
! If you're like me and like seeing this kind if bizarre stuff..
! get in there and see it now while its still up. Before somebody
! gets it taken offline...but even more important that that, 
! DO NOT FUCKING FORGET TO SAVE IT TO DISK!YOU'RE FRIENDS WILL NOT 
! BELIEVE YOU WITHOUT PROOF..TRUST ME ON THIS. SAVE IT SO THAT 
! WHEN YOU TELL THEM YOU CAN ALSO SHOW THEM.
! http://www.nfogroup.net/ral/
! CLICK HERE TO WATCH HARVEY GIVE HEAD TO GROUP OF 18 year old FARM SLUTS!!!!}
! wbcng^gryhfcynarg(arg

Index: TestMailParse008.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse008.cam,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse008.cam	28 Feb 2003 01:57:23 -0000	1.2
--- TestMailParse008.cam	16 Apr 2003 00:59:58 -0000	1.3
***************
*** 1,45 ****
! Return-Path: <sy...@ya...>
! Received: from N1N ([218.0.119.123]) by priv-edtnes27.telusplanet.net
! 	(InterMail vM.5.01.05.17 201-253-122-126-117-20021021) with ESMTP
! 	id <20030112013444.RTJR4607.priv-edtnes27.telusplanet.net@N1N>
! 	for <jo...@te...>; Sat, 11 Jan 2003 18:34:44 -0700
! From: "Alice" <sy...@ya...>
  Subject: [spam] Hello,Let us enjoy life!
! To: jo...@te...
! Content-Type: text/html;
!     charset="us-ascii"
! Date: Sun, 12 Jan 2003 09:34:46 +0800
! X-Priority: 3
! X-Mailer: jpfree Group Mail Express V1.0
! Message-Id: <20030112013444.RTJR4607.priv-edtnes27.telusplanet.net@N1N>
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! <HTML><HEAD><TITLE></TITLE>
! <META content="Microsoft FrontPage 4.0" name=GENERATOR></HEAD> 
! <BODY text=#000000 bgColor=#EFEBE7>
! <table border="0" width="500" cellspacing="0" cellpadding="5">
! <tr>
! <td valign="top">
! <h1 align=left><FONT size=4><B>Hello friends.</B></FONT></h1> 
! <h1 align=left><B><FONT size=4 face="Arial Narrow">I bet you would just love
! to<a href="http://www.apple999.com/xy1.htm">
! see me naked</a>, spreading my candy for ya. I can not even tell 
! you how much it turns me on to have people <a
! href="http://www.apple999.com/xy1.htm">get
! off to my naked sexy body</a>. I've left you a tiny sample of 
! my gorgeousness just to give you a itty- bitty taste of what's 
! inside if you join. So when you are done checking out my different 
! pics- it's time for you to join!!</FONT></B></h1>
! <P align=left><B><FONT size=4 face="Arial"><a
! href="http://www.apple999.com/xy1.htm">See
! you inside...</a></FONT></B></P>
! <P align=left><B><FONT size=4 face="Arial"><a
! href="http://www.apple999.com/xy1.htm">Hugs
! &amp; Kisses,</a><BR>
! Kurious</FONT></B></P>
! </td>
! <td><a href="http://www.apple999.com/xy1.htm">
! </tr>
! </table>
! </BODY></HTML>
--- 1,45 ----
! Return-Path: <sy...@ya...>
! Received: from N1N ([218.0.119.123]) by priv-edtnes27.telusplanet.net
! 	(InterMail vM.5.01.05.17 201-253-122-126-117-20021021) with ESMTP
! 	id <20030112013444.RTJR4607.priv-edtnes27.telusplanet.net@N1N>
! 	for <jo...@te...>; Sat, 11 Jan 2003 18:34:44 -0700
! From: "Alice" <sy...@ya...>
  Subject: [spam] Hello,Let us enjoy life!
! To: jo...@te...
! Content-Type: text/html;
!     charset="us-ascii"
! Date: Sun, 12 Jan 2003 09:34:46 +0800
! X-Priority: 3
! X-Mailer: jpfree Group Mail Express V1.0
! Message-Id: <20030112013444.RTJR4607.priv-edtnes27.telusplanet.net@N1N>
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! <HTML><HEAD><TITLE></TITLE>
! <META content="Microsoft FrontPage 4.0" name=GENERATOR></HEAD> 
! <BODY text=#000000 bgColor=#EFEBE7>
! <table border="0" width="500" cellspacing="0" cellpadding="5">
! <tr>
! <td valign="top">
! <h1 align=left><FONT size=4><B>Hello friends.</B></FONT></h1> 
! <h1 align=left><B><FONT size=4 face="Arial Narrow">I bet you would just love
! to<a href="http://www.apple999.com/xy1.htm">
! see me naked</a>, spreading my candy for ya. I can not even tell 
! you how much it turns me on to have people <a
! href="http://www.apple999.com/xy1.htm">get
! off to my naked sexy body</a>. I've left you a tiny sample of 
! my gorgeousness just to give you a itty- bitty taste of what's 
! inside if you join. So when you are done checking out my different 
! pics- it's time for you to join!!</FONT></B></h1>
! <P align=left><B><FONT size=4 face="Arial"><a
! href="http://www.apple999.com/xy1.htm">See
! you inside...</a></FONT></B></P>
! <P align=left><B><FONT size=4 face="Arial"><a
! href="http://www.apple999.com/xy1.htm">Hugs
! &amp; Kisses,</a><BR>
! Kurious</FONT></B></P>
! </td>
! <td><a href="http://www.apple999.com/xy1.htm">
! </tr>
! </table>
! </BODY></HTML>

Index: TestMailParse009.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse009.cam,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse009.cam	28 Feb 2003 01:57:23 -0000	1.2
--- TestMailParse009.cam	16 Apr 2003 00:59:58 -0000	1.3
***************
*** 1,98 ****
! Return-Path: <bri...@po...>
! Received: from 200.204.91.79 (200.204.91.79)
!   by mta564.mail.yahoo.com with SMTP; 09 Jan 2003 05:15:37 -0800 (PST)
! From: "Luke Perry" <bri...@po...>
! Reply-To: "Luke Perry" <bri...@po...>
! CC: big...@ya..., sta...@ya...
! Date: Thu, 9 Jan 2003 05:14:46 -0800
  Subject: [spam] FánTástìç!! ^ comman6853 ^ »»» Eárn Mõnéy thrôuGh UnçõLLeçted Judgments! «««
! X-Priority: 1
! MIME-Version: 1.0
! X-Mailer: Microsoft Outlook Express 6.00.2600.0000
! X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000
! Content-Type: text/html; charset=us-ascii
! Content-Transfer-Encoding: 7bit
! Content-Length: 1094
! Message-ID: <avj...@FQ...valid>
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! <font color=white>*-*-**-*-*-*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*
! *-*-*-*-*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*****-----*-**-*-*-*--*-*--*-*-*-*-*-***-
! <BR>¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤<BR> comman6853
! *--*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**</font><br>
! 
! <HTML>
! <font color=white
! size=1>comman6853YHERKHSDKJFHSDKJFHKSJDFHKJSDHFIUWEYRKHSDKFJHSDKJFHSRHFKSDJHFKJS
! DHFKSHDFKJSDHFUIWEYRIHWSFKJSDHKFJWIEURYKSJDHFKJSDHFKJSDHFKSHDFIWUEYRWHSFKJSDHFKH
! WEKRHKSJDFHWEYHFK^#$*#^^!*^*^$*^!^%^*^*^$&%^%(!@</font><br><!-- <REM: <URL2#####>>
! -->
! 
! 
! 
! 
! 
! 
! 
! 
! <HEAD></HEAD>
! <body>
! <P align=left>
! &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<IMG
! src="http://202.108.221.16/HTTP/ben/MBTY.jpg" border=0>&nbsp;&nbsp;&nbsp;<img
! src="http://202.108.221.16/HTTP/ben/EmailOffersOndemand.jpg" border="0">
! <BR><BR>
! 
! 
! 
! 
! 
! 
! 
! 
! <IMG src="http://202.108.221.16/HTTP/ben/sinko.gif" border=0>
! <BR><BR>
! <a href="mailto:28...@28..."><img
! src="http://202.108.221.16/HTTP/ben/clhere.gif" border="0"
! onMouseOver="window.status='283245'; return true"
! onMouseOut="window.status='283245'"></a>
! </P>
! 
! 
! 
! 
! 
! 
! 
! 
! <BR><BR><BR><BR><BR><BR><BR>
! 283245
! </body>
! <BR>
! <BR>
! <BR>
! <BR>
! <BR><font color=fuchsia face="tempus sans itc" ><b>LYK 01'08''03 C24
! <BR><BR><BR><BR>00066©<BR><BR>
! <BR>
! <BR>
! <BR><font color=white size=1>Current alternatives for recovering judgments
! inadequate-learn moreSecure Your Future Tod...@ya...Work at home-
! unlimited potentialHave you heard about this?com...@ya...Thriving Business
! needs your help!!!!We have the most advanced asset tracking services in the
! world!com...@ya...New career in legal profession gives you fresh outlook
! on your lifeHere's your chance for the American Dre...@ya...New
! methods for recovering judicial judgmentsRead Thi...@ya...Feel the
! need to succeedHave you heard about this?com...@ya...Everyone needs
! a Home-Based BusinessTraining in the Judgment business -A great new business
! idea!com...@ya...Feel the need to succeedHelp people who are awarded
! judgments - work from your hom...@ya...Love your job- work from
! homeSeeking Justice-Minded People for Business Opp...@ya...Work
! at home- unlimited potentialSuccessful judgment recovery
! bus...@ya...Enjoy the fruits of your laborDedicated, Hard-Working
! People Nee...@ya...</FONT>
! <BR>
! <BR></HTML>
! 
!  [@^*#@*%_#%*#_$%*_#_]
--- 1,98 ----
! Return-Path: <bri...@po...>
! Received: from 200.204.91.79 (200.204.91.79)
!   by mta564.mail.yahoo.com with SMTP; 09 Jan 2003 05:15:37 -0800 (PST)
! From: "Luke Perry" <bri...@po...>
! Reply-To: "Luke Perry" <bri...@po...>
! CC: big...@ya..., sta...@ya...
! Date: Thu, 9 Jan 2003 05:14:46 -0800
  Subject: [spam] FánTástìç!! ^ comman6853 ^ »»» Eárn Mõnéy thrôuGh UnçõLLeçted Judgments! «««
! X-Priority: 1
! MIME-Version: 1.0
! X-Mailer: Microsoft Outlook Express 6.00.2600.0000
! X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000
! Content-Type: text/html; charset=us-ascii
! Content-Transfer-Encoding: 7bit
! Content-Length: 1094
! Message-ID: <avj...@FQ...valid>
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! <font color=white>*-*-**-*-*-*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*
! *-*-*-*-*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*****-----*-**-*-*-*--*-*--*-*-*-*-*-***-
! <BR>¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤<BR> comman6853
! *--*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**</font><br>
! 
! <HTML>
! <font color=white
! size=1>comman6853YHERKHSDKJFHSDKJFHKSJDFHKJSDHFIUWEYRKHSDKFJHSDKJFHSRHFKSDJHFKJS
! DHFKSHDFKJSDHFUIWEYRIHWSFKJSDHKFJWIEURYKSJDHFKJSDHFKJSDHFKSHDFIWUEYRWHSFKJSDHFKH
! WEKRHKSJDFHWEYHFK^#$*#^^!*^*^$*^!^%^*^*^$&%^%(!@</font><br><!-- <REM: <URL2#####>>
! -->
! 
! 
! 
! 
! 
! 
! 
! 
! <HEAD></HEAD>
! <body>
! <P align=left>
! &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<IMG
! src="http://202.108.221.16/HTTP/ben/MBTY.jpg" border=0>&nbsp;&nbsp;&nbsp;<img
! src="http://202.108.221.16/HTTP/ben/EmailOffersOndemand.jpg" border="0">
! <BR><BR>
! 
! 
! 
! 
! 
! 
! 
! 
! <IMG src="http://202.108.221.16/HTTP/ben/sinko.gif" border=0>
! <BR><BR>
! <a href="mailto:28...@28..."><img
! src="http://202.108.221.16/HTTP/ben/clhere.gif" border="0"
! onMouseOver="window.status='283245'; return true"
! onMouseOut="window.status='283245'"></a>
! </P>
! 
! 
! 
! 
! 
! 
! 
! 
! <BR><BR><BR><BR><BR><BR><BR>
! 283245
! </body>
! <BR>
! <BR>
! <BR>
! <BR>
! <BR><font color=fuchsia face="tempus sans itc" ><b>LYK 01'08''03 C24
! <BR><BR><BR><BR>00066©<BR><BR>
! <BR>
! <BR>
! <BR><font color=white size=1>Current alternatives for recovering judgments
! inadequate-learn moreSecure Your Future Tod...@ya...Work at home-
! unlimited potentialHave you heard about this?com...@ya...Thriving Business
! needs your help!!!!We have the most advanced asset tracking services in the
! world!com...@ya...New career in legal profession gives you fresh outlook
! on your lifeHere's your chance for the American Dre...@ya...New
! methods for recovering judicial judgmentsRead Thi...@ya...Feel the
! need to succeedHave you heard about this?com...@ya...Everyone needs
! a Home-Based BusinessTraining in the Judgment business -A great new business
! idea!com...@ya...Feel the need to succeedHelp people who are awarded
! judgments - work from your hom...@ya...Love your job- work from
! homeSeeking Justice-Minded People for Business Opp...@ya...Work
! at home- unlimited potentialSuccessful judgment recovery
! bus...@ya...Enjoy the fruits of your laborDedicated, Hard-Working
! People Nee...@ya...</FONT>
! <BR>
! <BR></HTML>
! 
!  [@^*#@*%_#%*#_$%*_#_]

Index: TestMailParse010.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse010.cam,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse010.cam	28 Feb 2003 01:57:23 -0000	1.2
--- TestMailParse010.cam	16 Apr 2003 00:59:58 -0000	1.3
***************
*** 1,30 ****
! X-Auth-No: 
! Return-Path: <cs...@my...>
! Received: from digitalme.com not authenticated [193.97.97.75]
!         by smtp-send.myrealbox.com with NetMail SMTP Agent $Revision$ on Novell NetWare;
!         Sat, 11 Jan 2003 22:03:10 -0700
! Received: from 65.100.247.142 not authenticated [65.100.247.142]
!         by digitalme.com with Novell NIMS $Revision$ on Novell NetWare;
!         Sat, 11 Jan 2003 21:03:05 -0800
! Message-ID: <44747.22535@>
! From: U'S'A  L'o't't'e'r'y  L'T'D <iplvwq@>
  Subject: [spam] Re[4]:  Regarding your activation
! To: ar...@my...
! Date: Sun, 12 Jan 2003 07:03:25 
! MIME-Version: 1.0
! Content-Type: text/plain;
!         charset="windows-1252"
! Content-Transfer-Encoding: base64
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! Q29uZ3JhdHVsYXRpb25zIQ0KDQpZb3UgaGF2ZSBiZWVuIHNlbGVjdGVkIHRvIHJlY2lldmUgbWVt
! YmVyc2hpcCB0byB0aGUgYmVzdCBBYERgVWBMYFQgc2l0ZSBvZg0KeW91ciBjaG9pY2UgZm9yIEZe
! Ul5FXkUhDQoNCiogV2UgaGF2ZSBldmVyeSBuaWNoZSB5b3UgY2FuIGltYWdpbmUhDQoqIEFsbCBv
! ZiBvdXIgc2l0ZXMgaGFzIGhpZ2ggcXVhbGl0eSBjb250YW50IQ0KKiBZb3UgY2FuIGJlIGluIG1l
! bWJlciBzZWN0aW9uIGluIGxlc3MgdGhhbiAxIG1pbiENCiogQW5kIGJlc3Qgb2YgYWxsOiBOYE9g
! IENgUmBFYERgSWBUYCBDYEFgUmBEYCBOYEVgRWBEYEVgRGANCg0KKiAqICogKiBDYExgSWBDYEsg
! SGBFYFJgRSAqICogKiAqDQpodHRwOi8vYmVzdHBvcm5ob3N0LmNvbS92YXN5YS8/aW5zdGFudGhv
! bWUNCg0KSWYgeW91IGhhdmUgcmVjZWl2ZWQgdGhpcyBtYWlsaW5nIGluIGVycm9yLCBvciBkbyBu
! b3Qgd2lzaCB0byByZWNlaXZlIGFueQ0KZnVydGhlciBvZmZlcnMgb3Igbm90aWNlcyBmcm9tIHVz
! LCBzaW1wbHkNCmdvIGhlcmU6IHJtX21lX25vd0BtYWlsLmNvbT9zdWJqZWN0PURy
--- 1,30 ----
! X-Auth-No: 
! Return-Path: <cs...@my...>
! Received: from digitalme.com not authenticated [193.97.97.75]
!         by smtp-send.myrealbox.com with NetMail SMTP Agent $Revision$ on Novell NetWare;
!         Sat, 11 Jan 2003 22:03:10 -0700
! Received: from 65.100.247.142 not authenticated [65.100.247.142]
!         by digitalme.com with Novell NIMS $Revision$ on Novell NetWare;
!         Sat, 11 Jan 2003 21:03:05 -0800
! Message-ID: <44747.22535@>
! From: U'S'A  L'o't't'e'r'y  L'T'D <iplvwq@>
  Subject: [spam] Re[4]:  Regarding your activation
! To: ar...@my...
! Date: Sun, 12 Jan 2003 07:03:25 
! MIME-Version: 1.0
! Content-Type: text/plain;
!         charset="windows-1252"
! Content-Transfer-Encoding: base64
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! Q29uZ3JhdHVsYXRpb25zIQ0KDQpZb3UgaGF2ZSBiZWVuIHNlbGVjdGVkIHRvIHJlY2lldmUgbWVt
! YmVyc2hpcCB0byB0aGUgYmVzdCBBYERgVWBMYFQgc2l0ZSBvZg0KeW91ciBjaG9pY2UgZm9yIEZe
! Ul5FXkUhDQoNCiogV2UgaGF2ZSBldmVyeSBuaWNoZSB5b3UgY2FuIGltYWdpbmUhDQoqIEFsbCBv
! ZiBvdXIgc2l0ZXMgaGFzIGhpZ2ggcXVhbGl0eSBjb250YW50IQ0KKiBZb3UgY2FuIGJlIGluIG1l
! bWJlciBzZWN0aW9uIGluIGxlc3MgdGhhbiAxIG1pbiENCiogQW5kIGJlc3Qgb2YgYWxsOiBOYE9g
! IENgUmBFYERgSWBUYCBDYEFgUmBEYCBOYEVgRWBEYEVgRGANCg0KKiAqICogKiBDYExgSWBDYEsg
! SGBFYFJgRSAqICogKiAqDQpodHRwOi8vYmVzdHBvcm5ob3N0LmNvbS92YXN5YS8/aW5zdGFudGhv
! bWUNCg0KSWYgeW91IGhhdmUgcmVjZWl2ZWQgdGhpcyBtYWlsaW5nIGluIGVycm9yLCBvciBkbyBu
! b3Qgd2lzaCB0byByZWNlaXZlIGFueQ0KZnVydGhlciBvZmZlcnMgb3Igbm90aWNlcyBmcm9tIHVz
! LCBzaW1wbHkNCmdvIGhlcmU6IHJtX21lX25vd0BtYWlsLmNvbT9zdWJqZWN0PURy

Index: TestMailParse011.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse011.cam,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse011.cam	28 Feb 2003 01:57:23 -0000	1.2
--- TestMailParse011.cam	16 Apr 2003 00:59:58 -0000	1.3
***************
*** 1,44 ****
! Return-Path: <hor...@fr...>
! Delivered-To: myrealemailaddress@domain
! Received: (qmail 26261 invoked by uid 609); 18 Jan 2003 06:22:49 -0000
! Delivered-To: spam-address-ccbill@domain
! Received: (qmail 26258 invoked by uid 421); 18 Jan 2003 06:22:49 -0000 blah blah
! by ekardia with Microsoft SMTPSVC(5.0.2122.2262);
! Sat, 18 Jan 2003 15:26:39 +0900
! Date: Sat, 18 Jan 2003 06:25:35 GMT
! From: "Acaynya"<hor...@fr...>
! X-Priority: 3
! To: spamaddy@domain
  Subject: [spam] spamaddy,what ?
! Mime-Version: 1.0
! Content-Type: text/plain; charset=us-ascii
! Content-Transfer-Encoding: 7bit
! Message-ID: <EKARDIAX6Mmasdf78970016@ekardia>
! X-OriginalArrivalTime: 18 Jan 2003 06:26:40.0656 (UTC)
! FILETIME=[8FDC2900:01BAAAABA]
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! I think you answered my ad longtime ago if it was not you I am sorry.
! If it was I could not answer
! you because my Eudora died and I could not get it to work but my friend got
! the emails address out for me ..:)
! I hope it was you and you are still interested,
! as I realize lots of time has past.
! I really don't know where to start ....
! Maybe you can tell me little more about yourself since I lost your first email
! ,
! what you look like,age,and are you still looking ?
! If you are interested learning more about me, I have a profile at :
! 
! http://www.hiddenmatch.com
! 
! I am NOT a Porn Chick ..:-)
! I just chose it because you don't have to pay,
! And they allow any pictures I want .:).
! Oh yea , My username is darla1792 .
! Don't really know what else to say for now I hope this is the right address .
! Let me know if you are interested, And I hope
! you don't run when you see my picture :-)
! 
! Bye ..... D
--- 1,44 ----
! Return-Path: <hor...@fr...>
! Delivered-To: myrealemailaddress@domain
! Received: (qmail 26261 invoked by uid 609); 18 Jan 2003 06:22:49 -0000
! Delivered-To: spam-address-ccbill@domain
! Received: (qmail 26258 invoked by uid 421); 18 Jan 2003 06:22:49 -0000 blah blah
!  by ekardia with Microsoft SMTPSVC(5.0.2122.2262);
! Sat, 18 Jan 2003 15:26:39 +0900
! Date: Sat, 18 Jan 2003 06:25:35 GMT
! From: "Acaynya"<hor...@fr...>
! X-Priority: 3
! To: spamaddy@domain
  Subject: [spam] spamaddy,what ?
! Mime-Version: 1.0
! Content-Type: text/plain; charset=us-ascii
! Content-Transfer-Encoding: 7bit
! Message-ID: <EKARDIAX6Mmasdf78970016@ekardia>
! X-OriginalArrivalTime: 18 Jan 2003 06:26:40.0656 (UTC)
!  FILETIME=[8FDC2900:01BAAAABA]
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! I think you answered my ad longtime ago if it was not you I am sorry.
! If it was I could not answer
! you because my Eudora died and I could not get it to work but my friend got
! the emails address out for me ..:)
! I hope it was you and you are still interested,
! as I realize lots of time has past.
! I really don't know where to start ....
! Maybe you can tell me little more about yourself since I lost your first email
! ,
! what you look like,age,and are you still looking ?
! If you are interested learning more about me, I have a profile at :
! 
! http://www.hiddenmatch.com
! 
! I am NOT a Porn Chick ..:-)
! I just chose it because you don't have to pay,
! And they allow any pictures I want .:).
! Oh yea , My username is darla1792 .
! Don't really know what else to say for now I hope this is the right address .
! Let me know if you are interested, And I hope
! you don't run when you see my picture :-)
! 
! Bye ..... D

Index: TestMailParse011.msg
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse011.msg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestMailParse011.msg	7 Feb 2003 22:24:33 -0000	1.1
--- TestMailParse011.msg	16 Apr 2003 00:59:58 -0000	1.2
***************
*** 4,8 ****
  Delivered-To: spam-address-ccbill@domain
  Received: (qmail 26258 invoked by uid 421); 18 Jan 2003 06:22:49 -0000 blah blah
! by ekardia with Microsoft SMTPSVC(5.0.2122.2262);
  Sat, 18 Jan 2003 15:26:39 +0900
  Date: Sat, 18 Jan 2003 06:25:35 GMT
--- 4,8 ----
  Delivered-To: spam-address-ccbill@domain
  Received: (qmail 26258 invoked by uid 421); 18 Jan 2003 06:22:49 -0000 blah blah
!  by ekardia with Microsoft SMTPSVC(5.0.2122.2262);
  Sat, 18 Jan 2003 15:26:39 +0900
  Date: Sat, 18 Jan 2003 06:25:35 GMT
***************
*** 16,20 ****
  Message-ID: <EKARDIAX6Mmasdf78970016@ekardia>
  X-OriginalArrivalTime: 18 Jan 2003 06:26:40.0656 (UTC)
! FILETIME=[8FDC2900:01BAAAABA]
  
  I think you answered my ad longtime ago if it was not you I am sorry.
--- 16,20 ----
  Message-ID: <EKARDIAX6Mmasdf78970016@ekardia>
  X-OriginalArrivalTime: 18 Jan 2003 06:26:40.0656 (UTC)
!  FILETIME=[8FDC2900:01BAAAABA]
  
  I think you answered my ad longtime ago if it was not you I am sorry.

Index: TestMailParse012.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse012.cam,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse012.cam	28 Feb 2003 01:57:23 -0000	1.2
--- TestMailParse012.cam	16 Apr 2003 00:59:58 -0000	1.3
***************
*** 1,54 ****
! Return-Path: <Bri...@ao...>
! Received: from sunsinger.herald.co.uk (sunsinger.herald.co.uk [213.38.80.4]) by walnut.he.net (8.8.6/8.8.2) with ESMTP id RAA04728 for <jg...@ex...>; Mon, 20 Jan 2003 17:08:29 -0800
! Received: from mailin-03.mx.aol.com (CacheFlowServer@[200.215.97.82])
! 	by sunsinger.herald.co.uk (8.9.3/8.9.3/Debian/GNU) with SMTP id BAA08887
! 	for <web...@jg...>; Tue, 21 Jan 2003 01:08:19 GMT
! Date: Tue, 21 Jan 2003 01:08:19 GMT
! Message-Id: <200...@su...>
! X-Authentication-Warning: sunsinger.herald.co.uk: Host CacheFlowServer@[200.215.97.82] claimed to be mailin-03.mx.aol.com
! From: Brianna121 <Bri...@ao...>
! To: <web...@jg...>
  Subject: [spam] Want to see a huge horse c*ck in a tiny teen c*nt?
! MIME-Version: 1.0
! Content-Type: text/html; charset="US-ASCII"
! Content-transfer-encoding: 7bit
! X-UIDL: M-$"!c:b"!57:!!i#1!!
! X-POPFile-Link: <http://127.0.0.1:9090/jump_to_message?view=popfile2146=1.msg>
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! <html>
! 
! <head>
! <title>get it now</title>
! <base target="_blank">
! </head>
! <body alink="Blue" link="Blue" vlink="Blue">
! <a href="http://pc.x-x-xfreehosting.com/pc">
! You think you have seen some pretty crazy porn on the internet? YOU HAVEN'T SEEN SHIT! I saw the most unbelievable movie clip ever to grace the internet! These guys put up a clip of a beautiful teen farm girl who actually fucks her horse!
! <br>
! NO BULLSHIT, SHE ACTUALLY FUCKS A HORSE WITH A 25 INCH COCK! 
! THE MOVIE QUALITY IS GREAT AND HAS SOUND TOO! IT IS UNBELIEVABLE!
! <br><br>
! THIS LITTLE SLUTS CAN REALLY HANDLE A GIANT HORSE COCK IN HER TIGHT LITTLE TEEN PUSSY LIKE YOU WOULD NOT BELIEVE! YOU HAV TO WATCH THIS CLIP BEFORE SOMEONE FINDS IT AND TAKE IT OFF.
! <br><br>
! HERES THE GOOD PART. THESE GUYS AREN'T A NORMAL PORN SITE SO THEY DON'T WANT MONEY TO LET US WATCH SO ITS FREE. BUT WHAT THEY DO IS MAKE YOU TAKE THIS TEST THAT ASKS HOW BIG A HORSE DICK IS. THAT'S SOMETHING  THAT ONLY PEOPLE INTO ANIMAL SEX WOULD KNOW. SO I THINK THEY ARE JUST TRYING TO MAKE SURE YOU ARE SOMEONE WHOS INTO THIS STUFF..NOT SOMEONE WHO WANTS TO BUST THEM. SO IF YOU'RE LIKE ME AND DON'T KNOW ANYTHING ABOUT ANIMALS JUST GUESS THE SIZE. THERE ARE ONLY 3 CHOICES AND IF YOU GET IT RIGHT YOU'RE IN. YOU GET TO WATCH THE WHOLE CLIP..AND HEY DO NOT FORGET TO SAVE IT CUZ  YOU'LL WANT TO WATCH IT AGAIN OR SHOW IT TO YOUR FRIENDS LATER! 
! <br><br>
! CLICK HERE TO WATCH THIS LITTLE SLUT FUCK HER HORSE FOR 8 MINUTES! DO NOT FORGET TO SAVE IT SO YOU CAN WATCH IT AGAIN LATER!</a>
! <p> </p>
! <p> </p>
! <p> </p>
! <p> </p>
! <p> </p>
! <p> </p>
! <p> </p>
! <p> </p>
! <br>
! <br>
! <br>
! <br>
! <br>
! <br>
! <div align="center">
!   <div>
!   <p align="left"><a href="http://6.x-x-xfreehosting.com/index.php?cid=291&eid=d2VibWFzdGVyQGpnYy5vcmc=">Go Here to Stop</a></p>
--- 1,54 ----
! Return-Path: <Bri...@ao...>
! Received: from sunsinger.herald.co.uk (sunsinger.herald.co.uk [213.38.80.4]) by walnut.he.net (8.8.6/8.8.2) with ESMTP id RAA04728 for <jg...@ex...>; Mon, 20 Jan 2003 17:08:29 -0800
! Received: from mailin-03.mx.aol.com (CacheFlowServer@[200.215.97.82])
! 	by sunsinger.herald.co.uk (8.9.3/8.9.3/Debian/GNU) with SMTP id BAA08887
! 	for <web...@jg...>; Tue, 21 Jan 2003 01:08:19 GMT
! Date: Tue, 21 Jan 2003 01:08:19 GMT
! Message-Id: <200...@su...>
! X-Authentication-Warning: sunsinger.herald.co.uk: Host CacheFlowServer@[200.215.97.82] claimed to be mailin-03.mx.aol.com
! From: Brianna121 <Bri...@ao...>
! To: <web...@jg...>
  Subject: [spam] Want to see a huge horse c*ck in a tiny teen c*nt?
! MIME-Version: 1.0
! Content-Type: text/html; charset="US-ASCII"
! Content-transfer-encoding: 7bit
! X-UIDL: M-$"!c:b"!57:!!i#1!!
! X-POPFile-Link: <http://127.0.0.1:9090/jump_to_message?view=popfile2146=1.msg>
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! <html>
! 
! <head>
! <title>get it now</title>
! <base target="_blank">
! </head>
! <body alink="Blue" link="Blue" vlink="Blue">
! <a href="http://pc.x-x-xfreehosting.com/pc">
! You think you have seen some pretty crazy porn on the internet? YOU HAVEN'T SEEN SHIT! I saw the most unbelievable movie clip ever to grace the internet! These guys put up a clip of a beautiful teen farm girl who actually fucks her horse!
! <br>
! NO BULLSHIT, SHE ACTUALLY FUCKS A HORSE WITH A 25 INCH COCK! 
! THE MOVIE QUALITY IS GREAT AND HAS SOUND TOO! IT IS UNBELIEVABLE!
! <br><br>
! THIS LITTLE SLUTS CAN REALLY HANDLE A GIANT HORSE COCK IN HER TIGHT LITTLE TEEN PUSSY LIKE YOU WOULD NOT BELIEVE! YOU HAV TO WATCH THIS CLIP BEFORE SOMEONE FINDS IT AND TAKE IT OFF.
! <br><br>
! HERES THE GOOD PART. THESE GUYS AREN'T A NORMAL PORN SITE SO THEY DON'T WANT MONEY TO LET US WATCH SO ITS FREE. BUT WHAT THEY DO IS MAKE YOU TAKE THIS TEST THAT ASKS HOW BIG A HORSE DICK IS. THAT'S SOMETHING  THAT ONLY PEOPLE INTO ANIMAL SEX WOULD KNOW. SO I THINK THEY ARE JUST TRYING TO MAKE SURE YOU ARE SOMEONE WHOS INTO THIS STUFF..NOT SOMEONE WHO WANTS TO BUST THEM. SO IF YOU'RE LIKE ME AND DON'T KNOW ANYTHING ABOUT ANIMALS JUST GUESS THE SIZE. THERE ARE ONLY 3 CHOICES AND IF YOU GET IT RIGHT YOU'RE IN. YOU GET TO WATCH THE WHOLE CLIP..AND HEY DO NOT FORGET TO SAVE IT CUZ  YOU'LL WANT TO WATCH IT AGAIN OR SHOW IT TO YOUR FRIENDS LATER! 
! <br><br>
! CLICK HERE TO WATCH THIS LITTLE SLUT FUCK HER HORSE FOR 8 MINUTES! DO NOT FORGET TO SAVE IT SO YOU CAN WATCH IT AGAIN LATER!</a>
! <p> </p>
! <p> </p>
! <p> </p>
! <p> </p>
! <p> </p>
! <p> </p>
! <p> </p>
! <p> </p>
! <br>
! <br>
! <br>
! <br>
! <br>
! <br>
! <div align="center">
!   <div>
!   <p align="left"><a href="http://6.x-x-xfreehosting.com/index.php?cid=291&eid=d2VibWFzdGVyQGpnYy5vcmc=">Go Here to Stop</a></p>

Index: TestMailParse013.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse013.cam,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse013.cam	28 Feb 2003 01:57:23 -0000	1.2
--- TestMailParse013.cam	16 Apr 2003 00:59:58 -0000	1.3
***************
*** 1,62 ****
! From rr...@nn... Mon Jan 06 05:00:37 2003
! Received: from palm.lyris.net [216.91.57.210] by ajw.com [127.0.0.1] with SMTP (MDaemon.v2.7.SP4.R) for <Ar...@aj...>; Mon, 06 Jan 2003 05:00:43 -0500
! Mime-Version: 1.0
! X-Sender: rR...@po...
! Message-Id: <LYRIS-57933-146278-2003.01.06-02.00.42--alan#aj...@ne...>
! In-Reply-To: 
!  <LYRIS-54343-146225-2003.01.06-00.00.02--rrr#nnn...@ne...
!  >
! Date: Mon, 6 Jan 2003 02:00:37 -0800
! To: "Armlet Forum" <arm...@ne...>
! From: RN <rr...@nn...>
  Subject: [spam] (Archive Copy) RE: CW v9 and armlets...
! Content-Type: text/plain; charset="us-ascii" ; format="flowed"
! List-Unsubscribe: <mailto:lea...@ne...>
! List-Owner: <mailto:own...@ne...>
! Reply-To: "Armlet Forum" <arm...@ne...>
! X-Message-Id: <p05111a00ba3efa6a0686@[192.168.1.100]>
! Sender: bou...@ne...
! X-Palm-Dev-Forum: armlet-forum
! X-MDArchive-Copy: 1
! X-MDaemon-Deliver-To: Ar...@aj...
! X-Return-Path: bou...@ne...
! X-MBF-FILE: MDaemon Gateway to RFC822 (RFC822.MBF v1.0)
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! On Sun, 5 Jan 2003 22:46:10 -0800,
! "BF" <bff...@ss...> wrote:
! >I tried many variations of your code to setup r10 for writable global
! >variables.  Unfortunately I can't get it to compile under CW9.  Here are
! >the errors, followed by the code.  Of course the code below won't run,
! >but I don't understand why I can't get your sample to build:
! >  ... [ examples and errors deleted] ...
! 
! Maybe the  "asm { mov r10, r4; }"  is required before the return
! to balance the register usage?
! 
! I can only get the code to compile with thumb mode on (default) and
! optimizations off.  When it does compile, it seems to work just fine
! (e.g. a 40k armlet functions correctly while using lots of read/write
! global variables and callbacks...)
! 
! >It looks like the variable R5 and the register r5 aren't related.
! 
! ( Heh!  :-)  I just kept renaming the variable until it matched the
! register that the disassembly said the compiler was actually using
! (for my sanity).   But I would like to find some clean syntax that
! will safely survive compiler optimizations (the code I posted
! obviously won't!).
! 
! I'm almost ready to try using gcc-arm-elf to build my armlet
! entry point and concatenate that in front of the CW v9 output.
! Messy...
! 
! RN
! HHHHHH
!     <http://www.hhhhhh.com/rrr/hhhhhh>
! 
! -- 
! For information on using the Palm Developer Forums, or to unsubscribe, please see http://www.palmos.com/dev/support/forums/
! 
! 
--- 1,62 ----
! From rr...@nn... Mon Jan 06 05:00:37 2003
! Received: from palm.lyris.net [216.91.57.210] by ajw.com [127.0.0.1] with SMTP (MDaemon.v2.7.SP4.R) for <Ar...@aj...>; Mon, 06 Jan 2003 05:00:43 -0500
! Mime-Version: 1.0
! X-Sender: rR...@po...
! Message-Id: <LYRIS-57933-146278-2003.01.06-02.00.42--alan#aj...@ne...>
! In-Reply-To: 
!  <LYRIS-54343-146225-2003.01.06-00.00.02--rrr#nnn...@ne...
!  >
! Date: Mon, 6 Jan 2003 02:00:37 -0800
! To: "Armlet Forum" <arm...@ne...>
! From: RN <rr...@nn...>
  Subject: [spam] (Archive Copy) RE: CW v9 and armlets...
! Content-Type: text/plain; charset="us-ascii" ; format="flowed"
! List-Unsubscribe: <mailto:lea...@ne...>
! List-Owner: <mailto:own...@ne...>
! Reply-To: "Armlet Forum" <arm...@ne...>
! X-Message-Id: <p05111a00ba3efa6a0686@[192.168.1.100]>
! Sender: bou...@ne...
! X-Palm-Dev-Forum: armlet-forum
! X-MDArchive-Copy: 1
! X-MDaemon-Deliver-To: Ar...@aj...
! X-Return-Path: bou...@ne...
! X-MBF-FILE: MDaemon Gateway to RFC822 (RFC822.MBF v1.0)
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! On Sun, 5 Jan 2003 22:46:10 -0800,
! "BF" <bff...@ss...> wrote:
! >I tried many variations of your code to setup r10 for writable global
! >variables.  Unfortunately I can't get it to compile under CW9.  Here are
! >the errors, followed by the code.  Of course the code below won't run,
! >but I don't understand why I can't get your sample to build:
! >  ... [ examples and errors deleted] ...
! 
! Maybe the  "asm { mov r10, r4; }"  is required before the return
! to balance the register usage?
! 
! I can only get the code to compile with thumb mode on (default) and
! optimizations off.  When it does compile, it seems to work just fine
! (e.g. a 40k armlet functions correctly while using lots of read/write
! global variables and callbacks...)
! 
! >It looks like the variable R5 and the register r5 aren't related.
! 
! ( Heh!  :-)  I just kept renaming the variable until it matched the
! register that the disassembly said the compiler was actually using
! (for my sanity).   But I would like to find some clean syntax that
! will safely survive compiler optimizations (the code I posted
! obviously won't!).
! 
! I'm almost ready to try using gcc-arm-elf to build my armlet
! entry point and concatenate that in front of the CW v9 output.
! Messy...
! 
! RN
! HHHHHH
!     <http://www.hhhhhh.com/rrr/hhhhhh>
! 
! -- 
! For information on using the Palm Developer Forums, or to unsubscribe, please see http://www.palmos.com/dev/support/forums/
! 
! 

Index: TestMailParse014.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse014.cam,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse014.cam	28 Feb 2003 01:57:23 -0000	1.2
--- TestMailParse014.cam	16 Apr 2003 00:59:58 -0000	1.3
***************
*** 1,40 ****
! Received: from msely.prodigy.net ([213.70.63.68]) by mc4-f37.law16.hotmail.com with Microsoft SMTPSVC(5.0.2195.5600);
! 	 Mon, 25 Nov 2002 20:51:23 -0800
  Subject: [spam] 5uj9s
! To: cfz...@wo...
! From: Douglas Arnold <0n...@wo...>
! Date: Tue Nov 26 12:53:20 2002 -0400
! Content-Type: text/html; charset="US-ASCII"
! Message-ID: <8h2...@wo...>
! Return-Path: 0n...@wo...
! X-OriginalArrivalTime: 26 Nov 2002 04:51:23.0664 (UTC) FILETIME=[785FA900:01C29507]
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
! <BODY BGCOLOR="WHITE">
!  <TABLE WIDTH=550><TR><TD><FONT SIZE=4 FACE="VERDANA" COLOR="#333366">
!  <CENTER>W&#105;&#112;&#101; O&#117;t T&#97;x D&#101;&#98;t, E&#110;d y&#111;&#117;r IRS t&#97;x &#112;r&#111;&#98;l...
 
[truncated message content]

[popfile-commit] engine/UI HTML.pm,1.131,1.132

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

Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv17280/UI

Modified Files:
	HTML.pm 
Log Message:
change handling of bayes::{scores__} to reduce burden on forking
(Disables saving of scores where not needed, clears scores after where enabled)

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.131
retrieving revision 1.132
diff -C2 -d -r1.131 -r1.132
*** HTML.pm	15 Apr 2003 21:22:02 -0000	1.131
--- HTML.pm	16 Apr 2003 00:59:57 -0000	1.132
***************
*** 2871,2876 ****
  
                  $body .= "<table><tr><td class=\"top20\" valign=\"top\">\n";
                  $self->{classifier__}->classify_file($self->global_config_( 'msgdir' ) . "$self->{form_}{view}", $self);
!                 $body .= $self->{classifier__}->{scores__};
                  $body .= "</tr></table></td>\n</tr>\n";
              }
--- 2871,2886 ----
  
                  $body .= "<table><tr><td class=\"top20\" valign=\"top\">\n";
+                 
+                 # Enable saving of word-scores
+ 
+                 $self->{classifier__}->toggle_score( 1 );
+                 
                  $self->{classifier__}->classify_file($self->global_config_( 'msgdir' ) . "$self->{form_}{view}", $self);
!                                 
!                 
!                 $self->{classifier__}->toggle_score( 0 );
!                 $body .= $self->{classifier__}->get_scores();
!                 $self->{classifier__}->clear_scores();
!                 
                  $body .= "</tr></table></td>\n</tr>\n";
              }

[popfile-commit] engine/Classifier Bayes.pm,1.124,1.125

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

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

Modified Files:
	Bayes.pm 
Log Message:
change handling of bayes::{scores__} to reduce burden on forking
(Disables saving of scores where not needed, clears scores after where enabled)

Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -d -r1.124 -r1.125
*** Bayes.pm	15 Apr 2003 21:20:17 -0000	1.124
--- Bayes.pm	16 Apr 2003 00:59:57 -0000	1.125
***************
*** 37,41 ****
  
      # Set this to 1 to get scores for individual words in message detail
!     $self->{wordscores__}        = 1;
  
      # Just our hostname
--- 37,41 ----
  
      # Set this to 1 to get scores for individual words in message detail
!     $self->{wordscores__}        = 0;
  
      # Just our hostname
***************
*** 1468,1470 ****
--- 1468,1516 ----
  }
  
+ # ---------------------------------------------------------------------------------------------
+ #
+ # get_scores - Gets the HTMLized (for now) listing of word scores
+ #
+ # ---------------------------------------------------------------------------------------------
+ 
+ sub get_scores
+ {
+     my ( $self ) = @_;
+     
+     return $self->{scores__};
+ }
+ 
+ # ---------------------------------------------------------------------------------------------
+ #
+ # clear_scores - clears the listing of word scores
+ #
+ # ---------------------------------------------------------------------------------------------
+ 
+ sub clear_scores
+ {
+     my ( $self ) = @_;
+     
+     $self->{scores__} = '';
+     
+ }
+ 
+ 
+ # ---------------------------------------------------------------------------------------------
+ #
+ # toggle_score - Enables and disables the saving of word scores
+ #
+ # $value        1 for enabled, 0 for disabled
+ #
+ # ---------------------------------------------------------------------------------------------
+ 
+ sub toggle_score
+ {
+     my ( $self, $value ) = @_;
+     
+     $self->{wordscores__} = $value;
+ }
+ 
+ 
+ 
  1;
+ 

[popfile-commit] engine color.pl,1.6,1.7

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

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

Modified Files:
	color.pl 
Log Message:
change handling of bayes::{scores__} to reduce burden on forking
(Disables saving of scores where not needed, clears scores after where enabled)

Index: color.pl
===================================================================
RCS file: /cvsroot/popfile/engine/color.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** color.pl	13 Feb 2003 14:22:34 -0000	1.6
--- color.pl	16 Apr 2003 00:59:56 -0000	1.7
***************
*** 11,14 ****
--- 11,15 ----
  use Classifier::MailParse;
  use Classifier::Bayes;
+ use POPFile::Configuration;
  
  # main
***************
*** 17,28 ****
  {
      my $m = new Classifier::MailParse;
!     $m->{bayes} = new Classifier::Bayes;
      
!     if ( $m->{bayes}->initialize() == 0 ) {
          die "Failed to start while initializing the classifier module";
      }
  
!     $m->{bayes}->load_word_matrix();
!     $m->{color} = 1;
      print $m->parse_stream($ARGV[0]);
  }
--- 18,33 ----
  {
      my $m = new Classifier::MailParse;
!     $m->{bayes__} = new Classifier::Bayes;
!     $m->{configuration__} = new POPFile::Configuration;
!     $m->{configuration__}->{configuration__} = $m->{configuration__};
!     $m->{bayes__}->{configuration__} = $m->{configuration__};
      
!     
!     if ( $m->{bayes__}->initialize() == 0 ) {
          die "Failed to start while initializing the classifier module";
      }
  
!     $m->{bayes__}->load_word_matrix_();
!     $m->{color__} = 1;
      print $m->parse_stream($ARGV[0]);
  }

[popfile-commit] windows CBP.nsh,NONE,1.1 installer.nsi,1.34,1.35

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

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv11340

Modified Files:
	installer.nsi 
Added Files:
	CBP.nsh 
Log Message:
Merged patch that allows the installer to create buckets

--- NEW FILE: CBP.nsh ---
#----------------------------------------------------------------------------------------------
#
# CBP.nsh --- This file is used by 'installer.nsi', the NSIS script used to create the
#             Windows installer for POPFile. The CBP package allows the user to select several
#             buckets for use with a "clean" install of POPFile. Three built-in default values
#             can be overridden by creating suitable "!define" statements in 'installer.nsi'.
#
# Copyright (c) 2001-2003 John Graham-Cumming
#
#----------------------------------------------------------------------------------------------

# This version of 'CBP.nsh' was tested using NSIS 2.0b4 (CVS)

#//////////////////////////////////////////////////////////////////////////////////////////////
#
#                           External interface - starts here
#
#//////////////////////////////////////////////////////////////////////////////////////////////

[...1651 lines suppressed...]

  !undef CBP_C_CREATE_BN

  !undef CBP_C_FULL_COMBO_LIST
  !undef CBP_C_MIN_COMBO_LIST

  !undef CBP_C_MESSAGE

  !undef CBP_C_FIRST_BN_CBOX
  !undef CBP_C_FIRST_BN_CBOX_MINUS_ONE
  !undef CBP_C_FIRST_BN_TEXT
  !undef CBP_C_LAST_BN_TEXT_PLUS_ONE

  !undef CBP_C_MAX_BNCOUNT
  !undef CBP_C_MAX_BN_TEXT_PLUS_ONE
  !undef CBP_MAX_BN_CBOX_PLUS_ONE

#==============================================================================================
# End of CBP.nsh
#==============================================================================================

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** installer.nsi	14 Mar 2003 22:35:17 -0000	1.34
--- installer.nsi	15 Apr 2003 21:31:18 -0000	1.35
***************
*** 6,9 ****
--- 6,33 ----
  !define MUI_VERSION "0.18.1"
  !include "MUI.nsh"
+ 
+ #----------------------------------------------------------------------------------------
+ # CBP Configuration Data (leave lines commented-out if defaults are satisfactory)
+ #----------------------------------------------------------------------------------------
+ #   ; Maximum number of buckets handled (in range 2 to 8)
+ #
+ #   !define CBP_MAX_BUCKETS 8
+ #
+ #   ; Default bucket selection (use "" if no buckets are to be pre-selected)
+ #
+ #   !define CBP_DEFAULT_LIST "in-box|junk|personal|work"
+ #
+ #   ; List of suggestions for bucket names (use "" if no suggestions are required)
+ #
+ #   !define CBP_SUGGESTION_LIST \
+ #   "admin|business|computers|family|financial|general|hobby|in-box|junk|list-admin|\
+ #   miscellaneous|not_spam|other|personal|recreation|school|security|shopping|spam|\
+ #   travel|work"
+ #----------------------------------------------------------------------------------------
+ # Make the CBP package available
+ #----------------------------------------------------------------------------------------
+ 
+ !include CBP.nsh
+ 
  ;--------------------------------
  ;Configuration
***************
*** 53,59 ****
    !insertmacro MUI_PAGECOMMAND_COMPONENTS
    !insertmacro MUI_PAGECOMMAND_DIRECTORY
!   Page custom SetOptionsPage  ": Options"
    !insertmacro MUI_PAGECOMMAND_INSTFILES
!   Page custom SetOutlookOrOutlookExpressPage  ": Configure Outlook Express"
    !insertmacro MUI_PAGECOMMAND_FINISH
  
--- 77,84 ----
    !insertmacro MUI_PAGECOMMAND_COMPONENTS
    !insertmacro MUI_PAGECOMMAND_DIRECTORY
!   Page custom SetOptionsPage "" ": Options"
    !insertmacro MUI_PAGECOMMAND_INSTFILES
!   !insertmacro CBP_PAGECOMMAND_SELECTBUCKETS ": Create POPFile Buckets"
!   Page custom SetOutlookOrOutlookExpressPage "" ": Configure Outlook Express"
    !insertmacro MUI_PAGECOMMAND_FINISH
  

[popfile-commit] engine/languages Hungarian.msg,NONE,1.1

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

Update of /cvsroot/popfile/engine/languages
In directory sc8-pr-cvs1:/tmp/cvs-serv9366

Added Files:
	Hungarian.msg 
Log Message:
Added Hungarian

--- NEW FILE: Hungarian.msg ---
# Copyright (c) 2001-2003 John Graham-Cumming

# Identify the language and character set used for the interface
LanguageCode                            hu
LanguageCharset                         ISO-8859-2

# This is used to get the appropriate subdirectory for the manual
ManualLanguage                          hu

# Common words that are used on their own all over the interface
Apply                                   Alkalmaz
On                                      Be
Off                                     Ki
TurnOn                                  Bekapcsol
TurnOff                                 Kikapcsol
Add                                     Hozzáad
Remove                                  Elvesz
Previous                                Elõzõ
Next                                    Következõ
From                                    Feladó
Subject                                 Téma
Classification                          Osztályozás
Reclassify                              Újraosztályoz
Undo                                    Undo
Close                                   Bezár
Find                                    Keres
Filter                                  Szûrõ
Yes                                     Igen
No                                      Nem
ChangeToYes                             Kapcsold Igen-re
ChangeToNo                              Kapcsold Nem-re
Bucket                                  Tartály
Magnet                                  Mágnes
Delete                                  Töröl
Create                                  Létrehoz
To                                      Cimzett
Total                                   Összesités
Rename                                  Átnevez
Frequency                               Frekvencia
Probability                             Valószinûség
Score                                   Pontszám
Lookup                                  Lookup

# The header and footer that appear on every UI page
Header_Title                            POPFile Vezérlõközpont
Header_Shutdown                         Shutdown POPFile
Header_History                          History
Header_Buckets                          Tartályok
Header_Configuration                    Beállitások
Header_Advanced                         Haladó
Header_Security                         Biztonság
Header_Magnets                          Mágnesek

Footer_HomePage                         POPFile Honlap
Footer_Manual                           Kézikönyv
Footer_Forums                           Fórumok
Footer_FeedMe                           Adj enni!
Footer_RequestFeature                   Tulajdonság kérése
Footer_MailingList                      Levlista

Configuration_Error1                    Az elválasztó karakter nem lehet hosszabb 1 karakternél
Configuration_Error2                    A felhasználói interfész port egy szám kell hogy legyen 1 és 65535 között.
Configuration_Error3                    A POP3 port egy szám kell hogy legyen 1 és 65535 között.
Configuration_Error4                    A lapszám egy szám kell hogy legyen 1 és 1000 között.
Configuration_Error5                    A history-ban lévõ napok száma egy szám kell hogy legyen 1 és 366 között.
Configuration_Error6                    A TCP idõtúllépés egy szám kell hogy legyen 10 és 300 között.
Configuration_POP3Port                  POP3 figyelõ port
Configuration_POP3Update                Az új port: %s; A változtatás életbeléptetéséhez újra kell inditanod POPFile-t.
Configuration_Separator                 Elválasztó karakter
Configuration_SepUpdate                 Az új elválasztó karakter: %s
Configuration_UI                        Felhasználói interfész web port
Configuration_UIUpdate                  Az új felhasználói interfész web port %s; A változtatás életbeléptetéséhez újra kell inditanod POPFile-t.
Configuration_History                   Egy lapon lévõ emailek száma
Configuration_HistoryUpdate             Az egy lapon lévõ emailek száma megváltozott: %s
Configuration_Days                      A history-ban megõrizendõ napok száma
Configuration_DaysUpdate                A history-ban megõrizendõ napok számának új értéke: %s
Configuration_UserInterface             Felhasználói felület
Configuration_Skins                     Skinek
Configuration_SkinsChoose               Válassz skin-t
Configuration_Language                  Nyelv
Configuration_LanguageChoose            Válassz nyelvet
Configuration_ListenPorts               Figyelj portokon
Configuration_HistoryView               History Nézet
Configuration_TCPTimeout                TCP Kapcsolat Timeout
Configuration_TCPTimeoutSecs            TCP kapcsolat timeout másodpercekben
Configuration_TCPTimeoutUpdate          A TCP kapcsolat timeout új értéke: %s
Configuration_ClassificationInsertion   Osztályozás beillesztés
Configuration_SubjectLine               Beillesztés az email témájába
Configuration_XTCInsertion              X-Text-Classification alkalmazása
Configuration_XPLInsertion              X-POPFile-Link beillesztése
Configuration_Logging                   Naplózás
Configuration_None                      Nincs
Configuration_ToScreen                  Képernyõre
Configuration_ToFile                    Fájlba
Configuration_ToScreenFile              Képernyõre és fájlba
Configuration_LoggerOutput              Naplózó kimenet

Advanced_Error1                         '%s' már hozzá lett adva a blokkoló szavakhoz
Advanced_Error2                         A figyelmen kivül hagyott szavak csak betûket, számokat és a következõ karaktereket tartalmayhatják:, ., _, -, @
Advanced_Error3                         '%s' hozzáadva a blokkolt szavak listájához
Advanced_Error4                         '%s' nincs a blokkolt szavak között
Advanced_Error5                         '%s' törölve a blokkolt szavak közúl
Advanced_StopWords                      Figyelmen kivûl hagyott szavak
Advanced_Message1                       A következõ szavak minden osztályozásból ki fognak maradni, mivel túl sûrûn fordulnak elõ.
Advanced_AddWord                        Szó hozzáadása
Advanced_RemoveWord                     Szó törlése

History_Filter                          &nbsp;(csak a <font color=%s>%s</font> konténer tartalma látható)
History_Search                          &nbsp;(Találatok %s témára)
History_Title                           Utoljára beérkezett üzenetek
History_Jump                            Üzenetre ugrás
History_ShowAll                         Mutasd mindet
History_ShouldBe                        Kellene lennie
History_NoFrom                          nincs feladó
History_NoSubject                       nincs téma
History_ClassifyAs                      Osztályozd mint
History_MagnetUsed                      Eltéritõ mágnes:
History_ChangedTo                       Új érték: <font color=%s>%s
History_Already                         Újraosztályozva mint <font color=%s>%s</font>
History_RemoveAll                       Mindet töröl
History_RemovePage                      Töröld ezt az oldalt
History_Remove                          Klikkelj hogy töröld a bejegyzéseket a History-ból
History_SearchMessage                   Keress feladó/téma alapján
History_NoMessages                      Nincs üzenet
History_ShowMagnet                      Mágnesezett
History_Magnet                          &nbsp;(Csak mágnesek által osztályozott üzenetek látszanak)
History_ResetSearch                     Nullázás

Password_Title                          Jelszó
Password_Enter                          Ird be a jelszót
Password_Go                             Mehet!
Password_Error1                         Rossz jelszó

Security_Error1                         A secure port egy szám kell hogy legyen 1 és 65535 között
Security_Stealth                        Lopakodó (Stealth) Üzemmód/Szerver Múködés
Security_NoStealthMode                  Nem (Stealth Üzemmód)
Security_ExplainStats                   (Ha ez be van kapcsolva, akkor a POPFile naponta egyszer elküldi a következõ 3 változó értékét egy script-nek a www.usethesource.com-ra: bc (a konténerek száma) mc (a POPFile által osztályozott üzenetek száma) ec (az osztályozási hibák száma). Ezeket az adatokat egy állomámyban tartom, és arra használom õket hogy néhány statisztikai adatok publikáljak a POPFile hatékonyságáról és arról hogy az emberek hogyan hasynálják a programot. A Web szerverem kb. 5 napig õrzi meg az információt, majd törli. Nem tárolok semmiféle kapcsolatot a begyûjtött adatok és az IP cimek között.)
Security_ExplainUpdate                  (Ha ez be van kapcsolva, akkor a POPFile naponta egyszer elküldi a következõ 3 változó értékét egy script-nek a www.usethesource.com-ra: ma (az általad használt POPFile fõ verziószáma) mi (az általad használt POPFile al-verziószáma) bn (az általad használt POPFile build száma). Az általad használt POPFile kapni fog egy grafikát a szervertõl, ami a lap tetején lesz látható ha egy újabb verzió elérhetõ. Ezeket az adatokat egy állomámyban tartom, és arra használom õket hogy néhány statisztikai adatok publikáljak a POPFile hatékonyságáról és arról hogy az emberek hogyan hasynálják a programot. A Web szerverem kb. 5 napig õrzi meg az információt, majd törli. Nem tárolok semmiféle kapcsolatot a begyûjtött adatok és az IP cimek között.) 
Security_PasswordTitle                  Felhaszálói felület jelszó
Security_Password                       Jelszó
Security_PasswordUpdate                 Az új jelszó: %s
Security_AUTHTitle                      Secure Password Authentication/AUTH
Security_SecureServer                   Secure szerver
Security_SecureServerUpdate             Az új secure szerver: %s; Ez a változás nem fog érvénybe lépni amig ujra nem inditod a POPFile-t.
Security_SecurePort                     Secure port
Security_SecurePortUpdate               Az új port: %s; Ez a változás nem fog érvénybe lépni amig ujra nem inditod a POPFile-t.
Security_POP3                           POP3 kapcsolat engedélyezése távoli gépekkel
Security_UI                             HTTP (Felhasználói felület) engedélyezése távoli gépekkel
Security_UpdateTitle                    Automatikus új verzió ellenõrzés
Security_Update                         Naponta ellenõrizze hogy van-e új POPFile verzió
Security_StatsTitle                     Statisztika küldése
Security_Stats                          Küldd el a statisztikákat Johnünak minden nap

Magnet_Error1                           A mágnes '%s' már létezik a '%s' konténerben
Magnet_Error2                           Az új mágnes '%s' összeragadhat a '%s' mágnessel és hibás eredményeket okozhat a '%s' konténerben. Az új mágnes nem lett hozzáadva a rendszerhez.
Magnet_Error3                           Hozd létre a '%s' mágnest a '%s' konténerben.
Magnet_CurrentMagnets                   Mágnesek
Magnet_Message1                         A következõ mágnes minden egyes levelet a megadott konténerbe fog irányitani.
Magnet_CreateNew                        Hozz létre új mágnest
Magnet_Explanation                      Három fajta mágnes létezik:</b> <ul><li><b>Feladó cime vagy neve:</b> Például: jo...@co..., ha egy bizonyos email cimet keresünk<br>company.com ha mindenkit meg akarunk találni aki a company.com cimrõl jön, <br>"John Doe" ha egy bizonyos embert akarunk kiszûrni, John meg fog találni minden John-t<li><b>Cimyett cime vagy neve:</b> Ugyanaz mint a Feladó, de ez a Cimzett nevében és cimében keres.<li><b>Téma:</b> Például: hello meg fog találni minden email-t aminek a szó "hello" a témájában szerepel</ul>
Magnet_MagnetType                       Mágnes tipus
Magnet_Value                            Érték
Magnet_Always                           Mindig a konténerbe megy

Bucket_Error1                           Konténer nevek csak kisbetûket tartalmazhatnak a-tól z-ig, valamint a - és _ jeleket
Bucket_Error2                           Már létezik egy %s nevû konténer
Bucket_Error3                           A %s nevû konténer létrehozva
Bucket_Error4                           Kérem adjon meg egy nem-üres szót
Bucket_Error5                           Konténer átnevezve %-ról %s-ra
Bucket_Error6                           A %s nevû konténert töröltem
Bucket_Title                            Összefoglaló
Bucket_BucketName                       Konténer név
Bucket_WordCount                        Szavak száma
Bucket_WordCounts                       Szavak számai
Bucket_UniqueWords                      Egyedi szavak
Bucket_SubjectModification              Téma megváltoztatás
Bucket_ChangeColor                      Szin megváltoztatása
Bucket_NotEnoughData                    Nincs elég adat
Bucket_ClassificationAccuracy           Az osztályozás pontossága
Bucket_EmailsClassified                 Osztályozott Emailek száma
Bucket_EmailsClassifiedUpper            Osztályozott Emailek száma
Bucket_ClassificationErrors             Osztályozási hibák
Bucket_Accuracy                         Pontosság
Bucket_ClassificationCount              Osztályozások száma
Bucket_ResetStatistics                  Statisztika nullázása
Bucket_LastReset                        Utolsó nullázás
Bucket_CurrentColor                     %s a jelenlgi szin %s
Bucket_SetColorTo                       %s szin %s-ra állitása
Bucket_Maintenance                      Karbantartás
Bucket_CreateBucket                     Konténer létrehozása:
Bucket_DeleteBucket                     Konténer törlése:
Bucket_RenameBucket                     Konténer átnevezése:
Bucket_Lookup                           Keresés
Bucket_LookupMessage                    Szó keresése a konténerekben
Bucket_LookupMessage2                   Keresés eredménye:
Bucket_LookupMostLikely                 <b>%s</b> legvalószinûbben a következõ helyen fog megjelenni: <font color=%s>%s</font>
Bucket_DoesNotAppear                    <p><b>%s</b> egyik konténerben sem található
Bucket_DisabledGlobally                 Globálisan letiltott
Bucket_To                               to
Bucket_Quarantine                       Karantén

SingleBucket_Title                      %s részletei
SingleBucket_WordCount                  Konténerben lévõ szavak száma
SingleBucket_TotalWordCount             Összes szó száma
SingleBucket_Percentage                 Teljes százalék
SingleBucket_WordTable                  Szótáblázat % -nak
SingleBucket_Message1                   A csillaggal jelölt szavak(*) részt vettek az osztályzásban a POPFile legutóbbi inditása óta. Kattints egy szóra hogy megnézd a konténerenkénti valószinûségét.
SingleBucket_Unique                     %s egyedi

Session_Title                           POPFile Session Lejárt
Session_Error                           Ez a POPFile session lejárt.  Egy lehetséges ok hogy elinditotta és leállitotta a POPFile-t, de a böngészõt nyitva hagyta. Kérem kattintson a felül lévõ linkek egyikére.

[popfile-commit] engine/languages Deutsch.msg,1.12,1.13

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

Update of /cvsroot/popfile/engine/languages
In directory sc8-pr-cvs1:/tmp/cvs-serv8425

Modified Files:
	Deutsch.msg 
Log Message:
Updated German translation

Index: Deutsch.msg
===================================================================
RCS file: /cvsroot/popfile/engine/languages/Deutsch.msg,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Deutsch.msg	7 Apr 2003 10:13:32 -0000	1.12
--- Deutsch.msg	15 Apr 2003 21:26:28 -0000	1.13
***************
*** 1,247 ****
! # Copyright (c) 2001-2003 John Graham-Cumming
! 
! # Identify the language and character set used for the interface
! 
! LanguageCode                            de
! LanguageCharset                         ISO-8859-1
! 
! # This is used to get the appropriate subdirectory for the manual
! ManualLanguage                          de
! 
! # Common words that are used on their own all over the interface
! Apply                                   Anwenden
! On                                      Ein
! Off                                     Aus
! TurnOn                                  Einschalten
! TurnOff                                 Ausschalten
! Add                                     Hinzufügen
! Remove                                  Entfernen
! Previous                                Zurück
! Next                                    Weiter
! From                                    Absender
! Subject                                 Betreff
! Classification                          Einstufung
! Reclassify                              Neu einstufen
! Undo                                    widerrufen
! Close                                   Schließen
! Find                                    Suchen
! Filter                                  Filter
! Yes                                     Ja
! No                                      Nein
! ChangeToYes                             Ändern in Ja
! ChangeToNo                              Ändern in Nein
! Bucket                                  Kategorie
! Magnet                                  Magnet
! Delete                                  Löschen
! Create                                  Erstellen
! To                                      Empfänger
! Total                                   Insgesamt
! Rename                                  Umbenennen
! Frequency                               Häufigkeit
! Probability                             Wahrscheinlichkeit
! Score                                   Auswertung
! Lookup                                  Nachschlagen
! 
! # The header and footer that appear on every UI page
! Header_Title                            POPFile Kontrollzentrum
! Header_Shutdown                         Herunterfahren
! Header_History                          Verlauf
! Header_Buckets                          Kategorie
! Header_Configuration                    Konfiguration
! Header_Advanced                         Erweitert
! Header_Security                         Sicherheit
! Header_Magnets                          Magnete
! Footer_HomePage                         POPFile Homepage
! Footer_Manual                           Handbuch
! Footer_Forums                           Foren
! Footer_FeedMe                           Spenden
! Footer_RequestFeature                   Funktionalität vorschlagen
! Footer_MailingList                      Mailing Liste
! 
! Configuration_Error1                    Das Trennzeichen muß ein einzelnes Zeichen sein.
! Configuration_Error2                    Der Port für das Kontrollzentrum muß zwischen 1 und 65535 liegen.
! Configuration_Error3                    Der POP3 Port muß zwischen 1 und 65535 liegen.
! Configuration_Error4                    Die Seitengröße muß zwischen 1 und 1000 liegen.
! Configuration_Error5                    Die Anzahl der Tage im Verlauf muß zwischen 1 und 366 liegen.
! Configuration_Error6                    Der TCP Timeout muß zwischen 10 und 300 liegen.
! Configuration_Error7                    Der XML-RPC Port muß zwischen 1 und 65535 liegen.
! Configuration_POP3Port                  POP3 Port
! Configuration_POP3Update                Neuer POP3 Port: %s - Diese Änderung wird erst nach einem Neustart von POPFile wirksam.
! Configuration_XMLRPCUpdate              Neuer XML-RPC Port: %s - Diese Änderung wird erst nach einem Neustart von POPFile wirksam.
! Configuration_XMLRPCPort                XML-RPC Port
! Configuration_SMTPPort                  SMTP Port
! Configuration_SMTPUpdate                Neuer SMPT Port: %s - Diese Änderung wird erst nach einem Neustart von POPFile wirksam.
! Configuration_NNTPPort                  NNTP Port
! Configuration_NNTPUpdate                Neuer NNTP Port: %s - Diese Änderung wird erst nach einem Neustart von POPFile wirksam.
! Configuration_POP3Separator             POP3 Server:Port:Benutzer Trennzeichen
! Configuration_NNTPSeparator             NNTP Server:Port:Benutzer Trennzeichen
! Configuration_POP3SepUpdate             Neues POP3 Trennzeichen: %s
! Configuration_NNTPSepUpdate             Neues NNTP Trennzeichen: %s
! Configuration_UI                        Web Port für Kontrollzentrum
! Configuration_UIUpdate                  Neuer Web Port für Kontrollzentrum: %s - Dieser Änderung wird erst nach einem Neustart von POPFile wirksam.
! Configuration_History                   Anzahl Nachrichten pro Seite
! Configuration_HistoryUpdate             Neue Anzahl Nachrichten pro Seite: %s
! Configuration_Days                      Nachrichten x Tage im Verlauf speichern
! Configuration_DaysUpdate                Nachrichten werden nun %s Tage im Verlauf gespeichert
! Configuration_UserInterface             Benutzeroberfläche
! Configuration_Skins                     Skins
! Configuration_SkinsChoose               Skin auswählen
! Configuration_Language                  Sprache
! Configuration_LanguageChoose            Sprache auswählen
! Configuration_ListenPorts               Moduleinstellungen
! Configuration_HistoryView               Verlaufsansicht
! Configuration_TCPTimeout                Verbindungstimeout
! Configuration_TCPTimeoutSecs            Verbindungstimeout in Sekunden
! Configuration_TCPTimeoutUpdate          Neuer Verbidungstimeout: %s
! Configuration_ClassificationInsertion   Einstufung anzeigen
! Configuration_SubjectLine               Betreff-Zeile ändern
! Configuration_XTCInsertion              X-Text-Classification einfügen
! Configuration_XPLInsertion              X-POPFile-Link einfügen
! Configuration_Logging                   Protokollierung
! Configuration_None                      Keine Ausgabe
! Configuration_ToScreen                  Auf den Bildschirm
! Configuration_ToFile                    In eine Datei
! Configuration_ToScreenFile              Bildschirm und Datei
! Configuration_LoggerOutput              Protokoll ausgeben
! Configuration_GeneralSkins              Skins
! Configuration_SmallSkins                kleine Skins
! Configuration_TinySkins                 sehr kleine Skins
! 
! Advanced_Error1                         '%s' ist bereits in der Liste der ignorierten Wörter
! Advanced_Error2                         Ignorierte Wörtern können nur alphanumerische, ., _, -, oder @ Zeichen enthalten
! Advanced_Error3                         '%s' zu den ignorierten Wörtern hinzugefügt
! Advanced_Error4                         '%s' ist nicht in der Liste der ignorierten Wörter
! Advanced_Error5                         '%s' von der Liste der ignorierten Wörter entfernt
! Advanced_StopWords                      Ignorierte Wörter
! Advanced_Message1                       POPFile ignoriert die folgenden, häufig verwendeten Wörter:
! Advanced_AddWord                        Wort hinzufügen
! Advanced_RemoveWord                     Wort löschen
! 
! History_Filter                          &nbsp;(zeige nur Kategorie <font color="%s">%s</font>)
! History_Search                          &nbsp;(gesuchter Absender/Betreff: %s)
! History_Title                           Letzte Nachrichten
! History_Jump                            zu Nachricht gehen
! History_ShowAll                         Alle anzeigen
! History_ShouldBe                        Sollte sein
! History_NoFrom                          kein Absender angegeben
! History_NoSubject                       kein Betreff
! History_ClassifyAs                      eingestuft als
! History_MagnetUsed                      Magnet benutzt
! History_ChangedTo                       Geändert: <font color="%s">%s
! History_Already                         Bereits neu eingestuft als <font color="%s">%s</font>
! History_RemoveAll                       Alle entfernen
! History_RemovePage                      Diese Seite entfernen
! History_Remove                          Um Einträge im Verlauf zu löschen, klicken Sie auf
! History_SearchMessage                   Nach Absender/Betreff suchen
! History_NoMessages                      keine Nachrichten
! History_ShowMagnet                      magnetisiert
! History_Magnet                          &nbsp;(zeige nur durch Magnet eingestufte Nachrichten)
! History_ResetSearch                     Zurücksetzen
! 
! Password_Title                          Paßwort
! Password_Enter                          Paßwort eingeben
! Password_Go                             Anmelden
! Password_Error1                         Falsches Paßwort
! 
! Security_Error1                         Der Port muß zwischen 1 und 65535 liegen.
! Security_Stealth                        Stealth Modus/Serverbetrieb
! Security_NoStealthMode                  Nein (Stealth Modus)
! Security_ExplainStats                   (Wenn Sie diese Funktion einschalten, sendet POPFile täglich die drei folgenden Werte an ein Skript auf www.usethesource.com: bc (Anzahl von Ihnen eingerichteter Kategorien), mc (Anzahl von POPFile eingestufter Nachrichten) und ec (Anzahl der Einstufungsfehler). Diese werden in einer Datei gespeichert und benutzt, um öffentliche Statistiken darüber zu erstellen, wie POPFile genutzt wird und wie gut es dabei funktioniert. Die Daten werden etwa 5 Tage auf dem Server gespeichert und dann gelöscht. Zuordnungen zwischen IP-Adressen und statistischen Daten werden nicht gespeichert.)
! Security_ExplainUpdate                  (Wenn Sie diese Funktion einschalten, sendet POPFile täglich die drei folgenden Werte an ein Skript auf www.usethesource.com: ma (die Hauptversionsnummer der POPFile-Installation), mi (die Nebenversionsnummer der POPFile-Installation) und bn (die build-Nummer der POPFile-Installation). POPFile erhält die Antwort in Form einer Grafik, die am Kopf einer Seite erscheint, wenn eine neue Version verfügbar ist. Die Daten werden etwa 5 Tage auf dem Server gespeichert und dann gelöscht. Zuordnungen zwischen IP-Adressen und statistischen Daten werden nicht gespeichert.)
! Security_PasswordTitle                  Paßwort für Benutzeroberfläche
! Security_Password                       Paßwort
! Security_PasswordUpdate                 Neues Paßwort: %s
! Security_AUTHTitle                      externe Server
! Security_SecureServer                   POP3 SPA/AUTH Server
! Security_SecureServerUpdate             Neuer POP3 SPA/AUTH Server: %s - Diese Änderung wird erst nach einem Neustart von POPFile wirksam.
! Security_SecurePort                     POP3 SPA/AUTH Port
! Security_SecurePortUpdate               Neuer POP3 SPA/AUTH Port %s - Diese Änderung wird erst nach einem Neustart von POPFile wirksam.
! Security_SMTPServer                     externer SMTP Server
! Security_SMTPServerUpdate               Neuer externer SMTP Server: %s - Diese Änderung wird erst nach einem Neustart von POPFile wirksam.
! Security_SMTPPort                       externer SMTP port
! Security_SMTPPortUpdate                 Neuer externer SMTP Port: %s - Diese Änderung wird erst nach einem Neustart von POPFile wirksam.
! Security_POP3                           POP3 Verbindungen von fremden Rechnern erlauben (erfordert Neustart von POPFile)
! Security_SMTP                           SMTP Verbindungen von fremden Rechnern erlauben (erfordert Neustart von POPFILE)
! Security_NNTP                           NNTP Verbindungen von fremden Rechnern erlauben (erfordert Neustart von POPFile)
! Security_UI                             HTTP (Benutzeroberfläche) Verbindungen von fremden Rechnern erlauben (erfordert Neustart von POPFile)
! Security_XMLRPC                         XML-RPC Verbindungen von fremden Rechnern erlauben (erfordert Neustart von POPFile)
! Security_UpdateTitle                    Automatisch auf Updates prüfen
! Security_Update                         Täglich nach POPFile Updates suchen
! Security_StatsTitle                     Statistik Report
! Security_Stats                          Täglich Statistiken senden
! 
! Magnet_Error1                           Magnet '%s' existiert bereits in Kategorie '%s'
! Magnet_Error2                           Neuer Magnet '%s' kollidiert mit Magnet '%s' in Kategorie '%s' und könnte unklare Ergebnisse verursachen. Magnet wurde nicht unzugefügt.
! Magnet_Error3                           Erstelle neuen Magnet '%s' in Kategorie '%s'
! Magnet_CurrentMagnets                   Aktuelle Magnete
! Magnet_Message1                         Die folgenden Magnete ordnen neue Post zwingend in eine angegebene Kategorie ein.
! Magnet_CreateNew                        Neuen Magnet erstellen
! Magnet_Explanation                      Drei Typen von Magneten sind verfügbar: <ul><li>Absenderadresse oder -name:</b> z.B.: ha...@fi..., um eine bestimmte Adresse zu erfassen, <br />firma.de, um jeden zu erfassen, der von firma.de sendet, <br />Hans Mustermann, um eine bestimmte Person zu erfassen; Hans erfaßt jeden Hans</li><li><b>Empfängeradresse oder -name:</b> Wie beim Absender-Magnet nur für die Empfängeradresse der Nachricht.</li><li><b>Wörter im Betreff:</b> z.B.: "Hallo", um alle Nachrichten mit "Hallo" im Betreff zu erfassen</li></ul>
! Magnet_MagnetType                       Typ des Magnets
! Magnet_Value                            Wert
! Magnet_Always                           Immer dieser Kategorie zuordnen
! 
! Bucket_Error1                           Kategorienamen können nur Kleinbuchstaben von a bis z, - oder _ enthalten
! Bucket_Error2                           Kategoriename %s existiert bereits
! Bucket_Error3                           Kategorie %s erstellt
! Bucket_Error4                           Bitte geben Sie ein nicht-leeres Wort ein
! Bucket_Error5                           Kategorie %s in %s umbenannt
! Bucket_Error6                           Kategorie %s gelöscht
! Bucket_Title                            Zusammenfassung
! Bucket_BucketName                       Kategoriename
! Bucket_WordCount                        Wortanzahl
! Bucket_WordCounts                       Wortanzahl
! Bucket_UniqueWords                      verschiedene Wörter
! Bucket_SubjectModification              Betreff ändern
! Bucket_ChangeColor                      Farbe ändern
! Bucket_NotEnoughData                    Nicht genügend Daten
! Bucket_ClassificationAccuracy           Genauigkeit
! Bucket_EmailsClassified                 Nachrichten klassifiziert
! Bucket_EmailsClassifiedUpper            Nachrichten klassifiziert
! Bucket_ClassificationErrors             Einstufungsfehler
! Bucket_Accuracy                         Genauigkeit
! Bucket_ClassificationCount              Anzahl Einstufungen
! Bucket_ResetStatistics                  Statistiken zurücksetzen
! Bucket_LastReset                        Läuft seit
! Bucket_CurrentColor                     Derzeitige Farbe von %s ist %s
! Bucket_SetColorTo                       Setze Farbe von %s auf %s
! Bucket_Maintenance                      Verwaltung
! Bucket_CreateBucket                     Erstelle Kategorie
! Bucket_DeleteBucket                     Lösche Kategorie
! Bucket_RenameBucket                     Benenne Kategorie um
! Bucket_Lookup                           Nachschlagen
! Bucket_LookupMessage                    Wort in Kategorie nachschlagen
! Bucket_LookupMessage2                   Ergebnis für
! Bucket_LookupMostLikely                 <b>%s</b> erscheint am wahrscheinlichsten in <font color="%s">%s</font>
! Bucket_DoesNotAppear                    <p><b>%s</b> erscheint in keiner Kategorie
! Bucket_DisabledGlobally                 Global deaktiviert
! Bucket_To                               in
! Bucket_Quarantine                       Quarantäne
! 
! SingleBucket_Title                      Details für %s
! SingleBucket_WordCount                  Anzahl Worte in dieser Kategorie
! SingleBucket_TotalWordCount             Anzahl Worte insgesamt
! SingleBucket_Percentage                 Anteil an der Gesamtzahl
! SingleBucket_WordTable                  Worttabelle für %s
! SingleBucket_Message1                   Mit (*) gekennzeichnete Wörter wurden in dieser POPFile Sitzung zur Sortierung benutzt. Klicken Sie auf ein beliebiges Wort, um die Wahrscheinlichkeit seines Erscheinens für alle Kategorien anzusehen.
! SingleBucket_Unique                     %s verschiedene
! 
! Session_Title                           POPFile Sitzung abgelaufen
! Session_Error                           Ihre POPFile-Sitzung ist abgelaufen. Dies könnte dadurch verursacht worden sein, daß Sie POPFile neu gestartet haben, das Kontrollzentrum aber noch im Browser geöffnet war. Bitte klicken Sie auf einen der oben angezeigten Verweise, um mit der Benutzung von POPFile weitermachen zu können.
! 
! Header_MenuSummary                      Diese Tabelle ist das Navigationsmenü, das Zugang zu den einzelnen Bereichen des Kontrollzentrums bietet.
! History_MainTableSummary                Diese Tabelle zeigt Absender und Betreff der letzten empfangenen Nachrichten an und ermöglicht es, diese durchzusehen und zu reklassifizieren. Ein Klick auf den Betreff zeigt die vollständige Nachricht an sowie Details, warum diese so und nicht anders klassifiziert wurde. Die Spalte "Sollte sein" ermöglicht es, anzugeben, in welche Kategorie die Nachricht gehört bzw. entsprechende Änderungen rückgängig zu machen. Die Spalte "Delete" ermöglicht es, einzelne Nachrichten aus dem Verlauf zu löschen, falls Sie diese nicht mehr benötigen.
! History_OpenMessageSummary              Diese Tabelle enthält den kompletten Text einer Nachricht. Die Wörter sind entsprechend der Kategorie eingefärbt, in die sie am wahrscheinlichsten passen.
! Bucket_MainTableSummary                 Diese Tabelle bietet einen Überblick über die einzelnen Kategorien. Jede Reihe zeigt Name, Gesamtzahl der Wörter und die Anzahl verschiedener Wörter pro Kategorie an, ob die Betreff-Zeile der Nachricht bei der Klassifizierung geändert wird, ob die Nachrichten dieser Kategorie in Quarantäne gestellt werden sollen, sowie eine Tabelle zur Auswahl einer Farbe, in der alle zu dieser Kategorie gehörenden Elemente im Kontrollzentrum dargestellt werden sollen.
! Bucket_StatisticsTableSummary           Diese Tabelle zeigt drei verschiedene Statistiken bezüglich POPFiles Gesamtleistung an. Die erste: Wie fehlerfrei ist die Einordnung in die entsprechenden Kategorien? Die zweite: Wie viele Nachrichten wurden analysiert und wie wurden sie eingeordnet? Die dritte: Wie viele Wörter gehören zu jeder Kategorie und wie hoch ist der Prozentsatz zur Gesamtzahl?
! Bucket_MaintenanceTableSummary          Diese Tabelle enthält Formulare zum Erstellen, Löschen und Umbenennen von Kategorien und um die relative Wahrscheinlichkeit der Wörter in jeder einzelnen Kategorie nachzuschlagen. 
! Bucket_AccuracyChartSummary             Diese Tabelle stellt die Genauigkeit der Nachrichten-Sortierung grafisch dar.
! Bucket_BarChartSummary                  Diese Tabelle stellt einen Prozentanteil grafisch dar. Sie wird sowohl für die Anzahl der eingestuften Nachrichten als auch für die Gesamtzahl der Wörter genutzt.
! Bucket_LookupResultsSummary             Diese Tabelle stellt die Wahrscheinlichkeiten bezüglich jedes angegebenen Wortes dar. Für jede Kategorie wird folgendes angezeigt: Die Häufigkeit, mit der das Wort auftritt, die Wahrscheinlichkeit, daß es in dieser Kategorie auftritt und die Auswirkungen auf die Punktzahl der Kategorie insgesamt, falls das Wort in einer Nachricht auftaucht.
! Bucket_WordListTableSummary             Diese Tabelle bietet eine Liste aller Wörter einer bestimmten Kategorie - reihenweise sortiert nach dem ersten Buchstaben.
! Magnet_MainTableSummary                 Diese Tabelle zeigt eine Liste der Magnete an, die dazu benutzt werden, um Nachrichten automatisch nach festen Kriterien zu sortieren. Jede Reihe zeigt an, wie der Magnet definiert ist, in welche Kategorie er einsortiert und eine Schaltfläche, um den Magnet zu löschen.
! Configuration_MainTableSummary          Diese Tabelle enthält einige Formulare zur Konfiguration von POPFile.
! Configuration_InsertionTableSummary     Diese Tabelle enthält Schaltflächen zur Konfiguration, ob bestimmte Änderungen an Kopfzeilen oder Betreff der Nachricht gemacht werden sollen, bevor diese an das entsprechende Programm weitergegeben wird.
! Security_MainTableSummary               Diese Tabelle bietet Einstellungsmöglichkeiten, die die Sicherheit von POPFile insgesamt betreffen, ob es automatisch auf neue Versionen prüfen soll oder ob Statistiken über die Leistung von POPFile an eine zentrale Datenbank zwecks der Erstellung von Gesamtstatistiken geschickt werden sollen.
! Advanced_MainTableSummary               Diese Tabelle enthält eine Liste von Wörtern, die POPFile ignoriert, wenn es eine Nachricht analysiert. Dies betrifft Wörter, die besonders häufig in Nachrichten auftauchen. Diese sind reihenweise alphabetisch nach dem ersten Buchstaben sortiert.
! 
--- 1,247 ----
! # Copyright (c) 2001-2003 John Graham-Cumming
! 
! # Identify the language and character set used for the interface
! 
! LanguageCode                            de
! LanguageCharset                         ISO-8859-1
! 
! # This is used to get the appropriate subdirectory for the manual
! ManualLanguage                          de
! 
! # Common words that are used on their own all over the interface
! Apply                                   Anwenden
! On                                      Ein
! Off                                     Aus
! TurnOn                                  Einschalten
! TurnOff                                 Ausschalten
! Add                                     Hinzufügen
! Remove                                  Entfernen
! Previous                                Zurück
! Next                                    Weiter
! From                                    Absender
! Subject                                 Betreff
! Classification                          Einstufung
! Reclassify                              Neu einstufen
! Undo                                    widerrufen
! Close                                   Schließen
! Find                                    Suchen
! Filter                                  Filter
! Yes                                     Ja
! No                                      Nein
! ChangeToYes                             Ändern in Ja
! ChangeToNo                              Ändern in Nein
! Bucket                                  Kategorie
! Magnet                                  Magnet
! Delete                                  Löschen
! Create                                  Erstellen
! To                                      Empfänger
! Total                                   Insgesamt
! Rename                                  Umbenennen
! Frequency                               Häufigkeit
! Probability                             Wahrscheinlichkeit
! Score                                   Auswertung
! Lookup                                  Nachschlagen
! 
! # The header and footer that appear on every UI page
! Header_Title                            POPFile Kontrollzentrum
! Header_Shutdown                         Herunterfahren
! Header_History                          Verlauf
! Header_Buckets                          Kategorie
! Header_Configuration                    Konfiguration
! Header_Advanced                         Erweitert
! Header_Security                         Sicherheit
! Header_Magnets                          Magnete
! Footer_HomePage                         POPFile Homepage
! Footer_Manual                           Handbuch
! Footer_Forums                           Foren
! Footer_FeedMe                           Spenden
! Footer_RequestFeature                   Funktionalität vorschlagen
! Footer_MailingList                      Mailing Liste
! 
! Configuration_Error1                    Das Trennzeichen muß ein einzelnes Zeichen sein.
! Configuration_Error2                    Der Port für das Kontrollzentrum muß zwischen 1 und 65535 liegen.
! Configuration_Error3                    Der POP3 Port muß zwischen 1 und 65535 liegen.
! Configuration_Error4                    Die Seitengröße muß zwischen 1 und 1000 liegen.
! Configuration_Error5                    Die Anzahl der Tage im Verlauf muß zwischen 1 und 366 liegen.
! Configuration_Error6                    Der TCP Timeout muß zwischen 10 und 300 liegen.
! Configuration_Error7                    Der XML-RPC Port muß zwischen 1 und 65535 liegen.
! Configuration_POP3Port                  POP3 Port
! Configuration_POP3Update                Neuer POP3 Port: %s - Diese Änderung wird erst nach einem Neustart von POPFile wirksam.
! Configuration_XMLRPCUpdate              Neuer XML-RPC Port: %s - Diese Änderung wird erst nach einem Neustart von POPFile wirksam.
! Configuration_XMLRPCPort                XML-RPC Port
! Configuration_SMTPPort                  SMTP Port
! Configuration_SMTPUpdate                Neuer SMPT Port: %s - Diese Änderung wird erst nach einem Neustart von POPFile wirksam.
! Configuration_NNTPPort                  NNTP Port
! Configuration_NNTPUpdate                Neuer NNTP Port: %s - Diese Änderung wird erst nach einem Neustart von POPFile wirksam.
! Configuration_POP3Separator             POP3 Server:Port:Benutzer Trennzeichen
! Configuration_NNTPSeparator             NNTP Server:Port:Benutzer Trennzeichen
! Configuration_POP3SepUpdate             Neues POP3 Trennzeichen: %s
! Configuration_NNTPSepUpdate             Neues NNTP Trennzeichen: %s
! Configuration_UI                        Web Port für Kontrollzentrum
! Configuration_UIUpdate                  Neuer Web Port für Kontrollzentrum: %s - Dieser Änderung wird erst nach einem Neustart von POPFile wirksam.
! Configuration_History                   Anzahl Nachrichten pro Seite
! Configuration_HistoryUpdate             Neue Anzahl Nachrichten pro Seite: %s
! Configuration_Days                      Nachrichten x Tage im Verlauf speichern
! Configuration_DaysUpdate                Nachrichten werden nun %s Tage im Verlauf gespeichert
! Configuration_UserInterface             Benutzeroberfläche
! Configuration_Skins                     Skins
! Configuration_SkinsChoose               Skin auswählen
! Configuration_Language                  Sprache
! Configuration_LanguageChoose            Sprache auswählen
! Configuration_ListenPorts               Moduleinstellungen
! Configuration_HistoryView               Verlaufsansicht
! Configuration_TCPTimeout                Verbindungstimeout
! Configuration_TCPTimeoutSecs            Verbindungstimeout in Sekunden
! Configuration_TCPTimeoutUpdate          Neuer Verbidungstimeout: %s
! Configuration_ClassificationInsertion   Einstufung anzeigen
! Configuration_SubjectLine               Betreff-Zeile ändern
! Configuration_XTCInsertion              X-Text-Classification einfügen
! Configuration_XPLInsertion              X-POPFile-Link einfügen
! Configuration_Logging                   Protokollierung
! Configuration_None                      Keine Ausgabe
! Configuration_ToScreen                  Auf den Bildschirm
! Configuration_ToFile                    In eine Datei
! Configuration_ToScreenFile              Bildschirm und Datei
! Configuration_LoggerOutput              Protokoll ausgeben
! Configuration_GeneralSkins              Skins
! Configuration_SmallSkins                kleine Skins
! Configuration_TinySkins                 sehr kleine Skins
! 
! Advanced_Error1                         '%s' ist bereits in der Liste der ignorierten Wörter
! Advanced_Error2                         Ignorierte Wörtern können nur alphanumerische, ., _, -, oder @ Zeichen enthalten
! Advanced_Error3                         '%s' zu den ignorierten Wörtern hinzugefügt
! Advanced_Error4                         '%s' ist nicht in der Liste der ignorierten Wörter
! Advanced_Error5                         '%s' von der Liste der ignorierten Wörter entfernt
! Advanced_StopWords                      Ignorierte Wörter
! Advanced_Message1                       POPFile ignoriert die folgenden, häufig verwendeten Wörter:
! Advanced_AddWord                        Wort hinzufügen
! Advanced_RemoveWord                     Wort löschen
! 
! History_Filter                          &nbsp;(zeige nur Kategorie <font color="%s">%s</font>)
! History_Search                          &nbsp;(gesuchter Absender/Betreff: %s)
! History_Title                           Letzte Nachrichten
! History_Jump                            zu Nachricht gehen
! History_ShowAll                         Alle anzeigen
! History_ShouldBe                        Sollte sein
! History_NoFrom                          kein Absender angegeben
! History_NoSubject                       kein Betreff
! History_ClassifyAs                      eingestuft als
! History_MagnetUsed                      Magnet benutzt
! History_ChangedTo                       Geändert: <font color="%s">%s
! History_Already                         Bereits neu eingestuft als <font color="%s">%s</font>
! History_RemoveAll                       Alle entfernen
! History_RemovePage                      Diese Seite entfernen
! History_Remove                          Um Einträge im Verlauf zu löschen, klicken Sie auf
! History_SearchMessage                   Nach Absender/Betreff suchen
! History_NoMessages                      keine Nachrichten
! History_ShowMagnet                      magnetisiert
! History_Magnet                          &nbsp;(zeige nur durch Magnet eingestufte Nachrichten)
! History_ResetSearch                     Zurücksetzen
! 
! Password_Title                          Paßwort
! Password_Enter                          Paßwort eingeben
! Password_Go                             Anmelden
! Password_Error1                         Falsches Paßwort
! 
! Security_Error1                         Der Port muß zwischen 1 und 65535 liegen.
! Security_Stealth                        Stealth Modus/Serverbetrieb
! Security_NoStealthMode                  Nein (Stealth Modus)
! Security_ExplainStats                   (Wenn Sie diese Funktion einschalten, sendet POPFile täglich die drei folgenden Werte an ein Skript auf www.usethesource.com: bc (Anzahl von Ihnen eingerichteter Kategorien), mc (Anzahl von POPFile eingestufter Nachrichten) und ec (Anzahl der Einstufungsfehler). Diese werden in einer Datei gespeichert und benutzt, um öffentliche Statistiken darüber zu erstellen, wie POPFile genutzt wird und wie gut es dabei funktioniert. Die Daten werden etwa 5 Tage auf dem Server gespeichert und dann gelöscht. Zuordnungen zwischen IP-Adressen und statistischen Daten werden nicht gespeichert.)
! Security_ExplainUpdate                  (Wenn Sie diese Funktion einschalten, sendet POPFile täglich die drei folgenden Werte an ein Skript auf www.usethesource.com: ma (die Hauptversionsnummer der POPFile-Installation), mi (die Nebenversionsnummer der POPFile-Installation) und bn (die build-Nummer der POPFile-Installation). POPFile erhält die Antwort in Form einer Grafik, die am Kopf einer Seite erscheint, wenn eine neue Version verfügbar ist. Die Daten werden etwa 5 Tage auf dem Server gespeichert und dann gelöscht. Zuordnungen zwischen IP-Adressen und statistischen Daten werden nicht gespeichert.)
! Security_PasswordTitle                  Paßwort für Benutzeroberfläche
! Security_Password                       Paßwort
! Security_PasswordUpdate                 Neues Paßwort: %s
! Security_AUTHTitle                      externe Server
! Security_SecureServer                   POP3 SPA/AUTH Server
! Security_SecureServerUpdate             Neuer POP3 SPA/AUTH Server: %s - Diese Änderung wird erst nach einem Neustart von POPFile wirksam.
! Security_SecurePort                     POP3 SPA/AUTH Port
! Security_SecurePortUpdate               Neuer POP3 SPA/AUTH Port %s - Diese Änderung wird erst nach einem Neustart von POPFile wirksam.
! Security_SMTPServer                     externer SMTP Server
! Security_SMTPServerUpdate               Neuer externer SMTP Server: %s - Diese Änderung wird erst nach einem Neustart von POPFile wirksam.
! Security_SMTPPort                       externer SMTP port
! Security_SMTPPortUpdate                 Neuer externer SMTP Port: %s - Diese Änderung wird erst nach einem Neustart von POPFile wirksam.
! Security_POP3                           POP3 Verbindungen von fremden Rechnern erlauben (erfordert Neustart von POPFile)
! Security_SMTP                           SMTP Verbindungen von fremden Rechnern erlauben (erfordert Neustart von POPFILE)
! Security_NNTP                           NNTP Verbindungen von fremden Rechnern erlauben (erfordert Neustart von POPFile)
! Security_UI                             HTTP (Benutzeroberfläche) Verbindungen von fremden Rechnern erlauben (erfordert Neustart von POPFile)
! Security_XMLRPC                         XML-RPC Verbindungen von fremden Rechnern erlauben (erfordert Neustart von POPFile)
! Security_UpdateTitle                    Automatisch auf Updates prüfen
! Security_Update                         Täglich nach POPFile Updates suchen
! Security_StatsTitle                     Statistik Report
! Security_Stats                          Täglich Statistiken senden
! 
! Magnet_Error1                           Magnet '%s' existiert bereits in Kategorie '%s'
! Magnet_Error2                           Neuer Magnet '%s' kollidiert mit Magnet '%s' in Kategorie '%s' und könnte unklare Ergebnisse verursachen. Magnet wurde nicht unzugefügt.
! Magnet_Error3                           Erstelle neuen Magnet '%s' in Kategorie '%s'
! Magnet_CurrentMagnets                   Aktuelle Magnete
! Magnet_Message1                         Die folgenden Magnete ordnen neue Post zwingend in eine angegebene Kategorie ein.
! Magnet_CreateNew                        Neuen Magnet erstellen
! Magnet_Explanation                      Drei Typen von Magneten sind verfügbar: <ul><li>Absenderadresse oder -name:</b> z.B.: ha...@fi..., um eine bestimmte Adresse zu erfassen, <br />firma.de, um jeden zu erfassen, der von firma.de sendet, <br />Hans Mustermann, um eine bestimmte Person zu erfassen; Hans erfaßt jeden Hans</li><li><b>Empfängeradresse oder -name:</b> Wie beim Absender-Magnet nur für die Empfängeradresse der Nachricht.</li><li><b>Wörter im Betreff:</b> z.B.: "Hallo", um alle Nachrichten mit "Hallo" im Betreff zu erfassen</li></ul>
! Magnet_MagnetType                       Typ des Magnets
! Magnet_Value                            Wert
! Magnet_Always                           Immer dieser Kategorie zuordnen
! 
! Bucket_Error1                           Kategorienamen können nur Kleinbuchstaben von a bis z, - oder _ enthalten
! Bucket_Error2                           Kategoriename %s existiert bereits
! Bucket_Error3                           Kategorie %s erstellt
! Bucket_Error4                           Bitte geben Sie ein nicht-leeres Wort ein
! Bucket_Error5                           Kategorie %s in %s umbenannt
! Bucket_Error6                           Kategorie %s gelöscht
! Bucket_Title                            Zusammenfassung
! Bucket_BucketName                       Kategoriename
! Bucket_WordCount                        Wortanzahl
! Bucket_WordCounts                       Wortanzahl
! Bucket_UniqueWords                      verschiedene Wörter
! Bucket_SubjectModification              Betreff ändern
! Bucket_ChangeColor                      Farbe ändern
! Bucket_NotEnoughData                    Nicht genügend Daten
! Bucket_ClassificationAccuracy           Genauigkeit
! Bucket_EmailsClassified                 Nachrichten klassifiziert
! Bucket_EmailsClassifiedUpper            Nachrichten klassifiziert
! Bucket_ClassificationErrors             Einstufungsfehler
! Bucket_Accuracy                         Genauigkeit
! Bucket_ClassificationCount              Anzahl Einstufungen
! Bucket_ResetStatistics                  Statistiken zurücksetzen
! Bucket_LastReset                        Läuft seit
! Bucket_CurrentColor                     Derzeitige Farbe von %s ist %s
! Bucket_SetColorTo                       Setze Farbe von %s auf %s
! Bucket_Maintenance                      Verwaltung
! Bucket_CreateBucket                     Erstelle Kategorie
! Bucket_DeleteBucket                     Lösche Kategorie
! Bucket_RenameBucket                     Benenne Kategorie um
! Bucket_Lookup                           Nachschlagen
! Bucket_LookupMessage                    Wort in Kategorie nachschlagen
! Bucket_LookupMessage2                   Ergebnis für
! Bucket_LookupMostLikely                 <b>%s</b> erscheint am wahrscheinlichsten in <font color="%s">%s</font>
! Bucket_DoesNotAppear                    <p><b>%s</b> erscheint in keiner Kategorie
! Bucket_DisabledGlobally                 Global deaktiviert
! Bucket_To                               in
! Bucket_Quarantine                       Quarantäne
! 
! SingleBucket_Title                      Details für %s
! SingleBucket_WordCount                  Anzahl Worte in dieser Kategorie
! SingleBucket_TotalWordCount             Anzahl Worte insgesamt
! SingleBucket_Percentage                 Anteil an der Gesamtzahl
! SingleBucket_WordTable                  Worttabelle für %s
! SingleBucket_Message1                   Klicken Sie auf einen Buchstaben, um eine Liste der Wörter aufzurufen, die mit diesem beginnen. Klicken Sie auf ein beliebiges Wort, um die Wahrscheinlichkeit seines Erscheinens für alle Kategorien anzusehen.
! SingleBucket_Unique                     %s verschiedene
! 
! Session_Title                           POPFile Sitzung abgelaufen
! Session_Error                           Ihre POPFile-Sitzung ist abgelaufen. Dies könnte dadurch verursacht worden sein, daß Sie POPFile neu gestartet haben, das Kontrollzentrum aber noch im Browser geöffnet war. Bitte klicken Sie auf einen der oben angezeigten Verweise, um mit der Benutzung von POPFile weitermachen zu können.
! 
! Header_MenuSummary                      Diese Tabelle ist das Navigationsmenü, das Zugang zu den einzelnen Bereichen des Kontrollzentrums bietet.
! History_MainTableSummary                Diese Tabelle zeigt Absender und Betreff der letzten empfangenen Nachrichten an und ermöglicht es, diese durchzusehen und zu reklassifizieren. Ein Klick auf den Betreff zeigt die vollständige Nachricht an sowie Details, warum diese so und nicht anders klassifiziert wurde. Die Spalte "Sollte sein" ermöglicht es, anzugeben, in welche Kategorie die Nachricht gehört bzw. entsprechende Änderungen rückgängig zu machen. Die Spalte "Delete" ermöglicht es, einzelne Nachrichten aus dem Verlauf zu löschen, falls Sie diese nicht mehr benötigen.
! History_OpenMessageSummary              Diese Tabelle enthält den kompletten Text einer Nachricht. Die Wörter sind entsprechend der Kategorie eingefärbt, in die sie am wahrscheinlichsten passen.
! Bucket_MainTableSummary                 Diese Tabelle bietet einen Überblick über die einzelnen Kategorien. Jede Reihe zeigt Name, Gesamtzahl der Wörter und die Anzahl verschiedener Wörter pro Kategorie an, ob die Betreff-Zeile der Nachricht bei der Klassifizierung geändert wird, ob die Nachrichten dieser Kategorie in Quarantäne gestellt werden sollen, sowie eine Tabelle zur Auswahl einer Farbe, in der alle zu dieser Kategorie gehörenden Elemente im Kontrollzentrum dargestellt werden sollen.
! Bucket_StatisticsTableSummary           Diese Tabelle zeigt drei verschiedene Statistiken bezüglich POPFiles Gesamtleistung an. Die erste: Wie fehlerfrei ist die Einordnung in die entsprechenden Kategorien? Die zweite: Wie viele Nachrichten wurden analysiert und wie wurden sie eingeordnet? Die dritte: Wie viele Wörter gehören zu jeder Kategorie und wie hoch ist der Prozentsatz zur Gesamtzahl?
! Bucket_MaintenanceTableSummary          Diese Tabelle enthält Formulare zum Erstellen, Löschen und Umbenennen von Kategorien und um die relative Wahrscheinlichkeit der Wörter in jeder einzelnen Kategorie nachzuschlagen. 
! Bucket_AccuracyChartSummary             Diese Tabelle stellt die Genauigkeit der Nachrichten-Sortierung grafisch dar.
! Bucket_BarChartSummary                  Diese Tabelle stellt einen Prozentanteil grafisch dar. Sie wird sowohl für die Anzahl der eingestuften Nachrichten als auch für die Gesamtzahl der Wörter genutzt.
! Bucket_LookupResultsSummary             Diese Tabelle stellt die Wahrscheinlichkeiten bezüglich jedes angegebenen Wortes dar. Für jede Kategorie wird folgendes angezeigt: Die Häufigkeit, mit der das Wort auftritt, die Wahrscheinlichkeit, daß es in dieser Kategorie auftritt und die Auswirkungen auf die Punktzahl der Kategorie insgesamt, falls das Wort in einer Nachricht auftaucht.
! Bucket_WordListTableSummary             Diese Tabelle bietet eine Liste aller Wörter einer bestimmten Kategorie - reihenweise sortiert nach dem ersten Buchstaben.
! Magnet_MainTableSummary                 Diese Tabelle zeigt eine Liste der Magnete an, die dazu benutzt werden, um Nachrichten automatisch nach festen Kriterien zu sortieren. Jede Reihe zeigt an, wie der Magnet definiert ist, in welche Kategorie er einsortiert und eine Schaltfläche, um den Magnet zu löschen.
! Configuration_MainTableSummary          Diese Tabelle enthält einige Formulare zur Konfiguration von POPFile.
! Configuration_InsertionTableSummary     Diese Tabelle enthält Schaltflächen zur Konfiguration, ob bestimmte Änderungen an Kopfzeilen oder Betreff der Nachricht gemacht werden sollen, bevor diese an das entsprechende Programm weitergegeben wird.
! Security_MainTableSummary               Diese Tabelle bietet Einstellungsmöglichkeiten, die die Sicherheit von POPFile insgesamt betreffen, ob es automatisch auf neue Versionen prüfen soll oder ob Statistiken über die Leistung von POPFile an eine zentrale Datenbank zwecks der Erstellung von Gesamtstatistiken geschickt werden sollen.
! Advanced_MainTableSummary               Diese Tabelle enthält eine Liste von Wörtern, die POPFile ignoriert, wenn es eine Nachricht analysiert. Dies betrifft Wörter, die besonders häufig in Nachrichten auftauchen. Diese sind reihenweise alphabetisch nach dem ersten Buchstaben sortiert.
! 

[popfile-commit] engine/UI HTML.pm,1.130,1.131

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

Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv5899/UI

Modified Files:
	HTML.pm 
Log Message:
Prevent negative values in the Accuracy

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.130
retrieving revision 1.131
diff -C2 -d -r1.130 -r1.131
*** HTML.pm	15 Apr 2003 21:20:18 -0000	1.130
--- HTML.pm	15 Apr 2003 21:22:02 -0000	1.131
***************
*** 1672,1676 ****
      my $accuracy = $self->{language__}{Bucket_NotEnoughData};
      my $percent = 0;
!     if ( $self->global_config_( 'mcount' ) > 0 )  {
          $percent = int( 10000 * ( $self->global_config_( 'mcount' ) - $self->global_config_( 'ecount' ) ) / $self->global_config_( 'mcount' ) ) / 100;
          $accuracy = "$percent%";
--- 1672,1676 ----
      my $accuracy = $self->{language__}{Bucket_NotEnoughData};
      my $percent = 0;
!     if ( $self->global_config_( 'mcount' ) > $self->global_config_( 'ecount' ) )  {
          $percent = int( 10000 * ( $self->global_config_( 'mcount' ) - $self->global_config_( 'ecount' ) ) / $self->global_config_( 'mcount' ) ) / 100;
          $accuracy = "$percent%";

[popfile-commit] engine/UI HTML.pm,1.129,1.130

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

Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv4822/UI

Modified Files:
	HTML.pm 
Log Message:
Finished working on false positive/negative counting

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.129
retrieving revision 1.130
diff -C2 -d -r1.129 -r1.130
*** HTML.pm	15 Apr 2003 13:32:35 -0000	1.129
--- HTML.pm	15 Apr 2003 21:20:18 -0000	1.130
***************
*** 1503,1509 ****
          for my $bucket ($self->{classifier__}->get_buckets()) {
              $self->{classifier__}->set_bucket_parameter( $bucket, 'count', 0 );
          }
          $self->{classifier__}->write_parameters();
!         $self->config_( 'last_reset', localtime );
          $self->{configuration__}->save_configuration();
      }
--- 1503,1512 ----
          for my $bucket ($self->{classifier__}->get_buckets()) {
              $self->{classifier__}->set_bucket_parameter( $bucket, 'count', 0 );
+             $self->{classifier__}->set_bucket_parameter( $bucket, 'fpcount', 0 );
+             $self->{classifier__}->set_bucket_parameter( $bucket, 'fncount', 0 );
          }
          $self->{classifier__}->write_parameters();
!         my $lasttime = localtime;
!         $self->config_( 'last_reset', $lasttime );
          $self->{configuration__}->save_configuration();
      }
***************
*** 2375,2392 ****
              if ( !$reclassified ) {
                  $self->{classifier__}->add_message_to_bucket( $self->global_config_( 'msgdir' ) . $mail_file, $newbucket );
-                 $self->global_config_( 'ecount', $self->global_config_( 'ecount' ) + 1 ) if ( $newbucket ne $bucket );
  
                  $self->log_( "Reclassifying $mail_file from $bucket to $newbucket" );
  
                  if ( $bucket ne $newbucket ) {
!                     $self->{classifier__}->set_bucket_parameter( $newbucket, 'count',
!                     $self->{classifier__}->get_bucket_parameter( $newbucket, 'count' ) + 1 );
!                     $self->{classifier__}->set_bucket_parameter( $bucket, 'count',
!                     $self->{classifier__}->get_bucket_parameter( $bucket, 'count' ) - 1 );
  
!                     $self->{classifier__}->set_bucket_parameter( $newbucket, 'fncount',
!                     $self->{classifier__}->get_bucket_parameter( $newbucket, 'fncount' ) + 1 );
!                     $self->{classifier__}->set_bucket_parameter( $bucket, 'fpcount',
!                     $self->{classifier__}->get_bucket_parameter( $bucket, 'fpcount' ) + 1 );
  		}
  
--- 2378,2401 ----
              if ( !$reclassified ) {
                  $self->{classifier__}->add_message_to_bucket( $self->global_config_( 'msgdir' ) . $mail_file, $newbucket );
  
                  $self->log_( "Reclassifying $mail_file from $bucket to $newbucket" );
  
                  if ( $bucket ne $newbucket ) {
!                     my $ecount = $self->global_config_( 'ecount' ) + 1;
!                     $self->global_config_( 'ecount', $ecount );
  
!                     my $count = $self->{classifier__}->get_bucket_parameter( $newbucket, 'count' );
!                     $self->{classifier__}->set_bucket_parameter( $newbucket, 'count', $count+1 );
! 
!                     $count = $self->{classifier__}->get_bucket_parameter( $bucket, 'count' );
!                     $count -= 1;
!                     $count = 0 if ( $count < 0 ) ;
!                     $self->{classifier__}->set_bucket_parameter( $bucket, 'count', $count );
! 
!                     my $fncount = $self->{classifier__}->get_bucket_parameter( $newbucket, 'fncount' );
!                     $self->{classifier__}->set_bucket_parameter( $newbucket, 'fncount', $fncount+1 );
! 
!                     my $fpcount = $self->{classifier__}->get_bucket_parameter( $bucket, 'fpcount' );
!                     $self->{classifier__}->set_bucket_parameter( $bucket, 'fpcount', $fpcount+1 );
  		}
  
***************
*** 2438,2453 ****
  
                  if ( $bucket ne $usedtobe ) {
!                     $self->global_config_( 'ecount', $self->global_config_( 'ecount' ) - 1 ) if ( $self->global_config_( 'ecount' ) > 0 );
  
!                     $self->{classifier__}->set_bucket_parameter( $bucket, 'count',
!                     $self->{classifier__}->get_bucket_parameter( $bucket, 'count' ) - 1 );
!                     $self->{classifier__}->set_bucket_parameter( $usedtobe, 'count',
!                     $self->{classifier__}->get_bucket_parameter( $usedtobe, 'count' ) + 1 );
  
!                     $self->{classifier__}->set_bucket_parameter( $bucket, 'fncount',
!                     $self->{classifier__}->get_bucket_parameter( $bucket, 'fncount' ) - 1 );
!                     $self->{classifier__}->set_bucket_parameter( $usedtobe, 'fpcount',
!                     $self->{classifier__}->get_bucket_parameter( $usedtobe, 'fpcount' ) - 1 );
!                 }
  
                  # Since we have just changed the classification of this file and it has
--- 2447,2469 ----
  
                  if ( $bucket ne $usedtobe ) {
!                     my $ecount = $self->global_config_( 'ecount' ) - 1;
!                     $ecount = 0 if ( $ecount < 0 );
!                     $self->global_config_( 'ecount', $ecount );
  
!                     my $count = $self->{classifier__}->get_bucket_parameter( $bucket, 'count' ) - 1;
!                     $count = 0 if ( $count < 0 );
!                     $self->{classifier__}->set_bucket_parameter( $bucket, 'count', $count );
  
! 		    $count = $self->{classifier__}->get_bucket_parameter( $usedtobe, 'count' ) + 1;
!                     $self->{classifier__}->set_bucket_parameter( $usedtobe, 'count', $count );
! 
!                     my $fncount = $self->{classifier__}->get_bucket_parameter( $bucket, 'fncount' ) - 1;
!                     $fncount = 0 if ( $fncount < 0 );
!                     $self->{classifier__}->set_bucket_parameter( $bucket, 'fncount', $fncount );
! 
!                     my $fpcount = $self->{classifier__}->get_bucket_parameter( $usedtobe, 'fpcount' ) - 1;
!                     $fpcount = 0 if ( $fpcount < 0 );
!                     $self->{classifier__}->set_bucket_parameter( $usedtobe, 'fpcount', $fpcount );
! 		}
  
                  # Since we have just changed the classification of this file and it has
***************
*** 2706,2710 ****
          # they will come back in the right order
  
!         foreach my $header (undef, 'from', 'subject', 'bucket') {
              $body .= "<th class=\"historyLabel\" scope=\"col\">\n";
              $body .= "<a href=\"/history?session=$self->{session_key__}&amp;filter=$self->{form_}{filter}&amp;setsort=" . ($self->{form_}{sort} eq "$header"?"-":"");
--- 2722,2726 ----
          # they will come back in the right order
  
!         foreach my $header ('', 'from', 'subject', 'bucket') {
              $body .= "<th class=\"historyLabel\" scope=\"col\">\n";
              $body .= "<a href=\"/history?session=$self->{session_key__}&amp;filter=$self->{form_}{filter}&amp;setsort=" . ($self->{form_}{sort} eq "$header"?"-":"");