' . __( 'Sorry, you are not allowed to add users to this network.' ) . '
', + 403 + ); + } } elseif ( ! current_user_can( 'create_users' ) ) { - wp_die( __( 'Cheatin’ uh?' ), 403 ); + wp_die( + '' . __( 'Sorry, you are not allowed to create users.' ) . '
', + 403 + ); } if ( is_multisite() ) { - function admin_created_user_email( $text ) { - $roles = get_editable_roles(); - $role = $roles[ $_REQUEST['role'] ]; - /* translators: 1: Site name, 2: site URL, 3: role */ - return sprintf( __( 'Hi, -You\'ve been invited to join \'%1$s\' at -%2$s with the role of %3$s. -If you do not want to join this site please ignore -this email. This invitation will expire in a few days. - -Please click the following link to activate your user account: -%%s' ), get_bloginfo( 'name' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ) ); - } add_filter( 'wpmu_signup_user_notification_email', 'admin_created_user_email' ); } @@ -54,8 +50,13 @@ if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) { die(); } - if ( ! current_user_can('promote_user', $user_details->ID) ) - wp_die( __( 'Cheatin’ uh?' ), 403 ); + if ( ! current_user_can( 'promote_user', $user_details->ID ) ) { + wp_die( + '' . __( 'Sorry, you are not allowed to add users to this network.' ) . '
', + 403 + ); + } // Adding an existing user to this blog $new_user_email = $user_details->user_email; @@ -65,15 +66,27 @@ if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) { if ( ( $username != null && !is_super_admin( $user_id ) ) && ( array_key_exists($blog_id, get_blogs_of_user($user_id)) ) ) { $redirect = add_query_arg( array('update' => 'addexisting'), 'user-new.php' ); } else { - if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) { + 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-new.php' ); + $redirect = add_query_arg( array( 'update' => 'addnoconfirmation' , 'user_id' => $user_id ), 'user-new.php' ); } else { $newuser_key = substr( md5( $user_id ), 0, 5 ); add_option( 'new_user_' . $newuser_key, array( 'user_id' => $user_id, 'email' => $user_details->user_email, 'role' => $_REQUEST[ 'role' ] ) ); $roles = get_editable_roles(); $role = $roles[ $_REQUEST['role'] ]; + + /** + * Fires immediately after a user is invited to join a site, but before the notification is sent. + * + * @since 4.4.0 + * + * @param int $user_id The invited user's ID. + * @param array $role The role of invited user. + * @param string $newuser_key The key of the invitation. + */ + do_action( 'invite_user', $user_id, $role, $newuser_key ); + /* translators: 1: Site name, 2: site URL, 3: role, 4: activation URL */ $message = __( 'Hi, @@ -91,8 +104,13 @@ Please click the following link to confirm the invite: } elseif ( isset($_REQUEST['action']) && 'createuser' == $_REQUEST['action'] ) { check_admin_referer( 'create-user', '_wpnonce_create-user' ); - if ( ! current_user_can('create_users') ) - wp_die( __( 'Cheatin’ uh?' ), 403 ); + if ( ! current_user_can( 'create_users' ) ) { + wp_die( + '' . __( 'Sorry, you are not allowed to create users.' ) . '
', + 403 + ); + } if ( ! is_multisite() ) { $user_id = edit_user(); @@ -115,22 +133,26 @@ Please click the following link to confirm the invite: $add_user_errors = $user_details[ 'errors' ]; } else { /** - * Filter the user_login, also known as the username, before it is added to the site. + * Filters the user_login, also known as the username, before it is added to the site. * * @since 2.0.3 * * @param string $user_login The sanitized username. */ $new_user_login = apply_filters( 'pre_user_login', sanitize_user( wp_unslash( $_REQUEST['user_login'] ), true ) ); - if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) { + if ( isset( $_POST[ 'noconfirmation' ] ) && current_user_can( 'manage_network_users' ) ) { add_filter( 'wpmu_signup_user_notification', '__return_false' ); // Disable confirmation email add_filter( 'wpmu_welcome_user_notification', '__return_false' ); // Disable welcome email } wpmu_signup_user( $new_user_login, $new_user_email, array( 'add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST['role'] ) ); - if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) { + if ( isset( $_POST[ 'noconfirmation' ] ) && current_user_can( 'manage_network_users' ) ) { $key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $new_user_email ) ); - wpmu_activate_signup( $key ); - $redirect = add_query_arg( array('update' => 'addnoconfirmation'), 'user-new.php' ); + $new_user = wpmu_activate_signup( $key ); + if ( is_wp_error( $new_user ) ) { + $redirect = add_query_arg( array( 'update' => 'addnoconfirmation' ), 'user-new.php' ); + } else { + $redirect = add_query_arg( array( 'update' => 'addnoconfirmation', 'user_id' => $new_user['user_id'] ), 'user-new.php' ); + } } else { $redirect = add_query_arg( array('update' => 'newuserconfirmation'), 'user-new.php' ); } @@ -153,8 +175,9 @@ if ( is_multisite() ) { $help .= '' . __('Because this is a multisite installation, you may add accounts that already exist on the Network by specifying a username or email, and defining a role. For more options, such as specifying a password, you have to be a Network Administrator and use the hover link under an existing user’s name to Edit the user profile under Network Admin > All Users.') . '
' . '' . __('New users will receive an email letting them know they’ve been added as a user for your site. This email will also contain their password. Check the box if you don’t want the user to receive a welcome email.') . '
'; } else { - $help .= '' . __('You must assign a password to the new user, which they can change after logging in. The username, however, cannot be changed.') . '
' . - '' . __('New users will receive an email letting them know they’ve been added as a user for your site. By default, this email will also contain their password. Uncheck the box if you don’t want the password to be included in the welcome email.') . '
'; + $help .= '' . __('New users are automatically assigned a password, which they can change after logging in. You can view or edit the assigned password by clicking the Show Password button. The username cannot be changed once the user has been added.') . '
' . + + '' . __('By default, new users will receive an email letting them know they’ve been added as a user for your site. This email will also contain a password reset link. Uncheck the box if you don’t want to send the new user a welcome email.') . '
'; } $help .= '' . __('Remember to click the Add New User button at the bottom of this screen when you are finished.') . '
'; @@ -185,10 +208,10 @@ get_current_screen()->set_help_sidebar( ); wp_enqueue_script('wp-ajax-response'); -wp_enqueue_script('user-profile'); +wp_enqueue_script( 'user-profile' ); /** - * Filter whether to enable user auto-complete for non-super admins in Multisite. + * Filters whether to enable user auto-complete for non-super admins in Multisite. * * @since 3.4.0 * @@ -205,6 +228,14 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); if ( isset($_GET['update']) ) { $messages = array(); if ( is_multisite() ) { + $edit_link = ''; + if ( ( isset( $_GET['user_id'] ) ) ) { + $user_id_new = absint( $_GET['user_id'] ); + if ( $user_id_new ) { + $edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user_id_new ) ) ); + } + } + switch ( $_GET['update'] ) { case "newuserconfirmation": $messages[] = __('Invitation email sent to new user. A confirmation link must be clicked before their account is created.'); @@ -213,7 +244,12 @@ if ( isset($_GET['update']) ) { $messages[] = __('Invitation email sent to user. A confirmation link must be clicked for them to be added to your site.'); break; case "addnoconfirmation": - $messages[] = __('User has been added to your site.'); + if ( empty( $edit_link ) ) { + $messages[] = __( 'User has been added to your site.' ); + } else { + /* translators: %s: edit page url */ + $messages[] = sprintf( __( 'User has been added to your site. Edit user' ), $edit_link ); + } break; case "addexisting": $messages[] = __('That user is already a member of this site.'); @@ -232,13 +268,13 @@ if ( isset($_GET['update']) ) { } ?>' . __( 'Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ) . '
'; - $label = __('E-mail'); + $label = __('Email'); $type = 'email'; } else { echo '' . __( 'Enter the email address or username of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ) . '
'; - $label = __('E-mail or Username'); + $label = __('Email or Username'); $type = 'text'; } ?> @@ -303,7 +339,7 @@ if ( is_multisite() ) { - +