Ticket #5336: group-admin-invites-panel.patch

bp-groups/admin/css/admin.css

@@ -23 +23 @@
 .bp-groups-settings-section {
         margin-bottom: 15px;
 }
-.bp-groups-member-type {
+.bp-group-admin-paginated-list {
         position: relative;
-        padding-bottom: 1.7em;
+        padding: 1.7em 0;
+}
+.bp-groups-member-type {
+        padding-top: 0;
 }
 .bp-groups-member-type > h4 {
         margin-bottom: .5em;
 }
+
 ul.bp-group-delete-list {
         list-style-type: disc;
         margin: 4px 26px;

bp-groups/admin/css/admin.min.css

@@ -1 @@
-body.toplevel_page_bp-groups table.groups th#status,body.toplevel_page_bp-groups table.groups th#members{width:10%}body.toplevel_page_bp-groups table.groups th#last_active{width:15%}#bp-groups-edit-form input{outline:medium none;padding:3px 8px}#bp-groups-edit-form input#bp-groups-name{font-size:1.7em;width:100%}#bp-groups-edit-form input#bp-groups-new-members{width:100%;max-width:90%;border:0}.bp-groups-settings-section{margin-bottom:15px}.bp-groups-member-type{position:relative;padding-bottom:1.7em}.bp-groups-member-type>h4{margin-bottom:.5em}ul.bp-group-delete-list{list-style-type:disc;margin:4px 26px}.bp-group-admin-pagination{position:absolute;text-align:right;width:100%}.bp-group-admin-pagination.table-top{top:0}.bp-group-admin-pagination.table-bottom{bottom:0}.bp-group-admin-pagination-viewing{font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;color:#777;font-size:12px;font-style:italic}.bp-group-admin-pagination-links{white-space:nowrap;padding-left:15px}
- No newline at end of file
+body.toplevel_page_bp-groups table.groups th#members,body.toplevel_page_bp-groups table.groups th#status{width:10%}body.toplevel_page_bp-groups table.groups th#last_active{width:15%}#bp-groups-edit-form input{outline:medium none;padding:3px 8px}#bp-groups-edit-form input#bp-groups-name{font-size:1.7em;width:100%}#bp-groups-edit-form input#bp-groups-new-members{width:100%;max-width:90%;border:0}.bp-groups-settings-section{margin-bottom:15px}.bp-group-admin-paginated-list{position:relative;padding:1.7em 0}.bp-groups-member-type{padding-top:0}.bp-groups-member-type>h4{margin-bottom:.5em}ul.bp-group-delete-list{list-style-type:disc;margin:4px 26px}.bp-group-admin-pagination{position:absolute;text-align:right;width:100%}.bp-group-admin-pagination.table-top{top:0}.bp-group-admin-pagination.table-bottom{bottom:0}.bp-group-admin-pagination-viewing{font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;color:#777;font-size:12px;font-style:italic}.bp-group-admin-pagination-links{white-space:nowrap;padding-left:15px}
+ No newline at end of file

bp-groups/bp-groups-admin.php

@@ -126 +126 @@
                 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_invitations', _x( 'Manage Invitations', 'group admin edit screen', 'buddypress' ), 'bp_groups_admin_edit_metabox_invitations', get_current_screen()->id, 'normal', 'core' );
 
                 do_action( 'bp_groups_admin_meta_boxes' );
 
@@ -337 +338 @@
                         }
                 }
 
+                // Process invitation removals
+                if ( ! empty( $_POST['bp-groups-remove-invite'] ) ) {
+
+                        foreach ( (array) $_POST['bp-groups-remove-invite'] as $uninvited ) {
+
+                                // Remove the invitation
+                                $result = groups_delete_invite( (int) $uninvited, $group_id );
+                                
+                                // Store the success or failure
+                                if ( $result ) {
+                                        $success_removed_invite[] = $uninvited;
+                                } else {
+                                        $error_removed_invite[]   = $uninvited;
+                                }
+
+                        }
+                }
+
                 // Call actions for plugins to do something before we redirect
                 do_action( 'bp_group_admin_edit_after', $group_id );
 
@@ -370 +389 @@
                         $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 );
+                }
+
                 // Redirect
                 wp_redirect( apply_filters( 'bp_group_admin_edit_redirect', $redirect_to ) );
                 exit;
@@ -767 +796 @@
         // Loop through each member type
         foreach ( $members as $member_type => $type_users ) : ?>
 
-                <div class="bp-groups-member-type" id="bp-groups-member-type-<?php echo esc_attr( $member_type ) ?>">
+                <div class="bp-groups-member-type bp-group-admin-paginated-list" id="bp-groups-member-type-<?php echo esc_attr( $member_type ) ?>">
 
                         <h4>
                                 <?php switch ( $member_type ) :
