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

Timestamp:

05/11/10 17:06:26 (14 years ago)

Author:

Kris Deugau

Message:

/trunk

Merge addition of CustIDCK.pm from r56 - proprietary info this contained
was stripped during repo history conversion and it makes a good base for
providing data validation hooks.
Also merge all updates and related additions since.
See #13.

File:

• trunk/cgi-bin/main.cgi (modified) (3 diffs)

trunk/cgi-bin/main.cgi

@@ -15 +15 @@
 use CommonWeb qw(:ALL);
 use MyIPDB;
+use CustIDCK;
 use POSIX qw(ceil);
 use NetAddr::IP;
@@ -943 +944 @@
       return;
     }
-    if ($webvar{custid} !~ /^(?:\d{5,10}|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";
+    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) {
+        printError("Error verifying customer ID: ".$CustIDCK::ErrMsg);
+        return;
+      }
+      if (!$status) {
+        printError("Customer ID not valid.  Make sure the Customer ID ".
+          "is correct.<br>\nUse STAFF for staff static IPs, and 6750400 for any other ".
+          "non-customer assignments.");
+        return;
+      }
+#"Please enter a valid customer ID- this must be a 7- or 10-digit number, or STAFF for
+#static IPs for staff.");
+    }
+#    print "<!-- [ In validateInput().  Insert customer ID cross-check here. ] -->\n";
   } else {
     # New!  Improved!  And now Loaded From The Database!!
@@ -967 +982 @@
   } else {
     $flag = 'n';
-    if ($webvar{alloctype} =~ /[wp][cr]|d[pi]/) {
+    if ($webvar{alloctype} =~ /[wp][cr]|[ds][pi]/) {
       # Set this forcibly rather than messing around elsewhere.  Yes, this *is* a hack.  PTHBTT!!
-      # Match CORE/WAN types (wc, wr, pc, pr), DSL pool and IP (dp, di).
-      $webvar{pop} = "Sudbury";
-    } elsif ($webvar{pop} =~ /^-$/) {
+      $webvar{pop} = 'Sudbury';
+    }
+    if ($webvar{pop} =~ /^-$/) {
       $flag = 'to route the block from/through';
     }