| 1 |
brianr |
1.1 |
diff -urN smeserver-mailstats-1.1.old/root/usr/bin/mailstats.pl smeserver-mailstats-1.1/root/usr/bin/mailstats.pl |
| 2 |
|
|
--- smeserver-mailstats-1.1.old/root/usr/bin/mailstats.pl 2020-10-19 12:16:21.422151324 +0100 |
| 3 |
|
|
+++ smeserver-mailstats-1.1/root/usr/bin/mailstats.pl 2020-10-19 12:27:22.000000000 +0100 |
| 4 |
|
|
@@ -11,9 +11,9 @@ |
| 5 |
|
|
# bjr - 02sept12 - Add in qpsmtpd failure code auth::auth_cvm_unix_local as per Bug 7089 |
| 6 |
|
|
# bjr - 10Jun15 - Sort out multiple files as input parameters as per bug 5613 |
| 7 |
|
|
# - Sort out geoip failure status as per Bug 4262 |
| 8 |
|
|
-# - change final message about the DB (it is created automatically these days by the rpm) |
| 9 |
|
|
+# - change final message about the DB (it is created automatically these days by the rpm) |
| 10 |
|
|
# bjr - 17Jun15 - Add annotation showing Badcountries being eliminated |
| 11 |
|
|
-# - correct Spamfilter details extract, as per Bug 8656 |
| 12 |
|
|
+# - correct Spamfilter details extract, as per Bug 8656 |
| 13 |
|
|
# - Add analysis table of Geoip results |
| 14 |
|
|
# bjr - 19Jun15 - Add totals for the League tables |
| 15 |
|
|
# bjr and Unnilennium - 08Apr16 - Add in else for unrecognised plugin detection |
| 16 |
|
|
@@ -29,7 +29,7 @@ |
| 17 |
|
|
# bjr - 30Apr17 - Change Categ index code - Bug 9888 again |
| 18 |
|
|
# bjr - 18Dec19 - Sort out a few format problems and also remove some debugging crud - Bug 10858 |
| 19 |
|
|
# bjr - 18Dec19 - change to fix truncation of email address in by email table - bug 10327 |
| 20 |
|
|
-# bjr - 16Apr20 - Eliminate Unitiailised varaibe when no data - bug 10928 |
| 21 |
|
|
+# bjr - 18Oct20 - Alter use of lc to avoid uninitialised messages - bug 11044 |
| 22 |
|
|
# |
| 23 |
|
|
############################################################################# |
| 24 |
|
|
# |
| 25 |
|
|
@@ -102,7 +102,7 @@ |
| 26 |
|
|
|
| 27 |
|
|
#Configuration section |
| 28 |
|
|
my %opt = ( |
| 29 |
|
|
- version => '0.7.13', # please update at each change. |
| 30 |
|
|
+ version => '0.7.14', # please update at each change. |
| 31 |
|
|
debug => 0, # guess what ? |
| 32 |
|
|
sendmail => '/usr/sbin/sendmail', # Path to sendmail stub |
| 33 |
|
|
from => 'spamfilter-stats', # Who is the mail from |
| 34 |
|
|
@@ -386,8 +386,7 @@ |
| 35 |
|
|
$counts{$PERCENT}{$categs[$ncateg]} = 0; |
| 36 |
|
|
|
| 37 |
|
|
if ($cdb->get('mailstats')){ |
| 38 |
|
|
- $display[$ncateg] = $cdb->get('mailstats')->prop($categs[$ncateg]) || "auto"; |
| 39 |
|
|
- $display[$ncateg] = lc($display[$ncateg]); |
| 40 |
|
|
+ $display[$ncateg] = lc($cdb->get('mailstats')->prop($categs[$ncateg]) || "auto"); |
| 41 |
|
|
} else { |
| 42 |
|
|
$display[$ncateg] = 'auto' |
| 43 |
|
|
} |
| 44 |
|
|
@@ -609,7 +608,7 @@ |
| 45 |
|
|
|
| 46 |
|
|
# if ( ( $currentrcptdomain{ $proc } || '' ) eq '' ) { |
| 47 |
|
|
# reduce to lc and process each e,mail if a list, pseperatedy commas |
| 48 |
|
|
- my $recipientmail = lc( $log_items[4] ); |
| 49 |
|
|
+ my $recipientmail = lc( $log_items[4] || ' ' ); |
| 50 |
|
|
if ( $recipientmail =~ m/.*,/ ) { |
| 51 |
|
|
|
| 52 |
|
|
#comma - split the line and deal with each domain |
Parent Directory
| 
Revision Log
| 
Revision Graph
