Changeset 3372

Timestamp:

11/07/2010 11:25:07 AM (14 years ago)

Author:

boonebgorges

Message:

Adds exclude parameter for bp_group_has_members(). Fixes #2641

Location:

trunk/bp-groups

Files:

• bp-groups-classes.php (modified) (3 diffs)
• bp-groups-templatetags.php (modified) (4 diffs)

trunk/bp-groups/bp-groups-classes.php

@@ -998 +998 @@
     }
 
-    function get_all_for_group( $group_id, $limit = false, $page = false, $exclude_admins_mods = true, $exclude_banned = true ) {
+    function get_all_for_group( $group_id, $limit = false, $page = false, $exclude_admins_mods = true, $exclude_banned = true, $exclude = false ) {
         global $bp, $wpdb;
 
@@ -1005 +1005 @@
 
         if ( $exclude_admins_mods )
-            $exclude_sql = $wpdb->prepare( "AND is_admin = 0 AND is_mod = 0" );
+            $exclude_admins_sql = $wpdb->prepare( "AND is_admin = 0 AND is_mod = 0" );
 
         if ( $exclude_banned )
             $banned_sql = $wpdb->prepare( " AND is_banned = 0" );
 
+        if ( $exclude )
+            $exclude_sql = $wpdb->prepare( " AND m.user_id NOT IN ({$exclude})" );
+
         if ( bp_is_active( 'xprofile' ) )
-            $members = $wpdb->get_results( $wpdb->prepare( "SELECT m.user_id, m.date_modified, m.is_banned, u.user_login, u.user_nicename, u.user_email, pd.value as display_name FROM {$bp->groups->table_name_members} m, {$wpdb->users} u, {$bp->profile->table_name_data} pd WHERE u.ID = m.user_id AND u.ID = pd.user_id AND pd.field_id = 1 AND group_id = %d AND is_confirmed = 1 {$banned_sql} {$exclude_sql} ORDER BY m.date_modified DESC {$pag_sql}", $group_id ) );
+            $members = $wpdb->get_results( $wpdb->prepare( "SELECT m.user_id, m.date_modified, m.is_banned, u.user_login, u.user_nicename, u.user_email, pd.value as display_name FROM {$bp->groups->table_name_members} m, {$wpdb->users} u, {$bp->profile->table_name_data} pd WHERE u.ID = m.user_id AND u.ID = pd.user_id AND pd.field_id = 1 AND group_id = %d AND is_confirmed = 1 {$banned_sql} {$exclude_admins_sql} {$exclude_sql} ORDER BY m.date_modified DESC {$pag_sql}", $group_id ) );
         else
-            $members = $wpdb->get_results( $wpdb->prepare( "SELECT m.user_id, m.date_modified, m.is_banned, u.user_login, u.user_nicename, u.user_email, u.display_name FROM {$bp->groups->table_name_members} m, {$wpdb->users} u WHERE u.ID = m.user_id AND group_id = %d AND is_confirmed = 1 {$banned_sql} {$exclude_sql} ORDER BY m.date_modified DESC {$pag_sql}", $group_id ) );
+            $members = $wpdb->get_results( $wpdb->prepare( "SELECT m.user_id, m.date_modified, m.is_banned, u.user_login, u.user_nicename, u.user_email, u.display_name FROM {$bp->groups->table_name_members} m, {$wpdb->users} u WHERE u.ID = m.user_id AND group_id = %d AND is_confirmed = 1 {$banned_sql} {$exclude_admins_sql} {$exclude_sql} ORDER BY m.date_modified DESC {$pag_sql}", $group_id ) );
 
         if ( !$members )
@@ -1021 +1024 @@
             $total_member_count = count($members);
         else
-            $total_member_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(user_id) FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 1 {$banned_sql} {$exclude_sql}", $group_id ) );
+            $total_member_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(user_id) FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 1 {$banned_sql} {$exclude_admins_sql} {$exclude_sql}", $group_id ) );
 
         /* Fetch whether or not the user is a friend */

trunk/bp-groups/bp-groups-templatetags.php

@@ -1281 +1281 @@
     var $total_group_count;
 
-    function bp_groups_group_members_template( $group_id, $per_page, $max, $exclude_admins_mods, $exclude_banned ) {
+    function bp_groups_group_members_template( $group_id, $per_page, $max, $exclude_admins_mods, $exclude_banned, $exclude ) {
         global $bp;
 
@@ -1287 +1287 @@
         $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
 
-        $this->members = BP_Groups_Member::get_all_for_group( $group_id, $this->pag_num, $this->pag_page, $exclude_admins_mods, $exclude_banned );
+        $this->members = BP_Groups_Member::get_all_for_group( $group_id, $this->pag_num, $this->pag_page, $exclude_admins_mods, $exclude_banned, $exclude );
 
         if ( !$max || $max >= (int)$this->members['count'] )
@@ -1368 +1368 @@
         'per_page' => 20,
         'max' => false,
+        'exclude' => false,
         'exclude_admins_mods' => 1,
         'exclude_banned' => 1
@@ -1375 +1376 @@
     extract( $r, EXTR_SKIP );
 
-    $members_template = new BP_Groups_Group_Members_Template( $group_id, $per_page, $max, (int)$exclude_admins_mods, (int)$exclude_banned );
+    $members_template = new BP_Groups_Group_Members_Template( $group_id, $per_page, $max, (int)$exclude_admins_mods, (int)$exclude_banned, $exclude );
     return apply_filters( 'bp_group_has_members', $members_template->has_members(), &$members_template );
 }