diff -up smeserver-mailstats-1.0/root/usr/bin/spamfilter-stats-7.pl.628 smeserver-mailstats-1.0/root/usr/bin/spamfilter-stats-7.pl
--- smeserver-mailstats-1.0/root/usr/bin/spamfilter-stats-7.pl.628	2016-04-10 13:15:15.814000000 -0400
+++ smeserver-mailstats-1.0/root/usr/bin/spamfilter-stats-7.pl	2016-04-10 13:16:35.427000000 -0400
@@ -16,6 +16,8 @@
 #								 - correct Spamfilter details extract, as per Bug 8656 
 #                - Add analysis table of Geoip results 
 # bjr - 19Jun15	 - Add totals for the League tables
+# bjr and  Unnilennium  - 08Apr16 - Add in else for unrecognised plugin detection
+# bjr - 08Apr16 - Add in link for SaneSecurity "extra" virus detection
 #
 #############################################################################
 #
@@ -71,7 +73,7 @@ if ($cdb->get('mailstats')){
 
 #Configuration section
 my %opt = (
-    version => '0.6.28',                        # please update at each change.
+    version => '0.6.29',                        # 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
@@ -119,6 +121,7 @@ my %found_viruses = ();
 my %found_qpcodes  = ();
 my %found_SARules = ();
 my %junkcount = ();
+my %unrecog_plugin = ();
 
 # replaced by...
 my %counts = ();                       #Hold all counts in 2-D matrix
@@ -445,59 +448,59 @@ LINE: while (<>) {
 
    if ($log_items[5] eq 'check_earlytalker') {$MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
 
-   if ($log_items[5] eq 'check_relay') { $MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
+   elsif ($log_items[5] eq 'check_relay') { $MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
 
-   if ($log_items[5] eq 'check_norelay') { $MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
+   elsif ($log_items[5] eq 'check_norelay') { $MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
 
-   if ($log_items[5] eq 'require_resolvable_fromhost') { $MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
+   elsif ($log_items[5] eq 'require_resolvable_fromhost') { $MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
 
-   if ($log_items[5] eq 'check_basicheaders') { $MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
+   elsif ($log_items[5] eq 'check_basicheaders') { $MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
 
-   if ($log_items[5] eq 'rhsbl') { $RBLcount++;$counts{$abshour}{$CATRBLDNS}++;mark_domain_rejected($proc);next LINE}
+   elsif ($log_items[5] eq 'rhsbl') { $RBLcount++;$counts{$abshour}{$CATRBLDNS}++;mark_domain_rejected($proc);next LINE}
 
-   if ($log_items[5] eq 'dnsbl') { $RBLcount++;$counts{$abshour}{$CATRBLDNS}++;mark_domain_rejected($proc);next LINE}
+   elsif ($log_items[5] eq 'dnsbl') { $RBLcount++;$counts{$abshour}{$CATRBLDNS}++;mark_domain_rejected($proc);next LINE}
 
-   if ($log_items[5] eq 'check_badmailfrom') { $MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
+   elsif ($log_items[5] eq 'check_badmailfrom') { $MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
 
-   if ($log_items[5] eq 'check_badrcptto_patterns') { $MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
+   elsif ($log_items[5] eq 'check_badrcptto_patterns') { $MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
 
-   if ($log_items[5] eq 'check_badrcptto') { $MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
+   elsif ($log_items[5] eq 'check_badrcptto') { $MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
 
-   if ($log_items[5] eq 'check_spamhelo') { $MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
+   elsif ($log_items[5] eq 'check_spamhelo') { $MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
 
-   if ($log_items[5] eq 'check_goodrcptto extn') { $MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
+   elsif ($log_items[5] eq 'check_goodrcptto extn') { $MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
 
-   if ($log_items[5] eq 'rcpt_ok') { $MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
+   elsif ($log_items[5] eq 'rcpt_ok') { $MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
 
-   if ($log_items[5] eq 'pattern_filter') { $PatternFilterCount++;$counts{$abshour}{$CATEXECUT}++;mark_domain_rejected($proc);next LINE}
+   elsif ($log_items[5] eq 'pattern_filter') { $PatternFilterCount++;$counts{$abshour}{$CATEXECUT}++;mark_domain_rejected($proc);next LINE}
 
-   if ($log_items[5] eq 'virus::pattern_filter') { $PatternFilterCount++;$counts{$abshour}{$CATEXECUT}++;mark_domain_rejected($proc);next LINE}
+   elsif ($log_items[5] eq 'virus::pattern_filter') { $PatternFilterCount++;$counts{$abshour}{$CATEXECUT}++;mark_domain_rejected($proc);next LINE}
 
-   if ($log_items[5] eq 'check_goodrcptto') {$MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
+   elsif ($log_items[5] eq 'check_goodrcptto') {$MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
 
-   if ($log_items[5] eq 'check_smtp_forward') {$MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
+   elsif ($log_items[5] eq 'check_smtp_forward') {$MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
 
-   if ($log_items[5] eq 'count_unrecognized_commands') {$MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
+   elsif ($log_items[5] eq 'count_unrecognized_commands') {$MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
 
-   if ($log_items[5] eq 'check_badcountries') {$MiscDenyCount++;$counts{$abshour}{$CATBADCOUNTRIES}++;mark_domain_rejected($proc);next LINE}
+   elsif ($log_items[5] eq 'check_badcountries') {$MiscDenyCount++;$counts{$abshour}{$CATBADCOUNTRIES}++;mark_domain_rejected($proc);next LINE}
 
-   if ($log_items[5] eq 'tnef2mime') { next LINE} #Not expecting this one.
+   elsif ($log_items[5] eq 'tnef2mime') { next LINE} #Not expecting this one.
 
-   if ($log_items[5] eq 'spamassassin') { $above15++;$counts{$abshour}{$CATSPAMDEL}++;
+   elsif ($log_items[5] eq 'spamassassin') { $above15++;$counts{$abshour}{$CATSPAMDEL}++;
             # and extract the spam score
             if ($log_items[8] =~ "Yes, hits=(.*) required=([0-9\.]+)") {$rejectspamavg += $1}
             mark_domain_rejected($proc);
             next LINE
    }
 
-   if ($log_items[5] eq 'virus::clamav') { $infectedcount++;$counts{$abshour}{$CATVIRUS}++;
+   elsif ($log_items[5] eq 'virus::clamav') { $infectedcount++;$counts{$abshour}{$CATVIRUS}++;
             #extract the virus name
             if ($log_items[7] =~ "Virus Found: (.*)" ) {$found_viruses{$1}++;}
             mark_domain_rejected($proc);
             next LINE
    }
 
-   if ($log_items[5] eq 'queued') { $Accepttotal++;
+   elsif ($log_items[5] eq 'queued') { $Accepttotal++;
             #extract the spam score
             if ($log_items[8] =~ ".*hits=(.*) required=([0-9\.]+)") {
               $score = $1;
@@ -516,13 +519,17 @@ LINE: while (<>) {
    }
    
 
-   if ($log_items[5] eq 'tls') {$MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
+   elsif ($log_items[5] eq 'tls') {$MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
 
-   if ($log_items[5] eq 'auth::auth_cvm_unix_local') {$MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
+   elsif ($log_items[5] eq 'auth::auth_cvm_unix_local') {$MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
  
+	 #Treat it as Unconf if not recognised
+	 else {$MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);$unrecog_plugin{$log_items[5]}++;next LINE}
 
+/*
    print "Unexpected failure string in log file: ".$log_items[5]."\n";  #Not detected
    next LINE
+*/
 
    }
 
@@ -757,8 +764,16 @@ if ( !$disabled ) {
 
    if ($finaldisplay[$BadCountryCateg]){
         $BadCountries  = $cdb->get('qpsmtpd')->prop('BadCountries') || "*none*";
-	print "*Geoip\.*:Bad Countries mask is:".$BadCountries."\n";
+				print "*Geoip\.*:Bad Countries mask is:".$BadCountries."\n";
    }
+   
+   if (scalar keys %unrecog_plugin > 0){
+		 #Show unrecog plugins found
+		 print "*Unrecognised plugins found - categorised as Non-Conf\n";
+		 foreach my $unrec (keys %unrecog_plugin){
+			 print "\t$unrec\t($unrecog_plugin{$unrec})\n";
+		}
+		}
 
     if ($QueryNoLogTerse) {
       print "* - as no records where found, it looks as though you may not have the *logterse* \nplugin running as part of qpsmtpd \n";
@@ -1014,13 +1029,18 @@ sub show_virus_variants
 {
 
     print("Virus Statistics by name:\n");
-    print("---------------------------------------------\n");
+    print("------------------------------------------------------------------------\n");
     foreach my $virus (sort { $found_viruses{$b} <=> $found_viruses{$a} }
                 keys %found_viruses)
     {
-    print "Rejected $found_viruses{$virus}\t$virus\n";
+			if (index($virus,"Sanesecurity")!=-1){
+			print "Rejected $found_viruses{$virus}\thttp://sane.mxuptime.com/s.aspx?id=$virus\n";
+		} else {
+			print "Rejected $found_viruses{$virus}\t$virus\n";
+		}
+			
     }
-    print("---------------------------------------------\n\n");
+    print("------------------------------------------------------------------------\n\n");
 }
 
 sub show_qpsmtpd_codes