@@ -859 +888 @@
 }
 
 /**
+ * Renders the Invitations metabox on single group pages.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @param BP_Groups_Group $item The BP_Groups_Group object for the current
+ *        group.
+ */
+function bp_groups_admin_edit_metabox_invitations( $item ) {
+        global $members_template;
+
+        $current_inv_page = isset( $_GET[ 'invitations_page' ] ) ? absint( $_GET[ 'invitations_page' ] ) : 1;
+        $per_page = 10;
+
+        //Get invitations
+        $invitations = BP_Groups_Member::get_group_invites( $item->id, $per_page, $current_inv_page );
+        $total_invites = (int) $invitations['total'];
+
+        $pagination[ 'invitations' ] = bp_groups_admin_create_invitation_pagination_links( $current_inv_page, $per_page, $total_invites );
+        ?>      
+        <div id="bp-group-invitations-list" class="bp-group-admin-paginated-list">
+                
+                <div class="bp-group-admin-pagination table-top">
+                        <?php echo $pagination[ 'invitations' ] ?>
+                </div>
+
+                
+        <?php if ( !empty( $invitations['invitees'] ) ) : ?>
+
+                <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', 'User_id of group invitation sender in group admin', 'buddypress' ) ?></th>
+                                <th scope="col" class="remove-invitation-column"><?php _ex( 'Remove Invitation', 'Remove invitation in group admin', 'buddypress' ) ?></th>
+                        </tr>
+                        </thead>
+
+                        <tbody>
+
+                        <?php foreach ( $invitations['invitees'] as $invitee ) : ?>
+                                <tr>
+                                        <th scope="row" class="uid-column"><?php echo esc_html( $invitee->user_id ); ?></th>
+
+                                        <td class="uname-column">
+                                                <a style="float: left;" href="<?php echo bp_core_get_user_domain( $invitee->user_id ); ?>"><?php echo bp_core_fetch_avatar( array(
+                                                        'item_id' => $invitee->user_id,
+                                                        'width'   => '32',
+                                                        'height'  => '32'
+                                                ) ); ?></a>
+
+                                                <span style="margin: 8px; float: left;"><?php echo bp_core_get_userlink( $invitee->user_id ) ?></span>
+                                        </td>
+
+                                        <td class="inviter-name-column">
+                                                <span style="margin: 8px; float: left;"><?php echo bp_core_get_userlink( $invitee->inviter_id ) ?></span>
+                                        </td>
+                                        <td class="inviter-name-column">
+                                                <label style="margin: 8px; float: left;"><input type="checkbox" name="bp-groups-remove-invite[<?php echo esc_html( $invitee->user_id ); ?>]" value="<?php echo esc_html( $invitee->user_id ); ?>">Remove</label>
+                                        </td>
+                                </tr>
+
+                        <?php endforeach; ?>
+
+                        </tbody>
+                </table>
+
+                <div class="bp-group-admin-pagination table-bottom">
+                        <?php echo $pagination[ 'invitations' ] ?>
+                </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
+}
+
+/**
  * Renders the Status metabox for the Groups admin edit screen.
  *
  * @since BuddyPress (1.7.0)
@@ -945 +1057 @@
 
         return $pagination;
 }
+/**
+ * Create pagination links for invitations.
+ *
+ * This function is intended to create pagination links for use under the
+ * Manage Invitations 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.0.0)
+ *
+ * @return string Pagination links HTML.
+ */
+function bp_groups_admin_create_invitation_pagination_links( $page, $per_page, $total_invites ) {
+        $pagination = '';
+
+        // The key used to paginate this member type in the $_GET global
+        $qs_key = 'invitations_page';
+        $url_base = remove_query_arg( array( $qs_key, 'updated', 'success_modified' ), $_SERVER['REQUEST_URI'] );
+
+        
+        // Don't show anything if there's no pagination
+        if ( 1 === $page && $total_invites<= $per_page ) {
+                return $pagination;
+        }
+
+        $current_page_start = ( ( $page - 1 ) * $per_page ) + 1;
+        $current_page_end   = $page * $per_page > intval( $total_invites ) ? $total_invites : $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( $total_invites / $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', $total_invites, 'buddypress' ), $total_invites )
+        );
+
+        $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.

bp-groups/bp-groups-classes.php

@@ -2168 +2168 @@
                         return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id AND m.user_id = %d AND m.is_confirmed = 1 AND m.is_banned = 0", $user_id ) );
                 }
         }
+        /**
+         * Get a group's outstanding group invitations.
+         *
+         * @param int $group_id ID of the group.
+         * @param int $limit Optional. Max number of results to return.
+         *        Default: false (no limit).
+         * @param int $page Optional. Page offset of results to return.
+         *        Default: false (no limit).
+         * @return array {
+         *     @type array $invitees Array of users returned by paginated query.
+         *     @type int $total Count of users matching query.
+         * }
+         */
+        public static function get_group_invites( $group_id, $limit = false, $page = false ) {
+                global $wpdb, $bp;
+
+                $pag_sql = ( !empty( $limit ) && !empty( $page ) ) ? $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) ) : '';
+
+                // Outstanding invitations can be identified by checking for is_confirmed = 0 AND inviter_id != 0 AND invite_sent = 1
+                // Outstanding membership requests have is_confirmed = 0 AND inviter_id = 0 AND invite_sent = 0
+                
+                $paged_invitees = $wpdb->get_results( $wpdb->prepare( "SELECT m.*, i1.ID as invitee_id_check, i1.display_name as invitee_display_name, i2.ID as inviter_id_check, i2.display_name as inviter_display_name FROM {$bp->groups->table_name_members} m, {$wpdb->users} i1, {$wpdb->users} i2 WHERE m.user_id = i1.ID AND m.inviter_id = i2.ID AND m.is_confirmed = 0 AND m.inviter_id != 0 AND m.invite_sent = 1 AND m.group_id = %d ORDER BY m.date_modified ASC {$pag_sql}", $group_id ) );
+                $total_invitees = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT m.user_id) FROM {$bp->groups->table_name_members} m WHERE m.is_confirmed = 0 AND m.inviter_id != 0 AND m.invite_sent = 1 AND m.group_id = %d {$exclude_sql} ORDER BY date_modified ASC", $group_id ) );
+
+                return array( 'invitees' => $paged_invitees, 'total' => $total_invitees );
+        }
 
         /**
          * Get a user's outstanding group invitations.