Changeset 3368

Timestamp:

11/06/2010 08:15:27 PM (14 years ago)

Author:

boonebgorges

Message:

Adds exclude parameter for bp_has_members(). Fixes #2620

Location:

trunk

Files:

• bp-core.php (modified) (2 diffs)
• bp-core/bp-core-classes.php (modified) (4 diffs)
• bp-core/bp-core-templatetags.php (modified) (4 diffs)

trunk/bp-core.php

@@ -535 +535 @@
         'type' => 'active', // active, newest, alphabetical, random or popular
         'user_id' => false, // Pass a user_id to limit to only friend connections for this user
+        'exclude' => false, // Users to exclude from results
         'search_terms' => false, // Limit to users that match these search terms
 
@@ -546 +547 @@
     extract( $params, EXTR_SKIP );
 
-    return apply_filters( 'bp_core_get_users', BP_Core_User::get_users( $type, $per_page, $page, $user_id, $include, $search_terms, $populate_extras ), &$params );
+    return apply_filters( 'bp_core_get_users', BP_Core_User::get_users( $type, $per_page, $page, $user_id, $include, $search_terms, $populate_extras, $exclude ), &$params );
 }
 

trunk/bp-core/bp-core-classes.php

@@ -107 +107 @@
     /* Static Functions */
 
-    function get_users( $type, $limit = null, $page = 1, $user_id = false, $include = false, $search_terms = false, $populate_extras = true ) {
+    function get_users( $type, $limit = null, $page = 1, $user_id = false, $include = false, $search_terms = false, $populate_extras = true, $exclude = false ) {
         global $wpdb, $bp;
 
@@ -141 +141 @@
         if ( 'alphabetical' == $type )
             $sql['where_alpha'] = "AND pd.field_id = 1";
+        
+        if ( !empty( $exclude ) )
+            $sql['where_exclude'] = "AND u.ID NOT IN ({$exclude})";
 
         if ( $include ) {
@@ -232 +235 @@
     }
 
-    function get_users_by_letter( $letter, $limit = null, $page = 1, $populate_extras = true ) {
+    function get_users_by_letter( $letter, $limit = null, $page = 1, $populate_extras = true, $exclude = false ) {
         global $wpdb, $bp;
 
@@ -252 +255 @@
         $status_sql = bp_core_get_status_sql( 'u.' );
 
-        $total_users_sql = apply_filters( 'bp_core_users_by_letter_count_sql', $wpdb->prepare( "SELECT COUNT(DISTINCT u.ID) FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE {$status_sql} AND pf.name = %s AND pd.value LIKE '$letter%%' ORDER BY pd.value ASC", BP_XPROFILE_FULLNAME_FIELD_NAME ), $letter );
-        $paged_users_sql = apply_filters( 'bp_core_users_by_letter_sql', $wpdb->prepare( "SELECT DISTINCT u.ID as id, u.user_registered, u.user_nicename, u.user_login, u.user_email FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE {$status_sql} AND pf.name = %s AND pd.value LIKE '$letter%%' ORDER BY pd.value ASC{$pag_sql}", BP_XPROFILE_FULLNAME_FIELD_NAME ), $letter, $pag_sql );
-
+        $exclude_sql = ( !empty( $exclude ) ) ? " AND u.ID NOT IN ({$exclude})" : "";
+
+        $total_users_sql = apply_filters( 'bp_core_users_by_letter_count_sql', $wpdb->prepare( "SELECT COUNT(DISTINCT u.ID) FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE {$status_sql} AND pf.name = %s {$exclude_sql} AND pd.value LIKE '$letter%%'  ORDER BY pd.value ASC", BP_XPROFILE_FULLNAME_FIELD_NAME ), $letter );
+        $paged_users_sql = apply_filters( 'bp_core_users_by_letter_sql', $wpdb->prepare( "SELECT DISTINCT u.ID as id, u.user_registered, u.user_nicename, u.user_login, u.user_email FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE {$status_sql} AND pf.name = %s {$exclude_sql} AND pd.value LIKE '$letter%%' ORDER BY pd.value ASC{$pag_sql}", BP_XPROFILE_FULLNAME_FIELD_NAME ), $letter, $pag_sql );
+        
         $total_users = $wpdb->get_var( $total_users_sql );
         $paged_users = $wpdb->get_results( $paged_users_sql );

trunk/bp-core/bp-core-templatetags.php

@@ -18 +18 @@
     var $total_member_count;
 
-    function bp_core_members_template( $type, $page_number, $per_page, $max, $user_id, $search_terms, $include, $populate_extras ) {
+    function bp_core_members_template( $type, $page_number, $per_page, $max, $user_id, $search_terms, $include, $populate_extras, $exclude ) {
         global $bp;
 
@@ -26 +26 @@
 
         if ( isset( $_REQUEST['letter'] ) && '' != $_REQUEST['letter'] )
-            $this->members = BP_Core_User::get_users_by_letter( $_REQUEST['letter'], $this->pag_num, $this->pag_page, $populate_extras );
+            $this->members = BP_Core_User::get_users_by_letter( $_REQUEST['letter'], $this->pag_num, $this->pag_page, $populate_extras, $exclude );
         else if ( false !== $include )
             $this->members = BP_Core_User::get_specific_users( $include, $this->pag_num, $this->pag_page, $populate_extras );
         else
-            $this->members = bp_core_get_users( array( 'type' => $this->type, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'user_id' => $user_id, 'include' => $include, 'search_terms' => $search_terms, 'populate_extras' => $populate_extras ) );
+            $this->members = bp_core_get_users( array( 'type' => $this->type, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'user_id' => $user_id, 'include' => $include, 'search_terms' => $search_terms, 'populate_extras' => $populate_extras, 'exclude' => $exclude ) );
 
         if ( !$max || $max >= (int)$this->members['total'] )
@@ -141 +141 @@
         'max' => false,
 
-        'include' => false, // Pass a user_id or comma separated list of user_ids to only show these users
+        'include' => false, // Pass a user_id or a list (comma-separated or array) of user_ids to only show these users
+        'exclude' => false, // Pass a user_id or a list (comma-separated or array) of user_ids to exclude these users
 
         'user_id' => $user_id, // Pass a user_id to only show friends of this user
@@ -161 +162 @@
         return false;
 
-    $members_template = new BP_Core_Members_Template( $type, $page, $per_page, $max, $user_id, $search_terms, $include, (bool)$populate_extras );
+    $members_template = new BP_Core_Members_Template( $type, $page, $per_page, $max, $user_id, $search_terms, $include, (bool)$populate_extras, $exclude );
     return apply_filters( 'bp_has_members', $members_template->has_members(), &$members_template );
 }