Changeset 596 for branches/stable/cgi-bin

Timestamp:

05/15/13 18:03:32 (11 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Hand-backport static IP assign-by-browse. As with assign-routed-by-browse
in r595, this could not be merged from /trunk directly due to intermingled
changes for the new database structure and will cause merge conflicts
later.

File:

• branches/stable/cgi-bin/main.cgi (modified) (2 diffs)

branches/stable/cgi-bin/main.cgi

@@ -323 +323 @@
     if ($webvar{fbtype} eq 'i') {
       my $ipinfo = getBlockData($ip_dbh, $webvar{block}, 'i');
-      my $pinfo = getBlockData($ip_dbh, $webvar{parent});
+##fixme:  a reversion!  kill it!
+my ($iptype,$pool) = $ip_dbh->selectrow_array("SELECT type,pool FROM poolips WHERE ip = ?", undef, ($block));
       $page->param(
         fbip => 1,
@@ -329 +330 @@
         fbdisptype => $list_alloctypes{$ipinfo->{type}},
         type => $ipinfo->{type},
-        allocfrom => $pinfo->{block},
+        allocfrom => $pool,
         );
     } elsif ($webvar{fbtype} eq 'n') {