Index: trunk/cgi-bin/admin.cgi =================================================================== --- trunk/cgi-bin/admin.cgi (revision 515) +++ trunk/cgi-bin/admin.cgi (revision 517) @@ -15,6 +15,7 @@ use warnings; use CGI::Carp qw(fatalsToBrowser); +use CGI::Simple; +use HTML::Template; use DBI; -use CommonWeb qw(:ALL); #use POSIX qw(ceil); use NetAddr::IP; @@ -39,4 +40,20 @@ syslog "debug", "$authuser active"; + +# Set up the CGI object... +my $q = new CGI::Simple; +# ... and get query-string params as well as POST params if necessary +$q->parse_query_string; + +# Convenience; saves changing all references to %webvar +##fixme: tweak for handling -Allocate block/IP: as to - -
- -Manually update allocation data in this /24: - -
- -
rWHOIS tools: -
- -Bump "last updated" timestamp on this master: - (Sets timestamp to "now")
-Edit customer data for rWHOIS - data used for -blocks with the SWIP box checkmarked. Links to edit/add data are on this page. - -
List IP Pools for manual tweaking and updates - -
Manage users (add/remove users; change -internal access controls - note that this does NOT include IP-based limits)
-Manage email notice options (pick which events -and allocation types cause notifications; configure recipient lists for notices) - -
Consistency check tools
-General: Check general netblock consistency.
-Free space: List total and aggregate free space. Does not -include private networks (192.168.0.0/16, 172.16.0.0/12, 10.0.0.0/8) -); -} else { - print 'Back to main
'; -} - - -## Possible actions. -if ($webvar{action} eq 'alloc') { - # OK, we know what we're allocating. + while (my ($cidr,$mtime) = $sth->fetchrow_array) { + my %row = ( + master => $cidr, + masterdate => $mtime + ); + push @masterlist, \%row; + } + $page->param(masterlist => \@masterlist); + +} + +## Non-default actions. + +elsif ($webvar{action} eq 'alloc') { if ($webvar{cidr} !~ /^\s*(\d{1,3}\.){3}\d{1,3}(\/\d{2})?\s*$/) { - printAndExit("Can't allocate something that's not a netblock/ip"); + $page->param(errmsg => "Can't allocate something that's not a netblock/ip"); + goto ERRJUMP; } @@ -148,12 +152,12 @@ my $status = CustIDCK->custid_exist($webvar{custid}); if ($CustIDCK::Error) { - printError("Error verifying customer ID: ".$CustIDCK::ErrMsg); - return; + $page->param(errmsg => "Error verifying customer ID: ".$CustIDCK::ErrMsg); + goto ERRJUMP; } if (!$status) { - printError("Customer ID not valid. Make sure the Customer ID ". + $page->param(errmsg => "Customer ID not valid. Make sure the Customer ID ". "is correct.
\nUse STAFF for staff static IPs, and $IPDB::defcustid for any other ". "non-customer assignments."); - return; + goto ERRJUMP; } } @@ -169,6 +173,8 @@ @data = $sth->fetchrow_array; # User deserves errors if user can't be bothered to find the free block first. - printAndExit("Can't allocate from outside a free block!!\n") - if !$data[0]; + if (!$data[0]) { + $page->param(errmsg => "Can't allocate from outside a free block!!"); + goto ERRJUMP; + } } elsif ($webvar{alloctype} =~ /^(.)i$/) { $sth = $ip_dbh->prepare("select cidr from allocations where cidr >>='$cidr' and (type like '_d' or type like '_p')"); @@ -176,6 +182,8 @@ @data = $sth->fetchrow_array; # User deserves errors if user can't be bothered to find the pool and a free IP first. - printAndExit("Can't allocate static IP from outside a pool!!\n") - if !$data[0]; + if (!$data[0]) { + $page->param(errmsg => "Can't allocate static IP from outside a pool!!"); + goto ERRJUMP; + } } else { $sth = $ip_dbh->prepare("select cidr from freeblocks where cidr >>='$cidr' and not (routed='n')"); @@ -183,6 +191,8 @@ @data = $sth->fetchrow_array; # User deserves errors if user can't be bothered to find the free block first. - printAndExit("Can't allocate from outside a routed block!!\n") - if !$data[0]; + if (!$data[0]) { + $page->param(errmsg => "Can't allocate from outside a routed block!!"); + goto ERRJUMP; + } } @@ -190,54 +200,30 @@ $sth->finish; - my $cities = ''; + my @cities; foreach my $city (@citylist) { - $cities .= "\n"; - } - - print qq( - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Allocating:$cidr
Type:$disp_alloctypes{$webvar{alloctype}} -
Allocated from:$alloc_from
Customer ID:$custid
Customer location: - - Add new location -
Circuit ID:
Description/Name:
Notes:
WARNING: This will IMMEDIATELY assign this block!!
-); - + my %row = (city => $city); + push @cities, \%row; + } + $page->param( + cidr => $cidr, + disptype => $disp_alloctypes{$webvar{alloctype}}, + type => $webvar{alloctype}, + alloc_from => $alloc_from, + custid => $custid, + citylist => \@cities + ); } elsif ($webvar{action} eq 'confirm') { - print "Assigning $webvar{cidr} to $webvar{custid} (\"$webvar{desc}\") as ". - "$disp_alloctypes{$webvar{alloctype}}...
\n"; + $page->param( + cidr => $webvar{cidr}, + custid => $webvar{custid}, + desc => $webvar{desc}, + disptype => $disp_alloctypes{$webvar{alloctype}} + ); # Only need to check city here. if ($webvar{city} eq '-') { - printError("Invalid customer location! Go back and select customer's location."); + $page->param(locerr => "Invalid customer location! Go back and select customer's location."); + goto ERRJUMP; } else { if ($webvar{alloctype} =~ /^.i$/) { @@ -247,9 +233,8 @@ $sth->execute; if ($sth->err) { - print "Allocation failed! DBI said:\n".$sth->errstr."\n"; + $page->param(errmsg => $sth->errstr); syslog "err", "($authuser) Allocation of '$webvar{cidr}' to '$webvar{custid}' as ". "'$webvar{alloctype}' failed: '".$sth->errstr."'"; } else { - print "Allocation OK!\n"; syslog "notice", "$authuser allocated '$webvar{cidr}' to '$webvar{custid}' as ". "'$webvar{alloctype}'"; @@ -263,9 +248,8 @@ $webvar{circid}); if ($retcode eq 'OK') { - print "Allocation OK!\n"; syslog "notice", "$authuser allocated '$webvar{cidr}' to '$webvar{custid}' as ". "'$webvar{alloctype}'"; } else { - print "Allocation failed! IPDB::allocateBlock said:\n$msg\n"; + $page->param(errmsg => $msg); syslog "err", "($authuser) Allocation of '$webvar{cidr}' to '$webvar{custid}' as ". "'$webvar{alloctype}' failed: '$msg'"; @@ -276,54 +260,39 @@ } 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') { - print "Touching master $webvar{whichmaster}\n"; + + $page->param(master => $webvar{whichmaster}); $sth = $ip_dbh->prepare("update masterblocks set mtime=now() where cidr='$webvar{whichmaster}'"); $sth->execute; if ($sth->err) { - print "

Error updating modified timestamp on master $webvar{whichmaster}: ".$sth->errstr."\n"; - } + $page->param(errmsg => $sth->errstr); + } + } elsif ($webvar{action} eq 'listcust') { - print qq(Add new entry:\n -

- - - - - -
CustID:
-); - print "

