Fixed for whitelist

Seems OnWhitelist had an additional parameter for userid.

diff --git a/maps/bin/MAPS.pm b/maps/bin/MAPS.pm
index bf6c82a..babf46b 100644 (file)
--- a/maps/bin/MAPS.pm
+++ b/maps/bin/MAPS.pm
@@ -451,7 +451,7 @@ sub OnNulllist ($;$) {
   return CheckOnList "null", $sender, $update;
 } # CheckOnNulllist
 
-sub OnWhitelist ($;$) {
+sub OnWhitelist ($;$$) {
   my ($sender, $userid, $update) = @_;
 
   if (defined $userid) {

diff --git a/maps/bin/checkaddress b/maps/bin/checkaddress
index 92f4c64..3ebefbc 100755 (executable)
--- a/maps/bin/checkaddress
+++ b/maps/bin/checkaddress
@@ -63,11 +63,11 @@ foreach (@ARGV) {
   # Finally, we handle return processing
   
   # Check whitelist
-  if (OnWhitelist $sender) {
+  if (OnWhitelist $sender, $username, 0) {
     display "Sender $sender would be whitelisted";
-  } elsif (OnBlacklist $sender) {
+  } elsif (OnBlacklist $sender, 0) {
     display "Sender $sender would be be blacklisted";
-  } elsif (OnNulllist $sender) {
+  } elsif (OnNulllist $sender, 0) {
     display "Sender $sender would be nulllisted"
   } else {
     display "Sender $sender would be returned"

diff --git a/maps/bin/checkaddress.cgi b/maps/bin/checkaddress.cgi
index 0912182..3b28cce 100755 (executable)
--- a/maps/bin/checkaddress.cgi
+++ b/maps/bin/checkaddress.cgi
@@ -64,7 +64,7 @@ sub Body {
   # Then we process nulllist people.
   #
   # Finally, we handle return processing
-  ($onlist, $rule) = OnWhitelist $sender, 0;
+  ($onlist, $rule) = OnWhitelist $sender, $userid, 0;
 
   if ($onlist) {
     print div {-align => "center"},

diff --git a/maps/bin/detail.cgi b/maps/bin/detail.cgi
index fe98a1b..646f51e 100755 (executable)
--- a/maps/bin/detail.cgi
+++ b/maps/bin/detail.cgi
@@ -178,7 +178,7 @@ sub PrintTable {
     my ($onlist, $rule);
     $rule = 'none';
 
-    ($onlist, $rule) = OnWhitelist $sender, 0;
+    ($onlist, $rule) = OnWhitelist $sender, $userid, 0;
 
     unless ($onlist) {
       ($onlist, $rule) = OnBlacklist $sender, 0;