Index: /branches/sql-cleanup/cgi-bin/main.cgi
===================================================================
--- /branches/sql-cleanup/cgi-bin/main.cgi	(revision 154)
+++ /branches/sql-cleanup/cgi-bin/main.cgi	(revision 155)
@@ -325,4 +325,5 @@
     # 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,5 +788,5 @@
 #  + 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,5 +850,5 @@
 ##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,5 +895,5 @@
       $cidr = $subblocks[0];
     }
-  } # if ($webvar{alloctype} =~ /^[cdsmw]i$/)
+  } # if ($webvar{alloctype} =~ /^.i$/)
 
   open HTML, "../confirm.html"
@@ -1052,4 +1053,5 @@
   $data[2] =~ s/\s//;
 
+##fixme LEGACY CODE
   # Postfix "i" on pool IP types
   if ($data[2] =~ /^[cdsmw]$/) {
@@ -1114,5 +1116,5 @@
     # 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,5 +1206,5 @@
     $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,5 +1219,5 @@
     $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,5 +1244,5 @@
 
   # 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 {