popfile-commit — CVS commit list messages

[popfile-commit] windows/languages Danish-mui.nsh,NONE,1.1 Danish-pfi.nsh,NONE,1.1

[<xue...@us...>]

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

Added Files:
	Danish-mui.nsh Danish-pfi.nsh 
Log Message:
"Danish" language files for the multi-language version of the installer/uninstaller.

--- NEW FILE: Danish-mui.nsh ---
#--------------------------------------------------------------------------
# Danish-mui.nsh
#
# This file contains additional "Danish" text strings used by the Windows installer
# for POPFile (these strings are customised versions of strings provided by NSIS).
#
# See 'Danish-pfi.nsh' for the strings which are used on the custom pages.
#
# These strings are grouped according to the page/window where they are used
#
# Copyright (c) 2001-2003 John Graham-Cumming
#
#--------------------------------------------------------------------------

#--------------------------------------------------------------------------
# Standard MUI Page - Welcome
#
# The sequence \r\n\r\n inserts a blank line (note that the MUI_TEXT_WELCOME_INFO_TEXT string
# should end with a \r\n\r\n sequence because another paragraph follows this string).
#--------------------------------------------------------------------------

!insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT \
"Dette vil installere POPFile på din computer.\r\n\r\ndet foretrækkes at du lukker alle kørende programmer inden start af guiden.\r\n\r\n"

#--------------------------------------------------------------------------
# Standard MUI Page - License Agreement
#--------------------------------------------------------------------------

; As of 27 June2003, the NSIS MUI language file is not compatible with MUI 1.65
; (this is temporary (and crude) patch to allow installer to support the Danish language)

!insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX \
"hvis du accepterer alle reglerne, klik Jeg accepterer for at komme videre. Du skal acceptere reglerne for at komme videre POPFile."

!insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS \
"hvis du accepterer alle reglerne, klik Jeg accepterer for at komme videre. Du skal acceptere reglerne for at komme videre POPFile."

#--------------------------------------------------------------------------
# Standard MUI Page - Finish
#
# The MUI_TEXT_FINISH_RUN text should be a short phrase (not a long paragraph)
#--------------------------------------------------------------------------

!insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_RUN \
"POPFile Kontrolcenter"

#--------------------------------------------------------------------------
# End of 'Danish-mui.nsh'
#--------------------------------------------------------------------------

--- NEW FILE: Danish-pfi.nsh ---
#--------------------------------------------------------------------------
# Danish-pfi.nsh
#
# This file contains additional "Danish" text strings used by the Windows installer
# for POPFile (these strings are unique to POPFile).
#
# See 'Danish-mui.nsh' for the strings which modify standard NSIS MUI messages.
#
# These strings are grouped according to the page/window where they are used
#
# Copyright (c) 2001-2003 John Graham-Cumming
#
#--------------------------------------------------------------------------
# String Formatting (applies to _IO_ text used for custom pages):
#
#   (1) The sequence  \r\n      inserts a newline
#   (2) The sequence  \r\n\r\n  inserts a blank line
#
# (the 'PFI_LANG_CBP_IO_INTRO' string in 'Custom Page - POPFile Classification Bucket Creation'
#  shows how the \r\n\r\n sequence is used)
#--------------------------------------------------------------------------

#--------------------------------------------------------------------------
# Mark the start of the language data
#--------------------------------------------------------------------------

!define PFI_LANG  "DANISH"

#--------------------------------------------------------------------------
# Startup message box offering to display the Release Notes
#--------------------------------------------------------------------------

!insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_1        "Display POPFile Release Notes ?"
!insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_2        "'Yes' recommended if you are upgrading POPFile (you may need to backup BEFORE upgrading)"

#--------------------------------------------------------------------------
# Standard MUI Page - Choose Components
#--------------------------------------------------------------------------

!insertmacro PFI_LANG_STRING DESC_SecPOPFile              "Installs the core files needed by POPFile, including a minimal version of Perl."
!insertmacro PFI_LANG_STRING DESC_SecSkins                "Installs POPFile skins that allow you to change the look and feel of the POPFile user interface."
!insertmacro PFI_LANG_STRING DESC_SecLangs                "Installs non-English language versions of the POPFile UI."

#--------------------------------------------------------------------------
# Custom Page - POPFile Installation Options
#--------------------------------------------------------------------------

; Page Title and Sub-title displayed in the page header

!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_TITLE       "POPFile Installation Options"
!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_SUBTITLE    "Leave these options unchanged unless you need to change them"

; Text strings displayed on the custom page

!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_POP3     "Choose the default port number for POP3 connections (110 recommended)"
!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_GUI      "Choose the default port number for 'User Interface' connections (8080 recommended)"
!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP  "Run POPFile automatically when Windows starts (runs in background, no window seen)"
!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_WARNING  "IMPORTANT WARNING"
!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_MESSAGE  "IF UPGRADING POPFILE --- INSTALLER WILL SHUTDOWN THE EXISTING VERSION"

; Message Boxes used when validating user's selections

!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1    "The POP3 port cannot be set to"
!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2    "The port must be a number in the range 1 to 65535."
!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_3    "Please change your POP3 port selection."

!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_1     "The 'User Interface' port cannot be set to"
!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_2     "The port must be a number in the range 1 to 65535."
!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_3     "Please change your 'User Interface' port selection."

!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1    "The POP3 port must be different from the 'User Interface' port."
!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2    "Please change your port selections."

#--------------------------------------------------------------------------
# Standard MUI Page - Installing POPfile
#--------------------------------------------------------------------------

; Installation Progress Reports displayed above the progress bar

!insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_UPGRADE   "Checking if this is an upgrade installation..."
!insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_CORE      "Installing POPFile core files..."
!insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_PERL      "Installing minimal Perl files..."
!insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_SHORT     "Creating POPFile shortcuts..."
!insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_SKINS     "Installing POPFile skin files..."
!insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_LANGS     "Installing POPFile UI language files..."
!insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC    "Tryk næste for at fortsætte"

; Installation Log Messages

!insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_1          "Shutting down previous version of POPFile using port"

; Message Box text strings

!insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_1          "file from previous installation found."
!insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_2          "OK to update this file ?"
!insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_3          "Click 'Yes' to update it (old file will be saved as"
!insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_4          "Click 'No' to keep the old file (new file will saved as"

!insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_1           "Backup copy of"
!insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_2           "already exists"
!insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_3           "OK to overwrite this file?"
!insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_4           "Click 'Yes' to overwrite, click 'No' to skip making a backup copy"

#--------------------------------------------------------------------------
# Custom Page - POPFile Classification Bucket Creation
#--------------------------------------------------------------------------

; Page Title and Sub-title displayed in the page header

!insertmacro PFI_LANG_STRING PFI_LANG_CBP_TITLE           "POPFile Classification Bucket Creation"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_SUBTITLE        "POPFile needs AT LEAST TWO buckets in order to be able to classify your email"

; Text strings displayed on the custom page

!insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_INTRO        "After installation, POPFile makes it easy to change the number of buckets (and their names) to suit your needs.\r\n\r\nBucket names must be single words, using lowercase letters, digits 0 to 9, hyphens and underscores."
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CREATE       "Create a new bucket by either selecting a name from the list below or typing a name of your own choice in the box below."
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_DELETE       "To delete one or more buckets from the list, tick the relevant 'Remove' box(es) then click the 'Continue' button."
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_LISTHDR      "Buckets to be used by POPFile"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_REMOVE       "Fjern"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CONTINUE     "Fortsætte"

; Text strings used for status messages under the bucket list

!insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_1        "There is no need to add more buckets"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_2        "You must define AT LEAST TWO buckets"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_3        "At least one more bucket is required"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_4        "Installer cannot create more than"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_5        "buckets"

; Message box text strings

!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_1      "A bucket called"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_2      "has already been defined."
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_3      "Please choose a different name for the new bucket."

!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_1      "The installer can only create up to"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_2      "buckets."
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_3      "Once POPFile has been installed you can create more than"

!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_1      "The name"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_2      "is not a valid name for a bucket."
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_3      "Spandenes navne kan kun indholde bogstaverne a til z med små bogstaver, samt - og _"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_4      "Please choose a different name for the new bucket."

!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_1     "POPFile requires AT LEAST TWO buckets before it can classify your email."
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_2     "Please enter the name of a bucket to be created, either by picking a suggested name from the drop-down list or by typing in a name of your own choice."
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3     "You must define AT LEAST TWO buckets before continuing with the installation of POPFile."

!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_1        "buckets have been defined for use by POPFile."
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_2        "Do you want to configure POPFile to use these buckets?"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_3        "Click 'No' if you wish to change your bucket selections."

!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_1      "The installer was unable to create"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_2      "of the"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_3      "buckets you selected."
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_4      "Once POPFile has been installed you can use its 'User Interface' control panel to create the missing bucket(s)."

#--------------------------------------------------------------------------
# Custom Page - Reconfigure Outlook Express
#--------------------------------------------------------------------------

; Page Title and Sub-title displayed in the page header

!insertmacro PFI_LANG_STRING PFI_LANG_OECFG_TITLE         "Reconfigure Outlook Express"
!insertmacro PFI_LANG_STRING PFI_LANG_OECFG_SUBTITLE      "POPFile can reconfigure Outlook Express for you"

; Text displayed on the custom page

!insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_INTRO      "POPFile has detected the following Outlook Express email account and can automatically configure it to work with POPFile"
!insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_CHECKBOX   "Reconfigure this account to work with POPFile"
!insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_EMAIL      "Email address:"
!insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_SERVER     "POP3 server:"
!insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_USERNAME   "POP3 username:"
!insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_RESTORE    "If you uninstall POPFile the original settings will be restored"

!insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_LINK_1     "account for the"
!insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_LINK_2     "identity"

#--------------------------------------------------------------------------
# Custom Page - POPFile can now be started
#--------------------------------------------------------------------------

; Page Title and Sub-title displayed in the page header

!insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_TITLE        "POPFile can now be started"
!insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_SUBTITLE     "The POPFile User Interface only works if POPFile has been started"

; Text displayed on the custom page

!insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_INTRO     "Start POPFile now ?"
!insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NO        "No (the 'User Interface' cannot be used if POPFile is not started)"
!insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_DOSBOX    "Run POPFile (in a window)"
!insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_BCKGRND   "Run POPFile in background (no window displayed)"
!insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_1    "Once POPFile has been started, you can display the POPFile 'User Interface' by"
!insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_2    "(a) double-clicking the POPFile icon in the system tray,   OR"
!insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_3    "(b) using Start --> Programs --> POPFile --> POPFile User Interface."

; Banner message displayed whilst waiting for POPFile to start

!insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_1     "Preparing to start POPFile."
!insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_2     "This may take a few seconds..."

#--------------------------------------------------------------------------
# Standard MUI Page - Uninstall POPFile
#--------------------------------------------------------------------------

; Uninstall Progress Reports displayed above the progress bar

!insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_1        "Shutting down POPFile..."
!insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_2        "Deleting 'Start Menu' entries for POPFile..."
!insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_3        "Deleting POPFile core files..."
!insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_4        "Restoring Outlook Express settings..."
!insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_5        "Deleting POPFile skins files..."
!insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_6        "Deleting minimal Perl files..."

; Uninstall Log Messages

!insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_1             "Shutting down POPFile using port"
!insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_2             "Opened"
!insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_3             "Restored"
!insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_4             "Closed"
!insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_5             "Removing all files from POPFile directory"
!insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_6             "Note: unable to remove all files from POPFile directory"

; Message Box text strings

!insertmacro PFI_LANG_UNSTRING PFI_LANG_MBNOTFOUND_1      "It does not appear that POPFile is installed in the directory"
!insertmacro PFI_LANG_UNSTRING PFI_LANG_MBNOTFOUND_2      "Continue anyway (not recommended) ?"
!insertmacro PFI_LANG_UNSTRING PFI_LANG_ABORT_1           "Uninstall aborted by user"
!insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMDIR_1        "Do you want to remove all files in your POPFile directory? (If you have anything you created that you want to keep, click No)"
!insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMERR_1        "Note"
!insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMERR_2        "could not be removed."

#--------------------------------------------------------------------------
# Mark the end of the language data
#--------------------------------------------------------------------------

!undef PFI_LANG

#--------------------------------------------------------------------------
# End of 'Danish-pfi.nsh'
#--------------------------------------------------------------------------

[popfile-commit] engine/Classifier Bayes.pm,1.107.2.9,1.107.2.10

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

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

Modified Files:
      Tag: v0/18/1
	Bayes.pm 
Log Message:
fix case where it was possible for messages to terminate without CRLF.CRLF (my fault)

Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.107.2.9
retrieving revision 1.107.2.10
diff -C2 -d -r1.107.2.9 -r1.107.2.10
*** Bayes.pm	22 Jun 2003 23:15:32 -0000	1.107.2.9
--- Bayes.pm	2 Jul 2003 09:52:07 -0000	1.107.2.10
***************
*** 350,354 ****
          if ( open COLOR, "<$bucket/color" ) {
              $color = <COLOR>;
!             
              # Someone (who shall remain nameless) went in an manually created
              # empty color files in their corpus directories which would cause
--- 350,354 ----
          if ( open COLOR, "<$bucket/color" ) {
              $color = <COLOR>;
! 
              # Someone (who shall remain nameless) went in an manually created
              # empty color files in their corpus directories which would cause
***************
*** 357,361 ****
              # with that user and to make POPFile a little safer which is always
              # a good thing
!             
              if ( !defined( $color ) ) {
                  $color = '';
--- 357,361 ----
              # with that user and to make POPFile a little safer which is always
              # a good thing
! 
              if ( !defined( $color ) ) {
                  $color = '';
***************
*** 387,392 ****
  
      # unclassified will always have the color black, note that unclassified is not
!     # actually a bucket 
!     
      $self->{colors}{unclassified} = 'black';
  
--- 387,392 ----
  
      # unclassified will always have the color black, note that unclassified is not
!     # actually a bucket
! 
      $self->{colors}{unclassified} = 'black';
  
***************
*** 398,402 ****
  
      $self->{parameters}{unclassified}{quarantine} = 0;
!     
      print "Corpus loaded with $self->{full_total} entries\n" if $self->{debug};
  }
--- 398,402 ----
  
      $self->{parameters}{unclassified}{quarantine} = 0;
! 
      print "Corpus loaded with $self->{full_total} entries\n" if $self->{debug};
  }
***************
*** 440,444 ****
          $self->write_parameters();
      }
!     
  
      # See if there are magnets defined
--- 440,444 ----
          $self->write_parameters();
      }
! 
  
      # See if there are magnets defined
***************
*** 764,768 ****
  
      $echo = 1 unless (defined $echo);
!         
      my $msg_subject     = '';     # The message subject
      my $msg_head_before = '';     # Store the message headers that come before Subject here
--- 764,768 ----
  
      $echo = 1 unless (defined $echo);
! 
      my $msg_subject     = '';     # The message subject
      my $msg_head_before = '';     # Store the message headers that come before Subject here
***************
*** 804,811 ****
          $line = $_;
  
!         # This is done so that we remove the network style end of line CR LF 
          # and allow Perl to decide on the local system EOL which it will expand
          # out of \n when this gets written to the temp file
!         
          $fileline = $line;
          $fileline =~ s/[\r\n]//g;
--- 804,811 ----
          $line = $_;
  
!         # This is done so that we remove the network style end of line CR LF
          # and allow Perl to decide on the local system EOL which it will expand
          # out of \n when this gets written to the temp file
! 
          $fileline = $line;
          $fileline =~ s/[\r\n]//g;
***************
*** 828,840 ****
              # Kill header lines containing only whitespace (Exim does this)
  
