X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=users.pl;h=62988081baf3acade7dcf0d020b98ea26b11096e;hb=bb3ed008868592ef478d8432b86a39c293efae2d;hp=6ed91d80bb3a32fdc5d1756bb749c3eeaa0fe892;hpb=8bd21c625add06fed135d3ce99208c7a94b44882;p=ndwebbie.git

diff --git a/users.pl b/users.pl
index 6ed91d8..6298808 100644
--- a/users.pl
+++ b/users.pl
@@ -110,7 +110,11 @@ $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;