Changeset 138 for trunk/cgi-bin/main.cgi

Timestamp:

01/26/05 17:31:33 (19 years ago)

Author:

Kris Deugau

Message:

/trunk

Redesign alloctype check so that it checks alloctypes that have
been loaded from the DB, rather than relying on hardcoded (and
therefore easy-to-forget-when-updating) entries.

File:

• trunk/cgi-bin/main.cgi (modified) (1 diff)

trunk/cgi-bin/main.cgi

@@ -987 +987 @@
     return;
   }
+
+  # Alloctype check.
   chomp $webvar{alloctype};
-  # We have different handling for customer allocations and "internal" or "our" allocations
-  if ($webvar{alloctype} =~ /^(ci|di|cn|mi|wi)$/) {
-    if (!$webvar{custid}) {
-      printError("Please enter a customer ID.");
-      return;
-    }
-    if ($webvar{custid} !~ /^(?:\d{10}|\d{7}|STAFF|TEMP)(?:-\d\d?)?$/) {
-      printError("Please enter a valid customer ID- this must be a 7- or 10-digit number, or STAFF for static IPs for staff.");
-      return;
-    }
-    print "<!-- [ In validateInput().  Insert customer ID cross-check here. ] -->\n";
-  } elsif ($webvar{alloctype} =~ /^([cdsmw]p|si|dn|dy|dc|dw|ee|rr|in)$/){
-    # All non-customer allocations MUST be entered with "our" customer ID.
-    # I have Defined this as 6750400 for consistency.
-    $webvar{custid} = "6750400";
-  } else {
+  if (!grep /$webvar{alloctype}/, keys %disp_alloctypes) {
     # 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");
     return;
+  }
+
+  # CustID check
+  # We have different handling for customer allocations and "internal" or "our" allocations
+  if ($webvar{alloctype} =~ /^(cn|.i)$/) {
+    if (!$webvar{custid}) {
+      printError("Please enter a customer ID.");
+      return;
+    }
+    if ($webvar{custid} !~ /^(?:\d{10}|\d{7}|STAFF|TEMP)(?:-\d\d?)?$/) {
+      printError("Please enter a valid customer ID- this must be a 7- or 10-digit number, or STAFF for static IPs for staff.");
+      return;
+    }
+    print "<!-- [ In validateInput().  Insert customer ID cross-check here. ] -->\n";
+  } else {
+    # All non-customer allocations MUST be entered with "our" customer ID.
+    # I have Defined this as 6750400 for consistency.
+    $webvar{custid} = "6750400";
   }