Changeset 449 for branches/htmlform/cgi-bin/main.cgi

Timestamp:

07/27/10 17:06:18 (14 years ago)

Author:

Kris Deugau

Message:

/branches/htmlform

Remove printFooter from CommonWeb.pm
Add HTML::Template to main.cgi, admin.cgi, and search.cgi
Convert footer.inc to templates/footer.tmpl, and normalize
output for three scripts above
See #3.

File:

• branches/htmlform/cgi-bin/main.cgi (modified) (6 diffs)

branches/htmlform/cgi-bin/main.cgi

@@ -13 +13 @@
 use CGI::Carp qw(fatalsToBrowser);
 use CGI::Simple;
+use HTML::Template;
 use DBI;
 use CommonWeb qw(:ALL);
@@ -49 +50 @@
 }
 initIPDBGlobals($ip_dbh);
+
+# Set up some globals
+##fixme - need to autofill this somehow
+$ENV{HTML_TEMPLATE_ROOT} = '/home/kdeugau/dev/ipdb/trunk/templates';
 
 # Headerize!  Make sure we replace the $$EXTRA0$$ bit as needed.
@@ -173 +178 @@
 finish($ip_dbh);
 
-print qq(<div align=right style="position: absolute; right: 30px;">).
-        qq(<a href="/ip/cgi-bin/admin.cgi">Admin tools</a></div><br>\n)
-        if $IPDBacl{$authuser} =~ /A/;
+#print qq(<div align=right style="position: absolute; right: 30px;">).
+#       qq(<a href="/ip/cgi-bin/admin.cgi">Admin tools</a></div><br>\n)
+#       if $IPDBacl{$authuser} =~ /A/;
 
 # We print the footer here, so we don't have to do it elsewhere.
-printFooter;
+my $footer = HTML::Template->new(filename => "footer.tmpl");
+# include the admin tools link in the output?
+$footer->param(adminlink => ($IPDBacl{$authuser} =~ /A/));
+
+print $footer->output;
+
 # Just in case something waaaayyy down isn't in place
 # properly... we exit explicitly.
@@ -1181 +1191 @@
     # Relatively simple SQL transaction here.
     my $sql;
-##fixme:  SQL parameters (#34)
-# need to make sure we log roughly the same info
     if (my $pooltype = ($webvar{alloctype} =~ /^(.)i$/) ) {
       $sql = "update poolips set custid='$webvar{custid}',notes='$webvar{notes}',".
@@ -1413 +1421 @@
 
 
+# going, going, gone... this sub to be removed Any Day Real Soon Now(TM)
 sub exitError {
   my $errStr = $_[0];
@@ -1420 +1429 @@
 </center>
 );
-  printFooter();
+
+  # We print the footer here, so we don't have to do it elsewhere.
+  my $footer = HTML::Template->new(filename => "footer.tmpl");
+  # include the admin tools link in the output?
+  $footer->param(adminlink => ($IPDBacl{$authuser} =~ /A/));
+
+  print $footer->output;
+
   exit;
 } # errorExit