From 4f37839bc9faacb57d9bce9196d916595f14b114 Mon Sep 17 00:00:00 2001
From: Andrew DeFaria <Andrew@DeFaria.com>
Date: Sat, 17 Jul 2021 15:34:09 -0700
Subject: [PATCH] Added use lib for clearscm

---
 maps/bin/MAPSDeliver       |  1 +
 maps/bin/add2blacklist.cgi |  1 +
 maps/bin/add2nulllist.cgi  |  1 +
 maps/bin/add2nulllist.pl   |  3 ++-
 maps/bin/add2whitelist.cgi |  1 +
 maps/bin/checkaddress.cgi  |  1 +
 maps/bin/checkaddress.pl   |  3 ++-
 maps/bin/detail.cgi        |  1 +
 maps/bin/display.cgi       |  1 +
 maps/bin/editprofile.cgi   |  1 +
 maps/bin/exportlist.cgi    |  1 +
 maps/bin/importlist.cgi    |  1 +
 maps/bin/maps              | 19 ++-----------------
 maps/bin/modifyentries.cgi |  1 +
 maps/bin/processaction.cgi |  1 +
 maps/bin/register.cgi      |  1 +
 maps/bin/registerform.cgi  |  1 +
 maps/bin/search.cgi        |  1 +
 maps/bin/signup.cgi        |  1 +
 maps/bin/stats.cgi         |  1 +
 maps/bin/updateprofile.cgi |  1 +
 21 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/maps/bin/MAPSDeliver b/maps/bin/MAPSDeliver
index ab6a2ff..eee5f26 100755
--- a/maps/bin/MAPSDeliver
+++ b/maps/bin/MAPSDeliver
@@ -21,6 +21,7 @@ use warnings;
 use FindBin;
 
 use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../../lib";
 
 use MAPSFile;
 use MAPS;
diff --git a/maps/bin/add2blacklist.cgi b/maps/bin/add2blacklist.cgi
index 469ef20..34fb5e9 100755
--- a/maps/bin/add2blacklist.cgi
+++ b/maps/bin/add2blacklist.cgi
@@ -19,6 +19,7 @@ use FindBin;
 local $0 = $FindBin::Script;
 
 use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../../lib";
 
 use Utils;
 
diff --git a/maps/bin/add2nulllist.cgi b/maps/bin/add2nulllist.cgi
index e398f4e..4f8a527 100755
--- a/maps/bin/add2nulllist.cgi
+++ b/maps/bin/add2nulllist.cgi
@@ -20,6 +20,7 @@ use FindBin;
 local $0 = $FindBin::Script;
 
 use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../../lib";
 
 use Utils;
 
diff --git a/maps/bin/add2nulllist.pl b/maps/bin/add2nulllist.pl
index 70a4760..13324d9 100755
--- a/maps/bin/add2nulllist.pl
+++ b/maps/bin/add2nulllist.pl
@@ -4,7 +4,8 @@ use warnings;
 
 use FindBin;
 
-use lib "$FindBin::Bin/../lib", '/opt/clearscm/lib';
+use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../../lib";
 
 use MAPS;
 use MAPSLog;
diff --git a/maps/bin/add2whitelist.cgi b/maps/bin/add2whitelist.cgi
index c3bac8d..6b75398 100755
--- a/maps/bin/add2whitelist.cgi
+++ b/maps/bin/add2whitelist.cgi
@@ -20,6 +20,7 @@ use FindBin;
 local $0 = $FindBin::Script;
 
 use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../../lib";
 
 use Utils;
 
diff --git a/maps/bin/checkaddress.cgi b/maps/bin/checkaddress.cgi
index 51ec2c1..ddec3d5 100755
--- a/maps/bin/checkaddress.cgi
+++ b/maps/bin/checkaddress.cgi
@@ -19,6 +19,7 @@ use FindBin;
 local $0 = $FindBin::Script;
 
 use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../../lib";
 
 use MAPS;
 
diff --git a/maps/bin/checkaddress.pl b/maps/bin/checkaddress.pl
index df25c8b..5eb290e 100755
--- a/maps/bin/checkaddress.pl
+++ b/maps/bin/checkaddress.pl
@@ -17,7 +17,8 @@ use warnings;
 
 use FindBin;
 
-use lib "$FindBin::Bin/../lib", '/opt/clearscm/lib';
+use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../../lib";
 
 use MAPS;
 use Display;
diff --git a/maps/bin/detail.cgi b/maps/bin/detail.cgi
index 857bb40..52399a9 100755
--- a/maps/bin/detail.cgi
+++ b/maps/bin/detail.cgi
@@ -25,6 +25,7 @@ use FindBin;
 local $0 = $FindBin::Script;
 
 use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../../lib";
 
 use MAPS;
 use MAPSLog;
diff --git a/maps/bin/display.cgi b/maps/bin/display.cgi
index 55d31f8..65be9b2 100755
--- a/maps/bin/display.cgi
+++ b/maps/bin/display.cgi
@@ -19,6 +19,7 @@ use FindBin;
 local $0 = $FindBin::Script;
 
 use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../../lib";
 
 use MAPS;
 use MAPSWeb;
diff --git a/maps/bin/editprofile.cgi b/maps/bin/editprofile.cgi
index ebd5424..652154b 100755
--- a/maps/bin/editprofile.cgi
+++ b/maps/bin/editprofile.cgi
@@ -19,6 +19,7 @@ use FindBin;
 local $0 = $FindBin::Script;
 
 use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../../lib";
 
 use MAPS;
 use MAPSWeb;
diff --git a/maps/bin/exportlist.cgi b/maps/bin/exportlist.cgi
index 5990e87..70907ba 100755
--- a/maps/bin/exportlist.cgi
+++ b/maps/bin/exportlist.cgi
@@ -18,6 +18,7 @@ use FindBin;
 local $0 = $FindBin::Script;
 
 use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../../lib";
 
 use MAPS;
 use MAPSWeb;
