Index: branches/htmlform/cgi-bin/main.cgi
===================================================================
--- branches/htmlform/cgi-bin/main.cgi (revision 451)
+++ branches/htmlform/cgi-bin/main.cgi (revision 456)
@@ -580,99 +580,97 @@
}
- my $html;
+ # hack pthbttt eww
+ $webvar{block} = '' if !$webvar{block};
+
+# hmm. TMPL_IF block and TMPL_ELSE block on these instead?
+ $page->param(rowa => 'row'.($webvar{block} eq '' ? 1 : 0));
+ $page->param(rowb => 'row'.($webvar{block} eq '' ? 0 : 1));
+ $page->param(block => $webvar{block}); # fb-assign flag, if block is set, we're in fb-assign
+ $page->param(iscontained => ($webvar{fbtype} && $webvar{fbtype} ne 'y'));
# New special case- block to assign is specified
if ($webvar{block} ne '') {
- open HTML, "../fb-assign.html"
- or croak "Could not open fb-assign.html: $!";
- $html = join('',);
- close HTML;
my $block = new NetAddr::IP $webvar{block};
- $html =~ s|\$\$BLOCK\$\$|$block|g;
- $html =~ s|\$\$MASKBITS\$\$|$block->masklen|;
- my $typelist = '';
-
+
+ # Handle contained freeblock allocation.
# This is a little dangerous, as it's *theoretically* possible to
# get fbtype='n' (aka a non-routed freeblock). However, should
# someone manage to get there, they get what they deserve.
if ($webvar{fbtype} ne 'y') {
- # Snag the type of the block from the database. We have no
- # convenient way to pass this in from the calling location. :/
+ # Snag the type of the container block from the database.
$sth = $ip_dbh->prepare("select type from allocations where cidr >>='$block'");
$sth->execute;
my @data = $sth->fetchrow_array;
$data[0] =~ s/c$/r/; # Munge the type into the correct form
- $typelist = "$list_alloctypes{$data[0]}\n";
+ $page->param(fbdisptype => $list_alloctypes{$data[0]});
+ $page->param(type => $data[0]);
} else {
- $typelist .= qq(\n";
- }
- $html =~ s|\$\$TYPELIST\$\$|$typelist|g;
+ $page->param(typelist => \@typelist);
+ }
} else {
- open HTML, "../assign.html"
- or croak "Could not open assign.html: $!";
- $html = join('',);
- close HTML;
- my $masterlist = "\n";
- $html =~ s|\$\$MASTERLIST\$\$|$masterlist|g;
- my $pops = '';
+ my %row = (master => "$master");
+ push (@masterlist, \%row);
+ }
+ $page->param(masterlist => \@masterlist);
+
+ my @pops;
foreach my $pop (@poplist) {
- $pops .= "\n";
- }
- $html =~ s|\$\$POPLIST\$\$|$pops|g;
- my $typelist = '';
- $sth = $ip_dbh->prepare("select type,listname from alloctypes where listorder < 900 order by listorder");
+ my %row = (pop => $pop);
+ push (@pops, \%row);
+ }
+ $page->param(pops => \@pops);
+
+ # could arguably include routing (500) in the list, but ATM it doesn't
+ # make sense, and in any case that shouldn't be structurally possible here.
+ $sth = $ip_dbh->prepare("select type,listname from alloctypes where listorder < 500 order by listorder");
$sth->execute;
- my @data = $sth->fetchrow_array;
- $typelist .= "\n";
+ my @typelist;
+ my $selflag = 0;
while (my @data = $sth->fetchrow_array) {
- $typelist .= "\n";
- }
- $html =~ s|\$\$TYPELIST\$\$|$typelist|g;
- }
- my $cities = '';
+ my %row = (tval => $data[0],
+ type => $data[1],
+ sel => ($selflag == 0 ? ' selected' : '')
+ );
+ push (@typelist, \%row);
+ $selflag++;
+ }
+ $page->param(typelist => \@typelist);
+ }
+
+ my @cities;
foreach my $city (@citylist) {
- $cities .= "\n";
- }
- $html =~ s|\$\$ALLCITIES\$\$|$cities|g;
+ my %row = (city => $city);
+ push (@cities, \%row);
+ }
+ $page->param(citylist => \@cities);
## node hack
$sth = $ip_dbh->prepare("SELECT node_id, node_name FROM nodes ORDER BY node_type,node_id");
$sth->execute() or print "DEBUG: failed retrieval from nodes: ".$sth->errstr," \n";
- my $nodes = '';
+ my @nodes;
while (my ($nid,$nname) = $sth->fetchrow_array()) {
- $nodes .= "\n";
- }
- $html =~ s/\$\$NODELIST\$\$/$nodes/;
+ my %row = (nid => $nid, nname => $nname);
+ push (@nodes, \%row);
+ }
+ $page->param(nodelist => \@nodes);
## end node hack
- my $i = 0;
- $i++ if $webvar{fbtype} eq 'y';
- # Check to see if user is allowed to do anything with sensitive data
- my $privdata = '';
- if ($IPDBacl{$authuser} =~ /s/) {
- $privdata = qq(