Changeset 479

Timestamp:

03/13/13 17:39:28 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Object conversion of DNSDB.pm, 12 of <mumble>. See #11.

• user subs addUser(), getUserCount(), getUserList(), getUserDropdown(), updateUser(), delUser(), userStatus(), and getUserData() and callers

Location:

trunk

Files:

• DNSDB.pm (modified) (9 diffs)
• dns-rpc.cgi (modified) (3 diffs)
• dns.cgi (modified) (8 diffs)

trunk/DNSDB.pm

@@ -2668 +2668 @@
 sub addUser {
   $errstr = '';
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $username = shift;
   my $group = shift;
@@ -2782 +2783 @@
 # - a "Starts with" string
 sub getUserCount {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -2810 +2812 @@
 # - offset/return-all-everything flag (defaults to $perpage records)
 sub getUserList {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -2850 +2853 @@
 # Returns a reference to a list of hashrefs suitable to feeding to HTML::Template
 sub getUserDropdown {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $grp = shift;
   my $sel = shift || 0;
@@ -2873 +2877 @@
 # Update general data about user
 sub updateUser {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
 ##fixme:  tweak calling convention so that we can update any given bit of data
@@ -2935 +2940 @@
 # Returns a success/failure code and matching message
 sub delUser {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $userid = shift;
 
   return ('FAIL',"Bad userid") if !defined($userid);
 
-  my $userdata = getUserData($dbh, $userid);
+  my $userdata = $self->getUserData($userid);
 
   # Allow transactions, and raise an exception on errors so we can catch it later.
@@ -3001 +3007 @@
 # Returns undef on errors.
 sub userStatus {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $id = shift;
   my $newstatus = shift || 'mu';
@@ -3007 +3014 @@
   return undef if $id !~ /^\d+$/;
 
-  my $userdata = getUserData($dbh, $id);
+  my $userdata = $self->getUserData($id);
 
   # Allow transactions, and raise an exception on errors so we can catch it later.
@@ -3049 +3056 @@
 # Get misc user data for display
 sub getUserData {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $uid = shift;
 

trunk/dns-rpc.cgi

@@ -245 +245 @@
     push @userargs, $args{$argname};
   }
-  my ($code,$msg) = DNSDB::addUser($dbh, @userargs);
+  my ($code,$msg) = $dnsdb->addUser(@userargs);
   die $msg if $code eq 'FAIL';
   return $msg;
@@ -271 +271 @@
 ##fixme:  also underlying in DNSDB::updateUser():  no way to just update this or that attribute;
 #         have to pass them all in to be overwritten
-  my ($code,$msg) = DNSDB::updateUser($dbh, @userargs);
+  my ($code,$msg) = $dnsdb->updateUser(@userargs);
   die $msg if $code eq 'FAIL';
   return $msg;
@@ -282 +282 @@
 
   die "Missing UID\n" if !$args{uid};
-  my ($code,$msg) = DNSDB::delUser($dbh, $args{uid});
+  my ($code,$msg) = $dnsdb->delUser($args{uid});
   die $msg if $code eq 'FAIL';
   return $msg;

trunk/dns.cgi

@@ -1096 +1096 @@
     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 +1199 @@
                 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 +1214 @@
 # 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 +1275 @@
     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 +1319 @@
     $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 +1965 @@
   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 +2190 @@
   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 +2216 @@
   $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}) {