Skip to:
Content

BuddyPress.org

Ticket #2620: 2620.patch

File 2620.patch, 7.4 KB (added by boonebgorges, 14 years ago)

  • bp-core/bp-core-templatetags.php

     
    1717        var $pag_links;
    1818        var $total_member_count;
    1919
    20         function bp_core_members_template( $type, $page_number, $per_page, $max, $user_id, $search_terms, $include, $populate_extras ) {
     20        function bp_core_members_template( $type, $page_number, $per_page, $max, $user_id, $search_terms, $include, $exclude, $populate_extras ) {
    2121                global $bp;
    2222
    2323                $this->pag_page = isset( $_REQUEST['upage'] ) ? intval( $_REQUEST['upage'] ) : $page_number;
    … …  
    2525                $this->type = $type;
    2626
    2727                if ( isset( $_REQUEST['letter'] ) && '' != $_REQUEST['letter'] ) {
    28                         $this->members = BP_Core_User::get_users_by_letter( $_REQUEST['letter'], $this->pag_num, $this->pag_page, $populate_extras );
     28                        $this->members = BP_Core_User::get_users_by_letter( $_REQUEST['letter'], $exclude, $this->pag_num, $this->pag_page, $populate_extras );
    2929                }
    3030                else if ( false !== $include ) {
    3131                        $this->members = BP_Core_User::get_specific_users( $include, $this->pag_num, $this->pag_page, $populate_extras );
    3232                }
    3333                else {
    34                         $this->members = bp_core_get_users( array( 'type' => $this->type, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'user_id' => $user_id, 'search_terms' => $search_terms, 'populate_extras' => $populate_extras ) );
     34                        $this->members = bp_core_get_users( array( 'type' => $this->type, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'user_id' => $user_id, 'exclude' => $exclude, 'search_terms' => $search_terms, 'populate_extras' => $populate_extras ) );
    3535                }
    3636
    3737                if ( !$max || $max >= (int)$this->members['total'] )
    … …  
    142142                'per_page' => 20,
    143143                'max' => false,
    144144
    145                 'include' => false, // Pass a user_id or comma separated list of user_ids to only show these users
     145                'include' => false, // Pass a user_id or a list (comma-separated or array) of user_ids to only show these users
     146                'exclude' => false, // Pass a user_id or a list (comma-separated or array) of user_ids to exclude these users
    146147
    147148                'user_id' => $user_id, // Pass a user_id to only show friends of this user
    148149                'search_terms' => $search_terms, // Pass search_terms to filter users by their profile data
    … …  
    158159                        $per_page = $max;
    159160        }
    160161
    161         /* Make sure we return no members if we looking at friendship requests and there are none. */
     162        if ( is_array( $include ) )
     163                $include = implode( ',', $include );
     164               
     165        if ( is_array( $exclude ) )
     166                $exclude = implode( ',', $exclude );
     167
     168        /* Make sure we return no members if we are looking at friendship requests and there are none. */
    162169        if ( empty( $include ) && $bp->friends->slug == $bp->current_component && 'requests' == $bp->current_action )
    163170                return false;
    164171
    165         $members_template = new BP_Core_Members_Template( $type, $page, $per_page, $max, $user_id, $search_terms, $include, (bool)$populate_extras );
     172        $members_template = new BP_Core_Members_Template( $type, $page, $per_page, $max, $user_id, $search_terms, $include, $exclude, (bool)$populate_extras );
    166173
    167174        return $members_template->has_members();
    168175}

  • bp-core/bp-core-classes.php

     
    106106
    107107        /* Static Functions */
    108108
    109         function get_users( $type, $limit = null, $page = 1, $user_id = false, $search_terms = false, $populate_extras = true ) {
     109        function get_users( $type, $limit = null, $page = 1, $user_id = false, $exclude = false, $search_terms = false, $populate_extras = true ) {
    110110                global $wpdb, $bp;
    111111
    112112                $sql = array();
    … …  
    137137
    138138                if ( 'alphabetical' == $type )
    139139                        $sql['where_alpha'] = "AND pd.field_id = 1";
     140               
     141                if ( !empty( $exclude ) )
     142                        $sql['where_exclude'] = "AND u.ID NOT IN ({$exclude})";
    140143
    141144                if ( $user_id && function_exists( 'friends_install' ) ) {
    142145                        $friend_ids = friends_get_friend_user_ids( $user_id );
    … …  
    216219                return array( 'users' => $paged_users, 'total' => $total_users );
    217220        }
    218221
    219         function get_users_by_letter( $letter, $limit = null, $page = 1, $populate_extras = true ) {
     222        function get_users_by_letter( $letter, $exclude, $limit = null, $page = 1, $populate_extras = true ) {
    220223                global $wpdb, $bp;
    221224
    222225                if ( $limit && $page )
    … …  
    228231                $letter = like_escape( $wpdb->escape( $letter ) );
    229232                $status_sql = bp_core_get_status_sql( 'u.' );
    230233
    231                 $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 );
    232                 $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 );
     234                $exclude_sql = ( !empty( $exclude ) ) ? " AND u.ID NOT IN ({$exclude})" : "";
    233235
     236                $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 );
     237                $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 );
     238               
    234239                $total_users = $wpdb->get_var( $total_users_sql );
    235240                $paged_users = $wpdb->get_results( $paged_users_sql );
    236241

  • bp-core.php

     
    497497        $defaults = array(
    498498                'type' => 'active', // active, newest, alphabetical, random or popular
    499499                'user_id' => false, // Pass a user_id to limit to only friend connections for this user
     500                'exclude' => false, // Users to exclude from results
    500501                'search_terms' => false, // Limit to users that match these search terms
    501502
    502503                'per_page' => 20, // The number of results to return per page
    … …  
    507508        $params = wp_parse_args( $args, $defaults );
    508509        extract( $params, EXTR_SKIP );
    509510
    510         return apply_filters( 'bp_core_get_users', BP_Core_User::get_users( $type, $per_page, $page, $user_id, $search_terms, $populate_extras ), &$params );
     511        return apply_filters( 'bp_core_get_users', BP_Core_User::get_users( $type, $per_page, $page, $user_id, $exclude, $search_terms, $populate_extras ), &$params );
    511512}
    512513
    513514/**