Index: branches/htmlform/cgi-bin/main.cgi =================================================================== --- branches/htmlform/cgi-bin/main.cgi (revision 473) +++ branches/htmlform/cgi-bin/main.cgi (revision 474) @@ -1160,10 +1160,4 @@ } - #show confirm screen. - open HTML, "../confirmRemove.html" - or croak "Could not open confirmRemove.html :$!"; - my $html = join('', ); - close HTML; - # Serves'em right for getting here... if (!defined($webvar{block})) { @@ -1189,6 +1183,8 @@ $desc = "N/A"; $notes = "N/A"; + $privdata = "N/A"; } elsif ($webvar{alloctype} eq 'mm') { + $cidr = $webvar{block}; $city = "N/A"; @@ -1198,4 +1194,6 @@ $desc = "N/A"; $notes = "N/A"; + $privdata = "N/A"; + } elsif ($webvar{alloctype} =~ /^.i$/) { # done with alloctype=[rm]m @@ -1222,38 +1220,17 @@ } # end cases for different alloctypes - # Munge everything into HTML - $html =~ s|Please confirm|Please confirm removal of|; - $html =~ s|\$\$BLOCK\$\$|$cidr|g; - $html =~ s|\$\$TYPEFULL\$\$|$disp_alloctypes{$alloctype}|g; - $html =~ s|\$\$ALLOCTYPE\$\$|$alloctype|g; - $html =~ s|\$\$CITY\$\$|$city|g; - $html =~ s|\$\$CUSTID\$\$|$custid|g; - $html =~ s|\$\$CIRCID\$\$|$circid|g; - $html =~ s|\$\$DESC\$\$|$desc|g; - $html =~ s|\$\$NOTES\$\$|$notes|g; - - $html =~ s|\$\$ACTION\$\$|finaldelete|g; - - # Set the warning text. - if ($alloctype =~ /^.[pd]$/) { - $html =~ s||
Warning: clicking confirm will remove this record entirely.
Any IPs allocated from this pool will also be removed!
|; - } else { - $html =~ s||
Warning: clicking confirm will remove this record entirely.
|; - } - - my $i = 1; - # Check to see if user is allowed to do anything with sensitive data - if ($IPDBacl{$authuser} =~ /s/) { - $privdata = qq(Restricted data:). - qq($privdata\n); - $i++; - } - $html =~ s/\$\$PRIVDATA\$\$/$privdata/g; - - $i = ++$i % 2; - $html =~ s/\$\$BUTTONROWCOLOUR\$\$/color$i/; - - print $html; -} # end edit() + $page->param(block => $cidr); + $page->param(disptype => $disp_alloctypes{$alloctype}); + $page->param(type => $alloctype); + $page->param(city => $city); + $page->param(custid => $custid); + $page->param(circid => $circid); + $page->param(desc => $desc); + $page->param(notes => $notes); + $privdata = ' ' if $privdata eq ''; + $page->param(privdata => $privdata) if $IPDBacl{$authuser} =~ /s/; + $page->param(delpool => $alloctype =~ /^.[pd]$/); + +} # end remove() Index: branches/htmlform/templates/delete.tmpl =================================================================== --- branches/htmlform/templates/delete.tmpl (revision 474) +++ branches/htmlform/templates/delete.tmpl (revision 474) @@ -0,0 +1,69 @@ +
Please confirm removal of:
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
IP block:
City:
Type:
Customer ID:
Circuit ID:
Description/Name:
Notes:
Restricted data:
+Warning: clicking confirm will remove this record entirely. +
Any IPs allocated from this pool will also be removed! +
+
+
+ + + + + +
+
+
Index: branches/htmlform/templates/showmaster.tmpl =================================================================== --- branches/htmlform/templates/showmaster.tmpl (revision 473) +++ branches/htmlform/templates/showmaster.tmpl (revision 474) @@ -30,5 +30,5 @@
- + Index: branches/htmlform/templates/showrouted.tmpl =================================================================== --- branches/htmlform/templates/showrouted.tmpl (revision 473) +++ branches/htmlform/templates/showrouted.tmpl (revision 474) @@ -67,4 +67,4 @@
-
No unassigned blocks in routed block
+
No unassigned blocks in routed block