Ticket #5440: 5440.01.patch

bp-groups/bp-groups-classes.php

@@ -1454 +1454 @@
  *   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
+ * - *Membership requests* are entries with is_confirmed = 0 and
+ *   inviter_id = 0 (and invite_sent = 0)
  *
  * @since BuddyPress (1.8.0)
  */
@@ -1709 +1711 @@
                 global $wpdb;
 
                 $bp     = buddypress();
-                $extras = $wpdb->get_results( $wpdb->prepare( "SELECT user_id, date_modified, is_banned FROM {$bp->groups->table_name_members} WHERE user_id IN ({$user_ids_sql}) AND group_id = %d", $this->query_vars['group_id'] ) );
+                $extras = $wpdb->get_results( $wpdb->prepare( "SELECT id, user_id, date_modified, is_banned FROM {$bp->groups->table_name_members} WHERE user_id IN ({$user_ids_sql}) AND group_id = %d", $this->query_vars['group_id'] ) );
 
                 foreach ( (array) $extras as $extra ) {
                         if ( isset( $this->results[ $extra->user_id ] ) ) {
@@ -1717 +1719 @@
                                 $this->results[ $extra->user_id ]->user_id       = (int) $extra->user_id;
                                 $this->results[ $extra->user_id ]->is_banned     = (int) $extra->is_banned;
                                 $this->results[ $extra->user_id ]->date_modified = $extra->date_modified;
+                                $this->results[ $extra->user_id ]->groups_members_table_id       = (int) $extra->id;
                         }
                 }
 

bp-groups/bp-groups-template.php

@@ -2919 +2919 @@
         var $pag_links;
         var $total_request_count;
 
