Changeset 22 for trunk/dnsbl/dnsbl.cgi

Timestamp:

08/30/10 15:13:38 (14 years ago)

Author:

Kris Deugau

Message:

/trunk/dnsbl

Extend browse listing in reporting to indicate containing blocks
and repeat-offender IPs, as well as show containing block on report
finalize page

File:

• trunk/dnsbl/dnsbl.cgi (modified) (8 diffs)

trunk/dnsbl/dnsbl.cgi

@@ -89 +89 @@
   $page->param(ip => $webvar{ip});
   $page->param(err => $err);
+
+  $page->param(browsebits => browse($dbh,$webvar{ip}));
 }
 print $page->output;
@@ -101 +103 @@
   my $dbh = shift;
   my $ip = shift;
+  my $ipcidr = new NetAddr::IP $ip;
 
   my $basesql = "SELECT b.block,o.orgname,b.listme,o.listme,b.comments,o.comments ".
@@ -118 +121 @@
   $sth0->execute($ip);
   while (my ($block0,$org0,$listmeb0,$listmeo0,$bcomments0,$ocomments0) = $sth0->fetchrow_array) {
-    $tmpl0->param(lvlclass => 'lvl0'.($dnsbl->autolist_block($block0) ? ' auto0' : ''));
+    my $block0cidr = new NetAddr::IP $block0;
+    $tmpl0->param(lvlclass => 'lvl0'.($dnsbl->autolist_block($block0) ? ' auto0' : '').
+        ( $ipcidr->within($block0cidr) ? ' inhere' : ''));
     $tmpl0->param(netclass => ($listmeb0 ? 'b0list' : ''));
     $tmpl0->param(net => $block0);
@@ -129 +134 @@
     if ($sth1->rows > 0) {
       while (my ($block1,$org1,$listmeb1,$listmeo1,$bcomments1,$ocomments1) = $sth1->fetchrow_array) {
+        my $block1cidr = new NetAddr::IP $block1;
         my $tmpl1 = new HTML::Template(filename => 'templates/browse-block.tmpl');
-        $tmpl1->param(lvlclass => 'lvl1'.($dnsbl->autolist_block($block1) ? ' auto1' : ''));
+        $tmpl1->param(lvlclass => 'lvl1'.($dnsbl->autolist_block($block1) ? ' auto1' : '').
+                ( $ipcidr->within($block1cidr) ? ' inhere' : ''));
         $tmpl1->param(netclass => ($listmeb1 ? 'b1list' : ''));
         $tmpl1->param(net => $block1);
@@ -142 +149 @@
         if ($sth2->rows > 0) {
           while (my ($block2,$org2,$listmeb2,$listmeo2,$bcomments2,$ocomments2) = $sth2->fetchrow_array) {
+            my $block2cidr = new NetAddr::IP $block2;
             my $tmpl2 = new HTML::Template(filename => 'templates/browse-block.tmpl');
-            $tmpl2->param(lvlclass => 'lvl2'.($dnsbl->autolist_block($block2) ? ' auto2' : ''));
+            $tmpl2->param(lvlclass => 'lvl2'.($dnsbl->autolist_block($block2) ? ' auto2' : '').
+                ( $ipcidr->within($block2cidr) ? ' inhere' : ''));
             $tmpl2->param(netclass => ($listmeb2 ? 'b2list' : ''));
             $tmpl2->param(net => $block2);
@@ -158 +167 @@
               $iprow{ipcount} = $data4[1];
               $iprow{indent} = '    ';
+              $iprow{repeater} = 1 if $ip eq $data4[0];
 #       ip        | count | s4list |             added
               push @iprows, \%iprow;
@@ -175 +185 @@
           $iprow{ipcount} = $data4[1];
           $iprow{indent} = '  ';
+          $iprow{repeater} = 1 if $ip eq $data4[0];
 #       ip        | count | s4list |             added
           push @iprows, \%iprow;
@@ -193 +204 @@
       $iprow{ipcount} = $data4[1];
       $iprow{indent} = '';
+      $iprow{repeater} = 1 if $ip eq $data4[0];
 #       ip        | count | s4list |             added
       push @iprows, \%iprow;