Cleaned up and linked rules

[clearscm.git] / maps / bin / detail.cgi

diff --git a/maps/bin/detail.cgi b/maps/bin/detail.cgi
index 7631983..2bac172 100755 (executable)
--- a/maps/bin/detail.cgi
+++ b/maps/bin/detail.cgi
@@ -171,6 +171,33 @@ sub PrintTable {
 
   foreach my $sender (ReturnSenders $userid, $type, $next, $lines, $date) {
     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
+
+    if ($rule) {
+      $rule =~ s/Matching rule: \(//;
+      $rule =~ s/\)//;
+
+      if ($rule =~ /(\w+):(\d+)/) {
+        my $list     = $1;
+        my $sequence = $2 - 1;
+        my $link     = "<a href=\"/maps/php/list.php?type=$list&next=$sequence\">$list:$2</a>";
+
+        $rule =~ s/\w+:\d+/$link/;
+      } # if
+    } # if
 
     $next++;
     print
@@ -179,7 +206,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'};
@@ -191,12 +218,16 @@ sub PrintTable {
                    -width       => '100%',
                    -bgcolor     => '#d4d0c8'};
     print
-      td {-class => 'tablelabel',
-          -valign => 'middle',
-          -width  => '40'}, 'Sender:',
-      td {-class  => 'sender',
-          -valign => 'middle'},
-      a {-href    => "mailto:$sender"}, $sender;
+      td {-class   => 'tablelabel',
+          -valign  => 'middle',
+          -width   => '40'}, 'Sender:',
+      td {-class   => 'sender',
+          -valign  => 'middle',
+          -width   => '40%'},
+        a {-href   => "mailto:$sender?subject=$msgs2[0][0]"}, $sender,
+      td {
+          -valign  => 'middle'},
+          $rule;
     print
       end_table;
 
@@ -238,7 +269,7 @@ sub PrintTable {
               -bgcolor => '#ffffff'},
            a {-href    => "display.cgi?sender=$sender;msg_nbr=$msg_nbr"}, $subject,
           td {-class   => 'date',
-              -width   => '130',
+              -width   => '150',
               -valign  => 'middle'}, $msg_date
         ];
       print end_table;