Changeset 489 for branches

Timestamp:

09/23/10 18:45:58 (14 years ago)

Author:

Kris Deugau

Message:

/branches/htmlform

Remove use of printError() in admin.cgi. See #15, #26

Location:

branches/htmlform

Files:

• cgi-bin/admin.cgi (modified) (4 diffs)
• templates/admin/alloc.tmpl (modified) (2 diffs)
• templates/admin/confirm.tmpl (modified) (2 diffs)

branches/htmlform/cgi-bin/admin.cgi

@@ -124 +124 @@
 
 ## Non-default actions.
+
 elsif ($webvar{action} eq 'alloc') {
-  # OK, we know what we're allocating.
 
   if ($webvar{cidr} !~ /^\s*(\d{1,3}\.){3}\d{1,3}(\/\d{2})?\s*$/) {
@@ -142 +142 @@
       my $status = CustIDCK->custid_exist($webvar{custid});
       if ($CustIDCK::Error) {
-        printError("Error verifying customer ID: ".$CustIDCK::ErrMsg);
-        return;
+        $page->param(errmsg => "Error verifying customer ID: ".$CustIDCK::ErrMsg);
+        goto ERRJUMP;
       }
       if (!$status) {
-        printError("Customer ID not valid.  Make sure the Customer ID ".
+        $page->param(errmsg => "Customer ID not valid.  Make sure the Customer ID ".
           "is correct.<br>\nUse STAFF for staff static IPs, and $IPDB::defcustid for any other ".
           "non-customer assignments.");
-        return;
+        goto ERRJUMP;
       }
     }
@@ -208 +208 @@
   # Only need to check city here.
   if ($webvar{city} eq '-') {
-    printError("Invalid customer location!  Go back and select customer's location.");
+    $page->param(locerr => "Invalid customer location!  Go back and select customer's location.");
+    goto ERRJUMP;
   } else {
     if ($webvar{alloctype} =~ /^.i$/) {
@@ -497 +498 @@
 }
 
-print "Content-type: text/html\n\n".$header->output;
+ERRJUMP: print "Content-type: text/html\n\n".$header->output;
 print $page->output;
 

branches/htmlform/templates/admin/alloc.tmpl

@@ +1 @@
+<TMPL_IF errmsg>
+<TMPL_VAR NAME=errmsg>
+<TMPL_ELSE>
 <form method="POST" action="admin.cgi">
 <fieldset><legend></legend>
@@ -45 +48 @@
 <input type="hidden" name="action" value="confirm">
 </fieldset></form>
-
+</TMPL_IF>

branches/htmlform/templates/admin/confirm.tmpl

@@ +1 @@
+<TMPL_IF locerr>
+<TMPL_VAR NAME=locerr>
+<TMPL_ELSE>
 Assigning <TMPL_VAR NAME=cidr> to <TMPL_VAR NAME=custid> ("<TMPL_VAR NAME=desc>") as
 <TMPL_VAR NAME=disptype>...<br>
@@ -6 +9 @@
 Allocation OK!
 </TMPL_IF>
+</TMPL_IF>