Changeset 11140

Timestamp:

09/21/2016 05:38:04 PM (9 years ago)

Author:

dcavins

Message:

WP Users List: Refinements to member type bulk change controls and filters.

Apply code improvements from related work on group type (#7175).

• Improve error message presentation.
• Escape strings before output.
• Use strict comparison operators.

Props dcavins, djpaul.

See #6060

File:

• trunk/src/bp-members/classes/class-bp-members-admin.php (modified) (7 diffs)

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

@@ -2064 +2064 @@
 
         // Bail if current user cannot promote users.
-        if ( ! current_user_can( 'promote_users' ) ) {
+        if ( ! bp_current_user_can( 'promote_users' ) ) {
             return;
         }
@@ -2085 +2085 @@
             <?php foreach( $types as $type ) : ?>
 
-                <option value="<?php echo esc_attr( $type->name ); ?>"><?php echo $type->labels['name']; ?></option>
+                <option value="<?php echo esc_attr( $type->name ); ?>"><?php esc_html_e( $type->labels['singular_name'] ); ?></option>
 
             <?php endforeach; ?>
@@ -2106 +2106 @@
         $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'] ) )
+        // Bail if no users are specified or if this isn't a BuddyPress action.
+        if ( empty( $_REQUEST['users'] )
+            || ( empty( $_REQUEST['bp_change_type'] ) && empty( $_REQUEST['bp_change_type2'] ) )
             || empty( $_REQUEST['bp_change_member_type'] )
         ) {
@@ -2122 +2118 @@
 
         // Bail if current user cannot promote users.
-        if ( ! current_user_can( 'promote_users' ) ) {
+        if ( ! bp_current_user_can( 'promote_users' ) ) {
             return;
         }
@@ -2134 +2130 @@
 
         // Check that the selected type actually exists.
-        if ( 'remove_member_type' != $new_type && null == bp_get_member_type_object( $new_type ) ) {
-            return;
-        }
-
-        // Run through user ids.
-        $error = false;
-        foreach ( (array) $_REQUEST['users'] as $user_id ) {
-            $user_id = (int) $user_id;
-
-            // Get the old member type to check against.
-            $member_type = bp_get_member_type( $user_id );
-
-            if ( 'remove_member_type' == $new_type ) {
-                // Remove the current member type, if there's one to remove.
-                if ( $member_type ) {
-                    $removed = bp_remove_member_type( $user_id, $member_type );
-                    if ( false == $removed || is_wp_error( $removed ) ) {
-                        $error = true;
+        if ( 'remove_member_type' != $new_type && null === bp_get_member_type_object( $new_type ) ) {
+            $error = true;
+        } else {
+            // Run through user ids.
+            $error = false;
+            foreach ( (array) $_REQUEST['users'] as $user_id ) {
+                $user_id = (int) $user_id;
+
+                // Get the old member type to check against.
+                $member_type = bp_get_member_type( $user_id );
+
+                if ( 'remove_member_type' === $new_type ) {
+                    // Remove the current member type, if there's one to remove.
+                    if ( $member_type ) {
+                        $removed = bp_remove_member_type( $user_id, $member_type );
+                        if ( false === $removed || is_wp_error( $removed ) ) {
+                            $error = true;
+                        }
                     }
-                }
-            } else {
-                // Set the new member type.
-                if ( $new_type !== $member_type ) {
-                    $set = bp_set_member_type( $user_id, $new_type );
-                    if ( false == $set || is_wp_error( $set ) ) {
-                        $error = true;
+                } else {
+                    // Set the new member type.
+                    if ( $new_type !== $member_type ) {
+                        $set = bp_set_member_type( $user_id, $new_type );
+                        if ( false === $set || is_wp_error( $set ) ) {
+                            $error = true;
+                        }
                     }
                 }
@@ -2185 +2181 @@
 
         // Display feedback.
-        if ( $updated && in_array( $updated, array( 'member-type-change-error', 'member-type-change-success' ) ) ) {
+        if ( $updated && in_array( $updated, array( 'member-type-change-error', 'member-type-change-success' ), true ) ) {
 
             if ( 'member-type-change-error' === $updated ) {
                 $notice = __( 'There was an error while changing member type. Please try again.', 'buddypress' );
+                $type   = 'error';
             } else {
                 $notice = __( 'Member type was changed successfully.', 'buddypress' );
+                $type   = 'updated';
             }
 
-            bp_core_add_admin_notice( $notice );
+            bp_core_add_admin_notice( $notice, $type );
         }
     }
@@ -2235 +2233 @@
         if ( $type_obj = bp_get_member_type_object( $type ) ) {
             $url = add_query_arg( array( 'bp-member-type' => urlencode( $type ) ) );
-            $retval = '<a href="' . esc_url( $url ) . '">' . $type_obj->labels['singular_name'] . '</a>';
+            $retval = '<a href="' . esc_url( $url ) . '">' . esc_html( $type_obj->labels['singular_name'] ) . '</a>';
         }