Changeset 72

Timestamp:

07/20/18 11:58:21 (6 years ago)

Author:

Kris Deugau

Message:

/trunk/dnsbl

Another couple of missed minor fixes around exclusion behaviours

File:

• trunk/dnsbl/DNSBL.pm (modified) (4 diffs)

trunk/dnsbl/DNSBL.pm

@@ -313 +313 @@
   my $orgid = shift;
   my $level = shift;
-  my $exclude = shift;
+  my $exclude = shift || 'n';
   my $comment = shift;
   $blockin =~ s/^\s+//;
@@ -332 +332 @@
     }
     $sth = $dbh->prepare("INSERT INTO blocks (block,orgid,level,parent,exclude,comments,ipcount) VALUES (?,?,?,?,?,?,".
-        "(SELECT count(*) FROM iplist WHERE ip << ? AND exclude='n'))");
+        "(SELECT count(*) FROM iplist i JOIN blocks b ON b.block=i.parent WHERE i.ip << ? AND i.exclude='n' AND b.exclude='n'))");
     $sth->execute("$block",$orgid,$level,$parent,$exclude,$comment,"$block");
     $sth = $dbh->prepare("UPDATE iplist SET parent=? WHERE parent=? AND ip << ?");
@@ -354 +354 @@
   my $orgid = shift;
   my $level = shift;
-  my $exclude = shift;
+  my $exclude = shift || 'n';
   my $comment = shift;
   $blockin =~ s/^\s+//;
@@ -387 +387 @@
   }
   # nb: no need to return anything, since the CIDR block is the key
-}
+} # updateblock()