From bea57618abafc540d48753f78400a6d0e4cde3f1 Mon Sep 17 00:00:00 2001
From: Michael Andreen <harv@ruin.nu>
Date: Wed, 27 Dec 2006 11:14:49 +0000
Subject: [PATCH] list groups

---
 templates/users.tmpl | 3 ++-
 users.pl             | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/templates/users.tmpl b/templates/users.tmpl
index 8565c8a..6465775 100644
--- a/templates/users.tmpl
+++ b/templates/users.tmpl
@@ -62,10 +62,11 @@
 </form>
 <TMPL_ELSE>
 <table border="1">
-	<tr><th>User</th></tr>
+	<tr><th>User</th><th>Groups</th></tr>
 <TMPL_LOOP Users>
 	<tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
 		<td><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;user=<TMPL_VAR NAME=Uid>"><TMPL_VAR NAME=Username></a></td>
+		<td><TMPL_VAR NAME=Groups></td>
 	</tr>
 </TMPL_LOOP>
 </table>
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;
-- 
2.39.2