X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/58f607a1de715c9bca69340a4d6fb9e1b9c2bed2..61343b82c4f0da4c68e4c6373daafff4a81efdd1:/wp-admin/user-new.php diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php index 12da9e19..33b81964 100644 --- a/wp-admin/user-new.php +++ b/wp-admin/user-new.php @@ -1,6 +1,6 @@ 'enter_email'), 'user-new.php' ) ); + die(); + } + } + + if ( !$user_details ) { + wp_redirect( add_query_arg( array('update' => 'does_not_exist'), 'user-new.php' ) ); + die(); + } + + if ( ! current_user_can('promote_user', $user_details->ID) ) + wp_die(__('Cheatin’ uh?')); + + // 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; + 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() ) { + add_existing_user_to_blog( array( 'user_id' => $user_id, 'role' => $_REQUEST[ 'role' ] ) ); + $redirect = add_query_arg( array('update' => 'addnoconfirmation'), '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'] ]; + /* 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' ), get_option( 'blogname' ) ), sprintf( $message, get_option( 'blogname' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ), home_url( "/newbloguser/$newuser_key/" ) ) ); + $redirect = add_query_arg( array('update' => 'add'), 'user-new.php' ); + } + } + wp_redirect( $redirect ); + die(); +} 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 ( ! 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 { - $user_login = preg_replace( "/\s+/", '', sanitize_user( $_REQUEST[ 'user_login' ], true ) ); - $user_details = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->users} WHERE user_login = %s AND user_email = %s", $user_login, $_REQUEST[ 'email' ] ) ); - if ( $user_details ) { - // Adding an existing user to this blog - $new_user_email = esc_html(trim($_REQUEST['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' ); + // Adding a new user to this blog + $user_details = wpmu_validate_user_signup( $_REQUEST[ 'user_login' ], $_REQUEST[ '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(wp_unslash($_REQUEST['user_login']), true)); + if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) { + add_filter( 'wpmu_signup_user_notification', '__return_false' ); // Disable confirmation 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' ); } else { - if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) { - add_existing_user_to_blog( array( 'user_id' => $user_id, 'role' => $_REQUEST[ 'role' ] ) ); - $redirect = add_query_arg( array('update' => 'addnoconfirmation'), '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/"))); - $redirect = add_query_arg( array('update' => 'add'), 'user-new.php' ); - } + $redirect = add_query_arg( array('update' => 'newuserconfirmation'), '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' ] ); - 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() ) { - add_filter( 'wpmu_signup_user_notification', '__return_false' ); // Disable confirmation 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' ); - } else { - $redirect = add_query_arg( array('update' => 'newuserconfimation'), 'user-new.php' ); - } - wp_redirect( $redirect ); - die(); - } } } } @@ -108,34 +137,63 @@ if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) { $title = __('Add New User'); $parent_file = 'users.php'; -add_contextual_help($current_screen, - '

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

' . - '' . - '

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

' . - '

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

' . - '

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

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

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

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

' . + '

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

' . '

' . __('Support Forums') . '

' ); wp_enqueue_script('wp-ajax-response'); wp_enqueue_script('user-profile'); -wp_enqueue_script('password-strength-meter'); -require_once ('admin-header.php'); +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( 'admin-header.php' ); if ( isset($_GET['update']) ) { $messages = array(); if ( is_multisite() ) { 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": @@ -147,6 +205,12 @@ if ( isset($_GET['update']) ) { case "addexisting": $messages[] = __('That user is already a member of this site.'); break; + case "does_not_exist": + $messages[] = __('The requested user does not exist.'); + break; + case "enter_email": + $messages[] = __('Please enter a valid email address.'); + break; } } else { if ( 'add' == $_GET['update'] ) @@ -156,7 +220,13 @@ if ( isset($_GET['update']) ) { ?>
-

+

+

@@ -185,32 +255,70 @@ if ( ! empty( $messages ) ) {
' . sprintf(__('Users can register themselves or you can manually create users here.'), site_url('wp-register.php')) . '

'; - else - echo '

' . sprintf(__('Users cannot currently register themselves, but you can manually create users here.'), admin_url('options-general.php#users_can_register')) . '

'; -} else { - echo '

' . __( 'You can add new users to your site in two ways:' ) . '

  1. ' . __( 'Enter the username and email address of an existing user on this site.' ) . '
  2. ' . __( 'Enter the username and the email address of a person who is not already a member of this site. Choose the username carefully, it cannot be changed.' ) . '

'; - echo '

' . __( 'That person will be sent an email asking them to click a link confirming the invite. New users will then be sent an email with a randomly generated password and a login link.' ) . '

'; -} +if ( is_multisite() ) { + if ( $do_both ) + echo '

' . __('Add Existing User') . '

'; + 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'); + } 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'); + } ?> -
> - +> + + + + + + + + + + + + + + + + + + +
+
+ 'addusersub' ) ); ?> +
'login', 'first_name' => 'firstname', 'last_name' => 'lastname', - 'email' => 'email', 'url' => 'uri', 'role' => 'role') as $post_field => $var ) { +} // is_multisite() + +if ( current_user_can( 'create_users') ) { + if ( $do_both ) + echo '

' . __( 'Add New User' ) . '

'; +?> +

+
> + + + '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($$var) ) - $$var = isset($_POST[$post_field]) ? stripslashes($_POST[$post_field]) : ''; + if( isset( $_POST['createuser'] ) ) { + if ( ! isset($$var) ) + $$var = isset( $_POST[$post_field] ) ? wp_unslash( $_POST[$post_field] ) : ''; + } else { + $$var = false; + } } -$new_user_send_password = !$_POST || isset($_POST['send_password']); + ?> - + @@ -232,9 +340,15 @@ $new_user_send_password = !$_POST || isset($_POST['send_password']); - - + + + + + - + @@ -261,16 +375,15 @@ $new_user_send_password = !$_POST || isset($_POST['send_password']); - +
-
-
+ 		+ + +

@@ -243,7 +357,7 @@ $new_user_send_password = !$_POST || isset($_POST['send_password']);
-

- -

-
+ 'createusersub' ) ); ?> + + +