-        function __construct( $group_id, $per_page, $max ) {
-
-                $this->pag_page = isset( $_REQUEST['mrpage'] ) ? intval( $_REQUEST['mrpage'] ) : 1;
-                $this->pag_num  = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
-                $this->requests = BP_Groups_Group::get_membership_requests( $group_id, $this->pag_num, $this->pag_page );
+        function __construct( $args = array() ) {
 
-                if ( !$max || $max >= (int) $this->requests['total'] )
-                        $this->total_request_count = (int) $this->requests['total'];
-                else
-                        $this->total_request_count = (int) $max;
+                // 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__ ) );
 
-                $this->requests = $this->requests['requests'];
+                        $old_args_keys = array(
+                                0  => 'group_id',
+                                1  => 'per_page',
+                                2  => 'max'
+                        );
 
-                if ( $max ) {
-                        if ( $max >= count($this->requests) )
-                                $this->request_count = count($this->requests);
-                        else
-                                $this->request_count = (int) $max;
-                } else {
-                        $this->request_count = count($this->requests);
+                        $func_args = func_get_args();
+                        $args      = bp_core_parse_args_array( $old_args_keys, $func_args );
                 }
 
+                $r = wp_parse_args( $args, array(
+                        'group_id' => bp_get_current_group_id(),
+                        'per_page' => 10,
+                        'page'     => 1,
+                ) );
+
+                $this->pag_num  = isset( $_REQUEST['mrnum'] ) ? intval( $_REQUEST['mrnum'] ) : $r['per_page'];
+                $this->pag_page = isset( $_REQUEST['mrpage'] ) ? intval( $_REQUEST['mrpage'] ) : $r['page'];
+
+                // $this->requests = BP_Groups_Group::get_membership_requests( $group_id, $this->pag_num, $this->pag_page );
+                $mrquery = 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'   => 0,
+                ) );
+
+                $this->total_request_count = $mrquery->total_users;
+                $this->requests           = array_values( $mrquery->results );
+                $this->request_count       = count( $this->requests );
+
+                //Can we accommodate 'max' arguments using BP_Group_Member_Query? Is it necessary? I'm not sure it's really doing anything.
+                // if ( !$max || $max >= (int) $this->requests['total'] )
+                //      $this->total_request_count = (int) $this->requests['total'];
+                // else
+                //      $this->total_request_count = (int) $max;
+
+                // $this->requests = $this->requests['requests'];
+
+                // if ( $max ) {
+                //      if ( $max >= count($this->requests) )
+                //              $this->request_count = count($this->requests);
+                //      else
+                //              $this->request_count = (int) $max;
+                // } else {
+                //      $this->request_count = count($this->requests);
+                // }
+
                 $this->pag_links = paginate_links( array(
                         'base' => add_query_arg( 'mrpage', '%#%' ),
                         'format' => '',
@@ -2987 +3023 @@
         }
 
         function the_request() {
+                global $group_id;
+
                 $this->in_the_loop = true;
                 $this->request     = $this->next_request();
 
@@ -2996 +3034 @@
 }
 
 function bp_group_has_membership_requests( $args = '' ) {
-        global $requests_template, $groups_template;
+        global $requests_template, $group_id;
+        $bp = buddypress();
 
         $defaults = array(
-                'group_id' => $groups_template->group->id,
+                'group_id' => false,
+                'page'     => 1,
                 'per_page' => 10,
                 'max'      => false
         );
 
         $r = wp_parse_args( $args, $defaults );
-        extract( $r, EXTR_SKIP );
 
-        $requests_template = new BP_Groups_Membership_Requests_Template( $group_id, $per_page, $max );
+        if ( !$r['group_id'] ) {
+                // Backwards compatibility
+                if ( !empty( $bp->groups->current_group ) )
+                        $r['group_id'] = $bp->groups->current_group->id;
+
+                if ( !empty( $bp->groups->new_group_id ) )
+                        $r['group_id'] = $bp->groups->new_group_id;
+        }
+
+        if ( !$r['group_id'] )
+                return false;
+
+        $group_id = $r['group_id']; // globaled for later use
+
+        $requests_template = new BP_Groups_Membership_Requests_Template( $r );
         return apply_filters( 'bp_group_has_membership_requests', $requests_template->has_requests(), $requests_template );
 }
 
@@ -3033 +3086 @@
         echo bp_get_group_request_reject_link();
 }
         function bp_get_group_request_reject_link() {
-                global $requests_template, $groups_template;
+                global $requests_template, $group_id;
 
-                return apply_filters( 'bp_get_group_request_reject_link', wp_nonce_url( bp_get_group_permalink( $groups_template->group ) . 'admin/membership-requests/reject/' . $requests_template->request->id, 'groups_reject_membership_request' ) );
+                $group_object = groups_get_group( array( 'group_id' => $group_id ) );
+
+                return apply_filters( 'bp_get_group_request_reject_link', wp_nonce_url( bp_get_group_permalink( $group_object ) . 'admin/membership-requests/reject/' . $requests_template->request->groups_members_table_id, 'groups_reject_membership_request' ) );
         }
 
 function bp_group_request_accept_link() {
         echo bp_get_group_request_accept_link();
 }
         function bp_get_group_request_accept_link() {
-                global $requests_template, $groups_template;
+                global $requests_template, $group_id;
+
+                $group_object = groups_get_group( array( 'group_id' => $group_id ) );
 
-                return apply_filters( 'bp_get_group_request_accept_link', wp_nonce_url( bp_get_group_permalink( $groups_template->group ) . 'admin/membership-requests/accept/' . $requests_template->request->id, 'groups_accept_membership_request' ) );
+                return apply_filters( 'bp_get_group_request_accept_link', wp_nonce_url( bp_get_group_permalink( $group_object ) . 'admin/membership-requests/accept/' . $requests_template->request->groups_members_table_id, 'groups_accept_membership_request' ) );
         }
 
 function bp_group_request_user_link() {
@@ -3068 +3125 @@
         echo apply_filters( 'bp_group_request_comment', strip_tags( stripslashes( $requests_template->request->comments ) ) );
 }
 
