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

Timestamp:

11/07/12 17:45:28 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Tweak custid check in both main.cgi and admin.cgi; move the
general hardcoded checks into CustIDCK.pm.

File:

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

trunk/cgi-bin/main.cgi

@@ -572 +572 @@
       return;
     }
-    if ($webvar{custid} !~ /^(?:\d{10}|\d{7}|STAFF)(?:-\d\d?)?$/) {
-      # Force uppercase for now...
-      $webvar{custid} =~ tr/a-z/A-Z/;
-      # Crosscheck with billing.
-      my $status = CustIDCK->custid_exist($webvar{custid});
-      if ($CustIDCK::Error) {
-        $page->param(err => "Error verifying customer ID: ".$CustIDCK::ErrMsg);
-        return;
-      }
-      if (!$status) {
-        $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.");
-        return;
-      }
+    # Crosscheck with billing.
+    my $status = CustIDCK->custid_exist($webvar{custid});
+    if ($CustIDCK::Error) {
+      $page->param(err => "Error verifying customer ID: ".$CustIDCK::ErrMsg);
+      return;
+    }
+    if (!$status) {
+      $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.");
+      return;
     }
 #    print "<!-- [ In validateInput().  Insert customer ID cross-check here. ] -->\n";