Index: trunk/dns.cgi
===================================================================
--- trunk/dns.cgi	(revision 477)
+++ trunk/dns.cgi	(revision 479)
@@ -1096,5 +1096,5 @@
     if ($flag && ($permissions{admin} || $permissions{user_edit} ||
 	($permissions{self_edit} && $webvar{id} == $session->param('uid')) )) {
-      my $stat = userStatus($dbh,$webvar{id},$webvar{userstatus});
+      my $stat = $dnsdb->userStatus($webvar{id}, $webvar{userstatus});
       $page->param(resultmsg => $DNSDB::resultstr);
     } else {
@@ -1199,5 +1199,5 @@
 		unless $permissions{admin} || $permissions{user_create};
 	# no scope check;  user is created in the current group
-        ($code,$msg) = addUser($dbh, $webvar{uname}, $curgroup, $webvar{pass1},
+        ($code,$msg) = $dnsdb->addUser($webvar{uname}, $curgroup, $webvar{pass1},
 		($webvar{makeactive} eq 'on' ? 1 : 0), $webvar{accttype}, $permstring,
 		$webvar{fname}, $webvar{lname}, $webvar{phone});
@@ -1214,5 +1214,5 @@
 # or self-torture trying to not commit the transaction until we're really done.
 	# Allowing for changing group, but not coding web support just yet.
-	($code,$msg) = updateUser($dbh, $webvar{uid}, $webvar{uname}, $webvar{gid}, $webvar{pass1},
+	($code,$msg) = $dnsdb->updateUser($webvar{uid}, $webvar{uname}, $webvar{gid}, $webvar{pass1},
 		($webvar{makeactive} eq 'on' ? 1 : 0), $webvar{accttype},
 		$webvar{fname}, $webvar{lname}, $webvar{phone});
@@ -1275,5 +1275,5 @@
     fill_clonemelist();
 
-    my $userinfo = getUserData($dbh,$webvar{user});
+    my $userinfo = $dnsdb->getUserData($webvar{user});
     fill_actypelist($userinfo->{type});
     # not using this yet, but adding it now means we can *much* more easily do so later.
@@ -1319,5 +1319,5 @@
     $page->param(user => $dnsdb->userFullName($webvar{id}));
   } elsif ($webvar{del} eq 'ok') {
-    my ($code,$msg) = delUser($dbh, $webvar{id});
+    my ($code,$msg) = $dnsdb->delUser($webvar{id});
     if ($code eq 'OK') {
       # success.  go back to the user list, do not pass "GO"
@@ -1965,5 +1965,5 @@
   local $webvar{clonesrc} = 0 if !defined($webvar{clonesrc});
 
-  my $clones = getUserDropdown($dbh, $curgroup, $webvar{clonesrc});
+  my $clones = $dnsdb->getUserDropdown($curgroup, $webvar{clonesrc});
   $page->param(clonesrc => $clones);
 }
@@ -2190,6 +2190,6 @@
   my $childlist = join(',',@childgroups);
 
-  my $count = getUserCount($dbh, (childlist => $childlist, curgroup => $curgroup,
-	filter => ($filter ? $filter : undef), startwith => ($startwith ? $startwith : undef) ) );
+  my $count = $dnsdb->getUserCount(childlist => $childlist, curgroup => $curgroup,
+	filter => ($filter ? $filter : undef), startwith => ($startwith ? $startwith : undef) );
 
 # fill page count and first-previous-next-last-all bits
@@ -2216,7 +2216,7 @@
   $page->param(searchsubs => $searchsubs) if $searchsubs;
 
-  my $ulist = getUserList($dbh, (childlist => $childlist, curgroup => $curgroup,
+  my $ulist = $dnsdb->getUserList(childlist => $childlist, curgroup => $curgroup,
 	filter => ($filter ? $filter : undef), startwith => ($startwith ? $startwith : undef),
-	offset => $webvar{offset}, sortby => $sortby, sortorder => $sortorder) );
+	offset => $webvar{offset}, sortby => $sortby, sortorder => $sortorder);
   # Some UI things need to be done to the list (unlike other lists)
   foreach my $u (@{$ulist}) {