Ticket #5336: 5336.03.patch

src/bp-groups/admin/css/admin.css

@@ -42 +42 @@
         line-height: 24px;
         color: #666;
 }
-.bp-groups-member-type {
+.bp-groups-member-type, .bp-group-admin-paginated-list {
         position: relative;
 }
-.bp-groups-member-type > h4 {
+.bp-groups-member-type > h4, .bp-group-admin-paginated-list > h4 {
         margin-bottom: .5em;
 }
 ul.bp-group-delete-list {

src/bp-groups/bp-groups-admin.php

@@ -125 +125 @@
                 add_meta_box( 'bp_group_settings', _x( 'Settings', 'group admin edit screen', 'buddypress' ), 'bp_groups_admin_edit_metabox_settings', get_current_screen()->id, 'side', 'core' );
                 add_meta_box( 'bp_group_add_members', _x( 'Add New Members', 'group admin edit screen', 'buddypress' ), 'bp_groups_admin_edit_metabox_add_new_members', get_current_screen()->id, 'normal', 'core' );
                 add_meta_box( 'bp_group_members', _x( 'Manage Members', 'group admin edit screen', 'buddypress' ), 'bp_groups_admin_edit_metabox_members', get_current_screen()->id, 'normal', 'core' );
+                add_meta_box( 'bp_group_invites_requests', _x( 'Manage Unconfirmed Members', 'group admin edit screen', 'buddypress' ), 'bp_groups_admin_edit_metabox_invites_requests', get_current_screen()->id, 'normal', 'core' );
 
                 do_action( 'bp_groups_admin_meta_boxes' );
 
@@ -333 +334 @@
                         }
                 }
 
+                // Process invitation actions
+                if ( ! empty( $_POST['bp-groups-invite-action'] ) ) {
+
+                        foreach ( $_POST['bp-groups-invite-action'] as $user_id => $action ) {
+                                switch ( $action ) {
+                                        case 'remove':
+                                                // Remove the invitation 
+                                                $result = groups_uninvite_user( $user_id, $group_id ); 
+                                                // Store the success or failure 
+                                                if ( $result ) { 
+                                                        $success_removed_invite[] = $user_id; 
+                                                } else { 
+                                                        $error_removed_invite[]   = $user_id; 
+                                                }
+                                                break;
+                                        case 'resend':
+                                                // This can't work at the moment, because sending invites is tied to the logged-in user id
+                                                break;
+                                        case 'send':
+                                                // This can't work at the moment, because sending invites is tied to the logged-in user id
+                                                break;
+                                }                       
+                        }
+                        // Destroy the variables to prevent confusion
+                        unset( $action, $user_id );
+                }
+
+                // Process invitation actions
+                if ( ! empty( $_POST['bp-groups-mem-req-action'] ) ) {
+
+                        foreach ( $_POST['bp-groups-mem-req-action'] as $membership_id => $action ) {
+                                switch ( $action ) {
+                                        case 'accept':
+                                                // Accept the request 
+                                                $result = groups_accept_membership_request( $membership_id ); 
+                                                // Store the success or failure 
+                                                if ( $result ) { 
+                                                        $success_accepted_mem_req[] = $membership_id; 
+                                                } else { 
+                                                        $error_accepted_mem_req[]   = $membership_id; 
+                                                }
+                                                break;
+                                        case 'reject':
+                                                // Reject the request 
+                                                $result = groups_reject_membership_request( $membership_id ); 
+                                                // Store the success or failure 
+                                                if ( $result ) { 
+                                                        $success_rejected_mem_req[] = $membership_id; 
+                                                } else { 
+                                                        $error_rejected_mem_req[]   = $membership_id; 
+                                                }                                               break;
+                                }                       
+                        }
+                        // Destroy the variables to prevent confusion
+                        unset( $action, $membership_id );
+                }
+
                 // Call actions for plugins to do something before we redirect
                 do_action( 'bp_group_admin_edit_after', $group_id );
 
@@ -365 +423 @@
                         $error_modified = implode( ',', array_filter( $error_modified, 'urlencode' ) );
                         $redirect_to = add_query_arg( 'error_modified', $error_modified, $redirect_to );
                 }
