diff --git bp-groups/bp-groups-classes.php bp-groups/bp-groups-classes.php index de81785..a64d52d 100644 --- bp-groups/bp-groups-classes.php +++ bp-groups/bp-groups-classes.php @@ -1446,9 +1446,10 @@ class BP_Group_Member_Query extends BP_User_Query { 'group_id' => 0, 'group_role' => array( 'member' ), 'is_confirmed' => true, + 'type' => 'last_modified' ) ); - $group_member_ids = $this->get_group_member_ids(); + $group_member_ids = $this->get_group_member_ids( $this->query_vars['type'] ); // If the group member query returned no users, bail with an // array that will guarantee no matches for BP_User_Query @@ -1470,9 +1471,12 @@ class BP_Group_Member_Query extends BP_User_Query { * * @return array $ids User IDs of relevant group member ids. */ - protected function get_group_member_ids() { + protected function get_group_member_ids( $type = '' ) { global $wpdb; + if ( empty( $type ) ) + $type = 'last_modified'; + if ( is_array( $this->group_member_ids ) ) { return $this->group_member_ids; } @@ -1547,17 +1551,27 @@ class BP_Group_Member_Query extends BP_User_Query { $sql['where'] = ! empty( $sql['where'] ) ? 'WHERE ' . implode( ' AND ', $sql['where'] ) : ''; /** ORDER BY clause ***************************************************/ - - // @todo For now, mimicking legacy behavior of - // bp_group_has_members(), which has us order by date_modified - // only. Should abstract it in the future + /** + * The order for alphabetical type will be set in BP_Group_Member_Query->set_order_by() + * In group members tables, date_modified is the 'sortable' field available + * The 2 types left: last_modified and first_modified are managed here + */ $sql['orderby'] = "ORDER BY date_modified"; $sql['order'] = "DESC"; + if ( 'first_modified' == $type ) { + $sql['order'] = "ASC"; + } + /** LIMIT clause ******************************************************/ $this->group_member_ids = $wpdb->get_col( "{$sql['select']} {$sql['where']} {$sql['orderby']} {$sql['order']} {$sql['limit']}" ); - return $this->group_member_ids; + /** + * You can filter the group member ids from here to build your custom query + * if you defined a custom type using the action 'bp_groups_members_order_options' + * for instance + */ + return apply_filters( 'bp_group_member_query_group_member_ids', $this->group_member_ids, $type, $this->query_vars['group_id'] ); } /** @@ -1569,16 +1583,21 @@ class BP_Group_Member_Query extends BP_User_Query { * @param BP_User_Query $query BP_User_Query object. */ public function set_orderby( $query ) { - $gm_ids = $this->get_group_member_ids(); + + $gm_ids = $this->get_group_member_ids( $query->query_vars['type'] ); + if ( empty( $gm_ids ) ) { $gm_ids = array( 0 ); } - // The first param in the FIELD() clause is the sort column id - $gm_ids = array_merge( array( 'u.id' ), wp_parse_id_list( $gm_ids ) ); - $gm_ids_sql = implode( ',', $gm_ids ); + // No need to change the order of BP_User_Query in case type is alphabetical + if ( 'alphabetical' != $query->query_vars['type'] ) { + // The first param in the FIELD() clause is the sort column id + $gm_ids = array_merge( array( 'u.id' ), wp_parse_id_list( $gm_ids ) ); + $gm_ids_sql = implode( ',', $gm_ids ); - $query->uid_clauses['orderby'] = "ORDER BY FIELD(" . $gm_ids_sql . ")"; + $query->uid_clauses['orderby'] = "ORDER BY FIELD(" . $gm_ids_sql . ")"; + } // Prevent this filter from running on future BP_User_Query // instances on the same page diff --git bp-groups/bp-groups-functions.php bp-groups/bp-groups-functions.php index a356e1d..0f78bd2 100644 --- bp-groups/bp-groups-functions.php +++ bp-groups/bp-groups-functions.php @@ -373,7 +373,7 @@ function groups_get_group_mods( $group_id ) { * @param array|string $exclude Array or comma-sep list of users to exclude * @return array Multi-d array of 'members' list and 'count' */ -function groups_get_group_members( $group_id, $limit = false, $page = false, $exclude_admins_mods = true, $exclude_banned = true, $exclude = false, $group_role = false ) { +function groups_get_group_members( $group_id, $limit = false, $page = false, $exclude_admins_mods = true, $exclude_banned = true, $exclude = false, $group_role = false, $type = false, $search_terms = false ) { // For legacy users. Use of BP_Groups_Member::get_all_for_group() // is deprecated. func_get_args() can't be passed to a function in PHP @@ -398,6 +398,9 @@ function groups_get_group_members( $group_id, $limit = false, $page = false, $ex } } + if ( empty( $type ) ) + $type = 'last_modified'; + // Perform the group member query (extends BP_User_Query) $members = new BP_Group_Member_Query( array( 'group_id' => $group_id, @@ -405,7 +408,8 @@ function groups_get_group_members( $group_id, $limit = false, $page = false, $ex 'page' => $page, 'group_role' => $group_role, 'exclude' => $exclude, - 'type' => 'last_modified', + 'type' => $type, + 'search_terms' => $search_terms, ) ); // Structure the return value as expected by the template functions diff --git bp-groups/bp-groups-template.php bp-groups/bp-groups-template.php index 512724f..1dfa0dd 100644 --- bp-groups/bp-groups-template.php +++ bp-groups/bp-groups-template.php @@ -1914,11 +1914,11 @@ class BP_Groups_Group_Members_Template { var $pag_links; var $total_group_count; - function __construct( $group_id, $per_page, $max, $exclude_admins_mods, $exclude_banned, $exclude, $group_role = false ) { + function __construct( $group_id, $page_number, $per_page, $max, $exclude_admins_mods, $exclude_banned, $exclude, $group_role = false, $type, $search_terms ) { - $this->pag_page = isset( $_REQUEST['mlpage'] ) ? intval( $_REQUEST['mlpage'] ) : 1; + $this->pag_page = isset( $_REQUEST['mlpage'] ) ? intval( $_REQUEST['mlpage'] ) : (int) $page_number; $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page; - $this->members = groups_get_group_members( $group_id, $this->pag_num, $this->pag_page, $exclude_admins_mods, $exclude_banned, $exclude, $group_role ); + $this->members = groups_get_group_members( $group_id, $this->pag_num, $this->pag_page, $exclude_admins_mods, $exclude_banned, $exclude, $group_role, $type, $search_terms ); if ( !$max || $max >= (int) $this->members['count'] ) $this->total_member_count = (int) $this->members['count']; @@ -1995,16 +1995,22 @@ function bp_group_has_members( $args = '' ) { global $members_template; $r = wp_parse_args( $args, array( - 'group_id' => bp_get_current_group_id(), - 'per_page' => 20, - 'max' => false, - 'exclude' => false, + 'group_id' => bp_get_current_group_id(), + 'page' => 1, + 'per_page' => 20, + 'max' => false, + 'exclude' => false, 'exclude_admins_mods' => 1, - 'exclude_banned' => 1, - 'group_role' => false, + 'exclude_banned' => 1, + 'group_role' => false, + 'type' => 'last_modified', + 'search_terms' => false ) ); - $members_template = new BP_Groups_Group_Members_Template( $r['group_id'], $r['per_page'], $r['max'], (int) $r['exclude_admins_mods'], (int) $r['exclude_banned'], $r['exclude'], $r['group_role'] ); + if ( empty( $r['search_terms'] ) && ! empty( $_REQUEST['s'] ) ) + $r['search_terms'] = $_REQUEST['s']; + + $members_template = new BP_Groups_Group_Members_Template( $r['group_id'], $r['page'], $r['per_page'], $r['max'], (int) $r['exclude_admins_mods'], (int) $r['exclude_banned'], $r['exclude'], $r['group_role'], $r['type'], $r['search_terms'] ); return apply_filters( 'bp_group_has_members', $members_template->has_members(), $members_template ); } @@ -2180,6 +2186,57 @@ function bp_group_member_admin_pagination() { return $members_template->pag_links; } +/** + * Output the Group members template + * + * @since BuddyPress (?) + * + * @return string html output + */ +function bp_groups_members_template_part() { + ?> + + +
+ + + +
+ +
  • + + +
    • + + - - -