Changeset 504

Timestamp:

09/27/11 13:01:55 (13 years ago)

Author:

Kris Deugau

Message:

/branches/htmlform

Convert all but one remaining call to printError to use the
designated error space in the relevant templates
Also make sure to actually generate an error on a missing POP
for new allocations
See #15.

File:

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

branches/htmlform/cgi-bin/main.cgi

@@ -701 +701 @@
             " block size for the pool.";
         } else {
+          if (!$webvar{pop}) {
+            $page->param(err => 'Please select a POP to route the block from/through.');
+            return;
+          }
           $city = $webvar{pop};
           $failmsg = "No suitable free block found.<br>\nYou will have to route another".
@@ -845 +849 @@
 sub validateInput {
   if ($webvar{city} eq '-') {
-    printError("Please choose a city.");
+    $page->param(err => 'Please choose a city');
     return;
   }
@@ -854 +858 @@
     # Danger! Danger!  alloctype should ALWAYS be set by a dropdown.  Anyone
     # managing to call things in such a way as to cause this deserves a cryptic error.
-    printError("Invalid alloctype");
+    $page->param(err => 'Invalid alloctype');
     return;
   }
@@ -862 +866 @@
   if ($def_custids{$webvar{alloctype}} eq '') {
     if (!$webvar{custid}) {
-      printError("Please enter a customer ID.");
+      $page->param(err => 'Please enter a customer ID.');
       return;
     }
@@ -871 +875 @@
       my $status = CustIDCK->custid_exist($webvar{custid});
       if ($CustIDCK::Error) {
-        printError("Error verifying customer ID: ".$CustIDCK::ErrMsg);
+        $page->param(err => "Error verifying customer ID: ".$CustIDCK::ErrMsg);
         return;
       }
       if (!$status) {
-        printError("Customer ID not valid.  Make sure the Customer ID ".
+        $page->param(err => "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.");
@@ -907 +911 @@
     }
   }
+
+  # if the alloctype has a restricted city/POP list as determined above,
+  # and the reqested city/POP does not match that list, complain
   if ($flag ne 'n') {
-    printError("Please choose a valid POP location $flag.  Valid ".
+    $page->param(err => "Please choose a valid POP location $flag.  Valid ".
         "POP locations are currently:<br>\n".join (" - ", @poplist));
     return;
@@ -1141 +1148 @@
   # Serves'em right for getting here...
   if (!defined($webvar{block})) {
-    printError("Error 332");
+    $page->param(err => "Can't delete a block that doesn't exist");
     return;
   }