<?php
/**
- * New User Administration Panel.
+ * New User Administration Screen.
*
* @package WordPress
* @subpackage Administration
*/
/** WordPress Administration Bootstrap */
-require_once('./admin.php');
+require_once( dirname( __FILE__ ) . '/admin.php' );
if ( is_multisite() ) {
- if ( ! current_user_can( 'create_users' ) && ! current_user_can( 'promote_users' ) )
- wp_die( __( 'Cheatin’ uh?' ) );
+ if ( ! current_user_can( 'create_users' ) && ! current_user_can( 'promote_users' ) ) {
+ wp_die(
+ '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
+ '<p>' . __( 'Sorry, you are not allowed to add users to this network.' ) . '</p>',
+ 403
+ );
+ }
} elseif ( ! current_user_can( 'create_users' ) ) {
- wp_die( __( 'Cheatin’ uh?' ) );
+ wp_die(
+ '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
+ '<p>' . __( 'Sorry, you are not allowed to create users.' ) . '</p>',
+ 403
+ );
}
if ( is_multisite() ) {
- function admin_created_user_email( $text ) {
- /* translators: 1: Site name, 2: site URL, 3: role */
- return sprintf( __( 'Hi,
-You\'ve been invited to join \'%1$s\' at
-%2$s as a %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'), site_url(), esc_html( $_REQUEST[ 'role' ] ) );
- }
add_filter( 'wpmu_signup_user_notification_email', 'admin_created_user_email' );
-
- function admin_created_user_subject( $text ) {
- return "[" . get_bloginfo('name') . "] Your site invite";
- }
}
if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) {
check_admin_referer( 'add-user', '_wpnonce_add-user' );
$user_details = null;
- if ( false !== strpos($_REQUEST[ 'email' ], '@') ) {
- $user_details = get_user_by('email', $_REQUEST[ 'email' ]);
+ $user_email = wp_unslash( $_REQUEST['email'] );
+ if ( false !== strpos( $user_email, '@' ) ) {
+ $user_details = get_user_by( 'email', $user_email );
} else {
if ( is_super_admin() ) {
- $user_details = get_user_by('login', $_REQUEST[ 'email' ]);
+ $user_details = get_user_by( 'login', $user_email );
} else {
wp_redirect( add_query_arg( array('update' => 'enter_email'), 'user-new.php' ) );
die();
die();
}
- if ( ! current_user_can('promote_user', $user_details->ID) )
- wp_die(__('Cheatin’ uh?'));
+ if ( ! current_user_can( 'promote_user', $user_details->ID ) ) {
+ wp_die(
+ '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
+ '<p>' . __( 'Sorry, you are not allowed to add users to this network.' ) . '</p>',
+ 403
+ );
+ }
// Adding an existing user to this blog
- $new_user_email = esc_html(trim($_REQUEST['email']));
+ $new_user_email = $user_details->user_email;
$redirect = 'user-new.php';
$username = $user_details->user_login;
$user_id = $user_details->ID;
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' ] ) );
- $message = __("Hi,\n\nYou have been invited to join '%s' at\n%s as a %s.\nPlease click the following link to confirm the invite:\n%s\n");
- wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), get_option( 'blogname' ) ), sprintf($message, get_option('blogname'), site_url(), $_REQUEST[ 'role' ], site_url("/newbloguser/$newuser_key/")));
+
+ $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 );
+
+ $switched_locale = switch_to_locale( get_user_locale( $user_details ) );
+
+ /* translators: 1: Site name, 2: site URL, 3: role, 4: activation URL */
+ $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/" ) ) );
+
+ if ( $switched_locale ) {
+ restore_previous_locale();
+ }
+
$redirect = add_query_arg( array('update' => 'add'), 'user-new.php' );
}
}
} 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?'));
+ if ( ! current_user_can( 'create_users' ) ) {
+ wp_die(
+ '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
+ '<p>' . __( 'Sorry, you are not allowed to create users.' ) . '</p>',
+ 403
+ );
+ }
- if ( !is_multisite() ) {
- $user_id = add_user();
+ if ( ! is_multisite() ) {
+ $user_id = edit_user();
if ( is_wp_error( $user_id ) ) {
$add_user_errors = $user_id;
} else {
- if ( current_user_can('edit_users') ) {
- $new_user_login = apply_filters('pre_user_login', sanitize_user(stripslashes($_REQUEST['user_login']), true));
- $redirect = 'users.php?usersearch='. urlencode($new_user_login) . '&update=add' . '#user-' . $user_id;
- } else {
+ if ( current_user_can( 'list_users' ) )
+ $redirect = 'users.php?update=add&id=' . $user_id;
+ else
$redirect = add_query_arg( 'update', 'add', 'user-new.php' );
- }
wp_redirect( $redirect );
die();
}
} else {
- // Adding a new user to this blog
- $user_details = wpmu_validate_user_signup( $_REQUEST[ 'user_login' ], $_REQUEST[ 'email' ] );
- unset( $user_details[ 'errors' ]->errors[ 'user_email_used' ] );
+ // 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' ];
} else {
- $new_user_login = apply_filters('pre_user_login', sanitize_user(stripslashes($_REQUEST['user_login']), true));
- if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
+ /**
+ * 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' ] ) && 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, $_REQUEST[ 'email' ], array( 'add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST[ 'role' ] ) );
- if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
- $key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $_REQUEST[ 'email' ] ) );
- wpmu_activate_signup( $key );
- $redirect = add_query_arg( array('update' => 'addnoconfirmation'), 'user-new.php' );
+ wpmu_signup_user( $new_user_login, $new_user_email, array( 'add_to_blog' => $wpdb->blogid, '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' );
+ } else {
+ $redirect = add_query_arg( array( 'update' => 'addnoconfirmation', 'user_id' => $new_user['user_id'] ), 'user-new.php' );
+ }
} else {
- $redirect = add_query_arg( array('update' => 'newuserconfimation'), 'user-new.php' );
+ $redirect = add_query_arg( array('update' => 'newuserconfirmation'), 'user-new.php' );
}
wp_redirect( $redirect );
die();
}
}
-
$title = __('Add New User');
$parent_file = 'users.php';
if ( is_multisite() && current_user_can('promote_users') && current_user_can('create_users') )
$do_both = true;
-add_contextual_help($current_screen,
- '<p>' . __('To add a new user to your site, fill in the form on this screen. If you’re not sure which role to assign, you can use the link below to review the different roles and their capabilities. Here is a basic overview of roles:') . '</p>' .
- '<ul>' .
- '<li>' . __('Administrators have access to all the administration features.') . '</li>' .
- '<li>' . __('Editors can publish posts, manage posts as well as manage other people’s posts, etc.') . '</li>' .
- '<li>' . __('Authors can publish and manage their own posts.') . '</li>' .
- '<li>' . __('Contributors can write and manage their posts but not publish posts or upload media files.') . '</li>' .
- '<li>' . __('Subscribers can read comments/comment/receive newsletters, etc.') . '</li>' .
- '</ul>' .
- '<p>' . __('You must assign a password to the new user, but don’t worry; when they log in for the first time they will be prompted to change it. The username, however, cannot be changed.') . '</p>' .
- '<p>' . __('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.') . '</p>' .
- '<p>' . __('Remember to click the Add User button at the bottom of this screen when you are finished.') . '</p>' .
+$help = '<p>' . __('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.') . '</p>';
+
+if ( is_multisite() ) {
+ $help .= '<p>' . __('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.') . '</p>' .
+ '<p>' . __('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.') . '</p>';
+} else {
+ $help .= '<p>' . __('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.') . '</p>' .
+
+ '<p>' . __('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.') . '</p>';
+}
+
+$help .= '<p>' . __('Remember to click the Add New User button at the bottom of this screen when you are finished.') . '</p>';
+
+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' => '<p>' . __('Here is a basic overview of the different user roles and the permissions associated with each one:') . '</p>' .
+ '<ul>' .
+ '<li>' . __('Subscribers can read comments/comment/receive newsletters, etc. but cannot create regular site content.') . '</li>' .
+ '<li>' . __('Contributors can write and manage their posts but not publish posts or upload media files.') . '</li>' .
+ '<li>' . __('Authors can publish and manage their own posts, and are able to upload files.') . '</li>' .
+ '<li>' . __('Editors can publish posts, manage posts as well as manage other people’s posts, etc.') . '</li>' .
+ '<li>' . __('Administrators have access to all the administration features.') . '</li>' .
+ '</ul>'
+) );
+
+get_current_screen()->set_help_sidebar(
'<p><strong>' . __('For more information:') . '</strong></p>' .
- '<p>' . __('<a href="http://codex.wordpress.org/Users_Add_New_SubPanel" target="_blank">Documentation on Adding New Users</a>') . '</p>' .
- '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+ '<p>' . __('<a href="https://codex.wordpress.org/Users_Add_New_Screen">Documentation on Adding New Users</a>') . '</p>' .
+ '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
);
wp_enqueue_script('wp-ajax-response');
-wp_enqueue_script('user-profile');
+wp_enqueue_script( 'user-profile' );
-require_once ('admin-header.php');
+/**
+ * Filters whether to enable user auto-complete for non-super admins in Multisite.
+ *
+ * @since 3.4.0
+ *
+ * @param bool $enable Whether to enable auto-complete for non-super admins. Default false.
+ */
+if ( is_multisite() && current_user_can( 'promote_users' ) && ! wp_is_large_network( 'users' )
+ && ( is_super_admin() || apply_filters( 'autocomplete_users_for_site_admins', false ) )
+) {
+ wp_enqueue_script( 'user-suggest' );
+}
+
+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 "newuserconfimation":
+ 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.');
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. <a href="%s">Edit user</a>' ), $edit_link );
+ }
break;
case "addexisting":
$messages[] = __('That user is already a member of this site.');
case "does_not_exist":
$messages[] = __('The requested user does not exist.');
break;
- case "does_not_exist":
+ case "enter_email":
$messages[] = __('Please enter a valid email address.');
break;
}
}
?>
<div class="wrap">
-<?php screen_icon(); ?>
-<h2 id="add-new-user"> <?php
+<h1 id="add-new-user"><?php
if ( current_user_can( 'create_users' ) ) {
- echo _x( 'Add New User', 'user' );
+ _e( 'Add New User' );
} elseif ( current_user_can( 'promote_users' ) ) {
- echo _x( 'Add Existing User', 'user' );
+ _e( 'Add Existing User' );
} ?>
-</h2>
+</h1>
<?php if ( isset($errors) && is_wp_error( $errors ) ) : ?>
<div class="error">
if ( ! empty( $messages ) ) {
foreach ( $messages as $msg )
- echo '<div id="message" class="updated"><p>' . $msg . '</p></div>';
+ echo '<div id="message" class="updated
notice is-dismissible"><p>' . $msg . '</p></div>';
} ?>
<?php if ( isset($add_user_errors) && is_wp_error( $add_user_errors ) ) : ?>
<?php
if ( is_multisite() ) {
if ( $do_both )
- echo '<h3 id="add-existing-user">' . __('Add Existing User') . '</h3>';
+ echo '<h2 id="add-existing-user">' . __( 'Add Existing User' ) . '</h2>';
if ( !is_super_admin() ) {
- _e( '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');
+ echo '<p>' . __( '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.' ) . '</p>';
+ $label = __('Email');
+ $type = 'email';
} else {
- _e( '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');
+ echo '<p>' . __( '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.' ) . '</p>';
+ $label = __('Email or Username');
+ $type = 'text';
}
?>
-<form action="" method="post" name="adduser" id="adduser" class="add:users: validate"<?php do_action('user_new_form_tag');?>>
+<form method="post" name="adduser" id="adduser" class="validate" novalidate="novalidate"<?php
+ /**
+ * Fires inside the adduser form tag.
+ *
+ * @since 3.0.0
+ */
+ do_action( 'user_new_form_tag' );
+?>>
<input name="action" type="hidden" value="adduser" />
<?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ) ?>
<table class="form-table">
<tr class="form-field form-required">
<th scope="row"><label for="adduser-email"><?php echo $label; ?></label></th>
- <td><input name="email" type="text" id="adduser-email" value="" /></td>
+ <td><input name="email" type="<?php echo $type; ?>" id="adduser-email" class="wp-suggest-user" value="" /></td>
</tr>
<tr class="form-field">
<th scope="row"><label for="adduser-role"><?php _e('Role'); ?></label></th>
</select>
</td>
</tr>
-<?php if ( is_super_admin() ) { ?>
+<?php if ( current_user_can( 'manage_network_users' ) ) { ?>
<tr>
- <th scope="row"><label for="adduser-noconfirmation"><?php _e('Skip Confirmation Email') ?></label></th>
- <td><label for="adduser-noconfirmation"><input type="checkbox" name="noconfirmation" id="adduser-noconfirmation" value="1" /> <?php _e( 'Add the user without sending them a confirmation email.' ); ?></label></td>
+ <th scope="row"><?php _e( 'Skip Confirmation Email' ); ?></th>
+ <td>
+ <input type="checkbox" name="noconfirmation" id="adduser-noconfirmation" value="1" />
+ <label for="adduser-noconfirmation"><?php _e( 'Add the user without sending an email that requires their confirmation.' ); ?></label>
+ </td>
</tr>
<?php } ?>
</table>
-<?php submit_button( __( 'Add Existing User '), 'primary', 'adduser', true, array( 'id' => 'addusersub' ) ); ?>
+<?php
+/**
+ * Fires at the end of the new user form.
+ *
+ * Passes a contextual string to make both types of new user forms
+ * uniquely targetable. Contexts are 'add-existing-user' (Multisite),
+ * and 'add-new-user' (single site and network admin).
+ *
+ * @since 3.7.0
+ *
+ * @param string $type A contextual string specifying which type of new user form the hook follows.
+ */
+do_action( 'user_new_form', 'add-existing-user' );
+?>
+<?php submit_button( __( 'Add Existing User' ), 'primary', 'adduser', true, array( 'id' => 'addusersub' ) ); ?>
</form>
<?php
} // is_multisite()
if ( current_user_can( 'create_users') ) {
if ( $do_both )
- echo '<h3 id="create-new-user">' . __( 'Add New User' ) . '</h3>';
+ echo '<h2 id="create-new-user">' . __( 'Add New User' ) . '</h2>';
?>
-<p><?php _e('Create a brand new user and add it to this site.'); ?></p>
-<form action="" method="post" name="createuser" id="createuser" class="add:users: validate"<?php do_action('user_new_form_tag');?>>
+<p><?php _e('Create a brand new user and add them to this site.'); ?></p>
+<form method="post" name="createuser" id="createuser" class="validate" novalidate="novalidate"<?php
+ /** This action is documented in wp-admin/user-new.php */
+ do_action( 'user_new_form_tag' );
+?>>
<input name="action" type="hidden" value="createuser" />
-<?php wp_nonce_field( 'create-user', '_wpnonce_create-user' ) ?>
+<?php wp_nonce_field( 'create-user', '_wpnonce_create-user' ); ?>
<?php
// Load up the passed data, else set to a default.
-foreach ( array( 'user_login' => 'login', 'first_name' => 'firstname', 'last_name' => 'lastname',
- 'email' => 'email', 'url' => 'uri', 'role' => 'role', 'send_password' => 'send_password', 'noconfirmation' => 'ignore_pass' ) as $post_field => $var ) {
- $var = "new_user_$var";
- if( isset( $_POST['createuser'] ) ) {
- if ( ! isset($$var) )
- $$var = isset( $_POST[$post_field] ) ? stripslashes( $_POST[$post_field] ) : '';
- } else {
- $$var = false;
- }
-}
+$creating = isset( $_POST['createuser'] );
+
+$new_user_login = $creating && isset( $_POST['user_login'] ) ? wp_unslash( $_POST['user_login'] ) : '';
+$new_user_firstname = $creating && isset( $_POST['first_name'] ) ? wp_unslash( $_POST['first_name'] ) : '';
+$new_user_lastname = $creating && isset( $_POST['last_name'] ) ? wp_unslash( $_POST['last_name'] ) : '';
+$new_user_email = $creating && isset( $_POST['email'] ) ? wp_unslash( $_POST['email'] ) : '';
+$new_user_uri = $creating && isset( $_POST['url'] ) ? wp_unslash( $_POST['url'] ) : '';
+$new_user_role = $creating && isset( $_POST['role'] ) ? wp_unslash( $_POST['role'] ) : '';
+$new_user_send_notification = $creating && ! isset( $_POST['send_user_notification'] ) ? false : true;
+$new_user_ignore_pass = $creating && isset( $_POST['noconfirmation'] ) ? wp_unslash( $_POST['noconfirmation'] ) : '';
?>
<table class="form-table">
<tr class="form-field form-required">
<th scope="row"><label for="user_login"><?php _e('Username'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
- <td><input name="user_login" type="text" id="user_login" value="<?php echo esc_attr($new_user_login); ?>" aria-required="true" /></td>
+ <td><input name="user_login" type="text" id="user_login" value="<?php echo esc_attr( $new_user_login ); ?>" aria-required="true" autocapitalize="none" autocorrect="off" maxlength="60" /></td>
</tr>
<tr class="form-field form-required">
- <th scope="row"><label for="email"><?php _e('E-mail'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
- <td><input name="email" type="text" id="email" value="<?php echo esc_attr($new_user_email); ?>" /></td>
+ <th scope="row"><label for="email"><?php _e('Email'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
+ <td><input name="email" type="email" id="email" value="<?php echo esc_attr( $new_user_email ); ?>" /></td>
</tr>
<?php if ( !is_multisite() ) { ?>
<tr class="form-field">
</tr>
<tr class="form-field">
<th scope="row"><label for="url"><?php _e('Website') ?></label></th>
- <td><input name="url" type="text" id="url" class="code" value="<?php echo esc_attr($new_user_uri); ?>" /></td>
+ <td><input name="url" type="url" id="url" class="code" value="<?php echo esc_attr( $new_user_uri ); ?>" /></td>
</tr>
-<?php if ( apply_filters('show_password_fields', true) ) : ?>
- <tr class="form-field form-required">
- <th scope="row"><label for="pass1"><?php _e('Password'); ?> <span class="description"><?php /* translators: password input field */_e('(twice, required)'); ?></span></label></th>
- <td><input name="pass1" type="password" id="pass1" autocomplete="off" />
- <br />
+ <tr class="form-field form-required user-pass1-wrap">
+ <th scope="row">
+ <label for="pass1">
+ <?php _e( 'Password' ); ?>
+ <span class="description hide-if-js"><?php _e( '(required)' ); ?></span>
+ </label>
+ </th>
+ <td>
+ <input class="hidden" value=" " /><!-- #24364 workaround -->
+ <button type="button" class="button wp-generate-pw hide-if-no-js"><?php _e( 'Show password' ); ?></button>
+ <div class="wp-pwd hide-if-js">
+ <?php $initial_password = wp_generate_password( 24 ); ?>
+ <span class="password-input-wrapper">
+ <input type="password" name="pass1" id="pass1" class="regular-text" autocomplete="off" data-reveal="1" data-pw="<?php echo esc_attr( $initial_password ); ?>" aria-describedby="pass-strength-result" />
+ </span>
+ <button type="button" class="button wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
+ <span class="dashicons dashicons-hidden"></span>
+ <span class="text"><?php _e( 'Hide' ); ?></span>
+ </button>
+ <button type="button" class="button wp-cancel-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Cancel password change' ); ?>">
+ <span class="text"><?php _e( 'Cancel' ); ?></span>
+ </button>
+ <div style="display:none" id="pass-strength-result" aria-live="polite"></div>
+ </div>
+ </td>
+ </tr>
+ <tr class="form-field form-required user-pass2-wrap hide-if-js">
+ <th scope="row"><label for="pass2"><?php _e( 'Repeat Password' ); ?> <span class="description"><?php _e( '(required)' ); ?></span></label></th>
+ <td>
<input name="pass2" type="password" id="pass2" autocomplete="off" />
- <br />
- <div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
- <p class="description indicator-hint"><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ & ).'); ?></p>
+ </td>
+ </tr>
+ <tr class="pw-weak">
+ <th><?php _e( 'Confirm Password' ); ?></th>
+ <td>
+ <label>
+ <input type="checkbox" name="pw_weak" class="pw-checkbox" />
+ <?php _e( 'Confirm use of weak password' ); ?>
+ </label>
</td>
</tr>
<tr>
- <th scope="row"><label for="send_password"><?php _e('Send Password?') ?></label></th>
- <td><label for="send_password"><input type="checkbox" name="send_password" id="send_password" <?php checked( $new_user_send_password ); ?> /> <?php _e('Send this password to the new user by email.'); ?></label></td>
+ <th scope="row"><?php _e( 'Send User Notification' ) ?></th>
+ <td>
+ <input type="checkbox" name="send_user_notification" id="send_user_notification" value="1" <?php checked( $new_user_send_notification ); ?> />
+ <label for="send_user_notification"><?php _e( 'Send the new user an email about their account.' ); ?></label>
+ </td>
</tr>
-<?php endif; ?>
<?php } // !is_multisite ?>
<tr class="form-field">
<th scope="row"><label for="role"><?php _e('Role'); ?></label></th>
</select>
</td>
</tr>
- <?php if ( is_multisite() && is_super_admin() ) { ?>
+ <?php if ( is_multisite() && current_user_can( 'manage_network_users' ) ) { ?>
<tr>
- <th scope="row"><label for="noconfirmation"><?php _e('Skip Confirmation Email') ?></label></th>
- <td><label for="noconfirmation"><input type="checkbox" name="noconfirmation" id="noconfirmation" value="1" <?php checked( $new_user_ignore_pass ); ?> /> <?php _e( 'Add the user without sending them a confirmation email.' ); ?></label></td>
+ <th scope="row"><?php _e( 'Skip Confirmation Email' ); ?></th>
+ <td>
+ <input type="checkbox" name="noconfirmation" id="noconfirmation" value="1" <?php checked( $new_user_ignore_pass ); ?> />
+ <label for="noconfirmation"><?php _e( 'Add the user without sending an email that requires their confirmation.' ); ?></label>
+ </td>
</tr>
<?php } ?>
</table>
-<?php submit_button( __( 'Add New User '), 'primary', 'createuser', true, array( 'id' => 'createusersub' ) ); ?>
+<?php
+/** This action is documented in wp-admin/user-new.php */
+do_action( 'user_new_form', 'add-new-user' );
+?>
+
+<?php submit_button( __( 'Add New User' ), 'primary', 'createuser', true, array( 'id' => 'createusersub' ) ); ?>
</form>
<?php } // current_user_can('create_users') ?>
</div>
<?php
-include('./admin-footer.php');
-?>
+include( ABSPATH . 'wp-admin/admin-footer.php' );
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff