Changeset 801 for trunk

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

Location:

trunk/cgi-bin

Files:

• admin.cgi (modified) (6 diffs)
• search.cgi (modified) (3 diffs)

trunk/cgi-bin/admin.cgi

@@ -55 +55 @@
 
 # Set up some globals
-$ENV{HTML_TEMPLATE_ROOT} = $thingroot."templates";
+$ENV{HTML_TEMPLATE_ROOT} = $thingroot;
+my @templatepath = [ "localtemplates", "templates" ];
 
 # Why not a global DB handle?  (And a global statement handle, as well...)
@@ -75 +76 @@
 # handle DB error output
 if ($webvar{action} eq 'dberr') {
-  my $page = HTML::Template->new(filename => "admin/dberr.tmpl");
+  my $page = HTML::Template->new(filename => "admin/dberr.tmpl", path => @templatepath);
   $page->param(errmsg => $errstr);
   print "Content-Type: text/html\n\n".$page->output;
@@ -82 +83 @@
 
 if ($IPDBacl{$authuser} !~ /A/) {
-  my $page = HTML::Template->new(filename => "admin/aclerr.tmpl");
+  my $page = HTML::Template->new(filename => "admin/aclerr.tmpl", path => @templatepath);
 ##fixme:  need params for IPDB admin email and name
   $page->param(ipdbadmin_email => 'ipdbadmin@example.com');
@@ -90 +91 @@
 }
 
-my $header = HTML::Template->new(filename => "admin/header.tmpl");
+my $header = HTML::Template->new(filename => "admin/header.tmpl", path => @templatepath);
 $header->param(mainpage => 1) if $webvar{action} eq 'main';
 $header->param(webpath => $IPDB::webpath);
@@ -96 +97 @@
 
 my $page;
-if (-e "$ENV{HTML_TEMPLATE_ROOT}/admin/$webvar{action}.tmpl") {
-  $page = HTML::Template->new(filename => "admin/$webvar{action}.tmpl");
+if (-e "$ENV{HTML_TEMPLATE_ROOT}/templates/admin/$webvar{action}.tmpl") {
+  $page = HTML::Template->new(filename => "admin/$webvar{action}.tmpl", path => @templatepath);
 } else {
-  $page = HTML::Template->new(filename => "admin/dunno.tmpl");
+  $page = HTML::Template->new(filename => "admin/dunno.tmpl", path => @templatepath);
 }
 
@@ -481 +482 @@
 
 # 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);
 # we're already in the admin tools, no need to provide a bottom link.  maybe.
 #$footer->param(adminlink => ($IPDBacl{$authuser} =~ /A/));

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