X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=maps%2Fbin%2Fdetail.cgi;h=2bac172df035c23608ffaa9d996527fa186989ba;hb=c799127c92994f07a62499f980410dbdb01c9d19;hp=b90f13dc6caed79befe77facae29205d482292db;hpb=267b7dcc740e1cf29d5a9a2aa65b526abd1af3b0;p=clearscm.git diff --git a/maps/bin/detail.cgi b/maps/bin/detail.cgi index b90f13d..2bac172 100755 --- a/maps/bin/detail.cgi +++ b/maps/bin/detail.cgi @@ -173,6 +173,32 @@ 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 + + if ($rule) { + $rule =~ s/Matching rule: \(//; + $rule =~ s/\)//; + + if ($rule =~ /(\w+):(\d+)/) { + my $list = $1; + my $sequence = $2 - 1; + my $link = "$list:$2"; + + $rule =~ s/\w+:\d+/$link/; + } # if + } # if + $next++; print start_Tr {-valign => 'middle'}; @@ -180,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'}; @@ -196,8 +222,12 @@ sub PrintTable { -valign => 'middle', -width => '40'}, 'Sender:', td {-class => 'sender', + -valign => 'middle', + -width => '40%'}, + 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; @@ -239,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;