Changeset 544 for trunk/cgi-bin/IPDB.pm

Timestamp:

11/05/12 16:53:38 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Extend findAllocateFrom() to allow passing a target block to allocate
to restrict the freeblock selection
Remove local SQL for confirmation page for "assign this block" in
admin.cgi in favour of existing data and subs. See #34.
For admin.cgi "assign this block", if the requested IP type does not
match the pool, the type will be adjusted and a warning pushed out.
Add space on "assign this block" template for a warning.

File:

• trunk/cgi-bin/IPDB.pm (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -549 +549 @@
   ##fixme:  chain cities to align roughly with a full layer-2 node graph
   $city = $pop if $type !~ /^.[pc]$/;
-  if ($type ne 'rm') {
+  if ($type ne 'rm' && $city) {
     $sql .= " AND city = ?";
     push @vallist, $city;
+  }
+  # Allow specifying an arbitrary full block, instead of a master
+  if ($optargs{gimme}) {
+    $sql .= " AND cidr >>= ?";
+    push @vallist, $optargs{gimme};
   }
   # if a specific master was requested, allow the requestor to self->shoot(foot)