diff -urN smeserver-mailstats-1.1.old/root/usr/bin/mailstats.pl smeserver-mailstats-1.1/root/usr/bin/mailstats.pl --- smeserver-mailstats-1.1.old/root/usr/bin/mailstats.pl 2023-02-15 08:51:39.092005908 +0000 +++ smeserver-mailstats-1.1/root/usr/bin/mailstats.pl 2023-02-15 08:54:28.360245710 +0000 @@ -32,6 +32,7 @@ # bjr - 18Dec19 - change to fix truncation of email address in by email table - bug 10327 # bjr - 18Oct20 - Alter use of lc to avoid uninitialised messages - bug 11044 # bjr - 02Apr21 - Fix up lc to try to avoif uninit messages - and alter warning status - bug 11519 +# bjr - 15Feb23 - Add in auth::auth_imap after change to use dovecot as incoming authorisation Bugzilla 12327 # ############################################################################# # @@ -48,14 +49,14 @@ # / SARulePercentThreshold (0.5) - threshold of SArules percentage for report cutoff # / Email (admin) - email to send report # / SaveDataToMySQL - save data to MySQL database (default is "no") -# / ShowLeagueTotals - Show totals row after league tables - (default is "yes") +# / ShowLeagueTotals - Show totals row after league tables - (default is "yes") # / DBHost - MySQL server hostname (default is "localhost"). # / DBPort - MySQL server post (default is "3306") # / Interval - "daily", "weekly", "fortnightly", "monthly", "99999" - last is number of hours (default is daily) # / Base - "Midnight", "Midday", "Now", "99" hour (0-23) (default is midnight) -# / HTMLEmail - "yes", "no", "both" - default is "No" - Send email in HTML +# / HTMLEmail - "yes", "no", "both" - default is "No" - Send email in HTML # NOT YET INUSE - WIP! -# / HTMLPage - "yes" / "no" - default is "yes" if HTMLEmail is "yes" or "both" otherwise "no" +# / HTMLPage - "yes" / "no" - default is "yes" if HTMLEmail is "yes" or "both" otherwise "no" # ############################################################################# # @@ -104,7 +105,7 @@ #Configuration section my %opt = ( - version => '0.7.15', # please update at each change. + version => '0.7.16', # please update at each change. debug => 0, # guess what ? sendmail => '/usr/sbin/sendmail', # Path to sendmail stub from => 'spamfilter-stats', # Who is the mail from @@ -739,6 +740,8 @@ elsif ($log_items[5] eq 'auth::auth_cvm_unix_local') {$MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc)} + elsif ($log_items[5] eq 'auth::auth_imap') {$MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc)} + elsif ($log_items[5] eq 'earlytalker') {$MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc)} elsif ($log_items[5] eq 'uribl') {$RBLcount++;$counts{$abshour}{$CATRBLDNS}++;mark_domain_rejected($proc);$blacklistURL{get_domain($log_items[7])}++} @@ -1897,5 +1900,3 @@ return unless $ip; return $ip->is_rfc1918(); } - -