Changeset 491 for branches

Timestamp:

09/23/10 20:06:19 (14 years ago)

Author:

Kris Deugau

Message:

/branches/htmlform

Convert dangling DB error to template in admin.cgi; remove all refs to printAndExit().
See #3, #15, #26.

Location:

branches/htmlform

Files:

• cgi-bin/admin.cgi (modified) (8 diffs)
• templates/admin/dberr.tmpl (added)

branches/htmlform/cgi-bin/admin.cgi

@@ -42 +42 @@
 syslog "debug", "$authuser active";
 
+# Set up the CGI object...
+my $q = new CGI::Simple;
+# ... and get query-string params as well as POST params if necessary
+$q->parse_query_string;
+
+# Convenience;  saves changing all references to %webvar
+##fixme:  tweak for handling <select multiple='y' size=3> (list with multiple selection)
+my %webvar = $q->Vars;
+
+# anyone got a better name?  :P
+my $thingroot = $ENV{SCRIPT_FILENAME};
+$thingroot =~ s|cgi-bin/admin.cgi||;
+
+# Set up some globals
+$ENV{HTML_TEMPLATE_ROOT} = $thingroot."templates";
+
 # Why not a global DB handle?  (And a global statement handle, as well...)
 # Use the connectDB function, otherwise we end up confusing ourselves
@@ -49 +65 @@
 ($ip_dbh,$errstr) = connectDB_My;
 if (!$ip_dbh) {
-  printAndExit("Database error: $errstr\n");
-}
-initIPDBGlobals($ip_dbh);
-
-# anyone got a better name?  :P
-my $thingroot = $ENV{SCRIPT_FILENAME};
-$thingroot =~ s|cgi-bin/admin.cgi||;
-
-# Set up some globals
-$ENV{HTML_TEMPLATE_ROOT} = $thingroot."templates";
+  $webvar{action} = "dberr";
+} else {
+  initIPDBGlobals($ip_dbh);
+}
+
+# handle DB error output
+if ($webvar{action} eq 'dberr') {
+  my $page = HTML::Template->new(filename => "admin/dberr.tmpl");
+  $page->param(errmsg => $errstr);
+  print "Content-Type: text/html\n\n".$page->output;
+  exit;
+}
 
 if ($IPDBacl{$authuser} !~ /A/) {
@@ -69 +87 @@
 }
 
-# Set up the CGI object...
-my $q = new CGI::Simple;
-# ... and get query-string params as well as POST params if necessary
-$q->parse_query_string;
-
-# Convenience;  saves changing all references to %webvar
-##fixme:  tweak for handling <select multiple='y' size=3> (list with multiple selection)
-my %webvar = $q->Vars;
-
 my $header = HTML::Template->new(filename => "admin/header.tmpl");
 
@@ -91 +100 @@
 }
 
+# handle index page
 if ($webvar{action} eq 'main') {
   $header->param(mainpage => 1);
@@ -128 +138 @@
 
   if ($webvar{cidr} !~ /^\s*(\d{1,3}\.){3}\d{1,3}(\/\d{2})?\s*$/) {
-    printAndExit("Can't allocate something that's not a netblock/ip");
+    $page->param(errmsg => "Can't allocate something that's not a netblock/ip");
+    goto ERRJUMP;
   }
 
@@ -163 +174 @@
     @data = $sth->fetchrow_array;
 # User deserves errors if user can't be bothered to find the free block first.
-    printAndExit("Can't allocate from outside a free block!!\n")
-        if !$data[0];
+    if (!$data[0]) {
+      $page->param(errmsg => "Can't allocate from outside a free block!!");
+      goto ERRJUMP;
+    }
   } elsif ($webvar{alloctype} =~ /^(.)i$/) {
     $sth = $ip_dbh->prepare("select cidr from allocations where cidr >>='$cidr' and (type like '_d' or type like '_p')");
@@ -170 +183 @@
     @data = $sth->fetchrow_array;
 # User deserves errors if user can't be bothered to find the pool and a free IP first.
-    printAndExit("Can't allocate static IP from outside a pool!!\n")
-        if !$data[0];
+    if (!$data[0]) {
+      $page->param(errmsg => "Can't allocate static IP from outside a pool!!");
+      goto ERRJUMP;
+    }
   } else {
     $sth = $ip_dbh->prepare("select cidr from freeblocks where cidr >>='$cidr' and not (routed='n')");
@@ -177 +192 @@
     @data = $sth->fetchrow_array;
 # User deserves errors if user can't be bothered to find the free block first.
-    printAndExit("Can't allocate from outside a routed block!!\n")
-        if !$data[0];
+    if (!$data[0]) {
+      $page->param(errmsg => "Can't allocate from outside a routed block!!");
+      goto ERRJUMP;
+    }
   }