Changeset 26

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

Location:

trunk/dnsbl

Files:

• dnsbl.cgi (modified) (3 diffs)
• templates/dbreport.tmpl (modified) (1 diff)
• templates/report.tmpl (modified) (1 diff)

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});

trunk/dnsbl/templates/dbreport.tmpl

@@ -15 +15 @@
 <TMPL_IF block2><br>added level 2 block <TMPL_VAR NAME=block2></TMPL_IF>
 <TMPL_IF err><hr><TMPL_VAR NAME=err></TMPL_IF>
-<hr><a href="/">Back</a>
+<hr><a href="<TMPL_VAR NAME=dnsblsiteroot>">Back</a>
 <TMPL_IF NAME=browsebits>
 <td valign=top>

trunk/dnsbl/templates/report.tmpl

@@ -9 +9 @@
 <table border=1><tr><td>
 <TMPL_VAR NAME=ip><TMPL_IF NAME=nreports></td><td>(reported <TMPL_VAR NAME=nreports> time(s))
-</TMPL_IF></td><td><a href="/">Back</a></td></tr>
+</TMPL_IF></td><td><a href="<TMPL_VAR NAME=dnsblsiteroot>">Back</a></td></tr>
 <form action="dnsbl.cgi">
 <input type=hidden name=page value=dbreport>