[Mtdmods-checkins] SF.net SVN: mtdmods: [24] GroupMembersPageMOD/upload/groups.php

[<mar...@us...>]

Revision: 24
Author:   markthedaemon
Date:     2006-07-02 14:00:26 -0700 (Sun, 02 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/mtdmods/?rev=24&view=rev

Log Message:
-----------
commiting some code by Ramon Fincken (Thanks Ramon! :D)

Modified Paths:
--------------
    GroupMembersPageMOD/upload/groups.php
Modified: GroupMembersPageMOD/upload/groups.php
===================================================================
--- GroupMembersPageMOD/upload/groups.php	2006-07-02 20:43:21 UTC (rev 23)
+++ GroupMembersPageMOD/upload/groups.php	2006-07-02 21:00:26 UTC (rev 24)
@@ -46,16 +46,18 @@
 // Set the array
 $group_data = array();
 
-// Hidden groups appear for staff
-$hide_sql = ( $userdata['user_level'] != USER ) ? '' : ' AND g.group_type <> ' . GROUP_HIDDEN;
+// Hidden groups appear for staff
+$hide_sql = ( $userdata['user_level'] != USER ) ? '' : ' AND g.group_type <> ' . GROUP_HIDDEN;
+// Hide pending users
+$hide_sql .= " AND ug.user_pending = 0 ";
 
 // Execute the select query
 $sql = 'SELECT g.*, u.user_id, u.username, u.user_website FROM ' . USERS_TABLE . ' u, ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . ' ug
-			WHERE u.user_id = ug.user_id
-				AND ug.group_id = g.group_id
-					AND g.group_single_user = 0
-						' . $hide_sql . '
-							ORDER BY g.group_name ASC';
+         WHERE u.user_id = ug.user_id
+            AND ug.group_id = g.group_id
+               AND g.group_single_user = 0           
+                  ' . $hide_sql . '
+                     ORDER BY g.group_name, u.username ASC';
 if ( ! $result = $db->sql_query($sql) )
 {
 	// Error handling


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.