Changeset 325 for trunk/dns.cgi

Timestamp:

05/02/12 15:03:07 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Move SQL from user list code into DNSDB.pm. See #1

File:

• trunk/dns.cgi (modified) (2 diffs)

trunk/dns.cgi

@@ -2048 +2048 @@
   my $childlist = join(',',@childgroups);
 
-  my $sql = "SELECT count(*) FROM users WHERE group_id IN ($curgroup".($childlist ? ",$childlist" : '').")".
-        ($startwith ? " AND username ~* ?" : '').
-        ($filter ? " AND username ~* ?" : '');
-  my $sth = $dbh->prepare($sql);
-  $sth->execute(@filterargs);
-  my ($count) = ($sth->fetchrow_array);
+  my $count = getUserCount($dbh, (childlist => $childlist, curgroup => $curgroup,
+        filter => ($filter ? $filter : undef), startwith => ($startwith ? $startwith : undef) ) );
 
 # fill page count and first-previous-next-last-all bits
@@ -2078 +2074 @@
   $page->param(searchsubs => $searchsubs) if $searchsubs;
 
-# munge sortby for columns in database
-  $sortby = 'u.username' if $sortby eq 'user';
-  $sortby = 'u.type' if $sortby eq 'type';
-  $sortby = 'g.group_name' if $sortby eq 'group';
-  $sortby = 'u.status' if $sortby eq 'status';
-
-  my @userlist;
-  $sql = "SELECT u.user_id, u.username, u.firstname || ' ' || u.lastname AS fname, u.type, g.group_name, u.status ".
-        "FROM users u ".
-        "INNER JOIN groups g ON u.group_id=g.group_id ".
-        "WHERE u.group_id IN ($curgroup".($childlist ? ",$childlist" : '').")".
-        ($startwith ? " AND u.username ~* ?" : '').
-        ($filter ? " AND u.username ~* ?" : '').
-        " ORDER BY $sortby $sortorder ".
-        ($offset eq 'all' ? '' : " LIMIT $perpage OFFSET ".$offset*$perpage);
-
-  $sth = $dbh->prepare($sql);
-  $sth->execute(@filterargs);
-
-  my $rownum = 0;
-  while (my @data = $sth->fetchrow_array) {
-    no warnings "uninitialized";        # Just In Case something stupid happens and a user gets no first or last name
-    my %row;
-    $row{userid} = $data[0];
-    $row{username} = $data[1];
-    $row{userfull} = $data[2];
-    $row{usertype} = ($data[3] eq 'S' ? 'superuser' : "user");
-    $row{usergroup} = $data[4];
-    $row{active} = $data[5];
-    $row{bg} = ($rownum++)%2;
-    $row{sid} = $sid;
-    $row{eduser} = ($permissions{admin} ||
-        ($permissions{user_edit} && $data[3] ne 'S') || 
-        ($permissions{self_edit} && $data[0] == $session->param('uid')) );
-    $row{deluser} = ($permissions{admin} || ($permissions{user_delete} && $data[3] ne 'S'));
-    push @userlist, \%row;
-  }
-  $page->param(usertable => \@userlist);
+  my $ulist = getUserList($dbh, (childlist => $childlist, curgroup => $curgroup,
+        filter => ($filter ? $filter : undef), startwith => ($startwith ? $startwith : undef),
+        offset => $webvar{offset}, sortby => $sortby, sortorder => $sortorder) );
+  # Some UI things need to be done to the list (unlike other lists)
+  foreach my $u (@{$ulist}) {
+    $u->{eduser} = ($permissions{admin} ||
+        ($permissions{user_edit} && $u->{type} ne 'S') ||
+        ($permissions{self_edit} && $u->{user_id} == $session->param('uid')) );
+    $u->{deluser} = ($permissions{admin} || ($permissions{user_delete} && $u->{type} ne 'S'));
+    $u->{type} = ($u->{type} eq 'S' ? 'superuser' : 'user');
+  }
+  $page->param(usertable => $ulist);
 } # end list_users()