diff --git a/maps/bin/importlist.cgi b/maps/bin/importlist.cgi
index 743c3aa..885af72 100755
--- a/maps/bin/importlist.cgi
+++ b/maps/bin/importlist.cgi
@@ -56,6 +56,7 @@ use FindBin;
 local $0 = $FindBin::Script;
 
 use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../../lib";
 
 use Getopt::Long;
 use Pod::Usage;
diff --git a/maps/bin/maps b/maps/bin/maps
index 52e234f..854316b 100755
--- a/maps/bin/maps
+++ b/maps/bin/maps
@@ -61,7 +61,8 @@ use FindBin;
 use File::Temp qw (tempfile);
 use Net::Domain qw (hostdomain);
 
-use lib "$FindBin::Bin/../lib", "$FindBin::Bin/../../lib";
+use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../../lib";
 
 use MAPS;
 use MAPSLog;
@@ -73,10 +74,6 @@ my $verbose   = 0;
 my $execute   = 1;
 my $userid    = $ENV{USER};
 
-my $logpath   = "$FindBin::Bin/../log";
-my $logfile   = "$logpath/debug.log";
-my $forwardto = $ENV{MAPS_FORWARDTO} || 'adefaria@gmail.com';
-
 # For some reason I'm not parsing messages correctly but it only seems to
 # happen when the message is piped in from the MTA. This routine will
 # temporarily save the messages in a file.
@@ -126,17 +123,6 @@ sub ProcessMsgs ($$$) {
   while (!eof *$msgfile) {
     my ($sender, $sender_long, $reply_to, $subject, $data) = ReadMsg (*$msgfile);
 
-    #if ($forwardto) {
-      # Forward a copy
-      #open my $mail, '|', "/usr/lib/sendmail $forwardto"
-        #or die "Unable to open pipe to sendmail - $!";
-
-      #print $mail "$data\n";
-
-      #close $mail
-        #or die "Unable to forward email to $forwardto - $!";      
-    #} # if
-
     my ($onlist, $rule, $sequence, $hit_count);
 
     # Algorithm change: We now first check to see if the sender is not found
@@ -226,7 +212,6 @@ GetOptions(
   'verbose'     => sub { set_verbose },
   'debug'       => sub { set_debug },
   'execute!'    => \$execute,
-  'forwardto=s' => \$forwardto
 ) || Usage;
 
 my $msgfile;
diff --git a/maps/bin/modifyentries.cgi b/maps/bin/modifyentries.cgi
index cdf3f14..6ac50d7 100755
--- a/maps/bin/modifyentries.cgi
+++ b/maps/bin/modifyentries.cgi
@@ -19,6 +19,7 @@ use FindBin;
 local $0 = $FindBin::Script;
 
 use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../../lib";
 
 use MAPS;
 use MAPSLog;
diff --git a/maps/bin/processaction.cgi b/maps/bin/processaction.cgi
index 02c3b27..7422b74 100755
--- a/maps/bin/processaction.cgi
+++ b/maps/bin/processaction.cgi
@@ -18,6 +18,7 @@ use warnings;
 use FindBin;
 
 use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../../lib";
 
 use MAPS;
 use MAPSWeb;
diff --git a/maps/bin/register.cgi b/maps/bin/register.cgi
index c8e2508..8dae177 100755
--- a/maps/bin/register.cgi
+++ b/maps/bin/register.cgi
@@ -19,6 +19,7 @@ use FindBin;
 local $0 = $FindBin::Script;
 
 use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../../lib";
 
 use MAPS;
 use MAPSLog;
diff --git a/maps/bin/registerform.cgi b/maps/bin/registerform.cgi
index 25e2c63..48abe04 100755
--- a/maps/bin/registerform.cgi
+++ b/maps/bin/registerform.cgi
@@ -21,6 +21,7 @@ local $0 = $FindBin::Script;
 use CGI qw/:standard *table start_div end_div/;
 
 use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../../lib";
 
 use MAPS;
 use MAPSWeb;
diff --git a/maps/bin/search.cgi b/maps/bin/search.cgi
index dae6ce5..167ed36 100755
--- a/maps/bin/search.cgi
+++ b/maps/bin/search.cgi
@@ -19,6 +19,7 @@ use FindBin;
 local $0 = $FindBin::Script;
 
 use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../../lib";
 
 use MAPS;
 use MAPSWeb;
diff --git a/maps/bin/signup.cgi b/maps/bin/signup.cgi
index 83e459e..9d2b155 100755
--- a/maps/bin/signup.cgi
+++ b/maps/bin/signup.cgi
@@ -20,6 +20,7 @@ use FindBin;
 local $0 = $FindBin::Script;
 
 use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../../lib";
 
 use MAPS;
 use MAPSWeb;
diff --git a/maps/bin/stats.cgi b/maps/bin/stats.cgi
index 135ce78..4b3cdfb 100755
--- a/maps/bin/stats.cgi
+++ b/maps/bin/stats.cgi
@@ -21,6 +21,7 @@ use FindBin;
 local $0 = $FindBin::Script;
 
 use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../../lib";
 
 use MAPS;
 use MAPSLog;
diff --git a/maps/bin/updateprofile.cgi b/maps/bin/updateprofile.cgi
index ade2b21..2dc9146 100755
--- a/maps/bin/updateprofile.cgi
+++ b/maps/bin/updateprofile.cgi
@@ -20,6 +20,7 @@ use FindBin;
 local $0 = $FindBin::Script;
 
 use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../../lib";
 
 use MAPS;
 use MAPSWeb;
-- 
2.17.1