Changeset 41225 for trunk/src/wp-admin/user-new.php

Timestamp:

08/03/2017 09:40:02 PM (7 years ago)

Author:

flixos90

Message:

Multisite: Introduce a can_add_user_to_blog filter to prevent adding a user to a site.

Under certain circumstances, it can be necessary that a user should not be added to a site, beyond the restrictions that WordPress core applies. With the new can_add_user_to_blog filter, plugin developers can run custom checks and return an error in case of a failure, that will prevent the user from being added.

The user-facing parts and the REST API route that interact with add_user_to_blog() have been adjusted accordingly to provide appropriate error feedback when a user could not be added to a site. Furthermore, two existing error feedback messages in the site admin's "New User" screen have been adjusted to properly show inside an error notice instead of a success notice.

Props jmdodd.
Fixes #41101.

File:

• trunk/src/wp-admin/user-new.php (modified) (3 diffs)

trunk/src/wp-admin/user-new.php

@@ -68 +68 @@
     } else {
         if ( isset( $_POST[ 'noconfirmation' ] ) && current_user_can( 'manage_network_users' ) ) {
-            add_existing_user_to_blog( array( 'user_id' => $user_id, 'role' => $_REQUEST[ 'role' ] ) );
-            $redirect = add_query_arg( array( 'update' => 'addnoconfirmation' , 'user_id' => $user_id ), 'user-new.php' );
+            $result = add_existing_user_to_blog( array( 'user_id' => $user_id, 'role' => $_REQUEST[ 'role' ] ) );
+
+            if ( ! is_wp_error( $result ) ) {
+                $redirect = add_query_arg( array( 'update' => 'addnoconfirmation', 'user_id' => $user_id ), 'user-new.php' );
+            } else {
+                $redirect = add_query_arg( array( 'update' => 'could_not_add' ), 'user-new.php' );
+            }
         } else {
             $newuser_key = substr( md5( $user_id ), 0, 5 );
@@ -158 +163 @@
                 if ( is_wp_error( $new_user ) ) {
                     $redirect = add_query_arg( array( 'update' => 'addnoconfirmation' ), 'user-new.php' );
+                } elseif ( ! is_user_member_of_blog( $new_user['user_id'] ) ) {
+                    $redirect = add_query_arg( array( 'update' => 'created_could_not_add' ), 'user-new.php' );
                 } else {
                     $redirect = add_query_arg( array( 'update' => 'addnoconfirmation', 'user_id' => $new_user['user_id'] ), 'user-new.php' );
@@ -262 +269 @@
                 $messages[] = __('That user is already a member of this site.');
                 break;
+            case "could_not_add":
+                $add_user_errors = new WP_Error( 'could_not_add', __( 'That user could not be added to this site.' ) );
+                break;
+            case "created_could_not_add":
+                $add_user_errors = new WP_Error( 'created_could_not_add', __( 'User has been created, but could not be added to this site.' ) );
+                break;
             case "does_not_exist":
-                $messages[] = __('The requested user does not exist.');
+                $add_user_errors = new WP_Error( 'does_not_exist', __( 'The requested user does not exist.' ) );
                 break;
             case "enter_email":
-                $messages[] = __('Please enter a valid email address.');
+                $add_user_errors = new WP_Error( 'enter_email', __( 'Please enter a valid email address.' ) );
                 break;
         }