Changeset 97 for branches/stable

Timestamp:

12/02/04 15:48:33 (20 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Backported pool/static type checks from /trunk r72

File:

• branches/stable/cgi-bin/main.cgi (modified) (17 diffs)

branches/stable/cgi-bin/main.cgi

@@ -371 +371 @@
     # Fix up types from pools (which are single-char)
     # Fixing the database would be...  painful.  :(
-    if ($data[2] =~ /^[sdcmw]$/) {
+    if ($data[2] =~ /^[cdsmw]$/) {
       $data[2] .= 'i';
     }
@@ -377 +377 @@
         $data[1], $full_alloc_types{$data[2]}, $data[3], $data[4]);
     # Allow listing of pool if desired/required.
-    if ($data[2] =~ /^[sdcmw]p$/) {
+    if ($data[2] =~ /^[cdsmw]p$/) {
       $row[0] .= ' &nbsp; <a href="/ip/cgi-bin/main.cgi?action=listpool'.
         "&pool=$data[0]\">List IPs</a>";
@@ -666 +666 @@
         $data[3], $full_alloc_types{$data[2]}, $data[1], $data[4]);
     # If the allocation is a pool, allow listing of the IPs in the pool.
-    if ($data[2] =~ /^[sdcmw]p$/) {
+    if ($data[2] =~ /^[cdsmw]p$/) {
       $row[0] .= ' &nbsp; <a href="/ip/cgi-bin/main.cgi?action=listpool'.
         "&pool=$data[0]\">List IPs</a>";
@@ -839 +839 @@
 #  + Different flavours of netblock
 
-  if ($webvar{alloctype} =~ /^[scdmw]i$/) {
+  if ($webvar{alloctype} =~ /^[cdsmw]i$/) {
     my ($base,undef) = split //, $webvar{alloctype};    # split into individual chars
     my $sql;
@@ -898 +898 @@
           " a set of smaller netblocks or a single smaller netblock.";
       } else {
-        if ($webvar{alloctype} =~ /^[scdmw]p$/) {
+        if ($webvar{alloctype} =~ /^[cdsmw]p$/) {
           if (($webvar{city} !~ /^(Sudbury|North Bay)$/) && ($webvar{alloctype} eq 'dp')) {
             printAndExit("You must chose Sudbury or North Bay for DSL pools."); }
@@ -940 +940 @@
       $cidr = $subblocks[0];
     }
-  } # if ($webvar{alloctype} =~ /^[cdsm]i$/) {
+  } # if ($webvar{alloctype} =~ /^[cdsmw]i$/)
 
   open HTML, "../confirm.html"
@@ -995 +995 @@
 # Same ordering as confirmation page
 
-  if ($webvar{alloctype} =~ /^[cdsm]i$/) {
+  if ($webvar{alloctype} =~ /^[cdsmw]i$/) {
     my ($base,$tmp) = split //, $webvar{alloctype};     # split into individual chars
 
@@ -1146 +1146 @@
       # special extra handling for pools.
       # Note that this must be done for ANY pool allocation!
-      if ( my ($pooltype) = ($webvar{alloctype} =~ /^([cdsm])p$/) ) {
+      if ( my ($pooltype) = ($webvar{alloctype} =~ /^([cdsmw])p$/) ) {
         # have to insert all pool IPs into poolips table as "unallocated".
         $sth = $ip_dbh->prepare("insert into poolips values ('$webvar{fullcidr}',".
@@ -1201 +1201 @@
     }
 #    print "<!-- [ In validateInput().  Insert customer ID cross-check here. ] -->\n";
-  } elsif ($webvar{alloctype} =~ /^([sdcmw]p|si|dn|dy|dc|ee|rr|ii)$/){
+  } elsif ($webvar{alloctype} =~ /^([cdsmw]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.
@@ -1250 +1250 @@
 
   # Postfix "i" on pool IP types
-  if ($data[2] =~ /^[cdsm]$/) {
+  if ($data[2] =~ /^[cdsmw]$/) {
     $data[2] .= "i";
   }
@@ -1312 +1312 @@
     # Relatively simple SQL transaction here.
     my $sql;
-    if (my $pooltype = ($webvar{alloctype} =~ /^([cdms])i$/) ) {
+    if (my $pooltype = ($webvar{alloctype} =~ /^([cdsmw])i$/) ) {
       $sql = "update poolips set custid='$webvar{custid}',notes='$webvar{notes}',".
         "circuitid='$webvar{circid}',description='$webvar{desc}' ".
@@ -1399 +1399 @@
     $desc = "N/A";
     $notes = "N/A";
-  } elsif ($webvar{alloctype} =~ /^[sdcmw]i$/) { # done with alloctype=rr
+  } elsif ($webvar{alloctype} =~ /^[cdsmw]i$/) { # done with alloctype=rr
 
     # Unassigning a static IP
@@ -1412 +1412 @@
     $alloctype .="i";
 
-  } else { # done with alloctype=[sdcmw]i
+  } else { # done with alloctype=[cdsmw]i
 
     my $sth = $ip_dbh->prepare("select cidr,custid,type,city,circuitid,description,notes from ".
@@ -1437 +1437 @@
 
   # Set the warning text.
-  if ($alloctype =~ /^[sdcmw]p$/) {
+  if ($alloctype =~ /^[cdsmw]p$/) {
     $html =~ s|<!--warn-->|<tr bgcolor="black"><td colspan="2"><div class="red">Warning: clicking confirm will remove this record entirely.<br>Any IPs allocated from this pool will also be removed!</div></td></tr>|;
   } else {
@@ -1459 +1459 @@
   local $ip_dbh->{RaiseError} = 1;
 
-  if ($webvar{alloctype} =~ /^[sdcmw]i$/) {
+  if ($webvar{alloctype} =~ /^[cdsmw]i$/) {
 
     eval {
@@ -1482 +1482 @@
     syslog "notice", "$authuser deallocated static IP $webvar{block}";
 
-  } elsif ($webvar{alloctype} eq 'mm') { # end alloctype = [sdcmw]i
+  } elsif ($webvar{alloctype} eq 'mm') { # end alloctype = [cdsmw]i
 
     eval {
@@ -1527 +1527 @@
         $sth->execute;
         # Special case - delete pool IPs
-        if ($webvar{alloctype} =~ /^[sdcmw]p$/) {
+        if ($webvar{alloctype} =~ /^[cdsmw]p$/) {
           # We have to delete the IPs from the pool listing.
           $sth = $ip_dbh->prepare("delete from poolips where pool='$webvar{block}'");