Changeset 101 for trunk/uribl/uridb.cgi

Timestamp:

09/24/25 11:01:28 (43 hours ago)

Author:

Kris Deugau

Message:

/trunk/uribl

File off most of the rough edges on configuration from the misc table; all
keys now have defaults in the object, overrides happen correctly, and all
keys are filled in to the appropriate places in the output rather than
hardcoding things.

File:

• trunk/uribl/uridb.cgi (modified) (2 diffs)

trunk/uribl/uridb.cgi

@@ -103 +103 @@
     ($domain) = split /:/, $domain;
     $domain =~ s/^\+//;
-    $domain =~ s/\.$uridb->{misc}{blzone}//;
+    $domain =~ s/\.$uridb->{misc}{blzone}// if $uridb->{misc}{blzone};
     # and a secondary zone name Just In Case(TM)
-    $domain =~ s/\.$uridb->{misc}{altblzone}//;
+    $domain =~ s/\.$uridb->{misc}{altblzone}// if $uridb->{misc}{altblzone};
     # trim any non-FQDN URI parts
     $domain =~ s{/.+$}{};
@@ -113 +113 @@
     chomp $domain;
     # now, see if it's multilisted
-    if ($domain =~ / on (\w+)\s*$/) {
+    if ($domain =~ / on ([\w-]+)\s*$/) {
       my $sub = $1;
-      #$domain =~ s/ on \w+\s*$//;
+      $domain =~ s/ on [\w-]+\s*$//;
       $domlist[$domcount-1]->{otherlists} .= ",$sub";
       next;