@@ -2525,8 +2578,8 @@ sub display_virusflow
| |
};
- if ($CONFIG{SHOW_DIRECTION}) {
- print qq{
+if ($CONFIG{SHOW_DIRECTION}) {
+ print qq{
| $TRANSLATE{'Viruses delivery flows'} |
|---|
| | $TRANSLATE{'Messages'} | $TRANSLATE{'Size'} ($TRANSLATE{$CONFIG{'SIZE_UNIT'}}) | $TRANSLATE{'Mean'} |
@@ -2569,7 +2622,7 @@ sub compute_dsnflow
for (my $i = 0; $i <= $#{$STATS{$id}{status}}; $i++) {
next if ($mailbox && ($STATS{$id}{rcpt}[$i] !~ /$mailbox\@/) );
if ($STATS{$id}{status}[$i] eq 'Sent') {
- my $direction = &set_direction($id, $i, $hostname);
+ my $direction = &set_direction($STATS{$id}{sender_relay}, $STATS{$id}{rcpt_relay}[$i], $hostname);
$dsn{$direction}++;
if ($direction =~ /_Int$/) {
$dsn{local_outbound}++;
@@ -4290,6 +4343,8 @@ sub get_detail_stat
%lstat = &get_dsnsrc_detail($path, $peri, $search, $hour);
} elsif ($type eq 'postgrey') {
%lstat = &get_postgrey_detail($path, $peri, $search, $hour);
+ } elsif ($type eq 'flow') {
+ %lstat = &get_flow_detail($path, $peri, $search, $hour, $hostname);
} else {
print "BAD DETAIL TYPE\n";
}
@@ -4332,7 +4387,7 @@ sub show_detail
if ($type !~ /spam/) {
print qq{$TRANSLATE{'Status'} | \n};
}
- if (!grep(/$type/, 'dsn', 'dsnsrc', 'sender', 'recipient', 'postgrey')) {
+ if (!grep(/$type/, 'dsn', 'dsnsrc', 'sender', 'recipient', 'postgrey', 'flow')) {
if ($type eq 'spam') {
print qq{$TRANSLATE{'Spam'} | \n};
} elsif ($type =~ /spam_/) {
@@ -4467,7 +4522,7 @@ sub show_detail
}
print "";
}
- if (!grep(/$type/, 'dsn', 'dsnsrc', 'sender', 'recipient', 'postgrey')) {
+ if (!grep(/$type/, 'dsn', 'dsnsrc', 'sender', 'recipient', 'postgrey', 'flow')) {
if ($type eq 'spam') {
$lstat{$id}{spam} ||= ' ';
print qq{$lstat{$id}{spam} | };
@@ -4528,7 +4583,7 @@ sub show_download_detail
if ($type !~ /spam/) {
print "$TRANSLATE{'Status'};";
}
- if (!grep(/$type/, 'dsn', 'dsnsrc', 'sender', 'recipient', 'postgrey')) {
+ if (!grep(/$type/, 'dsn', 'dsnsrc', 'sender', 'recipient', 'postgrey', 'flow')) {
if ($type eq 'spam') {
print "$TRANSLATE{'Spam'};";
} elsif ($type =~ /spam_/) {
@@ -4636,7 +4691,7 @@ sub show_download_detail
}
print ";"
}
- if (!grep(/$type/, 'dsn', 'dsnsrc', 'sender', 'recipient', 'postgrey')) {
+ if (!grep(/$type/, 'dsn', 'dsnsrc', 'sender', 'recipient', 'postgrey', 'flow')) {
if ($type eq 'spam') {
print "$lstat{$id}{spam};";
} elsif ($type =~ /spam_/) {
@@ -5370,6 +5425,62 @@ sub get_postgrey_detail
return %local_stat;
}
+sub get_flow_detail
+{
+ my ($path, $peri, $search, $hour, $hostname) = @_;
+
+ my %local_stat = ();
+
+ my $file = "$path/senders.dat";
+ if (open(IN, $file)) {
+ while (my $l = ) {
+ chomp($l);
+ # Format: Hour:Id:Sender:Size:Nrcpts:Relay:Subject
+ my @data = split(/:/, $l);
+ $data[0] =~ /^(\d{2})/;
+ next if (($hour ne '') && ($1 != $hour));
+ $data[2] ||= '<>';
+ $local_stat{$data[1]}{hour} = $data[0];
+ $local_stat{$data[1]}{sender} = $data[2];
+ $local_stat{$data[1]}{size} = $data[3];
+ $local_stat{$data[1]}{nrcpt} = $data[4];
+ $local_stat{$data[1]}{sender_relay} = $data[5];
+ for (my $i = 6; $i <= $#data; $i++) {
+ $local_stat{$data[1]}{subject} .= ($i > 6) ? ':' : '';
+ $local_stat{$data[1]}{subject} .= $data[$i];
+ }
+ }
+ close(IN);
+ }
+
+ $file = "$path/recipient.dat";
+ if (open(IN, $file)) {
+ while (my $l = ) {
+ chomp($l);
+ # Format: Hour:Id:recipient:Relay:Status
+ my @data = split(/:/, $l);
+ $data[0] =~ /^(\d{2})/;
+ next if (($hour ne '') && ($1 != $hour));
+ if ($data[4] eq 'Sent') {
+ my $direction = &set_direction($local_stat{$data[1]}{sender_relay}, $data[3], $hostname);
+ if ($direction eq $search) {
+ push(@{$local_stat{$data[1]}{rcpt}}, $data[2]);
+ push(@{$local_stat{$data[1]}{rcpt_relay}}, $data[3]);
+ push(@{$local_stat{$data[1]}{status}}, $data[4]);
+ }
+ }
+ }
+ close(IN);
+
+ # Eliminate unwanted sender only entries
+ foreach my $k (keys %local_stat) {
+ delete $local_stat{$k} if (!exists $local_stat{$k}{rcpt} || $#{$local_stat{$k}{rcpt}} == -1);
+ }
+ }
+
+ return %local_stat;
+}
+
sub check_auth
{
# Allow if site with no auth or user is an admin
|