[Spamscan-cvs] spamscan/bin spamscan,1.5,1.6

[<de...@us...>]

Update of /cvsroot/spamscan/spamscan/bin
In directory sc8-pr-cvs1:/tmp/cvs-serv32569

Modified Files:
	spamscan 
Log Message:
Made notspam messages more powerful, added option to turn off db usage via config file, and now shows db results in headers (temp only)

Index: spamscan
===================================================================
RCS file: /cvsroot/spamscan/spamscan/bin/spamscan,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** spamscan	23 Jul 2003 02:23:05 -0000	1.5
--- spamscan	11 Aug 2003 21:35:07 -0000	1.6
***************
*** 37,40 ****
--- 37,41 ----
  if ($User_Preferences{'striphtml'}) { $striphtml = $User_Preferences{'striphtml'}; }
  if ($User_Preferences{'passcode'}) { $passcode = $User_Preferences{'passcode'}; }
+ if ($User_Preferences{'use_db'}) { $use_db = $User_Preferences{'use_db'}; }
  
  
***************
*** 42,46 ****
  
  ##########################################################
! $version = "1.71b";
  $url = "http:\/\/spamscan.sourceforge.net";
  
--- 43,47 ----
  
  ##########################################################
! $version = "1.75b";
  $url = "http:\/\/spamscan.sourceforge.net";
  
***************
*** 148,152 ****
  &to_filter;
  &body_filter;
! &db_filter;
  
  if ($spampassword eq $passcode) {
--- 149,155 ----
  &to_filter;
  &body_filter;
! if ($use_db eq "y") {
! 	&db_filter;
! }
  
  if ($spampassword eq $passcode) {
***************
*** 428,431 ****
--- 431,436 ----
                          # $phrasedb{$wordcksum}--;
                          $phrasedb{$wordling}--;
+                         $phrasedb{$wordling}--;
+                         $phrasedb{$wordling}--;
                          $wordling = "";
                  }
***************
*** 525,531 ****
                          }
                          $wordling =~ s/\s+$//;
!                         $wordcksum = unpack ("%32C*", $wordling) % 32767;
                          # $phrasedb{$wordcksum}--;
                          $dbcount = $dbcount + $phrasedb{$wordling};
                          $wordling = "";
                  }
--- 530,538 ----
                          }
                          $wordling =~ s/\s+$//;
!                         # $wordcksum = unpack ("%32C*", $wordling) % 32767;
                          # $phrasedb{$wordcksum}--;
                          $dbcount = $dbcount + $phrasedb{$wordling};
+ 			$rsnline = "$wordling \- $phrasedb{$wordling}";
+ 			push (@spamreasons, $rsnline);
                          $wordling = "";
                  }