Ticket #6060: 6060.patch

src/bp-core/bp-core-taxonomy.php

@@ -21 +21 @@
  */
 function bp_register_default_taxonomies() {
         // Member Type.
-        register_taxonomy( 'bp_member_type', 'user', array(
+        register_taxonomy( bp_get_member_type_tax_type(), 'user', array(
                 'public' => false,
         ) );
 

src/bp-core/classes/class-bp-user-query.php

@@ -780 +780 @@
 
                 $tax_query = new WP_Tax_Query( array(
                         array(
-                                'taxonomy' => 'bp_member_type',
+                                'taxonomy' => bp_get_member_type_tax_type(),
                                 'field'    => 'name',
                                 'operator' => $operator,
                                 'terms'    => $types,
@@ -788 +788 @@
                 ) );
 
                 // Switch to the root blog, where member type taxonomies live.
-                $site_id  = bp_get_taxonomy_term_site_id( 'bp_member_type' );
+                $site_id  = bp_get_taxonomy_term_site_id( bp_get_member_type_tax_type() );
                 $switched = false;
                 if ( $site_id !== get_current_blog_id() ) {
                         switch_to_blog( $site_id );

src/bp-members/bp-members-cache.php

@@ -20 +20 @@
 function bp_members_prefetch_member_type( BP_User_Query $bp_user_query ) {
         $uncached_member_ids = bp_get_non_cached_ids( $bp_user_query->user_ids, 'bp_member_member_type' );
 
-        $member_types = bp_get_object_terms( $uncached_member_ids, 'bp_member_type', array(
+        $member_types = bp_get_object_terms( $uncached_member_ids, bp_get_member_type_tax_type(), array(
                 'fields' => 'all_with_object_id',
         ) );
 

src/bp-members/bp-members-functions.php

@@ -2506 +2506 @@
 /** Member Types *************************************************************/
 
 /**
+ * Output the slug of the member type taxonomy.
+ *
+ * @since 2.7.0
+ */
+function bp_member_type_tax_type() {
+        echo bp_get_member_type_tax_type();
+}
+
+/**
+ * Return the slug of the member type taxonomy.
+ *
+ * @since 2.7.0
+ *
+ * @return string The unique member taxonomy slug.
+ */
+function bp_get_member_type_tax_type() {
+        /**
+         * Filters the slug of the member type taxonomy.
+         *
+         * @since 2.7.0
+         *
+         * @param string $value Member type taxonomy slug.
+         */
+        return apply_filters( 'bp_get_member_type_tax_type', 'bp_member_type' );
+}
+
+/**
  * Register a member type.
  *
  * @since 2.2.0
@@ -2676 +2703 @@
                 return false;
         }
 
-        $retval = bp_set_object_terms( $user_id, $member_type, 'bp_member_type', $append );
+        $retval = bp_set_object_terms( $user_id, $member_type, bp_get_member_type_tax_type(), $append );
 
         // Bust the cache if the type has been updated.
         if ( ! is_wp_error( $retval ) ) {
@@ -2712 +2739 @@
                 return false;
         }
 
-        $deleted = bp_remove_object_terms( $user_id, $member_type, 'bp_member_type' );
+        $deleted = bp_remove_object_terms( $user_id, $member_type, bp_get_member_type_tax_type() );
 
         // Bust the cache if the type has been removed.
         if ( ! is_wp_error( $deleted ) ) {
@@ -2747 +2774 @@
         $types = wp_cache_get( $user_id, 'bp_member_member_type' );
 
         if ( false === $types ) {
-                $types = bp_get_object_terms( $user_id, 'bp_member_type' );
+                $types = bp_get_object_terms( $user_id, bp_get_member_type_tax_type() );
 
                 if ( ! is_wp_error( $types ) ) {
                         $types = wp_list_pluck( $types, 'name' );

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

@@ -215 +215 @@
                                 add_filter( 'set-screen-option',    array( $this, 'signup_screen_options' ), 10, 3 );
                         }
                 }
+
+                /** Users List - Members Types ***************************************
+         */
+
+                if ( is_admin() && ! empty( buddypress()->members->types ) ) {
+
+                        // Change type UI and bulk processing.
+                        add_action( 'restrict_manage_users', array( $this, 'users_type_change_to'   ) );
+                        add_action( 'load-users.php',        array( $this, 'users_type_bulk_change' ) );
+
+                        // Display for each user its type in a row.
+                        add_filter( 'manage_users_columns',       array( $this, 'users_type_column' )        );
+                        add_filter( 'manage_users_custom_column', array( $this, 'users_type_row'    ), 10, 3 );
+
+                        // Filter users by type.
+                        add_filter( 'pre_get_users', array( $this, 'users_type_process_filter_by' ) );
+                }
         }
 
         /**
@@ -1905 +1922 @@
          * @since 2.0.0
          *
          * @param string $action Delete, activate, or resend activation link.
+         *
          * @return string
          */
         public function signups_admin_manage( $action = '' ) {
@@ -2032 +2050 @@
 
                 <?php
         }
+
+        /** Users List Management ****************************************************/
+
+        /**
+         * Display a dropdown to change the member type of selected user(s).
+         *
+         * @since 2.7.0
+         *
+         * @param string $which Where this dropdown is displayed - top or bottom.
+         */
+        public function users_type_change_to( $which ) {
+                $id_name = 'bottom' === $which ? 'bp_change_type2' : 'bp_change_type';
+
+                // Bail if current user cannot promote users
+                if ( ! current_user_can( 'promote_users' ) ) {
+                        return;
+                }
+
+                $types = buddypress()->members->types; ?>
+
+            <label class="screen-reader-text" for="bp_change_type"><?php _e( 'Change member type to&hellip;', 'buddypress' ) ?></label>
+            <select name="<?php echo $id_name; ?>" id="<?php echo $id_name; ?>" style="display:inline-block;float:none;">
+                <option value=""><?php _e( 'Change member type to&hellip;', 'buddypress' ) ?></option>
+
+                <?php foreach( $types as $type ) : ?>
+
+                                <option value="<?php echo esc_attr( $type->name ); ?>"><?php echo $type->labels['name']; ?></option>
+
+                <?php endforeach; ?>
+
+            </select>
+                <?php
+
+                submit_button( __( 'Change', 'buddypress' ), 'button', 'bp_change_member_type', false );
+
+        wp_nonce_field( 'bp-bulk-users-change-type', 'bp-bulk-users-change-type-nonce' );
+        }
+
+        /**
+         * Process bulk member type submission from the Users Table.
+         *
+         * @since 2.7.0
+         */
+        public function users_type_bulk_change() {
+                $this->users_type_change_notice();
+
+                // Bail if no users specified
+                if ( empty( $_REQUEST['users'] ) ) {
+                        return;
+                }
+
+                // Bail if this isn't a BuddyPress action.
+                if (
+                        ( empty( $_REQUEST['bp_change_type'] ) && empty( $_REQUEST['bp_change_type2'] ) ) ||
+                        empty( $_REQUEST['bp_change_member_type'] )
+                ) {
+                        return;
+                }
+
+                // Bail if nonce check fails.
+                check_admin_referer( 'bp-bulk-users-change-type', 'bp-bulk-users-change-type-nonce' );
+
+                // Bail if current user cannot promote users.
+                if ( ! current_user_can( 'promote_users' ) ) {
+                        return;
+                }
+
+                // Bail if the new type is empty.
+                $new_type = '';
+                if ( ! empty( $_REQUEST['bp_change_type2'] ) ) {
+                        $new_type = sanitize_text_field( $_REQUEST['bp_change_type2'] );
+                } elseif ( ! empty( $_REQUEST['bp_change_type'] ) ) {
+                        $new_type = sanitize_text_field( $_REQUEST['bp_change_type'] );
+                }
+                if ( empty( $new_type ) ) {
+                        return;
+                }
+
+                // Check that the selected type actually exists.
+                $types = buddypress()->members->types;
+                if ( empty( $types[ $new_type ] ) ) {
+                        return;
+                }
+
+                // Run through user ids.
+                foreach ( (array) $_REQUEST['users'] as $user_id ) {
+                        $user_id = (int) $user_id;
+
+                        // Get the old member type to check against.
+                        $user_type = bp_get_member_type( $user_id );
+
+                        // Set the new member type.
+                        if ( $new_type !== $user_type ) {
+                                $set = bp_set_member_type( $user_id, $new_type );
+
+                                // Lets assume, that everything is fine.
+                                if ( ! empty( $set ) && ! is_wp_error( $set ) ) {
+                                        $redirect = add_query_arg( array( 'updated' => 'member-type-change-success' ), wp_get_referer() );
+                                } else {
+                                        $redirect = add_query_arg( array( 'updated' => 'member-type-change-error' ), wp_get_referer() );
+                                }
+
+                                wp_redirect( $redirect );
+                                exit();
+                        }
+                }
+        }
+
+        /**
+         * Display an admin area notice upon member type bulk update.
+         *
+         * @since 2.7.0
+         */
+        public function users_type_change_notice() {
+                $updated = isset( $_REQUEST['updated'] ) ? $_REQUEST['updated'] : false;
+
+                // Display feedback.
+                if ( ! empty( $updated ) && in_array( $updated, array( 'member-type-change-error', 'member-type-change-success' ) ) ) {
+
+                        if ( 'member-type-change-error' === $updated ) {
+                                $notice = __( 'There was an error while changing member type. Please try again.', 'buddypress' );
+                        } else {
+                                $notice = __( 'Member type was successfully changed.', 'buddypress' );
+                        }
+
+                        bp_core_add_admin_notice( $notice );
+                }
+        }
+
+        /**
+         * Add Member Type column to the WordPress Users table.
+         *
+         * @since 2.7.0
+         *
+         * @param array $columns Users table columns.
+         *
+         * @return array $columns
+         */
+        public function users_type_column( $columns = array() ) {
+                $columns[ bp_get_member_type_tax_type() ] = __( 'Member Type', 'buddypress' );
+
+                return $columns;
+        }
+
+        /**
+         * Return member's type for display in the Users list table.
+         *
+         * @since 2.7.0
+         *
+         * @param string $retval
+         * @param string $column_name
+         * @param int $user_id
+         *
+         * @return string Displayable member type as a link to filter all users.
+         */
+        public function users_type_row( $retval = '', $column_name = '', $user_id = 0 ) {
+                // Only looking for member type column
+                if ( bp_get_member_type_tax_type() !== $column_name ) {
+                        return $retval;
+                }
+
+                // Get the member type.
+                $type   = bp_get_member_type( $user_id );
+                $retval = '';
+
+                // Translate user role for display.
+                if ( ! empty( $type ) ) {
+                        $types = buddypress()->members->types;
+
+                        if ( ! empty( $types[ $type ]->labels['singular_name'] ) ) {
+                                $url = add_query_arg( array( 'bp-member-type' => urlencode( $type ) ), wp_get_referer() );
+
+                                $retval = '<a href="' . esc_url( $url ) . '">' . translate_user_role( $types[ $type ]->labels['singular_name'] ) . '</a>';
+                        }
+                }
+
+                return $retval;
+        }
+
+        /*******************************************************************/
+
+        /**
+         * Filter in admin area on Users page those with a specified type.
+         *
+         * @param WP_Query $query
+         *
+         * @since 2.7.0
+         */
+        public function users_type_process_filter_by( $query ) {
+                global $pagenow;
+
+                if ( is_admin() && 'users.php' === $pagenow && ! empty( $_REQUEST['bp-member-type'] ) ) {
+                        $type_slug = sanitize_text_field( $_REQUEST['bp-member-type'] );
+
+                        // Check that the type actually exists.
+                        $types = buddypress()->members->types;
+                        if ( empty( $types[ $type_slug ] ) ) {
+                                return;
+                        }
+
+                        // Get the list of users, that are assigned to this member type.
+                        $type = get_term_by( 'slug', $type_slug, bp_get_member_type_tax_type() );
+
+                        if ( ! $type->term_id ) {
+                                return;
+                        }
+
+                        $user_ids = get_objects_in_term( $type->term_id, bp_get_member_type_tax_type() );
+
+                        if ( $user_ids && ! is_wp_error( $user_ids ) ) {
+                    $query->set( 'include', (array) $user_ids );
+                        }
+                }
+        }
 }
 endif; // End class_exists check.