Index: branches/htmlform/cgi-bin/main.cgi =================================================================== --- branches/htmlform/cgi-bin/main.cgi (revision 468) +++ branches/htmlform/cgi-bin/main.cgi (revision 469) @@ -982,17 +982,34 @@ ##fixme # Needs thinking. Have to allow changes to city to correct errors, no? +# Also have areas where a routed block at a POP serves "many" cities/towns/named crossroads $html =~ s/\$\$BLOCK\$\$/$webvar{block}/g; + +# cidr,custid,type,city,circuitid,description,notes,modifystamp,privdata,swip + +$page->param(block => $webvar{block}); + +$page->param(custid => $data[1]); +$page->param(city => $data[3]); +$page->param(circid => $data[4]); +$page->param(desc => $data[5]); +$page->param(notes => $data[6]); if ($IPDBacl{$authuser} =~ /c/) { $html =~ s/\$\$CUSTID\$\$//; - -# Screw it. Changing allocation types gets very ugly VERY quickly- especially -# with the much longer list of allocation types. -# We'll just show what type of block it is. - -# this has now been Requested, so here goes. - ##fixme The check here should be built from the database +# Need to expand to support pool types too if ($data[2] =~ /^.[ne]$/) { +$page->param(changetype => $IPDBacl{$authuser} =~ /c/); +$page->param(alloctype => [ + { selme => ($data[2] eq 'me'), type => "me", disptype => "Dialup netblock" }, + { selme => ($data[2] eq 'de'), type => "de", disptype => "Dynamic DSL netblock" }, + { selme => ($data[2] eq 'ce'), type => "ce", disptype => "Dynamic cable netblock" }, + { selme => ($data[2] eq 'we'), type => "we", disptype => "Dynamic wireless netblock" }, + { selme => ($data[2] eq 'cn'), type => "cn", disptype => "Customer netblock" }, + { selme => ($data[2] eq 'en'), type => "en", disptype => "End-use netblock" }, + { selme => ($data[2] eq 'in'), type => "in", disptype => "Internal netblock" }, + ] + ); + # Block that can be changed my $blockoptions = "\n"; + my @nodelist; while (my ($nid,$nname) = $sth->fetchrow_array()) { $nodes .= "$nname\n"; - } + my %row = ( + selme => ($nodeid == $nid), + nodeid => $nid, + nodename => $nname, + ); + push (@nodelist, \%row); + } +$page->param(nodelist => \@nodelist); $nodes .= "\n"; $html =~ s/\$\$NODE\$\$/$nodes/; @@ -1061,5 +1089,5 @@ } my ($lastmod,undef) = split /\s+/, $data[7]; - $html =~ s/\$\$LASTMOD\$\$/$lastmod/g; + $page->param(lastmod => $lastmod); ## Hack time! SWIP isn't going to stay, so I'm not going to integrate it with ACLs. @@ -1077,4 +1105,7 @@ # Check to see if we can display sensitive data my $privdata = ''; +$page->param(nocling => $IPDBacl{$authuser} =~ /s/); +$page->param(privdata => $data[8]); + if ($IPDBacl{$authuser} =~ /s/) { $privdata = qq(Restricted data:). @@ -1089,4 +1120,5 @@ # can't leave the submit buttons there. my $updok = ''; +$page->param(maychange => $IPDBacl{$authuser} =~ /c/); if ($IPDBacl{$authuser} =~ /c/) { $updok = qq(
). @@ -1098,4 +1130,5 @@ my $delok = ''; +$page->param(maydel => $IPDBacl{$authuser} =~ /d/); if ($IPDBacl{$authuser} =~ /d/) { $delok = qq(
@@ -1109,5 +1142,5 @@ $html =~ s/\$\$DELOK\$\$/$delok/; - print $html; +# print $html; } # edit() Index: branches/htmlform/ipdb.css =================================================================== --- branches/htmlform/ipdb.css (revision 468) +++ branches/htmlform/ipdb.css (revision 469) @@ -96,10 +96,12 @@ font-family: Verdana, Arial, Helvetica, sans-serif; } -tr.row0 { +/* for reasons of Please The Validation Gods, these may be applied to + things that are not technically table rows */ +.row0 { background-color: #D0E0E0; font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 90%; } -tr.row1 { +.row1 { background-color: #A8C4D0; font-family: Verdana, Arial, Helvetica, sans-serif; Index: branches/htmlform/templates/edit.tmpl =================================================================== --- branches/htmlform/templates/edit.tmpl (revision 469) +++ branches/htmlform/templates/edit.tmpl (revision 469) @@ -0,0 +1,161 @@ +
+
Edit the information below
+ + + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
IP block:
City: + + + + + +
Type: + + + + + +
Demarc/tower: + + + + + + + +N/A + +
CustID: + + + + + +
SWIPed?: + +checked=yes> + +YesNo + +
Last modified:
Circuit ID: + + + + + +
Description/Name: + + + + + +
Notes: + + + + +
Restricted data: + + + + + +
+ + +
+
+ + + + +
+
+ + + + +
+
+ +
+ +