From 5995b6839f7e566dbe9cd137ddd42343b28418b2 Mon Sep 17 00:00:00 2001
From: Andrew DeFaria <Andrew@DeFaria.com>
Date: Wed, 10 Jan 2018 10:43:10 -0800
Subject: [PATCH] Added matching rule to detail.cgi

Also cleaned up checkaddress.cgi a bit.
---
 maps/bin/checkaddress.cgi | 24 ++++++++++++------------
 maps/bin/detail.cgi       | 21 +++++++++++++++++++--
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/maps/bin/checkaddress.cgi b/maps/bin/checkaddress.cgi
index 8621719..06c3bc9 100755
--- a/maps/bin/checkaddress.cgi
+++ b/maps/bin/checkaddress.cgi
@@ -37,11 +37,11 @@ my $sender = param ("sender");
 
 sub Heading {
   print
-    header     (-title	=> "MAPS: Check Address"),
+    header     (-title  => "MAPS: Check Address"),
     start_html (-title  => "MAPS: Check Address",
-		-author	=> "Andrew\@DeFaria.com");
-    print h3 {-align	=> "center",
-	      -class	=> "header"},
+                -author => "Andrew\@DeFaria.com");
+    print h3 {-align => "center",
+              -class => "header"},
     "MAPS: Checking address $sender";
 } # Heading
 
@@ -65,23 +65,23 @@ sub Body {
   #
   # Finally, we handle return processing
   ($onlist, $rule) = OnWhitelist $sender;
-  
+
   if ($onlist) {
     print div {-align => "center"},
       font {-color => "green"},
         "Messages from", b ($sender), "will be", b ("delivered"), br, hr;
-   	print $rule;
+    print $rule;
   } else {
     ($onlist, $rule) = OnBlacklist $sender;
-    
+
     if ($onlist) {
       print div {-align	=> "center"},
-        	font {-color	=> "black"},
+           font {-color	=> "black"},
             "Messages from", b ($sender), "will be", b ("blacklisted"), br, hr;
       print $rule;
     } else {
       ($onlist, $rule) = OnNulllist $sender;
-  
+
       if ($onlist) {
         print div {-align	=> "center"},
           font {-color	=> "grey"},
@@ -96,9 +96,9 @@ sub Body {
   } # if
 
   print br div {-align	=> "center"},
-    submit (-name	=> "submit",
-	    -value	=> "Close",
-	    -onClick	=> "window.close (self)");
+    submit (-name    => "submit",
+            -value   => "Close",
+            -onClick => "window.close (self)");
 } # Body
 
 sub Footing {
diff --git a/maps/bin/detail.cgi b/maps/bin/detail.cgi
index 85ecb49..622c148 100755
--- a/maps/bin/detail.cgi
+++ b/maps/bin/detail.cgi
@@ -173,6 +173,19 @@ sub PrintTable {
     my @msgs = ReturnMessages $userid, $sender;
     my @msgs2 = @msgs;
 
+    my ($onlist, $rule);
+    $rule = 'none';
+
+    ($onlist, $rule) = OnNulllist $sender;
+
+    unless ($onlist) {
+      ($onlist, $rule) = OnBlacklist $sender;
+
+      unless ($onlist) {
+        ($onlist, $rule) = OnWhitelist $sender;
+      } # unless
+    } # unless
+
     $next++;
     print
       start_Tr {-valign => 'middle'};
@@ -180,7 +193,7 @@ sub PrintTable {
       td {-class => 'tableborder'}, small ($next,
         checkbox {-name  => "action$next",
                   -label => ''}),
-          hidden ({-name     => "email$next",
+          hidden ({-name    => "email$next",
                    -default => $sender});
     print
       start_td {-align => 'left'};
@@ -196,8 +209,12 @@ sub PrintTable {
           -valign  => 'middle',
           -width   => '40'}, 'Sender:',
       td {-class   => 'sender',
+          -valign  => 'middle',
+          -width   => '50%'},
+        a {-href   => "mailto:$sender?subject=$msgs2[0][0]"}, $sender,
+      td {
           -valign  => 'middle'},
-        a {-href   => "mailto:$sender?subject=$msgs2[0][0]"}, $sender;
+          $rule;
     print
       end_table;
 
-- 
2.17.1