Index: branches/htmlform/cgi-bin/admin.cgi =================================================================== --- branches/htmlform/cgi-bin/admin.cgi (revision 483) +++ branches/htmlform/cgi-bin/admin.cgi (revision 484) @@ -117,10 +117,7 @@ $page->param(masterlist => \@masterlist); -#} else { -# print 'Back to main
'; -} - - -## Possible actions. +} + +## Non-default actions. elsif ($webvar{action} eq 'alloc') { # OK, we know what we're allocating. @@ -290,10 +287,12 @@ 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); } @@ -366,22 +365,17 @@ } 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}); @@ -389,9 +383,9 @@ $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}); if ($sth->err) { print "Error updating pool IP $webvar{ip}: $@

\n"; @@ -404,39 +398,28 @@ syslog "notice", "$authuser updated pool IP $webvar{ip}"; } + } 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') { @@ -448,14 +431,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])); @@ -463,19 +445,12 @@ "('$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') { Index: branches/htmlform/templates/admin/deluser.tmpl =================================================================== --- branches/htmlform/templates/admin/deluser.tmpl (revision 484) +++ branches/htmlform/templates/admin/deluser.tmpl (revision 484) @@ -0,0 +1,3 @@ +Deleting user ... +
    Error deleting user: OK     +
    Back to user listing Index: branches/htmlform/templates/admin/newuser.tmpl =================================================================== --- branches/htmlform/templates/admin/newuser.tmpl (revision 484) +++ branches/htmlform/templates/admin/newuser.tmpl (revision 484) @@ -0,0 +1,3 @@ +Adding user ... +
    Error adding user: OK     +
    Back to user listing Index: branches/htmlform/templates/admin/showpools.tmpl =================================================================== --- branches/htmlform/templates/admin/showpools.tmpl (revision 484) +++ branches/htmlform/templates/admin/showpools.tmpl (revision 484) @@ -0,0 +1,7 @@ +IP Pools currently allocated: + + + + + +
    Pool# of free IPs
    Index: branches/htmlform/templates/admin/showusers.tmpl =================================================================== --- branches/htmlform/templates/admin/showusers.tmpl (revision 484) +++ branches/htmlform/templates/admin/showusers.tmpl (revision 484) @@ -0,0 +1,43 @@ +Notes: +
      +
    • Admin users automatically get all other priviledges. +
    • Everyone has basic read access. +
    +
    Add new user:
    +
    +Username:
    +Password: Password is pre-encrypted (MUST be crypt() encrypted)
    + +
    + +
    Users with access: + + + + + + + + +
    + +
    + + + + + + + + + + + +
    General access
    UsernameAdd newChangeDeleteSystems/NetworkingAdmin user
    checked="checked"> checked="checked"> checked="checked"> checked="checked"> checked="checked"> +
    +
    + + + +
    +
    Index: branches/htmlform/templates/admin/touch.tmpl =================================================================== --- branches/htmlform/templates/admin/touch.tmpl (revision 484) +++ branches/htmlform/templates/admin/touch.tmpl (revision 484) @@ -0,0 +1,5 @@ +Touching master ...
    +

    Error updating modified timestamp on master :

    +OK! +     + Index: branches/htmlform/templates/admin/updacl.tmpl =================================================================== --- branches/htmlform/templates/admin/updacl.tmpl (revision 484) +++ branches/htmlform/templates/admin/updacl.tmpl (revision 484) @@ -0,0 +1,4 @@ +Updating ACL for :
    +New ACL:
    +OK! +
    Back to user listing