X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=maps%2Fbin%2Fregister.cgi;h=8dae177247a1671a5bed191fcdfcf0728102aa51;hb=d5f93e83122b24c166624dec7660b23ed1236455;hp=63975b4253cf976ff02bc0af2633ddd2b13f2b83;hpb=020a4a5ea2be725b155cae3a2cadc9aba3911b9b;p=clearscm.git

diff --git a/maps/bin/register.cgi b/maps/bin/register.cgi
index 63975b4..8dae177 100755
--- a/maps/bin/register.cgi
+++ b/maps/bin/register.cgi
@@ -2,7 +2,7 @@
 ################################################################################
 #
 # File:         $RCSfile: register.cgi,v $
-# Revision:	$Revision: 1.1 $
+# Revision:     $Revision: 1.1 $
 # Description:	Register a MAPS user
 # Author:       Andrew@DeFaria.com
 # Created:      Mon Jan 16 20:25:32 PST 2006
@@ -16,9 +16,10 @@ 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 MAPSLog;
@@ -26,20 +27,24 @@ use MAPSWeb;
 
 use CGI qw/:standard/;
 
-my $fullname	= param ("fullname");
-my $sender	= lc (param ("sender"));
-my $userid	= param ("userid");
+my $fullname = param("fullname");
+my $sender   = lc(param("sender"));
+my $userid   = param("userid");
+
+sub MyFooting() {
+  print div({-align  => "center"},
+    button (-name    => "close",
+            -value   => "Close Window",
+            -onClick => "window.close ()")
+  );
 
-sub MyFooting {
-  print div ({-align	=> "center"},
-    button (-name	=> "close",
-	    -value	=> "Close Window",
-	    -onClick	=> "window.close ()"));
   print end_html;
+
+  return;
 } # MyFooting
 
-sub MyError {
-  my $errmsg = shift;
+sub MyError($) {
+  my ($errmsg) = @_;
 
   print h3 ({-class => "error",
              -align => "center"}, "ERROR: " . $errmsg);
@@ -49,33 +54,34 @@ sub MyError {
   exit 1;
 } # MyError
 
-sub MyHeading {
+sub MyHeading() {
   print
-    header     (-title	=> "MAPS Registration"),
-    start_html (-title  => "MAPS Registration",
-		-author	=> "Andrew\@DeFaria.com",
-		-style	=> {-src	=> "/maps/css/MAPSPlain.css"});
+    header(-title  => "MAPS Registration"),
+    start_html(-title  => "MAPS Registration",
+                -author => "Andrew\@DeFaria.com",
+                -style  => {-src => "/maps/css/MAPSPlain.css"}
+    );
   print
-    h2 ({-class => "header",
-	 -align	=> "center"},
-      font ({-class => "standout"}, 
-	    "MAPS"), "Registration Results");
+    h2 ({-class     => "header",
+         -align     => "center"},
+      'Registration Results'
+  );
+
+  return;
 } # MyHeading
 
 # Main
 MyHeading;
 
-if ($sender eq "") {
-  MyError "Sender not specified!";
-}
+MyError("Sender not specified!") if $sender eq '';
 
-my $rule;
+my ($status, $rule) = OnWhitelist($sender, $userid, 0);
 
-if (OnWhitelist $sender, $userid) {
-  MyError "The email address $sender is already on ${userid}'s list"
+if ($status) {
+  MyError("The email address $sender is already on ${userid}'s list)");
 } # if
 
-my $messages = Add2Whitelist $sender, $userid, $fullname;
+my $messages = Add2Whitelist($sender, $userid, $fullname);
 
 print p "$fullname, your email address, $sender, has been added to ${userid}'s white list.";