diff --git bp-groups/bp-groups-classes.php bp-groups/bp-groups-classes.php
index 6106e46..0315704 100644
--- bp-groups/bp-groups-classes.php
+++ bp-groups/bp-groups-classes.php
@@ -1447,6 +1447,14 @@ class BP_Groups_Group {
/**
* Query for the members of a group.
*
+ * Special notes about the group members data schema:
+ * - *Members* are entries with is_confirmed = 1
+ * - *Pending requests* are entries with is_confirmed = 0 and inviter_id = 0
+ * - *Pending and sent invitations* are entries with is_confirmed = 0 and
+ * inviter_id != 0 and invite_sent = 1
+ * - *Pending and unsent invitations* are entries with is_confirmed = 0 and
+ * inviter_id != 0 and invite_sent = 0
+ *
* @since BuddyPress (1.8.0)
*/
class BP_Group_Member_Query extends BP_User_Query {
@@ -1501,6 +1509,8 @@ class BP_Group_Member_Query extends BP_User_Query {
'group_id' => 0,
'group_role' => array( 'member' ),
'is_confirmed' => true,
+ 'invite_sent' => null,
+ 'inviter_id' => null,
'type' => 'last_joined',
) );
@@ -1550,6 +1560,35 @@ class BP_Group_Member_Query extends BP_User_Query {
$is_confirmed = ! empty( $this->query_vars['is_confirmed'] ) ? 1 : 0;
$sql['where'][] = $wpdb->prepare( "is_confirmed = %d", $is_confirmed );
+ // invite_sent
+ if ( ! is_null( $this->query_vars['invite_sent'] ) ) {
+ $invite_sent = ! empty( $this->query_vars['invite_sent'] ) ? 1 : 0;
+ $sql['where'][] = $wpdb->prepare( "invite_sent = %d", $invite_sent );
+ }
+
+ // inviter_id
+ if ( ! is_null( $this->query_vars['inviter_id'] ) ) {
+ $inviter_id = $this->query_vars['inviter_id'];
+
+ // Empty: inviter_id = 0. (pass false, 0, or empty array)
+ if ( empty( $inviter_id ) ) {
+ $sql['where'][] = "inviter_id = 0";
+
+ // The string 'any' matches any non-zero value (inviter_id != 0)
+ } else if ( 'any' === $inviter_id ) {
+ $sql['where'][] = "inviter_id != 0";
+
+ // Assume that a list of inviter IDs has been passed
+ } else {
+ // Parse and sanitize
+ $inviter_ids = wp_parse_id_list( $inviter_id );
+ if ( ! empty( $inviter_ids ) ) {
+ $inviter_ids_sql = implode( ',', $inviter_ids );
+ $sql['where'][] = "inviter_id IN ({$inviter_ids_sql})";
+ }
+ }
+ }
+
// Role information is stored as follows: admins have
// is_admin = 1, mods have is_mod = 1, banned have is_banned =
// 1, and members have all three set to 0.
diff --git bp-groups/bp-groups-template.php bp-groups/bp-groups-template.php
index fe6c837..70f4350 100644
--- bp-groups/bp-groups-template.php
+++ bp-groups/bp-groups-template.php
@@ -3085,9 +3085,56 @@ class BP_Groups_Invite_Template {
var $pag_links;
var $total_invite_count;
- function __construct( $user_id, $group_id ) {
- $this->invites = groups_get_invites_for_group( $user_id, $group_id );
- $this->invite_count = count( $this->invites );
+ public function __construct( $args = array() ) {
+
+ // Backward compatibility with old method of passing arguments
+ if ( ! is_array( $args ) || func_num_args() > 1 ) {
+ _deprecated_argument( __METHOD__, '2.0.0', sprintf( __( 'Arguments passed to %1$s should be in an associative array. See the inline documentation at %2$s for more details.', 'buddypress' ), __METHOD__, __FILE__ ) );
+
+ $old_args_keys = array(
+ 0 => 'user_id',
+ 1 => 'group_id',
+ );
+
+ $func_args = func_get_args();
+ $args = bp_core_parse_args_array( $old_args_keys, $func_args );
+ }
+
+ $r = wp_parse_args( $args, array(
+ 'user_id' => bp_loggedin_user_id(),
+ 'group_id' => bp_get_current_group_id(),
+ 'page' => 1,
+ 'per_page' => 10,
+ ) );
+
+ $this->pag_num = intval( $r['per_page'] );
+ $this->pag_page = isset( $_REQUEST['invitepage'] ) ? intval( $_REQUEST['invitepage'] ) : $r['page'];
+
+ $iquery = new BP_Group_Member_Query( array(
+ 'group_id' => $r['group_id'],
+ 'type' => 'first_joined',
+ 'per_page' => $this->pag_num,
+ 'page' => $this->pag_page,
+
+ // These filters ensure we get only pending invites
+ 'is_confirmed' => false,
+ 'inviter_id' => $r['user_id'],
+ ) );
+ $this->invite_data = $iquery->results;
+
+ $this->total_invite_count = $iquery->total_users;
+ $this->invites = array_values( wp_list_pluck( $this->invite_data, 'ID' ) );
+ $this->invite_count = count( $this->invites );
+
+ $this->pag_links = paginate_links( array(
+ 'base' => add_query_arg( 'invitepage', '%#%' ),
+ 'format' => '',
+ 'total' => ceil( $this->total_invite_count / $this->pag_num ),
+ 'current' => $this->pag_page,
+ 'prev_text' => '←',
+ 'next_text' => '→',
+ 'mid_size' => 1,
+ ) );
}
function has_invites() {
@@ -3125,11 +3172,24 @@ class BP_Groups_Invite_Template {
function the_invite() {
global $group_id;
-
$this->in_the_loop = true;
$user_id = $this->next_invite();
+
$this->invite = new stdClass;
- $this->invite->user = new BP_Core_User( $user_id );
+ $this->invite->user = $this->invite_data[ $user_id ];
+
+ // This method previously populated the user object with
+ // BP_Core_User. We manually configure BP_Core_User data for
+ // backward compatibility.
+ $this->invite->user->profile_data = BP_XProfile_ProfileData::get_all_for_user( $user_id );
+ $this->invite->user->avatar = bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'full', 'alt' => sprintf( __( 'Avatar of %s', 'buddypress' ), $this->invite->user->fullname ) ) );
+ $this->invite->user->avatar_thumb = bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'alt' => sprintf( __( 'Avatar of %s', 'buddypress' ), $this->invite->user->fullname ) ) );
+ $this->invite->user->avatar_mini = bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'alt' => sprintf( __( 'Avatar of %s', 'buddypress' ), $this->invite->user->fullname ), 'width' => 30, 'height' => 30 ) );
+ $this->invite->user->email = $this->invite->user->user_email;
+ $this->invite->user->user_url = bp_core_get_user_domain( $user_id, $this->invite->user->user_nicename, $this->invite->user->user_login );
+ $this->invite->user->user_link = "{$this->invite->user->fullname}";
+ $this->invite->user->last_active = bp_core_get_last_activity( $this->invite->user->last_activity, __( 'active %s', 'buddypress' ) );
+
$this->invite->group_id = $group_id; // Globaled in bp_group_has_invites()
if ( 0 == $this->current_invite ) // loop has just started
@@ -3138,29 +3198,31 @@ class BP_Groups_Invite_Template {
}
function bp_group_has_invites( $args = '' ) {
- global $bp, $invites_template, $group_id;
+ global $invites_template, $group_id;
+ $bp = buddypress();
$defaults = array(
- 'group_id' => false,
- 'user_id' => bp_loggedin_user_id()
+ 'group_id' => false,
+ 'user_id' => bp_loggedin_user_id(),
+ 'per_page' => 10,
+ 'page' => 1
);
$r = wp_parse_args( $args, $defaults );
- extract( $r, EXTR_SKIP );
- if ( !$group_id ) {
+ if ( !$r['group_id'] ) {
// Backwards compatibility
if ( !empty( $bp->groups->current_group ) )
- $group_id = $bp->groups->current_group->id;
+ $r['group_id'] = $bp->groups->current_group->id;
if ( !empty( $bp->groups->new_group_id ) )
- $group_id = $bp->groups->new_group_id;
+ $r['group_id'] = $bp->groups->new_group_id;
}
- if ( !$group_id )
+ if ( !$r['group_id'] )
return false;
- $invites_template = new BP_Groups_Invite_Template( $user_id, $group_id );
+ $invites_template = new BP_Groups_Invite_Template( $r );
return apply_filters( 'bp_group_has_invites', $invites_template->has_invites(), $invites_template );
}
@@ -3221,6 +3283,48 @@ function bp_group_invite_user_remove_invite_url() {
return wp_nonce_url( site_url( bp_get_groups_slug() . '/' . $invites_template->invite->group_id . '/invites/remove/' . $invites_template->invite->user->id ), 'groups_invite_uninvite_user' );
}
+/**
+ * Output pagination links for group invitations.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+function bp_group_invite_pagination_links() {
+ echo bp_get_group_invite_pagination_links();
+}
+ /**
+ * Get pagination links for group invitations.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+ function bp_get_group_invite_pagination_links() {
+ global $invites_template;
+ return apply_filters( 'bp_get_group_invite_pagination_links', $invites_template->pag_links );
+ }
+
+/**
+ * Output pagination count text for group invitations.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+function bp_group_invite_pagination_count() {
+ echo bp_get_group_invite_pagination_count();
+}
+ /**
+ * Get pagination count text for group invitations.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+ function bp_get_group_invite_pagination_count() {
+ global $invites_template;
+
+ $start_num = intval( ( $invites_template->pag_page - 1 ) * $invites_template->pag_num ) + 1;
+ $from_num = bp_core_number_format( $start_num );
+ $to_num = bp_core_number_format( ( $start_num + ( $invites_template->pag_num - 1 ) > $invites_template->total_invite_count ) ? $invites_template->total_invite_count : $start_num + ( $invites_template->pag_num - 1 ) );
+ $total = bp_core_number_format( $invites_template->total_invite_count );
+
+ return apply_filters( 'bp_get_groups_pagination_count', sprintf( _n( 'Viewing invitation %1$s to %2$s (of %3$s invitation)', 'Viewing invitation %1$s to %2$s (of %3$s invitations)', $total, 'buddypress' ), $from_num, $to_num, $total ), $from_num, $to_num, $total );
+ }
+
/***
* Groups RSS Feed Template Tags
*/
diff --git bp-templates/bp-legacy/buddypress-functions.php bp-templates/bp-legacy/buddypress-functions.php
index d8963f5..93efcef 100644
--- bp-templates/bp-legacy/buddypress-functions.php
+++ bp-templates/bp-legacy/buddypress-functions.php
@@ -139,6 +139,7 @@ class BP_Legacy extends BP_Theme_Compat {
'groups_filter' => 'bp_legacy_theme_object_template_loader',
'members_filter' => 'bp_legacy_theme_object_template_loader',
'messages_filter' => 'bp_legacy_theme_messages_template_loader',
+ 'invite_filter' => 'bp_legacy_theme_invite_template_loader',
// Friends
'accept_friendship' => 'bp_legacy_theme_ajax_accept_friendship',
@@ -601,6 +602,16 @@ function bp_legacy_theme_messages_template_loader() {
}
/**
+ * Load group invitations loop to handle pagination requests sent via AJAX.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+function bp_legacy_theme_invite_template_loader() {
+ bp_get_template_part( 'groups/single/invites-loop' );
+ exit();
+}
+
+/**
* Load the activity loop template when activity is requested via AJAX,
*
* @return string JSON object containing 'contents' (output of the template loop
diff --git bp-templates/bp-legacy/buddypress/groups/single/invites-loop.php bp-templates/bp-legacy/buddypress/groups/single/invites-loop.php
new file mode 100644
index 0000000..5df7144
--- /dev/null
+++ bp-templates/bp-legacy/buddypress/groups/single/invites-loop.php
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git bp-templates/bp-legacy/buddypress/groups/single/send-invites.php bp-templates/bp-legacy/buddypress/groups/single/send-invites.php
index c2f0500..6f3d9ef 100644
--- bp-templates/bp-legacy/buddypress/groups/single/send-invites.php
+++ bp-templates/bp-legacy/buddypress/groups/single/send-invites.php
@@ -2,77 +2,20 @@
+