X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=users.pl;h=62988081baf3acade7dcf0d020b98ea26b11096e;hb=c10765bfab69c9d2abdb96bf05a6662088cf8b3f;hp=3425c247dcdb1d713160c2ba585b8e0de363e6bc;hpb=5e38dff0cf8667720f7ae7f89302e0246ecf5624;p=ndwebbie.git

diff --git a/users.pl b/users.pl
index 3425c24..6298808 100644
--- a/users.pl
+++ b/users.pl
@@ -110,14 +110,18 @@ $BODY->param(RemoveGroups => \@remgroups);
 $BODY->param(AddGroups => \@addgroups);
 
 }else{
-	my $query = $DBH->prepare(qq{SELECT uid,username FROM users ORDER BY username})or $error .= $DBH->errstr;
+	my $query = $DBH->prepare(qq{SELECT u.uid,username,TRIM(',' FROM concat(g.groupname||',')) AS groups
+		FROM users u LEFT OUTER JOIN (groupmembers gm NATURAL JOIN groups g) ON gm.uid = u.uid
+		WHERE u.uid > 0
+		GROUP BY u.uid,username
+		ORDER BY username})or $error .= $DBH->errstr;
 	$query->execute or $error .= $DBH->errstr;
 	my @users;
 	my $i = 0;
 	while (my $user = $query->fetchrow_hashref){
+		$i++;
 		$user->{ODD} = $i % 2;
 		push @users, $user;
-		$i++;
 	}
 	$BODY->param(Users => \@users);
 }