diff -r c7c34916027a -r 177826044cd9 wp/wp-admin/user-new.php --- a/wp/wp-admin/user-new.php Mon Oct 14 18:06:33 2019 +0200 +++ b/wp/wp-admin/user-new.php Mon Oct 14 18:28:13 2019 +0200 @@ -29,24 +29,24 @@ add_filter( 'wpmu_signup_user_notification_email', 'admin_created_user_email' ); } -if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) { +if ( isset( $_REQUEST['action'] ) && 'adduser' == $_REQUEST['action'] ) { check_admin_referer( 'add-user', '_wpnonce_add-user' ); $user_details = null; - $user_email = wp_unslash( $_REQUEST['email'] ); + $user_email = wp_unslash( $_REQUEST['email'] ); if ( false !== strpos( $user_email, '@' ) ) { $user_details = get_user_by( 'email', $user_email ); } else { if ( current_user_can( 'manage_network_users' ) ) { $user_details = get_user_by( 'login', $user_email ); } else { - wp_redirect( add_query_arg( array('update' => 'enter_email'), 'user-new.php' ) ); + wp_redirect( add_query_arg( array( 'update' => 'enter_email' ), 'user-new.php' ) ); die(); } } - if ( !$user_details ) { - wp_redirect( add_query_arg( array('update' => 'does_not_exist'), 'user-new.php' ) ); + if ( ! $user_details ) { + wp_redirect( add_query_arg( array( 'update' => 'does_not_exist' ), 'user-new.php' ) ); die(); } @@ -60,26 +60,44 @@ // Adding an existing user to this blog $new_user_email = $user_details->user_email; - $redirect = 'user-new.php'; - $username = $user_details->user_login; - $user_id = $user_details->ID; + $redirect = 'user-new.php'; + $username = $user_details->user_login; + $user_id = $user_details->ID; if ( $username != null && array_key_exists( $blog_id, get_blogs_of_user( $user_id ) ) ) { - $redirect = add_query_arg( array('update' => 'addexisting'), 'user-new.php' ); + $redirect = add_query_arg( array( 'update' => 'addexisting' ), 'user-new.php' ); } else { - if ( isset( $_POST[ 'noconfirmation' ] ) && current_user_can( 'manage_network_users' ) ) { - $result = add_existing_user_to_blog( array( 'user_id' => $user_id, 'role' => $_REQUEST[ 'role' ] ) ); + if ( isset( $_POST['noconfirmation'] ) && current_user_can( 'manage_network_users' ) ) { + $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' ); + $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 = wp_generate_password( 20, false ); - add_option( 'new_user_' . $newuser_key, array( 'user_id' => $user_id, 'email' => $user_details->user_email, 'role' => $_REQUEST[ 'role' ] ) ); + 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'] ]; + $role = $roles[ $_REQUEST['role'] ]; /** * Fires immediately after a user is invited to join a site, but before the notification is sent. @@ -95,25 +113,29 @@ $switched_locale = switch_to_locale( get_user_locale( $user_details ) ); /* translators: 1: Site name, 2: site URL, 3: role, 4: activation URL */ - $message = __( 'Hi, + $message = __( + 'Hi, You\'ve been invited to join \'%1$s\' at %2$s with the role of %3$s. Please click the following link to confirm the invite: -%4$s' ); - wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), sprintf( $message, get_option( 'blogname' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ), home_url( "/newbloguser/$newuser_key/" ) ) ); +%4$s' + ); + + /* translators: Joining confirmation notification email subject. %s: Site title */ + wp_mail( $new_user_email, sprintf( __( '[%s] Joining Confirmation' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), sprintf( $message, get_option( 'blogname' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ), home_url( "/newbloguser/$newuser_key/" ) ) ); if ( $switched_locale ) { restore_previous_locale(); } - $redirect = add_query_arg( array('update' => 'add'), 'user-new.php' ); + $redirect = add_query_arg( array( 'update' => 'add' ), 'user-new.php' ); } } wp_redirect( $redirect ); die(); -} elseif ( isset($_REQUEST['action']) && 'createuser' == $_REQUEST['action'] ) { +} elseif ( isset( $_REQUEST['action'] ) && 'createuser' == $_REQUEST['action'] ) { check_admin_referer( 'create-user', '_wpnonce_create-user' ); if ( ! current_user_can( 'create_users' ) ) { @@ -130,45 +152,53 @@ if ( is_wp_error( $user_id ) ) { $add_user_errors = $user_id; } else { - if ( current_user_can( 'list_users' ) ) + if ( current_user_can( 'list_users' ) ) { $redirect = 'users.php?update=add&id=' . $user_id; - else + } else { $redirect = add_query_arg( 'update', 'add', 'user-new.php' ); + } wp_redirect( $redirect ); die(); } } else { // Adding a new user to this site $new_user_email = wp_unslash( $_REQUEST['email'] ); - $user_details = wpmu_validate_user_signup( $_REQUEST['user_login'], $new_user_email ); - if ( is_wp_error( $user_details[ 'errors' ] ) && !empty( $user_details[ 'errors' ]->errors ) ) { - $add_user_errors = $user_details[ 'errors' ]; + $user_details = wpmu_validate_user_signup( $_REQUEST['user_login'], $new_user_email ); + if ( is_wp_error( $user_details['errors'] ) && $user_details['errors']->has_errors() ) { + $add_user_errors = $user_details['errors']; } else { - /** - * 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. - */ + /** This filter is documented in wp-includes/user.php */ $new_user_login = apply_filters( 'pre_user_login', sanitize_user( wp_unslash( $_REQUEST['user_login'] ), true ) ); - if ( isset( $_POST[ 'noconfirmation' ] ) && current_user_can( 'manage_network_users' ) ) { + 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' => get_current_blog_id(), 'new_role' => $_REQUEST['role'] ) ); - 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_signup_user( + $new_user_login, + $new_user_email, + array( + 'add_to_blog' => get_current_blog_id(), + 'new_role' => $_REQUEST['role'], + ) + ); + 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 ) ); $new_user = wpmu_activate_signup( $key ); 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' ); + $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' ); + $redirect = add_query_arg( array( 'update' => 'newuserconfirmation' ), 'user-new.php' ); } wp_redirect( $redirect ); die(); @@ -176,52 +206,57 @@ } } -$title = __('Add New User'); +$title = __( 'Add New User' ); $parent_file = 'users.php'; $do_both = false; -if ( is_multisite() && current_user_can('promote_users') && current_user_can('create_users') ) +if ( is_multisite() && current_user_can( 'promote_users' ) && current_user_can( 'create_users' ) ) { $do_both = true; +} -$help = '

' . __('To add a new user to your site, fill in the form on this screen and click the Add New User button at the bottom.') . '

'; +$help = '

' . __( 'To add a new user to your site, fill in the form on this screen and click the Add New User button at the bottom.' ) . '

'; 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.') . '

'; + $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 .= '

' . __('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.') . '

' . + $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.') . '

'; + '

' . __( '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.') . '

'; +$help .= '

' . __( 'Remember to click the Add New User button at the bottom of this screen when you are finished.' ) . '

'; -get_current_screen()->add_help_tab( array( - 'id' => 'overview', - 'title' => __('Overview'), - 'content' => $help, -) ); +get_current_screen()->add_help_tab( + array( + 'id' => 'overview', + 'title' => __( 'Overview' ), + 'content' => $help, + ) +); -get_current_screen()->add_help_tab( array( -'id' => 'user-roles', -'title' => __('User Roles'), -'content' => '

' . __('Here is a basic overview of the different user roles and the permissions associated with each one:') . '

' . - '' -) ); +get_current_screen()->add_help_tab( + array( + 'id' => 'user-roles', + 'title' => __( 'User Roles' ), + 'content' => '

' . __( 'Here is a basic overview of the different user roles and the permissions associated with each one:' ) . '

' . + '', + ) +); get_current_screen()->set_help_sidebar( - '

' . __('For more information:') . '

' . - '

' . __('Documentation on Adding New Users') . '

' . - '

' . __('Support Forums') . '

' + '

' . __( 'For more information:' ) . '

' . + '

' . __( 'Documentation on Adding New Users' ) . '

' . + '

' . __( 'Support' ) . '

' ); -wp_enqueue_script('wp-ajax-response'); +wp_enqueue_script( 'wp-ajax-response' ); wp_enqueue_script( 'user-profile' ); /** @@ -239,7 +274,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); -if ( isset($_GET['update']) ) { +if ( isset( $_GET['update'] ) ) { $messages = array(); if ( is_multisite() ) { $edit_link = ''; @@ -251,13 +286,13 @@ } switch ( $_GET['update'] ) { - case "newuserconfirmation": - $messages[] = __('Invitation email sent to new user. A confirmation link must be clicked before their account is created.'); + case 'newuserconfirmation': + $messages[] = __( 'Invitation email sent to new user. A confirmation link must be clicked before their account is created.' ); break; - case "add": - $messages[] = __('Invitation email sent to user. A confirmation link must be clicked for them to be added to your site.'); + case 'add': + $messages[] = __( 'Invitation email sent to user. A confirmation link must be clicked for them to be added to your site.' ); break; - case "addnoconfirmation": + case 'addnoconfirmation': if ( empty( $edit_link ) ) { $messages[] = __( 'User has been added to your site.' ); } else { @@ -265,58 +300,66 @@ $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.'); + case 'addexisting': + $messages[] = __( 'That user is already a member of this site.' ); break; - case "could_not_add": + 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": + 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": + case 'does_not_exist': $add_user_errors = new WP_Error( 'does_not_exist', __( 'The requested user does not exist.' ) ); break; - case "enter_email": + case 'enter_email': $add_user_errors = new WP_Error( 'enter_email', __( 'Please enter a valid email address.' ) ); break; } } else { - if ( 'add' == $_GET['update'] ) - $messages[] = __('User added.'); + if ( 'add' == $_GET['update'] ) { + $messages[] = __( 'User added.' ); + } } } ?>
-

+ +} +?>

- +
-

' . $msg . '

'; -} ?> + } +} +?> - +
get_error_messages() as $message ) - echo "

$message

"; + foreach ( $add_user_errors->get_error_messages() as $message ) { + echo "

$message

"; + } ?>
@@ -324,42 +367,45 @@ ' . __( 'Add Existing User' ) . ''; + } if ( ! current_user_can( 'manage_network_users' ) ) { echo '

' . __( '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 = __('Email'); + $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 = __('Email or Username'); + $label = __( 'Email or Username' ); $type = 'text'; } -?> -
+> + ?> +> - + - +
- + - + - - 'addusersub' ) ); ?> + + 'addusersub' ) ); ?>
-' . __( 'Add New User' ) . ''; -?> -

-
+

+> + ?> +> - - + - + ?> +
- + - + - + - - + + - - + + - + @@ -451,10 +500,11 @@ @@ -477,7 +527,7 @@ - + - + @@ -506,12 +557,12 @@ - + - 'createusersub' ) ); ?> + 'createusersub' ) ); ?>