Index: branches/htmlform/cgi-bin/admin.cgi
===================================================================
--- branches/htmlform/cgi-bin/admin.cgi (revision 487)
+++ branches/htmlform/cgi-bin/admin.cgi (revision 488)
@@ -243,25 +243,11 @@
} elsif ($webvar{action} eq 'alloctweak') {
+
fix_allocfrom();
showAllocs($webvar{allocfrom});
+
} elsif ($webvar{action} eq 'update') {
+
update();
-} elsif ($webvar{action} eq 'assign') {
- # Display a list of possible blocks within the requested block.
- open (HTML, "../admin_alloc.html")
- or croak "Could not open admin_alloc.html :$!";
- my $html = join('', );
- $html =~ s/\$\$MASK\$\$/$webvar{masklen}/g;
- $html =~ s/\$\$ALLOCFROM\$\$/$webvar{allocfrom}/g;
-
- my $from = new NetAddr::IP $webvar{allocfrom};
- my @blocklist = $from->split($webvar{masklen});
- my $availblocks;
- foreach (@blocklist) {
- $availblocks .= qq(
$_
\n);
- }
- $html =~ s/\$\$BLOCKLIST\$\$/$availblocks/g;
-
- print $html;
} elsif ($webvar{action} eq 'touch') {
@@ -547,31 +533,4 @@
-# List free blocks in a /24 for arbitrary manual allocation
-sub showfree($) {
- my $cidr = new NetAddr::IP $_[0];
- print "Showing free blocks in $cidr \n".
- "
\n";
- $sth = $ip_dbh->prepare("select * from freeblocks where cidr <<= '$cidr' order by cidr");
- $sth->execute;
- while (my @data = $sth->fetchrow_array) {
- my $temp = new NetAddr::IP $data[0];
- print "
\n";
- }
- print "
\n";
-}
-
-
# Show allocations to allow editing.
sub showAllocs {