Changeset 10521

Timestamp:

02/05/2016 05:15:55 AM (9 years ago)

Author:

boonebgorges

Message:

Move bp-members classes to their own files.

See #6870.

Location:

trunk/src/bp-members

Files:

• admin/bp-members-admin-classes.php (modified) (1 diff)
• bp-members-admin.php (modified) (1 diff)
• bp-members-loader.php (modified) (1 diff)
• bp-members-screens.php (modified) (2 diffs)
• bp-members-template.php (modified) (2 diffs)
• bp-members-widgets.php (modified) (2 diffs)
• classes/class-bp-core-members-template.php (copied) (copied from trunk/src/bp-members/bp-members-template.php) (2 diffs)
• classes/class-bp-core-members-widget.php (copied) (copied from trunk/src/bp-members/bp-members-widgets.php) (2 diffs)
• classes/class-bp-core-recently-active-widget.php (copied) (copied from trunk/src/bp-members/bp-members-widgets.php) (2 diffs)
• classes/class-bp-core-whos-online-widget.php (copied) (copied from trunk/src/bp-members/bp-members-widgets.php) (2 diffs)
• classes/class-bp-members-admin.php (copied) (copied from trunk/src/bp-members/bp-members-admin.php) (2 diffs)
• classes/class-bp-members-component.php (copied) (copied from trunk/src/bp-members/bp-members-loader.php) (1 diff)
• classes/class-bp-members-list-table.php (copied) (copied from trunk/src/bp-members/admin/bp-members-admin-classes.php) (3 diffs)
• classes/class-bp-members-ms-list-table.php (copied) (copied from trunk/src/bp-members/admin/bp-members-admin-classes.php) (3 diffs)
• classes/class-bp-members-theme-compat.php (copied) (copied from trunk/src/bp-members/bp-members-screens.php) (2 diffs)
• classes/class-bp-registration-theme-compat.php (copied) (copied from trunk/src/bp-members/bp-members-screens.php) (2 diffs)

trunk/src/bp-members/admin/bp-members-admin-classes.php

@@ -11 +11 @@
 defined( 'ABSPATH' ) || exit;
 