Click CustID to edit existing customer contact data:\n". - "\n\n"; + $sth = $ip_dbh->prepare("select custid,name,tech_handle from customers order by custid"); $sth->execute; + my @custlist; while (my @data = $sth->fetchrow_array) { - print qq(). - "\n"; - } - print "
CustIDNameTech handle
$data[0]$data[1]$data[2]
\n"; + my %row = ( + custid => $data[0], + custname => $data[1], + tech => $data[2] + ); + push @custlist, \%row; + } + $page->param(custlist => \@custlist); + } elsif ($webvar{action} eq 'edcust') { + if ($webvar{newcust}) { - print "got here?\n"; $sth = $ip_dbh->prepare("INSERT INTO customers (custid) VALUES (?)"); $sth->execute($webvar{custid}); @@ -335,46 +304,22 @@ my ($custid, $name, $street, $city, $prov, $country, $pocode, $phone, $tech, $abuse, $admin, $special) = $sth->fetchrow_array; - print qq(

- - - - - - - - - - - - - - - - -
CustID:$custidName:
Street:City:
Province/State: (2-letter code)Country: (2-letter code)
Postal/ZIP Code:Phone:
Contacts/ARIN Handles: - Tech:
- Abuse:
- Admin:
-Note: Only tech is required at the moment. -		"Special":
-
-

