Changeset 449 for branches

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.

Location:

branches/htmlform/cgi-bin

Files:

• CommonWeb.pm (modified) (3 diffs)
• IPDB.pm (modified) (1 diff)
• admin.cgi (modified) (3 diffs)
• main.cgi (modified) (6 diffs)
• search.cgi (modified) (3 diffs)

branches/htmlform/cgi-bin/CommonWeb.pm

@@ -16 +16 @@
 $VERSION     = 1.00;
 @ISA         = qw(Exporter);
-@EXPORT_OK      = qw(&printFooter &printHeader &printError &printAndExit &desanitize &cleanInput &desanitize);
+@EXPORT_OK      = qw( &printHeader &printError &printAndExit &desanitize &cleanInput &desanitize);
 
 @EXPORT      = (); #export nothing by default
-%EXPORT_TAGS = ( ALL => [qw( &printFooter &printHeader &printError
+%EXPORT_TAGS = ( ALL => [qw( &printHeader &printError
                                 &printAndExit &desanitize &cleanInput )],
-                 lean    => [qw( &printFooter &printHeader &printError
+                 lean    => [qw( &printHeader &printError
                                 &printAndExit &cleanInput )]
                 );
@@ -47 +47 @@
 }
 
-sub printFooter
-{
-  open FILE, "../footer.inc"
-        or croak $!;
-  while (<FILE>) 
-  {
-    print;
-  }
-  close FILE;
-}
-
 sub printError($)
 {
@@ -76 +65 @@
         </center>
         );
-        printFooter();
+        print "<br>would print footer but already dun gone and shot($self->foot)\n";
         exit(0);
 }

branches/htmlform/cgi-bin/IPDB.pm

@@ -121 +121 @@
     $IPDBacl{$data[0]} = $data[1];
   }
+
+##fixme:  initialize HTML::Template env var for template path
+# something like $self->path().'/templates' ?
+#  $ENV{HTML_TEMPLATE_ROOT} = 'foo/bar';
 
   return (1,"OK");

branches/htmlform/cgi-bin/admin.cgi

@@ -16 +16 @@
 use CGI::Carp qw(fatalsToBrowser);
 use CGI::Simple;
+use HTML::Template;
 use DBI;
 use CommonWeb qw(:ALL);
@@ -51 +52 @@
 }
 initIPDBGlobals($ip_dbh);
+
+##fixme - need to autofill this somehow
+$ENV{HTML_TEMPLATE_ROOT} = '/home/kdeugau/dev/ipdb/trunk/templates';
 
 if ($IPDBacl{$authuser} !~ /A/) {
@@ -660 +664 @@
 print qq(<hr><a href="/ip/">Back</a> to main interface</a>\n);
 
-printFooter;
+# We print the footer here, so we don't have to do it elsewhere.
+my $footer = HTML::Template->new(filename => "footer.tmpl");
+# we're already in the admin tools, no need to provide a bottom link.  maybe.
+#$footer->param(adminlink => ($IPDBacl{$authuser} =~ /A/));
+
+print $footer->output;
 
 $ip_dbh->disconnect;

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

branches/htmlform/cgi-bin/search.cgi

@@ -15 +15 @@
 use CGI::Carp qw(fatalsToBrowser);
 use CGI::Simple;
+use HTML::Template;
 use DBI;
 use CommonWeb qw(:ALL);
@@ -53 +54 @@
 # Global variables
 my $RESULTS_PER_PAGE = 25;
+##fixme - need to autofill this somehow
+$ENV{HTML_TEMPLATE_ROOT} = '/home/kdeugau/dev/ipdb/trunk/templates';
 
 # Set up the CGI object...
@@ -298 +301 @@
 # Shut down and clean up.
 finish($ip_dbh);
-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;
+
 # We shouldn't need to directly execute any code below here;  it's all subroutines.
 exit 0;