+                if ( !empty( $success_removed_invite ) ) {
+                        $success_removed_invite = implode( ',', array_filter( $success_removed_invite, 'urlencode' ) );
+                        $redirect_to = add_query_arg( 'success_removed_invite', $success_removed_invite, $redirect_to );
+                }
+
+                if ( !empty( $error_removed_invite ) ) {
+                        $error_removed_invite = implode( ',', array_filter( $error_removed_invite, 'urlencode' ) );
+                        $redirect_to = add_query_arg( 'error_removed_invite', $error_removed_invite, $redirect_to );
+                }
+
+                if ( !empty( $success_accepted_mem_req ) ) {
+                        $success_accepted_mem_req = implode( ',', array_filter( $success_accepted_mem_req, 'urlencode' ) );
+                        $redirect_to = add_query_arg( 'success_accepted_mem_req', $success_accepted_mem_req, $redirect_to );
+                }
+
+                if ( !empty( $error_accepted_mem_req ) ) {
+                        $error_accepted_mem_req = implode( ',', array_filter( $error_accepted_mem_req, 'urlencode' ) );
+                        $redirect_to = add_query_arg( 'error_accepted_mem_req', $error_accepted_mem_req, $redirect_to );
+                }
+
+                if ( !empty( $success_rejected_mem_req ) ) {
+                        $success_rejected_mem_req = implode( ',', array_filter( $success_rejected_mem_req, 'urlencode' ) );
+                        $redirect_to = add_query_arg( 'success_rejected_mem_req', $success_rejected_mem_req, $redirect_to );
+                }
+
+                if ( !empty( $error_rejected_mem_req ) ) {
+                        $error_rejected_mem_req = implode( ',', array_filter( $error_rejected_mem_req, 'urlencode' ) );
+                        $redirect_to = add_query_arg( 'error_rejected_mem_req', $error_rejected_mem_req, $redirect_to );
+                }
 
                 // Redirect
                 wp_redirect( apply_filters( 'bp_group_admin_edit_redirect', $redirect_to ) );
