X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=maps%2Fbin%2Fcheckaddress.cgi;h=ddec3d5891a21a3a0308929224c77c56db7ce3f1;hb=4f37839bc9faacb57d9bce9196d916595f14b114;hp=09121821f5c21694afa9e7623abe326ffe79e72e;hpb=ec9dcaa8edb34b1d8be0ce254423294f01ae48ab;p=clearscm.git

diff --git a/maps/bin/checkaddress.cgi b/maps/bin/checkaddress.cgi
index 0912182..ddec3d5 100755
--- a/maps/bin/checkaddress.cgi
+++ b/maps/bin/checkaddress.cgi
@@ -2,7 +2,7 @@
 ################################################################################
 #
 # File:         $RCSfile: checkaddress.cgi,v $
-# Revision:	$Revision: 1.1 $
+# Revision:     $Revision: 1.1 $
 # Description:	Check an email address
 # Author:       Andrew@DeFaria.com
 # Created:      Mon Jan 16 20:25:32 PST 2006
@@ -16,26 +16,29 @@ use strict;
 use warnings;
 
 use FindBin;
-$0 = $FindBin::Script;
+local $0 = $FindBin::Script;
 
-use lib $FindBin::Bin;
+use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../../lib";
 
 use MAPS;
 
-use CGI qw (:standard);
+use CGI qw(:standard);
 
 # Get MAPSUser from cookie
 my $userid;
 
 if (param "user") {
-  $userid = param "user";
+  $userid = param 'user';
 } else {
-  $userid = cookie ("MAPSUser");
+  $userid = cookie 'MAPSUser';
 } # if
 
-my $sender = param ("sender");
+$userid //= $ENV{USER};
 
-sub Heading {
+my $sender = param("sender");
+
+sub Heading() {
   print
     header     (-title  => "MAPS: Check Address"),
     start_html (-title  => "MAPS: Check Address",
@@ -43,9 +46,11 @@ sub Heading {
     print h3 {-align => "center",
               -class => "header"},
     "MAPS: Checking address $sender";
+
+  return;
 } # Heading
 
-sub Body {
+sub Body() {
   my ($onlist, $rule);
 
   # Algorithm change: We now first check to see if the sender is not found
@@ -64,7 +69,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"},
@@ -72,41 +77,45 @@ sub Body {
         "Messages from", b ($sender), "will be", b ("delivered"), br, hr;
     print $rule;
   } else {
-    ($onlist, $rule) = OnBlacklist $sender, 0;
+    ($onlist, $rule) = OnBlacklist($sender, 0);
 
     if ($onlist) {
-      print div {-align	=> "center"},
-           font {-color	=> "black"},
+      print div {-align => "center"},
+           font {-color => "black"},
             "Messages from", b ($sender), "will be", b ("blacklisted"), br, hr;
       print $rule;
     } else {
-      ($onlist, $rule) = OnNulllist $sender, 0;
+      ($onlist, $rule) = OnNulllist($sender, 0);
 
       if ($onlist) {
-        print div {-align	=> "center"},
-          font {-color	=> "grey"},
+        print div {-align => "center"},
+             font {-color => "grey"},
             "Messages from", b ($sender), "will be", b ("discarded"), br, hr;
         print $rule;
       } else {
-        print div {-align	=> "center"},
-          font {-color	=> "red"},
+        print div {-align => "center"},
+             font {-color => "red"},
             "Messages from", b ($sender), "will be", b ("returned");
       } # if
     } # if
   } # if
 
   print br div {-align => "center"},
-    submit (-name      => "submit",
-            -value     => "Close",
-            -onClick   => "window.close (self)");
+    submit(-name      => "submit",
+           -value     => "Close",
+           -onClick   => "window.close (self)");
+
+  return;
 } # Body
 
-sub Footing {
+sub Footing() {
   print end_html;
+
+  return;
 } # Footing
 
 # Main
-SetContext $userid;
+SetContext($userid);
 Heading;
 Body;
 Footing;