Explanation for "Special" field:

-This is a temporary place to define the WHOIS "net name" for a block. -It may be removed later, more likely migrated elsewhere. -

It's formatted like this, one line for each custom net name: -

NetName[CIDR block]: NET-NAME
-Example: -
NetName192.168.236.0/24: MEGAWIDGET-1
-Note: -
    -
  • Spacing is important - there should only be ONE space, in between the colon and the net name. -
  • The CIDR block name nust include all four octets - no short forms are accepted. -
  • Net names must be all uppercase, and consist only of A-Z, 0-9, and - (same as for SWIPed net names). -
-
-); + + $page->param( + custid => $custid, + name => $name, + street => $street, + city => $city, + prov => $prov, + country => $country, + pocode => $pocode, + phone => $phone, + tech => $tech, + abuse => $abuse, + admin => $admin, + special => $special + ); } elsif ($webvar{action} eq 'updcust') { + $sth = $ip_dbh->prepare("UPDATE customers SET". " name=?, street=?, city=?, province=?, country=?, pocode=?,". @@ -384,98 +329,80 @@ $webvar{country}, $webvar{pocode}, $webvar{phone}, $webvar{tech_handle}, $webvar{abuse_handle}, $webvar{admin_handle}, $webvar{special}, $webvar{custid}); - print "Updated $webvar{custid}
\n". - qq( - - - - - - - - - - - -
CustID:$webvar{custid}
Name:$webvar{name}
Street:$webvar{street}
City:$webvar{city}
Province/State:$webvar{province}
Country:$webvar{country}
Postal/ZIP Code:$webvar{pocode}
Phone:$webvar{phone}
Contacts/ARIN Handles: - Tech: $webvar{tech_handle}
- Abuse: $webvar{abuse_handle}
- Admin: $webvar{admin_handle}
-
"Special":
$webvar{special}
-Back to rWHOIS customer list
\n); + $page->param( + custid => $webvar{custid}, + name => $webvar{name}, + street => $webvar{street}, + city => $webvar{city}, + prov => $webvar{province}, + country => $webvar{country}, + pocode => $webvar{pocode}, + phone => $webvar{phone}, + tech => $webvar{tech_handle}, + abuse => $webvar{abuse_handle}, + admin => $webvar{admin_handle}, + special => $webvar{special} + ); } elsif ($webvar{action} eq 'showpools') { - print "IP Pools currently allocated:\n". - "\n\n"; - $sth = $ip_dbh->prepare("select cidr from allocations where type like '%p' or type like '%d' order by cidr"); - $sth->execute; - my %poolfree; - while (my @data = $sth->fetchrow_array) { - $poolfree{$data[0]} = 0; - } - $sth = $ip_dbh->prepare("select pool,ip from poolips where available='y' order by ip"); - $sth->execute; - while (my @data = $sth->fetchrow_array) { - $poolfree{$data[0]}++; - } - foreach my $key (keys %poolfree) { - print qq(). - "\n"; - } - print "
Pool# of free IPs
$key$poolfree{$key}
\n"; + + $sth = $ip_dbh->prepare("select pool, count(*) from poolips where available='y' group by pool order by pool"); + $sth->execute; + my @poollist; + while (my ($pool,$free) = $sth->fetchrow_array) { + my %row = ( + pool => $pool, + free => $free + ); + push @poollist, \%row; + } + $page->param(poollist => \@poollist); + } elsif ($webvar{action} eq 'tweakpool') { + showPool($webvar{pool}); + } elsif ($webvar{action} eq 'updatepool') { $sth = $ip_dbh->prepare("update poolips set custid='$webvar{custid}', ". - "city='$webvar{city}', type='$webvar{type}', available='". + "city=?, type='$webvar{type}', available='". (($webvar{available} eq 'y') ? 'y' : 'n'). - "', notes='$webvar{notes}', description='$webvar{desc}' ". + "', notes=?, description=? ". "where ip='$webvar{ip}'"); - $sth->execute; + $sth->execute($webvar{city},$webvar{notes},$webvar{desc}); + $page->param(ip => $webvar{ip}); if ($sth->err) { - print "Error updating pool IP $webvar{ip}: $@
\n"; - syslog "err", "$authuser could not update pool IP $webvar{ip}: $@"; - } else { - $sth = $ip_dbh->prepare("select pool from poolips where ip='$webvar{ip}'"); - $sth->execute; - my @data = $sth->fetchrow_array; - print "$webvar{ip} in $data[0] updated\n
\n"; + $page->param(errmsg => $sth->errstr); + syslog "err", "$authuser could not update pool IP $webvar{ip}: ".$sth->errstr; + } else { syslog "notice", "$authuser updated pool IP $webvar{ip}"; } + $sth = $ip_dbh->prepare("select pool from poolips where ip='$webvar{ip}'"); + $sth->execute; + my @data = $sth->fetchrow_array; + $page->param(pool => $data[0]); + } elsif ($webvar{action} eq 'showusers') { - print "Notes:
\n". - "
  • Admin users automatically get all other priviledges.\n". - "
  • Everyone has basic read access.\n". - "
    Add new user:
    \n". - "Username:
    \n". - "Password: Password is pre-encrypted (MUST be crypt() encrypted)
    \n". - "
    \n"; - - print "
    Users with access:\n\n"; - print "\n"; - print "". - "\n". - "\n"; + $sth = $ip_dbh->prepare("select username,acl from users order by username"); $sth->execute; - while (my @data = $sth->fetchrow_array) { - print "". - qq(\n). - "\n); - - } - print "
    General access
    UsernameAdd newChangeDeleteSystems/NetworkingAdmin user
    $data[0]). - # Now for the fun bit. We have to pull apart the ACL field and - # output a bunch of checkboxes. - "
    ". - "". - qq(
    \n"; + my @userlist; + while (my ($username,$acl) = $sth->fetchrow_array) { +##fixme: funky things happening with HTML::Template here; shouldn't need the "logic ? iftrue : iffalse" structure + my %row = ( + username => $username, + can_add => ($acl =~ /a/ ? 1 : 0), + can_change => ($acl =~ /c/ ? 1 : 0), + can_del => ($acl =~ /d/ ? 1 : 0), + sysnet => ($acl =~ /s/ ? 1 : 0), + is_admin => ($acl =~ /A/ ? 1 : 0), + acl => $acl + ); + push @userlist, \%row; + } + $page->param(userlist => \@userlist); + } elsif ($webvar{action} eq 'updacl') { - print "Updating ACL for $webvar{username}:
    \n"; + + $page->param(username => $webvar{username}); my $acl = 'b'; if ($webvar{admin} eq 'on') { @@ -487,14 +414,13 @@ ($webvar{sysnet} eq 'on' ? 's' : ''); } - print "New ACL: $acl
    \n"; + $page->param(acl => $acl); $sth = $ip_dbh->prepare("update users set acl='$acl' where username='$webvar{username}'"); $sth->execute; - print "OK\n" if !$sth->err; - - print qq(
    Back to user listing\n); + $page->param(errmsg => $sth->errstr) if $sth->err; } elsif ($webvar{action} eq 'newuser') { - print "Adding user $webvar{username}...\n"; + + $page->param(username => $webvar{username}); my $cr_pass = ($webvar{preenc} ? $webvar{password} : crypt $webvar{password}, join('',('.','/',0..9,'A'..'Z','a'..'z')[rand 64, rand 64])); @@ -502,70 +428,29 @@ "('$webvar{username}','$cr_pass','b')"); $sth->execute; - if ($sth->err) { - print "
    Error adding user: ".$sth->errstr; - } else { - print "OK\n"; - } - - print qq(
    Back to user listing\n); + $page->param(errmsg => $sth->errstr) if $sth->err; } elsif ($webvar{action} eq 'deluser') { - print "Deleting user $webvar{username}.
    \n"; + + $page->param(username => $webvar{username}); $sth = $ip_dbh->prepare("delete from users where username='$webvar{username}'"); $sth->execute; - print "OK\n" if !$sth->err; - - print qq(
    Back to user listing\n); + $page->param(errmsg => $sth->errstr) if $sth->err; } elsif ($webvar{action} eq 'emailnotice') { - print "

    Email notice management:

    \nClick the email addresses to edit that list."; + $sth = $ip_dbh->prepare("SELECT action,reciplist FROM notify"); $sth->execute; - - print "\n"; + my @spamlist; while (my ($notice_code,$reciplist) = $sth->fetchrow_array() ) { ##fixme: hairy mess, only a few things call mailNotify() anyway, so many possible notices won't work. my $action_out = dispNoticeCode($notice_code); - print "". - qq(). - qq(\n); - } - print qq( -
    $action_out$reciplistDelete
    Known "special" codes:
    -
      -
    • swi: Notify if block being updated has SWIP flag set
      • -
    -); - -# add new entries from this tangle: - print "

    Add new notification:

    \n". - "Note: Failure notices on most conditions are not yet supported.\n"; - - print qq( - - - - - - - -
    Recipients
    Action - - - -
    Add   - Update   - Delete   - New listitem
    - Special: (requires code changes) -
    -    		Failure?
    Event/Allocation type: - - - - - - - - -); + my %row = ( + action => $action_out, + code => $notice_code, + recips => $reciplist + ); + push @spamlist, \%row; + } + $page->param(spamlist => \@spamlist); $sth = $ip_dbh->prepare("SELECT type,dispname FROM alloctypes WHERE listorder < 500 ". @@ -573,75 +458,77 @@ $sth->execute; my $i=0; + my @typelist; while (my ($type,$disp) = $sth->fetchrow_array) { - print " "; - $i++; - print " \n\t" - if ($i % 4 == 0); - } - - print qq( -
    All allocationsAll static IPsNew cityNew node
    $disp
    -
    - -); - ## done spitting out add-new-spam-me-now table + my %row = ( + type => $type, + disptype => $disp, +# ahh, off-by-one counts, how we do love thee... NOT! + newrow => ($i+2 > $sth->rows ? 1 : (++$i % 4)), + ); + push @typelist, \%row; + } + $page->param(typelist => \@typelist); } elsif ($webvar{action} eq 'addnotice') { + $webvar{alloctype} = $webvar{special} if $webvar{msgaction} eq 's:'; if ($webvar{msgaction} && $webvar{alloctype} && $webvar{reciplist}) { + $page->param(cantry => 1); $webvar{reciplist} =~ s/[\r\n]+/,/g; $webvar{msgaction} = "f:$webvar{msgaction}" if $webvar{onfail}; - print "Adding notice to $webvar{reciplist} for ".dispNoticeCode($webvar{msgaction}.$webvar{alloctype}).":\n"; + $page->param(reciplist => $webvar{reciplist}); + $page->param(dispnotice => dispNoticeCode($webvar{msgaction}.$webvar{alloctype})); $sth = $ip_dbh->prepare("INSERT INTO notify (action, reciplist) VALUES (?,?)"); ##fixme: automagically merge reciplists iff action already exists $sth->execute($webvar{msgaction}.$webvar{alloctype}, $webvar{reciplist}); - if ($sth->err) { - print "Failed: DB error: ".$sth->errstr."\n"; - } else { - print "OK!
    \n" - } - } else { - print "Need to specify at least one recipient, an action, and an allocation type. ". - qq{("Special" content is considered an allocation type). Hit the Back button and try again.
    \n}; - } - print qq(Back to email notice list\n); + $page->param(addfailed => $sth->errstr) if $sth->err; + } } elsif ($webvar{action} eq 'delnotice') { - print "Deleting notices on ".dispNoticeCode($webvar{code}.$webvar{alloctype}).":\n"; + + $page->param(dispnotice => dispNoticeCode($webvar{code}.$webvar{alloctype})); $sth = $ip_dbh->prepare("DELETE FROM notify WHERE action=?"); $sth->execute($webvar{code}); - if ($sth->err) { - print "Failed: DB error: ".$sth->errstr."\n"; - } else { - print "OK!
    \n" - } - print qq(Back to email notice list\n); + $page->param(delfailed => $sth->errstr) if $sth->err; } elsif ($webvar{action} eq 'ednotice') { - print "

    Editing recipient list for '".dispNoticeCode($webvar{code})."':

    \n"; + + $page->param(dispnotice => dispNoticeCode($webvar{code})); + $page->param(code => $webvar{code}); $sth = $ip_dbh->prepare("SELECT reciplist FROM notify WHERE action=?"); $sth->execute($webvar{code}); my ($reciplist) = $sth->fetchrow_array; $reciplist =~ s/,/\n/g; - print qq(
    \n). - qq(
    ). - qq(\n). - "
    \n"; + $page->param(reciplist => $reciplist); + } elsif ($webvar{action} eq 'updnotice') { - print "

    Updating recipient list for '".dispNoticeCode($webvar{code})."':

    \n"; + + $page->param(dispnotice => dispNoticeCode($webvar{code})); $sth = $ip_dbh->prepare("UPDATE notify SET reciplist=? WHERE action=?"); $webvar{reciplist} =~ s/[\r\n]+/,/g; $sth->execute($webvar{reciplist}, $webvar{code}); - if ($sth->err) { - print "Failed: DB error: ".$sth->errstr."\n"; - } else { - print "OK!
    \n" - } - print qq(Back to email notice list\n); + $page->param(updfailed => $sth->errstr) if $sth->err; + } elsif ($webvar{action} ne '') { - print "webvar{action} check failed: Don't know how to $webvar{action}"; -} + $page->param(dunno => $webvar{action}); +} + +ERRJUMP: print "Content-type: text/html\n\n".$header->output; +print $page->output; + +##fixme: make me a footer param! +print qq(
    Back to main interface
    \n); + +# We print the footer here, so we don't have to do it elsewhere. +my $footer = HTML::Template->new(filename => "footer.tmpl"); +# we're already in the admin tools, no need to provide a bottom link. maybe. +#$footer->param(adminlink => ($IPDBacl{$authuser} =~ /A/)); + +print $footer->output; + +$ip_dbh->disconnect; + +exit; + # Hokay. This is a little different. We have a few specific functions here: @@ -649,12 +536,4 @@ # -> Tweak individual DB fields # - -print qq(
    Back to main interface\n); - -printFooter; - -$ip_dbh->disconnect; - -exit; @@ -671,84 +550,55 @@ -# 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". - qq(\n). - "". - qq(). - "\n\n"; - } - print "
    $temp". - (($temp->masklen == 30) ? '30' - : "$data[2]
    \n"; -} - - # Show allocations to allow editing. -sub showAllocs($) { - my $cidr = new NetAddr::IP $_[0]; - print "Edit custID, allocation type, city for allocations in ". - "$cidr:\n"; - $sth = $ip_dbh->prepare("select * from allocations where cidr <<= '$cidr' order by cidr"); - $sth->execute; - while (my @data = $sth->fetchrow_array) { - print "\n". - qq(\n). - qq(\n). - "\n). - "". - qq(\n); - } - print "
    $data[0]$data[4]$data[5]
    \n"; - - # notes - print "
    Notes:\n". - "
      \n
    • Use the main interface to update description and notes fields\n". - "
    • Changing the allocation type here will NOT affect IP pool data.\n". - "
    \n"; -} + $row{typelist} = \@typelist; + push @blocklist, \%row; + } + $page->param(blocklist => \@blocklist); +} # end showAllocs() # Stuff updates into DB sub update { - eval { - # Relatively simple SQL transaction here. Note that we're deliberately NOT - # updating notes/desc here as it's available through the main interface. - $sth = $ip_dbh->prepare("update allocations set custid='$webvar{custid}',". - "city='$webvar{city}',type='$webvar{alloctype}' where cidr='$webvar{block}'"); - $sth->execute; - $ip_dbh->commit; - }; - if ($@) { - carp "Transaction aborted because $@"; - eval { $ip_dbh->rollback; }; - syslog "err", "$authuser could not update block '$webvar{block}': '$@'"; + # Relatively simple SQL transaction here. Note that we're deliberately NOT + # updating notes/desc here as it's available through the main interface. + $sth = $ip_dbh->prepare("update allocations set custid='$webvar{custid}',". + "city=?,type='$webvar{alloctype}' where cidr='$webvar{block}'"); + $sth->execute($webvar{city}); + + $page->param(block => $webvar{block}); + if ($sth->err) { + $page->param(updfailed => $sth->errstr); + syslog "err", "$authuser could not update block '$webvar{block}': '".$sth->errstr."'"; } else { - # If we get here, the operation succeeded. syslog "notice", "$authuser updated $webvar{block}"; - print "Allocation $webvar{block} updated
    \n"; } # need to get /24 that block is part of @@ -756,5 +606,5 @@ $bits[3] = "0/24"; showAllocs((join ".", @bits)); -} +} # end update() @@ -764,33 +614,34 @@ sub showPool($) { my $pool = new NetAddr::IP $_[0]; - print qq(Listing pool $pool:\n - - - - - - - - - -). - "
    Customer ID:
    Customer location:
    Type:
    Available?
    Description/name:
    Notes:
    Update the following record:\n"; - $sth = $ip_dbh->prepare("select pool,ip,custid,city,type,available,description,notes from poolips where pool='$pool' order by ip"); - $sth->execute; - while (my @data = $sth->fetchrow_array) { - print qq(). - "". - "\n"; - } - print "
    $data[1]$data[2]$data[3]$data[4]$data[5]$data[6]$data[7]
    \n"; -} + my @typelist; + while (my ($type,$dispname) = $sth->fetchrow_array) { + my %row = ( + type => $type, + dispname => $dispname + ); + push @typelist, \%row; + } + $page->param(typelist => \@typelist); + + $sth = $ip_dbh->prepare("select ip,custid,city,type,available,description,notes from poolips where pool='$pool' order by ip"); + $sth->execute; + my @iplist; + while (my ($ip,$custid,$city,$type,$avail,$desc,$notes) = $sth->fetchrow_array) { + my %row = ( + ip => $ip, + custid => $custid, + city => $city, + type => $type, + avail => $avail, + desc => $desc, + notes => $notes + ); + push @iplist, \%row; + } + $page->param(iplist => \@iplist); +} # end showPool()