Index: trunk/dns.cgi
===================================================================
--- trunk/dns.cgi	(revision 24)
+++ trunk/dns.cgi	(revision 25)
@@ -445,14 +445,11 @@
   } else {
     ($code,$msg) = addUser($dbh,$webvar{username}, $webvar{group}, $webvar{pass1},
-	($webvar{makeactive} eq 'on' ? 1 : 0), $webvar{fname}, $webvar{lname});
+	($webvar{makeactive} eq 'on' ? 1 : 0), $webvar{accttype}, 
+	$webvar{fname}, $webvar{lname}, $webvar{phone});
   }
 
 # hokay, a bit of magic to decide which page we hit.
   if ($code eq 'OK') {
-# redirect to dns.cgi?etc&page=reclist
     changepage(page => "useradmin");
-#    $page = HTML::Template->new(filename => "$templatedir/reclist.tmpl");
-#    showdomain(0,$msg);
-##work
   } else {
 # oooh, yeah, this is supposed to be a redirect.  er, maybe.  whee.
@@ -469,4 +466,28 @@
 
   $page->param(add_failed => 1);
+
+} elsif ($webvar{page} eq 'deluser') {
+
+  $page->param(id => $webvar{id});
+  # first pass = confirm y/n (sorta)
+  if (!defined($webvar{del})) {
+    $page->param(del_getconf => 1);
+    $page->param(user => userFullName($dbh,$webvar{id}));
+  } elsif ($webvar{del} eq 'ok') {
+    my ($code,$msg) = delUser($dbh, $webvar{id});
+    if ($code ne 'OK') {
+# need to find failure mode
+      $page->param(del_failed => 1);
+      $page->param(errmsg => $msg);
+      list_users($curgroup);
+    } else {
+      # success.  go back to the domain list, do not pass "GO"
+      changepage(page => "useradmin");
+    }
+  } else {
+    # cancelled.  whee!
+    changepage(page => "useradmin");
+  }
+
 }
 
@@ -821,5 +842,5 @@
 
   my @userlist;
-  $sth = $dbh->prepare("SELECT u.user_id, u.email, u.firstname, u.lastname, u.type, g.group_name, u.status ".
+  $sth = $dbh->prepare("SELECT u.user_id, u.username, u.firstname, u.lastname, u.type, g.group_name, u.status ".
         "FROM users u ".
         "INNER JOIN groups g ON u.group_id=g.group_id ".