X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=maps%2Fbin%2Fcheckaddress;h=92f4c648968d3d53548306abfa81f5be0973bca5;hb=86c53e0f6f2444f02083e93202169965ce300c1e;hp=19a0df5555b6abe000934717ee4779a3c62e8c15;hpb=30a8417fed91992fd099fa8d9aa774f587bc607c;p=clearscm.git

diff --git a/maps/bin/checkaddress b/maps/bin/checkaddress
index 19a0df5..92f4c64 100755
--- a/maps/bin/checkaddress
+++ b/maps/bin/checkaddress
@@ -45,23 +45,31 @@ foreach (@ARGV) {
     next;
   } # if
 
-  ($status, $rule) = OnNulllist $sender;
-
-  if ($status) {
-    display "Sender $sender would be nulllist'ed\n$rule";
+  # Algorithm change: We now first check to see if the sender is not found
+  # in the message and skip it if so. Then we handle if we are the sender
+  # and that the from address is formatted properly. Spammers often use 
+  # the senders email address (i.e. andrew@defaria.com) as their from address
+  # so we check "Andrew DeFaria <Andrew@DeFaria.com>", which they have never
+  # forged. This catches a lot of spam actually.
+  #
+  # Next we check to see if the sender is on our whitelist. If so then we let
+  # them in. This allows us to say whitelist josephrosenberg@hotmail.com while
+  # still nulllisting all of the other hotmail.com spammers.
+  #
+  # Next we process blacklisted people as they are also of high priority.
+  #
+  # Then we process nulllist people.
+  #
+  # Finally, we handle return processing
+  
+  # Check whitelist
+  if (OnWhitelist $sender) {
+    display "Sender $sender would be whitelisted";
+  } elsif (OnBlacklist $sender) {
+    display "Sender $sender would be be blacklisted";
+  } elsif (OnNulllist $sender) {
+    display "Sender $sender would be nulllisted"
   } else {
-    ($status, $rule) = OnBlacklist $sender;
-
-    if ($status) {
-      display "Sender $sender would be blacklist'ed\n$rule";
-    } else {
-      ($status, $rule) = OnWhitelist $sender;
-
-      if ($status) {
-	display "Sender $sender would be whitelist'ed\n$rule";
-      } else {
-	display "Sender $sender would be returned";
-      } # if
-    } # if
-  } # if
+    display "Sender $sender would be returned"
+  } # if 
 } # foreach