Changeset 155

Timestamp:

02/04/05 17:35:56 (20 years ago)

Author:

Kris Deugau

Message:

/branches/sql-cleanup

Fixed (most) of the last of the semi-"legacy" checks on
pool/static-ip types to allow simple addition of new types via
the alloctypes table rather than having to modify code. Two
legacy checks remain, which add 'i' to poolips.ptype values and
which should never trigger with the updated arrangment for the
poolips table.

File:

• branches/sql-cleanup/cgi-bin/main.cgi (modified) (9 diffs)

branches/sql-cleanup/cgi-bin/main.cgi

@@ -325 +325 @@
     # Fix up types from pools (which are single-char)
     # Fixing the database would be...  painful.  :(
+##fixme LEGACY CODE
     if ($data[2] =~ /^[cdsmw]$/) {
       $data[2] .= 'i';
@@ -787 +788 @@
 #  + Different flavours of netblock
 
-  if ($webvar{alloctype} =~ /^[cdsmw]i$/) {
+  if ($webvar{alloctype} =~ /^.i$/) {
     my ($base,undef) = split //, $webvar{alloctype};    # split into individual chars
     my $sql;
@@ -849 +850 @@
 ##fixme
 # This section needs serious Pondering.
-        if ($webvar{alloctype} =~ /^[cdsmw]p$/) {
+        if ($webvar{alloctype} =~ /^.[pd]$/) {
           if (($webvar{city} !~ /^(Sudbury|North Bay)$/) && ($webvar{alloctype} eq 'dp')) {
             printError("You must chose Sudbury or North Bay for DSL pools.");
@@ -894 +895 @@
       $cidr = $subblocks[0];
     }
-  } # if ($webvar{alloctype} =~ /^[cdsmw]i$/)
+  } # if ($webvar{alloctype} =~ /^.i$/)
 
   open HTML, "../confirm.html"
@@ -1052 +1053 @@
   $data[2] =~ s/\s//;
 
+##fixme LEGACY CODE
   # Postfix "i" on pool IP types
   if ($data[2] =~ /^[cdsmw]$/) {
@@ -1114 +1116 @@
     # Relatively simple SQL transaction here.
     my $sql;
-    if (my $pooltype = ($webvar{alloctype} =~ /^([cdsmw])i$/) ) {
+    if (my $pooltype = ($webvar{alloctype} =~ /^(.)i$/) ) {
       # Note the hack ( available='n' ) to work around "update" additions
       # to static IP space.  Eww.
@@ -1204 +1206 @@
     $desc = "N/A";
     $notes = "N/A";
-  } elsif ($webvar{alloctype} =~ /^[cdsmw]i$/) { # done with alloctype=rr
+  } elsif ($webvar{alloctype} =~ /^.i$/) { # done with alloctype=rr
 
     # Unassigning a static IP
@@ -1217 +1219 @@
     $alloctype .="i";
 
-  } else { # done with alloctype=[cdsmw]i
+  } else { # done with alloctype=~ /^.i$/
 
     my $sth = $ip_dbh->prepare("select cidr,custid,type,city,circuitid,description,notes from ".
@@ -1242 +1244 @@
 
   # Set the warning text.
-  if ($alloctype =~ /^[cdsmw]p$/) {
+  if ($alloctype =~ /^.[pd]$/) {
     $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 {