Changeset 69

Timestamp:

07/19/18 17:03:38 (7 years ago)

Author:

Kris Deugau

Message:

/trunk/dnsbl

• Accumulated fixes and tweaks from production
• Add FindBin to a couple of scripts to make them more portable; they no longer need to be run from the directory they're in, or have system-specific paths hardcoded in either "use lib" or a -I argument

Location:

trunk/dnsbl

Files:

• DNSBL.pm (modified) (2 diffs)
• browse.cgi (modified) (1 diff)
• dnsbl.cgi (modified) (2 diffs)
• export-dnsbl (modified) (1 diff)

trunk/dnsbl/DNSBL.pm

@@ -184 +184 @@
         "WHERE b.block >>= ? ".
         "GROUP BY b.block,b.level,b.listme,o.listme ORDER BY b.block");
-  $sthmoron = $dbh->prepare("SELECT ip,s4list,white FROM iplist WHERE parent = ?");
+  $sthmoron = $dbh->prepare("SELECT ip,s4list,exclude FROM iplist WHERE parent = ?");
 }
 
@@ -217 +217 @@
         $sth = $dbh->prepare("INSERT INTO iplist (ip,parent,exclude) VALUES ".
                 "(?,(SELECT block FROM blocks WHERE block >> ? ORDER BY level DESC LIMIT 1),?)");
-        $sth->execute($rep,$rep,$exclude) or die "couldn't add entry for $rep: ".$dbh->errstr."\n";
+        $sth->execute($rep,$rep,($exclude ? 'y' : 'n')) or die "couldn't add entry for $rep: ".$dbh->errstr."\n";
       } elsif ($rows == 1) {
         $sth = $dbh->prepare("UPDATE iplist SET count=count+1,".

trunk/dnsbl/browse.cgi

@@ -25 +25 @@
 use CGI::Simple;
 use HTML::Template;
+
+# push "the directory the script is in" into @INC
+use FindBin;
+use lib "$FindBin::RealBin/";
 
 use DNSBL 2.2;

trunk/dnsbl/dnsbl.cgi

@@ -27 +27 @@
 use Net::DNS;
 
+# push "the directory the script is in" into @INC
+use FindBin;
+use lib "$FindBin::RealBin/";
+
 use DNSBL 2.2;
 use DNSBLweb;
@@ -189 +193 @@
     }
     if (!$dnsbl->blockexists($webvar{$blockn})) {
-      my $ret = $dnsbl->addblock($webvar{$blockn}, $orgid, $i, $webvar{$excln});
+      my $ret = $dnsbl->addblock($webvar{$blockn}, $orgid, $i, $webvar{$excln}, $webvar{$commentn});
       $err .= "error adding $webvar{$blockn}: $ret<br>\n" if $ret;
       $page->param($blockn => $webvar{$blockn});

trunk/dnsbl/export-dnsbl

@@ -22 +22 @@
 use warnings;
 use DBI;
+
+# push "the directory the script is in" into @INC
+use FindBin;
+use lib "$FindBin::RealBin/";
 
 use DNSBL 2.2;