X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=maps%2Fbin%2Fdetail.cgi;h=b4c3e902e8e0251938ce366e42d4db434dffef13;hb=8af32b28b56662686b6ceb59f2e00dc19cfc7a33;hp=622c148620d0c6c5c6cdff23bfe024390b0b12ad;hpb=5995b6839f7e566dbe9cd137ddd42343b28418b2;p=clearscm.git

diff --git a/maps/bin/detail.cgi b/maps/bin/detail.cgi
index 622c148..b4c3e90 100755
--- a/maps/bin/detail.cgi
+++ b/maps/bin/detail.cgi
@@ -1,5 +1,6 @@
 #!/usr/bin/perl
 #################################################################################
+#
 # File:         $RCSfile: detail.cgi,v $
 # Revision:     $Revision: 1.1 $
 # Description:  Displays list of email addresses based on report type.
@@ -10,7 +11,8 @@
 #
 # (c) Copyright 2000-2006, Andrew@DeFaria.com, all rights reserved.
 #
-################################################################################use strict;
+################################################################################
+use strict;
 use warnings;
 
 use MIME::Words qw(:all);
@@ -172,20 +174,33 @@ sub PrintTable {
   foreach my $sender (ReturnSenders $userid, $type, $next, $lines, $date) {
     my @msgs = ReturnMessages $userid, $sender;
     my @msgs2 = @msgs;
+    my $onlist;
+    my $rule      = 'none';
+    my $hit_count = 0;
 
-    my ($onlist, $rule);
-    $rule = 'none';
-
-    ($onlist, $rule) = OnNulllist $sender;
+    ($onlist, $rule, $hit_count) = OnWhitelist $sender, $userid, 0;
 
     unless ($onlist) {
-      ($onlist, $rule) = OnBlacklist $sender;
+      ($onlist, $rule, $hit_count) = OnBlacklist $sender, 0;
 
       unless ($onlist) {
-        ($onlist, $rule) = OnWhitelist $sender;
+        ($onlist, $rule, $hit_count) = OnNulllist $sender, 0;
       } # 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>/$hit_count";
+
+        $rule =~ s/\w+:\d+/$link/;
+      } # if
+    } # if
+
     $next++;
     print
       start_Tr {-valign => 'middle'};
@@ -210,7 +225,7 @@ sub PrintTable {
           -width   => '40'}, 'Sender:',
       td {-class   => 'sender',
           -valign  => 'middle',
-          -width   => '50%'},
+          -width   => '40%'},
         a {-href   => "mailto:$sender?subject=$msgs2[0][0]"}, $sender,
       td {
           -valign  => 'middle'},
@@ -280,6 +295,7 @@ sub PrintTable {
 } # PrintTable
 
 # Main
+my $condition;
 my @scripts = ('ListActions.js');
 
 my $heading_date =$date ne '' ? ' on ' . FormatDate ($date) : '';