+/**
+ * Output pagination links for group membership requests.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+function bp_group_mem_requests_pagination_links() {
+        echo bp_get_group_mem_requests_pagination_links();
+}
+        /**
+         * Get pagination links for group membership requests.
+         *
+         * @since BuddyPress (2.0.0)
+         */
+        function bp_get_group_mem_requests_pagination_links() {
+                global $requests_template;
+                return apply_filters( 'bp_get_group_mem_requests_pagination_links', $requests_template->pag_links );
+        }
+
+/**
+ * Output pagination count text for group membership requests.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+function bp_group_mem_requests_pagination_count() {
+        echo bp_get_group_mem_requests_pagination_count();
+}
+        /**
+         * Get pagination count text for group membership requests.
+         *
+         * @since BuddyPress (2.0.0)
+         */
+        function bp_get_group_mem_requests_pagination_count() {
+                global $requests_template;
+
+                $start_num = intval( ( $requests_template->pag_page - 1 ) * $requests_template->pag_num ) + 1;
+                $from_num  = bp_core_number_format( $start_num );
+                $to_num    = bp_core_number_format( ( $start_num + ( $requests_template->pag_num - 1 ) > $requests_template->total_request_count ) ? $requests_template->total_request_count : $start_num + ( $requests_template->pag_num - 1 ) );
+                $total     = bp_core_number_format( $requests_template->total_request_count );
+
+                return apply_filters( 'bp_get_groups_pagination_count', sprintf( _n( 'Viewing requests %1$s to %2$s (of %3$s request)', 'Viewing request %1$s to %2$s (of %3$s requests)', $total, 'buddypress' ), $from_num, $to_num, $total ), $from_num, $to_num, $total );
+        }
+
 /************************************************************************************
  * Invite Friends Template Tags
  **/

bp-templates/bp-legacy/buddypress-functions.php