!             next if ( $line =~ /^[ \t]+(\r\n|\r|\n)$/i ); 
  
              if ( !( $line =~ /^(\r\n|\r|\n)$/i ) )  {
                  $message_size += length $line;
                  print TEMP $fileline;
-                 
-                 # If there is no echoing occuring, it doesn't matter what we do to these 
  
!                 if ($echo) { 
                      if ( $line =~ /^Subject:(.*)/i )  {
                          $msg_subject = $1;
--- 828,840 ----
              # Kill header lines containing only whitespace (Exim does this)
  
!             next if ( $line =~ /^[ \t]+(\r\n|\r|\n)$/i );
  
              if ( !( $line =~ /^(\r\n|\r|\n)$/i ) )  {
                  $message_size += length $line;
                  print TEMP $fileline;
  
!                 # If there is no echoing occuring, it doesn't matter what we do to these
! 
!                 if ($echo) {
                      if ( $line =~ /^Subject:(.*)/i )  {
                          $msg_subject = $1;
***************
*** 845,849 ****
                      # Strip out the X-Text-Classification header that is in an incoming message
                      next if ( $line =~ /^X-Text-Classification:/i );
!                     
                      if ( $line =~ /(^[ \t])|([:])/ ) {
                          if ( $msg_subject eq '' )  {
--- 845,849 ----
                      # Strip out the X-Text-Classification header that is in an incoming message
                      next if ( $line =~ /^X-Text-Classification:/i );
! 
                      if ( $line =~ /(^[ \t])|([:])/ ) {
                          if ( $msg_subject eq '' )  {
***************
*** 857,861 ****
  
                          $msg_head_q .= $line;
!                     }                    
                  }
              } else {
--- 857,861 ----
  
                          $msg_head_q .= $line;
!                     }
                  }
              } else {
***************
*** 885,894 ****
      # an email of that type
      $classification = ($class ne '')?$class:$self->classify_file($temp_file);
!         
      # Add the Subject line modification or the original line back again
      if ( $classification ne 'unclassified' ) {
          if ( $self->{configuration}->{configuration}{subject} ) {
              # Don't add the classification unless it is not present
!             if ( !( $msg_subject =~ /\[\Q$classification\E\]/ ) && 
                   ( $self->{parameters}{$classification}{subject} == 1 ) &&
                   ( $self->{parameters}{$classification}{quarantine} == 0 ) )  {
--- 885,894 ----
      # an email of that type
      $classification = ($class ne '')?$class:$self->classify_file($temp_file);
! 
      # Add the Subject line modification or the original line back again
      if ( $classification ne 'unclassified' ) {
          if ( $self->{configuration}->{configuration}{subject} ) {
              # Don't add the classification unless it is not present
!             if ( !( $msg_subject =~ /\[\Q$classification\E\]/ ) &&
                   ( $self->{parameters}{$classification}{subject} == 1 ) &&
                   ( $self->{parameters}{$classification}{quarantine} == 0 ) )  {
***************
*** 938,942 ****
                  if ( $self->{configuration}->{configuration}{subject} ) {
                      # Don't add the classification unless it is not present
!                     if ( !( $msg_subject =~ /\[\Q$classification\E\]/ ) && 
                           ( $self->{parameters}{$classification}{subject} == 1 ) ) {
                          $msg_subject = " [$classification]$msg_subject";
--- 938,942 ----
                  if ( $self->{configuration}->{configuration}{subject} ) {
                      # Don't add the classification unless it is not present
!                     if ( !( $msg_subject =~ /\[\Q$classification\E\]/ ) &&
                           ( $self->{parameters}{$classification}{subject} == 1 ) ) {
                          $msg_subject = " [$classification]$msg_subject";
***************
*** 961,965 ****
          print $client $msg_head_before;
          print $client $msg_head_after;
!         print $client $msg_body;        
      }
  
--- 961,965 ----
          print $client $msg_head_before;
          print $client $msg_head_after;
!         print $client $msg_body;
      }
  
***************
*** 967,977 ****
          if ($echo) {
              $self->echo_to_dot( $mail, $client );
!         } else { 
              $self->echo_to_dot( $mail, undef);
          }
      } else {
!         print $client ".$eol" if ( $echo );
      }
!     
  
      if ( !$nosave ) {
--- 967,977 ----
          if ($echo) {
              $self->echo_to_dot( $mail, $client );
!         } else {
              $self->echo_to_dot( $mail, undef);
          }
      } else {
!         print $client "$eol.$eol" if ( $echo );
      }
! 
  
      if ( !$nosave ) {

[popfile-commit] engine/Classifier Bayes.pm,1.157,1.158

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

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

Modified Files:
	Bayes.pm 
Log Message:
fix case where it was possible for messages to terminate without CRLF.CRLF (my fault)
ensure classify_and_modify streams are always binmode

Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.157
retrieving revision 1.158
diff -C2 -d -r1.157 -r1.158
*** Bayes.pm	30 Jun 2003 14:57:52 -0000	1.157
--- Bayes.pm	2 Jul 2003 09:50:14 -0000	1.158
***************
*** 950,953 ****
--- 950,958 ----
      $echo = 1 unless (defined $echo);
  
+     # binmode both our streams incase they're file streams or something odd
+ 
+     binmode $mail;
+     binmode $client;
+ 
      my $msg_subject     = '';     # The message subject
      my $msg_head_before = '';     # Store the message headers that come before Subject here
***************
*** 1164,1168 ****
          }
  
!         print $client ".$eol" if ( $echo );
      }
  
--- 1169,1173 ----
          }
  
!         print $client "$eol.$eol" if ( $echo );
      }
  

[popfile-commit] windows/languages - New directory

[<xue...@us...>]

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

Log Message:
Directory /cvsroot/popfile/windows/languages added to the repository

[popfile-commit] engine/tests TestModule.tst,NONE,1.1

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

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

Added Files:
	TestModule.tst 
Log Message:
Added test suite for POPFile::Module... yes folks I've started working on the complete unit test suite for POPFile

--- NEW FILE: TestModule.tst ---
# ---------------------------------------------------------------------------------------------
#
# Tests for Module.pm
#
# Copyright (c) 2003 John Graham-Cumming
#
# ---------------------------------------------------------------------------------------------

use POPFile::Module;
use POPFile::MQ;
use POPFile::Configuration;
use POPFile::Logger;

my $m = new POPFile::Module;

# Check that base functions return good values

test_assert_equal( $m->initialize(), 1 );
test_assert_equal( $m->start(),      1 );
test_assert_equal( $m->service(),    1 );

# Set and get a name

$m->name( 'test' );
test_assert_equal( $m->name(), 'test' );

# Check that the configuration functions work

my $c = new POPFile::Configuration;
$m->configuration( $c );

$m->config_( 'parameter', 'value' );
test_assert_equal( $m->config_( 'parameter' ), 'value' );
$m->module_config_( 'module', 'mparameter', 'mvalue' );
test_assert_equal( $m->module_config_( 'module', 'mparameter' ), 'mvalue' );
$m->global_config_( 'gparameter', 'gvalue' );
test_assert_equal( $m->global_config_( 'gparameter' ), 'gvalue' );

# Check that the MQ interface functions work

my $mq = new POPFile::MQ;
$m->mq( $mq );

$m->mq_register_( 'NOTYPE', $m );
$m->mq_post_( 'DUMMY', 'msg', 'param' );

test_assert_equal( $mq->{waiters__}{NOTYPE}[0], $m );
test_assert_equal( $mq->{queue__}{DUMMY}[0][0], 'msg' );
test_assert_equal( $mq->{queue__}{DUMMY}[0][1], 'param' );

# Check that the logger function works

my $l = new POPFile::Logger;
$m->logger( $l );
$l->configuration( $c );
$l->calculate_today__();
$m->global_config_( 'debug', 1 );

$m->log_( 'logmsg' );

test_assert( $l->{last_ten__}[0] =~ /logmsg/ );
test_assert_equal( $l->last_ten(), $m->last_ten_log_entries() );

[popfile-commit] engine/POPFile Configuration.pm,1.19,1.20

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

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

Modified Files:
	Configuration.pm 
Log Message:
Added test suite for POPFile::Module... yes folks I've started working on the complete unit test suite for POPFile

Index: Configuration.pm
===================================================================
RCS file: /cvsroot/popfile/engine/POPFile/Configuration.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Configuration.pm	14 Jun 2003 21:10:12 -0000	1.19
--- Configuration.pm	1 Jul 2003 18:38:59 -0000	1.20
***************
*** 211,215 ****
      # if accessed from the config module or through module_config_ from outside
  
!     my %upgrades = ( 
  
  		     # Parameters that are now handled by Classifier::Bayes
--- 211,215 ----
      # if accessed from the config module or through module_config_ from outside
  
!     my %upgrades = (
  
  		     # Parameters that are now handled by Classifier::Bayes

[popfile-commit] windows/languages English-mui.nsh,NONE,1.1 English-pfi.nsh,NONE,1.1

[<xue...@us...>]

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

Added Files:
	English-mui.nsh English-pfi.nsh 
Log Message:
"English" language files for the multi-language version of the installer/uninstaller.

--- NEW FILE: English-mui.nsh ---
#--------------------------------------------------------------------------
# English-mui.nsh
#
# This file contains additional "English" text strings used by the Windows installer
# for POPFile (these strings are customised versions of strings provided by NSIS).
#
# See 'English-pfi.nsh' for the strings which are used on the custom pages.
#
# These strings are grouped according to the page/window where they are used
#
# Copyright (c) 2001-2003 John Graham-Cumming
#
#--------------------------------------------------------------------------

#--------------------------------------------------------------------------
# Standard MUI Page - Welcome
#
# The sequence \r\n\r\n inserts a blank line (note that the MUI_TEXT_WELCOME_INFO_TEXT string
# should end with a \r\n\r\n sequence because another paragraph follows this string).
#--------------------------------------------------------------------------

!insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT \
"This wizard will guide you through the installation of POPFile.\r\n\r\n\It is recommended that you close all other applications before starting Setup.\r\n\r\n"

#--------------------------------------------------------------------------
# Standard MUI Page - Finish
#
# The MUI_TEXT_FINISH_RUN text should be a short phrase (not a long paragraph)
#--------------------------------------------------------------------------

!insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_RUN \
"POPFile User Interface"

#--------------------------------------------------------------------------
# End of 'English-mui.nsh'
#--------------------------------------------------------------------------

--- NEW FILE: English-pfi.nsh ---
#--------------------------------------------------------------------------
# English-pfi.nsh
#
# This file contains additional "English" text strings used by the Windows installer
# for POPFile (these strings are unique to POPFile).
#
# See 'English-mui.nsh' for the strings which modify standard NSIS MUI messages.
#
# These strings are grouped according to the page/window where they are used
#
# Copyright (c) 2001-2003 John Graham-Cumming
#
#--------------------------------------------------------------------------
# String Formatting (applies to _IO_ text used for custom pages):
#
#   (1) The sequence  \r\n      inserts a newline
#   (2) The sequence  \r\n\r\n  inserts a blank line
#
# (the 'PFI_LANG_CBP_IO_INTRO' string in 'Custom Page - POPFile Classification Bucket Creation'
#  shows how the \r\n\r\n sequence is used)
#--------------------------------------------------------------------------

#--------------------------------------------------------------------------
# Mark the start of the language data
#--------------------------------------------------------------------------

!define PFI_LANG  "ENGLISH"

#--------------------------------------------------------------------------
# Startup message box offering to display the Release Notes
#--------------------------------------------------------------------------

!insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_1        "Display POPFile Release Notes ?"
!insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_2        "'Yes' recommended if you are upgrading POPFile (you may need to backup BEFORE upgrading)"

#--------------------------------------------------------------------------
# Standard MUI Page - Choose Components
#--------------------------------------------------------------------------

!insertmacro PFI_LANG_STRING DESC_SecPOPFile              "Installs the core files needed by POPFile, including a minimal version of Perl."
!insertmacro PFI_LANG_STRING DESC_SecSkins                "Installs POPFile skins that allow you to change the look and feel of the POPFile user interface."
!insertmacro PFI_LANG_STRING DESC_SecLangs                "Installs non-English language versions of the POPFile UI."

#--------------------------------------------------------------------------
# Custom Page - POPFile Installation Options
#--------------------------------------------------------------------------

; Page Title and Sub-title displayed in the page header

!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_TITLE       "POPFile Installation Options"
!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_SUBTITLE    "Leave these options unchanged unless you need to change them"

; Text strings displayed on the custom page

!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_POP3     "Choose the default port number for POP3 connections (110 recommended)"
!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_GUI      "Choose the default port number for 'User Interface' connections (8080 recommended)"
!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP  "Run POPFile automatically when Windows starts (runs in background, no window seen)"
!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_WARNING  "IMPORTANT WARNING"
!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_MESSAGE  "IF UPGRADING POPFILE --- INSTALLER WILL SHUTDOWN THE EXISTING VERSION"

; Message Boxes used when validating user's selections

!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1    "The POP3 port cannot be set to"
!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2    "The port must be a number in the range 1 to 65535."
!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_3    "Please change your POP3 port selection."

!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_1     "The 'User Interface' port cannot be set to"
!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_2     "The port must be a number in the range 1 to 65535."
!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_3     "Please change your 'User Interface' port selection."

!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1    "The POP3 port must be different from the 'User Interface' port."
!insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2    "Please change your port selections."

#--------------------------------------------------------------------------
# Standard MUI Page - Installing POPfile
#--------------------------------------------------------------------------

; Installation Progress Reports displayed above the progress bar

!insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_UPGRADE   "Checking if this is an upgrade installation..."
!insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_CORE      "Installing POPFile core files..."
!insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_PERL      "Installing minimal Perl files..."
!insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_SHORT     "Creating POPFile shortcuts..."
!insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_SKINS     "Installing POPFile skin files..."
!insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_LANGS     "Installing POPFile UI language files..."
!insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC    "Click Next to continue"

; Installation Log Messages

!insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_1          "Shutting down previous version of POPFile using port"

; Message Box text strings

!insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_1          "file from previous installation found."
!insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_2          "OK to update this file ?"
!insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_3          "Click 'Yes' to update it (old file will be saved as"
!insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_4          "Click 'No' to keep the old file (new file will saved as"

!insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_1           "Backup copy of"
!insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_2           "already exists"
!insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_3           "OK to overwrite this file?"
!insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_4           "Click 'Yes' to overwrite, click 'No' to skip making a backup copy"

#--------------------------------------------------------------------------
# Custom Page - POPFile Classification Bucket Creation
#--------------------------------------------------------------------------

; Page Title and Sub-title displayed in the page header

!insertmacro PFI_LANG_STRING PFI_LANG_CBP_TITLE           "POPFile Classification Bucket Creation"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_SUBTITLE        "POPFile needs AT LEAST TWO buckets in order to be able to classify your email"

; Text strings displayed on the custom page

!insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_INTRO        "After installation, POPFile makes it easy to change the number of buckets (and their names) to suit your needs.\r\n\r\nBucket names must be single words, using lowercase letters, digits 0 to 9, hyphens and underscores."
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CREATE       "Create a new bucket by either selecting a name from the list below or typing a name of your own choice in the box below."
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_DELETE       "To delete one or more buckets from the list, tick the relevant 'Remove' box(es) then click the 'Continue' button."
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_LISTHDR      "Buckets to be used by POPFile"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_REMOVE       "Remove"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CONTINUE     "Continue"

; Text strings used for status messages under the bucket list

!insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_1        "There is no need to add more buckets"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_2        "You must define AT LEAST TWO buckets"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_3        "At least one more bucket is required"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_4        "Installer cannot create more than"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_5        "buckets"

; Message box text strings

!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_1      "Sorry! A bucket called"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_2      "has already been defined."
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_3      "Please choose a different name for the new bucket."

!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_1      "Sorry! The installer can only create up to"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_2      "buckets."
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_3      "Once POPFile has been installed you can create more than"

!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_1      "The name"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_2      "is not a valid name for a bucket."
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_3      "Bucket names can only contain the letters a to z in lower case, numbers 0 to 9,  plus - and _"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_4      "Please choose a different name for the new bucket."

!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_1     "POPFile requires AT LEAST TWO buckets before it can classify your email."
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_2     "Please enter the name of a bucket to be created, either by picking a suggested name from the drop-down list or by typing in a name of your own choice."
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3     "Sorry! You must define AT LEAST TWO buckets before continuing with the installation of POPFile."

!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_1        "buckets have been defined for use by POPFile."
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_2        "Do you want to configure POPFile to use these buckets?"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_3        "Click 'No' if you wish to change your bucket selections."

!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_1      "Sorry! The installer was unable to create"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_2      "of the"
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_3      "buckets you selected."
!insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_4      "Once POPFile has been installed you can use its 'User Interface' control panel to create the missing bucket(s)."

#--------------------------------------------------------------------------
# Custom Page - Reconfigure Outlook Express
#--------------------------------------------------------------------------

; Page Title and Sub-title displayed in the page header

!insertmacro PFI_LANG_STRING PFI_LANG_OECFG_TITLE         "Reconfigure Outlook Express"
!insertmacro PFI_LANG_STRING PFI_LANG_OECFG_SUBTITLE      "POPFile can reconfigure Outlook Express for you"

; Text displayed on the custom page

!insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_INTRO      "POPFile has detected the following Outlook Express email account and can automatically configure it to work with POPFile"
!insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_CHECKBOX   "Reconfigure this account to work with POPFile"
!insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_EMAIL      "Email address:"
!insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_SERVER     "POP3 server:"
!insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_USERNAME   "POP3 username:"
!insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_RESTORE    "If you uninstall POPFile the original settings will be restored"

!insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_LINK_1     "account for the"
!insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_LINK_2     "identity"

#--------------------------------------------------------------------------
# Custom Page - POPFile can now be started
#--------------------------------------------------------------------------

; Page Title and Sub-title displayed in the page header

!insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_TITLE        "POPFile can now be started"
!insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_SUBTITLE     "The POPFile User Interface only works if POPFile has been started"

; Text displayed on the custom page

!insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_INTRO     "Start POPFile now ?"
!insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NO        "No (the 'User Interface' cannot be used if POPFile is not started)"
!insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_DOSBOX    "Run POPFile (in a window)"
!insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_BCKGRND   "Run POPFile in background (no window displayed)"
!insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_1    "Once POPFile has been started, you can display the POPFile 'User Interface' by"
!insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_2    "(a) double-clicking the POPFile icon in the system tray,   OR"
!insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_3    "(b) using Start --> Programs --> POPFile --> POPFile User Interface."

; Banner message displayed whilst waiting for POPFile to start

!insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_1     "Preparing to start POPFile."
!insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_2     "This may take a few seconds..."

#--------------------------------------------------------------------------
# Standard MUI Page - Uninstall POPFile
#--------------------------------------------------------------------------

; Uninstall Progress Reports displayed above the progress bar

!insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_1        "Shutting down POPFile..."
!insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_2        "Deleting 'Start Menu' entries for POPFile..."
!insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_3        "Deleting POPFile core files..."
!insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_4        "Restoring Outlook Express settings..."
!insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_5        "Deleting POPFile skins files..."
!insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_6        "Deleting minimal Perl files..."

; Uninstall Log Messages

!insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_1             "Shutting down POPFile using port"
!insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_2             "Opened"
!insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_3             "Restored"
!insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_4             "Closed"
!insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_5             "Removing all files from POPFile directory"
!insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_6             "Note: unable to remove all files from POPFile directory"

; Message Box text strings

!insertmacro PFI_LANG_UNSTRING PFI_LANG_MBNOTFOUND_1      "It does not appear that POPFile is installed in the directory"
!insertmacro PFI_LANG_UNSTRING PFI_LANG_MBNOTFOUND_2      "Continue anyway (not recommended) ?"
!insertmacro PFI_LANG_UNSTRING PFI_LANG_ABORT_1           "Uninstall aborted by user"
!insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMDIR_1        "Do you want to remove all files in your POPFile directory? (If you have anything you created that you want to keep, click No)"
!insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMERR_1        "Note"
!insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMERR_2        "could not be removed."

#--------------------------------------------------------------------------
# Mark the end of the language data
#--------------------------------------------------------------------------

!undef PFI_LANG

#--------------------------------------------------------------------------
# End of 'English-pfi.nsh'
#--------------------------------------------------------------------------

[popfile-commit] windows installer.nsi,1.78,1.79

[<xue...@us...>]

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

Modified Files:
	installer.nsi 
Log Message:
{NOTEPAD} is global not local, so it must be initialised earlier.

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** installer.nsi	30 Jun 2003 17:45:27 -0000	1.78
--- installer.nsi	1 Jul 2003 03:19:41 -0000	1.79
***************
*** 259,265 ****
    !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${RELEASE_NOTES}" "release.txt"
    
    MessageBox MB_YESNO "Display POPFile Release Notes ?$\r$\n$\r$\n\
        'Yes' recommended if you are upgrading." IDNO exit
-   SearchPath ${NOTEPAD} notepad.exe
    StrCmp ${NOTEPAD} "" use_file_association
    ExecWait 'notepad.exe "$PLUGINSDIR\release.txt"'
--- 259,265 ----
    !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${RELEASE_NOTES}" "release.txt"
    
+   SearchPath ${NOTEPAD} notepad.exe
    MessageBox MB_YESNO "Display POPFile Release Notes ?$\r$\n$\r$\n\
        'Yes' recommended if you are upgrading." IDNO exit
    StrCmp ${NOTEPAD} "" use_file_association
    ExecWait 'notepad.exe "$PLUGINSDIR\release.txt"'

[popfile-commit] windows installer.nsi,1.77,1.78

[<xue...@us...>]

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

Modified Files:
	installer.nsi 
Log Message:
Oops! Found a case where OEConfig was not closing a file.

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** installer.nsi	26 Jun 2003 17:41:37 -0000	1.77
--- installer.nsi	30 Jun 2003 17:45:27 -0000	1.78
***************
*** 1422,1425 ****
--- 1422,1426 ----
  
  separator_done:
+   FileClose ${CFG}
    Push ${L_SEPARATOR}
    Call TrimNewlines

[popfile-commit] engine/Classifier Bayes.pm,1.156,1.157

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

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

Modified Files:
	Bayes.pm 
Log Message:
Allow $ and @ in magnets

Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.156
retrieving revision 1.157
diff -C2 -d -r1.156 -r1.157
*** Bayes.pm	26 Jun 2003 17:36:17 -0000	1.156
--- Bayes.pm	30 Jun 2003 14:57:52 -0000	1.157
***************
*** 592,601 ****
          # You cannot use @ or $ inside a \Q\E regular expression and hence
          # we have to change the $magnet and the text we are comparing against
!         # by changing the $ and @ signs to .
  
              my $noattype;
  
              $noattype = $self->{parser__}->get_header($type);
!             $noattype =~ s/[@\$]/\./g;
  
              for my $magnet (sort keys %{$self->{magnets__}{$bucket}{$type}}) {
--- 592,603 ----
          # You cannot use @ or $ inside a \Q\E regular expression and hence
          # we have to change the $magnet and the text we are comparing against
!         # by changing the $ and @ signs to special forms which I hope
!         # never really appear
  
              my $noattype;
  
              $noattype = $self->{parser__}->get_header($type);
!             $noattype =~ s/@/__POPFILE_AT__/g;
!             $noattype =~ s/\$/__POPFILE_DOLLAR__/g;
  
              for my $magnet (sort keys %{$self->{magnets__}{$bucket}{$type}}) {
***************
*** 603,607 ****
  
                  $regex = $magnet;
!                 $regex =~ s/[@\$]/\./g;
  
                  if ( $noattype =~ m/\Q$regex\E/i ) {
--- 605,610 ----
  
                  $regex = $magnet;
!                 $regex =~ s/@/__POPFILE_AT__/g;
!                 $regex =~ s/\$/__POPFILE_DOLLAR__/g;
  
                  if ( $noattype =~ m/\Q$regex\E/i ) {

[popfile-commit] engine/Classifier MailParse.pm,1.140,1.141

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

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

Modified Files:
	MailParse.pm 
Log Message:
debug is a private member variable

Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.140
retrieving revision 1.141
diff -C2 -d -r1.140 -r1.141
*** MailParse.pm	26 Jun 2003 14:09:00 -0000	1.140
--- MailParse.pm	29 Jun 2003 21:02:47 -0000	1.141
***************
*** 229,233 ****
      $self->{msg_total__}    += 1;
  
!     print "--- $word ($self->{words__}{$word})\n" if ($self->{debug});
  }
  
--- 229,233 ----
      $self->{msg_total__}    += 1;
  
!     print "--- $word ($self->{words__}{$word})\n" if ($self->{debug__});
  }
  
***************
*** 296,300 ****
                  $after = '&' if ( $after eq '>' );
                  if ( !( $self->{ut__} =~ s/($before)\Q$word\E($after)/$1<b><font color=\"$color\">$word<\/font><\/b>$2/ ) ) {
!                 	print "Could not find $word for colorization\n" if ( $self->{debug} );
                  }
              } else {
--- 296,300 ----
                  $after = '&' if ( $after eq '>' );
                  if ( !( $self->{ut__} =~ s/($before)\Q$word\E($after)/$1<b><font color=\"$color\">$word<\/font><\/b>$2/ ) ) {
!                 	print "Could not find $word for colorization\n" if ( $self->{debug__} );
                  }
              } else {
***************
*** 324,328 ****
      my $p = 0;
  
!     print "add_line: [$bigline]\n" if $self->{debug};
  
      # If the line is really long then split at every 1k and feed it to the parser below
--- 324,328 ----
      my $p = 0;
  
!     print "add_line: [$bigline]\n" if $self->{debug__};
  
      # If the line is really long then split at every 1k and feed it to the parser below
***************
*** 363,367 ****
                      $line       =~ s/$from/$to/g;
                      $self->{ut__} =~ s/$from/$to/g;
!                     print "$from -> $to\n" if $self->{debug};
                  }
              }
--- 363,367 ----
                      $line       =~ s/$from/$to/g;
                      $self->{ut__} =~ s/$from/$to/g;
!                     print "$from -> $to\n" if $self->{debug__};
                  }
              }
***************
*** 378,382 ****
                          $line       =~ s/$from/$to/g;
                          $self->{ut__} =~ s/$from/$to/g;
!                         print "$from -> $to\n" if $self->{debug};
                          $self->update_pseudoword( 'html', 'numericentity', $encoded, $from );
                      }
--- 378,382 ----
                          $line       =~ s/$from/$to/g;
                          $self->{ut__} =~ s/$from/$to/g;
!                         print "$from -> $to\n" if $self->{debug__};
                          $self->update_pseudoword( 'html', 'numericentity', $encoded, $from );
                      }
***************
*** 408,414 ****
                      my $original = "$1$2$4";
                      my $word = $2;
!                     print "$word ->" if $self->{debug};
                      $word    =~ s/[^A-Z]//gi;
!                     print "$word\n" if $self->{debug};
                      $self->update_word( $word, $encoded, ' ', ' ', $prefix);
                      $self->update_pseudoword( 'trick', 'spacedout', $encoded, $original );
--- 408,414 ----
                      my $original = "$1$2$4";
                      my $word = $2;
!                     print "$word ->" if $self->{debug__};
                      $word    =~ s/[^A-Z]//gi;
!                     print "$word\n" if $self->{debug__};
                      $self->update_word( $word, $encoded, ' ', ' ', $prefix);
                      $self->update_pseudoword( 'trick', 'spacedout', $encoded, $original );
***************
*** 464,468 ****
      $arg =~ s/[\r\n]//g;
  
!     print "HTML tag $tag with argument " . $arg . "\n" if ($self->{debug});
  
      # End tags do not require any argument decoding but we do look at them
--- 464,468 ----
      $arg =~ s/[\r\n]//g;
  
!     print "HTML tag $tag with argument " . $arg . "\n" if ($self->{debug__});
  
      # End tags do not require any argument decoding but we do look at them
***************
*** 515,524 ****
          }
  
!         print "   attribute $attribute with value $quote$value$quote\n" if ($self->{debug});
  
          # Remove leading whitespace and leading value-less attributes
  
          if ( $arg =~ s/^(([ \t]*(\w+)[\t ]+)+)([^=])/$4/ ) {
!             print "   attribute(s) " . $1 . " with no value\n" if ($self->{debug});
          }
  
--- 515,524 ----
          }
  
!         print "   attribute $attribute with value $quote$value$quote\n" if ($self->{debug__});
  
          # Remove leading whitespace and leading value-less attributes
  
          if ( $arg =~ s/^(([ \t]*(\w+)[\t ]+)+)([^=])/$4/ ) {
!             print "   attribute(s) " . $1 . " with no value\n" if ($self->{debug__});
          }
  
***************
*** 613,617 ****
              $self->{htmlfontcolor__} = map_color($self, $value);
              $self->compute_html_color_distance();
! 			print "Set html font color to $self->{htmlfontcolor__}\n" if ( $self->{debug} );
          }
  
--- 613,617 ----
              $self->{htmlfontcolor__} = map_color($self, $value);
              $self->compute_html_color_distance();
! 			print "Set html font color to $self->{htmlfontcolor__}\n" if ( $self->{debug__} );
          }
  
***************
*** 621,625 ****
              $self->{htmlfontcolor__} = map_color($self, $value);
              $self->compute_html_color_distance();
! 			print "Set html font color to $self->{htmlfontcolor__}\n" if ( $self->{debug} );
          }
  
--- 621,625 ----
              $self->{htmlfontcolor__} = map_color($self, $value);
              $self->compute_html_color_distance();
! 			print "Set html font color to $self->{htmlfontcolor__}\n" if ( $self->{debug__} );
          }
  
***************
*** 643,647 ****
              $self->update_pseudoword( 'html', "backcolor$value" );
              $self->{htmlbackcolor__} = map_color($self, $value);
! 			print "Set html back color to $self->{htmlbackcolor__}\n" if ( $self->{debug} );
  
              $self->{htmlbodycolor__} = $self->{htmlbackcolor__} if ( $tag =~ /^body$/i );
--- 643,647 ----
              $self->update_pseudoword( 'html', "backcolor$value" );
              $self->{htmlbackcolor__} = map_color($self, $value);
! 			print "Set html back color to $self->{htmlbackcolor__}\n" if ( $self->{debug__} );
  
              $self->{htmlbodycolor__} = $self->{htmlbackcolor__} if ( $tag =~ /^body$/i );
***************
*** 805,809 ****
  
      if ( !defined( $host ) || ( $host eq '' ) ) {
!         print "no hostname found: [$temp_url]\n" if ($self->{debug});
          return '';
      }
--- 805,809 ----
  
      if ( !defined( $host ) || ( $host eq '' ) ) {
!         print "no hostname found: [$temp_url]\n" if ($self->{debug__});
          return '';
      }
***************
*** 862,866 ****
      $line =~ s/[\r\n]+//gm;
  
!     print "parse_html: [$line] " . $self->{in_html_tag__} . "\n" if $self->{debug};
  
      # Remove HTML comments and other tags that begin !
--- 862,866 ----
      $line =~ s/[\r\n]+//gm;
  
!     print "parse_html: [$line] " . $self->{in_html_tag__} . "\n" if $self->{debug__};
  
      # Remove HTML comments and other tags that begin !
***************
*** 868,872 ****
      while ( $line =~ s/(<!.*?>)// ) {
          $self->update_pseudoword( 'html', 'comment', $encoded, $1 );
!         print "$line\n" if $self->{debug};
      }
  
--- 868,872 ----
      while ( $line =~ s/(<!.*?>)// ) {
          $self->update_pseudoword( 'html', 'comment', $encoded, $1 );
!         print "$line\n" if $self->{debug__};
      }
  
***************
*** 1011,1015 ****
              next if ( !defined($line) );
  
!             print ">>> $line" if $self->{debug};
  
              if ($self->{color__}) {
--- 1011,1015 ----
              next if ( !defined($line) );
  
!             print ">>> $line" if $self->{debug__};
  
              if ($self->{color__}) {
***************
*** 1043,1047 ****
  
                      $self->{in_headers__} = 0;
!                     print "Header parsing complete.\n" if $self->{debug};
  
                      next;
--- 1043,1047 ----
  
                      $self->{in_headers__} = 0;
!                     print "Header parsing complete.\n" if $self->{debug__};
  
                      next;
***************
*** 1081,1085 ****
  
                  if (!defined $2) {
!                     print "Hit MIME boundary --$1\n" if $self->{debug};
                      $self->{in_headers__} = 1;
                  } else {
--- 1081,1085 ----
  
                  if (!defined $2) {
!                     print "Hit MIME boundary --$1\n" if $self->{debug__};
                      $self->{in_headers__} = 1;
                  } else {
***************
*** 1089,1093 ****
                      my $boundary = $1;
  
!                     print "Hit MIME boundary terminator --$1--\n" if $self->{debug};
  
                      # escape to match escaped boundary characters
--- 1089,1093 ----
                      my $boundary = $1;
  
!                     print "Hit MIME boundary terminator --$1--\n" if $self->{debug__};
  
                      # escape to match escaped boundary characters
***************
*** 1109,1113 ****
                      $mime = ($temp_mime || '');
  
!                     print "MIME boundary list now $mime\n" if $self->{debug};
                      $self->{in_headers__} = 0;
                  }
--- 1109,1113 ----
                      $mime = ($temp_mime || '');
  
!                     print "MIME boundary list now $mime\n" if $self->{debug__};
                      $self->{in_headers__} = 0;
                  }
***************
*** 1201,1210 ****
          $self->{base64__} =~ s/ //g;
  
!         print "Base64 data: " . $self->{base64__} . "\n" if ($self->{debug});
  
          $decoded = decode_base64( $self->{base64__} );
          parse_html( $self, $decoded, 1 );
  
!         print "Decoded: " . $decoded . "\n" if ($self->{debug});
  
          $self->{ut__} = "<b>Found in encoded data:</b> " . $self->{ut__} if ( $self->{color__} );
--- 1201,1210 ----
          $self->{base64__} =~ s/ //g;
  
!         print "Base64 data: " . $self->{base64__} . "\n" if ($self->{debug__});
  
          $decoded = decode_base64( $self->{base64__} );
          parse_html( $self, $decoded, 1 );
  
!         print "Decoded: " . $decoded . "\n" if ($self->{debug__});
  
          $self->{ut__} = "<b>Found in encoded data:</b> " . $self->{ut__} if ( $self->{color__} );
***************
*** 1290,1294 ****
      my ($self, $header, $argument, $mime, $encoding) = @_;
  
!     print "Header ($header) ($argument)\n" if ($self->{debug});
  
      if ( $self->{color__} ) {
--- 1290,1294 ----
      my ($self, $header, $argument, $mime, $encoding) = @_;
  
!     print "Header ($header) ($argument)\n" if ($self->{debug__});
  
      if ( $self->{color__} ) {
***************
*** 1384,1388 ****
  
          if ( $argument =~ /^(.*?)(;)/ ) {
!             print "Set content type to $1\n" if $self->{debug};
              $self->{content_type__} = $1;
          }
--- 1384,1388 ----
  
          if ( $argument =~ /^(.*?)(;)/ ) {
!             print "Set content type to $1\n" if $self->{debug__};
              $self->{content_type__} = $1;
          }
***************
*** 1405,1409 ****
                      $mime = $boundary;
                  }
!                 print "Set mime boundary to " . $mime . "\n" if $self->{debug};
                  return ($mime, $encoding);
              }
--- 1405,1409 ----
                      $mime = $boundary;
                  }
!                 print "Set mime boundary to " . $mime . "\n" if $self->{debug__};
                  return ($mime, $encoding);
              }
***************
*** 1417,1421 ****
      if ( $header =~ /^Content-Transfer-Encoding$/i ) {
          $encoding = $argument;
!         print "Setting encoding to $encoding\n" if $self->{debug};
          my $compact_encoding = $encoding;
          $compact_encoding =~ s/[^A-Za-z0-9]//g;
--- 1417,1421 ----
      if ( $header =~ /^Content-Transfer-Encoding$/i ) {
          $encoding = $argument;
!         print "Setting encoding to $encoding\n" if $self->{debug__};
          my $compact_encoding = $encoding;
          $compact_encoding =~ s/[^A-Za-z0-9]//g;

[popfile-commit] engine/languages English.msg,1.36,1.37

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

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

Modified Files:
	English.msg 
Log Message:
Add string needed for Windows tray icon configuration option

Index: English.msg
===================================================================
RCS file: /cvsroot/popfile/engine/languages/English.msg,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** English.msg	14 Jun 2003 21:10:13 -0000	1.36
--- English.msg	29 Jun 2003 21:02:26 -0000	1.37
***************
*** 253,256 ****
--- 253,258 ----
  View_Title                              Single Message View
  
+ Windows_TrayIcon                        Show POPFile icon in Windows system tray?
+ 
  Header_MenuSummary                      This table is the navigation menu which allows access to each of the different pages of the control center.
  History_MainTableSummary                This table shows the sender and subject of recently received messages and allows them to be reviewed and reclassified.  Clicking on the subject line will show the full message text, along with information about why it was classified as it was.  The 'Should be' column allows you to specify which bucket the message belongs in, or to undo that change.  The 'Delete' column allows you to delete specific messages from the history if you don't need them anymore.
***************
*** 268,270 ****
--- 270,273 ----
  Security_MainTableSummary               This table provides sets of controls that affect the security of the overall configuration of POPFile, whether it should automatically check for updates to the program, and whether statistics about POPFile's performance should be sent to the central datastore of the program's author for general information.
  Advanced_MainTableSummary               This table provides a list of words that POPFile ignores when classifying message due to their relative frequency in message in general.  They are organized per row according to the first letter of the words.
+ 
  

[popfile-commit] engine/UI HTML.pm,1.173,1.174

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

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

Modified Files:
	HTML.pm 
Log Message:
Support PNG graphics for skins

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.173
retrieving revision 1.174
diff -C2 -d -r1.173 -r1.174
*** HTML.pm	25 Jun 2003 04:10:55 -0000	1.173
--- HTML.pm	29 Jun 2003 21:01:39 -0000	1.174
***************
*** 337,340 ****
--- 337,345 ----
      }
  
+     if ( $url =~ /\/(.+\.png)/ ) {
+         $self->http_file_( $client, $1, 'image/png' );
+         return 1;
+     }
+ 
      if ( $url =~ /(skins\/.+\.css)/ ) {
          $self->http_file_( $client, $1, 'text/css' );

[popfile-commit] engine/Platform MSWin32.pm,1.7,1.8

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

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

Modified Files:
	MSWin32.pm 
Log Message:
Handle new option to hide the system tray icon from the menu, and add configuration item that makes the tray icon configurable from the web interface

Index: MSWin32.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Platform/MSWin32.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MSWin32.pm	8 May 2003 00:53:45 -0000	1.7
--- MSWin32.pm	29 Jun 2003 20:59:59 -0000	1.8
***************
*** 50,53 ****
--- 50,57 ----
      $self->config_( 'trayicon', 1 );
  
+     $self->register_configuration_item_( 'configuration',
+                                          'windows_trayicon',
+                                          $self );
+ 
      return 1;
  }
***************
*** 55,58 ****
--- 59,135 ----
  # ---------------------------------------------------------------------------------------------
  #
+ # configure_item
+ #
+ #    $name            The name of the item being configured, was passed in by the call
+ #                     to register_configuration_item
+ #    $language        Reference to the hash holding the current language
+ #    $session_key     The current session key
+ #
+ #  Must return the HTML for this item
+ # ---------------------------------------------------------------------------------------------
+ 
+ sub configure_item
+ {
+     my ( $self, $name, $language, $session_key ) = @_;
+ 
+     my $body;
+ 
+     # POP3 Listen Port widget
+     if ( $name eq 'windows_trayicon' ) {
+         $body .= "<span class=\"configurationLabel\">$$language{Windows_TrayIcon}:</span><br />\n";
+         $body .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" summary=\"\"><tr><td nowrap=\"nowrap\">\n";
+ 
+         if ( $self->config_( 'trayicon' ) == 0 ) {
+             $body .= "<form action=\"/configuration\">\n";
+             $body .= "<span class=\"securityWidgetStateOff\">$$language{No}</span>\n";
+             $body .= "<input type=\"submit\" class=\"toggleOn\" id=\"windowTrayIconOn\" name=\"toggle\" value=\"$$language{ChangeToYes}\" />\n";
+             $body .= "<input type=\"hidden\" name=\"windows_trayicon\" value=\"1\" />\n";
+             $body .= "<input type=\"hidden\" name=\"session\" value=\"$session_key\" />\n</form>\n";
+         } else {
+             $body .= "<form action=\"/configuration\">\n";
+             $body .= "<span class=\"securityWidgetStateOn\">$$language{Yes}</span>\n";
+             $body .= "<input type=\"submit\" class=\"toggleOn\" id=\"windowTrayIconOff\" name=\"toggle\" value=\"$$language{ChangeToNo}\" />\n";
+             $body .= "<input type=\"hidden\" name=\"windows_trayicon\" value=\"0\" />\n";
+             $body .= "<input type=\"hidden\" name=\"session\" value=\"$session_key\" />\n</form>\n";
+         }
+         $body .= "</td></tr></table>\n";
+     }
+ 
+     return $body;
+ }
+ 
+ # ---------------------------------------------------------------------------------------------
+ #
+ # validate_item
+ #
+ #    $name            The name of the item being configured, was passed in by the call
+ #                     to register_configuration_item
+ #    $language        Reference to the hash holding the current language
+ #    $form            Hash containing all form items
+ #
+ #  Must return the HTML for this item
+ # ---------------------------------------------------------------------------------------------
+ 
+ sub validate_item
+ {
+     my ( $self, $name, $language, $form ) = @_;
+ 
+     if ( $name eq 'windows_trayicon' ) {
+         if ( defined($$form{windows_trayicon}) ) {
+             $self->config_( 'trayicon', $$form{windows_trayicon} );
+ 
+             if ( $$form{windows_trayicon} == 0 ) {
+                 $self->{hideicon__} = Win32::API->new( "Platform/POPFileIcon.dll", "HideIcon", "", "N" );
+                 $self->{hideicon__}->Call();
+                 undef $self->{hideicon__};
+ 	    }
+         }
+     }
+ 
+     return '';
+ }
+ 
+ # ---------------------------------------------------------------------------------------------
+ #
  # prefork
  #
***************
*** 92,95 ****
--- 169,184 ----
  
      my $event = $self->{getmessage__}->Call();
+ 
+     # User wants the icon hidden
+ 
+     if ( $event == 3 ) {
+         $self->config_( 'trayicon', 0 );
+ 
+         $self->{hideicon__} = Win32::API->new( "Platform/POPFileIcon.dll", "HideIcon", "", "N" );
+         $self->{hideicon__}->Call();
+         undef $self->{hideicon__};
+ 
+         return 1;
+     }
  
      # Double click icon, or select Open option in menu results in

[popfile-commit] engine/Platform POPFileIcon.dll,1.2,1.3

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

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

Modified Files:
	POPFileIcon.dll 
Log Message:
New binary of the DLL with resource leak fix

Index: POPFileIcon.dll
===================================================================
RCS file: /cvsroot/popfile/engine/Platform/POPFileIcon.dll,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsnHLK3F and /tmp/cvsUCsaWd differ

[popfile-commit] windows/POPFileIcon icon.cpp,1.2,1.3 icon.def,1.1,1.2 icon.rc,1.1,1.2 resource.h,1.1,1.2

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

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

Modified Files:
	icon.cpp icon.def icon.rc resource.h 
Log Message:
Fix a resource leak because we were not deleting the icon object; add Hide POPFile Icon menu item; add confirmation dialog box for shutdown option

Index: icon.cpp
===================================================================
RCS file: /cvsroot/popfile/windows/POPFileIcon/icon.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** icon.cpp	6 May 2003 16:16:30 -0000	1.2
--- icon.cpp	29 Jun 2003 20:58:21 -0000	1.3
***************
*** 26,29 ****
--- 26,30 ----
  bool gShutdown = false;
  bool gUI       = false;
+ bool gHideIcon = false;
  
  // Used to store information about the POPFile icon displayed
***************
*** 78,82 ****
  								NULL ) ) {
  						case IDM_EXIT: 
! 							gShutdown = true;
  							break;
  						case IDM_UI:
--- 79,88 ----
  								NULL ) ) {
  						case IDM_EXIT: 
! 							if ( MessageBox( hwnd, "Are you sure you want to shutdown POPFile?", "Shutdown POPFile", MB_ICONQUESTION | MB_YESNO ) == IDYES ) {
!    							    gShutdown = true;
! 							}
! 							break;
! 						case IDM_HIDEICON: 
! 							gHideIcon = true;
  							break;
  						case IDM_UI:
***************
*** 158,164 ****
  {
  	Shell_NotifyIcon( NIM_DELETE, &gNid );
! 
  	DestroyWindow( gHwnd );
- 
  	UnregisterClass( gClassName, ghInst );
  }
--- 164,169 ----
  {
  	Shell_NotifyIcon( NIM_DELETE, &gNid );
!     DestroyIcon( gNid.hIcon );
  	DestroyWindow( gHwnd );
  	UnregisterClass( gClassName, ghInst );
  }
***************
*** 183,186 ****
--- 188,211 ----
  		return 2;
  	}
+ 
+ 	if ( gHideIcon ) {
+ 		gHideIcon = false;
+ 		return 3;
+ 	}
+ 
+ 	return 0;
+ }
+ 
+ //---------------------------------------------------------------------------
+ //
+ // HideIcon
+ //
+ // Called to make the icon disappear
+ //
+ //---------------------------------------------------------------------------
+ 
+ int APIENTRY HideIcon()
+ {
+ 	HidePOPFileIcon__();
  
  	return 0;

Index: icon.def
===================================================================
RCS file: /cvsroot/popfile/windows/POPFileIcon/icon.def,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** icon.def	6 May 2003 16:11:56 -0000	1.1
--- icon.def	29 Jun 2003 20:58:21 -0000	1.2
***************
*** 3,5 ****
--- 3,6 ----
  EXPORTS
  	GetMenuMessage	@1
+ 	HideIcon        @2
  	

Index: icon.rc
===================================================================
RCS file: /cvsroot/popfile/windows/POPFileIcon/icon.rc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** icon.rc	6 May 2003 16:11:56 -0000	1.1
--- icon.rc	29 Jun 2003 20:58:21 -0000	1.2
***************
*** 58,61 ****
--- 58,62 ----
      BEGIN
          MENUITEM "POPFile &UI",                 IDM_UI
+         MENUITEM "&Hide POPFile Icon",          IDM_HIDEICON
          MENUITEM SEPARATOR
          MENUITEM "&Shutdown POPFile",           IDM_EXIT
***************
*** 72,75 ****
--- 73,115 ----
  // remains consistent on all systems.
  IDI_POPFILE             ICON                    "popfile.ico"
+ 
+ /////////////////////////////////////////////////////////////////////////////
+ //
+ // Version
+ //
+ 
+ VS_VERSION_INFO VERSIONINFO
+  FILEVERSION 1,0,0,1
+  PRODUCTVERSION 1,0,0,1
+  FILEFLAGSMASK 0x17L
+ #ifdef _DEBUG
+  FILEFLAGS 0x1L
+ #else
+  FILEFLAGS 0x0L
+ #endif
+  FILEOS 0x4L
+  FILETYPE 0x2L
+  FILESUBTYPE 0x0L
+ BEGIN
+     BLOCK "StringFileInfo"
+     BEGIN
+         BLOCK "040904b0"
+         BEGIN
+             VALUE "CompanyName", "The POPFile Project"
+             VALUE "FileDescription", "POPFile Tray Icon DLL"
+             VALUE "FileVersion", "1, 0, 0, 1"
+             VALUE "InternalName", "POPFileIcon.DLL"
+             VALUE "LegalCopyright", "Copyright (C) 2003 John Graham-Cumming"
+             VALUE "OriginalFilename", "POPFileIcon.dll"
+             VALUE "ProductName", "POPFile Tray Icon DLL"
+             VALUE "ProductVersion", "1, 0, 0, 1"
+         END
+     END
+     BLOCK "VarFileInfo"
+     BEGIN
+         VALUE "Translation", 0x409, 1200
+     END
+ END
+ 
  #endif    // English (U.S.) resources
  /////////////////////////////////////////////////////////////////////////////

Index: resource.h
===================================================================
RCS file: /cvsroot/popfile/windows/POPFileIcon/resource.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** resource.h	6 May 2003 16:11:56 -0000	1.1
--- resource.h	29 Jun 2003 20:58:21 -0000	1.2
***************
*** 7,10 ****
--- 7,11 ----
  #define IDM_EXIT                        102
  #define IDM_UI                          103
+ #define IDM_HIDEICON                    105
  
  // Next default values for new objects
***************
*** 12,16 ****
  #ifdef APSTUDIO_INVOKED
  #ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE        105
  #define _APS_NEXT_COMMAND_VALUE         40001
  #define _APS_NEXT_CONTROL_VALUE         1001
--- 13,17 ----
  #ifdef APSTUDIO_INVOKED
  #ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE        106
  #define _APS_NEXT_COMMAND_VALUE         40001
  #define _APS_NEXT_CONTROL_VALUE         1001

[popfile-commit] engine/Proxy POP3.pm,1.59,1.60

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

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

Modified Files:
	POP3.pm 
Log Message:
fix bug in toptoo caching. A file stream is NOT binmode!

Index: POP3.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/POP3.pm,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** POP3.pm	24 Jun 2003 16:07:20 -0000	1.59
--- POP3.pm	27 Jun 2003 06:52:23 -0000	1.60
***************
*** 268,272 ****
          #    NOTE messages retrieved using TOPTOO are visible in the history as they
          #    are "cached" to avoid requiring repeated downloads if the client issues
!         #    a RETR for the message in the same session   
          #
          #    NOTE using toptoo=1 on a slow link could cause performance problems, in
--- 268,272 ----
          #    NOTE messages retrieved using TOPTOO are visible in the history as they
          #    are "cached" to avoid requiring repeated downloads if the client issues
!         #    a RETR for the message in the same session
          #
          #    NOTE using toptoo=1 on a slow link could cause performance problems, in
***************
*** 359,362 ****
--- 359,367 ----
  
              if (defined($downloaded{$count}) && open( RETRFILE, "<$file" ) ) {
+ 
+                 # act like a network stream
+ 
+                 binmode RETRFILE;
+ 
                  # File has been fetched and classified already
  

[popfile-commit] windows ioA.ini,1.10,1.11

[<xue...@us...>]

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

Modified Files:
	ioA.ini 
Log Message:
A better description for the STARTUP option.

Index: ioA.ini
===================================================================
RCS file: /cvsroot/popfile/windows/ioA.ini,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ioA.ini	13 Jun 2003 10:03:36 -0000	1.10
--- ioA.ini	26 Jun 2003 22:43:10 -0000	1.11
***************
*** 47,51 ****
  [Field 5]
  Type=checkbox
! Text=Run POPFile automatically when Windows starts
  Left=0
  Right=-1
--- 47,51 ----
  [Field 5]
  Type=checkbox
! Text=Run POPFile automatically when Windows starts (runs in background, no DOS box seen)
  Left=0
  Right=-1

[popfile-commit] engine pipe.pl,NONE,1.1

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

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

Added Files:
	pipe.pl 
Log Message:
Added new pipe.pl script that can be used to classify and modify a mail message on STDIN and output it on STDOUT

--- NEW FILE: pipe.pl ---
#!/usr/bin/perl
# ---------------------------------------------------------------------------------------------
#
# pipe.pl --- Read a message in on STDIN and write out the modified version on STDOUT
#
# Copyright (c) 2001-2003 John Graham-Cumming
#
# ---------------------------------------------------------------------------------------------

use strict;
use Classifier::Bayes;
use POPFile::Configuration;
use POPFile::MQ;
use POPFile::Logger;
use UI::HTML;

# main

if ( $#ARGV == -1 ) 
{
    my $c = new POPFile::Configuration;
    my $mq = new POPFile::MQ;
    my $l = new POPFile::Logger;
    my $b = new Classifier::Bayes;
    my $u = new UI::HTML;

    $u->configuration( $c );
    $u->mq( $mq );
    $u->logger( $l );

    $l->configuration( $c );
    $l->mq( $mq );
    $l->logger( $l );

    $mq->configuration( $c );
    $mq->mq( $mq );
    $mq->logger( $l );

    $b->configuration( $c );
    $b->mq( $mq );
    $b->logger( $l );

    $c->configuration( $c );
    $c->mq( $mq );
    $c->logger( $l );

    $l->initialize();
    $c->initialize();
    $b->initialize();
    $u->initialize();

    $b->start();

    $b->classify_and_modify(\*STDIN, \*STDOUT, 0, 0, 1, '', 1) . "'\n";
}
else
{
    print "pipe.pl - reads a message on STDIN, classifies it, outputs the modified version on STDOUT\n\n";
    print "Usage: pipe.pl\n";
}

[popfile-commit] engine bayes.pl,1.16,1.17

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

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

Modified Files:
	bayes.pl 
Log Message:
Updated bayes.pl to work with POPFile's object structure

Index: bayes.pl
===================================================================
RCS file: /cvsroot/popfile/engine/bayes.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** bayes.pl	14 Jun 2003 21:10:12 -0000	1.16
--- bayes.pl	26 Jun 2003 17:48:22 -0000	1.17
***************
*** 10,13 ****
--- 10,16 ----
  use strict;
  use Classifier::Bayes;
+ use POPFile::Configuration;
+ use POPFile::MQ;
+ use POPFile::Logger;
  
  # main
***************
*** 15,27 ****
  if ( $#ARGV == 0 ) 
  {
      my $b = new Classifier::Bayes;
  
!     if ( $b->initialize() == 0 ) {
!         die "Failed to start while initializing the classifier module";
!     }
  
!     $b->{debug} = 1; 
!     $b->{parser}->{debug} = 0;
!     $b->load_word_matrix();
  
      my @files   = glob $ARGV[0];
--- 18,46 ----
  if ( $#ARGV == 0 ) 
  {
+     my $c = new POPFile::Configuration;
+     my $mq = new POPFile::MQ;
+     my $l = new POPFile::Logger;
      my $b = new Classifier::Bayes;
  
!     $c->configuration( $c );
!     $c->mq( $mq );
!     $c->logger( $l );
  
!     $l->configuration( $c );
!     $l->mq( $mq );
!     $l->logger( $l );
! 
!     $l->initialize();
! 
!     $mq->configuration( $c );
!     $mq->mq( $mq );
!     $mq->logger( $l );
! 
!     $b->configuration( $c );
!     $b->mq( $mq );
!     $b->logger( $l );
! 
!     $b->initialize();
!     $b->start();
  
      my @files   = glob $ARGV[0];
***************
*** 31,36 ****
      }
  
!     foreach my $word (keys %{$b->{parser}->{words}}) {
!         print "$word $b->{parser}->{words}{$word}\n";
      }
  }
--- 50,55 ----
      }
  
!     foreach my $word (keys %{$b->{parser__}->{words__}}) {
!         print "$word $b->{parser__}->{words__}{$word}\n";
      }
  }

[popfile-commit] windows installer.nsi,1.76,1.77

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

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

Modified Files:
	installer.nsi 
Log Message:
Ship bayes.pl and new pipe.pl

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** installer.nsi	24 Jun 2003 19:52:49 -0000	1.76
--- installer.nsi	26 Jun 2003 17:41:37 -0000	1.77
***************
*** 315,318 ****
--- 315,320 ----
    File "..\engine\popfile.pl"
    File "..\engine\insert.pl"
+   File "..\engine\bayes.pl"
+   File "..\engine\pipe.pl"
    File "..\engine\pix.gif"
    File "..\engine\black.gif"

[popfile-commit] engine Makefile,1.10,1.11

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

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

Modified Files:
	Makefile 
Log Message:
Ship bayes.pl and new pipe.pl

Index: Makefile
===================================================================
RCS file: /cvsroot/popfile/engine/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Makefile	9 Jun 2003 18:32:43 -0000	1.10
--- Makefile	26 Jun 2003 17:41:37 -0000	1.11
***************
*** 33,37 ****
  $(POPFILE_ZIP): core manual skins
  
! core: popfile.pl otto.gif pix.gif black.gif insert.pl Classifier/*.pm POPFile/*.pm Proxy/POP3.pm Proxy/Proxy.pm UI/HT??.pm *.change license
  	rm -f $(POPFILE_ZIP)
  	$(BUILD_ZIP)
--- 33,37 ----
  $(POPFILE_ZIP): core manual skins
  
! core: popfile.pl otto.gif pix.gif black.gif bayes.pl pipe.pl insert.pl Classifier/*.pm POPFile/*.pm Proxy/POP3.pm Proxy/Proxy.pm UI/HT??.pm *.change license
  	rm -f $(POPFILE_ZIP)
  	$(BUILD_ZIP)

[popfile-commit] engine/Classifier Bayes.pm,1.155,1.156

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

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

Modified Files:
	Bayes.pm 
Log Message:
Remove angle brackets around XPL

Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.155
retrieving revision 1.156
diff -C2 -d -r1.155 -r1.156
*** Bayes.pm	25 Jun 2003 04:20:53 -0000	1.155
--- Bayes.pm	26 Jun 2003 17:36:17 -0000	1.156
***************
*** 1095,1101 ****
      my $xpl = '';
  
!     $xpl .= "<http://";
      $xpl .= $self->module_config_( 'html', 'local' )?"127.0.0.1":$self->config_( 'hostname' );
!     $xpl .= ":" . $self->module_config_( 'html', 'port' ) . "/jump_to_message?view=$temp_file>$eol";
  
      if ( $self->global_config_( 'xpl' ) && ( $self->{parameters__}{$classification}{quarantine} == 0 ) ) {
--- 1095,1101 ----
      my $xpl = '';
  
!     $xpl .= "http://";
      $xpl .= $self->module_config_( 'html', 'local' )?"127.0.0.1":$self->config_( 'hostname' );
!     $xpl .= ":" . $self->module_config_( 'html', 'port' ) . "/jump_to_message?view=$temp_file$eol";
  
      if ( $self->global_config_( 'xpl' ) && ( $self->{parameters__}{$classification}{quarantine} == 0 ) ) {

[popfile-commit] engine/tests TestMailParse001.wrd,1.1,1.2 TestMailParse002.wrd,1.1,1.2 TestMailParse003.wrd,1.3,1.4 TestMailParse004.wrd,1.1,1.2 TestMailParse005.wrd,1.2,1.3 TestMailParse006.wrd,1.2,1.3 TestMailParse007.wrd,1.4,1.5 TestMailParse008.wrd,1.2,1.3 TestMailParse009.wrd,1.5,1.6 TestMailParse010.cam,1.5,1.6 TestMailParse010.msg,1.1,1.2 TestMailParse010.wrd,1.3,1.4 TestMailParse011.wrd,1.2,1.3 TestMailParse012.wrd,1.2,1.3 TestMailParse013.wrd,1.3,1.4 TestMailParse014.wrd,1.2,1.3 TestMailParse015.wrd,1.4,1.5 TestMailParse016.wrd,1.1,1.2 TestMailParse017.wrd,1.2,1.3 TestMailParse019.wrd,1.3,1.4 TestMailParse020.wrd,1.2,1.3

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

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

Modified Files:
	TestMailParse001.wrd TestMailParse002.wrd TestMailParse003.wrd 
	TestMailParse004.wrd TestMailParse005.wrd TestMailParse006.wrd 
	TestMailParse007.wrd TestMailParse008.wrd TestMailParse009.wrd 
	TestMailParse010.cam TestMailParse010.msg TestMailParse010.wrd 
	TestMailParse011.wrd TestMailParse012.wrd TestMailParse013.wrd 
	TestMailParse014.wrd TestMailParse015.wrd TestMailParse016.wrd 
	TestMailParse017.wrd TestMailParse019.wrd TestMailParse020.wrd 
Log Message:
Updated the test suite for all the new pseudowords

Index: TestMailParse001.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse001.wrd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestMailParse001.wrd	20 Jan 2003 20:11:57 -0000	1.1
--- TestMailParse001.wrd	26 Jun 2003 14:19:41 -0000	1.2
***************
*** 4,5 ****
--- 4,8 ----
  trick:spacedout 1
  
+ from:blank 1
+ words 1
+ header:From 1

Index: TestMailParse002.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse002.wrd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestMailParse002.wrd	20 Jan 2003 20:11:58 -0000	1.1
--- TestMailParse002.wrd	26 Jun 2003 14:19:41 -0000	1.2
***************
*** 3,4 ****
--- 3,6 ----
  millionaire 4
  html:comment 3
+ from:blank 1
+ header:From 1

Index: TestMailParse003.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse003.wrd,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestMailParse003.wrd	26 Jun 2003 14:09:00 -0000	1.3
--- TestMailParse003.wrd	26 Jun 2003 14:19:41 -0000	1.4
***************
*** 36,37 ****
--- 36,54 ----
  pussy's 1
  from:serafina 1
+ j23...@ea... 1
+ header:Date 1
+ header:X-OriginalArrivalTime 1
+ header:Return-Path 1
+ header:X-Accept-Language 1
+ header:MIME-Version 1
+ header:Message-ID 1
+ header:To 1
+ header:X-Priority 1
+ header:Content-Type 2
+ header:Importance 1
+ header:Content-Transfer-Encoding 2
+ header:Subject 1
+ html:fontsize4 1
+ header:Errors-To 1
+ html:fontsize5 1
+ header:From 1

Index: TestMailParse004.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse004.wrd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestMailParse004.wrd	20 Jan 2003 20:11:58 -0000	1.1
--- TestMailParse004.wrd	26 Jun 2003 14:19:41 -0000	1.2
***************
*** 32,33 ****
--- 32,49 ----
  movies 1
  clips 1
+ html:fontcolor#0000ff 1
+ header:Date 1
+ header:Return-Path 1
+ header:MIME-Version 1
+ header:Message-ID 1
+ header:To 1
+ html:backcolor#000000 5
+ header:X-UIDL 1
+ header:Content-Type 2
+ charset:iso-8859-1 1
+ header:Content-Transfer-Encoding 1
+ html:fontcolor#ff0000 3
+ header:Subject 1
+ html:fontsize3 1
+ html:fontsize6 3
+ header:From 1

Index: TestMailParse005.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse005.wrd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse005.wrd	26 Jun 2003 14:09:00 -0000	1.2
--- TestMailParse005.wrd	26 Jun 2003 14:19:41 -0000	1.3
***************
*** 62,63 ****
--- 62,69 ----
  still 1
  sorry 1
+ header:Date 1
+ header:Return-Path 1
+ header:Message-ID 1
+ header:X-UIDL 1
+ header:Subject 1
+ header:From 1

Index: TestMailParse006.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse006.wrd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse006.wrd	21 Jan 2003 01:35:00 -0000	1.2
--- TestMailParse006.wrd	26 Jun 2003 14:19:41 -0000	1.3
***************
*** 36,37 ****
--- 36,47 ----
  biotechnology 1
  quality 1
+ nformation 1
+ free 1
+ nused 1
+ roducts 1
+ efund 1
+ trick:spacedout 1
+ lick 1
+ from:blank 1
+ uarantee 1
+ header:From 1

Index: TestMailParse007.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse007.wrd,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMailParse007.wrd	26 Jun 2003 14:09:00 -0000	1.4
--- TestMailParse007.wrd	26 Jun 2003 14:19:41 -0000	1.5
***************
*** 260,261 ****
--- 260,277 ----
  place 2
  clip 5
+ header:Date 1
+ header:Return-Path 1
+ header:Message-ID 1
+ easynet.be 2
+ intermail 1
+ header:Reply-To 1
+ priv-edtnes62.telusplanet.net 1
+ header:X-Mailer 1
+ header:Received 1
+ mov...@ea... 1
+ header:To 1
+ header:From 1
+ 5.01.05.17 1
+ header:Subject 1
+ telusplanet.net 2
+ jo...@te... 1

Index: TestMailParse008.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse008.wrd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse008.wrd	26 Jun 2003 14:09:00 -0000	1.2
--- TestMailParse008.wrd	26 Jun 2003 14:19:41 -0000	1.3
***************
*** 56,57 ****
--- 56,77 ----
  #efebe7 1
  apple999.com 5
+ rtjr4607.priv-edtnes27.telusplanet.net 1
+ header:Date 1
+ header:Return-Path 1
+ header:To 1
+ header:X-Priority 1
+ header:Message-Id 1
+ 5.01.05.17 1
+ header:Subject 1
+ intermail 1
+ html:backcolor#EFEBE7 1
+ charset:us-ascii 1
+ #000000 1
+ html:fontcolor#000000 1
+ header:Content-Type 1
+ jo...@te... 1
+ header:X-Mailer 1
+ header:Received 1
+ html:td 2
+ html:fontsize4 4
+ header:From 1

Index: TestMailParse009.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse009.wrd,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TestMailParse009.wrd	26 Jun 2003 14:09:00 -0000	1.5
--- TestMailParse009.wrd	26 Jun 2003 14:19:41 -0000	1.6
***************
*** 23,24 ****
--- 23,63 ----
  subject:comman 1
  28...@28... 1
+ mta564.mail.yahoo.com 1
+ whitesize=1 1
+ trick:invisibleink 20
+ header:Date 1
+ yherkhsdkjfhsdkjfhksjdfhkjsdhfiuweyrkhsdkfjhs 1
+ subject:thr 1
+ perry 1
+ header:Return-Path 1
+ header:Message-ID 1
+ header:MIME-Version 1
+ header:Reply-To 1
+ yahoo.com 1
+ header:X-MimeOLE 1
+ html:fontcolorwhite 2
+ header:X-Priority 1
+ subject:ted 1
+ wekrhksjdfhweyhfk 1
+ luke 1
+ comman 1
+ bri...@po... 2
+ header:Content-Length 1
+ header:CC 1
+ header:Content-Type 1
+ dkjfhsrhfksdjhfkjs 1
+ html:fontcolorwhitesize=1 1
+ html:fontcolorfuchsia 1
+ kjsdhfkjsdhfkshdfiwueyrwhsfkjsdhfkh 1
+ subject:lle 1
+ header:X-Mailer 1
+ header:Received 1
+ header:Content-Transfer-Encoding 1
+ html:imgremotesrc 4
+ dhfkshdfkjsdhfuiweyrihwsfkjsdhkfjwieuryksjdhf 1
+ header:Subject 1
+ html:fontsize1 1
+ mail.yahoo.com 1
+ subject:judgments 1
+ header:From 1
+ subject:ugh 1

Index: TestMailParse010.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse010.cam,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TestMailParse010.cam	26 Jun 2003 14:09:00 -0000	1.5
--- TestMailParse010.cam	26 Jun 2003 14:19:41 -0000	1.6
***************
*** 2,9 ****
  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@>
--- 2,9 ----
  Return-Path: <cs...@my...>
  Received: from digitalme.com not authenticated [193.97.97.75]
!         by smtp-send.myrealbox.com with NetMail SMTP Agent Revision: 1.1  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: 1.1  on Novell NetWare;
          Sat, 11 Jan 2003 21:03:05 -0800
  Message-ID: <44747.22535@>

Index: TestMailParse010.msg
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse010.msg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestMailParse010.msg	7 Feb 2003 22:24:33 -0000	1.1
--- TestMailParse010.msg	26 Jun 2003 14:19:41 -0000	1.2
***************
*** 2,9 ****
  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@>
--- 2,9 ----
  Return-Path: <cs...@my...>
  Received: from digitalme.com not authenticated [193.97.97.75]
!         by smtp-send.myrealbox.com with NetMail SMTP Agent Revision: 1.1  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: 1.1  on Novell NetWare;
          Sat, 11 Jan 2003 21:03:05 -0800
  Message-ID: <44747.22535@>

Index: TestMailParse010.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse010.wrd,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestMailParse010.wrd	26 Jun 2003 14:09:00 -0000	1.3
--- TestMailParse010.wrd	26 Jun 2003 14:19:41 -0000	1.4
***************
*** 50,51 ****
--- 50,74 ----
  from:iplvwq 1
  selected 1
+ netware 2
+ header:Date 1
+ header:Return-Path 1
+ header:MIME-Version 1
+ header:Message-ID 1
+ header:To 1
+ agent 1
+ netmail 1
+ revision 2
+ header:Content-Transfer-Encoding 1
+ header:Subject 1
+ header:X-Auth-No 1
+ instanthomeif 1
+ smtp-send.myrealbox.com 1
+ nims 1
+ ofyour 1
+ charset:windows-1252 1
+ header:Content-Type 1
+ simplygo 1
+ header:Received 2
+ anyfurther 1
+ header:From 1
+ novell 3

Index: TestMailParse011.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse011.wrd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse011.wrd	24 Jan 2003 23:18:44 -0000	1.2
--- TestMailParse011.wrd	26 Jun 2003 14:19:41 -0000	1.3
***************
*** 87,88 ****
--- 87,105 ----
  start 1
  yourself 1
+ header:Date 1
+ header:Return-Path 1
+ myrealemailaddress 1
+ header:Message-ID 1
+ header:To 1
+ header:X-Priority 1
+ ccbill 1
+ domain 2
+ header:Content-Transfer-Encoding 1
+ header:Subject 1
+ spam 1
+ header:X-OriginalArrivalTime 1
+ header:Mime-Version 1
+ header:Content-Type 1
+ header:Delivered-To 2
+ header:Received 2
+ header:From 1

Index: TestMailParse012.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse012.wrd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse012.wrd	26 Jun 2003 14:09:00 -0000	1.2
--- TestMailParse012.wrd	26 Jun 2003 14:19:41 -0000	1.3
***************
*** 147,148 ****
--- 147,167 ----
  something 1
  clip 4
+ header:Date 1
+ header:Return-Path 1
+ header:To 1
+ debian 1
+ header:X-UIDL 1
+ jgc.org 1
+ header:X-Text-Classification 1
+ header:Message-Id 1
+ baa 1
+ header:Content-transfer-encoding 1
+ header:Content-Type 1
+ header:From 1
+ header:MIME-Version 1
+ header:X-POPFile-Link 1
+ web...@jg... 1
+ header:Subject 1
+ header:X-Authentication-Warning 1
+ header:Received 2
+ gnu 1

Index: TestMailParse013.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse013.wrd,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestMailParse013.wrd	26 Jun 2003 14:09:00 -0000	1.3
--- TestMailParse013.wrd	26 Jun 2003 14:19:41 -0000	1.4
***************
*** 129,130 ****
--- 129,157 ----
  entry 1
  messy 1
+ header:X-MDArchive-Copy 1
+ efa 1
+ header:Date 1
+ header:To 1
+ header:X-Sender 1
+ header:Message-Id 1
+ lyris 1
+ header:Reply-To 1
+ header:Mime-Version 1
+ header:X-Palm-Dev-Forum 1
+ arm...@ne... 1
+ header:Content-Type 1
+ 192.168.1.100 1
+ to:palmos.com 1
+ nnn...@ne... 1
+ header:From 1
+ header:In-Reply-To 1
+ header:X-MDaemon-Deliver-To 1
+ header:Subject 1
+ archive 1
+ header:X-Message-Id 1
+ header:X-Return-Path 1
+ header:X-MBF-FILE 1
+ header:List-Owner 1
+ header:Sender 1
+ header:List-Unsubscribe 1
+ header:Received 1

Index: TestMailParse014.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse014.wrd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse014.wrd	27 Jan 2003 23:13:29 -0000	1.2
--- TestMailParse014.wrd	26 Jun 2003 14:19:41 -0000	1.3
***************
*** 96,97 ****
--- 96,111 ----
  yourself 1
  thank 1
+ header:Date 1
+ header:Return-Path 1
+ header:Message-ID 1
+ header:To 1
+ html:fontcolor#333366 7
+ header:Subject 1
+ html:backcolorWHITE 1
+ header:X-OriginalArrivalTime 1
+ header:Content-Type 1
+ header:Received 1
+ html:td 15
+ html:fontsize2 6
+ html:fontsize4 1
+ header:From 1

Index: TestMailParse015.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse015.wrd,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMailParse015.wrd	26 Jun 2003 14:09:00 -0000	1.4
--- TestMailParse015.wrd	26 Jun 2003 14:19:41 -0000	1.5
***************
*** 49,50 ****
--- 49,76 ----
  yourself 1
  freesexontheweb 1
+ header:Date 1
+ header:Return-Path 1
+ header:MIME-Version 1
+ header:Message-ID 1
+ header:X-Priority 1
+ debian 1
+ html:fontcolor#666666 2
+ header:X-UIDL 1
+ charset:iso-8859-1 1
+ header:Content-Transfer-Encoding 1
+ html:fontsize-2 1
+ header:Subject 1
+ html:fontcolor#99FF00 1
+ header:Content-Type 2
+ header:Importance 1
+ html:fontcolor#CCFF00 1
+ header:X-Authentication-Warning 1
+ header:X-Mailer 1
+ gnu 1
+ header:Received 2
+ html:fontcolor#FFFFFF 6
+ html:fontsize1 1
+ html:fontsize3 6
+ html:fontsize5 1
+ header:From 1
+ qaa 1

Index: TestMailParse016.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse016.wrd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestMailParse016.wrd	27 Jan 2003 23:13:29 -0000	1.1
--- TestMailParse016.wrd	26 Jun 2003 14:19:41 -0000	1.2
***************
*** 73,74 ****
--- 73,78 ----
  well 1
  classification 1
+ html:backcolor#FFFFFF 1
+ #000000 1
+ header:Sent 1
+ html:fontcolor#000000 1

Index: TestMailParse017.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse017.wrd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse017.wrd	26 Jun 2003 14:09:00 -0000	1.2
--- TestMailParse017.wrd	26 Jun 2003 14:19:41 -0000	1.3
***************
*** 18,19 ****
--- 18,34 ----
  to:recipients 1
  yahoo.com 3
+ header:Date 1
+ header:X-OriginalArrivalTime 1
+ header:Return-Path 3
+ header:MIME-Version 1
+ header:Message-ID 1
+ header:To 1
+ header:Content-Type 2
+ nbia-pmc.com 2
+ charset:iso-8859-1 1
+ header:Received 2
+ header:Content-Transfer-Encoding 1
+ header:Subject 1
+ header:X-Auth-OK 1
+ 3pmc.nbia-pmc.com 2
+ header:From 1

Index: TestMailParse019.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse019.wrd,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestMailParse019.wrd	26 Jun 2003 14:09:00 -0000	1.3
--- TestMailParse019.wrd	26 Jun 2003 14:19:41 -0000	1.4
***************
*** 117,118 ****
--- 117,133 ----
  requestid 1
  intercept 1
+ header:Date 1
+ header:Return-Path 1
+ header:To 1
+ header:X-Text-Classification 1
+ header:Message-Id 1
+ header:Content-Type 2
+ html:fontsize4 1
+ header:From 1
+ header:MIME-Version 1
+ header:X-POPFile-Link 1
+ asmc 1
+ header:Subject 1
+ msk 3
+ header:Delivered-To 2
+ header:Received 4

Index: TestMailParse020.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse020.wrd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse020.wrd	26 Jun 2003 14:09:00 -0000	1.2
--- TestMailParse020.wrd	26 Jun 2003 14:19:41 -0000	1.3
***************
*** 150,151 ****
--- 150,176 ----
  well 2
  from:schwabbauer 1
+ mimetmp 1
+ header:Date 1
+ header:List-Subscribe 1
+ header:To 1
+ header:X-Sender 1
+ header:Message-Id 1
+ header:Content-Transfer-Encoding 2
+ 192.168.0.30 1
+ header:Mime-Version 1
+ header:Content-Type 5
+ header:List-Id 1
+ header:Content-Disposition 1
+ header:Mailing-List 1
+ header:From 1
+ filename 1
+ header:Precedence 1
+ header:Subject 1
+ header:X-BeenThere 1
+ header:List-Post 1
+ header:List-Unsubscribe 1
+ eplgcfxgcqn 1
+ header:List-Help 1
+ header:Delivered-To 2
+ header:X-Mailer 1
+ header:Received 4

[popfile-commit] engine/tests TestMailParse.tst,1.6,1.7 TestMailParse003.cam,1.4,1.5 TestMailParse003.wrd,1.2,1.3 TestMailParse005.wrd,1.1,1.2 TestMailParse007.wrd,1.3,1.4 TestMailParse008.wrd,1.1,1.2 TestMailParse009.wrd,1.4,1.5 TestMailParse010.cam,1.4,1.5 TestMailParse010.wrd,1.2,1.3 TestMailParse011.cam,1.4,1.5 TestMailParse011.msg,1.3,1.4 TestMailParse012.wrd,1.1,1.2 TestMailParse013.cam,1.4,1.5 TestMailParse013.msg,1.1,1.2 TestMailParse013.wrd,1.2,1.3 TestMailParse015.wrd,1.3,1.4 TestMailParse017.wrd,1.1,1.2 TestMailParse019.wrd,1.2,1.3 TestMailParse020.wrd,1.1,1.2 TestMailParse021.msg,1.1,1.2

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

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

Modified Files:
	TestMailParse.tst TestMailParse003.cam TestMailParse003.wrd 
	TestMailParse005.wrd TestMailParse007.wrd TestMailParse008.wrd 
	TestMailParse009.wrd TestMailParse010.cam TestMailParse010.wrd 
	TestMailParse011.cam TestMailParse011.msg TestMailParse012.wrd 
	TestMailParse013.cam TestMailParse013.msg TestMailParse013.wrd 
	TestMailParse015.wrd TestMailParse017.wrd TestMailParse019.wrd 
	TestMailParse020.wrd TestMailParse021.msg 
Log Message:
Restored test suite to working order and fix bug where wrong Date header was being picked up in quarantined headers; all tests now pass

Index: TestMailParse.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse.tst,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TestMailParse.tst	29 Mar 2003 00:26:55 -0000	1.6
--- TestMailParse.tst	26 Jun 2003 14:09:00 -0000	1.7
***************
*** 24,29 ****
  
  # Check line splitting into words
! $cl->{htmlbackcolor} = $cl->map_color( 'white' );
! $cl->{htmlfontcolor} = $cl->map_color( 'black' );
  $cl->{words__}       = {};
  $cl->add_line( 'this is a test of,adding words: from a line of text!', 0, '' );
--- 24,29 ----
  
  # Check line splitting into words
! $cl->{htmlbackcolor__} = $cl->map_color( 'white' );
! $cl->{htmlfontcolor__} = $cl->map_color( 'black' );
  $cl->{words__}       = {};
  $cl->add_line( 'this is a test of,adding words: from a line of text!', 0, '' );
***************
*** 62,66 ****
  test_assert_equal( $cl->{htmlfontcolor__}, $cl->map_color( 'red' ) );
  $cl->{htmlfontcolor__} = '';
! test_assert_equal( $cl->parse_html( '<font color=#00ff00>' ), 0 );
  test_assert_equal( $cl->{htmlfontcolor__}, $cl->map_color( 'green' ) );
  $cl->{htmlfontcolor__} = '';
--- 62,66 ----
  test_assert_equal( $cl->{htmlfontcolor__}, $cl->map_color( 'red' ) );
  $cl->{htmlfontcolor__} = '';
! test_assert_equal( $cl->parse_html( '<font color=#008000>' ), 0 );
  test_assert_equal( $cl->{htmlfontcolor__}, $cl->map_color( 'green' ) );
  $cl->{htmlfontcolor__} = '';
***************
*** 130,145 ****
  # Check that from, to and subject get set correctly when parsing a message
  $cl->parse_stream( 'tests/TestMailParse013.msg' );
! test_assert_equal( $cl->{from},    'RN <rr...@nn...>'                        );
! test_assert_equal( $cl->{to},      '"Armlet Forum" <arm...@ne...>' );
! test_assert_equal( $cl->{subject}, '(Archive Copy) RE: CW v9 and armlets...'       );
  $cl->parse_stream( 'tests/TestMailParse018.msg' );
! $cl->{to} =~ /(\Qbugtracker\E@\Qrelativity.com\E)/;
  test_assert_equal( $1, 'bug...@re...' );
  $cl->parse_stream( 'tests/TestMailParse019.msg' );
! $cl->{to} =~ /(\Qbugtracker\E@\Qrelativity.com\E)/;
  test_assert_equal( $1, 'bug...@re...' );
  
  # Check that multi-line To: and CC: headers get handled properly
  $cl->parse_stream( 'tests/TestMailParse021.msg' );
! test_assert_equal( $cl->{to},      'ds...@ct..., ds...@do..., ds...@di..., ds...@di..., ds...@cr..., <ds...@cy...>, <ds...@do...>, <ds...@db...>, <ds...@cs...>, <ds...@cr...>, <ds...@dr...>, <ds...@cv...>, <ds...@dm...>, <ds...@da...>, <ds...@da...>' );
! test_assert_equal( $cl->{cc},      'ds...@dm..., ds...@da..., ds...@cr..., ds...@da..., <ds...@do...>, <ds...@dn...>, <ds...@cy...>, <ds...@cs...>, <ds...@di...>, <ds...@cv...>, <ds...@dr...>, <ds...@cr...>, <ds...@dc...>, <ds...@da...>' );
--- 130,148 ----
  # Check that from, to and subject get set correctly when parsing a message
  $cl->parse_stream( 'tests/TestMailParse013.msg' );
! test_assert_equal( $cl->{from__},    'RN <rr...@nn...>'                        );
! test_assert_equal( $cl->{to__},      '"Armlet Forum" <arm...@ne...>' );
! test_assert_equal( $cl->{subject__}, '(Archive Copy) RE: CW v9 and armlets...'       );
  $cl->parse_stream( 'tests/TestMailParse018.msg' );
! $cl->{to__} =~ /(\Qbugtracker\E@\Qrelativity.com\E)/;
  test_assert_equal( $1, 'bug...@re...' );
  $cl->parse_stream( 'tests/TestMailParse019.msg' );
! $cl->{to__} =~ /(\Qbugtracker\E@\Qrelativity.com\E)/;
  test_assert_equal( $1, 'bug...@re...' );
  
  # Check that multi-line To: and CC: headers get handled properly
  $cl->parse_stream( 'tests/TestMailParse021.msg' );
! $cl->{to__} =~ s/[\r\n]//g;
! test_assert_equal( $cl->{to__},      'ds...@ct..., ds...@do..., ds...@di..., ds...@di..., ds...@cr..., 	<ds...@cy...>, <ds...@do...>, <ds...@db...>, <ds...@cs...>	, <ds...@cr...>, 	<ds...@dr...>, <ds...@cv...>, <ds...@dm...>, <ds...@da...>, 	<ds...@da...>' );
! $cl->{cc__} =~ s/[\r\n]//g;
! test_assert_equal( $cl->{cc__},      'ds...@dm..., ds...@da..., ds...@cr..., ds...@da..., 	<ds...@do...>, <ds...@dn...>, <ds...@cy...>, <ds...@cs...>, 	<ds...@di...>, <ds...@cv...>, <ds...@dr...>, <ds...@cr...>, 	<ds...@dc...>, <ds...@da...>' );
! 

Index: TestMailParse003.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse003.cam,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMailParse003.cam	16 Apr 2003 01:26:45 -0000	1.4
--- TestMailParse003.cam	26 Jun 2003 14:09:00 -0000	1.5
***************
*** 13,21 ****
  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
--- 13,24 ----
  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
***************
*** 30,34 ****
  ayBIZXJlPC9hPjxCUj4NCjxCUj48L2h0bWw+DQoNCmFQcTgyTU9kICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjTUo=
  --=gs6mlah1knva3tk5nbs4422k3570q7m3k==--
! X-Text-Classification: spam
! X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
--- 33,36 ----
  ayBIZXJlPC9hPjxCUj4NCjxCUj48L2h0bWw+DQoNCmFQcTgyTU9kICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjTUo=
  --=gs6mlah1knva3tk5nbs4422k3570q7m3k==--
! 
  

Index: TestMailParse003.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse003.wrd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse003.wrd	24 Jan 2003 23:18:44 -0000	1.2
--- TestMailParse003.wrd	26 Jun 2003 14:09:00 -0000	1.3
***************
*** 16,20 ****
  encoding:base64 1
  earthlink.net 2
! html:encodedurl 22
  girls 1
  click 2
--- 16,20 ----
  encoding:base64 1
  earthlink.net 2
! html:encodedurl 3
  girls 1
  click 2

Index: TestMailParse005.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse005.wrd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestMailParse005.wrd	20 Jan 2003 20:11:58 -0000	1.1
--- TestMailParse005.wrd	26 Jun 2003 14:09:00 -0000	1.2
***************
*** 16,20 ****
  san 1
  diego 1
- trick:dottedwords 1
  bit 1
  webcam 3
--- 16,19 ----
***************
*** 23,27 ****
  xos...@ho... 2
  ano...@ns... 1
- psremember 1
  www.freelivecamgirls.net 2
  yah 1
--- 22,25 ----
***************
*** 37,41 ****
  live 2
  don't 1
! remember 1
  co.kr 1
  monday 1
--- 35,39 ----
  live 2
  don't 1
! remember 2
  co.kr 1
  monday 1

Index: TestMailParse007.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse007.wrd,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestMailParse007.wrd	24 Jan 2003 23:18:44 -0000	1.3
--- TestMailParse007.wrd	26 Jun 2003 14:09:00 -0000	1.4
***************
*** 159,163 ****
  lose 1
  put 1
! mail126.ninodw.com 1
  regularly 1
  seems 1
--- 159,163 ----
  lose 1
  put 1
! mail126.ninodw.com 2
  regularly 1
  seems 1
***************
*** 228,232 ****
  gryhfcynarg 1
  now 4
! ninodw.com 1
  subject:girls 1
  fuckin 1
--- 228,232 ----
  gryhfcynarg 1
  now 4
! ninodw.com 2
  subject:girls 1
  fuckin 1

Index: TestMailParse008.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse008.wrd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestMailParse008.wrd	20 Jan 2003 20:11:59 -0000	1.1
--- TestMailParse008.wrd	26 Jun 2003 14:09:00 -0000	1.2
***************
*** 3,7 ****
  join 2
  group 1
! telusplanet.net 1
  what's 1
  from:alice 1
--- 3,7 ----
  join 2
  group 1
! telusplanet.net 3
  what's 1
  from:alice 1
***************
*** 42,46 ****
  just 2
  tell 1
! priv-edtnes27.telusplanet.net 1
  from:yahu.com 1
  friends 1
--- 42,46 ----
  just 2
  tell 1
! priv-edtnes27.telusplanet.net 2
  from:yahu.com 1
  friends 1

Index: TestMailParse009.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse009.wrd,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMailParse009.wrd	25 Feb 2003 02:04:13 -0000	1.4
--- TestMailParse009.wrd	26 Jun 2003 14:09:00 -0000	1.5
***************
*** 17,21 ****
  encoding:7bit 1
  poetic.com 2
! white 3
  from:poetic.com 1
  200.204.91.79 2
--- 17,21 ----
  encoding:7bit 1
  poetic.com 2
! white 2
  from:poetic.com 1
  200.204.91.79 2
***************
*** 23,25 ****
  subject:comman 1
  28...@28... 1
- 202.108.221.16 4
--- 23,24 ----

Index: TestMailParse010.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse010.cam,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5

Index: TestMailParse010.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse010.wrd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse010.wrd	27 Feb 2003 09:49:38 -0000	1.2
--- TestMailParse010.wrd	26 Jun 2003 14:09:00 -0000	1.3
***************
*** 2,9 ****
  rm_...@ma... 1
  authenticated 2
! myrealbox.com 1
  subject:activation 1
  less 1
- further 1
  membership 1
  adult 1
--- 2,8 ----
  rm_...@ma... 1
  authenticated 2
! myrealbox.com 2
  subject:activation 1
  less 1
  membership 1
  adult 1
***************
*** 13,20 ****
  member 1
  recieve 1
- simply 1
  receive 1
  card 1
! digitalme.com 1
  wish 1
  subject:regarding 1
--- 12,18 ----
  member 1
  recieve 1
  receive 1
  card 1
! digitalme.com 2
  wish 1
  subject:regarding 1
***************
*** 23,27 ****
  to:ar...@my... 1
  here 2
- instanthome 1
  mailing 1
  section 1
--- 21,24 ----

Index: TestMailParse011.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse011.cam,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMailParse011.cam	16 Apr 2003 01:26:45 -0000	1.4
--- TestMailParse011.cam	26 Jun 2003 14:09:00 -0000	1.5
***************
*** 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
***************
*** 15,20 ****
  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>
--- 15,19 ----
  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>

Index: TestMailParse011.msg
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse011.msg,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestMailParse011.msg	16 Apr 2003 01:26:45 -0000	1.3
--- TestMailParse011.msg	26 Jun 2003 14:09:00 -0000	1.4
***************
*** 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
***************
*** 15,20 ****
  Content-Transfer-Encoding: 7bit
  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.
--- 15,19 ----
  Content-Transfer-Encoding: 7bit
  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.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse012.wrd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestMailParse012.wrd	21 Jan 2003 01:35:00 -0000	1.1
--- TestMailParse012.wrd	26 Jun 2003 14:09:00 -0000	1.2
***************
*** 10,14 ****
  girl 1
  subject:tiny 1
! sunsinger 3
  you'll 1
  stop 1
--- 10,14 ----
  girl 1
  subject:tiny 1
! sunsinger 4
  you'll 1
  stop 1
***************
*** 28,32 ****
  animals 1
  subject:spam 1
! herald 3
  here 2
  subject:want 1
--- 28,32 ----
  animals 1
  subject:spam 1
! herald 4
  here 2
  subject:want 1

Index: TestMailParse013.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse013.cam,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMailParse013.cam	16 Apr 2003 01:26:45 -0000	1.4
--- TestMailParse013.cam	26 Jun 2003 14:09:00 -0000	1.5
***************
*** 1,10 ****
- 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...>
--- 1,7 ----
  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...>

Index: TestMailParse013.msg
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse013.msg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestMailParse013.msg	7 Feb 2003 22:24:33 -0000	1.1
--- TestMailParse013.msg	26 Jun 2003 14:09:00 -0000	1.2
***************
*** 1,10 ****
- 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...>
--- 1,7 ----
  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...>

Index: TestMailParse013.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse013.wrd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse013.wrd	24 Jan 2003 23:18:44 -0000	1.2
--- TestMailParse013.wrd	26 Jun 2003 14:09:00 -0000	1.3
***************
*** 17,21 ****
  mode 1
  arm 1
- nnnnnnnnn.com 1
  wrote 1
  register 3
--- 17,20 ----
***************
*** 42,46 ****
  developer 1
  course 1
! palmos.com 6
  to:news.palmos.com 1
  won't 2
--- 41,45 ----
  developer 1
  course 1
! palmos.com 7
  to:news.palmos.com 1
  won't 2
***************
*** 49,53 ****
  see 1
  please 1
- rr...@nn... 1
  posted 1
  ajw.com 3
--- 48,51 ----
***************
*** 85,89 ****
  forum 4
  renaming 1
! news.palmos.com 5
  mbf 1
  hhhhhh 1
--- 83,87 ----
  forum 4
  renaming 1
! news.palmos.com 6
  mbf 1
  hhhhhh 1
***************
*** 98,102 ****
  variable 2
  bounce 2
! rrr 1
  callbacks 1
  get 3
--- 96,100 ----
  variable 2
  bounce 2
! rrr 2
  callbacks 1
  get 3

Index: TestMailParse015.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse015.wrd,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestMailParse015.wrd	31 Jan 2003 17:24:51 -0000	1.3
--- TestMailParse015.wrd	26 Jun 2003 14:09:00 -0000	1.4
***************
*** 1,5 ****
  animals 1
  wen...@ms... 1
! herald 3
  html:comment 1
  here 2
--- 1,5 ----
  animals 1
  wen...@ms... 1
! herald 4
  html:comment 1
  here 2
***************
*** 20,24 ****
  66.125.127.84 2
  host 1
! vanyel 3
  dsl.pltn13.pacbell.net 2
  girls 1
--- 20,24 ----
  66.125.127.84 2
  host 1
! vanyel 4
  dsl.pltn13.pacbell.net 2
  girls 1

Index: TestMailParse017.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse017.wrd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestMailParse017.wrd	27 Jan 2003 23:13:29 -0000	1.1
--- TestMailParse017.wrd	26 Jun 2003 14:09:00 -0000	1.2
***************
*** 1,3 ****
- microsoft 1
  200.155.65.82 1
  site 2
--- 1,2 ----
***************
*** 11,15 ****
  from:hot...@ya... 1
  hottest 2
- smtpsvc 1
  203.146.108.97 1
  mx1.mail.yahoo.com 1
--- 10,13 ----

Index: TestMailParse019.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse019.wrd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse019.wrd	18 Feb 2003 06:25:38 -0000	1.2
--- TestMailParse019.wrd	26 Jun 2003 14:09:00 -0000	1.3
***************
*** 64,73 ****
  slice 1
  generated 2
! bu...@dr... 2
  vi.relativity.com 1
  archives 1
! postfix 1
  confirmed 1
! tepkom 3
  to:el...@te... 1
  to:bug...@re... 1
--- 64,73 ----
  slice 1
  generated 2
! bu...@dr... 1
  vi.relativity.com 1
  archives 1
! postfix 3
  confirmed 1
! tepkom 5
  to:el...@te... 1
  to:bug...@re... 1
***************
*** 79,83 ****
  internet 1
  63.100.138.144 1
! drunin.net 2
  fix 1
  subject:dev 1
--- 79,83 ----
  internet 1
  63.100.138.144 1
! drunin.net 1
  fix 1
  subject:dev 1

Index: TestMailParse020.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse020.wrd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestMailParse020.wrd	20 Feb 2003 21:36:44 -0000	1.1
--- TestMailParse020.wrd	26 Jun 2003 14:09:00 -0000	1.2
***************
*** 65,69 ****
  moderator 1
  subject:please 1
- eplgcfxgcq 1
  pgp.mit.edu 1
  edit 1
--- 65,68 ----

Index: TestMailParse021.msg
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse021.msg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestMailParse021.msg	25 Feb 2003 02:04:13 -0000	1.1
--- TestMailParse021.msg	26 Jun 2003 14:09:00 -0000	1.2
***************
*** 1,36 ****
! Received: by mail (mbox dsmith)
!  (with Cubic Circle's cucipop (v1.31 1998/05/13) Wed Feb 12 21:05:46 2003)
! X-From_: cxc...@ya...  Wed Feb 12 20:51:28 2003
! Return-Path: <cxc...@ya...>
! Received: from srvexch.reichraming.helopal.com ([213.33.65.211])
! 	by mx.datasync.com (8.11.6/8.11.6) with ESMTP id h1D2pRM12104
! 	for <ds...@da...>; Wed, 12 Feb 2003 20:51:27 -0600
! Received: from mx1.mail.yahoo.com ([4.47.64.57]) by srvexch.reichraming.helopal.com with Microsoft SMTPSVC(5.0.2195.5329);
! 	 Thu, 13 Feb 2003 03:51:22 +0100
! Message-ID: <000067513ece$00005b27$000...@mx...>
! To: ds...@ct..., ds...@do..., ds...@di..., ds...@di..., ds...@cr..., 
! 	<ds...@cy...>, <ds...@do...>, <ds...@db...>, <ds...@cs...>
! 	, <ds...@cr...>, 
! 	<ds...@dr...>, <ds...@cv...>, <ds...@dm...>, <ds...@da...>, 
! 	<ds...@da...>
! CC: ds...@dm..., ds...@da..., ds...@cr..., ds...@da..., 
! 	<ds...@do...>, <ds...@dn...>, <ds...@cy...>, <ds...@cs...>, 
! 	<ds...@di...>, <ds...@cv...>, <ds...@dr...>, <ds...@cr...>, 
! 	<ds...@dc...>, <ds...@da...>
! From: "MARGIT" <cxc...@ya...>
! Subject:  Enlarge your package Doctor ApprovedNHOBS
! Date: Wed, 12 Feb 2003 20:51:18 01800
! MIME-Version: 1.0
! Content-Type: text/html;
! 	charset="iso-8859-1"
! Content-Transfer-Encoding: quoted-printable
! Reply-To: cxc...@ya...
! X-OriginalArrivalTime: 13 Feb 2003 02:51:23.0500 (UTC) FILETIME=[CB6012C0:01C2D30A]
! 
! <html><body><font face=Tahoma size=2 color=#FFFFFF><table border=0 width=489 height=41 bgcolor=#FFFFFF><tr><td width=100% height=35 bgcolor=#000000 align=center><font face=Impact size=3 color=#00FFFF>Take Control of Your Computer With This Top-of-the-Line Software!</font></td></tr></table><table border=5 cellspacing=3 width=489 cellpadding=3 bgcolor=#000080 bordercolor=#FFFFFF style="border-collapse: collapse" bordercolordark=#000000 height=567 bordercolorlight=#CCCCFF><tr><td width=467 height=555 bordercolorlight=#FFFFFF bordercolordark=#FFFF99><table border=6 width=100% height=86 bgcolor=#000000 bordercolor=#FFFFFF><tr><td width=100% height=80 align=center><b><font face=Tahoma size=6 color=#FFFFFF>
! Norton SystemWorks 2003</font><font color=#FF0000 face=Tahoma size=6> </font><font face=Tahoma size=5 color=#FFFF99> Software Suite</font><font color=#FF0000 face="Times New Roman" size=6><br> </font><font face="Times New Roman" size=6 color=#CCCCFF> -<i>Professional Edition</i>-</font></b></td></tr></table><table border=0 width=100% height=62><tr><td width=100% height=56 align=center><b><font face=Tahoma size=4 color=#CCFFFF>Includes Six - </font><font face=Tahoma size=4 color=#FFFFFF><i>Yes 6!</i> </font><font face=Tahoma size=4 color=#CCFFFF> - Feature-Packed Utilities<br>ALL for </font><font face=Tahoma size=4 color=#FFFFFF>1 Special LOW Price of Only $39.99!</font></b></td></tr></table><table border=4 width=100% height=135 bgcolor=#000080 bordercolor=#CCCCFF><tr><td width=100% height=129 bgcolor=#000000 bordercolor=#000080><b><font face=Tahoma size=2><font color=#FFFF99>This Software Will:<font face=Tahoma size=1 color=#000000></font><font color=#FFFFFF><br>&nbsp;- Protect your computer from unwanted and <i> hazardous</i> viruses<br>&nbsp;- Help secure your private &amp; valuable information<br>&nbsp;- Allow you to transfer files and send e-mails <u> safely</u><br>&nbsp;- Backup your ALL your data quick and easily<br>&nbsp;- Improve your PC's performance w/<i>superior</i> integral diagnostics!<br>&nbsp;- <i>You'll NEVER have to take your PC to the repair shop AGAIN!</i></font></font></b></td></tr></table>&nbsp;<table border=4 width=100% height=4 bgcolor=#000000 bordercolor=#CCCCFF><tr><td width=100% height=1><p align=center><b><font face=Tahoma size=5 color=#FFFFFF>6</font><font size=5 face=Tahoma><font color=#00FFFF> Top-of-the-Line </font></font><font face=Tahoma size=5 color=#FFFFFF> Utilities</font><font size=5 face=Tahoma><font color=#00FFFF><font color=#000080 size=5><br></font><u>1 </u></font></font><u><font face=Tahoma size=5 color=#FFFFFF> Great Price</font></u><font color=#000000 size=5> <font size=5 face=Tahoma><font color=#00FFFF><br> A </font></font> </font> <font face=Tahoma size=5 color=#FFFFFF>$249+</font><font color=#000000 size=5> <font size=5 face=Tahoma><font color=#00FFFF> </font></font> </font> <font face=Tahoma size=5 color=#FFFFFF> Combined Retail Value</font><font size=5 face=Tahoma><font color=#00FFFF><font color=#000000 size=5> </font> <i>YOURS</i> </font></font><font face=Tahoma size=5 color=#FFFFFF> for a limited time</font><font size=5 face=Tahoma><font color=#00FFFF> for Only !!!</font></font><font face=Tahoma size=5 color=#FFFFFF>$39.99</font><font face=Tahoma size=5 color=#00FFFF>!!!</font><font size=6><br> </font></b><font face=Tahoma size=4><font color=#00FFFF>&lt; </font></font><font face=Tahoma size=4 color=#FFFFFF> Price Includes FREE Shipping! </font><font color=#00FFFF><font face=Tahoma size=4> &gt;<br></font></font><font face=Impact size=4 color=#CCFFFF>And For a Limited time Buy 2 of Our Products &amp; Get 1 Free!</font></td></tr></table><p align=Center><b><font face=Tahoma size=3 color=#FFFFFF>Don't fall prey to destructive viruses or hackers!<br>Protect&nbsp; your computer and your valuable information and</font></b></p><table border=4 width=100% height=44 bordercolor=#FFFFFF bgcolor=#000080><tr><td width=100% height=38 bgcolor=#FFFFFF align=center><b>
! <a style="color: #FF0000; font-family: Verdana; font-size: 14pt; font-weight: bold" href="http://www.upgradesrus.net/nortonsw3.htm"><font face=Tahoma size=4 color=#0000FF>-&gt; CLICK HERE to Order Yours NOW! &lt;-</font></a></b></td></tr></table><br><p align=Center><font color=#ffffff size=5 face=Tahoma> <p align=Center><font color=#ffffff size=1 face=Tahoma>Your email address was obtained from an opt-in list. Opt-in EAF (Ecommerce Anti-Spam Federation) Approved List - Type UPC Prefix = YY*wud02FLUS.&nbsp;To unsubscribe from this list, please
! <a style="color: #ffffcc" href="http://www.upgradesrus.net/remove.asp">Click here</a> . Please allow 5 Business days for removal. We do not condone spam in any shape or form. Thank You kindly for your cooperation.</font></td></tr></table><font face=Tahoma size=4 color=#FFFFFF></body></html>
! 
! 
! 
--- 1,36 ----
! Received: by mail (mbox dsmith)
!  (with Cubic Circle's cucipop (v1.31 1998/05/13) Wed Feb 12 21:05:46 2003)
! X-From_: cxc...@ya...  Wed Feb 12 20:51:28 2003
! Return-Path: <cxc...@ya...>
! Received: from srvexch.reichraming.helopal.com ([213.33.65.211])
! 	by mx.datasync.com (8.11.6/8.11.6) with ESMTP id h1D2pRM12104
! 	for <ds...@da...>; Wed, 12 Feb 2003 20:51:27 -0600
! Received: from mx1.mail.yahoo.com ([4.47.64.57]) by srvexch.reichraming.helopal.com with Microsoft SMTPSVC(5.0.2195.5329);
! 	 Thu, 13 Feb 2003 03:51:22 +0100
! Message-ID: <000067513ece$00005b27$000...@mx...>
! To: ds...@ct..., ds...@do..., ds...@di..., ds...@di..., ds...@cr..., 
! 	<ds...@cy...>, <ds...@do...>, <ds...@db...>, <ds...@cs...>
! 	, <ds...@cr...>, 
! 	<ds...@dr...>, <ds...@cv...>, <ds...@dm...>, <ds...@da...>, 
! 	<ds...@da...>
! CC: ds...@dm..., ds...@da..., ds...@cr..., ds...@da..., 
! 	<ds...@do...>, <ds...@dn...>, <ds...@cy...>, <ds...@cs...>, 
! 	<ds...@di...>, <ds...@cv...>, <ds...@dr...>, <ds...@cr...>, 
! 	<ds...@dc...>, <ds...@da...>
! From: "MARGIT" <cxc...@ya...>
! Subject:  Enlarge your package Doctor ApprovedNHOBS
! Date: Wed, 12 Feb 2003 20:51:18 01800
! MIME-Version: 1.0
! Content-Type: text/html;
! 	charset="iso-8859-1"
! Content-Transfer-Encoding: quoted-printable
! Reply-To: cxc...@ya...
! X-OriginalArrivalTime: 13 Feb 2003 02:51:23.0500 (UTC) FILETIME=[CB6012C0:01C2D30A]
! 
! <html><body><font face=Tahoma size=2 color=#FFFFFF><table border=0 width=489 height=41 bgcolor=#FFFFFF><tr><td width=100% height=35 bgcolor=#000000 align=center><font face=Impact size=3 color=#00FFFF>Take Control of Your Computer With This Top-of-the-Line Software!</font></td></tr></table><table border=5 cellspacing=3 width=489 cellpadding=3 bgcolor=#000080 bordercolor=#FFFFFF style="border-collapse: collapse" bordercolordark=#000000 height=567 bordercolorlight=#CCCCFF><tr><td width=467 height=555 bordercolorlight=#FFFFFF bordercolordark=#FFFF99><table border=6 width=100% height=86 bgcolor=#000000 bordercolor=#FFFFFF><tr><td width=100% height=80 align=center><b><font face=Tahoma size=6 color=#FFFFFF>
! Norton SystemWorks 2003</font><font color=#FF0000 face=Tahoma size=6> </font><font face=Tahoma size=5 color=#FFFF99> Software Suite</font><font color=#FF0000 face="Times New Roman" size=6><br> </font><font face="Times New Roman" size=6 color=#CCCCFF> -<i>Professional Edition</i>-</font></b></td></tr></table><table border=0 width=100% height=62><tr><td width=100% height=56 align=center><b><font face=Tahoma size=4 color=#CCFFFF>Includes Six - </font><font face=Tahoma size=4 color=#FFFFFF><i>Yes 6!</i> </font><font face=Tahoma size=4 color=#CCFFFF> - Feature-Packed Utilities<br>ALL for </font><font face=Tahoma size=4 color=#FFFFFF>1 Special LOW Price of Only $39.99!</font></b></td></tr></table><table border=4 width=100% height=135 bgcolor=#000080 bordercolor=#CCCCFF><tr><td width=100% height=129 bgcolor=#000000 bordercolor=#000080><b><font face=Tahoma size=2><font color=#FFFF99>This Software Will:<font face=Tahoma size=1 color=#000000></font><font color=#FFFFFF><br>&nbsp;- Protect your computer from unwanted and <i> hazardous</i> viruses<br>&nbsp;- Help secure your private &amp; valuable information<br>&nbsp;- Allow you to transfer files and send e-mails <u> safely</u><br>&nbsp;- Backup your ALL your data quick and easily<br>&nbsp;- Improve your PC's performance w/<i>superior</i> integral diagnostics!<br>&nbsp;- <i>You'll NEVER have to take your PC to the repair shop AGAIN!</i></font></font></b></td></tr></table>&nbsp;<table border=4 width=100% height=4 bgcolor=#000000 bordercolor=#CCCCFF><tr><td width=100% height=1><p align=center><b><font face=Tahoma size=5 color=#FFFFFF>6</font><font size=5 face=Tahoma><font color=#00FFFF> Top-of-the-Line </font></font><font face=Tahoma size=5 color=#FFFFFF> Utilities</font><font size=5 face=Tahoma><font color=#00FFFF><font color=#000080 size=5><br></font><u>1 </u></font></font><u><font face=Tahoma size=5 color=#FFFFFF> Great Price</font></u><font color=#000000 size=5> <font size=5 face=Tahoma><font color=#00FFFF><br> A </font></font> </font> <font face=Tahoma size=5 color=#FFFFFF>$249+</font><font color=#000000 size=5> <font size=5 face=Tahoma><font color=#00FFFF> </font></font> </font> <font face=Tahoma size=5 color=#FFFFFF> Combined Retail Value</font><font size=5 face=Tahoma><font color=#00FFFF><font color=#000000 size=5> </font> <i>YOURS</i> </font></font><font face=Tahoma size=5 color=#FFFFFF> for a limited time</font><font size=5 face=Tahoma><font color=#00FFFF> for Only !!!</font></font><font face=Tahoma size=5 color=#FFFFFF>$39.99</font><font face=Tahoma size=5 color=#00FFFF>!!!</font><font size=6><br> </font></b><font face=Tahoma size=4><font color=#00FFFF>&lt; </font></font><font face=Tahoma size=4 color=#FFFFFF> Price Includes FREE Shipping! </font><font color=#00FFFF><font face=Tahoma size=4> &gt;<br></font></font><font face=Impact size=4 color=#CCFFFF>And For a Limited time Buy 2 of Our Products &amp; Get 1 Free!</font></td></tr></table><p align=Center><b><font face=Tahoma size=3 color=#FFFFFF>Don't fall prey to destructive viruses or hackers!<br>Protect&nbsp; your computer and your valuable information and</font></b></p><table border=4 width=100% height=44 bordercolor=#FFFFFF bgcolor=#000080><tr><td width=100% height=38 bgcolor=#FFFFFF align=center><b>
! <a style="color: #FF0000; font-family: Verdana; font-size: 14pt; font-weight: bold" href="http://www.upgradesrus.net/nortonsw3.htm"><font face=Tahoma size=4 color=#0000FF>-&gt; CLICK HERE to Order Yours NOW! &lt;-</font></a></b></td></tr></table><br><p align=Center><font color=#ffffff size=5 face=Tahoma> <p align=Center><font color=#ffffff size=1 face=Tahoma>Your email address was obtained from an opt-in list. Opt-in EAF (Ecommerce Anti-Spam Federation) Approved List - Type UPC Prefix = YY*wud02FLUS.&nbsp;To unsubscribe from this list, please
! <a style="color: #ffffcc" href="http://www.upgradesrus.net/remove.asp">Click here</a> . Please allow 5 Business days for removal. We do not condone spam in any shape or form. Thank You kindly for your cooperation.</font></td></tr></table><font face=Tahoma size=4 color=#FFFFFF></body></html>
! 
! 
!