Changeset 801 for trunk/cgi-bin/search.cgi

Timestamp:

12/24/15 13:14:27 (8 years ago)

Author:

Kris Deugau

Message:

/trunk

Extend template-replacement from r793 to search.cgi and admin.cgi

File:

• trunk/cgi-bin/search.cgi (modified) (3 diffs)

trunk/cgi-bin/search.cgi

@@ -71 +71 @@
 
 # Set up some globals
-$ENV{HTML_TEMPLATE_ROOT} = $thingroot."templates";
+$ENV{HTML_TEMPLATE_ROOT} = $thingroot;
+my @templatepath = [ "localtemplates", "templates" ];
 
 my $page;
 if (!defined($webvar{stype})) {
   $webvar{stype} = "<NULL>";   #shuts up the warnings.
-  $page = HTML::Template->new(filename => "search/compsearch.tmpl");
+  $page = HTML::Template->new(filename => "search/compsearch.tmpl", path => @templatepath);
 } else {
-  $page = HTML::Template->new(filename => "search/sresults.tmpl", global_vars => 1);
+  $page = HTML::Template->new(filename => "search/sresults.tmpl", global_vars => 1, path => @templatepath);
   $page->param(webpath => $IPDB::webpath);
 }
 
-my $header = HTML::Template->new(filename => "header.tmpl");
+my $header = HTML::Template->new(filename => "header.tmpl", path => @templatepath);
 $header->param(version => $IPDB::VERSION);
 $header->param(addperm => $IPDBacl{$authuser} =~ /a/);
@@ -94 +95 @@
 # Handle the DB error first
 if (!$ip_dbh) {
-  $page = HTML::Template->new(filename => "dberr.tmpl");
+  $page = HTML::Template->new(filename => "dberr.tmpl", path => @templatepath);
   $page->param(errmsg => $errstr);
 } elsif ($webvar{stype} eq 'q') {
@@ -314 +315 @@
 
 # We print the footer here, so we don't have to do it elsewhere.
-my $footer = HTML::Template->new(filename => "footer.tmpl");
+my $footer = HTML::Template->new(filename => "footer.tmpl", path => @templatepath);
 # include the admin tools link in the output?
 $footer->param(adminlink => ($IPDBacl{$authuser} =~ /A/));