Index: branches/htmlform/cgi-bin/main.cgi
===================================================================
--- branches/htmlform/cgi-bin/main.cgi (revision 475)
+++ branches/htmlform/cgi-bin/main.cgi (revision 476)
@@ -1102,18 +1102,22 @@
mailNotify($ip_dbh, 's:swi', "SWIPed: $disp_alloctypes{$webvar{alloctype}} $webvar{block}",
"$webvar{block} had SWIP status changed to \"Yes\" by $authuser") if $webvar{swip} eq 'on';
- open (HTML, "../updated.html")
- or croak "Could not open updated.html :$!";
- my $html = join('', );
+
+## node hack
+ if ($webvar{node} && $webvar{node} ne '-') {
+ $sth = $ip_dbh->prepare("SELECT node_name FROM nodes WHERE node_id=?");
+ $sth->execute($webvar{node});
+ my ($nodename) = $sth->fetchrow_array();
+ $page->param(nodename => $nodename);
+ }
+## end node hack
# Link back to browse-routed or list-pool page on "Update complete" page.
- my $backlink = "/ip/cgi-bin/main.cgi?action=";
my $cblock; # to contain the CIDR of the container block we're retrieving.
my $sql;
if (my $pooltype = ($webvar{alloctype} =~ /^(.)i$/) ) {
+ $page->param(backpool => 1);
$sql = "select pool from poolips where ip='$webvar{block}'";
- $backlink .= "listpool&pool=";
} else {
$sql = "select cidr from routed where cidr >>= '$webvar{block}'";
- $backlink .= "showrouted&block=";
}
# I define there to be no errors on this operation... so we don't need to check for them.
@@ -1123,30 +1127,17 @@
$sth->fetch();
$sth->finish;
- $backlink .= $cblock;
-
-my $swiptmp = ($webvar{swip} eq 'on' ? 'Yes' : 'No');
- $html =~ s/\$\$BLOCK\$\$/$webvar{block}/g;
- $webvar{city} = $q->escapeHTML($webvar{city});
- $html =~ s/\$\$CITY\$\$/$webvar{city}/g;
- $html =~ s/\$\$ALLOCTYPE\$\$/$webvar{alloctype}/g;
- $html =~ s/\$\$TYPEFULL\$\$/$disp_alloctypes{$webvar{alloctype}}/g;
- $html =~ s/\$\$CUSTID\$\$/$webvar{custid}/g;
- $html =~ s/\$\$SWIP\$\$/$swiptmp/g;
- $webvar{circid} = $q->escapeHTML($webvar{circid});
- $html =~ s/\$\$CIRCID\$\$/$webvar{circid}/g;
- $webvar{desc} = $q->escapeHTML($webvar{desc});
- $html =~ s/\$\$DESC\$\$/$webvar{desc}/g;
- $webvar{notes} = $q->escapeHTML($webvar{notes});
- $html =~ s/\$\$NOTES\$\$/$webvar{notes}/g;
- $html =~ s/\$\$BACKLINK\$\$/$backlink/g;
- $html =~ s/\$\$BACKBLOCK\$\$/$cblock/g;
-
- if ($IPDBacl{$authuser} =~ /s/) {
- $privdata = qq(| Restricted data: | ).
- qq().$q->escapeHTML($webvar{privdata}).qq( |
\n);
- }
- $html =~ s/\$\$PRIVDATA\$\$/$privdata/g;
-
- print $html;
+ $page->param(backblock => $cblock);
+
+ $page->param(cidr => $webvar{block});
+ $page->param(city => $webvar{city});
+ $page->param(disptype => $disp_alloctypes{$webvar{alloctype}});
+ $page->param(custid => $webvar{custid});
+ $page->param(swip => $webvar{swip} eq 'on' ? 'Yes' : 'No');
+ $page->param(circid => $q->escapeHTML($webvar{circid}));
+ $page->param(desc => $q->escapeHTML($webvar{desc}));
+ $page->param(notes => $q->escapeHTML($webvar{notes}));
+ $webvar{privdata} = ($webvar{privdata} ? $q->escapeHTML($webvar{privdata}) : " ");
+ $page->param(privdata => $webvar{privdata})
+ if $IPDBacl{$authuser} =~ /s/;
} # update()
@@ -1241,5 +1232,5 @@
sub finalDelete {
if ($IPDBacl{$authuser} !~ /d/) {
- printError("You shouldn't have been able to get here. Access denied.");
+ $page->param(aclerr => 1);
return;
}
@@ -1250,6 +1241,6 @@
my ($code,$msg) = deleteBlock($ip_dbh, $webvar{block}, $webvar{alloctype});
+ $page->param(block => $webvar{block});
if ($code eq 'OK') {
- print "Success! $webvar{block} deallocated.
\n";
syslog "notice", "$authuser deallocated '$webvar{alloctype}'-type netblock $webvar{block}".
" $custid, $city, desc='$description'";
@@ -1258,10 +1249,10 @@
"CustID: $custid\nCity: $city\nDescription: $description\n");
} else {
+ $page->param(failmsg => $msg);
if ($webvar{alloctype} =~ /^.i$/) {
syslog "err", "$authuser could not deallocate static IP '$webvar{block}': '$msg'";
- printError("Could not deallocate static IP $webvar{block}: $msg");
} else {
syslog "err", "$authuser could not deallocate netblock '$webvar{block}': '$msg'";
- printError("Could not deallocate netblock $webvar{block}: $msg");
+ $page->param(netblock => 1);
}
}
Index: branches/htmlform/templates/edit.tmpl
===================================================================
--- branches/htmlform/templates/edit.tmpl (revision 475)
+++ branches/htmlform/templates/edit.tmpl (revision 476)
@@ -51,5 +51,5 @@
-