Changeset 149 for branches/sql-cleanup/cgi-bin/main.cgi

Timestamp:

02/03/05 14:23:34 (19 years ago)

Author:

Kris Deugau

Message:

/branches/sql-cleanup

Fixed a bunch of general problems with pool allocations, and
rearranged some code, alloctypes, and the poolips table (ugh)
to more cleanly support different types of IP pool.

File:

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

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

@@ -354 +354 @@
         $data[1], $disp_alloctypes{$data[2]}, $data[3], $data[4]);
     # Allow listing of pool if desired/required.
-    if ($data[2] =~ /^[cdsmw]p$/) {
+    if ($data[2] =~ /^.[pd]$/) {
       $row[0] .= ' &nbsp; <a href="/ip/cgi-bin/main.cgi?action=listpool'.
         "&pool=$data[0]\">List IPs</a>";
@@ -620 +620 @@
         $data[3], $disp_alloctypes{$data[2]}, $data[1], $data[4]);
     # If the allocation is a pool, allow listing of the IPs in the pool.
-    if ($data[2] =~ /^[cdsmw]p$/) {
+    if ($data[2] =~ /^.[pd]$/) {
       $row[0] .= ' &nbsp; <a href="/ip/cgi-bin/main.cgi?action=listpool'.
         "&pool=$data[0]\">List IPs</a>";
@@ -675 +675 @@
   my $cidr = new NetAddr::IP $webvar{pool};
 
+  my ($pooltype,$poolcity);
+
   # Snag pool info for heading
-  $sth = $ip_dbh->prepare("select * from allocations where cidr='$cidr'");
+  $sth = $ip_dbh->prepare("select type,city from allocations where cidr='$cidr'");
   $sth->execute;
-  my @data = $sth->fetchrow_array;
-  my $type = $data[2];  # We'll need this later.
+  $sth->bind_columns(\$pooltype, \$poolcity);
+  $sth->fetch() || carp $sth->errstr;
 
   print qq(<center><div class="heading">Listing pool IPs for $cidr<br>\n).
-        qq(($disp_alloctypes{$type} in $data[3])</div></center><br>\n);
-  print qq(<div class="indent"><b>Reserved IPs:</b><br>\n);
-  print qq(<div class="indent"><table><tr class=color1><td>Network IP:</td><td>).
+        qq(($disp_alloctypes{$pooltype} in $poolcity)</div></center><br>\n);
+  # Only display net/gw/bcast if it's a "real" netblock and not a PPP(oE) lunacy
+  if ($pooltype =~ /^.d$/) {
+    print qq(<div class="indent"><b>Reserved IPs:</b><br>\n);
+    print qq(<div class="indent"><table><tr class=color1><td>Network IP:</td><td>).
         $cidr->addr."</td></tr>\n";
-  $cidr++;
-  print "<tr class=color2><td>Gateway:</td><td>".$cidr->addr."</td></tr>\n";
-  $cidr--;  $cidr--;
-  print "<tr class=color1><td>Broadcast:</td><td>".$cidr->addr."</td></tr>\n".
+    $cidr++;
+    print "<tr class=color2><td>Gateway:</td><td>".$cidr->addr."</td></tr>\n";
+    $cidr--;  $cidr--;
+    print "<tr class=color1><td>Broadcast:</td><td>".$cidr->addr."</td></tr>\n".
         "<tr><td>Netmask:</td><td>".$cidr->mask."</td></tr>\n".
         "</table></div></div>\n";
+  }
 
 # probably have to add an "edit IP allocation" link here somewhere.
@@ -973 +978 @@
         "'$webvar{alloctype}' by $authuser failed: '$msg'";
     printError("Allocation of $webvar{fullcidr} as $disp_alloctypes{$webvar{alloctype}}".
-        " failed: $msg\n");
+        " failed:<br>\n$msg\n");
   }