X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=maps%2Fbin%2Fdetail.cgi;h=0ecf224ea97f96842d33414fcb7d8d9e4f41f40f;hb=7ddf095f187ca60d9a70fb83b2bc3c2b6d91f088;hp=857bb40c8e429e1489c51af8247e8539af7b3bcf;hpb=ae9e57b169de143d2b8a7c761c3bf7394385e0d0;p=clearscm.git diff --git a/maps/bin/detail.cgi b/maps/bin/detail.cgi index 857bb40..0ecf224 100755 --- a/maps/bin/detail.cgi +++ b/maps/bin/detail.cgi @@ -9,7 +9,7 @@ # Modified: $Date: 2013/06/12 14:05:47 $ # Language: perl # -# (c) Copyright 2000-2006, Andrew@DeFaria.com, all rights reserved. +# (c) Copyright 2000-2021, Andrew@DeFaria.com, all rights reserved. # ################################################################################ use strict; @@ -25,16 +25,18 @@ use FindBin; local $0 = $FindBin::Script; use lib "$FindBin::Bin/../lib"; +use lib "$FindBin::Bin/../../lib"; use MAPS; use MAPSLog; use MAPSWeb; use DateUtils; -my $type = param 'type'; -my $next = param 'next'; -my $lines = param 'lines'; -my $date = param 'date'; +my $type = param 'type'; +my $list = substr $type, 0, -4 if $type =~ /list$/; +my $next = param 'next'; +my $lines = param 'lines'; +my $date = param 'date'; $date ||= ''; @@ -73,6 +75,17 @@ my %types = ( ] ); +sub formatRule($) { + my ($rec) = @_; + + return '' unless $rec->{pattern} or $rec->{domain}; + + $rec->{pattern} //= ''; + $rec->{domain} //= ''; + + return "$rec->{pattern}\@$rec->{domain}"; +} # formatRule + sub MakeButtons($) { my ($type) = @_; @@ -136,7 +149,12 @@ sub MakeButtons($) { -onClick => 'return ClearAll (document.detail);'}); } # if - return $buttons . $next_button; + print div { + -align => 'center', + -class => 'toolbar', + }, $buttons . $next_button; + + return; } # MakeButtons sub Body($) { @@ -144,6 +162,8 @@ sub Body($) { my $current = $next + 1; + my ($onlist, $rec); + print div {-align => 'center'}, b ( '(' . $current . '-' . $last . ' of ' . $total . ')'); print start_form { @@ -151,6 +171,11 @@ sub Body($) { -action => 'processaction.cgi', -name => 'detail' }; + + MakeButtons $type; + + print start_div {-id => 'highlightrow'}; + print start_table({-align => 'center', -id => $table_name, -border => 0, @@ -158,34 +183,53 @@ sub Body($) { -cellpadding => 0, -width => '100%'}) . "\n"; - my $buttons = MakeButtons $type; - - print start_div {-class => 'toolbar'}; print Tr [ - td {-class => 'tablebordertopleft', - -valign => 'middle'}, - td {-class => 'tablebordertopright', - -valign => 'middle', - -align => 'center'}, $buttons, + th {-class => 'tablebordertopleft'}, '', + th {-class => 'tableborder'}, 'Sender', + th {-class => 'tableborder'}, 'List', + th {-class => 'tableborder'}, 'Hit Count', + th {-class => 'tableborder'}, 'Rule', + th {-class => 'tableborder'}, 'Retention', + th {-class => 'tablebordertopright'}, 'Comment/Date', ]; - print end_div; - for my $sender (ReturnSenders( + my @senders = ReturnSenders( userid => $userid, type => $type, start_at => $next, lines => $lines, date => $date - )) { + ); + + for my $sender (@senders) { my $msgs = ReturnMessages( userid => $userid, sender => $sender, ); + my $leftclass = 'tableleftdata'; + my $dataclass = 'tabledata'; + my $rightclass = 'tablerightdata'; + my $senderclass = 'sender'; + my $subjectclass = 'subject'; + + # Check to see if this is the last line + if ((($next + 1) % $lines) == (@senders % $lines)) { + # We always "bottom" the first column + $leftclass = 'tablebottomleft'; + + # Check to see if there any message lines to display + unless (@$msgs) { + $dataclass = 'tablebottomdata'; + $rightclass = 'tablebottomright'; + $senderclass = 'senderbottom'; + } # unless + } # if + # This is for the purposes of supplying a subject line if the mailto address # is clicked on. It's kludgy because we are simply grabbing the subject line - # of the first email sent where there may be many emails from this sender. + # of the first email sent where there may be many emails from this sender # Still it is often the right subject (or a good enough one) # # A little tricky here because of transliteration. If I test for @@ -198,72 +242,99 @@ sub Body($) { $heading = $msgs->[0]{subject} if $msgs->[0]{subject}; } # if - my ($onlist, $seq); - - my $rule = 'none'; - my $hit_count = 0; - - ($onlist, $rule, $seq, $hit_count) = OnWhitelist($sender, $userid, 0); + ($onlist, $rec) = OnWhitelist($sender, $userid, 0); unless ($onlist) { - ($onlist, $rule, $seq, $hit_count) = OnBlacklist($sender, 0); + ($onlist, $rec) = OnBlacklist($sender, 0); unless ($onlist) { - ($onlist, $rule, $seq, $hit_count) = OnNulllist($sender, 0); + ($onlist, $rec) = OnNulllist($sender, 0); } # unless } # unless - if ($rule) { - if ($rule =~ /\((\w+):(\d+)\)\s+"(.*)"/) { - my $list = $1; - my $sequence = $2; - my $next = $sequence - 1; - $rule = $3; - - $rule =~ s/\\@/\@/; - - $rule = "$list:$sequence/$hit_count $rule"; - } # if - } # if - $next++; - print - start_Tr {-valign => 'middle'}; - print - td {-class => 'tableborder'}, small ($next, - checkbox {-name => "action$next", - -label => ''}), - hidden ({-name => "email$next", - -default => $sender}); - print - start_td {-align => 'left'}; - print - start_table {-class => 'tablerightdata', - -cellpadding => 2, - -callspacing => 0, - -border => 0, - -width => '100%', - -bgcolor => '#d4d0c8'}; + + # Start Sender line + my $rowspan = @$msgs + 1; + + print start_Tr {-valign => 'middle'}; + print td { + -class => $leftclass, + -align => 'right', + -valign => 'middle', + -rowspan => $rowspan, + }, $next, + checkbox { + -name => "action$next", + -label => '', + -valign => 'middle', + }; + + print hidden({ + -name => "email$next", + -default => $sender, + }); # Get subject line $heading = "?subject=$heading" if $heading; - print - td {-class => 'tablelabel', - -valign => 'middle', - -width => '40'}, 'Sender:', - td {-class => 'sender', - -valign => 'middle', - -width => '40%'}, - a {-href => "mailto:$sender$heading"}, $sender, + + print td { + -class => $senderclass, + }, a { + -href => "mailto:$sender$heading", + }, " $sender"; + + if ($rec) { + my $listlink = ($rec->{type} and $rec->{sequence}) ? "$rec->{type}:$rec->{sequence}" : ''; + + $rec->{comment} //= ''; + $rec->{retention} //= ''; + + print td { + -class => $dataclass, + -align => 'right', + }, a { + href => "/maps/php/list.php?type=$rec->{type}&next=" . ($rec->{sequence} - 1), + }, $listlink, + td { + -class => $dataclass, + -align => 'right', + }, "$rec->{hit_count} ", + td { + -class => $dataclass, + }, formatRule($rec), td { - -valign => 'middle'}, - $rule; - print - end_table; + -class => $dataclass, + -align => 'right', + }, "$rec->{retention} ", + td { + -class => $rightclass, + }, $rec->{comment}; + } else { + # $rec will be undefined if this message will be returned + print td {-class => $dataclass}, + td {-class => $dataclass}, + td {-class => $dataclass}, + td {-class => $dataclass}, + td {-class => $rightclass}; + } # if + + print end_Tr; - my $messages = 1; + my $msgnbr = 0; for my $rec (@$msgs) { + $msgnbr++; + + # We increased $next earlier so do not add 1 here + if (($next % $lines) == (@senders % $lines)) { + $dataclass = 'tablebottomdata'; + $rightclass = 'tablebottomright' if $msgnbr == @$msgs; + + # Only subjectbottom the last message + $subjectclass = 'subjectbottom' if $msgnbr == @$msgs; + } # if + if ($date eq substr ($rec->{timestamp}, 0, 10)) { $rec->{date} = b font {-color => 'green'}, SQLDatetime2UnixDatetime $rec->{timestamp}; } else { @@ -275,46 +346,26 @@ sub Body($) { $rec->{subject} =~ s/\>/>/g; $rec->{subject} =~ s/\ 'tablerightdata', - -cellpadding => 2, - -cellspacing => 2, - -border => 0, - -width => '100%'}; print Tr [ - td {-class => 'msgnbr', - -valign => 'middle', - -rowspan => 2, - -width => '2%'}, $messages++, - td {-class => 'tablelabel', - -valign => 'middle', - -width => '45'}, 'Subject:', - td {-class => 'subject', - -valign => 'middle', - -bgcolor => '#ffffff'}, - a {-href => "display.cgi?sender=$sender;msg_date=$rec->{timestamp}"}, $rec->{subject}, - td {-class => 'date', - -width => '150', - -valign => 'middle'}, $rec->{date}, + td { + -class => $subjectclass, + -colspan => 5, + }, a { + -href => "display.cgi?sender=$sender;msg_date=$rec->{timestamp}", + }, '    ' . $rec->{subject}, + td {-class => $rightclass, + -width => '150', + -align => 'right'}, span {-class => 'date'}, $rec->{date} . ' ', ]; - print end_table; } # for - print end_td; - print end_Tr; } # for - print start_div {-class => 'toolbar'}; - print - Tr [ - td {-class => 'tableborderbottomleft', - -valign => 'middle'}, - td {-class => 'tableborderbottomright', - -valign => 'middle'}, - $buttons - ]; - print end_div; print end_table; + print end_div; + + MakeButtons $type; + print end_form; return; @@ -355,8 +406,10 @@ if ($date eq '') { $condition .= "type = '$type' and timestamp > '$sod' and timestamp < '$eod'"; } # if -$total = CountLog( +# Need to count distinct on sender +$total = CountLogDistinct( userid => $userid, + column => 'sender', additional => $condition, );