Changeset 26 for trunk/dnsbl/dnsbl.cgi

Timestamp:

09/03/10 16:10:14 (14 years ago)

Author:

Kris Deugau

Message:

/trunk/dnsbl

Patch up a few things that got shaken out in copying to a live site

File:

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

trunk/dnsbl/dnsbl.cgi

@@ -34 +34 @@
 # multiple instances without having to duplicate the code.
 # This file is a Perl fragment to be processed inline.
-my $cfgname = $ENV{SERVER_NAME}.$ENV{SCRIPT_NAME};
+my $cfgname = $ENV{SERVER_NAME}.$ENV{REQUEST_URI};
 $cfgname =~ s|[./-]|_|g;
-$cfgname =~ s|_dnsbl_cgi||;
+$cfgname =~ s|_dnsbl_cgi.+||;
+$cfgname =~ s|_$||;
 if (-e "/etc/dnsbl/$cfgname.conf") {
   my $cfg = `cat /etc/dnsbl/$cfgname.conf`;
@@ -69 +70 @@
 
 if ($webvar{page} eq 'report') {
+  my $dnsblsiteroot = $ENV{REQUEST_URI};
+  $dnsblsiteroot =~ s|/dnsbl\.cgi\?.+|/|;
+  $page->param(dnsblsiteroot => $dnsblsiteroot);
+
   $page->param(ip => $webvar{ip});
   my $count = $dnsbl->ipexists($webvar{ip});
@@ -81 +86 @@
   }
 } elsif ($webvar{page} eq 'dbreport') {
+  my $dnsblsiteroot = $ENV{REQUEST_URI};
+  $dnsblsiteroot =~ s|/dnsbl\.cgi\?.+|/|;
+  $page->param(dnsblsiteroot => $dnsblsiteroot);
+
   my $err = '';
   my $count = $dnsbl->report($webvar{ip});