changeset 32:e7e484c89dbc

Added highlighting of blocked entries in summary tables.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 16 Aug 2009 00:34:45 +0300
parents 0d463c6570b6
children 9f02bf2207af
files README maltfilter
diffstat 2 files changed, 13 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/README	Sat Aug 15 23:49:58 2009 +0300
+++ b/README	Sun Aug 16 00:34:45 2009 +0300
@@ -1,4 +1,4 @@
-Malicious Attack Livid Termination Filter daemon (maltfilter) v0.10.1
+Malicious Attack Livid Termination Filter daemon (maltfilter) v0.10.2
 =====================================================================
 Programmed by Matti 'ccr' Hämäläinen <ccr@tnsp.org>
 (C) Copyright 2009 Tecnic Software productions (TNSP)
--- a/maltfilter	Sat Aug 15 23:49:58 2009 +0300
+++ b/maltfilter	Sun Aug 16 00:34:45 2009 +0300
@@ -10,7 +10,7 @@
 use Date::Parse;
 use Net::IP;
 
-my $progversion = "0.10.1";
+my $progversion = "0.10.2";
 my $progbanner =
 "Malicious Attack Livid Termination Filter daemon (maltfilter) v$progversion\n".
 "Programmed by Matti 'ccr' Hamalainen <ccr\@tnsp.org>\n".
@@ -181,11 +181,12 @@
   }
 }
 
-sub printTD($$$)
+sub printTD
 {
   my $fh = $_[1];
   if ($_[0]) {
-    print $fh "<td>".$_[2]."</td>";
+    my $s = defined($_[3]) ? " class=\"$_[3]\"" : "";
+    print $fh "<td".$s.">".$_[2]."</td>";
   } else {
     print $fh $_[2];
   }
@@ -250,7 +251,8 @@
   );
   
   foreach my $mip (sort { $func->($table, $a, $b) } keys %{$keys}) {
-    printElem($m, $f, " <tr>");
+    my $blocked = defined($blocklist{$mip}) ? "blocked" : "unblocked";
+    printElem($m, $f, " <tr class=\"$blocked\">");
     printTD($m, $f, sprintf(bb($m)."%-10d".eb($m), $table->{$mip}{"hits"}));
     printElem(!$m, $f, " | ");
     printTD($m, $f, sprintf("%-15s", getLink($m, $mip)));
@@ -296,14 +298,15 @@
   $str2." || ".$str2."\n");
   
   my $printEntry = sub {
-    printTD($m, $f, sprintf("%-15s", getLink($m, $_[0])));
+    my $blocked = defined($blocklist{$_[0]}) ? "blocked" : "unblocked";
+    printTD($m, $f, sprintf("%-15s", getLink($m, $_[0])), $blocked);
     printElem(!$m, $f, " | ");
-    printTD($m, $f, sprintf("%-8d ", $table->{$_[0]}{"hits"}));
+    printTD($m, $f, sprintf("%-8d ", $table->{$_[0]}{"hits"}), $blocked);
     printElem(!$m, $f, " | ");
-    printTD($m, $f, scalar localtime($table->{$_[0]}{"date2"}));
+    printTD($m, $f, scalar localtime($table->{$_[0]}{"date2"}), $blocked);
     printElem(!$m, $f, " | ");
-    my $tmp = join(", ", sort keys %{$table->{$_[0]}{"reason"}});
-    printTD($m, $f, sprintf("%-30s", $tmp));
+    my $tmp = join(", ", sort keys %{$table->{$_[0]}{"reason"}}, $blocked);
+    printTD($m, $f, sprintf("%-30s", $tmp), $blocked);
     $nhits += $table->{$_[0]}{"hits"};
   };