<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[16294] trunk/wp-admin: user-new.php revamp.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16294">16294</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-11-11 14:29:15 +0000 (Thu, 11 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>user-new.php revamp. Separate caps for adding users vs. creating users. Allow supes to add via email or username. Split adding existing users and creating new users into separate forms. see <a href="http://trac.wordpress.org/ticket/15357">#15357</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
<li><a href="#trunkwpadminusernewphp">trunk/wp-admin/user-new.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (16293 => 16294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2010-11-11 14:10:59 UTC (rev 16293)
+++ trunk/wp-admin/menu.php 2010-11-11 14:29:15 UTC (rev 16294)
</span><span class="lines">@@ -186,13 +186,13 @@
</span><span class="cx"> if ( current_user_can('list_users') ) {
</span><span class="cx"> $_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php.
</span><span class="cx"> $submenu['users.php'][5] = array(__('Users'), 'list_users', 'users.php');
</span><del>- $submenu['users.php'][10] = array(_x('Add New', 'user'), 'create_users', 'user-new.php');
</del><ins>+ $submenu['users.php'][10] = array(_x('Add New', 'user'), 'promote_users', 'user-new.php');
</ins><span class="cx">
</span><span class="cx"> $submenu['users.php'][15] = array(__('Your Profile'), 'read', 'profile.php');
</span><span class="cx"> } else {
</span><span class="cx"> $_wp_real_parent_file['users.php'] = 'profile.php';
</span><span class="cx"> $submenu['profile.php'][5] = array(__('Your Profile'), 'read', 'profile.php');
</span><del>- $submenu['profile.php'][10] = array(__('Add New User'), 'create_users', 'user-new.php');
</del><ins>+ $submenu['profile.php'][10] = array(__('Add New User'), 'promote_users', 'user-new.php');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $menu[75] = array( __('Tools'), 'edit_posts', 'tools.php', '', 'menu-top menu-icon-tools', 'menu-tools', 'div' );
</span></span></pre></div>
<a id="trunkwpadminusernewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-new.php (16293 => 16294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-new.php 2010-11-11 14:10:59 UTC (rev 16293)
+++ trunk/wp-admin/user-new.php 2010-11-11 14:29:15 UTC (rev 16294)
</span><span class="lines">@@ -9,12 +9,9 @@
</span><span class="cx"> /** WordPress Administration Bootstrap */
</span><span class="cx"> require_once('./admin.php');
</span><span class="cx">
</span><del>-if ( !current_user_can('create_users') )
</del><ins>+if ( ! current_user_can('create_users') || ! current_user_can('promote_users') )
</ins><span class="cx"> wp_die(__('Cheatin&#8217; uh?'));
</span><span class="cx">
</span><del>-if ( is_multisite() && !get_site_option( 'add_new_users' ) )
- wp_die( __('Page disabled by the administrator') );
-
</del><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> function admin_created_user_email( $text ) {
</span><span class="cx"> /* translators: 1: Site name, 2: site URL, 3: role */
</span><span class="lines">@@ -37,6 +34,53 @@
</span><span class="cx"> if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) {
</span><span class="cx"> check_admin_referer('add-user');
</span><span class="cx">
</span><ins>+ $user_details = null;
+ if ( false !== strpos($_REQUEST[ 'email' ], '@') ) {
+ $user_details = get_user_by('email', $_REQUEST[ 'email' ]);
+ } else {
+ if ( is_super_admin() ) {
+ $user_details = get_user_by('login', $_REQUEST[ 'email' ]);
+ } else {
+ 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' ) );
+ die();
+ }
+
+ if ( ! current_user_can('promote_user', $user_details->ID) )
+ wp_die(__('Cheatin&#8217; uh?'));
+
+ // 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' );
+ } 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' );
+ }
+ }
+ wp_redirect( $redirect );
+ die();
+} elseif ( isset($_REQUEST['action']) && 'createuser' == $_REQUEST['action'] ) {
+ check_admin_referer('create-user');
+
+ if ( ! current_user_can('create_users') )
+ wp_die(__('Cheatin&#8217; uh?'));
+
</ins><span class="cx"> if ( !is_multisite() ) {
</span><span class="cx"> $user_id = add_user();
</span><span class="cx">
</span><span class="lines">@@ -53,59 +97,38 @@
</span><span class="cx"> die();
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- $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' );
</del><ins>+ // 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' );
</ins><span class="cx"> } else {
</span><del>- 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' );
- }
</del><ins>+ $redirect = add_query_arg( array('update' => 'newuserconfimation'), 'user-new.php' );
</ins><span class="cx"> }
</span><span class="cx"> wp_redirect( $redirect );
</span><span class="cx"> die();
</span><del>- } 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();
- }
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> $title = __('Add New User');
</span><span class="cx"> $parent_file = 'users.php';
</span><span class="cx">
</span><ins>+$do_both = false;
+if ( is_multisite() && current_user_can('promote_users') && current_user_can('create_users') )
+ $do_both = true;
+
</ins><span class="cx"> add_contextual_help($current_screen,
</span><span class="cx"> '<p>' . __('To add a new user to your site, fill in the form on this screen. If you&#8217;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>' .
</span><span class="cx"> '<ul>' .
</span><span class="lines">@@ -144,6 +167,12 @@
</span><span class="cx"> case "addexisting":
</span><span class="cx"> $messages[] = __('That user is already a member of this site.');
</span><span class="cx"> break;
</span><ins>+ case "does_not_exist":
+ $messages[] = __('The requested user does not exist.');
+ break;
+ case "does_not_exist":
+ $messages[] = __('Please enter a valid email address.');
+ break;
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> if ( 'add' == $_GET['update'] )
</span><span class="lines">@@ -182,20 +211,58 @@
</span><span class="cx"> <div id="ajax-response"></div>
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>-if ( !is_multisite() ) {
- if ( get_option('users_can_register') )
- echo '<p>' . sprintf(__('Users can <a href="%1$s">register themselves</a> or you can manually create users here.'), site_url('wp-register.php')) . '</p>';
- else
- echo '<p>' . sprintf(__('Users cannot currently <a href="%1$s">register themselves</a>, but you can manually create users here.'), admin_url('options-general.php#users_can_register')) . '</p>';
-} else {
- echo '<p>' . __( 'You can add new users to your site in two ways:' ) . '<ol><li> ' . __( 'Enter the username and email address of an existing user on this network.' ) . '</li><li> ' . __( 'Enter the username and the email address of a person who is not already a member of this network. Choose the username carefully, it cannot be changed.' ) . '</li></ol></p>';
- echo '<p>' . __( '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.' ) . '</p>';
-}
</del><ins>+if ( is_multisite() ) {
+ if ( $do_both )
+ echo '<h3 id="add-existing-user">' . __('Add Existing User') . '</h3>';
+ 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');
+ }
</ins><span class="cx"> ?>
</span><del>-<form action="#add-new-user" method="post" name="adduser" id="adduser" class="add:users: validate"<?php do_action('user_new_form_tag');?>>
</del><ins>+<form action="#add-existing-user" method="post" name="adduser" id="adduser" class="add:users: validate"<?php do_action('user_new_form_tag');?>>
+<input name="action" type="hidden" id="action" value="adduser" />
</ins><span class="cx"> <?php wp_nonce_field('add-user') ?>
</span><ins>+<table class="form-table">
+ <tr class="form-field form-required">
+ <th scope="row"><label for="email"><?php echo $label; ?></label></th>
+ <td><input name="email" type="text" id="email" value="<?php echo esc_attr($new_user_email); ?>" /></td>
+ </tr>
+ <tr class="form-field">
+ <th scope="row"><label for="role"><?php _e('Role'); ?></label></th>
+ <td><select name="role" id="role">
+ <?php
+ if ( !$new_user_role )
+ $new_user_role = !empty($current_role) ? $current_role : get_option('default_role');
+ wp_dropdown_roles($new_user_role);
+ ?>
+ </select>
+ </td>
+ </tr>
+<?php if ( is_super_admin() ) { ?>
+ <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 _e( 'Add the user without sending them a confirmation email.' ); ?></label></td>
+ </tr>
+<?php } ?>
+</table>
+<?php submit_button( __( 'Add User '), 'primary', 'adduser', true, array( 'id' => 'addusersub' ) ); ?>
+</form>
</ins><span class="cx"> <?php
</span><del>-//Load up the passed data, else set to a default.
</del><ins>+} // is_multisite()
+
+if ( current_user_can( 'create_users') ) {
+ if ( $do_both )
+ echo '<h3 id="create-new-user">' . __('Create New User') . '</h3>';
+?>
+<p><?php _e('Create a brand new user and add it to this site.'); ?></p>
+<form action="#create-new-user" method="post" name="createuser" id="adduser" class="add:users: validate"<?php do_action('user_new_form_tag');?>>
+<input name="action" type="hidden" id="action" value="createuser" />
+<?php wp_nonce_field('create-user') ?>
+<?php
+// Load up the passed data, else set to a default.
</ins><span class="cx"> foreach ( array('user_login' => 'login', 'first_name' => 'firstname', 'last_name' => 'lastname',
</span><span class="cx"> 'email' => 'email', 'url' => 'uri', 'role' => 'role') as $post_field => $var ) {
</span><span class="cx"> $var = "new_user_$var";
</span><span class="lines">@@ -206,8 +273,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr class="form-field form-required">
</span><del>- <th scope="row"><label for="user_login"><?php _e('Username'); ?> <span class="description"><?php _e('(required)'); ?></span></label>
- <input name="action" type="hidden" id="action" value="adduser" /></th>
</del><ins>+ <th scope="row"><label for="user_login"><?php _e('Username'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
</ins><span class="cx"> <td><input name="user_login" type="text" id="user_login" value="<?php echo esc_attr($new_user_login); ?>" aria-required="true" /></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr class="form-field form-required">
</span><span class="lines">@@ -263,10 +329,10 @@
</span><span class="cx"> <?php } ?>
</span><span class="cx"> </table>
</span><span class="cx">
</span><del>-<?php submit_button( __( 'Add User '), 'primary', 'adduser', true, array( 'id' => 'addusersub' ) ); ?>
</del><ins>+<?php submit_button( __( 'Add User '), 'primary', 'createuser', true, array( 'id' => 'createusersub' ) ); ?>
</ins><span class="cx">
</span><span class="cx"> </form>
</span><del>-
</del><ins>+<?php } // current_user_can('create_users') ?>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php
</span><span class="cx"> include('./admin-footer.php');
</span></span></pre>
</div>
</div>
</body>
</html>