Changeset 56 for branches

Timestamp:

11/10/04 11:10:28 (20 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Add support for checking CustIDs against an external agent

• Uses CustIDCK.pm micro-module

Location:

branches/stable/cgi-bin

Files:

• CustIDCK.pm (added)
• main.cgi (modified) (2 diffs)

branches/stable/cgi-bin/main.cgi

@@ -15 +15 @@
 use CommonWeb qw(:ALL);
 use IPDB qw(:ALL);
+use CustIDCK;
 use POSIX qw(ceil);
 use NetAddr::IP;
@@ -1159 +1160 @@
     }
     if ($webvar{custid} !~ /^(?:\d{10}|\d{7}|STAFF)(?:-\d\d?)?$/) {
-      printAndExit("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";
+      # Force uppercase for now...
+      $webvar{custid} =~ tr/a-z/A-Z/;
+      # Crosscheck with ... er...  something.
+      my $status = CustIDCK->custid_exist($webvar{custid});
+      printAndExit("Error verifying customer ID: ".$CustIDCK::ErrMsg)
+        if $CustIDCK::Error;
+      printAndExit("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.")
+        if !$status;
+#"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";
   } elsif ($webvar{alloctype} =~ /^([sdcmw]p|si|dn|dy|dc|ee|rr|ii)$/){
     # All non-customer allocations MUST be entered with "our" customer ID.
     # I have Defined this as 6750400 for consistency.
-    $webvar{custid} = "6750400";
+    # STAFF is also acceptable.
+    if ((!$webvar{custid}) || ($webvar{custid} ne 'STAFF')) {
+      $webvar{custid} = "6750400";
+    }
     if ($webvar{alloctype} eq 'rr') {
       if ($webvar{city} !~ /^(?:Huntsville|North Bay|Ottawa|Pembroke|Sault Ste. Marie|Sudbury|Timmins|Thunder Bay|Toronto)$/) {