Changeset 546

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.

Location:

trunk/cgi-bin

Files:

• CustIDCK.pm (modified) (2 diffs)
• admin.cgi (modified) (1 diff)
• main.cgi (modified) (1 diff)

trunk/cgi-bin/CustIDCK.pm

@@ -34 +34 @@
   my $custid = shift;
 
-  return 1 if $custid =~ /^STAFF$/;
-  return 1 if $custid =~ /^5554242$/;  # just in case some later change might block this
-  return 1 if $custid =~ /^\d{7}$/;
-  return 1 if $custid =~ /^\d{10}$/;
+  # hardcoded "OK" custids.
+  return 1 if $custid =~ /^STAFF(?:-\d\d?)?$/;
+  return 1 if $custid =~ /^5554242(?:-\d\d?)?$/;  # just in case some later change might block this
+  return 1 if $custid =~ /^\d{7}(?:-\d\d?)?$/;
+  return 1 if $custid =~ /^\d{10}(?:-\d\d?)?$/;
+
+  # Force uppercase for now...
+  $custid =~ tr/a-z/A-Z/;
 
 # some example code for a database check
@@ -66 +70 @@
 
   # We should have a valid DB connection by now.
-  my $sth = $dbh->prepare("SELECT custid FROM custid WHERE custid = '$custid'");
-  $sth->execute;
+  
+  my $hr = $dbh->selectrow_hashref("SELECT custid FROM custid WHERE custid = ?", undef, ($custid) );
+  my $status = 0;
   if ($dbh->err) {
     $CustIDCK::Error = 1;
     $CustIDCK::ErrMsg = $dbh->errstr();
-    $sth->finish;
-    $dbh->disconnect;
-    return 0;
+  } else {
+    $status = 1 if ( $hr->{custid} );
   }
-  my $hr = $sth->fetchrow_hashref();
-  my $status = 0;
-  $status = 1 if ( $hr->{custid} );
-  $sth->finish;
   $dbh->disconnect;
   return $status;

trunk/cgi-bin/admin.cgi

@@ -123 +123 @@
   my $custid = $def_custids{$webvar{alloctype}};
   if ($custid eq '') {
-    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(errmsg => "Error verifying customer ID: ".$CustIDCK::ErrMsg);
-        goto ERRJUMP;
-      }
-      if (!$status) {
-        $page->param(errmsg => "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.");
-        goto ERRJUMP;
-      }
+    # Crosscheck with billing.
+    my $status = CustIDCK->custid_exist($webvar{custid});
+    if ($CustIDCK::Error) {
+      $page->param(errmsg => "Error verifying customer ID: ".$CustIDCK::ErrMsg);
+      goto ERRJUMP;
+    }
+    if (!$status) {
+      $page->param(errmsg => "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.");
+      goto ERRJUMP;
     }
     # Type that doesn't have a default custid

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";