-if ( class_exists( 'WP_Users_List_Table') ) :
-
-/**
- * List table class for signups admin page.
- *
- * @since 2.0.0
- */
-class BP_Members_List_Table extends WP_Users_List_Table {
-
-    /**
-     * Signup counts.
-     *
-     * @since 2.0.0
-     *
-     * @var int
-     */
-    public $signup_counts = 0;
-
-    /**
-     * Constructor.
-     *
-     * @since 2.0.0
-     */
-    public function __construct() {
-        // Define singular and plural labels, as well as whether we support AJAX.
-        parent::__construct( array(
-            'ajax'     => false,
-            'plural'   => 'signups',
-            'singular' => 'signup',
-        ) );
-    }
-
-    /**
-     * Set up items for display in the list table.
-     *
-     * Handles filtering of data, sorting, pagination, and any other data
-     * manipulation required prior to rendering.
-     *
-     * @since 2.0.0
-     */
-    public function prepare_items() {
-        global $usersearch;
-
-        $usersearch       = isset( $_REQUEST['s'] ) ? $_REQUEST['s'] : '';
-        $signups_per_page = $this->get_items_per_page( str_replace( '-', '_', "{$this->screen->id}_per_page" ) );
-        $paged            = $this->get_pagenum();
-
-        $args = array(
-            'offset'     => ( $paged - 1 ) * $signups_per_page,
-            'number'     => $signups_per_page,
-            'usersearch' => $usersearch,
-            'orderby'    => 'signup_id',
-            'order'      => 'DESC'
-        );
-
-        if ( isset( $_REQUEST['orderby'] ) ) {
-            $args['orderby'] = $_REQUEST['orderby'];
-        }
-
-        if ( isset( $_REQUEST['order'] ) ) {
-            $args['order'] = $_REQUEST['order'];
-        }
-
-        $signups = BP_Signup::get( $args );
-
-        $this->items = $signups['signups'];
-        $this->signup_counts = $signups['total'];
-
-        $this->set_pagination_args( array(
-            'total_items' => $this->signup_counts,
-            'per_page'    => $signups_per_page,
-        ) );
-    }
-
-    /**
-     * Get the views (the links above the WP List Table).
-     *
-     * @since 2.0.0
-     *
-     * @uses WP_Users_List_Table::get_views() to get the users views.
-     */
-    public function get_views() {
-        $views = parent::get_views();
-
-        // Remove the 'current' class from the 'All' link.
-        $views['all']        = str_replace( 'class="current"', '', $views['all'] );
-        $views['registered'] = sprintf( '<a href="%1$s" class="current">%2$s</a>', esc_url( add_query_arg( 'page', 'bp-signups', bp_get_admin_url( 'users.php' ) ) ), sprintf( _x( 'Pending %s', 'signup users', 'buddypress' ), '<span class="count">(' . number_format_i18n( $this->signup_counts ) . ')</span>' ) );
-
-        return $views;
-    }
-
-    /**
-     * Get rid of the extra nav.
-     *
-     * WP_Users_List_Table will add an extra nav to change user's role.
-     * As we're dealing with signups, we don't need this.
-     *
-     * @since 2.0.0
-     *
-     * @param array $which Current table nav item.
-     */
-    public function extra_tablenav( $which ) {
-        return;
-    }
-
-    /**
-     * Specific signups columns.
-     *
-     * @since 2.0.0
-     *
-     * @return array
-     */
-    public function get_columns() {
-
-        /**
-         * Filters the single site Members signup columns.
-         *
-         * @since 2.0.0
-         *
-         * @param array $value Array of columns to display.
-         */
-        return apply_filters( 'bp_members_signup_columns', array(
-            'cb'         => '<input type="checkbox" />',
-            'username'   => __( 'Username',    'buddypress' ),
-            'name'       => __( 'Name',        'buddypress' ),
-            'email'      => __( 'Email',       'buddypress' ),
-            'registered' => __( 'Registered',  'buddypress' ),
-            'date_sent'  => __( 'Last Sent',   'buddypress' ),
-            'count_sent' => __( 'Emails Sent', 'buddypress' )
-        ) );
-    }
-
-    /**
-     * Specific bulk actions for signups.
-     *
-     * @since 2.0.0
-     */
-    public function get_bulk_actions() {
-        $actions = array(
-            'activate' => _x( 'Activate', 'Pending signup action', 'buddypress' ),
-            'resend'   => _x( 'Email',    'Pending signup action', 'buddypress' ),
-        );
-
-        if ( current_user_can( 'delete_users' ) ) {
-            $actions['delete'] = __( 'Delete', 'buddypress' );
-        }
-
-        return $actions;
-    }
-
-    /**
-     * The text shown when no items are found.
-     *
-     * Nice job, clean sheet!
-     *
-     * @since 2.0.0
-     */
-    public function no_items() {
-
-        if ( bp_get_signup_allowed() ) {
-            esc_html_e( 'No pending accounts found.', 'buddypress' );
-        } else {
-            $link = false;
-
-            // Specific case when BuddyPress is not network activated.
-            if ( is_multisite() && current_user_can( 'manage_network_users') ) {
-                $link = sprintf( '<a href="%1$s">%2$s</a>', esc_url( network_admin_url( 'settings.php'       ) ), esc_html__( 'Edit settings', 'buddypress' ) );
-            } elseif ( current_user_can( 'manage_options' ) ) {
-                $link = sprintf( '<a href="%1$s">%2$s</a>', esc_url( bp_get_admin_url( 'options-general.php' ) ), esc_html__( 'Edit settings', 'buddypress' ) );
-            }
-
-            printf( __( 'Registration is disabled. %s', 'buddypress' ), $link );
-        }
-
-    }
-
-    /**
-     * The columns signups can be reordered with.
-     *
-     * @since 2.0.0
-     */
-    public function get_sortable_columns() {
-        return array(
-            'username'   => 'login',
-            'email'      => 'email',
-            'registered' => 'signup_id',
-        );
-    }
-
-    /**
-     * Display signups rows.
-     *
-     * @since 2.0.0
-     */
-    public function display_rows() {
-        $style = '';
-        foreach ( $this->items as $userid => $signup_object ) {
-
-            // Avoid a notice error appearing since 4.3.0.
-            if ( isset( $signup_object->id ) ) {
-                $signup_object->ID = $signup_object->id;
-            }
-
-            $style = ( ' class="alternate"' == $style ) ? '' : ' class="alternate"';
-            echo "\n\t" . $this->single_row( $signup_object, $style );
-        }
-    }
-
-    /**
-     * Display a signup row.
-     *
-     * @since 2.0.0
-     *
-     * @see WP_List_Table::single_row() for explanation of params.
-     *
-     * @param object|null $signup_object Signup user object.
-     * @param string      $style         Styles for the row.
-     * @param string      $role          Role to be assigned to user.
-     * @param int         $numposts      Numper of posts.
-     * @return void
-     */
-    public function single_row( $signup_object = null, $style = '', $role = '', $numposts = 0 ) {
-        echo '<tr' . $style . ' id="signup-' . esc_attr( $signup_object->id ) . '">';
-        echo $this->single_row_columns( $signup_object );
-        echo '</tr>';
-    }
-
-    /**
-     * Markup for the checkbox used to select items for bulk actions.
-     *
-     * @since 2.0.0
-     *
-     * @param object|null $signup_object The signup data object.
-     */
-    public function column_cb( $signup_object = null ) {
-    ?>
-        <label class="screen-reader-text" for="signup_<?php echo intval( $signup_object->id ); ?>"><?php printf( esc_html__( 'Select user: %s', 'buddypress' ), $signup_object->user_login ); ?></label>
-        <input type="checkbox" id="signup_<?php echo intval( $signup_object->id ) ?>" name="allsignups[]" value="<?php echo esc_attr( $signup_object->id ) ?>" />
-        <?php
-    }
-
-    /**
-     * The row actions (delete/activate/email).
-     *
-     * @since 2.0.0
-     *
-     * @param object|null $signup_object The signup data object.
-     */
-    public function column_username( $signup_object = null ) {
-        $avatar = get_avatar( $signup_object->user_email, 32 );
-
-        // Activation email link.
-        $email_link = add_query_arg(
-            array(
-                'page'      => 'bp-signups',
-                'signup_id' => $signup_object->id,
-                'action'    => 'resend',
-            ),
-            bp_get_admin_url( 'users.php' )
-        );
-
-        // Activate link.
-        $activate_link = add_query_arg(
-            array(
-                'page'      => 'bp-signups',
-                'signup_id' => $signup_object->id,
-                'action'    => 'activate',
-            ),
-            bp_get_admin_url( 'users.php' )
-        );
-
-        // Delete link.
-        $delete_link = add_query_arg(
-            array(
-                'page'      => 'bp-signups',
-                'signup_id' => $signup_object->id,
-                'action'    => 'delete',
-            ),
-            bp_get_admin_url( 'users.php' )
-        );
-
-        echo $avatar . sprintf( '<strong><a href="%1$s" class="edit" title="%2$s">%3$s</a></strong><br/>', esc_url( $activate_link ), esc_attr__( 'Activate', 'buddypress' ), $signup_object->user_login );
-
-        $actions = array();
-
-        $actions['activate'] = sprintf( '<a href="%1$s">%2$s</a>', esc_url( $activate_link ), __( 'Activate', 'buddypress' ) );
-        $actions['resend']   = sprintf( '<a href="%1$s">%2$s</a>', esc_url( $email_link ), __( 'Email', 'buddypress' ) );
-
-        if ( current_user_can( 'delete_users' ) ) {
-            $actions['delete'] = sprintf( '<a href="%1$s" class="delete">%2$s</a>', esc_url( $delete_link ), __( 'Delete', 'buddypress' ) );
-        }
-
-        /**
-         * Filters the multisite row actions for each user in list.
-         *
-         * @since 2.0.0
-         *
-         * @param array  $actions       Array of actions and corresponding links.
-         * @param object $signup_object The signup data object.
-         */
-        $actions = apply_filters( 'bp_members_ms_signup_row_actions', $actions, $signup_object );
-
-        echo $this->row_actions( $actions );
-    }
-
-    /**
-     * Display user name, if any.
-     *
-     * @since 2.0.0
-     *
-     * @param object $signup_object The signup data object.
-     */
-    public function column_name( $signup_object = null ) {
-        echo esc_html( $signup_object->user_name );
-    }
-
-    /**
-     * Display user email.
-     *
-     * @since 2.0.0
-     *
-     * @param object|null $signup_object The signup data object.
-     */
-    public function column_email( $signup_object = null ) {
-        printf( '<a href="mailto:%1$s">%2$s</a>', esc_attr( $signup_object->user_email ), esc_html( $signup_object->user_email ) );
-    }
-
-    /**
-     * Display registration date.
-     *
-     * @since 2.0.0
-     *
-     * @param object|null $signup_object The signup data object.
-     */
-    public function column_registered( $signup_object = null ) {
-        echo mysql2date( 'Y/m/d', $signup_object->registered );
-    }
-
-    /**
-     * Display the last time an activation email has been sent.
-     *
-     * @since 2.0.0
-     *
-     * @param object|null $signup_object The signup data object.
-     */
-    public function column_date_sent( $signup_object = null ) {
-        echo mysql2date( 'Y/m/d', $signup_object->date_sent );
-    }
-
-    /**
-     * Display number of time an activation email has been sent.
-     *
-     * @since 2.0.0
-     *
-     * @param object|null $signup_object Signup object instance.
-     */
-    public function column_count_sent( $signup_object = null ) {
-        echo absint( $signup_object->count_sent );
-    }
-
-    /**
-     * Allow plugins to add their custom column.
-     *
-     * @since 2.1.0
-     *
-     * @param object|null $signup_object The signup data object.
-     * @param string      $column_name   The column name.
-     * @return string
-     */
-    function column_default( $signup_object = null, $column_name = '' ) {
-
-        /**
-         * Filters the single site custom columns for plugins.
-         *
-         * @since 2.1.0
-         *
-         * @param string $column_name   The column name.
-         * @param object $signup_object The signup data object.
-         */
-        return apply_filters( 'bp_members_signup_custom_column', '', $column_name, $signup_object );
-    }
+if ( class_exists( 'WP_Users_List_Table' ) ) {
+    require dirname( dirname( __FILE__ ) ) . '/classes/class-bp-members-list-table.php';
 }
 
-endif;
-
-if ( class_exists( 'WP_MS_Users_List_Table' ) ) :
-
-/**
- * List table class for signups network admin page.
- *
- * @since 2.0.0
- */
-class BP_Members_MS_List_Table extends WP_MS_Users_List_Table {
-
-    /**
-     * Signup counts.
-     *
-     * @since 2.0.0
-     *
-     * @var int
-     */
-    public $signup_counts = 0;
-
-    /**
-     * Constructor.
-     *
-     * @since 2.0.0
-     */
-    public function __construct() {
-        // Define singular and plural labels, as well as whether we support AJAX.
-        parent::__construct( array(
-            'ajax'     => false,
-            'plural'   => 'signups',
-            'singular' => 'signup',
-        ) );
-    }
-
-    /**
-     * Set up items for display in the list table.
-     *
-     * Handles filtering of data, sorting, pagination, and any other data
-     * manipulation required prior to rendering.
-     *
-     * @since 2.0.0
-     */
-    public function prepare_items() {
-        global $usersearch, $mode;
-
-        $usersearch       = isset( $_REQUEST['s'] ) ? $_REQUEST['s'] : '';
-        $signups_per_page = $this->get_items_per_page( str_replace( '-', '_', "{$this->screen->id}_per_page" ) );
-        $paged            = $this->get_pagenum();
-
-        $args = array(
-            'offset'     => ( $paged - 1 ) * $signups_per_page,
-            'number'     => $signups_per_page,
-            'usersearch' => $usersearch,
-            'orderby'    => 'signup_id',
-            'order'      => 'DESC'
-        );
-
-        if ( isset( $_REQUEST['orderby'] ) ) {
-            $args['orderby'] = $_REQUEST['orderby'];
-        }
-
-        if ( isset( $_REQUEST['order'] ) ) {
-            $args['order'] = $_REQUEST['order'];
-        }
-
-        $mode    = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
-        $signups = BP_Signup::get( $args );
-
-        $this->items         = $signups['signups'];
-        $this->signup_counts = $signups['total'];
-
-        $this->set_pagination_args( array(
-            'total_items' => $this->signup_counts,
-            'per_page'    => $signups_per_page,
-        ) );
-    }
-
-    /**
-     * Get the views : the links above the WP List Table.
-     *
-     * @since 2.0.0
-     *
-     * @uses WP_MS_Users_List_Table::get_views() to get the users views.
-     */
-    public function get_views() {
-        $views = parent::get_views();
-
-        // Remove the 'current' class from the 'All' link.
-        $views['all']        = str_replace( 'class="current"', '', $views['all'] );
-        $views['registered'] = sprintf( '<a href="%1$s" class="current">%2$s</a>', esc_url( add_query_arg( 'page', 'bp-signups', network_admin_url( 'users.php' ) ) ), sprintf( _x( 'Pending %s', 'signup users', 'buddypress' ), '<span class="count">(' . number_format_i18n( $this->signup_counts ) . ')</span>' ) );
-
-        return $views;
-    }
-
-    /**
-     * Specific signups columns.
-     *
-     * @since 2.0.0
-     *
-     * @return array
-     */
-    public function get_columns() {
-
-        /**
-         * Filters the multisite Members signup columns.
-         *
-         * @since 2.0.0
-         *
-         * @param array $value Array of columns to display.
-         */
-        return apply_filters( 'bp_members_ms_signup_columns', array(
-            'cb'         => '<input type="checkbox" />',
-            'username'   => __( 'Username',    'buddypress' ),
-            'name'       => __( 'Name',        'buddypress' ),
-            'email'      => __( 'Email',       'buddypress' ),
-            'registered' => __( 'Registered',  'buddypress' ),
-            'date_sent'  => __( 'Last Sent',   'buddypress' ),
-            'count_sent' => __( 'Emails Sent', 'buddypress' )
-        ) );
-    }
-
-    /**
-     * Specific bulk actions for signups.
-     *
-     * @since 2.0.0
-     */
-    public function get_bulk_actions() {
-        $actions = array(
-            'activate' => _x( 'Activate', 'Pending signup action', 'buddypress' ),
-            'resend'   => _x( 'Email',    'Pending signup action', 'buddypress' ),
-        );
-
-        if ( current_user_can( 'delete_users' ) ) {
-            $actions['delete'] = __( 'Delete', 'buddypress' );
-        }
-
-        return $actions;
-    }
-
-    /**
-     * The text shown when no items are found.
-     *
-     * Nice job, clean sheet!
-     *
-     * @since 2.0.0
-     */
-    public function no_items() {
-        if ( bp_get_signup_allowed() ) {
-            esc_html_e( 'No pending accounts found.', 'buddypress' );
-        } else {
-            $link = false;
-
-            if ( current_user_can( 'manage_network_users' ) ) {
-                $link = sprintf( '<a href="%1$s">%2$s</a>', esc_url( network_admin_url( 'settings.php' ) ), esc_html__( 'Edit settings', 'buddypress' ) );
-            }
-
-            printf( __( 'Registration is disabled. %s', 'buddypress' ), $link );
-        }
-    }
-
-    /**
-     * The columns signups can be reordered with.
-     *
-     * @since 2.0.0
-     */
-    public function get_sortable_columns() {
-        return array(
-            'username'   => 'login',
-            'email'      => 'email',
-            'registered' => 'signup_id',
-        );
-    }
-
-    /**
-     * Display signups rows.
-     *
-     * @since 2.0.0
-     */
-    public function display_rows() {
-        $style = '';
-        foreach ( $this->items as $userid => $signup_object ) {
-
-            // Avoid a notice error appearing since 4.3.0.
-            if ( isset( $signup_object->id ) ) {
-                $signup_object->ID = $signup_object->id;
-            }
-
-            $style = ( ' class="alternate"' == $style ) ? '' : ' class="alternate"';
-            echo "\n\t" . $this->single_row( $signup_object, $style );
-        }
-    }
-
-    /**
-     * Display a signup row.
-     *
-     * @since 2.0.0
-     *
-     * @see WP_List_Table::single_row() for explanation of params.
-     *
-     * @param object|null $signup_object Signup user object.
-     * @param string      $style         Styles for the row.
-     */
-    public function single_row( $signup_object = null, $style = '' ) {
-        echo '<tr' . $style . ' id="signup-' . esc_attr( $signup_object->id ) . '">';
-        echo $this->single_row_columns( $signup_object );
-        echo '</tr>';
-    }
-
-    /**
-     * Prevents regular users row actions to be output.
-     *
-     * @since 2.4.0
-     *
-     * @param object|null $signup_object Signup being acted upon.
-     * @param string      $column_name   Current column name.
-     * @param string      $primary       Primary column name.
-     * @return string
-     */
-    protected function handle_row_actions( $signup_object = null, $column_name = '', $primary = '' ) {
-        return '';
-    }
-
-    /**
-     * Markup for the checkbox used to select items for bulk actions.
-     *
-     * @since 2.0.0
-     *
-     * @param object|null $signup_object The signup data object.
-     */
-    public function column_cb( $signup_object = null ) {
-    ?>
-        <label class="screen-reader-text" for="signup_<?php echo intval( $signup_object->id ); ?>"><?php printf( esc_html__( 'Select user: %s', 'buddypress' ), $signup_object->user_login ); ?></label>
-        <input type="checkbox" id="signup_<?php echo intval( $signup_object->id ) ?>" name="allsignups[]" value="<?php echo esc_attr( $signup_object->id ) ?>" />
-        <?php
-    }
-
-    /**
-     * The row actions (delete/activate/email).
-     *
-     * @since 2.0.0
-     *
-     * @param object|null $signup_object The signup data object.
-     */
-    public function column_username( $signup_object = null ) {
-        $avatar = get_avatar( $signup_object->user_email, 32 );
-
-        // Activation email link.
-        $email_link = add_query_arg(
-            array(
-                'page'      => 'bp-signups',
-                'signup_id' => $signup_object->id,
-                'action'    => 'resend',
-            ),
-            network_admin_url( 'users.php' )
-        );
-
-        // Activate link.
-        $activate_link = add_query_arg(
-            array(
-                'page'      => 'bp-signups',
-                'signup_id' => $signup_object->id,
-                'action'    => 'activate',
-            ),
-            network_admin_url( 'users.php' )
-        );
-
-        // Delete link.
-        $delete_link = add_query_arg(
-            array(
-                'page'      => 'bp-signups',
-                'signup_id' => $signup_object->id,
-                'action'    => 'delete',
-            ),
-            network_admin_url( 'users.php' )
-        );
-
-        echo $avatar . sprintf( '<strong><a href="%1$s" class="edit" title="%2$s">%3$s</a></strong><br/>', esc_url( $activate_link ), esc_attr__( 'Activate', 'buddypress' ), $signup_object->user_login );
-
-        $actions = array();
-
-        $actions['activate'] = sprintf( '<a href="%1$s">%2$s</a>', esc_url( $activate_link ), __( 'Activate', 'buddypress' ) );
-        $actions['resend']   = sprintf( '<a href="%1$s">%2$s</a>', esc_url( $email_link    ), __( 'Email',    'buddypress' ) );
-
-        if ( current_user_can( 'delete_users' ) ) {
-            $actions['delete'] = sprintf( '<a href="%1$s" class="delete">%2$s</a>', esc_url( $delete_link ), __( 'Delete', 'buddypress' ) );
-        }
-
-        /** This filter is documented in bp-members/admin/bp-members-classes.php */
-        $actions = apply_filters( 'bp_members_ms_signup_row_actions', $actions, $signup_object );
-
-        echo $this->row_actions( $actions );
-    }
-
-    /**
-     * Display user name, if any.
-     *
-     * @since 2.0.0
-     *
-     * @param object|null $signup_object The signup data object.
-     */
-    public function column_name( $signup_object = null ) {
-        echo esc_html( $signup_object->user_name );
-    }
-
-    /**
-     * Display user email.
-     *
-     * @since 2.0.0
-     *
-     * @param object|null $signup_object The signup data object.
-     */
-    public function column_email( $signup_object = null ) {
-        printf( '<a href="mailto:%1$s">%2$s</a>', esc_attr( $signup_object->user_email ), esc_html( $signup_object->user_email ) );
-    }
-
-    /**
-     * Display registration date.
-     *
-     * @since 2.0.0
-     *
-     * @param object|null $signup_object The signup data object.
-     */
-    public function column_registered( $signup_object = null ) {
-        global $mode;
-
-        if ( 'list' === $mode ) {
-            $date = 'Y/m/d';
-        } else {
-            $date = 'Y/m/d \<\b\r \/\> g:i:s a';
-        }
-
-        echo mysql2date( $date, $signup_object->registered ) . "</td>";
-    }
-
-    /**
-     * Display the last time an activation email has been sent.
-     *
-     * @since 2.0.0
-     *
-     * @param object|null $signup_object Signup object instance.
-     */
-    public function column_date_sent( $signup_object = null ) {
-        global $mode;
-
-        if ( 'list' === $mode ) {
-            $date = 'Y/m/d';
-        } else {
-            $date = 'Y/m/d \<\b\r \/\> g:i:s a';
-        }
-
-        echo mysql2date( $date, $signup_object->date_sent );
-    }
-
-    /**
-     * Display number of time an activation email has been sent.
-     *
-     * @since 2.0.0
-     *
-     * @param object|null $signup_object Signup object instance.
-     */
-    public function column_count_sent( $signup_object = null ) {
-        echo absint( $signup_object->count_sent );
-    }
-
-    /**
-     * Allow plugins to add their custom column.
-     *
-     * @since 2.1.0
-     *
-     * @param object|null $signup_object The signup data object.
-     * @param string      $column_name   The column name.
-     * @return string
-     */
-    function column_default( $signup_object = null, $column_name = '' ) {
-
-        /**
-         * Filters the multisite custom columns for plugins.
-         *
-         * @since 2.1.0
-         *
-         * @param string $column_name   The column name.
-         * @param object $signup_object The signup data object.
-         */
-        return apply_filters( 'bp_members_ms_signup_custom_column', '', $column_name, $signup_object );
-    }
+if ( class_exists( 'WP_MS_Users_List_Table' ) ) {
+    require dirname( dirname( __FILE__ ) ) . '/classes/class-bp-members-ms-list-table.php';
 }
-
-endif;

trunk/src/bp-members/bp-members-admin.php

@@ -11 +11 @@
 defined( 'ABSPATH' ) || exit;
 
-if ( !class_exists( 'BP_Members_Admin' ) ) :
-
-/**
- * Load Members admin area.
- *
- * @since 2.0.0
- */
-class BP_Members_Admin {
-
-    /** Directory *************************************************************/
-
-    /**
-     * Path to the BP Members Admin directory.
-     *
-     * @var string $admin_dir
-     */
-    public $admin_dir = '';
-
-    /** URLs ******************************************************************/
-
-    /**
-     * URL to the BP Members Admin directory.
-     *
-     * @var string $admin_url
-     */
-    public $admin_url = '';
-
-    /**
-     * URL to the BP Members Admin CSS directory.
-     *
-     * @var string $css_url
-     */
-    public $css_url = '';
-
-    /**
-     * URL to the BP Members Admin JS directory.
-     *
-     * @var string
-     */
-    public $js_url = '';
-
-    /** Other *****************************************************************/
-
-    /**
-     * Screen id for edit user's profile page.
-     *
-     * @var string
-     */
-    public $user_page = '';
-
-    /**
-     * Setup BP Members Admin.
-     *
-     * @since 2.0.0
-     *
-     * @uses buddypress() to get BuddyPress main instance.
-     */
-    public static function register_members_admin() {
-        if ( ! is_admin() ) {
-            return;
-        }
-
-        $bp = buddypress();
-
-        if ( empty( $bp->members->admin ) ) {
-            $bp->members->admin = new self;
-        }
-
-        return $bp->members->admin;
-    }
-
-    /**
-     * Constructor method.
-     *
-     * @since 2.0.0
-     */
-    public function __construct() {
-        $this->setup_globals();
-        $this->setup_actions();
-    }
-
-    /**
-     * Set admin-related globals.
-     *
-     * @since 2.0.0
-     */
-    private function setup_globals() {
-        $bp = buddypress();
-
-        // Paths and URLs
-        $this->admin_dir = trailingslashit( $bp->plugin_dir  . 'bp-members/admin' ); // Admin path.
-        $this->admin_url = trailingslashit( $bp->plugin_url  . 'bp-members/admin' ); // Admin URL.
-        $this->css_url   = trailingslashit( $this->admin_url . 'css' ); // Admin CSS URL.
-        $this->js_url    = trailingslashit( $this->admin_url . 'js'  ); // Admin CSS URL.
-
-        // Capability depends on config.
-        $this->capability = bp_core_do_network_admin() ? 'manage_network_users' : 'edit_users';
-
-        // The Edit Profile Screen id.
-        $this->user_page = '';
-
-        // The Show Profile Screen id.
-        $this->user_profile = is_network_admin() ? 'users' : 'profile';
-
-        // The current user id.
-        $this->current_user_id = get_current_user_id();
-
-        // The user id being edited.
-        $this->user_id = 0;
-
-        // Is a member editing their own profile.
-        $this->is_self_profile = false;
-
-        // The screen ids to load specific css for.
-        $this->screen_id = array();
-
-        // The stats metabox default position.
-        $this->stats_metabox = new StdClass();
-
-        // BuddyPress edit user's profile args.
-        $this->edit_profile_args = array( 'page' => 'bp-profile-edit' );
-        $this->edit_profile_url  = '';
-        $this->edit_url          = '';
-
-        // Data specific to signups.
-        $this->users_page   = '';
-        $this->signups_page = '';
-        $this->users_url    = bp_get_admin_url( 'users.php' );
-        $this->users_screen = bp_core_do_network_admin() ? 'users-network' : 'users';
-
-        // Specific config: BuddyPress is not network activated.
-        $this->subsite_activated = (bool) is_multisite() && ! bp_is_network_activated();
-
-        // When BuddyPress is not network activated, only Super Admin can moderate signups.
-        if ( ! empty( $this->subsite_activated ) ) {
-            $this->capability = 'manage_network_users';
-        }
-    }
-
-    /**
-     * Set admin-related actions and filters.
-     *
-     * @since 2.0.0
-     */
-    private function setup_actions() {
-
-        /** Extended Profile *************************************************
-         */
-
-        // Enqueue all admin JS and CSS.
-        add_action( 'bp_admin_enqueue_scripts', array( $this, 'enqueue_scripts'   )        );
-
-        // Add some page specific output to the <head>.
-        add_action( 'bp_admin_head',            array( $this, 'admin_head'        ), 999   );
-
-        // Add menu item to all users menu.
-        add_action( 'admin_menu',               array( $this, 'admin_menus'       ), 5     );
-        add_action( 'network_admin_menu',       array( $this, 'admin_menus'       ), 5     );
-        add_action( 'user_admin_menu',          array( $this, 'user_profile_menu' ), 5     );
-
-        // Create the Profile Navigation (Profile/Extended Profile).
-        add_action( 'edit_user_profile',        array( $this, 'profile_nav'       ), 99, 1 );
-        add_action( 'show_user_profile',        array( $this, 'profile_nav'       ), 99, 1 );
-
-        // Editing users of a specific site.
-        add_action( "admin_head-site-users.php", array( $this, 'profile_admin_head' ) );
-
-        // Add a row action to users listing.
-        if ( bp_core_do_network_admin() ) {
-            add_filter( 'ms_user_row_actions',        array( $this, 'row_actions'                    ), 10, 2 );
-            add_action( 'admin_init',                 array( $this, 'add_edit_profile_url_filter'    )        );
-            add_action( 'wp_after_admin_bar_render',  array( $this, 'remove_edit_profile_url_filter' )        );
-        }
-
-        // Add user row actions for single site.
-        add_filter( 'user_row_actions', array( $this, 'row_actions' ), 10, 2 );
-
-        // Process changes to member type.
-        add_action( 'bp_members_admin_load', array( $this, 'process_member_type_update' ) );
-
-        /** Signups **********************************************************
-         */
-
-        if ( is_admin() ) {
-
-            // Filter non multisite user query to remove sign-up users.
-            if ( ! is_multisite() ) {
-                add_action( 'pre_user_query', array( $this, 'remove_signups_from_user_query' ), 10, 1 );
-            }
-
-            // Reorganise the views navigation in users.php and signups page.
-            if ( current_user_can( $this->capability ) ) {
-                $user_screen = $this->users_screen;
-
-                /**
-                 * Users screen on multiblog is users, but signups
-                 * need to be managed in the network for this case
-                 */
-                if ( bp_is_network_activated() && bp_is_multiblog_mode() && false === strpos( $user_screen, '-network' ) ) {
-                    $user_screen .= '-network';
-                }
-
-                add_filter( "views_{$user_screen}", array( $this, 'signup_filter_view'    ), 10, 1 );
-                add_filter( 'set-screen-option',    array( $this, 'signup_screen_options' ), 10, 3 );
-            }
-        }
-    }
-
-    /**
-     * Get the user ID.
-     *
-     * Look for $_GET['user_id']. If anything else, force the user ID to the
-     * current user's ID so they aren't left without a user to edit.
-     *
-     * @since 2.1.0
-     *
-     * @return int
-     */
-    private function get_user_id() {
-        if ( ! empty( $this->user_id ) ) {
-            return $this->user_id;
-        }
-
-        $this->user_id = (int) get_current_user_id();
-
-        // We'll need a user ID when not on self profile.
-        if ( ! empty( $_GET['user_id'] ) ) {
-            $this->user_id = (int) $_GET['user_id'];
-        }
-
-        return $this->user_id;
-    }
-
-    /**
-     * Can the current user edit the one displayed.
-     *
-     * Self profile editing / or bp_moderate check.
-     * This might be replaced by more granular capabilities
-     * in the future.
-     *
-     * @since 2.1.0
-     *
-     * @param int $user_id ID of the user being checked for edit ability.
-     *
-     * @return bool
-     */
-    private function member_can_edit( $user_id = 0 ) {
-        $retval = false;
-
-        // Bail if no user ID was passed.
-        if ( empty( $user_id ) ) {
-            return $retval;
-        }
-
-        // Member can edit if they are viewing their own profile.
-        if ( $this->current_user_id === $user_id ) {
-            $retval = true;
-
-        // Trust the 'bp_moderate' capability.
-        } else {
-            $retval = bp_current_user_can( 'bp_moderate' );
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Get admin notice when saving a user or member profile.
-     *
-     * @since 2.1.0
-     *
-     * @return array
-     */
-    private function get_user_notice() {
-
-        // Setup empty notice for return value.
-        $notice = array();
-
-        // Updates.
-        if ( ! empty( $_REQUEST['updated'] ) ) {
-            switch ( $_REQUEST['updated'] ) {
-            case 'avatar':
-                $notice = array(
-                    'class'   => 'updated',
-                    'message' => __( 'Profile photo was deleted.', 'buddypress' )
-                );
-                break;
-            case 'ham' :
-                $notice = array(
-                    'class'   => 'updated',
-                    'message' => __( 'User removed as spammer.', 'buddypress' )
-                );
-                break;
-            case 'spam' :
-                $notice = array(
-                    'class'   => 'updated',
-                    'message' => __( 'User marked as spammer. Spam users are visible only to site admins.', 'buddypress' )
-                );
-                break;
-            case 1 :
-                $notice = array(
-                    'class'   => 'updated',
-                    'message' => __( 'Profile updated.', 'buddypress' )
-                );
-                break;
-            }
-        }
-
-        // Errors.
-        if ( ! empty( $_REQUEST['error'] ) ) {
-            switch ( $_REQUEST['error'] ) {
-            case 'avatar':
-                $notice = array(
-                    'class'   => 'error',
-                    'message' => __( 'There was a problem deleting that profile photo. Please try again.', 'buddypress' )
-                );
-                break;
-            case 'ham' :
-                $notice = array(
-                    'class'   => 'error',
-                    'message' => __( 'User could not be removed as spammer.', 'buddypress' )
-                );
-                break;
-            case 'spam' :
-                $notice = array(
-                    'class'   => 'error',
-                    'message' => __( 'User could not be marked as spammer.', 'buddypress' )
-                );
-                break;
-            case 1 :
-                $notice = array(
-                    'class'   => 'error',
-                    'message' => __( 'An error occurred while trying to update the profile.', 'buddypress' )
-                );
-                break;
-            case 2:
-                $notice = array(
-                    'class'   => 'error',
-                    'message' => __( 'Please make sure you fill in all required fields in this profile field group before saving.', 'buddypress' )
-                );
-                break;
-            case 3:
-                $notice = array(
-                    'class'   => 'error',
-                    'message' => __( 'There was a problem updating some of your profile information. Please try again.', 'buddypress' )
-                );
-                break;
-            }
-        }
-
-        return $notice;
-    }
-
-    /**
-     * Create the /user/ admin Profile submenus for all members.
-     *
-     * @since 2.1.0
-     *
-     * @uses add_submenu_page() To add the Edit Profile page in Profile section.
-     */
-    public function user_profile_menu() {
-
-        // Setup the hooks array.
-        $hooks = array();
-
-        // Add the faux "Edit Profile" submenu page.
-        $hooks['user'] = $this->user_page = add_submenu_page(
-            'profile.php',
-            __( 'Edit Profile',  'buddypress' ),
-            __( 'Edit Profile',  'buddypress' ),
-            'exist',
-            'bp-profile-edit',
-            array( $this, 'user_admin' )
-        );
-
-        // Setup the screen ID's.
-        $this->screen_id = array(
-            $this->user_page    . '-user',
-            $this->user_profile . '-user'
-        );
-
-        // Loop through new hooks and add method actions.
-        foreach ( $hooks as $key => $hook ) {
-            add_action( "load-{$hook}", array( $this, $key . '_admin_load' ) );
-        }
-
-        // Add the profile_admin_head method to proper admin_head actions.
-        add_action( "admin_head-{$this->user_page}", array( $this, 'profile_admin_head' ) );
-        add_action( "admin_head-profile.php",        array( $this, 'profile_admin_head' ) );
-    }
-
-    /**
-     * Create the All Users / Profile > Edit Profile and All Users Signups submenus.
-     *
-     * @since 2.0.0
-     *
-     * @uses add_submenu_page() To add the Edit Profile page in Users/Profile section.
-     */
-    public function admin_menus() {
-
-        // Setup the hooks array.
-        $hooks = array();
-
-        // Manage user's profile.
-        $hooks['user'] = $this->user_page = add_submenu_page(
-            $this->user_profile . '.php',
-            __( 'Edit Profile',  'buddypress' ),
-            __( 'Edit Profile',  'buddypress' ),
-            'read',
-            'bp-profile-edit',
-            array( $this, 'user_admin' )
-        );
-
-        // Only show sign-ups where they belong.
-        if ( ( ! bp_is_network_activated() && ! is_network_admin() ) || ( is_network_admin() && bp_is_network_activated() ) ) {
-
-            // Manage signups.
-            $hooks['signups'] = $this->signups_page = add_users_page(
-                __( 'Manage Signups',  'buddypress' ),
-                __( 'Manage Signups',  'buddypress' ),
-                $this->capability,
-                'bp-signups',
-                array( $this, 'signups_admin' )
-            );
-        }
-
-        $edit_page         = 'user-edit';
-        $profile_page      = 'profile';
-        $this->users_page  = 'users';
-
-        // Self profile check is needed for this pages.
-        $page_head = array(
-            $edit_page        . '.php',
-            $profile_page     . '.php',
-            $this->user_page,
-            $this->users_page . '.php',
-        );
-
-        // Append '-network' to each array item if in network admin.
-        if ( is_network_admin() ) {
-            $edit_page          .= '-network';
-            $profile_page       .= '-network';
-            $this->user_page    .= '-network';
-            $this->users_page   .= '-network';
-            $this->signups_page .= '-network';
-        }
-
-        // Setup the screen ID's.
-        $this->screen_id = array(
-            $edit_page,
-            $this->user_page,
-            $profile_page
-        );
-
-        // Loop through new hooks and add method actions.
-        foreach ( $hooks as $key => $hook ) {
-            add_action( "load-{$hook}", array( $this, $key . '_admin_load' ) );
-        }
-
-        // Add the profile_admin_head method to proper admin_head actions.
-        foreach ( $page_head as $head ) {
-            add_action( "admin_head-{$head}", array( $this, 'profile_admin_head' ) );
-        }
-    }
-
-    /**
-     * Highlight the Users menu if on Edit Profile and check if on the user's admin profile.
-     *
-     * @since 2.1.0
-     */
-    public function profile_admin_head() {
-        global $submenu_file, $parent_file;
-
-        // Is the user editing their own profile?
-        if ( is_user_admin() || ( defined( 'IS_PROFILE_PAGE' ) && IS_PROFILE_PAGE ) ) {
-            $this->is_self_profile = true;
-
-        // Is the user attempting to edit their own profile.
-        } elseif ( isset( $_GET['user_id' ] ) || ( isset( $_GET['page'] ) && ( 'bp-profile-edit' === $_GET['page'] ) ) ) {
-            $this->is_self_profile = (bool) ( $this->get_user_id() === $this->current_user_id );
-        }
-
-        // Force the parent file to users.php to open the correct top level menu
-        // but only if not editing a site via the network site editing page.
-        if ( 'sites.php' !== $parent_file ) {
-            $parent_file  = 'users.php';
-            $submenu_file = 'users.php';
-        }
-
-        // Editing your own profile, so recheck some vars.
-        if ( true === $this->is_self_profile ) {
-
-            // Use profile.php as the edit page.
-            $edit_page = 'profile.php';
-
-            // Set profile.php as the parent & sub files to correct the menu nav.
-            if ( is_blog_admin() || is_user_admin() ) {
-                $parent_file  = 'profile.php';
-                $submenu_file = 'profile.php';
-            }
-
-        // Not editing yourself, so use user-edit.php.
-        } else {
-            $edit_page = 'user-edit.php';
-        }
-
-        if ( is_user_admin() ) {
-            $this->edit_profile_url = add_query_arg( $this->edit_profile_args, user_admin_url( 'profile.php' ) );
-            $this->edit_url         = user_admin_url( 'profile.php' );
-
-        } elseif ( is_blog_admin() ) {
-            $this->edit_profile_url = add_query_arg( $this->edit_profile_args, admin_url( 'users.php' ) );
-            $this->edit_url         = admin_url( $edit_page );
-
-        } elseif ( is_network_admin() ) {
-            $this->edit_profile_url = add_query_arg( $this->edit_profile_args, network_admin_url( 'users.php' ) );
-            $this->edit_url         = network_admin_url( $edit_page );
-        }
-    }
-
-    /**
-     * Remove the Edit Profile page.
-     *
-     * We add these pages in order to integrate with WP's Users panel, but
-     * we want them to show up as a row action of the WP panel, not as separate
-     * subnav items under the Users menu.
-     *
-     * @since 2.0.0
-     */
-    public function admin_head() {
-        remove_submenu_page( 'users.php',   'bp-profile-edit' );
-        remove_submenu_page( 'profile.php', 'bp-profile-edit' );
-    }
-
-    /** Community Profile *****************************************************/
-
-    /**
-     * Add some specific styling to the Edit User and Edit User's Profile page.
-     *
-     * @since 2.0.0
-     */
-    public function enqueue_scripts() {
-        if ( ! in_array( get_current_screen()->id, $this->screen_id ) ) {
-            return;
-        }
-
-        $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-        $css = $this->css_url . "admin{$min}.css";
-
-        /**
-         * Filters the CSS URL to enqueue in the Members admin area.
-         *
-         * @since 2.0.0
-         *
-         * @param string $css URL to the CSS admin file to load.
-         */
-        $css = apply_filters( 'bp_members_admin_css', $css );
-
-        wp_enqueue_style( 'bp-members-css', $css, array(), bp_get_version() );
-
-        wp_style_add_data( 'bp-members-css', 'rtl', true );
-        if ( $min ) {
-            wp_style_add_data( 'bp-members-css', 'suffix', $min );
-        }
-
-        // Only load JavaScript for BuddyPress profile.
-        if ( get_current_screen()->id == $this->user_page ) {
-            $js = $this->js_url . "admin{$min}.js";
-
-            /**
-             * Filters the JS URL to enqueue in the Members admin area.
-             *
-             * @since 2.0.0
-             *
-             * @param string $js URL to the JavaScript admin file to load.
-             */
-            $js = apply_filters( 'bp_members_admin_js', $js );
-            wp_enqueue_script( 'bp-members-js', $js, array( 'jquery' ), bp_get_version(), true );
-        }
-
-        /**
-         * Fires after all of the members JavaScript and CSS are enqueued.
-         *
-         * @since 2.0.0
-         *
-         * @param string $id        ID of the current screen.
-         * @param array  $screen_id Array of allowed screens to add scripts and styles to.
-         */
-        do_action( 'bp_members_admin_enqueue_scripts', get_current_screen()->id, $this->screen_id );
-    }
-
-    /**
-     * Create the Profile navigation in Edit User & Edit Profile pages.
-     *
-     * @since 2.0.0
-     *
-     * @param object|null $user   User to create profile navigation for.
-     * @param string      $active Which profile to highlight.
-     * @return string
-     */
-    public function profile_nav( $user = null, $active = 'WordPress' ) {
-
-        // Bail if no user ID exists here.
-        if ( empty( $user->ID ) ) {
-            return;
-        }
-
-        // Add the user ID to query arguments when not editing yourself.
-        if ( false === $this->is_self_profile ) {
-            $query_args = array( 'user_id' => $user->ID );
-        } else {
-            $query_args = array();
-        }
-
-        // Conditionally add a referer if it exists in the existing request.
-        if ( ! empty( $_REQUEST['wp_http_referer'] ) ) {
-            $query_args['wp_http_referer'] = urlencode( stripslashes_deep( $_REQUEST['wp_http_referer'] ) );
-        }
-
-        // Setup the two distinct "edit" URL's.
-        $community_url = add_query_arg( $query_args, $this->edit_profile_url );
-        $wordpress_url = add_query_arg( $query_args, $this->edit_url         );
-
-        $bp_active = false;
-        $wp_active = ' nav-tab-active';
-        if ( 'BuddyPress' === $active ) {
-            $bp_active = ' nav-tab-active';
-            $wp_active = false;
-        } ?>
-
-        <h2 id="profile-nav" class="nav-tab-wrapper">
-            <?php
-            /**
-             * In configs where BuddyPress is not network activated, as regular
-             * admins do not have the capacity to edit other users, we must add
-             * this check.
-             */
-            if ( current_user_can( 'edit_user', $user->ID ) ) : ?>
-
-                <a class="nav-tab<?php echo esc_attr( $wp_active ); ?>" href="<?php echo esc_url( $wordpress_url );?>"><?php _e( 'Profile', 'buddypress' ); ?></a>
-
-            <?php endif; ?>
-
-            <a class="nav-tab<?php echo esc_attr( $bp_active ); ?>" href="<?php echo esc_url( $community_url );?>"><?php _e( 'Extended Profile', 'buddypress' ); ?></a>
-        </h2>
-
-        <?php
-    }
-
-    /**
-     * Set up the user's profile admin page.
-     *
-     * Loaded before the page is rendered, this function does all initial
-     * setup, including: processing form requests, registering contextual
-     * help, and setting up screen options.
-     *
-     * @since 2.0.0
-     */
-    public function user_admin_load() {
-
-        // Get the user ID.
-        $user_id = $this->get_user_id();
-
-        // Can current user edit this profile?
-        if ( ! $this->member_can_edit( $user_id ) ) {
-            wp_die( __( 'You cannot edit the requested user.', 'buddypress' ) );
-        }
-
-        // Build redirection URL.
-        $redirect_to = remove_query_arg( array( 'action', 'error', 'updated', 'spam', 'ham', 'delete_avatar' ), $_SERVER['REQUEST_URI'] );
-        $doaction    = ! empty( $_REQUEST['action'] ) ? $_REQUEST['action'] : false;
-
-        if ( ! empty( $_REQUEST['user_status'] ) ) {
-            $spam = (bool) ( 'spam' === $_REQUEST['user_status'] );
-
-            if ( $spam !== bp_is_user_spammer( $user_id ) ) {
-                $doaction = $_REQUEST['user_status'];
-            }
-        }
-
-        /**
-         * Fires at the start of the signups admin load.
-         *
-         * @since 2.0.0
-         *
-         * @param string $doaction Current bulk action being processed.
-         * @param array  $_REQUEST Current $_REQUEST global.
-         */
-        do_action_ref_array( 'bp_members_admin_load', array( $doaction, $_REQUEST ) );
-
-        /**
-         * Filters the allowed actions for use in the user admin page.
-         *
-         * @since 2.0.0
-         *
-         * @param array $value Array of allowed actions to use.
-         */
-        $allowed_actions = apply_filters( 'bp_members_admin_allowed_actions', array( 'update', 'delete_avatar', 'spam', 'ham' ) );
-
-        // Prepare the display of the Community Profile screen.
-        if ( ! in_array( $doaction, $allowed_actions ) ) {
-            add_screen_option( 'layout_columns', array( 'default' => 2, 'max' => 2, ) );
-
-            get_current_screen()->add_help_tab( array(
-                'id'      => 'bp-profile-edit-overview',
-                'title'   => __( 'Overview', 'buddypress' ),
-                'content' =>
-                '<p>' . __( 'This is the admin view of a user&#39;s profile.', 'buddypress' ) . '</p>' .
-                '<p>' . __( 'In the main column, you can edit the fields of the user&#39;s extended profile.', 'buddypress' ) . '</p>' .
-                '<p>' . __( 'In the right-hand column, you can update the user&#39;s status, delete the user&#39;s avatar, and view recent statistics.', 'buddypress' ) . '</p>'
-            ) );
-
-            // Help panel - sidebar links.
-            get_current_screen()->set_help_sidebar(
-                '<p><strong>' . __( 'For more information:', 'buddypress' ) . '</strong></p>' .
-                '<p>' . __( '<a href="https://codex.buddypress.org/administrator-guide/extended-profiles/">Managing Profiles</a>', 'buddypress' ) . '</p>' .
-                '<p>' . __( '<a href="https://buddypress.org/support/">Support Forums</a>', 'buddypress' ) . '</p>'
-            );
-
-            // Register metaboxes for the edit screen.
-            add_meta_box(
-                'submitdiv',
-                _x( 'Status', 'members user-admin edit screen', 'buddypress' ),
-                array( $this, 'user_admin_status_metabox' ),
-                get_current_screen()->id,
-                'side',
-                'core'
-            );
-
-            // In case xprofile is not active.
-            $this->stats_metabox->context  = 'normal';
-            $this->stats_metabox->priority = 'core';
-
-            /**
-             * Fires before loading the profile fields if component is active.
-             *
-             * Plugins should not use this hook, please use 'bp_members_admin_user_metaboxes' instead.
-             *
-             * @since 2.0.0
-             *
-             * @param int    $user_id       Current user ID for the screen.
-             * @param string $id            Current screen ID.
-             * @param object $stats_metabox Object holding position data for use with the stats metabox.
-             */
-            do_action_ref_array( 'bp_members_admin_xprofile_metabox', array( $user_id, get_current_screen()->id, $this->stats_metabox ) );
-
-            // If xProfile is inactive, difficult to know what's profile we're on.
-            if ( 'normal' === $this->stats_metabox->context ) {
-                $display_name = bp_core_get_user_displayname( $user_id );
-            } else {
-                $display_name = __( 'Member', 'buddypress' );
-            }
-
-            // User Stat metabox.
-            add_meta_box(
-                'bp_members_admin_user_stats',
-                sprintf( _x( "%s's Stats", 'members user-admin edit screen', 'buddypress' ), $display_name ),
-                array( $this, 'user_admin_stats_metabox' ),
-                get_current_screen()->id,
-                sanitize_key( $this->stats_metabox->context ),
-                sanitize_key( $this->stats_metabox->priority )
-            );
-
-            // Member Type metabox. Only added if member types have been registered.
-            $member_types = bp_get_member_types();
-            if ( ! empty( $member_types ) ) {
-                add_meta_box(
-                    'bp_members_admin_member_type',
-                    _x( 'Member Type', 'members user-admin edit screen', 'buddypress' ),
-                    array( $this, 'user_admin_member_type_metabox' ),
-                    get_current_screen()->id,
-                    'side',
-                    'core'
-                );
-            }
-
-            /**
-             * Fires at the end of the Community Profile screen.
-             *
-             * Plugins can restrict metabox to "bp_moderate" admins by checking if
-             * the first argument ($this->is_self_profile) is false in their callback.
-             * They can also restrict their metabox to self profile editing
-             * by setting it to true.
-             *
-             * @since 2.0.0
-             *
-             * @param bool $is_self_profile Whether or not it is the current user's profile.
-             * @param int  $user_id         Current user ID.
-             */
-            do_action( 'bp_members_admin_user_metaboxes', $this->is_self_profile, $user_id );
-
-            // Enqueue JavaScript files.
-            wp_enqueue_script( 'postbox'   );
-            wp_enqueue_script( 'dashboard' );
-
-        // Spam or Ham user.
-        } elseif ( in_array( $doaction, array( 'spam', 'ham' ) ) && empty( $this->is_self_profile ) ) {
-
-            check_admin_referer( 'edit-bp-profile_' . $user_id );
-
-            if ( bp_core_process_spammer_status( $user_id, $doaction ) ) {
-                $redirect_to = add_query_arg( 'updated', $doaction, $redirect_to );
-            } else {
-                $redirect_to = add_query_arg( 'error', $doaction, $redirect_to );
-            }
-
-            bp_core_redirect( $redirect_to );
-
-        // Update other stuff once above ones are done.
-        } else {
-            $this->redirect = $redirect_to;
-
-            /**
-             * Fires at end of user profile admin load if doaction does not match any available actions.
-             *
-             * @since 2.0.0
-             *
-             * @param string $doaction Current bulk action being processed.
-             * @param int    $user_id  Current user ID.
-             * @param array  $_REQUEST Current $_REQUEST global.
-             * @param string $redirect Determined redirect url to send user to.
-             */
-            do_action_ref_array( 'bp_members_admin_update_user', array( $doaction, $user_id, $_REQUEST, $this->redirect ) );
-
-            bp_core_redirect( $this->redirect );
-        }
-    }
-
-    /**
-     * Display the user's profile.
-     *
-     * @since 2.0.0
-     */
-    public function user_admin() {
-
-        if ( ! bp_current_user_can( 'bp_moderate' ) && empty( $this->is_self_profile ) ) {
-            die( '-1' );
-        }
-
-        // Get the user ID.
-        $user_id = $this->get_user_id();
-        $user    = get_user_to_edit( $user_id );
-
-        // Construct title.
-        if ( true === $this->is_self_profile ) {
-            $title = __( 'Profile',   'buddypress' );
-        } else {
-            $title = __( 'Edit User', 'buddypress' );
-        }
-
-        // Construct URL for form.
-        $request_url     = remove_query_arg( array( 'action', 'error', 'updated', 'spam', 'ham' ), $_SERVER['REQUEST_URI'] );
-        $form_action_url = add_query_arg( 'action', 'update', $request_url );
-        $wp_http_referer = false;
-        if ( ! empty( $_REQUEST['wp_http_referer'] ) ) {
-            $wp_http_referer = remove_query_arg( array( 'action', 'updated' ), $_REQUEST['wp_http_referer'] );
-        }
-
-        // Prepare notice for admin.
-        $notice = $this->get_user_notice();
-
-        if ( ! empty( $notice ) ) : ?>
-
-            <div <?php if ( 'updated' === $notice['class'] ) : ?>id="message" <?php endif; ?>class="<?php echo esc_attr( $notice['class'] ); ?>">
-
-                <p><?php echo esc_html( $notice['message'] ); ?></p>
-
-                <?php if ( !empty( $wp_http_referer ) && ( 'updated' === $notice['class'] ) ) : ?>
-
-                    <p><a href="<?php echo esc_url( $wp_http_referer ); ?>"><?php esc_html_e( '&larr; Back to Users', 'buddypress' ); ?></a></p>
-
-                <?php endif; ?>
-
-            </div>
-
-        <?php endif; ?>
-
-        <div class="wrap" id="community-profile-page">
-            <h1><?php echo esc_html( $title ); ?>
-
-                <?php if ( empty( $this->is_self_profile ) ) : ?>
-
-                    <?php if ( current_user_can( 'create_users' ) ) : ?>
-
-                        <a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user', 'buddypress' ); ?></a>
-
-                    <?php elseif ( is_multisite() && current_user_can( 'promote_users' ) ) : ?>
-
-                        <a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add Existing', 'user', 'buddypress' ); ?></a>
-
-                    <?php endif; ?>
-
-                <?php endif; ?>
-            </h1>
-
-            <?php if ( ! empty( $user ) ) :
-
-                $this->profile_nav( $user, 'BuddyPress' ); ?>
-
-                <form action="<?php echo esc_url( $form_action_url ); ?>" id="your-profile" method="post">
-                    <div id="poststuff">
-
-                        <div id="post-body" class="metabox-holder columns-<?php echo 1 == get_current_screen()->get_columns() ? '1' : '2'; ?>">
-
-                            <div id="postbox-container-1" class="postbox-container">
-                                <?php do_meta_boxes( get_current_screen()->id, 'side', $user ); ?>
-                            </div>
-
-                            <div id="postbox-container-2" class="postbox-container">
-                                <?php do_meta_boxes( get_current_screen()->id, 'normal',   $user ); ?>
-                                <?php do_meta_boxes( get_current_screen()->id, 'advanced', $user ); ?>
-                            </div>
-                        </div><!-- #post-body -->
-
-                    </div><!-- #poststuff -->
-
-                    <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
-                    <?php wp_nonce_field( 'meta-box-order',  'meta-box-order-nonce', false ); ?>
-                    <?php wp_nonce_field( 'edit-bp-profile_' . $user->ID ); ?>
-
-                </form>
-
-            <?php else : ?>
-
-                <p><?php printf( __( 'No user found with this ID. <a href="%s">Go back and try again</a>.', 'buddypress' ), esc_url( bp_get_admin_url( 'users.php' ) ) ); ?></p>
-
-            <?php endif; ?>
-
-        </div><!-- .wrap -->
-        <?php
-    }
-
-    /**
-     * Render the Status metabox for user's profile screen.
-     *
-     * Actions are:
-     * - Update profile fields if xProfile component is active
-     * - Spam/Unspam user
-     *
-     * @since 2.0.0
-     *
-     * @param WP_User|null $user The WP_User object to be edited.
-     */
-    public function user_admin_status_metabox( $user = null ) {
-
-        // Bail if no user id or if the user has not activated their account yet.
-        if ( empty( $user->ID ) ) {
-            return;
-        }
-
-        // Bail if user has not been activated yet (how did you get here?).
-        if ( isset( $user->user_status ) && ( 2 == $user->user_status ) ) : ?>
-
-            <p class="not-activated"><?php esc_html_e( 'User account has not yet been activated', 'buddypress' ); ?></p><br/>
-
-            <?php return;
-
-        endif; ?>
-
-        <div class="submitbox" id="submitcomment">
-            <div id="minor-publishing">
-                <div id="misc-publishing-actions">
-                    <?php
-
-                    // Get the spam status once here to compare against below.
-                    $is_spammer = bp_is_user_spammer( $user->ID );
-
-                    /**
-                     * In configs where BuddyPress is not network activated,
-                     * regular admins cannot mark a user as a spammer on front
-                     * end. This prevent them to do it in backend.
-                     *
-                     * Also prevent admins from marking themselves or other
-                     * admins as spammers.
-                     */
-                    if ( ( empty( $this->is_self_profile ) && ( ! in_array( $user->user_login, get_super_admins() ) ) && empty( $this->subsite_activated ) ) || ( ! empty( $this->subsite_activated ) && current_user_can( 'manage_network_users' ) ) ) : ?>
-
-                        <div class="misc-pub-section" id="comment-status-radio">
-                            <label class="approved"><input type="radio" name="user_status" value="ham" <?php checked( $is_spammer, false ); ?>><?php esc_html_e( 'Active', 'buddypress' ); ?></label><br />
-                            <label class="spam"><input type="radio" name="user_status" value="spam" <?php checked( $is_spammer, true ); ?>><?php esc_html_e( 'Spammer', 'buddypress' ); ?></label>
-                        </div>
-
-                    <?php endif ;?>
-
-                    <div class="misc-pub-section curtime misc-pub-section-last">
-                        <?php
-
-                        // Translators: Publish box date format, see http://php.net/date.
-                        $datef = __( 'M j, Y @ G:i', 'buddypress' );
-                        $date  = date_i18n( $datef, strtotime( $user->user_registered ) );
-                        ?>
-                        <span id="timestamp"><?php printf( __( 'Registered on: %s', 'buddypress' ), '<strong>' . $date . '</strong>' ); ?></span>
-                    </div>
-                </div> <!-- #misc-publishing-actions -->
-
-                <div class="clear"></div>
-            </div><!-- #minor-publishing -->
-
-            <div id="major-publishing-actions">
-
-                <div id="publishing-action">
-                    <a class="button bp-view-profile" href="<?php echo esc_url( bp_core_get_user_domain( $user->ID ) ); ?>" target="_blank"><?php esc_html_e( 'View Profile', 'buddypress' ); ?></a>
-                    <?php submit_button( esc_html__( 'Update Profile', 'buddypress' ), 'primary', 'save', false ); ?>
-                </div>
-                <div class="clear"></div>
-            </div><!-- #major-publishing-actions -->
-
-        </div><!-- #submitcomment -->
-
-        <?php
-    }
-
-    /**
-     * Render the fallback metabox in case a user has been marked as a spammer.
-     *
-     * @since 2.0.0
-     *
-     * @param WP_User|null $user The WP_User object to be edited.
-     */
-    public function user_admin_spammer_metabox( $user = null ) {
-    ?>
-        <p><?php printf( __( '%s has been marked as a spammer. All BuddyPress data associated with the user has been removed', 'buddypress' ), esc_html( bp_core_get_user_displayname( $user->ID ) ) ) ;?></p>
-    <?php
-    }
-
-    /**
-     * Render the Stats metabox to moderate inappropriate images.
-     *
-     * @since 2.0.0
-     *
-     * @param WP_User|null $user The WP_User object to be edited.
-     */
-    public function user_admin_stats_metabox( $user = null ) {
-
-        // Bail if no user ID.
-        if ( empty( $user->ID ) ) {
-            return;
-        }
-
-        // If account is not activated last activity is the time user registered.
-        if ( isset( $user->user_status ) && 2 == $user->user_status ) {
-            $last_active = $user->user_registered;
-
-        // Account is activated, getting user's last activity.
-        } else {
-            $last_active = bp_get_user_last_activity( $user->ID );
-        }
-
-        $datef = __( 'M j, Y @ G:i', 'buddypress' );
-        $date  = date_i18n( $datef, strtotime( $last_active ) ); ?>
-
-        <ul>
-            <li class="bp-members-profile-stats"><?php printf( __( 'Last active: %1$s', 'buddypress' ), '<strong>' . $date . '</strong>' ); ?></li>
-
-            <?php
-            // Loading other stats only if user has activated their account.
-            if ( empty( $user->user_status ) ) {
-
-                /**
-                 * Fires in the user stats metabox if the user has activated their account.
-                 *
-                 * @since 2.0.0
-                 *
-                 * @param array  $value Array holding the user ID.
-                 * @param object $user  Current displayed user object.
-                 */
-                do_action( 'bp_members_admin_user_stats', array( 'user_id' => $user->ID ), $user );
-            }
-            ?>
-        </ul>
-
-        <?php
-    }
-
-    /**
-     * Render the Member Type metabox.
-     *
-     * @since 2.2.0
-     *
-     * @param WP_User|null $user The WP_User object to be edited.
-     */
-    public function user_admin_member_type_metabox( $user = null ) {
-
-        // Bail if no user ID.
-        if ( empty( $user->ID ) ) {
-            return;
-        }
-
-        $types = bp_get_member_types( array(), 'objects' );
-        $current_type = bp_get_member_type( $user->ID );
-        ?>
-
-        <label for="bp-members-profile-member-type" class="screen-reader-text"><?php esc_html_e( 'Select member type', 'buddypress' ); ?></label>
-        <select name="bp-members-profile-member-type" id="bp-members-profile-member-type">
-            <option value="" <?php selected( '', $current_type ); ?>><?php /* translators: no option picked in select box */ esc_attr_e( '----', 'buddypress' ) ?></option>
-            <?php foreach ( $types as $type ) : ?>
-                <option value="<?php echo esc_attr( $type->name ) ?>" <?php selected( $type->name, $current_type ) ?>><?php echo esc_html( $type->labels['singular_name'] ) ?></option>
-            <?php endforeach; ?>
-        </select>
-
-        <?php
-
-        wp_nonce_field( 'bp-member-type-change-' . $user->ID, 'bp-member-type-nonce' );
-    }
-
-    /**
-     * Process changes from the Member Type metabox.
-     *
-     * @since 2.2.0
-     */
-    public function process_member_type_update() {
-        if ( ! isset( $_POST['bp-member-type-nonce'] ) || ! isset( $_POST['bp-members-profile-member-type'] ) ) {
-            return;
-        }
-
-        $user_id = $this->get_user_id();
-
-        check_admin_referer( 'bp-member-type-change-' . $user_id, 'bp-member-type-nonce' );
-
-        // Permission check.
-        if ( ! current_user_can( 'bp_moderate' ) && $user_id != bp_loggedin_user_id() ) {
-            return;
-        }
-
-        // Member type string must either reference a valid member type, or be empty.
-        $member_type = stripslashes( $_POST['bp-members-profile-member-type'] );
-        if ( ! empty( $member_type ) && ! bp_get_member_type_object( $member_type ) ) {
-            return;
-        }
-
-        /*
-         * If an invalid member type is passed, someone's doing something
-         * fishy with the POST request, so we can fail silently.
-         */
-        if ( bp_set_member_type( $user_id, $member_type ) ) {
-            // @todo Success messages can't be posted because other stuff happens on the page load.
-        }
-    }
-
-    /**
-     * Add a link to Profile in Users listing row actions.
-     *
-     * @since 2.0.0
-     *
-     * @param array|string $actions WordPress row actions (edit, delete).
-     * @param object|null  $user    The object for the user row.
-     * @return array Merged actions.
-     */
-    public function row_actions( $actions = '', $user = null ) {
-
-        // Bail if no user ID.
-        if ( empty( $user->ID ) ) {
-            return;
-        }
-
-        // Setup args array.
-        $args = array();
-
-        // Add the user ID if it's not for the current user.
-        if ( $user->ID !== $this->current_user_id ) {
-            $args['user_id'] = $user->ID;
-        }
-
-        // Add the referer.
-        $args['wp_http_referer'] = urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) );
-
-        // Add the "Extended" link if the current user can edit this user.
-        if ( current_user_can( 'edit_user', $user->ID ) || bp_current_user_can( 'bp_moderate' ) ) {
-
-            // Add query args and setup the Extended link.
-            $edit_profile      = add_query_arg( $args, $this->edit_profile_url );
-            $edit_profile_link = sprintf( '<a href="%1$s">%2$s</a>',  esc_url( $edit_profile ), esc_html__( 'Extended', 'buddypress' ) );
-
-            /**
-             * Check the edit action is available
-             * and preserve the order edit | profile | remove/delete.
-             */
-            if ( ! empty( $actions['edit'] ) ) {
-                $edit_action = $actions['edit'];
-                unset( $actions['edit'] );
-
-                $new_edit_actions = array(
-                    'edit'         => $edit_action,
-                    'edit-profile' => $edit_profile_link,
-                );
-
-            // If not available simply add the edit profile action.
-            } else {
-                $new_edit_actions = array( 'edit-profile' => $edit_profile_link );
-            }
-
-            $actions = array_merge( $new_edit_actions, $actions );
-        }
-
-        return $actions;
-    }
-
-    /**
-     * Add a filter to edit profile url in WP Admin Bar.
-     *
-     * @since 2.1.0
-     */
-    public function add_edit_profile_url_filter() {
-        add_filter( 'bp_members_edit_profile_url', array( $this, 'filter_adminbar_profile_link' ), 10, 3 );
-    }
-
-    /**
-     * Filter the profile url.
-     *
-     * @since 2.1.0
-     *
-     * @uses  user_admin_url()
-     *
-     * @param string $profile_link Profile Link for admin bar.
-     * @param string $url          Profile URL.
-     * @param int    $user_id      User ID.
-     * @return string
-     */
-    public function filter_adminbar_profile_link( $profile_link = '', $url = '', $user_id = 0 ) {
-        if ( ! is_super_admin( $user_id ) && is_admin() ) {
-            $profile_link = user_admin_url( 'profile.php' );
-        }
-        return $profile_link;
-    }
-
-    /**
-     * Remove the filter to edit profile url in WP Admin Bar.
-     *
-     * @since 2.1.0
-     */
-    public function remove_edit_profile_url_filter() {
-        remove_filter( 'bp_members_edit_profile_url', array( $this, 'filter_adminbar_profile_link' ), 10, 3 );
-    }
-
-    /** Signups Management ****************************************************/
-
-    /**
-     * Display the admin preferences about signups pagination.
-     *
-     * @since 2.0.0
-     *
-     * @param int    $value     Value for signup option.
-     * @param string $option    Value for the option key.
-     * @param int    $new_value Value for the saved option.
-     * @return int The pagination preferences.
-     */
-    public function signup_screen_options( $value = 0, $option = '', $new_value = 0 ) {
-        if ( 'users_page_bp_signups_network_per_page' != $option && 'users_page_bp_signups_per_page' != $option ) {
-            return $value;
-        }
-
-        // Per page.
-        $new_value = (int) $new_value;
-        if ( $new_value < 1 || $new_value > 999 ) {
-            return $value;
-        }
-
-        return $new_value;
-    }
-
-    /**
-     * Make sure no signups will show in users list.
-     *
-     * This is needed to handle signups that may have not been activated
-     * before the 2.0.0 upgrade.
-     *
-     * @since 2.0.0
-     *
-     * @param WP_User_Query|null $query The users query.
-     * @return WP_User_Query The users query without the signups.
-     */
-    public function remove_signups_from_user_query( $query = null ) {
-        global $wpdb;
-
-        // Bail if this is an ajax request.
-        if ( defined( 'DOING_AJAX' ) ) {
-            return;
-        }
-
-        // Bail if updating BuddyPress.
-        if ( bp_is_update() ) {
-            return;
-        }
-
-        // Bail if there is no current admin screen.
-        if ( ! function_exists( 'get_current_screen' ) || ! get_current_screen() ) {
-            return;
-        }
-
-        // Get current screen.
-        $current_screen = get_current_screen();
-
-        // Bail if not on a users page.
-        if ( ! isset( $current_screen->id ) || $this->users_page !== $current_screen->id ) {
-            return;
-        }
-
-        // Bail if already querying by an existing role.
-        if ( ! empty( $query->query_vars['role'] ) ) {
-            return;
-        }
-
-        $query->query_where .= " AND {$wpdb->users}.user_status != 2";
-    }
-
-    /**
-     * Filter the WP Users List Table views to include 'bp-signups'.
-     *
-     * @since 2.0.0
-     *
-     * @param array $views WP List Table views.
-     * @return array The views with the signup view added.
-     */
-    public function signup_filter_view( $views = array() ) {
-
-        // Remove the 'current' class from All if we're on the signups view.
-        if ( $this->signups_page == get_current_screen()->id ) {
-            $views['all'] = str_replace( 'class="current"', '', $views['all'] );
-            $class        = 'current';
-        } else {
-            $class        = '';
-        }
-
-        $signups = BP_Signup::count_signups();
-
-        if ( is_network_admin() ) {
-            $base_url = network_admin_url( 'users.php' );
-        } else {
-            $base_url = bp_get_admin_url( 'users.php' );
-        }
-
-        $url     = add_query_arg( 'page', 'bp-signups', $base_url );
-        $text    = sprintf( _x( 'Pending %s', 'signup users', 'buddypress' ), '<span class="count">(' . number_format_i18n( $signups ) . ')</span>' );
-
-        $views['registered'] = sprintf( '<a href="%1$s" class="%2$s">%3$s</a>', esc_url( $url ), $class, $text );
-
-        return $views;
-    }
-
-    /**
-     * Load the Signup WP Users List table.
-     *
-     * @since 2.0.0
-     *
-     * @param string $class    The name of the class to use.
-     * @param string $required The parent class.
-     * @return WP_List_Table The List table.
-     */
-    public static function get_list_table_class( $class = '', $required = '' ) {
-        if ( empty( $class ) ) {
-            return;
-        }
-
-        if ( ! empty( $required ) ) {
-            require_once( ABSPATH . 'wp-admin/includes/class-wp-' . $required . '-list-table.php' );
-            require_once( buddypress()->members->admin->admin_dir . 'bp-members-admin-classes.php' );
-        }
-
-        return new $class();
-    }
-
-    /**
-     * Set up the signups admin page.
-     *
-     * Loaded before the page is rendered, this function does all initial
-     * setup, including: processing form requests, registering contextual
-     * help, and setting up screen options.
-     *
-     * @since 2.0.0
-     *
-     * @global $bp_members_signup_list_table
-     */
-    public function signups_admin_load() {
-        global $bp_members_signup_list_table;
-
-        // Build redirection URL.
-        $redirect_to = remove_query_arg( array( 'action', 'error', 'updated', 'activated', 'notactivated', 'deleted', 'notdeleted', 'resent', 'notresent', 'do_delete', 'do_resend', 'do_activate', '_wpnonce', 'signup_ids' ), $_SERVER['REQUEST_URI'] );
-        $doaction    = bp_admin_list_table_current_bulk_action();
-
-        /**
-         * Fires at the start of the signups admin load.
-         *
-         * @since 2.0.0
-         *
-         * @param string $doaction Current bulk action being processed.
-         * @param array  $_REQUEST Current $_REQUEST global.
-         */
-        do_action( 'bp_signups_admin_load', $doaction, $_REQUEST );
-
-        /**
-         * Filters the allowed actions for use in the user signups admin page.
-         *
-         * @since 2.0.0
-         *
-         * @param array $value Array of allowed actions to use.
-         */
-        $allowed_actions = apply_filters( 'bp_signups_admin_allowed_actions', array( 'do_delete', 'do_activate', 'do_resend' ) );
-
-        // Prepare the display of the Community Profile screen.
-        if ( ! in_array( $doaction, $allowed_actions ) || ( -1 == $doaction ) ) {
-
-            if ( is_network_admin() ) {
-                $bp_members_signup_list_table = self::get_list_table_class( 'BP_Members_MS_List_Table', 'ms-users' );
-            } else {
-                $bp_members_signup_list_table = self::get_list_table_class( 'BP_Members_List_Table', 'users' );
-            }
-
-            // The per_page screen option.
-            add_screen_option( 'per_page', array( 'label' => _x( 'Pending Accounts', 'Pending Accounts per page (screen options)', 'buddypress' ) ) );
-
-            get_current_screen()->add_help_tab( array(
-                'id'      => 'bp-signups-overview',
-                'title'   => __( 'Overview', 'buddypress' ),
-                'content' =>
-                '<p>' . __( 'This is the administration screen for pending accounts on your site.', 'buddypress' ) . '</p>' .
-                '<p>' . __( 'From the screen options, you can customize the displayed columns and the pagination of this screen.', 'buddypress' ) . '</p>' .
-                '<p>' . __( 'You can reorder the list of your pending accounts by clicking on the Username, Email or Registered column headers.', 'buddypress' ) . '</p>' .
-                '<p>' . __( 'Using the search form, you can find pending accounts more easily. The Username and Email fields will be included in the search.', 'buddypress' ) . '</p>'
-            ) );
-
-            get_current_screen()->add_help_tab( array(
-                'id'      => 'bp-signups-actions',
-                'title'   => __( 'Actions', 'buddypress' ),
-                'content' =>
-                '<p>' . __( 'Hovering over a row in the pending accounts list will display action links that allow you to manage pending accounts. You can perform the following actions:', 'buddypress' ) . '</p>' .
-                '<ul><li>' . __( '"Email" takes you to the confirmation screen before being able to send the activation link to the desired pending account. You can only send the activation email once per day.', 'buddypress' ) . '</li>' .
-                '<li>' . __( '"Delete" allows you to delete a pending account from your site. You will be asked to confirm this deletion.', 'buddypress' ) . '</li></ul>' .
-                '<p>' . __( 'By clicking on a Username you will be able to activate a pending account from the confirmation screen.', 'buddypress' ) . '</p>' .
-                '<p>' . __( 'Bulk actions allow you to perform these 3 actions for the selected rows.', 'buddypress' ) . '</p>'
-            ) );
-
-            // Help panel - sidebar links.
-            get_current_screen()->set_help_sidebar(
-                '<p><strong>' . __( 'For more information:', 'buddypress' ) . '</strong></p>' .
-                '<p>' . __( '<a href="https://buddypress.org/support/">Support Forums</a>', 'buddypress' ) . '</p>'
-            );
-
-            // Add accessible hidden headings and text for the Pending Users screen.
-            if ( bp_get_major_wp_version() >= 4.4 ) {
-                get_current_screen()->set_screen_reader_content( array(
-                    'heading_views'      => __( 'Filter users list', 'buddypress' ),
-                    'heading_pagination' => __( 'Pending users list navigation', 'buddypress' ),
-                    'heading_list'       => __( 'Pending users list', 'buddypress' ),
-                ) ); 
-            }
-
-        } else {
-            if ( ! empty( $_REQUEST['signup_ids' ] ) ) {
-                $signups = wp_parse_id_list( $_REQUEST['signup_ids' ] );
-            }
-
-            // Handle resent activation links.
-            if ( 'do_resend' == $doaction ) {
-
-                // Nonce check.
-                check_admin_referer( 'signups_resend' );
-
-                $resent = BP_Signup::resend( $signups );
-
-                if ( empty( $resent ) ) {
-                    $redirect_to = add_query_arg( 'error', $doaction, $redirect_to );
-                } else {
-                    $query_arg = array( 'updated' => 'resent' );
-
-                    if ( ! empty( $resent['resent'] ) ) {
-                        $query_arg['resent'] = count( $resent['resent'] );
-                    }
-
-                    if ( ! empty( $resent['errors'] ) ) {
-                        $query_arg['notsent'] = count( $resent['errors'] );
-                        set_transient( '_bp_admin_signups_errors', $resent['errors'], 30 );
-                    }
-
-                    $redirect_to = add_query_arg( $query_arg, $redirect_to );
-                }
-
-                bp_core_redirect( $redirect_to );
-
-            // Handle activated accounts.
-            } elseif ( 'do_activate' == $doaction ) {
-
-                // Nonce check.
-                check_admin_referer( 'signups_activate' );
-
-                $activated = BP_Signup::activate( $signups );
-
-                if ( empty( $activated ) ) {
-                    $redirect_to = add_query_arg( 'error', $doaction, $redirect_to );
-                } else {
-                    $query_arg = array( 'updated' => 'activated' );
-
-                    if ( ! empty( $activated['activated'] ) ) {
-                        $query_arg['activated'] = count( $activated['activated'] );
-                    }
-
-                    if ( ! empty( $activated['errors'] ) ) {
-                        $query_arg['notactivated'] = count( $activated['errors'] );
-                        set_transient( '_bp_admin_signups_errors', $activated['errors'], 30 );
-                    }
-
-                    $redirect_to = add_query_arg( $query_arg, $redirect_to );
-                }
-
-                bp_core_redirect( $redirect_to );
-
-            // Handle sign-ups delete.
-            } elseif ( 'do_delete' == $doaction ) {
-
-                // Nonce check.
-                check_admin_referer( 'signups_delete' );
-
-                $deleted = BP_Signup::delete( $signups );
-
-                if ( empty( $deleted ) ) {
-                    $redirect_to = add_query_arg( 'error', $doaction, $redirect_to );
-                } else {
-                    $query_arg = array( 'updated' => 'deleted' );
-
-                    if ( ! empty( $deleted['deleted'] ) ) {
-                        $query_arg['deleted'] = count( $deleted['deleted'] );
-                    }
-
-                    if ( ! empty( $deleted['errors'] ) ) {
-                        $query_arg['notdeleted'] = count( $deleted['errors'] );
-                        set_transient( '_bp_admin_signups_errors', $deleted['errors'], 30 );
-                    }
-
-                    $redirect_to = add_query_arg( $query_arg, $redirect_to );
-                }
-
-                bp_core_redirect( $redirect_to );
-
-            // Plugins can update other stuff from here.
-            } else {
-                $this->redirect = $redirect_to;
-
-                /**
-                 * Fires at end of signups admin load if doaction does not match any actions.
-                 *
-                 * @since 2.0.0
-                 *
-                 * @param string $doaction Current bulk action being processed.
-                 * @param array  $_REQUEST Current $_REQUEST global.
-                 * @param string $redirect Determined redirect url to send user to.
-                 */
-                do_action( 'bp_members_admin_update_signups', $doaction, $_REQUEST, $this->redirect );
-
-                bp_core_redirect( $this->redirect );
-            }
-        }
-    }
-
-    /**
-     * Display any activation errors.
-     *
-     * @since 2.0.0
-     */
-    public function signups_display_errors() {
-
-        // Look for sign-up errors.
-        $errors = get_transient( '_bp_admin_signups_errors' );
-
-        // Bail if no activation errors.
-        if ( empty( $errors ) ) {
-            return;
-        }
-
-        // Loop through errors and display them.
-        foreach ( $errors as $error ) : ?>
-
-            <li><?php echo esc_html( $error[0] );?>: <?php echo esc_html( $error[1] );?></li>
-
-        <?php endforeach;
-
-        // Delete the redirect transient.
-        delete_transient( '_bp_admin_signups_errors' );
-    }
-
-    /**
-     * Get admin notice when viewing the sign-up page.
-     *
-     * @since 2.1.0
-     *
-     * @return array
-     */
-    private function get_signup_notice() {
-
-        // Setup empty notice for return value.
-        $notice = array();
-
-        // Updates.
-        if ( ! empty( $_REQUEST['updated'] ) ) {
-            switch ( $_REQUEST['updated'] ) {
-                case 'resent':
-                    $notice = array(
-                        'class'   => 'updated',
-                        'message' => ''
-                    );
-
-                    if ( ! empty( $_REQUEST['resent'] ) ) {
-                        $notice['message'] .= sprintf(
-                            _nx( '%s activation email successfully sent! ', '%s activation emails successfully sent! ',
-                             absint( $_REQUEST['resent'] ),
-                             'signup resent',
-                             'buddypress'
-                            ),
-                            number_format_i18n( absint( $_REQUEST['resent'] ) )
-                        );
-                    }
-
-                    if ( ! empty( $_REQUEST['notsent'] ) ) {
-                        $notice['message'] .= sprintf(
-                            _nx( '%s activation email was not sent.', '%s activation emails were not sent.',
-                             absint( $_REQUEST['notsent'] ),
-                             'signup notsent',
-                             'buddypress'
-                            ),
-                            number_format_i18n( absint( $_REQUEST['notsent'] ) )
-                        );
-
-                        if ( empty( $_REQUEST['resent'] ) ) {
-                            $notice['class'] = 'error';
-                        }
-                    }
-
-                    break;
-
-                case 'activated':
-                    $notice = array(
-                        'class'   => 'updated',
-                        'message' => ''
-                    );
-
-                    if ( ! empty( $_REQUEST['activated'] ) ) {
-                        $notice['message'] .= sprintf(
-                            _nx( '%s account successfully activated! ', '%s accounts successfully activated! ',
-                             absint( $_REQUEST['activated'] ),
-                             'signup resent',
-                             'buddypress'
-                            ),
-                            number_format_i18n( absint( $_REQUEST['activated'] ) )
-                        );
-                    }
-
-                    if ( ! empty( $_REQUEST['notactivated'] ) ) {
-                        $notice['message'] .= sprintf(
-                            _nx( '%s account was not activated.', '%s accounts were not activated.',
-                             absint( $_REQUEST['notactivated'] ),
-                             'signup notsent',
-                             'buddypress'
-                            ),
-                            number_format_i18n( absint( $_REQUEST['notactivated'] ) )
-                        );
-
-                        if ( empty( $_REQUEST['activated'] ) ) {
-                            $notice['class'] = 'error';
-                        }
-                    }
-
-                    break;
-
-                case 'deleted':
-                    $notice = array(
-                        'class'   => 'updated',
-                        'message' => ''
-                    );
-
-                    if ( ! empty( $_REQUEST['deleted'] ) ) {
-                        $notice['message'] .= sprintf(
-                            _nx( '%s sign-up successfully deleted!', '%s sign-ups successfully deleted!',
-                             absint( $_REQUEST['deleted'] ),
-                             'signup deleted',
-                             'buddypress'
-                            ),
-                            number_format_i18n( absint( $_REQUEST['deleted'] ) )
-                        );
-                    }
-
-                    if ( ! empty( $_REQUEST['notdeleted'] ) ) {
-                        $notice['message'] .= sprintf(
-                            _nx( '%s sign-up was not deleted.', '%s sign-ups were not deleted.',
-                             absint( $_REQUEST['notdeleted'] ),
-                             'signup notdeleted',
-                             'buddypress'
-                            ),
-                            number_format_i18n( absint( $_REQUEST['notdeleted'] ) )
-                        );
-
-                        if ( empty( $_REQUEST['deleted'] ) ) {
-                            $notice['class'] = 'error';
-                        }
-                    }
-
-                    break;
-            }
-        }
-
-        // Errors.
-        if ( ! empty( $_REQUEST['error'] ) ) {
-            switch ( $_REQUEST['error'] ) {
-                case 'do_resend':
-                    $notice = array(
-                        'class'   => 'error',
-                        'message' => esc_html__( 'There was a problem sending the activation emails. Please try again.', 'buddypress' ),
-                    );
-                    break;
-
-                case 'do_activate':
-                    $notice = array(
-                        'class'   => 'error',
-                        'message' => esc_html__( 'There was a problem activating accounts. Please try again.', 'buddypress' ),
-                    );
-                    break;
-
-                case 'do_delete':
-                    $notice = array(
-                        'class'   => 'error',
-                        'message' => esc_html__( 'There was a problem deleting sign-ups. Please try again.', 'buddypress' ),
-                    );
-                    break;
-            }
-        }
-
-        return $notice;
-    }
-
-    /**
-     * Signups admin page router.
-     *
-     * Depending on the context, display
-     * - the list of signups,
-     * - or the delete confirmation screen,
-     * - or the activate confirmation screen,
-     * - or the "resend" email confirmation screen.
-     *
-     * Also prepare the admin notices.
-     *
-     * @since 2.0.0
-     */
-    public function signups_admin() {
-        $doaction = bp_admin_list_table_current_bulk_action();
-
-        // Prepare notices for admin.
-        $notice = $this->get_signup_notice();
-
-        // Display notices.
-        if ( ! empty( $notice ) ) :
-            if ( 'updated' === $notice['class'] ) : ?>
-
-                <div id="message" class="<?php echo esc_attr( $notice['class'] ); ?>">
-
-            <?php else: ?>
-
-                <div class="<?php echo esc_attr( $notice['class'] ); ?>">
-
-            <?php endif; ?>
-
-                <p><?php echo $notice['message']; ?></p>
-
-                <?php if ( ! empty( $_REQUEST['notactivated'] ) || ! empty( $_REQUEST['notdeleted'] ) || ! empty( $_REQUEST['notsent'] ) ) :?>
-
-                    <ul><?php $this->signups_display_errors();?></ul>
-
-                <?php endif ;?>
-
-            </div>
-
-        <?php endif;
-
-        // Show the proper screen.
-        switch ( $doaction ) {
-            case 'activate' :
-            case 'delete' :
-            case 'resend' :
-                $this->signups_admin_manage( $doaction );
-                break;
-
-            default:
-                $this->signups_admin_index();
-                break;
-
-        }
-    }
-
-    /**
-     * This is the list of the Pending accounts (signups).
-     *
-     * @since 2.0.0
-     *
-     * @global $plugin_page
-     * @global $bp_members_signup_list_table
-     */
-    public function signups_admin_index() {
-        global $plugin_page, $bp_members_signup_list_table;
-
-        $usersearch = ! empty( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : '';
-
-        // Prepare the group items for display.
-        $bp_members_signup_list_table->prepare_items();
-
-        if ( is_network_admin() ) {
-            $form_url = network_admin_url( 'users.php' );
-        } else {
-            $form_url = bp_get_admin_url( 'users.php' );
-        }
-
-        $form_url = add_query_arg(
-            array(
-                'page' => 'bp-signups',
-            ),
-            $form_url
-        );
-
-        $search_form_url = remove_query_arg(
-            array(
-                'action',
-                'deleted',
-                'notdeleted',
-                'error',
-                'updated',
-                'delete',
-                'activate',
-                'activated',
-                'notactivated',
-                'resend',
-                'resent',
-                'notresent',
-                'do_delete',
-                'do_activate',
-                'do_resend',
-                'action2',
-                '_wpnonce',
-                'signup_ids'
-            ), $_SERVER['REQUEST_URI']
-        );
-
-        ?>
-
-        <div class="wrap">
-            <h1><?php _e( 'Users', 'buddypress' ); ?>
-
-                <?php if ( current_user_can( 'create_users' ) ) : ?>
-
-                    <a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user', 'buddypress' ); ?></a>
-
-                <?php elseif ( is_multisite() && current_user_can( 'promote_users' ) ) : ?>
-
-                    <a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add Existing', 'user', 'buddypress' ); ?></a>
-
-                <?php endif;
-
-                if ( $usersearch ) {
-                    printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;', 'buddypress' ) . '</span>', esc_html( $usersearch ) );
-                }
-
-                ?>
-            </h1>
-
-            <?php // Display each signups on its own row. ?>
-            <?php $bp_members_signup_list_table->views(); ?>
-
-            <form id="bp-signups-search-form" action="<?php echo esc_url( $search_form_url ) ;?>">
-                <input type="hidden" name="page" value="<?php echo esc_attr( $plugin_page ); ?>" />
-                <?php $bp_members_signup_list_table->search_box( __( 'Search Pending Users', 'buddypress' ), 'bp-signups' ); ?>
-            </form>
-
-            <form id="bp-signups-form" action="<?php echo esc_url( $form_url );?>" method="post">
-                <?php $bp_members_signup_list_table->display(); ?>
-            </form>
-        </div>
-    <?php
-    }
-
-    /**
-     * This is the confirmation screen for actions.
-     *
-     * @since 2.0.0
-     *
-     * @param string $action Delete, activate, or resend activation link.
-     * @return string
-     */
-    public function signups_admin_manage( $action = '' ) {
-        if ( ! current_user_can( $this->capability ) || empty( $action ) ) {
-            die( '-1' );
-        }
-
-        // Get the user IDs from the URL.
-        $ids = false;
-        if ( ! empty( $_POST['allsignups'] ) ) {
-            $ids = wp_parse_id_list( $_POST['allsignups'] );
-        } elseif ( ! empty( $_GET['signup_id'] ) ) {
-            $ids = absint( $_GET['signup_id'] );
-        }
-
-        if ( empty( $ids ) ) {
-            return false;
-        }
-
-        // Query for signups, and filter out those IDs that don't
-        // correspond to an actual signup.
-        $signups_query = BP_Signup::get( array(
-            'include' => $ids,
-        ) );
-
-        $signups    = $signups_query['signups'];
-        $signup_ids = wp_list_pluck( $signups, 'signup_id' );
-
-        // Set up strings.
-        switch ( $action ) {
-            case 'delete' :
-                $header_text = __( 'Delete Pending Accounts', 'buddypress' );
-                if ( 1 == count( $signup_ids ) ) {
-                    $helper_text = __( 'You are about to delete the following account:', 'buddypress' );
-                } else {
-                    $helper_text = __( 'You are about to delete the following accounts:', 'buddypress' );
-                }
-                break;
-
-            case 'activate' :
-                $header_text = __( 'Activate Pending Accounts', 'buddypress' );
-                if ( 1 == count( $signup_ids ) ) {
-                    $helper_text = __( 'You are about to activate the following account:', 'buddypress' );
-                } else {
-                    $helper_text = __( 'You are about to activate the following accounts:', 'buddypress' );
-                }
-                break;
-
-            case 'resend' :
-                $header_text = __( 'Resend Activation Emails', 'buddypress' );
-                if ( 1 == count( $signup_ids ) ) {
-                    $helper_text = __( 'You are about to resend an activation email to the following account:', 'buddypress' );
-                } else {
-                    $helper_text = __( 'You are about to resend an activation email to the following accounts:', 'buddypress' );
-                }
-                break;
-        }
-
-        // These arguments are added to all URLs.
-        $url_args = array( 'page' => 'bp-signups' );
-
-        // These arguments are only added when performing an action.
-        $action_args = array(
-            'action'     => 'do_' . $action,
-            'signup_ids' => implode( ',', $signup_ids )
-        );
-
-        if ( is_network_admin() ) {
-            $base_url = network_admin_url( 'users.php' );
-        } else {
-            $base_url = bp_get_admin_url( 'users.php' );
-        }
-
-        $cancel_url = add_query_arg( $url_args, $base_url );
-        $action_url = wp_nonce_url(
-            add_query_arg(
-                array_merge( $url_args, $action_args ),
-                $base_url
-            ),
-            'signups_' . $action
-        );
-
-        ?>
-
-        <div class="wrap">
-            <h1><?php echo esc_html( $header_text ); ?></h1>
-            <p><?php echo esc_html( $helper_text ); ?></p>
-
-            <ol class="bp-signups-list">
-            <?php foreach ( $signups as $signup ) :
-
-                $last_notified = mysql2date( 'Y/m/d g:i:s a', $signup->date_sent ); ?>
-
-                <li>
-                    <?php echo esc_html( $signup->user_name ) ?> - <?php echo sanitize_email( $signup->user_email );?>
-
-                    <?php if ( 'resend' == $action ) : ?>
-
-                        <p class="description">
-                            <?php printf( esc_html__( 'Last notified: %s', 'buddypress'), $last_notified ) ;?>
-
-                            <?php if ( ! empty( $signup->recently_sent ) ) : ?>
-
-                                <span class="attention wp-ui-text-notification"> <?php esc_html_e( '(less than 24 hours ago)', 'buddypress' ); ?></span>
-
-                            <?php endif; ?>
-                        </p>
-
-                    <?php endif; ?>
-
-                </li>
-
-            <?php endforeach; ?>
-            </ol>
-
-            <?php if ( 'delete' === $action ) : ?>
-
-                <p><strong><?php esc_html_e( 'This action cannot be undone.', 'buddypress' ) ?></strong></p>
-
-            <?php endif ; ?>
-
-            <a class="button-primary" href="<?php echo esc_url( $action_url ); ?>"><?php esc_html_e( 'Confirm', 'buddypress' ); ?></a>
-            <a class="button" href="<?php echo esc_url( $cancel_url ); ?>"><?php esc_html_e( 'Cancel', 'buddypress' ) ?></a>
-        </div>
-
-        <?php
-    }
-}
-endif; // End class_exists check.
+require dirname( __FILE__ ) . '/classes/class-bp-members-admin.php';
 
 // Load the BP Members admin.

trunk/src/bp-members/bp-members-loader.php

@@ -11 +11 @@
 defined( 'ABSPATH' ) || exit;
 
-/**
- * Defines the BuddyPress Members Component.
- */
-class BP_Members_Component extends BP_Component {
-
-    /**
-     * Member types.
-     *
-     * @see bp_register_member_type()
-     *
-     * @since 2.2.0
-     * @var array
-     */
-    public $types = array();
-
-    /**
-     * Start the members component creation process.
-     *
-     * @since 1.5.0
-     */
-    public function __construct() {
-        parent::start(
-            'members',
-            __( 'Members', 'buddypress' ),
-            buddypress()->plugin_dir,
-            array(
-                'adminbar_myaccount_order' => 20,
-                'search_query_arg' => 'members_search',
-            )
-        );
-    }
-
-    /**
-     * Include bp-members files.
-     *
-     * @see BP_Component::includes() for description of parameters.
-     *
-     * @param array $includes See {@link BP_Component::includes()}.
-     */
-    public function includes( $includes = array() ) {
-
-        // Always include these files.
-        $includes = array(
-            'actions',
-            'classes',
-            'filters',
-            'screens',
-            'template',
-            'adminbar',
-            'functions',
-            'widgets',
-            'cache',
-        );
-
-        if ( bp_is_active( 'activity' ) ) {
-            $includes[] = 'activity';
-        }
-
-        // Include these only if in admin.
-        if ( is_admin() ) {
-            $includes[] = 'admin';
-        }
-
-        parent::includes( $includes );
-    }
-
-    /**
-     * Set up bp-members global settings.
-     *
-     * The BP_MEMBERS_SLUG constant is deprecated, and only used here for
-     * backwards compatibility.
-     *
-     * @since 1.5.0
-     *
-     * @see BP_Component::setup_globals() for description of parameters.
-     *
-     * @param array $args See {@link BP_Component::setup_globals()}.
-     */
-    public function setup_globals( $args = array() ) {
-        global $wpdb;
-
-        $bp = buddypress();
-
-        /** Component Globals ************************************************
-         */
-
-        // Define a slug, as a fallback for backpat.
-        if ( !defined( 'BP_MEMBERS_SLUG' ) ) {
-            define( 'BP_MEMBERS_SLUG', $this->id );
-        }
-
-        // Override any passed args.
-        $args = array(
-            'slug'            => BP_MEMBERS_SLUG,
-            'root_slug'       => isset( $bp->pages->members->slug ) ? $bp->pages->members->slug : BP_MEMBERS_SLUG,
-            'has_directory'   => true,
-            'directory_title' => _x( 'Members', 'component directory title', 'buddypress' ),
-            'search_string'   => __( 'Search Members...', 'buddypress' ),
-            'global_tables'   => array(
-                'table_name_last_activity' => bp_core_get_table_prefix() . 'bp_activity',
-                'table_name_signups'       => $wpdb->base_prefix . 'signups', // signups is a global WordPress table
-            )
-        );
-
-        parent::setup_globals( $args );
-
-        /** Logged in user ***************************************************
-         */
-
-        // The core userdata of the user who is currently logged in.
-        $bp->loggedin_user->userdata       = bp_core_get_core_userdata( bp_loggedin_user_id() );
-
-        // Fetch the full name for the logged in user.
-        $bp->loggedin_user->fullname       = isset( $bp->loggedin_user->userdata->display_name ) ? $bp->loggedin_user->userdata->display_name : '';
-
-        // Hits the DB on single WP installs so get this separately.
-        $bp->loggedin_user->is_super_admin = $bp->loggedin_user->is_site_admin = is_super_admin( bp_loggedin_user_id() );
-
-        // The domain for the user currently logged in. eg: http://example.com/members/andy.
-        $bp->loggedin_user->domain         = bp_core_get_user_domain( bp_loggedin_user_id() );
-
-        /** Displayed user ***************************************************
-         */
-
-        // The core userdata of the user who is currently being displayed.
-        $bp->displayed_user->userdata = bp_core_get_core_userdata( bp_displayed_user_id() );
-
-        // Fetch the full name displayed user.
-        $bp->displayed_user->fullname = isset( $bp->displayed_user->userdata->display_name ) ? $bp->displayed_user->userdata->display_name : '';
-
-        // The domain for the user currently being displayed.
-        $bp->displayed_user->domain   = bp_core_get_user_domain( bp_displayed_user_id() );
-
-        /** Signup ***********************************************************
-         */
-
-        $bp->signup = new stdClass;
-
-        /** Profiles Fallback ************************************************
-         */
-
-        if ( ! bp_is_active( 'xprofile' ) ) {
-            $bp->profile       = new stdClass;
-            $bp->profile->slug = 'profile';
-            $bp->profile->id   = 'profile';
-        }
-    }
-
-    /**
-     * Set up canonical stack for this component.
-     *
-     * @since 2.1.0
-     */
-    public function setup_canonical_stack() {
-        $bp = buddypress();
-
-        /** Default Profile Component ****************************************
-         */
-
-        if ( defined( 'BP_DEFAULT_COMPONENT' ) && BP_DEFAULT_COMPONENT ) {
-            $bp->default_component = BP_DEFAULT_COMPONENT;
-        } else {
-            if ( bp_is_active( 'activity' ) && isset( $bp->pages->activity ) ) {
-                $bp->default_component = bp_get_activity_slug();
-            } else {
-                $bp->default_component = ( 'xprofile' === $bp->profile->id ) ? 'profile' : $bp->profile->id;
-            }
-        }
-
-        /** Canonical Component Stack ****************************************
-         */
-
-        if ( bp_displayed_user_id() ) {
-            $bp->canonical_stack['base_url'] = bp_displayed_user_domain();
-
-            if ( bp_current_component() ) {
-                $bp->canonical_stack['component'] = bp_current_component();
-            }
-
-            if ( bp_current_action() ) {
-                $bp->canonical_stack['action'] = bp_current_action();
-            }
-
-            if ( !empty( $bp->action_variables ) ) {
-                $bp->canonical_stack['action_variables'] = bp_action_variables();
-            }
-
-            // Looking at the single member root/home, so assume the default.
-            if ( ! bp_current_component() ) {
-                $bp->current_component = $bp->default_component;
-
-            // The canonical URL will not contain the default component.
-            } elseif ( bp_is_current_component( $bp->default_component ) && ! bp_current_action() ) {
-                unset( $bp->canonical_stack['component'] );
-            }
-
-            // If we're on a spammer's profile page, only users with the 'bp_moderate' cap
-            // can view subpages on the spammer's profile.
-            //
-            // users without the cap trying to access a spammer's subnav page will get
-            // redirected to the root of the spammer's profile page.  this occurs by
-            // by removing the component in the canonical stack.
-            if ( bp_is_user_spammer( bp_displayed_user_id() ) && ! bp_current_user_can( 'bp_moderate' ) ) {
-                unset( $bp->canonical_stack['component'] );
-            }
-        }
-    }
-
-    /**
-     * Set up fall-back component navigation if XProfile is inactive.
-     *
-     * @since 1.5.0
-     *
-     * @see BP_Component::setup_nav() for a description of arguments.
-     *
-     * @param array $main_nav Optional. See BP_Component::setup_nav() for
-     *                        description.
-     * @param array $sub_nav  Optional. See BP_Component::setup_nav() for
-     *                        description.
-     */
-    public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
-
-        // Bail if XProfile component is active.
-        if ( bp_is_active( 'xprofile' ) ) {
-            return;
-        }
-
-        // Don't set up navigation if there's no member.
-        if ( ! is_user_logged_in() && ! bp_is_user() ) {
-            return;
-        }
-
-        // Determine user to use.
-        if ( bp_displayed_user_domain() ) {
-            $user_domain = bp_displayed_user_domain();
-        } elseif ( bp_loggedin_user_domain() ) {
-            $user_domain = bp_loggedin_user_domain();
-        } else {
-            return;
-        }
-
-        $slug         = bp_get_profile_slug();
-        $profile_link = trailingslashit( $user_domain . $slug );
-
-        // Setup the main navigation.
-        $main_nav = array(
-            'name'                => _x( 'Profile', 'Member profile main navigation', 'buddypress' ),
-            'slug'                => $slug,
-            'position'            => 20,
-            'screen_function'     => 'bp_members_screen_display_profile',
-            'default_subnav_slug' => 'public',
-            'item_css_id'         => buddypress()->profile->id
-        );
-
-        // Setup the subnav items for the member profile.
-        $sub_nav[] = array(
-            'name'            => _x( 'View', 'Member profile view', 'buddypress' ),
-            'slug'            => 'public',
-            'parent_url'      => $profile_link,
-            'parent_slug'     => $slug,
-            'screen_function' => 'bp_members_screen_display_profile',
-            'position'        => 10
-        );
-
-        parent::setup_nav( $main_nav, $sub_nav );
-    }
-
-    /**
-     * Set up the title for pages and <title>.
-     */
-    public function setup_title() {
-        $bp = buddypress();
-
-        if ( bp_is_my_profile() ) {
-            $bp->bp_options_title = __( 'You', 'buddypress' );
-        } elseif ( bp_is_user() ) {
-            $bp->bp_options_title  = bp_get_displayed_user_fullname();
-            $bp->bp_options_avatar = bp_core_fetch_avatar( array(
-                'item_id' => bp_displayed_user_id(),
-                'type'    => 'thumb',
-                'alt'     => sprintf( __( 'Profile picture of %s', 'buddypress' ), $bp->bp_options_title )
-            ) );
-        }
-
-        parent::setup_title();
-    }
-
-    /**
-     * Setup cache groups.
-     *
-     * @since 2.2.0
-     */
-    public function setup_cache_groups() {
-
-        // Global groups.
-        wp_cache_add_global_groups( array(
-            'bp_last_activity',
-            'bp_member_type'
-        ) );
-
-        parent::setup_cache_groups();
-    }
-}
+require dirname( __FILE__ ) . '/classes/class-bp-members-component.php';
 
 /**

trunk/src/bp-members/bp-members-screens.php

@@ -12 +12 @@
 // Exit if accessed directly.
 defined( 'ABSPATH' ) || exit;
+
+require dirname( __FILE__ ) . '/classes/class-bp-members-theme-compat.php';
+require dirname( __FILE__ ) . '/classes/class-bp-registration-theme-compat.php';
 
 /**
@@ -382 +385 @@
 /** Theme Compatibility *******************************************************/
 
-/**
- * The main theme compat class for BuddyPress Members.
- *
- * This class sets up the necessary theme compatibility actions to safely output
- * member template parts to the_title and the_content areas of a theme.
- *
- * @since 1.7.0
- */
-class BP_Members_Theme_Compat {
-
-    /**
-     * Set up the members component theme compatibility.
-     *
-     * @since 1.7.0
-     */
-    public function __construct() {
-        add_action( 'bp_setup_theme_compat', array( $this, 'is_members' ) );
-    }
-
-    /**
-     * Are we looking at something that needs members theme compatibility?
-     *
-     * @since 1.7.0
-     */
-    public function is_members() {
-
-        // Bail if not looking at the members component or a user's page.
-        if ( ! bp_is_members_component() && ! bp_is_user() ) {
-            return;
-        }
-
-        // Members Directory.
-        if ( ! bp_current_action() && ! bp_current_item() ) {
-            bp_update_is_directory( true, 'members' );
-
-            /**
-             * Fires if looking at Members directory when needing theme compat.
-             *
-             * @since 1.5.0
-             */
-            do_action( 'bp_members_screen_index' );
-
-            add_filter( 'bp_get_buddypress_template',                array( $this, 'directory_template_hierarchy' ) );
-            add_action( 'bp_template_include_reset_dummy_post_data', array( $this, 'directory_dummy_post' ) );
-            add_filter( 'bp_replace_the_content',                    array( $this, 'directory_content'    ) );
-
-        // User page.
-        } elseif ( bp_is_user() ) {
-
-            // If we're on a single activity permalink page, we shouldn't use the members
-            // template, so stop here!
-            if ( bp_is_active( 'activity' ) && bp_is_single_activity() ) {
-                return;
-            }
-
-            /**
-             * Fires if looking at Members user page when needing theme compat.
-             *
-             * @since 1.5.0
-             */
-            do_action( 'bp_members_screen_display_profile' );
-
-            add_filter( 'bp_get_buddypress_template',                array( $this, 'single_template_hierarchy' ) );
-            add_action( 'bp_template_include_reset_dummy_post_data', array( $this, 'single_dummy_post'    ) );
-            add_filter( 'bp_replace_the_content',                    array( $this, 'single_dummy_content' ) );
-
-        }
-    }
-
-    /** Directory *************************************************************/
-
-    /**
-     * Add template hierarchy to theme compat for the members directory page.
-     *
-     * This is to mirror how WordPress has
-     * {@link https://codex.wordpress.org/Template_Hierarchy template hierarchy}.
-     *
-     * @since 1.8.0
-     *
-     * @param array $templates The templates from bp_get_theme_compat_templates().
-     * @return array $templates Array of custom templates to look for.
-     */
-    public function directory_template_hierarchy( $templates = array() ) {
-
-        // Set up the template hierarchy.
-        $new_templates = array();
-        if ( '' !== bp_get_current_member_type() ) {
-            $new_templates[] = 'members/index-directory-type-' . sanitize_file_name( bp_get_current_member_type() ) . '.php';
-        }
-        $new_templates[] = 'members/index-directory.php';
-
-        /**
-         * Filters the template hierarchy for theme compat and members directory page.
-         *
-         * @since 1.8.0
-         *
-         * @param array $value Array of template paths to add to hierarchy.
-         */
-        $new_templates = apply_filters( 'bp_template_hierarchy_members_directory', $new_templates );
-
-        // Merge new templates with existing stack
-        // @see bp_get_theme_compat_templates().
-        $templates = array_merge( (array) $new_templates, $templates );
-
-        return $templates;
-    }
-
-    /**
-     * Update the global $post with directory data.
-     *
-     * @since 1.7.0
-     */
-    public function directory_dummy_post() {
-        bp_theme_compat_reset_post( array(
-            'ID'             => 0,
-            'post_title'     => bp_get_directory_title( 'members' ),
-            'post_author'    => 0,
-            'post_date'      => 0,
-            'post_content'   => '',
-            'post_type'      => 'page',
-            'post_status'    => 'publish',
-            'is_page'        => true,
-            'comment_status' => 'closed'
-        ) );
-    }
-
-    /**
-     * Filter the_content with the members index template part.
-     *
-     * @since 1.7.0
-     */
-    public function directory_content() {
-        return bp_buffer_template_part( 'members/index', null, false );
-    }
-
-    /** Single ****************************************************************/
-
-    /**
-     * Add custom template hierarchy to theme compat for member pages.
-     *
-     * This is to mirror how WordPress has
-     * {@link https://codex.wordpress.org/Template_Hierarchy template hierarchy}.
-     *
-     * @since 1.8.0
-     *
-     * @param string $templates The templates from
-     *                          bp_get_theme_compat_templates().
-     * @return array $templates Array of custom templates to look for.
-     */
-    public function single_template_hierarchy( $templates ) {
-        // Setup some variables we're going to reference in our custom templates.
-        $user_nicename = buddypress()->displayed_user->userdata->user_nicename;
-
-        /**
-         * Filters the template hierarchy for theme compat and member pages.
-         *
-         * @since 1.8.0
-         *
-         * @param array $value Array of template paths to add to hierarchy.
-         */
-        $new_templates = apply_filters( 'bp_template_hierarchy_members_single_item', array(
-            'members/single/index-id-'        . sanitize_file_name( bp_displayed_user_id() ) . '.php',
-            'members/single/index-nicename-'  . sanitize_file_name( $user_nicename )         . '.php',
-            'members/single/index-action-'    . sanitize_file_name( bp_current_action() )    . '.php',
-            'members/single/index-component-' . sanitize_file_name( bp_current_component() ) . '.php',
-            'members/single/index.php'
-        ) );
-
-        // Merge new templates with existing stack
-        // @see bp_get_theme_compat_templates().
-        $templates = array_merge( (array) $new_templates, $templates );
-
-        return $templates;
-    }
-
-    /**
-     * Update the global $post with the displayed user's data.
-     *
-     * @since 1.7.0
-     */
-    public function single_dummy_post() {
-        bp_theme_compat_reset_post( array(
-            'ID'             => 0,
-            'post_title'     => bp_get_displayed_user_fullname(),
-            'post_author'    => 0,
-            'post_date'      => 0,
-            'post_content'   => '',
-            'post_type'      => 'page',
-            'post_status'    => 'publish',
-            'is_page'        => true,
-            'comment_status' => 'closed'
-        ) );
-    }
-
-    /**
-     * Filter the_content with the members' single home template part.
-     *
-     * @since 1.7.0
-     */
-    public function single_dummy_content() {
-        return bp_buffer_template_part( 'members/single/home', null, false );
-    }
-}
 new BP_Members_Theme_Compat();
-
-/**
- * The main theme compat class for BuddyPress Registration.
- *
- * This class sets up the necessary theme compatibility actions to safely output
- * registration template parts to the_title and the_content areas of a theme.
- *
- * @since 1.7.0
- */
-class BP_Registration_Theme_Compat {
-
-    /**
-     * Setup the groups component theme compatibility.
-     *
-     * @since 1.7.0
-     */
-    public function __construct() {
-        add_action( 'bp_setup_theme_compat', array( $this, 'is_registration' ) );
-    }
-
-    /**
-     * Are we looking at either the registration or activation pages?
-     *
-     * @since 1.7.0
-     */
-    public function is_registration() {
-
-        // Bail if not looking at the registration or activation page.
-        if ( ! bp_is_register_page() && ! bp_is_activation_page() ) {
-            return;
-        }
-
-        // Not a directory.
-        bp_update_is_directory( false, 'register' );
-
-        // Setup actions.
-        add_filter( 'bp_get_buddypress_template',                array( $this, 'template_hierarchy' ) );
-        add_action( 'bp_template_include_reset_dummy_post_data', array( $this, 'dummy_post'    ) );
-        add_filter( 'bp_replace_the_content',                    array( $this, 'dummy_content' ) );
-    }
-
-    /** Template ***********************************************************/
-
-    /**
-     * Add template hierarchy to theme compat for registration/activation pages.
-     *
-     * This is to mirror how WordPress has
-     * {@link https://codex.wordpress.org/Template_Hierarchy template hierarchy}.
-     *
-     * @since 1.8.0
-     *
-     * @param string $templates The templates from bp_get_theme_compat_templates().
-     * @return array $templates Array of custom templates to look for.
-     */
-    public function template_hierarchy( $templates ) {
-        $component = sanitize_file_name( bp_current_component() );
-
-        /**
-         * Filters the template hierarchy for theme compat and registration/activation pages.
-         *
-         * This filter is a variable filter that depends on the current component
-         * being used.
-         *
-         * @since 1.8.0
-         *
-         * @param array $value Array of template paths to add to hierarchy.
-         */
-        $new_templates = apply_filters( "bp_template_hierarchy_{$component}", array(
-            "members/index-{$component}.php"
-        ) );
-
-        // Merge new templates with existing stack
-        // @see bp_get_theme_compat_templates().
-        $templates = array_merge( (array) $new_templates, $templates );
-
-        return $templates;
-    }
-
-    /**
-     * Update the global $post with dummy data.
-     *
-     * @since 1.7.0
-     */
-    public function dummy_post() {
-        // Registration page.
-        if ( bp_is_register_page() ) {
-            $title = __( 'Create an Account', 'buddypress' );
-
-            if ( 'completed-confirmation' == bp_get_current_signup_step() ) {
-                $title = __( 'Check Your Email To Activate Your Account!', 'buddypress' );
-            }
-
-        // Activation page.
-        } else {
-            $title = __( 'Activate Your Account', 'buddypress' );
-
-            if ( bp_account_was_activated() ) {
-                $title = __( 'Account Activated', 'buddypress' );
-            }
-        }
-
-        bp_theme_compat_reset_post( array(
-            'ID'             => 0,
-            'post_title'     => $title,
-            'post_author'    => 0,
-            'post_date'      => 0,
-            'post_content'   => '',
-            'post_type'      => 'page',
-            'post_status'    => 'publish',
-            'is_page'        => true,
-            'comment_status' => 'closed'
-        ) );
-    }
-
-    /**
-     * Filter the_content with either the register or activate templates.
-     *
-     * @since 1.7.0
-     */
-    public function dummy_content() {
-        if ( bp_is_register_page() ) {
-            return bp_buffer_template_part( 'members/register', null, false );
-        } else {
-            return bp_buffer_template_part( 'members/activate', null, false );
-        }
-    }
-}
 new BP_Registration_Theme_Compat();

trunk/src/bp-members/bp-members-template.php

@@ -12 +12 @@
 // Exit if accessed directly.
 defined( 'ABSPATH' ) || exit;
+
+require dirname( __FILE__ ) . '/classes/class-bp-core-members-template.php';
 
 /**
@@ -282 +284 @@
         return apply_filters( 'bp_get_activate_slug', $slug );
     }
-
-/**
- * The main member template loop class.
- *
- * Responsible for loading a group of members into a loop for display.
- */
-class BP_Core_Members_Template {
-
-    /**
-     * The loop iterator.
-     *
-     * @var int
-     */
-    public $current_member = -1;
-
-    /**
-     * The number of members returned by the paged query.
-     *
-     * @var int
-     */
-    public $member_count;
-
-    /**
-     * Array of members located by the query.
-     *
-     * @var array
-     */
-    public $members;
-
-    /**
-     * The member object currently being iterated on.
-     *
-     * @var object
-     */
-    public $member;
-
-    /**
-     * A flag for whether the loop is currently being iterated.
-     *
-     * @var bool
-     */
-    public $in_the_loop;
-
-    /**
-     * The type of member being requested. Used for ordering results.
-     *
-     * @var string
-     */
-    public $type;
-
-    /**
-     * The unique string used for pagination queries.
-     *
-     * @var string
-     */
-    public $pag_arg;
-
-    /**
-     * The page number being requested.
-     *
-     * @var string
-     */
-    public $pag_page;
-
-    /**
-     * The number of items being requested per page.
-     *
-     * @var string
-     */
-    public $pag_num;
-
-    /**
-     * An HTML string containing pagination links.
-     *
-     * @var string
-     */
-    public $pag_links;
-
-    /**
-     * The total number of members matching the query parameters.
-     *
-     * @var int
-     */
-    public $total_member_count;
-
-    /**
-     * Constructor method.
-     *
-     * @see BP_User_Query for an in-depth description of parameters.
-     *
-     * @param string       $type                Sort order.
-     * @param int          $page_number         Page of results.
-     * @param int          $per_page            Number of results per page.
-     * @param int          $max                 Max number of results to return.
-     * @param int          $user_id             Limit to friends of a user.
-     * @param string       $search_terms        Limit to users matching search terms.
-     * @param array        $include             Limit results by these user IDs.
-     * @param bool         $populate_extras     Fetch optional extras.
-     * @param array        $exclude             Exclude these IDs from results.
-     * @param array        $meta_key            Limit to users with a meta_key.
-     * @param array        $meta_value          Limit to users with a meta_value (with meta_key).
-     * @param string       $page_arg            Optional. The string used as a query parameter in pagination links.
-     *                                          Default: 'upage'.
-     * @param array|string $member_type         Array or comma-separated string of member types to limit results to.
-     * @param array|string $member_type__in     Array or comma-separated string of member types to limit results to.
-     * @param array|string $member_type__not_in Array or comma-separated string of member types to exclude
-     *                                          from results.
-     */
-    function __construct( $type, $page_number, $per_page, $max, $user_id, $search_terms, $include, $populate_extras, $exclude, $meta_key, $meta_value, $page_arg = 'upage', $member_type = '', $member_type__in = '', $member_type__not_in = '' ) {
-
-        $this->pag_arg  = sanitize_key( $page_arg );
-        $this->pag_page = bp_sanitize_pagination_arg( $this->pag_arg, $page_number );
-        $this->pag_num  = bp_sanitize_pagination_arg( 'num',          $per_page    );
-        $this->type     = $type;
-
-        if ( !empty( $_REQUEST['letter'] ) )
-            $this->members = BP_Core_User::get_users_by_letter( $_REQUEST['letter'], $this->pag_num, $this->pag_page, $populate_extras, $exclude );
-        else
-            $this->members = bp_core_get_users( array( 'type' => $this->type, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'user_id' => $user_id, 'include' => $include, 'search_terms' => $search_terms, 'populate_extras' => $populate_extras, 'exclude' => $exclude, 'meta_key' => $meta_key, 'meta_value' => $meta_value, 'member_type' => $member_type, 'member_type__in' => $member_type__in, 'member_type__not_in' => $member_type__not_in ) );
-
-        if ( !$max || $max >= (int) $this->members['total'] )
-            $this->total_member_count = (int) $this->members['total'];
-        else
-            $this->total_member_count = (int) $max;
-
-        $this->members = $this->members['users'];
-
-        if ( $max ) {
-            if ( $max >= count( $this->members ) ) {
-                $this->member_count = count( $this->members );
-            } else {
-                $this->member_count = (int) $max;
-            }
-        } else {
-            $this->member_count = count( $this->members );
-        }
-
-        if ( (int) $this->total_member_count && (int) $this->pag_num ) {
-            $pag_args = array(
-                $this->pag_arg => '%#%',
-            );
-
-            if ( defined( 'DOING_AJAX' ) && true === (bool) DOING_AJAX ) {
-                $base = remove_query_arg( 's', wp_get_referer() );
-            } else {
-                $base = '';
-            }
-
-            /**
-             * Defaults to an empty array to make sure paginate_links()
-             * won't add the $page_arg to the links which would break
-             * pagination in case JavaScript is disabled.
-             */
-            $add_args = array();
-
-            if ( ! empty( $search_terms ) ) {
-                $query_arg = bp_core_get_component_search_query_arg( 'members' );
-                $add_args[ $query_arg ] = urlencode( $search_terms );
-            }
-
-            $this->pag_links = paginate_links( array(
-                'base'      => add_query_arg( $pag_args, $base ),
-                'format'    => '',
-                'total'     => ceil( (int) $this->total_member_count / (int) $this->pag_num ),
-                'current'   => (int) $this->pag_page,
-                'prev_text' => _x( '←', 'Member pagination previous text', 'buddypress' ),
-                'next_text' => _x( '→', 'Member pagination next text', 'buddypress' ),
-                'mid_size'  => 1,
-                'add_args'  => $add_args,
-            ) );
-        }
-    }
-
-    /**
-     * Whether there are members available in the loop.
-     *
-     * @see bp_has_members()
-     *
-     * @return bool True if there are items in the loop, otherwise false.
-     */
-    function has_members() {
-        if ( $this->member_count )
-            return true;
-
-        return false;
-    }
-
-    /**
-     * Set up the next member and iterate index.
-     *
-     * @return object The next member to iterate over.
-     */
-    function next_member() {
-        $this->current_member++;
-        $this->member = $this->members[$this->current_member];
-
-        return $this->member;
-    }
-
-    /**
-     * Rewind the members and reset member index.
-     */
-    function rewind_members() {
-        $this->current_member = -1;
-        if ( $this->member_count > 0 ) {
-            $this->member = $this->members[0];
-        }
-    }
-
-    /**
-     * Whether there are members left in the loop to iterate over.
-     *
-     * This method is used by {@link bp_members()} as part of the while loop
-     * that controls iteration inside the members loop, eg:
-     *     while ( bp_members() ) { ...
-     *
-     * @see bp_members()
-     *
-     * @return bool True if there are more members to show, otherwise false.
-     */
-    function members() {
-        if ( $this->current_member + 1 < $this->member_count ) {
-            return true;
-        } elseif ( $this->current_member + 1 == $this->member_count ) {
-
-            /**
-             * Fires right before the rewinding of members listing.
-             *
-             * @since 1.5.0
-             */
-            do_action('member_loop_end');
-            // Do some cleaning up after the loop.
-            $this->rewind_members();
-        }
-
-        $this->in_the_loop = false;
-        return false;
-    }
-
-    /**
-     * Set up the current member inside the loop.
-     *
-     * Used by {@link bp_the_member()} to set up the current member data
-     * while looping, so that template tags used during that iteration make
-     * reference to the current member.
-     *
-     * @see bp_the_member()
-     */
-    function the_member() {
-
-        $this->in_the_loop = true;
-        $this->member      = $this->next_member();
-
-        // Loop has just started.
-        if ( 0 == $this->current_member ) {
-
-            /**
-             * Fires if the current member is the first in the loop.
-             *
-             * @since 1.5.0
-             */
-            do_action( 'member_loop_start' );
-        }
-
-    }
-}
-
-/**
- * Rewind the members and reset member index.
- */
-function bp_rewind_members() {
-    global $members_template;
-
-    return $members_template->rewind_members();
-}
 
 /**

trunk/src/bp-members/bp-members-widgets.php

@@ -10 +10 @@
 // Exit if accessed directly.
 defined( 'ABSPATH' ) || exit;
+
+require dirname( __FILE__ ) . '/classes/class-bp-core-members-widget.php';
+require dirname( __FILE__ ) . '/classes/class-bp-core-whos-online-widget.php';
+require dirname( __FILE__ ) . '/classes/class-bp-core-recently-active-widget.php';
 
 /**
@@ -24 +28 @@
 }
 add_action( 'bp_register_widgets', 'bp_members_register_widgets' );
-
-/**
- * Members Widget.
- *
- * @since 1.0.3
- */
-class BP_Core_Members_Widget extends WP_Widget {
-
-    /**
-     * Constructor method.
-     */
-    public function __construct() {
-
-        // Setup widget name & description.
-        $name        = _x( '(BuddyPress) Members', 'widget name', 'buddypress' );
-        $description = __( 'A dynamic list of recently active, popular, and newest members', 'buddypress' );
-
-        // Call WP_Widget constructor.
-        parent::__construct( false, $name, array(
-            'description' => $description,
-            'classname'   => 'widget_bp_core_members_widget buddypress widget',
-        ) );
-
-        // Maybe enqueue JS for widget.
-        if ( is_active_widget( false, false, $this->id_base ) && ! is_admin() && ! is_network_admin() ) {
-            wp_enqueue_script( 'bp-widget-members' );
-        }
-    }
-
-    /**
-     * Display the Members widget.
-     *
-     * @see WP_Widget::widget() for description of parameters.
-     *
-     * @param array $args     Widget arguments.
-     * @param array $instance Widget settings, as saved by the user.
-     */
-    public function widget( $args, $instance ) {
-
-        // Get widget settings.
-        $settings = $this->parse_settings( $instance );
-
-        /**
-         * Filters the title of the Members widget.
-         *
-         * @since 1.8.0
-         * @since 2.3.0 Added 'instance' and 'id_base' to arguments passed to filter.
-         *
-         * @param string $title    The widget title.
-         * @param array  $settings The settings for the particular instance of the widget.
-         * @param string $id_base  Root ID for all widgets of this type.
-         */
-        $title = apply_filters( 'widget_title', $settings['title'], $settings, $this->id_base );
-        $title = $settings['link_title'] ? '<a href="' . bp_get_members_directory_permalink() . '">' . $title . '</a>' : $title;
-
-        /**
-         * Filters the separator of the member widget links.
-         *
-         * @since 2.4.0
-         *
-         * @param string $separator Separator string. Default '|'.
-         */
-        $separator = apply_filters( 'bp_members_widget_separator', '|' );
-
-        // Output before widget HTMl, title (and maybe content before & after it).
-        echo $args['before_widget']
-           . $args['before_title']
-           . $title
-           . $args['after_title'];
-
-        // Setup args for querying members.
-        $members_args = array(
-            'user_id'         => 0,
-            'type'            => $settings['member_default'],
-            'per_page'        => $settings['max_members'],
-            'max'             => $settings['max_members'],
-            'populate_extras' => true,
-            'search_terms'    => false,
-        ); ?>
-
-        <?php if ( bp_has_members( $members_args ) ) : ?>
-
-            <div class="item-options" id="members-list-options">
-                <a href="<?php bp_members_directory_permalink(); ?>" id="newest-members" <?php if ( 'newest' === $settings['member_default'] ) : ?>class="selected"<?php endif; ?>><?php esc_html_e( 'Newest', 'buddypress' ); ?></a>
-                <span class="bp-separator" role="separator"><?php echo esc_html( $separator ); ?></span>
-                <a href="<?php bp_members_directory_permalink(); ?>" id="recently-active-members" <?php if ( 'active' === $settings['member_default'] ) : ?>class="selected"<?php endif; ?>><?php esc_html_e( 'Active', 'buddypress' ); ?></a>
-
-                <?php if ( bp_is_active( 'friends' ) ) : ?>
-                    <span class="bp-separator" role="separator"><?php echo esc_html( $separator ); ?></span>
-                    <a href="<?php bp_members_directory_permalink(); ?>" id="popular-members" <?php if ( 'popular' === $settings['member_default'] ) : ?>class="selected"<?php endif; ?>><?php esc_html_e( 'Popular', 'buddypress' ); ?></a>
-
-                <?php endif; ?>
-
-            </div>
-
-            <ul id="members-list" class="item-list">
-
-                <?php while ( bp_members() ) : bp_the_member(); ?>
-
-                    <li class="vcard">
-                        <div class="item-avatar">
-                            <a href="<?php bp_member_permalink() ?>" title="<?php bp_member_name(); ?>"><?php bp_member_avatar(); ?></a>
-                        </div>
-
-                        <div class="item">
-                            <div class="item-title fn"><a href="<?php bp_member_permalink(); ?>" title="<?php bp_member_name(); ?>"><?php bp_member_name(); ?></a></div>
-                            <div class="item-meta">
-                                <span class="activity"><?php
-                                    if ( 'newest' === $settings['member_default'] ) :
-                                        bp_member_registered();
-                                    elseif ( 'active' === $settings['member_default'] ) :
-                                        bp_member_last_active();
-                                    elseif ( 'popular' === $settings['member_default'] ) :
-                                        bp_member_total_friend_count();
-                                    endif; ?></span>
-                            </div>
-                        </div>
-                    </li>
-
-                <?php endwhile; ?>
-
-            </ul>
-
-            <?php wp_nonce_field( 'bp_core_widget_members', '_wpnonce-members', false ); ?>
-
-            <input type="hidden" name="members_widget_max" id="members_widget_max" value="<?php echo esc_attr( $settings['max_members'] ); ?>" />
-
-        <?php else: ?>
-
-            <div class="widget-error">
-                <?php esc_html_e( 'No one has signed up yet!', 'buddypress' ); ?>
-            </div>
-
-        <?php endif; ?>
-
-        <?php echo $args['after_widget'];
-    }
-
-    /**
-     * Update the Members widget options.
-     *
-     * @param array $new_instance The new instance options.
-     * @param array $old_instance The old instance options.
-     * @return array $instance The parsed options to be saved.
-     */
-    public function update( $new_instance, $old_instance ) {
-        $instance = $old_instance;
-
-        $instance['title']          = strip_tags( $new_instance['title'] );
-        $instance['max_members']    = strip_tags( $new_instance['max_members'] );
-        $instance['member_default'] = strip_tags( $new_instance['member_default'] );
-        $instance['link_title']     = (bool) $new_instance['link_title'];
-
-        return $instance;
-    }
-
-    /**
-     * Output the Members widget options form.
-     *
-     * @param array $instance Widget instance settings.
-     *
-     * @return void
-     */
-    public function form( $instance ) {
-
-        // Get widget settings.
-        $settings       = $this->parse_settings( $instance );
-        $title          = strip_tags( $settings['title'] );
-        $max_members    = strip_tags( $settings['max_members'] );
-        $member_default = strip_tags( $settings['member_default'] );
-        $link_title     = (bool) $settings['link_title']; ?>
-
-        <p>
-            <label for="<?php echo $this->get_field_id( 'title' ); ?>">
-                <?php esc_html_e( 'Title:', 'buddypress' ); ?>
-                <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" style="width: 100%" />
-            </label>
-        </p>
-
-        <p>
-            <label for="<?php echo $this->get_field_id( 'link_title' ) ?>">
-                <input type="checkbox" name="<?php echo $this->get_field_name( 'link_title' ) ?>" id="<?php echo $this->get_field_id( 'link_title' ) ?>" value="1" <?php checked( $link_title ) ?> />
-                <?php esc_html_e( 'Link widget title to Members directory', 'buddypress' ); ?>
-            </label>
-        </p>
-
-        <p>
-            <label for="<?php echo $this->get_field_id( 'max_members' ); ?>">
-                <?php esc_html_e( 'Max members to show:', 'buddypress' ); ?>
-                <input class="widefat" id="<?php echo $this->get_field_id( 'max_members' ); ?>" name="<?php echo $this->get_field_name( 'max_members' ); ?>" type="text" value="<?php echo esc_attr( $max_members ); ?>" style="width: 30%" />
-            </label>
-        </p>
-
-        <p>
-            <label for="<?php echo $this->get_field_id( 'member_default' ) ?>"><?php esc_html_e( 'Default members to show:', 'buddypress' ); ?></label>
-            <select name="<?php echo $this->get_field_name( 'member_default' ) ?>" id="<?php echo $this->get_field_id( 'member_default' ) ?>">
-                <option value="newest"  <?php if ( 'newest'  === $member_default ) : ?>selected="selected"<?php endif; ?>><?php esc_html_e( 'Newest',  'buddypress' ); ?></option>
-                <option value="active"  <?php if ( 'active'  === $member_default ) : ?>selected="selected"<?php endif; ?>><?php esc_html_e( 'Active',  'buddypress' ); ?></option>
-                <option value="popular" <?php if ( 'popular' === $member_default ) : ?>selected="selected"<?php endif; ?>><?php esc_html_e( 'Popular', 'buddypress' ); ?></option>
-            </select>
-        </p>
-
-    <?php
-    }
-
-    /**
-     * Merge the widget settings into defaults array.
-     *
-     * @since 2.3.0
-     *
-     * @uses bp_parse_args() To merge widget settings into defaults.
-     *
-     * @param array $instance Widget instance settings.
-     * @return array
-     */
-    public function parse_settings( $instance = array() ) {
-        return bp_parse_args( $instance, array(
-            'title'          => __( 'Members', 'buddypress' ),
-            'max_members'    => 5,
-            'member_default' => 'active',
-            'link_title'     => false
-        ), 'members_widget_settings' );
-    }
-}
-
-/**
- * Who's Online Widget.
- *
- * @since 1.0.3
- */
-class BP_Core_Whos_Online_Widget extends WP_Widget {
-
-    /**
-     * Constructor method.
-     */
-    public function __construct() {
-        $name        = _x( "(BuddyPress) Who's Online", 'widget name', 'buddypress' );
-        $description = __( 'Profile photos of online users', 'buddypress' );
-        parent::__construct( false, $name, array(
-            'description' => $description,
-            'classname' => 'widget_bp_core_whos_online_widget buddypress widget',
-        ) );
-    }
-
-    /**
-     * Display the Who's Online widget.
-     *
-     * @see WP_Widget::widget() for description of parameters.
-     *
-     * @param array $args     Widget arguments.
-     * @param array $instance Widget settings, as saved by the user.
-     */
-    public function widget( $args, $instance ) {
-
-        // Get widget settings.
-        $settings = $this->parse_settings( $instance );
-
-        /**
-         * Filters the title of the Who's Online widget.
-         *
-         * @since 1.8.0
-         * @since 2.3.0 Added 'instance' and 'id_base' to arguments passed to filter.
-         *
-         * @param string $title    The widget title.
-         * @param array  $settings The settings for the particular instance of the widget.
-         * @param string $id_base  Root ID for all widgets of this type.
-         */
-        $title = apply_filters( 'widget_title', $settings['title'], $settings, $this->id_base );
-
-        echo $args['before_widget']
-           . $args['before_title']
-           . $title
-           . $args['after_title'];
-
-        // Setup args for querying members.
-        $members_args = array(
-            'user_id'         => 0,
-            'type'            => 'online',
-            'per_page'        => $settings['max_members'],
-            'max'             => $settings['max_members'],
-            'populate_extras' => true,
-            'search_terms'    => false,
-        ); ?>
-
-        <?php if ( bp_has_members( $members_args ) ) : ?>
-
-            <div class="avatar-block">
-
-                <?php while ( bp_members() ) : bp_the_member(); ?>
-
-                    <div class="item-avatar">
-                        <a href="<?php bp_member_permalink(); ?>" title="<?php bp_member_name(); ?>"><?php bp_member_avatar(); ?></a>
-                    </div>
-
-                <?php endwhile; ?>
-
-            </div>
-
-        <?php else: ?>
-
-            <div class="widget-error">
-                <?php esc_html_e( 'There are no users currently online', 'buddypress' ); ?>
-            </div>
-
-        <?php endif; ?>
-
-        <?php echo $args['after_widget'];
-    }
-
-    /**
-     * Update the Who's Online widget options.
-     *
-     * @param array $new_instance The new instance options.
-     * @param array $old_instance The old instance options.
-     * @return array $instance The parsed options to be saved.
-     */
-    public function update( $new_instance, $old_instance ) {
-        $instance                = $old_instance;
-        $instance['title']       = strip_tags( $new_instance['title'] );
-        $instance['max_members'] = strip_tags( $new_instance['max_members'] );
-
-        return $instance;
-    }
-
-    /**
-     * Output the Who's Online widget options form.
-     *
-     * @param array $instance Widget instance settings.
-     * @return void
-     */
-    public function form( $instance ) {
-
-        // Get widget settings.
-        $settings    = $this->parse_settings( $instance );
-        $title       = strip_tags( $settings['title'] );
-        $max_members = strip_tags( $settings['max_members'] ); ?>
-
-        <p>
-            <label for="<?php echo $this->get_field_id( 'title' ); ?>">
-                <?php esc_html_e( 'Title:', 'buddypress' ); ?>
-                <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" style="width: 100%" />
-            </label>
-        </p>
-
-        <p>
-            <label for="<?php echo $this->get_field_id( 'max_members' ); ?>">
-                <?php esc_html_e( 'Max members to show:', 'buddypress' ); ?>
-                <input class="widefat" id="<?php echo $this->get_field_id( 'max_members' ); ?>" name="<?php echo $this->get_field_name( 'max_members' ); ?>" type="text" value="<?php echo esc_attr( $max_members ); ?>" style="width: 30%" />
-            </label>
-        </p>
-
-    <?php
-    }
-
-    /**
-     * Merge the widget settings into defaults array.
-     *
-     * @since 2.3.0
-     *
-     * @uses bp_parse_args() To merge widget settings into defaults.
-     *
-     * @param array $instance Widget instance settings.
-     * @return array
-     */
-    public function parse_settings( $instance = array() ) {
-        return bp_parse_args( $instance, array(
-            'title'          => __( "Who's Online", 'buddypress' ),
-            'max_members'    => 15,
-        ), 'members_widget_settings' );
-    }
-}
-
-/**
- * Recently Active Members Widget.
- *
- * @since 1.0.3
- */
-class BP_Core_Recently_Active_Widget extends WP_Widget {
-
-    /**
-     * Constructor method.
-     */
-    public function __construct() {
-        $name        = _x( '(BuddyPress) Recently Active Members', 'widget name', 'buddypress' );
-        $description = __( 'Profile photos of recently active members', 'buddypress' );
-        parent::__construct( false, $name, array(
-            'description' => $description,
-            'classname'   => 'widget_bp_core_recently_active_widget buddypress widget',
-        ) );
-    }
-
-    /**
-     * Display the Recently Active widget.
-     *
-     * @see WP_Widget::widget() for description of parameters.
-     *
-     * @param array $args     Widget arguments.
-     * @param array $instance Widget settings, as saved by the user.
-     */
-    public function widget( $args, $instance ) {
-
-        // Get widget settings.
-        $settings = $this->parse_settings( $instance );
-
-        /**
-         * Filters the title of the Recently Active widget.
-         *
-         * @since 1.8.0
-         * @since 2.3.0 Added 'instance' and 'id_base' to arguments passed to filter.
-         *
-         * @param string $title    The widget title.
-         * @param array  $settings The settings for the particular instance of the widget.
-         * @param string $id_base  Root ID for all widgets of this type.
-         */
-        $title = apply_filters( 'widget_title', $settings['title'], $settings, $this->id_base );
-
-        echo $args['before_widget'];
-        echo $args['before_title']
-           . $title
-           . $args['after_title'];
-
-        // Setup args for querying members.
-        $members_args = array(
-            'user_id'         => 0,
-            'type'            => 'active',
-            'per_page'        => $settings['max_members'],
-            'max'             => $settings['max_members'],
-            'populate_extras' => true,
-            'search_terms'    => false,
-        ); ?>
-
-        <?php if ( bp_has_members( $members_args ) ) : ?>
-
-            <div class="avatar-block">
-
-                <?php while ( bp_members() ) : bp_the_member(); ?>
-
-                    <div class="item-avatar">
-                        <a href="<?php bp_member_permalink(); ?>" title="<?php bp_member_name(); ?>"><?php bp_member_avatar(); ?></a>
-                    </div>
-
-                <?php endwhile; ?>
-
-            </div>
-
-        <?php else: ?>
-
-            <div class="widget-error">
-                <?php esc_html_e( 'There are no recently active members', 'buddypress' ); ?>
-            </div>
-
-        <?php endif; ?>
-
-        <?php echo $args['after_widget'];
-    }
-
-    /**
-     * Update the Recently Active widget options.
-     *
-     * @param array $new_instance The new instance options.
-     * @param array $old_instance The old instance options.
-     * @return array $instance The parsed options to be saved.
-     */
-    public function update( $new_instance, $old_instance ) {
-        $instance                = $old_instance;
-        $instance['title']       = strip_tags( $new_instance['title'] );
-        $instance['max_members'] = strip_tags( $new_instance['max_members'] );
-
-        return $instance;
-    }
-
-    /**
-     * Output the Recently Active widget options form.
-     *
-     * @param array $instance Widget instance settings.
-     * @return void
-     */
-    public function form( $instance ) {
-
-        // Get widget settings.
-        $settings    = $this->parse_settings( $instance );
-        $title       = strip_tags( $settings['title'] );
-        $max_members = strip_tags( $settings['max_members'] ); ?>
-
-        <p>
-            <label for="<?php echo $this->get_field_id( 'title' ); ?>">
-                <?php esc_html_e( 'Title:', 'buddypress' ); ?>
-                <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" style="width: 100%" />
-            </label>
-        </p>
-
-        <p>
-            <label for="<?php echo $this->get_field_id( 'max_members' ); ?>">
-                <?php esc_html_e( 'Max members to show:', 'buddypress' ); ?>
-                <input class="widefat" id="<?php echo $this->get_field_id( 'max_members' ); ?>" name="<?php echo $this->get_field_name( 'max_members' ); ?>" type="text" value="<?php echo esc_attr( $max_members ); ?>" style="width: 30%" />
-            </label>
-        </p>
-
-    <?php
-    }
-
-    /**
-     * Merge the widget settings into defaults array.
-     *
-     * @since 2.3.0
-     *
-     * @uses bp_parse_args() To merge widget settings into defaults.
-     *
-     * @param array $instance Widget instance settings.
-     * @return array
-     */
-    public function parse_settings( $instance = array() ) {
-        return bp_parse_args( $instance, array(
-            'title'          => __( 'Recently Active Members', 'buddypress' ),
-            'max_members'    => 15,
-        ), 'recently_active_members_widget_settings' );
-    }
-}
 
 /**

trunk/src/bp-members/classes/class-bp-core-members-template.php

@@ -1 +1 @@
 <?php
 /**
- * BuddyPress Member Template Tags.
- *
- * Functions that are safe to use inside your template files and themes.
+ * BuddyPress Member Template loop class.
  *
  * @package BuddyPress
  * @subpackage Members
- * @since 1.5.0
  */
 
 // Exit if accessed directly.
 defined( 'ABSPATH' ) || exit;
-
-/**
- * Output the profile component slug.
- *
- * @since 2.4.0
- *
- * @uses bp_get_profile_slug()
- */
-function bp_profile_slug() {
-    echo bp_get_profile_slug();
-}
-    /**
-     * Return the profile component slug.
-     *
-     * @since 2.4.0
-     *
-     * @return string
-     */
-    function bp_get_profile_slug() {
-
-        /**
-         * Filters the profile component slug.
-         *
-         * @since 2.4.0
-         *
-         * @param string $slug Profile component slug.
-         */
-        return apply_filters( 'bp_get_profile_slug', buddypress()->profile->slug );
-    }
-
-/**
- * Output the members component slug.
- *
- * @since 1.5.0
- *
- * @uses bp_get_members_slug()
- */
-function bp_members_slug() {
-    echo bp_get_members_slug();
-}
-    /**
-     * Return the members component slug.
-     *
-     * @since 1.5.0
-     *
-     * @return string
-     */
-    function bp_get_members_slug() {
-
-        /**
-         * Filters the Members component slug.
-         *
-         * @since 1.5.0
-         *
-         * @param string $slug Members component slug.
-         */
-        return apply_filters( 'bp_get_members_slug', buddypress()->members->slug );
-    }
-
-/**
- * Output the members component root slug.
- *
- * @since 1.5.0
- *
- * @uses bp_get_members_root_slug()
- */
-function bp_members_root_slug() {
-    echo bp_get_members_root_slug();
-}
-    /**
-     * Return the members component root slug.
-     *
-     * @since 1.5.0
-     *
-     * @return string
-     */
-    function bp_get_members_root_slug() {
-
-        /**
-         * Filters the Members component root slug.
-         *
-         * @since 1.5.0
-         *
-         * @param string $slug Members component root slug.
-         */
-        return apply_filters( 'bp_get_members_root_slug', buddypress()->members->root_slug );
-    }
-
-/**
- * Output the member type base slug.
- *
- * @since 2.5.0
- */
-function bp_members_member_type_base() {
-    echo esc_url( bp_get_members_member_type_base() );
-}
-    /**
-     * Get the member type base slug.
-     *
-     * The base slug is the string used as the base prefix when generating member type directory URLs.
-     * For example, in example.com/members/type/foo/, 'foo' is the member type and 'type' is the
-     * base slug.
-     *
-     * @since 2.5.0
-     *
-     * @return string
-     */
-    function bp_get_members_member_type_base() {
-        /**
-         * Filters the member type URL base.
-         *
-         * @since 2.3.0
-         *
-         * @param string $base
-         */
-        return apply_filters( 'bp_members_member_type_base', _x( 'type', 'member type URL base', 'buddypress' ) );
-    }
-
-/**
- * Output member directory permalink.
- *
- * @since 1.5.0
- *
- * @uses bp_get_members_directory_permalink()
- */
-function bp_members_directory_permalink() {
-    echo esc_url( bp_get_members_directory_permalink() );
-}
-    /**
-     * Return member directory permalink.
-     *
-     * @since 1.5.0
-     *
-     * @return string
-     */
-    function bp_get_members_directory_permalink() {
-
-        /**
-         * Filters the member directory permalink.
-         *
-         * @since 1.5.0
-         *
-         * @param string $value Members directory permalink.
-         */
-        return apply_filters( 'bp_get_members_directory_permalink', trailingslashit( bp_get_root_domain() . '/' . bp_get_members_root_slug() ) );
-    }
-
-/**
- * Output member type directory permalink.
- *
- * @since 2.5.0
- *
- * @uses bp_get_member_type_directory_permalink()
- *
- * @param string $member_type Optional. Member type.
- */
-function bp_member_type_directory_permalink( $member_type = '' ) {
-    echo esc_url( bp_get_member_type_directory_permalink( $member_type ) );
-}
-    /**
-     * Return member type directory permalink.
-     *
-     * @since 2.5.0
-     *
-     * @param string $member_type Optional. Member type. Defaults to current member type.
-     * @return string Member type directory URL on success, an empty string on failure.
-     */
-    function bp_get_member_type_directory_permalink( $member_type = '' ) {
-
-        if ( $member_type ) {
-            $_member_type = $member_type;
-        } else {
-            // Fall back on the current member type.
-            $_member_type = bp_get_current_member_type();
-        }
-
-        $type = bp_get_member_type_object( $_member_type );
-
-        // Bail when member type is not found or has no directory.
-        if ( ! $type || ! $type->has_directory ) {
-            return '';
-        }
-
-        /**
-         * Filters the member type directory permalink.
-         *
-         * @since 2.5.0
-         *
-         * @param string $value       Member type directory permalink.
-         * @param object $type        Member type object.
-         * @param string $member_type Member type name, as passed to the function.
-         */
-        return apply_filters( 'bp_get_member_type_directory_permalink', trailingslashit( bp_get_members_directory_permalink() . bp_get_members_member_type_base() . '/' . $type->directory_slug ), $type, $member_type );
-    }
-
-/**
- * Output the sign-up slug.
- *
- * @since 1.5.0
- *
- * @uses bp_get_signup_slug()
- */
-function bp_signup_slug() {
-    echo bp_get_signup_slug();
-}
-    /**
-     * Return the sign-up slug.
-     *
-     * @since 1.5.0
-     *
-     * @return string
-     */
-    function bp_get_signup_slug() {
-        $bp = buddypress();
-
-        if ( !empty( $bp->pages->register->slug ) ) {
-            $slug = $bp->pages->register->slug;
-        } elseif ( defined( 'BP_REGISTER_SLUG' ) ) {
-            $slug = BP_REGISTER_SLUG;
-        } else {
-            $slug = 'register';
-        }
-
-        /**
-         * Filters the sign-up slug.
-         *
-         * @since 1.5.0
-         *
-         * @param string $slug Sign-up slug.
-         */
-        return apply_filters( 'bp_get_signup_slug', $slug );
-    }
-
-/**
- * Output the activation slug.
- *
- * @since 1.5.0
- *
- * @uses bp_get_activate_slug()
- */
-function bp_activate_slug() {
-    echo bp_get_activate_slug();
-}
-    /**
-     * Return the activation slug.
-     *
-     * @since 1.5.0
-     *
-     * @return string
-     */
-    function bp_get_activate_slug() {
-        $bp = buddypress();
-
-        if ( !empty( $bp->pages->activate->slug ) ) {
-            $slug = $bp->pages->activate->slug;
-        } elseif ( defined( 'BP_ACTIVATION_SLUG' ) ) {
-            $slug = BP_ACTIVATION_SLUG;
-        } else {
-            $slug = 'activate';
-        }
-
-        /**
-         * Filters the activation slug.
-         *
-         * @since 1.5.0
-         *
-         * @param string $slug Activation slug.
-         */
-        return apply_filters( 'bp_get_activate_slug', $slug );
-    }
 
 /**
@@ -548 +275 @@
     }
 }
-
-/**
- * Rewind the members and reset member index.
- */
-function bp_rewind_members() {
-    global $members_template;
-
-    return $members_template->rewind_members();
-}
-
-/**
- * Initialize the members loop.
- *
- * Based on the $args passed, bp_has_members() populates the $members_template
- * global, enabling the use of BuddyPress templates and template functions to
- * display a list of members.
- *
- * @global object $members_template {@link BP_Members_Template}
- *
- * @param array|string $args {
- *     Arguments for limiting the contents of the members loop. Most arguments
- *     are in the same format as {@link BP_User_Query}. However, because
- *     the format of the arguments accepted here differs in a number of ways,
- *     and because bp_has_members() determines some default arguments in a
- *     dynamic fashion, we list all accepted arguments here as well.
- *
- *     Arguments can be passed as an associative array, or as a URL query
- *     string (eg, 'user_id=4&per_page=3').
- *
- *     @type int                   $type                Sort order. Accepts 'active', 'random', 'newest', 'popular',
- *                                                      'online', 'alphabetical'. Default: 'active'.
- *     @type int|bool              $page                Page of results to display. Default: 1.
- *     @type int|bool              $per_page            Number of results per page. Default: 20.
- *     @type int|bool              $max                 Maximum number of results to return. Default: false (unlimited).
- *     @type string                $page_arg            The string used as a query parameter in pagination links.
- *                                                      Default: 'bpage'.
- *     @type array|int|string|bool $include             Limit results by a list of user IDs. Accepts an array, a
- *                                                      single integer, a comma-separated list of IDs, or false (to
- *                                                      disable this limiting). Accepts 'active', 'alphabetical',
- *                                                      'newest', or 'random'. Default: false.
- *     @type array|int|string|bool $exclude             Exclude users from results by ID. Accepts an array, a single
- *                                                      integer, a comma-separated list of IDs, or false (to disable
- *                                                      this limiting). Default: false.
- *     @type int                   $user_id             If provided, results are limited to the friends of the specified
- *                                                      user. When on a user's Friends page, defaults to the ID of the
- *                                                      displayed user. Otherwise defaults to 0.
- *     @type string|array          $member_type         Array or comma-separated list of member types to limit
- *                                                      results to.
- *     @type string|array          $member_type__in     Array or comma-separated list of member types to limit
- *                                                      results to.
- *     @type string|array          $member_type__not_in Array or comma-separated list of member types to exclude
- *                                                      from results.
- *     @type string                $search_terms        Limit results by a search term. Default: value of
- *                                                      `$_REQUEST['members_search']` or `$_REQUEST['s']`, if present.
- *                                                      Otherwise false.
- *     @type string                $meta_key            Limit results by the presence of a usermeta key.
- *                                                      Default: false.
- *     @type mixed                 $meta_value          When used with meta_key, limits results by the a matching
- *                                                      usermeta value. Default: false.
- *     @type bool                  $populate_extras     Whether to fetch optional data, such as friend counts.
- *                                                      Default: true.
- * }
- * @return bool Returns true when blogs are found, otherwise false.
- */
-function bp_has_members( $args = '' ) {
-    global $members_template;
-
-    // Default user ID.
-    $user_id = 0;
-
-    // User filtering.
-    if ( bp_is_user_friends() && ! bp_is_user_friend_requests() ) {
-        $user_id = bp_displayed_user_id();
-    }
-
-    $member_type = bp_get_current_member_type();
-    if ( ! $member_type && ! empty( $_GET['member_type'] ) ) {
-        if ( is_array( $_GET['member_type'] ) ) {
-            $member_type = $_GET['member_type'];
-        } else {
-            // Can be a comma-separated list.
-            $member_type = explode( ',', $_GET['member_type'] );
-        }
-    }
-
-    $search_terms_default = null;
-    $search_query_arg = bp_core_get_component_search_query_arg( 'members' );
-    if ( ! empty( $_REQUEST[ $search_query_arg ] ) ) {
-        $search_terms_default = stripslashes( $_REQUEST[ $search_query_arg ] );
-    }
-
-    // Type: active ( default ) | random | newest | popular | online | alphabetical.
-    $r = bp_parse_args( $args, array(
-        'type'                => 'active',
-        'page'                => 1,
-        'per_page'            => 20,
-        'max'                 => false,
-
-        'page_arg'            => 'upage',  // See https://buddypress.trac.wordpress.org/ticket/3679.
-
-        'include'             => false,    // Pass a user_id or a list (comma-separated or array) of user_ids to only show these users.
-        'exclude'             => false,    // Pass a user_id or a list (comma-separated or array) of user_ids to exclude these users.
-
-        'user_id'             => $user_id, // Pass a user_id to only show friends of this user.
-        'member_type'         => $member_type,
-        'member_type__in'     => '',
-        'member_type__not_in' => '',
-        'search_terms'        => $search_terms_default,
-
-        'meta_key'            => false,    // Only return users with this usermeta.
-        'meta_value'          => false,    // Only return users where the usermeta value matches. Requires meta_key.
-
-        'populate_extras'     => true      // Fetch usermeta? Friend count, last active etc.
-    ), 'has_members' );
-
-    // Pass a filter if ?s= is set.
-    if ( is_null( $r['search_terms'] ) ) {
-        if ( !empty( $_REQUEST['s'] ) ) {
-            $r['search_terms'] = $_REQUEST['s'];
-        } else {
-            $r['search_terms'] = false;
-        }
-    }
-
-    // Set per_page to max if max is larger than per_page.
-    if ( !empty( $r['max'] ) && ( $r['per_page'] > $r['max'] ) ) {
-        $r['per_page'] = $r['max'];
-    }
-
-    // Query for members and populate $members_template global.
-    $members_template = new BP_Core_Members_Template(
-        $r['type'],
-        $r['page'],
-        $r['per_page'],
-        $r['max'],
-        $r['user_id'],
-        $r['search_terms'],
-        $r['include'],
-        $r['populate_extras'],
-        $r['exclude'],
-        $r['meta_key'],
-        $r['meta_value'],
-        $r['page_arg'],
-        $r['member_type'],
-        $r['member_type__in'],
-        $r['member_type__not_in']
-    );
-
-    /**
-     * Filters whether or not BuddyPress has members to iterate over.
-     *
-     * @since 1.2.4
-     *
-     * @param bool  $value            Whether or not there are members to iterate over.
-     * @param array $members_template Populated $members_template global.
-     */
-    return apply_filters( 'bp_has_members', $members_template->has_members(), $members_template );
-}
-
-/**
- * Set up the current member inside the loop.
- *
- * @return object
- */
-function bp_the_member() {
-    global $members_template;
-    return $members_template->the_member();
-}
-
-/**
- * Check whether there are more members to iterate over.
- *
- * @return bool
- */
-function bp_members() {
-    global $members_template;
-    return $members_template->members();
-}
-
-/**
- * Output the members pagination count.
- */
-function bp_members_pagination_count() {
-    echo bp_get_members_pagination_count();
-}
-    /**
-     * Generate the members pagination count.
-     *
-     * @return string
-     */
-    function bp_get_members_pagination_count() {
-        global $members_template;
-
-        if ( empty( $members_template->type ) )
-            $members_template->type = '';
-
-        $start_num = intval( ( $members_template->pag_page - 1 ) * $members_template->pag_num ) + 1;
-        $from_num  = bp_core_number_format( $start_num );
-        $to_num    = bp_core_number_format( ( $start_num + ( $members_template->pag_num - 1 ) > $members_template->total_member_count ) ? $members_template->total_member_count : $start_num + ( $members_template->pag_num - 1 ) );
-        $total     = bp_core_number_format( $members_template->total_member_count );
-
-        if ( 'active' == $members_template->type ) {
-            if ( 1 == $members_template->total_member_count ) {
-                $pag = __( 'Viewing 1 active member', 'buddypress' );
-            } else {
-                $pag = sprintf( _n( 'Viewing %1$s - %2$s of %3$s active member', 'Viewing %1$s - %2$s of %3$s active members', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
-            }
-        } elseif ( 'popular' == $members_template->type ) {
-            if ( 1 == $members_template->total_member_count ) {
-                $pag = __( 'Viewing 1 member with friends', 'buddypress' );
-            } else {
-                $pag = sprintf( _n( 'Viewing %1$s - %2$s of %3$s member with friends', 'Viewing %1$s - %2$s of %3$s members with friends', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
-            }
-        } elseif ( 'online' == $members_template->type ) {
-            if ( 1 == $members_template->total_member_count ) {
-                $pag = __( 'Viewing 1 online member', 'buddypress' );
-            } else {
-                $pag = sprintf( _n( 'Viewing %1$s - %2$s of %3$s online member', 'Viewing %1$s - %2$s of %3$s online members', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
-            }
-        } else {
-            if ( 1 == $members_template->total_member_count ) {
-                $pag = __( 'Viewing 1 member', 'buddypress' );
-            } else {
-                $pag = sprintf( _n( 'Viewing %1$s - %2$s of %3$s member', 'Viewing %1$s - %2$s of %3$s members', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
-            }
-        }
-
-        /**
-         * Filters the members pagination count.
-         *
-         * @since 1.5.0
-         *
-         * @param string $pag Pagination count string.
-         */
-        return apply_filters( 'bp_members_pagination_count', $pag );
-    }
-
-/**
- * Output the members pagination links.
- */
-function bp_members_pagination_links() {
-    echo bp_get_members_pagination_links();
-}
-    /**
-     * Fetch the members pagination links.
-     *
-     * @return string
-     */
-    function bp_get_members_pagination_links() {
-        global $members_template;
-
-        /**
-         * Filters the members pagination link.
-         *
-         * @since 1.2.0
-         *
-         * @param string $pag_links HTML markup for pagination links.
-         */
-        return apply_filters( 'bp_get_members_pagination_links', $members_template->pag_links );
-    }
-
-/**
- * Output the ID of the current member in the loop.
- *
- * @uses bp_get_member_user_id()
- */
-function bp_member_user_id() {
-    echo bp_get_member_user_id();
-}
-    /**
-     * Get the ID of the current member in the loop.
-     *
-     * @return string Member ID.
-     */
-    function bp_get_member_user_id() {
-        global $members_template;
-        $member_id = isset( $members_template->member->id ) ? (int) $members_template->member->id : false;
-
-        /**
-         * Filters the ID of the current member in the loop.
-         *
-         * @since 1.2.0
-         *
-         * @param int $member_id ID of the member being iterated over.
-         */
-        return apply_filters( 'bp_get_member_user_id', $member_id );
-    }
-
-/**
- * Output the row class of the current member in the loop.
- *
- * @since 1.7.0
- *
- * @param array $classes Array of custom classes.
- */
-function bp_member_class( $classes = array() ) {
-    echo bp_get_member_class( $classes );
-}
-    /**
-     * Return the row class of the current member in the loop.
-     *
-     * @since 1.7.0
-     *
-     * @param array $classes Array of custom classes.
-     *
-     * @return string Row class of the member
-     */
-    function bp_get_member_class( $classes = array() ) {
-        global $members_template;
-
-        // Add even/odd classes, but only if there's more than 1 member.
-        if ( $members_template->member_count > 1 ) {
-            $pos_in_loop = (int) $members_template->current_member;
-            $classes[]   = ( $pos_in_loop % 2 ) ? 'even' : 'odd';
-
-        // If we've only one member in the loop, don't bother with odd and even.
-        } else {
-            $classes[] = 'bp-single-member';
-        }
-
-        // Maybe add 'is-online' class.
-        if ( ! empty( $members_template->member->last_activity ) ) {
-
-            // Calculate some times.
-            $current_time  = strtotime( bp_core_current_time() );
-            $last_activity = strtotime( $members_template->member->last_activity );
-            $still_online  = strtotime( '+5 minutes', $last_activity );
-
-            // Has the user been active recently?
-            if ( $current_time <= $still_online ) {
-                $classes[] = 'is-online';
-            }
-        }
-
-        // Add current user class.
-        if ( bp_loggedin_user_id() === (int) $members_template->member->id ) {
-            $classes[] = 'is-current-user';
-        }
-
-        /**
-         * Filters the determined classes to add to the HTML element.
-         *
-         * @since 1.7.0
-         *
-         * @param string $classes Classes to be added to the HTML element.
-         */
-        $classes = apply_filters( 'bp_get_member_class', $classes );
-        $classes = array_merge( $classes, array() );
-        $retval  = 'class="' . join( ' ', $classes ) . '"';
-
-        return $retval;
-    }
-
-/**
- * Output nicename of current member in the loop.
- */
-function bp_member_user_nicename() {
-    echo bp_get_member_user_nicename();
-}
-    /**
-     * Get the nicename of the current member in the loop.
-     *
-     * @return string Members nicename.
-     */
-    function bp_get_member_user_nicename() {
-        global $members_template;
-
-        /**
-         * Filters the nicename of the current member in the loop.
-         *
-         * @since 1.2.5
-         *
-         * @param string $user_nicename Nicename for the current member.
-         */
-        return apply_filters( 'bp_get_member_user_nicename', $members_template->member->user_nicename );
-    }
-
-/**
- * Output login for current member in the loop.
- */
-function bp_member_user_login() {
-    echo bp_get_member_user_login();
-}
-    /**
-     * Get the login of the current member in the loop.
-     *
-     * @return string Member's login.
-     */
-    function bp_get_member_user_login() {
-        global $members_template;
-
-        /**
-         * Filters the login of the current member in the loop.
-         *
-         * @since 1.2.5
-         *
-         * @param string $user_login Login for the current member.
-         */
-        return apply_filters( 'bp_get_member_user_login', $members_template->member->user_login );
-    }
-
-/**
- * Output the email address for the current member in the loop.
- */
-function bp_member_user_email() {
-    echo bp_get_member_user_email();
-}
-    /**
-     * Get the email address of the current member in the loop.
-     *
-     * @return string Member's email address.
-     */
-    function bp_get_member_user_email() {
-        global $members_template;
-
-        /**
-         * Filters the email address of the current member in the loop.
-         *
-         * @since 1.2.5
-         *
-         * @param string $user_email Email address for the current member.
-         */
-        return apply_filters( 'bp_get_member_user_email', $members_template->member->user_email );
-    }
-
-/**
- * Check whether the current member in the loop is the logged-in user.
- *
- * @return bool
- */
-function bp_member_is_loggedin_user() {
-    global $members_template;
-
-    /**
-     * Filters whether the current member in the loop is the logged-in user.
-     *
-     * @since 1.2.5
-     *
-     * @param bool $value Whether current member in the loop is logged in.
-     */
-    return apply_filters( 'bp_member_is_loggedin_user', bp_loggedin_user_id() == $members_template->member->id ? true : false );
-}
-
-/**
- * Output a member's avatar.
- *
- * @see bp_get_member_avatar() for description of arguments.
- *
- * @param array|string $args See {@link bp_get_member_avatar()}.
- */
-function bp_member_avatar( $args = '' ) {
-
-    /**
-     * Filters a members avatar.
-     *
-     * @since 1.2.0
-     *
-     * @param string $value Formatted HTML <img> element, or raw avatar URL based on $html arg.
-     */
-    echo apply_filters( 'bp_member_avatar', bp_get_member_avatar( $args ) );
-}
-    /**
-     * Get a member's avatar.
-     *
-     * @see bp_core_fetch_avatar() For a description of arguments and
-     *      return values.
-     *
-     * @param array|string $args  {
-     *     Arguments are listed here with an explanation of their defaults.
-     *     For more information about the arguments, see
-     *     {@link bp_core_fetch_avatar()}.
-     *     @type string   $alt     Default: 'Profile picture of [user name]'.
-     *     @type string   $class   Default: 'avatar'.
-     *     @type string   $type    Default: 'thumb'.
-     *     @type int|bool $width   Default: false.
-     *     @type int|bool $height  Default: false.
-     *     @type bool     $id      Currently unused.
-     *     @type bool     $no_grav Default: false.
-     * }
-     * @return string User avatar string.
-     */
-    function bp_get_member_avatar( $args = '' ) {
-        global $members_template;
-
-        $fullname = !empty( $members_template->member->fullname ) ? $members_template->member->fullname : $members_template->member->display_name;
-
-        $defaults = array(
-            'type'   => 'thumb',
-            'width'  => false,
-            'height' => false,
-            'class'  => 'avatar',
-            'id'     => false,
-            'alt'    => sprintf( __( 'Profile picture of %s', 'buddypress' ), $fullname )
-        );
-
-        $r = wp_parse_args( $args, $defaults );
-        extract( $r, EXTR_SKIP );
-
-        /**
-         * Filters a members avatar.
-         *
-         * @since 1.2.0
-         *
-         * @param string $value Formatted HTML <img> element, or raw avatar URL based on $html arg.
-         */
-        return apply_filters( 'bp_get_member_avatar', bp_core_fetch_avatar( array( 'item_id' => $members_template->member->id, 'type' => $type, 'alt' => $alt, 'css_id' => $id, 'class' => $class, 'width' => $width, 'height' => $height, 'email' => $members_template->member->user_email ) ) );
-    }
-
-/**
- * Output the permalink for the current member in the loop.
- */
-function bp_member_permalink() {
-    echo bp_get_member_permalink();
-}
-    /**
-     * Get the permalink for the current member in the loop.
-     *
-     * @return string
-     */
-    function bp_get_member_permalink() {
-        global $members_template;
-
-        /**
-         * Filters the permalink for the current member in the loop.
-         *
-         * @since 1.2.0
-         *
-         * @param string $value Permalink for the current member in the loop.
-         */
-        return apply_filters( 'bp_get_member_permalink', bp_core_get_user_domain( $members_template->member->id, $members_template->member->user_nicename, $members_template->member->user_login ) );
-    }
-
-    /**
-     * Alias of {@link bp_member_permalink()}.
-     */
-    function bp_member_link() { echo bp_get_member_permalink(); }
-
-    /**
-     * Alias of {@link bp_get_member_permalink()}.
-     */
-    function bp_get_member_link() { return bp_get_member_permalink(); }
-
-/**
- * Output display name of current member in the loop.
- */
-function bp_member_name() {
-
-    /**
-     * Filters the display name of current member in the loop.
-     *
-     * @since 1.2.0
-     *
-     * @param string $value Display name for current member.
-     */
-    echo apply_filters( 'bp_member_name', bp_get_member_name() );
-}
-    /**
-     * Get the display name of the current member in the loop.
-     *
-     * Full name is, by default, pulled from xprofile's Full Name field.
-     * When this field is empty, we try to get an alternative name from the
-     * WP users table, in the following order of preference: display_name,
-     * user_nicename, user_login.
-     *
-     * @return string The user's fullname for display.
-     */
-    function bp_get_member_name() {
-        global $members_template;
-
-        // Generally, this only fires when xprofile is disabled.
-        if ( empty( $members_template->member->fullname ) ) {
-            // Our order of preference for alternative fullnames.
-            $name_stack = array(
-                'display_name',
-                'user_nicename',
-                'user_login'
-            );
-
-            foreach ( $name_stack as $source ) {
-                if ( !empty( $members_template->member->{$source} ) ) {
-                    // When a value is found, set it as fullname and be done with it.
-                    $members_template->member->fullname = $members_template->member->{$source};
-                    break;
-                }
-            }
-        }
-
-        /**
-         * Filters the display name of current member in the loop.
-         *
-         * @since 1.2.0
-         *
-         * @param string $fullname Display name for current member.
-         */
-        return apply_filters( 'bp_get_member_name', $members_template->member->fullname );
-    }
-    add_filter( 'bp_get_member_name', 'wp_filter_kses' );
-    add_filter( 'bp_get_member_name', 'stripslashes'   );
-    add_filter( 'bp_get_member_name', 'strip_tags'     );
-    add_filter( 'bp_get_member_name', 'esc_html'       );
-
-/**
- * Output the current member's last active time.
- *
- * @param array $args See {@link bp_get_member_last_active()}.
- */
-function bp_member_last_active( $args = array() ) {
-    echo bp_get_member_last_active( $args );
-}
-    /**
-     * Return the current member's last active time.
-     *
-     * @param array $args {
-     *     Array of optional arguments.
-     *     @type mixed $active_format If true, formatted "active 5 minutes
-     *                                ago". If false, formatted "5 minutes ago".
-     *                                If string, should be sprintf'able like
-     *                                'last seen %s ago'.
-     * }
-     * @return string
-     */
-    function bp_get_member_last_active( $args = array() ) {
-        global $members_template;
-
-        // Parse the activity format.
-        $r = bp_parse_args( $args, array(
-            'active_format' => true
-        ) );
-
-        // Backwards compatibility for anyone forcing a 'true' active_format.
-        if ( true === $r['active_format'] ) {
-            $r['active_format'] = __( 'active %s', 'buddypress' );
-        }
-
-        // Member has logged in at least one time.
-        if ( isset( $members_template->member->last_activity ) ) {
-
-            // Backwards compatibility for pre 1.5 'ago' strings.
-            $last_activity = ! empty( $r['active_format'] )
-                ? bp_core_get_last_activity( $members_template->member->last_activity, $r['active_format'] )
-                : bp_core_time_since( $members_template->member->last_activity );
-
-        // Member has never logged in or been active.
-        } else {
-            $last_activity = __( 'Never active', 'buddypress' );
-        }
-
-        /**
-         * Filters the current members last active time.
-         *
-         * @since 1.2.0
-         *
-         * @param string $last_activity Formatted time since last activity.
-         * @param array  $r             Array of parsed arguments for query.
-         */
-        return apply_filters( 'bp_member_last_active', $last_activity, $r );
-    }
-
-/**
- * Output the latest update of the current member in the loop.
- *
- * @param array|string $args Array of arguments for latest update.
- */
-function bp_member_latest_update( $args = '' ) {
-    echo bp_get_member_latest_update( $args );
-}
-    /**
-     * Get the latest update from the current member in the loop.
-     *
-     * @param array|string $args {
-     *     Array of optional arguments.
-     *     @type int  $length    Truncation length. Default: 225.
-     *     @type bool $view_link Whether to provide a 'View' link for
-     *                           truncated entries. Default: false.
-     * }
-     * @return string
-     */
-    function bp_get_member_latest_update( $args = '' ) {
-        global $members_template;
-
-        $defaults = array(
-            'length'    => 225,
-            'view_link' => true
-        );
-
-        $r = wp_parse_args( $args, $defaults );
-        extract( $r );
-
-        if ( !bp_is_active( 'activity' ) || empty( $members_template->member->latest_update ) || !$update = maybe_unserialize( $members_template->member->latest_update ) )
-            return false;
-
-        /**
-         * Filters the excerpt of the latest update for current member in the loop.
-         *
-         * @since 1.2.5
-         *
-         * @param string $value Excerpt of the latest update for current member in the loop.
-         */
-        $update_content = apply_filters( 'bp_get_activity_latest_update_excerpt', trim( strip_tags( bp_create_excerpt( $update['content'], $length ) ) ) );
-
-        $update_content = sprintf( _x( '- &quot;%s&quot;', 'member latest update in member directory', 'buddypress' ), $update_content );
-
-        // If $view_link is true and the text returned by bp_create_excerpt() is different from the original text (ie it's
-        // been truncated), add the "View" link.
-        if ( $view_link && ( $update_content != $update['content'] ) ) {
-            $view = __( 'View', 'buddypress' );
-
-            $update_content .= '<span class="activity-read-more"><a href="' . bp_activity_get_permalink( $update['id'] ) . '" rel="nofollow">' . $view . '</a></span>';
-        }
-
-        /**
-         * Filters the latest update from the current member in the loop.
-         *
-         * @since 1.2.0
-         *
-         * @param string $update_content Formatted latest update for current member.
-         */
-        return apply_filters( 'bp_get_member_latest_update', $update_content );
-    }
-
-/**
- * Output a piece of user profile data.
- *
- * @see bp_get_member_profile_data() for a description of params.
- *
- * @param array|string $args See {@link bp_get_member_profile_data()}.
- */
-function bp_member_profile_data( $args = '' ) {
-    echo bp_get_member_profile_data( $args );
-}
-    /**
-     * Get a piece of user profile data.
-     *
-     * When used in a bp_has_members() loop, this function will attempt
-     * to fetch profile data cached in the template global. It is also safe
-     * to use outside of the loop.
-     *
-     * @param array|string $args {
-     *     Array of config parameters.
-     *     @type string $field   Name of the profile field.
-     *     @type int    $user_id ID of the user whose data is being fetched.
-     *                           Defaults to the current member in the loop, or if not
-     *                           present, to the currently displayed user.
-     * }
-     * @return string|bool Profile data if found, otherwise false.
-     */
-    function bp_get_member_profile_data( $args = '' ) {
-        global $members_template;
-
-        if ( ! bp_is_active( 'xprofile' ) ) {
-            return false;
-        }
-
-        // Declare local variables.
-        $data = false;
-
-        // Guess at default $user_id.
-        $default_user_id = 0;
-        if ( ! empty( $members_template->member->id ) ) {
-            $default_user_id = $members_template->member->id;
-        } elseif ( bp_displayed_user_id() ) {
-            $default_user_id = bp_displayed_user_id();
-        }
-
-        $defaults = array(
-            'field'   => false,
-            'user_id' => $default_user_id,
-        );
-
-        $r = wp_parse_args( $args, $defaults );
-
-        // If we're in a members loop, get the data from the global.
-        if ( ! empty( $members_template->member->profile_data ) ) {
-            $profile_data = $members_template->member->profile_data;
-        }
-
-        // Otherwise query for the data.
-        if ( empty( $profile_data ) && method_exists( 'BP_XProfile_ProfileData', 'get_all_for_user' ) ) {
-            $profile_data = BP_XProfile_ProfileData::get_all_for_user( $r['user_id'] );
-        }
-
-        // If we're in the members loop, but the profile data has not
-        // been loaded into the global, cache it there for later use.
-        if ( ! empty( $members_template->member ) && empty( $members_template->member->profile_data ) ) {
-            $members_template->member->profile_data = $profile_data;
-        }
-
-        // Get the data for the specific field requested.
-        if ( ! empty( $profile_data ) && ! empty( $profile_data[ $r['field'] ]['field_type'] ) && ! empty( $profile_data[ $r['field'] ]['field_data'] ) ) {
-            $data = xprofile_format_profile_field( $profile_data[ $r['field'] ]['field_type'], $profile_data[ $r['field'] ]['field_data'] );
-        }
-
-        /**
-         * Filters resulting piece of member profile data.
-         *
-         * @since 1.2.0
-         *
-         * @param string|bool $data Profile data if found, otherwise false.
-         */
-        return apply_filters( 'bp_get_member_profile_data', $data );
-    }
-
-/**
- * Output the 'registered [x days ago]' string for the current member.
- */
-function bp_member_registered() {
-    echo bp_get_member_registered();
-}
-    /**
-     * Get the 'registered [x days ago]' string for the current member.
-     *
-     * @return string
-     */
-    function bp_get_member_registered() {
-        global $members_template;
-
-        $registered = esc_attr( bp_core_get_last_activity( $members_template->member->user_registered, _x( 'registered %s', 'Records the timestamp that the user registered into the activity stream', 'buddypress' ) ) );
-
-        /**
-         * Filters the 'registered [x days ago]' string for the current member.
-         *
-         * @since 2.1.0
-         *
-         * @param string $registered The 'registered [x days ago]' string.
-         */
-        return apply_filters( 'bp_member_registered', $registered );
-    }
-
-/**
- * Output a random piece of profile data for the current member in the loop.
- */
-function bp_member_random_profile_data() {
-    global $members_template;
-
-    if ( bp_is_active( 'xprofile' ) ) { ?>
-        <?php $random_data = xprofile_get_random_profile_data( $members_template->member->id, true ); ?>
-            <strong><?php echo wp_filter_kses( $random_data[0]->name ) ?></strong>
-            <?php echo wp_filter_kses( $random_data[0]->value ) ?>
-    <?php }
-}
-
-/**
- * Output hidden input for preserving member search params on form submit.
- */
-function bp_member_hidden_fields() {
-    $query_arg = bp_core_get_component_search_query_arg( 'members' );
-
-    if ( isset( $_REQUEST[ $query_arg ] ) ) {
-        echo '<input type="hidden" id="search_terms" value="' . esc_attr( $_REQUEST[ $query_arg ] ) . '" name="search_terms" />';
-    }
-
-    if ( isset( $_REQUEST['letter'] ) ) {
-        echo '<input type="hidden" id="selected_letter" value="' . esc_attr( $_REQUEST['letter'] ) . '" name="selected_letter" />';
-    }
-
-    if ( isset( $_REQUEST['members_search'] ) ) {
-        echo '<input type="hidden" id="search_terms" value="' . esc_attr( $_REQUEST['members_search'] ) . '" name="search_terms" />';
-    }
-}
-
-/**
- * Output the Members directory search form.
- */
-function bp_directory_members_search_form() {
-
-    $query_arg = bp_core_get_component_search_query_arg( 'members' );
-
-    if ( ! empty( $_REQUEST[ $query_arg ] ) ) {
-        $search_value = stripslashes( $_REQUEST[ $query_arg ] );
-    } else {
-        $search_value = bp_get_search_default_text( 'members' );
-    }
-
-    $search_form_html = '<form action="" method="get" id="search-members-form">
-        <label for="members_search"><input type="text" name="' . esc_attr( $query_arg ) . '" id="members_search" placeholder="'. esc_attr( $search_value ) .'" /></label>
-        <input type="submit" id="members_search_submit" name="members_search_submit" value="' . __( 'Search', 'buddypress' ) . '" />
-    </form>';
-
-    /**
-     * Filters the Members component search form.
-     *
-     * @since 1.9.0
-     *
-     * @param string $search_form_html HTML markup for the member search form.
-     */
-    echo apply_filters( 'bp_directory_members_search_form', $search_form_html );
-}
-
-/**
- * Output the total member count.
- */
-function bp_total_site_member_count() {
-    echo bp_get_total_site_member_count();
-}
-    /**
-     * Get the total site member count.
-     *
-     * @return int
-     */
-    function bp_get_total_site_member_count() {
-
-        /**
-         * Filters the total site member count.
-         *
-         * @since 1.2.0
-         *
-         * @param int $value Number-formatted total site member count.
-         */
-        return apply_filters( 'bp_get_total_site_member_count', bp_core_number_format( bp_core_get_total_member_count() ) );
-    }
-
-/** Navigation and other misc template tags ***********************************/
-
-/**
- * Render the navigation markup for the logged-in user.
- *
- * Each component adds to this navigation array within its own
- * [component_name]setup_nav() function.
- *
- * This navigation array is the top level navigation, so it contains items such as:
- *      [Blog, Profile, Messages, Groups, Friends] ...
- *
- * The function will also analyze the current component the user is in, to
- * determine whether or not to highlight a particular nav item.
- *
- * @todo Move to a back-compat file?
- * @deprecated Does not seem to be called anywhere in BP core.
- */
-function bp_get_loggedin_user_nav() {
-    $bp = buddypress();
-
-    // Loop through each navigation item.
-    foreach( (array) $bp->bp_nav as $nav_item ) {
-
-        $selected = '';
-
-        // If the current component matches the nav item id, then add a highlight CSS class.
-        if ( !bp_is_directory() && !empty( $bp->active_components[bp_current_component()] ) && $bp->active_components[bp_current_component()] == $nav_item['css_id'] ) {
-            $selected = ' class="current selected"';
-        }
-
-        // If we are viewing another person (current_userid does not equal
-        // loggedin_user->id then check to see if the two users are friends.
-        // if they are, add a highlight CSS class to the friends nav item
-        // if it exists.
-        if ( !bp_is_my_profile() && bp_displayed_user_id() ) {
-            $selected = '';
-
-            if ( bp_is_active( 'friends' ) ) {
-                if ( $nav_item['css_id'] == $bp->friends->id ) {
-                    if ( friends_check_friendship( bp_loggedin_user_id(), bp_displayed_user_id() ) ) {
-                        $selected = ' class="current selected"';
-                    }
-                }
-            }
-        }
-
-        // Echo out the final list item.
-        echo apply_filters_ref_array( 'bp_get_loggedin_user_nav_' . $nav_item['css_id'], array( '<li id="li-nav-' . $nav_item['css_id'] . '" ' . $selected . '><a id="my-' . $nav_item['css_id'] . '" href="' . $nav_item['link'] . '">' . $nav_item['name'] . '</a></li>', &$nav_item ) );
-    }
-
-    // Always add a log out list item to the end of the navigation.
-    $logout_link = '<li><a id="wp-logout" href="' .  wp_logout_url( bp_get_root_domain() ) . '">' . __( 'Log Out', 'buddypress' ) . '</a></li>';
-
-    echo apply_filters( 'bp_logout_nav_link', $logout_link );
-}
-
-/**
- * Render the navigation markup for the displayed user.
- */
-function bp_get_displayed_user_nav() {
-    $bp = buddypress();
-
-    foreach ( (array) $bp->bp_nav as $user_nav_item ) {
-        if ( empty( $user_nav_item['show_for_displayed_user'] ) && !bp_is_my_profile() )
-            continue;
-
-        $selected = '';
-        if ( bp_is_current_component( $user_nav_item['slug'] ) ) {
-            $selected = ' class="current selected"';
-        }
-
-        if ( bp_loggedin_user_domain() ) {
-            $link = str_replace( bp_loggedin_user_domain(), bp_displayed_user_domain(), $user_nav_item['link'] );
-        } else {
-            $link = trailingslashit( bp_displayed_user_domain() . $user_nav_item['link'] );
-        }
-
-        /**
-         * Filters the navigation markup for the displayed user.
-         *
-         * This is a dynamic filter that is dependent on the navigation tab component being rendered.
-         *
-         * @since 1.1.0
-         *
-         * @param string $value         Markup for the tab list item including link.
-         * @param array  $user_nav_item Array holding parts used to construct tab list item.
-         *                              Passed by reference.
-         */
-        echo apply_filters_ref_array( 'bp_get_displayed_user_nav_' . $user_nav_item['css_id'], array( '<li id="' . $user_nav_item['css_id'] . '-personal-li" ' . $selected . '><a id="user-' . $user_nav_item['css_id'] . '" href="' . $link . '">' . $user_nav_item['name'] . '</a></li>', &$user_nav_item ) );
-    }
-}
-
-/** Cover image ***************************************************************/
-
-/**
- * Should we use the cover image header
- *
- * @since 2.4.0
- *
- * @return bool True if the displayed user has a cover image,
- *              False otherwise
- */
-function bp_displayed_user_use_cover_image_header() {
-    return (bool) bp_is_active( 'xprofile', 'cover_image' ) && ! bp_disable_cover_image_uploads() && bp_attachments_is_wp_version_supported();
-}
-
-/** Avatars *******************************************************************/
-
-/**
- * Output the logged-in user's avatar.
- *
- * @see bp_get_loggedin_user_avatar() for a description of params.
- *
- * @param array|string $args Array of arguments for logged in user avatar.
- */
-function bp_loggedin_user_avatar( $args = '' ) {
-    echo bp_get_loggedin_user_avatar( $args );
-}
-    /**
-     * Get the logged-in user's avatar.
-     *
-     * @see bp_core_fetch_avatar() For a description of arguments and
-     *      return values.
-     *
-     * @param array|string $args  {
-     *     Arguments are listed here with an explanation of their defaults.
-     *     For more information about the arguments, see
-     *     {@link bp_core_fetch_avatar()}.
-     *     @type string   $alt    Default: 'Profile picture of [user name]'.
-     *     @type bool     $html   Default: true.
-     *     @type string   $type   Default: 'thumb'.
-     *     @type int|bool $width  Default: false.
-     *     @type int|bool $height Default: false.
-     * }
-     * @return string User avatar string.
-     */
-    function bp_get_loggedin_user_avatar( $args = '' ) {
-
-        $r = wp_parse_args( $args, array(
-            'item_id' => bp_loggedin_user_id(),
-            'type'    => 'thumb',
-            'width'   => false,
-            'height'  => false,
-            'html'    => true,
-            'alt'     => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_loggedin_user_fullname() )
-        ) );
-
-        /**
-         * Filters the logged in user's avatar.
-         *
-         * @since 1.1.0
-         *
-         * @param string $value User avatar string.
-         */
-        return apply_filters( 'bp_get_loggedin_user_avatar', bp_core_fetch_avatar( $r ), $r, $args );
-    }
-
-/**
- * Output the displayed user's avatar.
- *
- * @see bp_get_displayed_user_avatar() for a description of params.
- *
- * @param array|string $args Array of arguments for displayed user avatar.
- */
-function bp_displayed_user_avatar( $args = '' ) {
-    echo bp_get_displayed_user_avatar( $args );
-}
-    /**
-     * Get the displayed user's avatar.
-     *
-     * @see bp_core_fetch_avatar() For a description of arguments and
-     *      return values.
-     *
-     * @param array|string $args  {
-     *     Arguments are listed here with an explanation of their defaults.
-     *     For more information about the arguments, see
-     *     {@link bp_core_fetch_avatar()}.
-     *     @type string   $alt    Default: 'Profile picture of [user name]'.
-     *     @type bool     $html   Default: true.
-     *     @type string   $type   Default: 'thumb'.
-     *     @type int|bool $width  Default: false.
-     *     @type int|bool $height Default: false.
-     * }
-     * @return string User avatar string.
-     */
-    function bp_get_displayed_user_avatar( $args = '' ) {
-
-        $r = wp_parse_args( $args, array(
-            'item_id' => bp_displayed_user_id(),
-            'type'    => 'thumb',
-            'width'   => false,
-            'height'  => false,
-            'html'    => true,
-            'alt'     => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_displayed_user_fullname() )
-        ) );
-
-        /**
-         * Filters the displayed user's avatar.
-         *
-         * @since 1.1.0
-         *
-         * @param string $value User avatar string.
-         */
-        return apply_filters( 'bp_get_displayed_user_avatar', bp_core_fetch_avatar( $r ), $r, $args );
-    }
-
-/**
- * Output the email address of the displayed user.
- */
-function bp_displayed_user_email() {
-    echo bp_get_displayed_user_email();
-}
-    /**
-     * Get the email address of the displayed user.
-     *
-     * @return string
-     */
-    function bp_get_displayed_user_email() {
-        $bp = buddypress();
-
-        // If displayed user exists, return email address.
-        if ( isset( $bp->displayed_user->userdata->user_email ) )
-            $retval = $bp->displayed_user->userdata->user_email;
-        else
-            $retval = '';
-
-        /**
-         * Filters the email address of the displayed user.
-         *
-         * @since 1.5.0
-         *
-         * @param string $retval Email address for displayed user.
-         */
-        return apply_filters( 'bp_get_displayed_user_email', esc_attr( $retval ) );
-    }
-
-/**
- * Output the "active [x days ago]" string for a user.
- *
- * @see bp_get_last_activity() for a description of parameters.
- *
- * @param int $user_id See {@link bp_get_last_activity()}.
- */
-function bp_last_activity( $user_id = 0 ) {
-
-    /**
-     * Filters the 'active [x days ago]' string for a user.
-     *
-     * @since 1.0.0
-     *
-     * @param string $value Formatted 'active [x days ago]' string.
-     */
-    echo apply_filters( 'bp_last_activity', bp_get_last_activity( $user_id ) );
-}
-    /**
-     * Get the "active [x days ago]" string for a user.
-     *
-     * @param int $user_id ID of the user. Default: displayed user ID.
-     * @return string
-     */
-    function bp_get_last_activity( $user_id = 0 ) {
-
-        if ( empty( $user_id ) )
-            $user_id = bp_displayed_user_id();
-
-        $last_activity = bp_core_get_last_activity( bp_get_user_last_activity( $user_id ), __('active %s', 'buddypress') );
-
-        /**
-         * Filters the 'active [x days ago]' string for a user.
-         *
-         * @since 1.5.0
-         *
-         * @param string $value Formatted 'active [x days ago]' string.
-         */
-        return apply_filters( 'bp_get_last_activity', $last_activity );
-    }
-
-/**
- * Output the calculated first name of the displayed or logged-in user.
- */
-function bp_user_firstname() {
-    echo bp_get_user_firstname();
-}
-    /**
-     * Output the first name of a user.
-     *
-     * Simply takes all the characters before the first space in a name.
-     *
-     * @param string|bool $name Full name to use when generating first name.
-     *                          Defaults to displayed user's first name, or to
-     *                          logged-in user's first name if it's unavailable.
-     * @return string
-     */
-    function bp_get_user_firstname( $name = false ) {
-
-        // Try to get displayed user.
-        if ( empty( $name ) )
-            $name = bp_get_displayed_user_fullname();
-
-        // Fall back on logged in user.
-        if ( empty( $name ) )
-            $name = bp_get_loggedin_user_fullname();
-
-        $fullname = (array) explode( ' ', $name );
-
-        /**
-         * Filters the first name of a user.
-         *
-         * @since 1.2.0
-         *
-         * @param string $value    First name of user.
-         * @param string $fullname Full name of user.
-         */
-        return apply_filters( 'bp_get_user_firstname', $fullname[0], $fullname );
-    }
-
-/**
- * Output the link for the logged-in user's profile.
- */
-function bp_loggedin_user_link() {
-    echo bp_get_loggedin_user_link();
-}
-    /**
-     * Get the link for the logged-in user's profile.
-     *
-     * @return string
-     */
-    function bp_get_loggedin_user_link() {
-
-        /**
-         * Filters the link for the logged-in user's profile.
-         *
-         * @since 1.2.4
-         *
-         * @param string $value Link for the logged-in user's profile.
-         */
-        return apply_filters( 'bp_get_loggedin_user_link', bp_loggedin_user_domain() );
-    }
-
-/**
- * Output the link for the displayed user's profile.
- */
-function bp_displayed_user_link() {
-    echo bp_get_displayed_user_link();
-}
-    /**
-     * Get the link for the displayed user's profile.
-     *
-     * @return string
-     */
-    function bp_get_displayed_user_link() {
-
-        /**
-         * Filters the link for the displayed user's profile.
-         *
-         * @since 1.2.4
-         *
-         * @param string $value Link for the displayed user's profile.
-         */
-        return apply_filters( 'bp_get_displayed_user_link', bp_displayed_user_domain() );
-    }
-
-    /**
-     * Alias of {@link bp_displayed_user_domain()}.
-     *
-     * @deprecated
-     */
-    function bp_user_link() { bp_displayed_user_domain(); }
-
-/**
- * Alias of {@link bp_displayed_user_id()}.
- */
-function bp_current_user_id() { return bp_displayed_user_id(); }
-
-/**
- * Generate the link for the displayed user's profile.
- *
- * @return string
- */
-function bp_displayed_user_domain() {
-    $bp = buddypress();
-
-    /**
-     * Filters the generated link for the displayed user's profile.
-     *
-     * @since 1.0.0
-     *
-     * @param string $value Generated link for the displayed user's profile.
-     */
-    return apply_filters( 'bp_displayed_user_domain', isset( $bp->displayed_user->domain ) ? $bp->displayed_user->domain : '' );
-}
-
-/**
- * Generate the link for the logged-in user's profile.
- *
- * @return string
- */
-function bp_loggedin_user_domain() {
-    $bp = buddypress();
-
-    /**
-     * Filters the generated link for the logged-in user's profile.
-     *
-     * @since 1.0.0
-     *
-     * @param string $value Generated link for the logged-in user's profile.
-     */
-    return apply_filters( 'bp_loggedin_user_domain', isset( $bp->loggedin_user->domain ) ? $bp->loggedin_user->domain : '' );
-}
-
-/**
- * Output the displayed user's display name.
- */
-function bp_displayed_user_fullname() {
-    echo bp_get_displayed_user_fullname();
-}
-    /**
-     * Get the displayed user's display name.
-     *
-     * @return string
-     */
-    function bp_get_displayed_user_fullname() {
-        $bp = buddypress();
-
-        /**
-         * Filters the displayed user's display name.
-         *
-         * @since 1.2.0
-         *
-         * @param string $value Displayed user's display name.
-         */
-        return apply_filters( 'bp_displayed_user_fullname', isset( $bp->displayed_user->fullname ) ? $bp->displayed_user->fullname : '' );
-    }
-
-    /**
-     * Alias of {@link bp_get_displayed_user_fullname()}.
-     */
-    function bp_user_fullname() { echo bp_get_displayed_user_fullname(); }
-
-
-/**
- * Output the logged-in user's display name.
- */
-function bp_loggedin_user_fullname() {
-    echo bp_get_loggedin_user_fullname();
-}
-    /**
-     * Get the logged-in user's display name.
-     *
-     * @return string
-     */
-    function bp_get_loggedin_user_fullname() {
-        $bp = buddypress();
-
-        /**
-         * Filters the logged-in user's display name.
-         *
-         * @since 1.0.0
-         *
-         * @param string $value Logged-in user's display name.
-         */
-        return apply_filters( 'bp_get_loggedin_user_fullname', isset( $bp->loggedin_user->fullname ) ? $bp->loggedin_user->fullname : '' );
-    }
-
-/**
- * Output the username of the displayed user.
- */
-function bp_displayed_user_username() {
-    echo bp_get_displayed_user_username();
-}
-    /**
-     * Get the username of the displayed user.
-     *
-     * @return string
-     */
-    function bp_get_displayed_user_username() {
-        $bp = buddypress();
-
-        if ( bp_displayed_user_id() ) {
-            $username = bp_core_get_username( bp_displayed_user_id(), $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login );
-        } else {
-            $username = '';
-        }
-
-        /**
-         * Filters the username of the displayed user.
-         *
-         * @since 1.2.0
-         *
-         * @param string $username Username of the displayed user.
-         */
-        return apply_filters( 'bp_get_displayed_user_username', $username );
-    }
-
-/**
- * Output the username of the logged-in user.
- */
-function bp_loggedin_user_username() {
-    echo bp_get_loggedin_user_username();
-}
-    /**
-     * Get the username of the logged-in user.
-     *
-     * @return string
-     */
-    function bp_get_loggedin_user_username() {
-        $bp = buddypress();
-
-        if ( bp_loggedin_user_id() ) {
-            $username = bp_core_get_username( bp_loggedin_user_id(), $bp->loggedin_user->userdata->user_nicename, $bp->loggedin_user->userdata->user_login );
-        } else {
-            $username = '';
-        }
-
-        /**
-         * Filters the username of the logged-in user.
-         *
-         * @since 1.2.0
-         *
-         * @param string $username Username of the logged-in user.
-         */
-        return apply_filters( 'bp_get_loggedin_user_username', $username );
-    }
-/**
- * Echo the current member type message.
- *
- * @since 2.3.0
- */
-function bp_current_member_type_message() {
-    echo bp_get_current_member_type_message();
-}
-    /**
-     * Generate the current member type message.
-     *
-     * @since 2.3.0
-     *
-     * @return string
-     */
-    function bp_get_current_member_type_message() {
-        $type_object = bp_get_member_type_object( bp_get_current_member_type() );
-
-        $message = sprintf( __( 'Viewing members of the type: %s', 'buddypress' ), '<strong>' . $type_object->labels['singular_name'] . '</strong>' );
-
-        return apply_filters( 'bp_get_current_member_type_message', $message );
-    }
-
-/** Signup Form ***************************************************************/
-
-/**
- * Do we have a working custom sign up page?
- *
- * @since 1.5.0
- *
- * @uses bp_get_signup_slug() To make sure there is a slug assigned to the page.
- * @uses bp_locate_template() To make sure a template exists to provide output.
- *
- * @return bool True if page and template exist, false if not.
- */
-function bp_has_custom_signup_page() {
-    static $has_page = false;
-
-    if ( empty( $has_page ) )
-        $has_page = bp_get_signup_slug() && bp_locate_template( array( 'registration/register.php', 'members/register.php', 'register.php' ), false );
-
-    return (bool) $has_page;
-}
-
-/**
- * Output the URL to the signup page.
- */
-function bp_signup_page() {
-    echo esc_url( bp_get_signup_page() );
-}
-    /**
-     * Get the URL to the signup page.
-     *
-     * @return string
-     */
-    function bp_get_signup_page() {
-        if ( bp_has_custom_signup_page() ) {
-            $page = trailingslashit( bp_get_root_domain() . '/' . bp_get_signup_slug() );
-        } else {
-            $page = bp_get_root_domain() . '/wp-signup.php';
-        }
-
-        /**
-         * Filters the URL to the signup page.
-         *
-         * @since 1.1.0
-         *
-         * @param string $page URL to the signup page.
-         */
-        return apply_filters( 'bp_get_signup_page', $page );
-    }
-
-/**
- * Do we have a working custom activation page?
- *
- * @since 1.5.0
- *
- * @uses bp_get_activate_slug() To make sure there is a slug assigned to the page.
- * @uses bp_locate_template() To make sure a template exists to provide output.
- * @return boolean True if page and template exist, false if not.
- */
-function bp_has_custom_activation_page() {
-    static $has_page = false;
-
-    if ( empty( $has_page ) )
-        $has_page = bp_get_activate_slug() && bp_locate_template( array( 'registration/activate.php', 'members/activate.php', 'activate.php' ), false );
-
-    return (bool) $has_page;
-}
-
-/**
- * Output the URL of the activation page.
- */
-function bp_activation_page() {
-    echo esc_url( bp_get_activation_page() );
-}
-    /**
-     * Get the URL of the activation page.
-     *
-     * @return string
-     */
-    function bp_get_activation_page() {
-        if ( bp_has_custom_activation_page() ) {
-            $page = trailingslashit( bp_get_root_domain() . '/' . bp_get_activate_slug() );
-        } else {
-            $page = trailingslashit( bp_get_root_domain() ) . 'wp-activate.php';
-        }
-
-        /**
-         * Filters the URL of the activation page.
-         *
-         * @since 1.2.0
-         *
-         * @param string $page URL to the activation page.
-         */
-        return apply_filters( 'bp_get_activation_page', $page );
-    }
-
-/**
- * Output the username submitted during signup.
- */
-function bp_signup_username_value() {
-    echo bp_get_signup_username_value();
-}
-    /**
-     * Get the username submitted during signup.
-     *
-     * @todo This should be properly escaped.
-     *
-     * @return string
-     */
-    function bp_get_signup_username_value() {
-        $value = '';
-        if ( isset( $_POST['signup_username'] ) )
-            $value = $_POST['signup_username'];
-
-        /**
-         * Filters the username submitted during signup.
-         *
-         * @since 1.1.0
-         *
-         * @param string $value Username submitted during signup.
-         */
-        return apply_filters( 'bp_get_signup_username_value', $value );
-    }
-
-/**
- * Output the user email address submitted during signup.
- */
-function bp_signup_email_value() {
-    echo bp_get_signup_email_value();
-}
-    /**
-     * Get the email address submitted during signup.
-     *
-     * @todo This should be properly escaped.
-     *
-     * @return string
-     */
-    function bp_get_signup_email_value() {
-        $value = '';
-        if ( isset( $_POST['signup_email'] ) )
-            $value = $_POST['signup_email'];
-
-        /**
-         * Filters the email address submitted during signup.
-         *
-         * @since 1.1.0
-         *
-         * @param string $value Email address submitted during signup.
-         */
-        return apply_filters( 'bp_get_signup_email_value', $value );
-    }
-
-/**
- * Output the 'signup_with_blog' value submitted during signup.
- */
-function bp_signup_with_blog_value() {
-    echo bp_get_signup_with_blog_value();
-}
-    /**
-     * Get the 'signup_with_blog' value submitted during signup.
-     *
-     * @return string
-     */
-    function bp_get_signup_with_blog_value() {
-        $value = '';
-        if ( isset( $_POST['signup_with_blog'] ) )
-            $value = $_POST['signup_with_blog'];
-
-        /**
-         * Filters the 'signup_with_blog' value submitted during signup.
-         *
-         * @since 1.1.0
-         *
-         * @param string $value 'signup_with_blog' value submitted during signup.
-         */
-        return apply_filters( 'bp_get_signup_with_blog_value', $value );
-    }
-
-/**
- * Output the 'signup_blog_url' value submitted at signup.
- */
-function bp_signup_blog_url_value() {
-    echo bp_get_signup_blog_url_value();