list groups

diff --git a/templates/users.tmpl b/templates/users.tmpl
index 8565c8a150bd5f8c48bef391d234abc6b4829180..646577579bc7980700f1137a4478ddde5d0a7ed7 100644 (file)
--- 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 6ed91d80bb3a32fdc5d1756bb749c3eeaa0fe892..62988081baf3acade7dcf0d020b98ea26b11096e 100644 (file)
--- 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;