X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/f9001779751f83dc8a10e478bfecb4d8dd5f964c..refs/tags/wordpress-3.3.1-scripts:/wp-admin/user-new.php
diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php
index b9d87256..43c37033 100644
--- a/wp-admin/user-new.php
+++ b/wp-admin/user-new.php
@@ -1,6 +1,6 @@
user_email;
$redirect = 'user-new.php';
$username = $user_details->user_login;
$user_id = $user_details->ID;
@@ -72,7 +72,14 @@ if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) {
} 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");
+ /* 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'), site_url(), $_REQUEST[ 'role' ], site_url("/newbloguser/$newuser_key/")));
$redirect = add_query_arg( array('update' => 'add'), 'user-new.php' );
}
@@ -125,7 +132,6 @@ if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) {
}
}
-
$title = __('Add New User');
$parent_file = 'users.php';
@@ -133,20 +139,40 @@ $do_both = false;
if ( is_multisite() && current_user_can('promote_users') && current_user_can('create_users') )
$do_both = true;
-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:') . '
' .
- '' .
- '- ' . __('Administrators have access to all the administration features.') . '
' .
- '- ' . __('Editors can publish posts, manage posts as well as manage other people’s posts, etc.') . '
' .
- '- ' . __('Authors can publish and manage their own posts.') . '
' .
- '- ' . __('Contributors can write and manage their posts but not publish posts or upload media files.') . '
' .
- '- ' . __('Subscribers can read comments/comment/receive newsletters, etc.') . '
' .
- '
' .
- '' . __('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.') . '
' .
+$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 recieve 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:') . '
' .
+ '' .
+ '- ' . __('Administrators have access to all the administration features.') . '
' .
+ '- ' . __('Editors can publish posts, manage posts as well as manage other people’s posts, etc.') . '
' .
+ '- ' . __('Authors can publish and manage their own posts, and are able to upload files.') . '
' .
+ '- ' . __('Contributors can write and manage their posts but not publish posts or upload media files.') . '
' .
+ '- ' . __('Subscribers can read comments/comment/receive newsletters, etc. but cannot create regular site content.') . '
' .
+ '
'
+) );
+
+get_current_screen()->set_help_sidebar(
'' . __('For more information:') . '
' .
- '' . __('Documentation on Adding New Users') . '
' .
+ '' . __('Documentation on Adding New Users') . '
' .
'' . __('Support Forums') . '
'
);