Changeset 12 for trunk

Timestamp:

10/25/04 17:29:26 (20 years ago)

Author:

Kris Deugau

Message:

cgi-bin/main.cgi:

• Added wireless IP and IP pool types
• Fixed checks that missed some pool types

File:

• trunk/cgi-bin/main.cgi (modified) (10 diffs)

trunk/cgi-bin/main.cgi

@@ -50 +50 @@
         "si","Server pool IP",
         "mi","Static dialup IP",
+        "wi","Static wireless IP",
         "cp","Cable pool",
         "dp","DSL pool",
         "sp","Server pool",
         "mp","Static dialup pool",
+        "wp","Static wireless pool",
         "dn","Dialup netblock",
         "dy","Dynamic DSL netblock",
@@ -364 +366 @@
         $data[1], $full_alloc_types{$data[2]}, $data[3], $data[4]);
     # Allow listing of pool if desired/required.
-    if ($data[2] =~ /^[sdcm]p$/) {
+    if ($data[2] =~ /^[sdcmw]p$/) {
       $row[0] .= ' &nbsp; <a href="/ip/cgi-bin/main.cgi?action=listpool'.
         "&pool=$data[0]\">List IPs</a>";
@@ -653 +655 @@
         $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] =~ /^[sdc]p$/) {
+    if ($data[2] =~ /^[sdcmw]p$/) {
       $row[0] .= ' &nbsp; <a href="/ip/cgi-bin/main.cgi?action=listpool'.
         "&pool=$data[0]\">List IPs</a>";
@@ -1122 +1124 @@
     }
     print "<!-- [ In validateInput().  Insert customer ID cross-check here. ] -->\n";
-  } elsif ($webvar{alloctype} =~ /^([sdc]p|si|dn|dy|dc|ee|rr|ii)$/){
+  } 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.
@@ -1293 +1295 @@
     $desc = "N/A";
     $notes = "N/A";
-  } elsif ($webvar{alloctype} =~ /^[sdcm]i$/) { # done with alloctype=rr
+  } elsif ($webvar{alloctype} =~ /^[sdcmw]i$/) { # done with alloctype=rr
 
     # Unassigning a static IP
@@ -1306 +1308 @@
     $alloctype .="i";
 
-  } else { # done with alloctype=[sdcm]i
+  } else { # done with alloctype=[sdcmw]i
 
     my $sth = $ip_dbh->prepare("select cidr,custid,type,city,description,notes from ".
@@ -1330 +1332 @@
 
   # Set the warning text.
-  if ($alloctype =~ /^[sdcm]p$/) {
+  if ($alloctype =~ /^[sdcmw]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 {
@@ -1352 +1354 @@
   local $ip_dbh->{RaiseError} = 1;
 
-  if ($webvar{alloctype} =~ /^[sdcm]i$/) {
+  if ($webvar{alloctype} =~ /^[sdcmw]i$/) {
 
     eval {
@@ -1375 +1377 @@
     syslog "notice", "$authuser deallocated static IP $webvar{block}";
 
-  } elsif ($webvar{alloctype} eq 'mm') { # end alloctype = [sdcm]i
+  } elsif ($webvar{alloctype} eq 'mm') { # end alloctype = [sdcmw]i
 
     eval {
@@ -1419 +1421 @@
         $sth = $ip_dbh->prepare("delete from allocations where cidr='$webvar{block}'");
         $sth->execute;
-
         # Special case - delete pool IPs
-        if ($webvar{alloctype} =~ /^[sdcm]p$/) {
+        if ($webvar{alloctype} =~ /^[sdcmw]p$/) {
           # We have to delete the IPs from the pool listing.
           $sth = $ip_dbh->prepare("delete * from poolips where pool='$webvar{block}'");