Changeset 479 for branches/htmlform/cgi-bin/CommonWeb.pm

Timestamp:

09/17/10 18:49:45 (14 years ago)

Author:

Kris Deugau

Message:

/branches/htmlform

Convert initial DB connection error output to a sane page. Could arguably provide
space for this (and other) errors on all normal pages. (See #3).
This allows us to:

• Remove editError sub in main.cgi
• Remove printHeader sub in CommonWeb.pm (see #15, #26)

Removed duplicate "exit if we get this far"
Tweak IPDB::finish so it doesn't spit a fatal error when called with a null database handle

File:

• branches/htmlform/cgi-bin/CommonWeb.pm (modified) (2 diffs)

branches/htmlform/cgi-bin/CommonWeb.pm

@@ -16 +16 @@
 $VERSION     = 1.00;
 @ISA         = qw(Exporter);
-@EXPORT_OK      = qw( &printHeader &printError &printAndExit &desanitize &cleanInput &desanitize);
+@EXPORT_OK      = qw( &printError &printAndExit &desanitize &cleanInput &desanitize);
 
 @EXPORT      = (); #export nothing by default
@@ -25 +25 @@
                 );
 
-
-sub printHeader {
-  my $title = shift;
-  print "Content-type: text/html\n\n";
-# This doesn't work well.  Must investigate.
-#  my $realm = shift;
-#  print qq(WWW-Authenticate: Basic realm="$realm"\n) if $realm;
-  open FILE, "../header.inc"
-        or carp $!;
-  my $html = join('',<FILE>);
-  close FILE;
-
-  $html =~ s/\$\$TITLE\$\$/$title/;
-# Necessary for mangling arbitrary bits of the header
-  my $i=0;
-  while (defined(my $param = shift)) {
-    $html =~ s/\$\$EXTRA$i\$\$/$param/g;
-    $i++;
-  }
-  print $html;
-}
 
 sub printError($)