@@ -898 +985 @@
 }
 
 /**
+ * Renders the Invitations metabox on single group pages.
+ *
+ * @since BuddyPress (2.1.0)
+ *
+ * @param BP_Groups_Group $item The BP_Groups_Group object for the current
+ *        group.
+ */
+ function bp_groups_admin_edit_metabox_invites_requests( $item ) {
+                $current_invite_page = isset( $_GET[ 'invites_page' ] ) ? absint( $_GET[ 'invites_page' ] ) : 1;
+                $invitee_query = new BP_Group_Member_Query( array(
+                        'group_id'      => $item->id,
+                        'type'          => 'alphabetical',
+                        'is_confirmed'  => false,
+                        'inviter_id'    => 'any', // Finds all non-zero entries -- invitations
+                        'per_page'      => 10,
+                        'page'          => $current_invite_page,
+                ) );
+
+                $invited_users   = $invitee_query->results;
+                $pagination['invites'] = bp_groups_admin_create_invite_pagination_links( $invitee_query, 'invites' );
+        ?>      
+        <div id="bp-group-invitations-list" class="bp-group-admin-paginated-list">
+                <h4><?php _ex( 'Outstanding Invitations', 'Outstanding invitations header in group admin', 'buddypress' ); ?></h4>
+
+                <?php if ( ! empty( $invited_users ) ) : ?>
+
+                <div class="bp-group-admin-pagination table-top">
+                        <?php echo $pagination['invites']; ?>
+                </div>
+
+                <table class="widefat bp-group-invitations">
+                        <thead>
+                        <tr>
+                                <th scope="col" class="uid-column"><?php _ex( 'ID', 'Group invitation recipient user_id in group admin', 'buddypress' ) ?></th>
+                                <th scope="col" class="uname-column"><?php _ex( 'Name', 'Group invitation recipient name in group admin', 'buddypress' ) ?></th>
+                                <th scope="col" class="inviter-name-column"><?php _ex( 'Invited By', 'Username of group invitation sender in group admin', 'buddypress' ) ?></th>
+                                <th scope="col" class="invitation-action-column"><?php _ex( 'Actions', 'Invitation actions in group admin', 'buddypress' ) ?></th>
+                        </tr>
+                        </thead>
+
+                        <tbody>
+
+                        <?php foreach ( $invited_users as $invite ) : ?>
+                                <tr>
+                                        <th scope="row" class="uid-column"><?php echo esc_html( $invite->ID ); ?></th>
+
+                                        <td class="uname-column">
+                                                    <a style="float: left;" href="<?php echo bp_core_get_userlink( $invite->ID, false, true ); ?>"><?php 
+                                                        echo bp_core_fetch_avatar( array(
+                                                                                                                        'item_id' => $invite->ID,
+                                                                                                                        'width'   => '32',
+                                                                                                                        'height'  => '32'
+                                                                                                                ) ); ?></a>
+
+                                                <span style="margin: 8px; float: left;"><?php echo bp_core_get_userlink( $invite->ID ); ?></span>
+                                        </td>
+
+                                        <td class="inviter-name-column">
+                                                <span style="margin: 8px; float: left;"><?php echo bp_core_get_userlink( $invite->inviter_id ); ?></span>
+                                        </td>
+                                        <td class="invitation-action-column">
+                                                <label style="margin: 8px; float: left;"><input type="radio" name="bp-groups-invite-action[<?php echo $invite->ID; ?>]" value="remove">Remove</label>
+
+                                                <?php /* This can't be done at the moment, because sending invitations is tied to the logged-in user's id. ?>
+                                                <?php if ( ! $invite->invite_sent ) : ?>
+                                                        <label style="margin: 8px; float: left;"><input type="radio" name="bp-groups-invite-action[<?php echo $invite->ID; ?>]" value="send">Send</label>
+                                                <?php else : ?>
+                                                        <label style="margin: 8px; float: left;"><input type="radio" name="bp-groups-invite-action[<?php echo $invite->ID; ?>]" value="resend">Re-send</label>
+                                                <?php endif; ?>
+                                                <?php */ ?>
+                                        </td>
+                                </tr>
+
+                        <?php endforeach; ?>
+
+                        </tbody>
+                </table>
+
+                <div class="bp-group-admin-pagination table-bottom">
+                        <?php echo $pagination['invites']; ?>
+                </div>
+
+        <?php else : ?>
+
+                <p class="bp-groups-no-outstanding-invites description"><?php _e( 'No outstanding invitations', 'buddypress' ) ?></p>
+
+        <?php endif; ?>
+
+        </div><!-- #bp-group-invitations-list -->
+
+        <?php
+
+        $current_req_page = isset( $_GET[ 'mem_req_page' ] ) ? absint( $_GET[ 'mem_req_page' ] ) : 1;
+                $request_query = new BP_Group_Member_Query( array(
+                        'group_id'      => $item->id,
+                        'type'          => 'alphabetical',
+                        'is_confirmed'  => false,
+                        'inviter_id'    => 0, // inviter_id = 0 and is_confirmed = 0 are requests
+                        'per_page'      => 10,
+                        'page'          => $current_req_page,
+                ) );
+
+                $mem_req_users   = $request_query->results;
+                $pagination['mem_req'] = bp_groups_admin_create_invite_pagination_links( $request_query, 'mem_req' );
+        ?>      
+        <div id="bp-group-requests-list" class="bp-group-admin-paginated-list">
+                <h4><?php _ex( 'Membership Requests', 'Membership requests header in group admin', 'buddypress' ); ?></h4>
+
+                <?php if ( ! empty( $mem_req_users ) ) : ?>
+
+                <div class="bp-group-admin-pagination table-top">
+                        <?php echo $pagination['mem_req']; ?>
+                </div>
+
+                <table class="widefat bp-group-mem-requests">
+                        <thead>
+                        <tr>
+                                <th scope="col" class="uid-column"><?php _ex( 'ID', 'Group invitation recipient user_id in group admin', 'buddypress' ) ?></th>
+                                <th scope="col" class="uname-column"><?php _ex( 'Name', 'Group invitation recipient name in group admin', 'buddypress' ) ?></th>
+                                <th scope="col" class="mem-req-action-column"><?php _ex( 'Actions', 'Membership request actions in group admin', 'buddypress' ) ?></th>
+                        </tr>
+                        </thead>
+
+                        <tbody>
+
+                        <?php foreach ( $mem_req_users as $mem_req ) : ?>
+                                <tr>
+                                        <th scope="row" class="uid-column"><?php echo esc_html( $mem_req->ID ); ?></th>
+
+                                        <td class="uname-column">
+                                                    <a style="float: left;" href="<?php echo bp_core_get_userlink( $mem_req->ID, false, true ); ?>"><?php 
+                                                        echo bp_core_fetch_avatar( array(
+                                                                                                                        'item_id' => $mem_req->ID,
+                                                                                                                        'width'   => '32',
+                                                                                                                        'height'  => '32'
+                                                                                                                ) ); ?></a>
+
+                                                <span style="margin: 8px; float: left;"><?php echo bp_core_get_userlink( $mem_req->ID ); ?></span>
+                                        </td>
+
+                                        <td class="mem-req-action-column">
+                                            <label style="margin: 8px; float: left;"><input type="radio" name="bp-groups-mem-req-action[<?php echo $mem_req->membership_id; ?>]" value="accept">Accept</label>
+                                            <label style="margin: 8px; float: left;"><input type="radio" name="bp-groups-mem-req-action[<?php echo $mem_req->membership_id; ?>]" value="reject">Reject</label>
+                                            </td>
+                                </tr>
+
+                        <?php endforeach; ?>
+
+                        </tbody>
+                </table>
+
+                <div class="bp-group-admin-pagination table-bottom">
+                        <?php echo $pagination['mem_req']; ?>
+                </div>
+
+        <?php else : ?>
+
+                <p class="bp-groups-no-outstanding-requests description"><?php _e( 'No outstanding membership requests', 'buddypress' ) ?></p>
+
+        <?php endif; ?>
+
+        </div><!-- #bp-group-requests-list -->
+        <?php
+}
+
+/**
  * Create pagination links out of a BP_Group_Member_Query.
  *
  * This function is intended to create pagination links for use under the
@@ -957 +1210 @@
 }
 
 /**
+ * Create pagination links out of a BP_Group_Member_Query.
+ *
+ * This function is intended to create pagination links for use under the
+ * Manage Unconfirmed Members section of the Groups Admin Dashboard pages. It is a stopgap
+ * measure until a more general pagination solution is in place for BuddyPress.
+ * Plugin authors should not use this function, as it is likely to be
+ * deprecated soon.
+ *
+ * @since BuddyPress (2.1.0)
+ *
+ * @param BP_Group_Member_Query $query A BP_Group_Member_Query object.
+ * @param string $type mem_req|invites.
+ * @return string Pagination links HTML.
+ */
+function bp_groups_admin_create_invite_pagination_links( BP_Group_Member_Query $query, $type ) {
+        $pagination = '';
+
+        if ( ! in_array( $type, array( 'invites', 'mem_req' ) ) ) {
+                return $pagination;
+        }
+
+        // The key used to paginate this member type in the $_GET global
+        $qs_key = $type . '_page';
+        $url_base = remove_query_arg( array( $qs_key, 'updated', 'success_modified' ), $_SERVER['REQUEST_URI'] );
+
+        $page     = isset( $_GET[ $qs_key ] ) ? absint( $_GET[ $qs_key ] ) : 1;
+        $per_page = 10; // @todo Make this customizable?
+
+        // Don't show anything if there's no pagination
+        if ( 1 === $page && $query->total_users <= $per_page ) {
+                return $pagination;
+        }
+
+        $current_page_start = ( ( $page - 1 ) * $per_page ) + 1;
+        $current_page_end   = $page * $per_page > intval( $query->total_users ) ? $query->total_users : $page * $per_page;
+
+        $pag_links = paginate_links( array(
+                'base'      => add_query_arg( $qs_key, '%#%', $url_base ),
+                'format'    => '',
+                'prev_text' => __( '&laquo;', 'buddypress' ),
+                'next_text' => __( '&raquo;', 'buddypress' ),
+                'total'     => ceil( $query->total_users / $per_page ),
+                'current'   => $page,
+        ) );
+
+        $viewing_text = sprintf(
+                __( 'Viewing %1$s - %2$s of %3$s', 'buddypress' ),
+                number_format_i18n( $current_page_start ),
+                number_format_i18n( $current_page_end ),
+                sprintf( _n( '%s member', '%s members', $query->total_users, 'buddypress' ), $query->total_users )
+        );
+
+        $pagination .= '<span class="bp-group-admin-pagination-viewing">' . $viewing_text . '</span>';
+        $pagination .= '<span class="bp-group-admin-pagination-links">' . $pag_links . '</span>';
+
+        return $pagination;
+}
+
+/**
  * Get a set of usernames corresponding to a set of user IDs.
  *
  * @since BuddyPress (1.7.0)