@@ -134 +134 @@
                 $actions = array(
 
                         // Directory filters
-                        'blogs_filter'    => 'bp_legacy_theme_object_template_loader',
-                        'forums_filter'   => 'bp_legacy_theme_object_template_loader',
-                        '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',
+                        'blogs_filter'                                  => 'bp_legacy_theme_object_template_loader',
+                        'forums_filter'                                 => 'bp_legacy_theme_object_template_loader',
+                        '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',
+                        'membership_requests_filter'    => 'bp_legacy_theme_membership_requests_template_loader',
 
                         // Friends
                         'accept_friendship' => 'bp_legacy_theme_ajax_accept_friendship',
@@ -612 +613 @@
 }
 
 /**
+ * Load group membership requests loop to handle pagination requests sent via AJAX.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+function bp_legacy_theme_membership_requests_template_loader() {
+        bp_get_template_part( 'groups/single/admin-requests-loop' );
+        exit();
+}
+
+/**
  * Load the activity loop template when activity is requested via AJAX,
  *
  * @return string JSON object containing 'contents' (output of the template loop

new file p-templates/bp-legacy/buddypress/groups/single/admin-requests-loop.php

@@ +1 @@
+<?php if ( bp_group_has_membership_requests( bp_ajax_querystring( 'membership_requests' ) ) ) : ?>
+
+        <div id="pag-top" class="pagination">
+
+                <div class="pag-count" id="group-mem-requests-count-top">
+
+                        <?php bp_group_mem_requests_pagination_count(); ?>
+
+                </div>
+
+                <div class="pagination-links" id="group-mem-requests-pag-top">
+
+                        <?php bp_group_mem_requests_pagination_links(); ?>
+
+                </div>
+
+        </div>
+
+        <ul id="request-list" class="item-list">
+                <?php while ( bp_group_membership_requests() ) : bp_group_the_membership_request(); ?>
+
+                        <li>
+                                <?php bp_group_request_user_avatar_thumb(); ?>
+                                <h4><?php bp_group_request_user_link(); ?> <span class="comments"><?php bp_group_request_comment(); ?></span></h4>
+                                <span class="activity"><?php bp_group_request_time_since_requested(); ?></span>
+
+                                <?php do_action( 'bp_group_membership_requests_admin_item' ); ?>
+
+                                <div class="action">
+
+                                        <?php bp_button( array( 'id' => 'group_membership_accept', 'component' => 'groups', 'wrapper_class' => 'accept', 'link_href' => bp_get_group_request_accept_link(), 'link_title' => __( 'Accept', 'buddypress' ), 'link_text' => __( 'Accept', 'buddypress' ) ) ); ?>
+
+                                        <?php bp_button( array( 'id' => 'group_membership_reject', 'component' => 'groups', 'wrapper_class' => 'reject', 'link_href' => bp_get_group_request_reject_link(), 'link_title' => __( 'Reject', 'buddypress' ), 'link_text' => __( 'Reject', 'buddypress' ) ) ); ?>
+
+                                        <?php do_action( 'bp_group_membership_requests_admin_item_action' ); ?>
+
+                                </div>
+                        </li>
+
+                <?php endwhile; ?>
+        </ul>
+
+        <div id="pag-bottom" class="pagination">
+
+                <div class="pag-count" id="group-mem-requests-count-bottom">
+
+                        <?php bp_group_mem_requests_pagination_count(); ?>
+
+                </div>
+
+                <div class="pagination-links" id="group-mem-requests-pag-bottom">
+
+                        <?php bp_group_mem_requests_pagination_links(); ?>
+
+                </div>
+
+        </div>
+
+        <?php else: ?>
+
+                <div id="message" class="info">
+                        <p><?php _e( 'There are no pending membership requests.', 'buddypress' ); ?></p>
+                </div>
+
+        <?php endif; ?>
+ No newline at end of file

bp-templates/bp-legacy/buddypress/groups/single/admin.php

@@ -303 +303 @@
 
         <?php do_action( 'bp_before_group_membership_requests_admin' ); ?>
 
-        <?php if ( bp_group_has_membership_requests() ) : ?>
+                <div class="membership_requests">
 
-                <ul id="request-list" class="item-list">
-                        <?php while ( bp_group_membership_requests() ) : bp_group_the_membership_request(); ?>
+                        <?php bp_get_template_part( 'groups/single/admin-requests-loop' ); ?>
 
-                                <li>
-                                        <?php bp_group_request_user_avatar_thumb(); ?>
-                                        <h4><?php bp_group_request_user_link(); ?> <span class="comments"><?php bp_group_request_comment(); ?></span></h4>
-                                        <span class="activity"><?php bp_group_request_time_since_requested(); ?></span>
-
-                                        <?php do_action( 'bp_group_membership_requests_admin_item' ); ?>
-
-                                        <div class="action">
-
-                                                <?php bp_button( array( 'id' => 'group_membership_accept', 'component' => 'groups', 'wrapper_class' => 'accept', 'link_href' => bp_get_group_request_accept_link(), 'link_title' => __( 'Accept', 'buddypress' ), 'link_text' => __( 'Accept', 'buddypress' ) ) ); ?>
-
-                                                <?php bp_button( array( 'id' => 'group_membership_reject', 'component' => 'groups', 'wrapper_class' => 'reject', 'link_href' => bp_get_group_request_reject_link(), 'link_title' => __( 'Reject', 'buddypress' ), 'link_text' => __( 'Reject', 'buddypress' ) ) ); ?>
-
-                                                <?php do_action( 'bp_group_membership_requests_admin_item_action' ); ?>
-
-                                        </div>
-                                </li>
-
-                        <?php endwhile; ?>
-                </ul>
-
-        <?php else: ?>
-
-                <div id="message" class="info">
-                        <p><?php _e( 'There are no pending membership requests.', 'buddypress' ); ?></p>
                 </div>
 
-        <?php endif; ?>
-
         <?php do_action( 'bp_after_group_membership_requests_admin' ); ?>
 
 <?php endif; ?>

bp-templates/bp-legacy/js/buddypress.js

@@ -853 +853 @@
                                 template = 'groups/single/members';
                         }
 
+                        // On the Admin > Requests page, we need to reset the object, since "admin" isn't helpful
+                        if ( 'admin' == object && jq('body').hasClass('membership-requests') ) {
+                                object = 'membership_requests';
+                        }
+
                         if ( pagination_id.indexOf( 'pag-bottom' ) !== -1 ) {
                                 var caller = 'pag-bottom';
                         } else {