X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/3f5685912e89eb3b0534acd85aa0946b1ca2bbe3..refs/tags/wordpress-3.3.1-scripts:/wp-admin/user-edit.php diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php index b3ecb63a..5f3d07e0 100644 --- a/wp-admin/user-edit.php +++ b/wp-admin/user-edit.php @@ -7,42 +7,57 @@ */ /** WordPress Administration Bootstrap */ -require_once('admin.php'); +require_once('./admin.php'); -if ( !defined('IS_PROFILE_PAGE') ) - define('IS_PROFILE_PAGE', false); +wp_reset_vars(array('action', 'redirect', 'profile', 'user_id', 'wp_http_referer')); + +$user_id = (int) $user_id; +$current_user = wp_get_current_user(); +if ( ! defined( 'IS_PROFILE_PAGE' ) ) + define( 'IS_PROFILE_PAGE', ( $user_id == $current_user->ID ) ); + +if ( ! $user_id && IS_PROFILE_PAGE ) + $user_id = $current_user->ID; +elseif ( ! $user_id && ! IS_PROFILE_PAGE ) + wp_die(__( 'Invalid user ID.' ) ); +elseif ( ! get_userdata( $user_id ) ) + wp_die( __('Invalid user ID.') ); wp_enqueue_script('user-profile'); -wp_enqueue_script('password-strength-meter'); $title = IS_PROFILE_PAGE ? __('Profile') : __('Edit User'); if ( current_user_can('edit_users') && !IS_PROFILE_PAGE ) $submenu_file = 'users.php'; else $submenu_file = 'profile.php'; -$parent_file = 'users.php'; -wp_reset_vars(array('action', 'redirect', 'profile', 'user_id', 'wp_http_referer')); +if ( current_user_can('edit_users') && !is_user_admin() ) + $parent_file = 'users.php'; +else + $parent_file = 'profile.php'; -$wp_http_referer = remove_query_arg(array('update', 'delete_count'), stripslashes($wp_http_referer)); -$user_id = (int) $user_id; +$profile_help = '

' . __('Your profile contains information about you (your “account”) as well as some personal options related to using WordPress.') . '

' . + '

' . __('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things. You can hide the Toolbar (formerly called the Admin Bar) from the front end of your site, however it cannot be disabled on the admin screens.') . '

' . + '

' . __('Your username cannot be changed, but you can use other fields to enter your real name or a nickname, and change which name to display on your posts.') . '

' . + '

' . __('Required fields are indicated; the rest are optional. Profile information will only be displayed if your theme is set up to do so.') . '

' . + '

' . __('Remember to click the Update Profile button when you are finished.') . '

'; -if ( !$user_id ) { - if ( IS_PROFILE_PAGE ) { - $current_user = wp_get_current_user(); - $user_id = $current_user->ID; - } else { - wp_die(__('Invalid user ID.')); - } -} elseif ( !get_userdata($user_id) ) { - wp_die( __('Invalid user ID.') ); -} +get_current_screen()->add_help_tab( array( + 'id' => 'overview', + 'title' => __('Overview'), + 'content' => $profile_help, +) ); + +get_current_screen()->set_help_sidebar( + '

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

' . + '

' . __('Documentation on User Profiles') . '

' . + '

' . __('Support Forums') . '

' +); -$all_post_caps = array('posts', 'pages'); -$user_can_edit = false; -foreach ( $all_post_caps as $post_cap ) - $user_can_edit |= current_user_can("edit_$post_cap"); +$wp_http_referer = remove_query_arg(array('update', 'delete_count'), stripslashes($wp_http_referer)); + +$user_can_edit = current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ); /** * Optional SSL preference that can be turned on by hooking to the 'personal_options' action. @@ -60,15 +75,31 @@ function use_ssl_preference($user) { ID && ! apply_filters( 'enable_edit_any_user_configuration', true ) ) + wp_die( __( 'You do not have permission to edit this user.' ) ); + +// Execute confirmed email change. See send_confirmation_on_profile_email(). +if ( is_multisite() && IS_PROFILE_PAGE && isset( $_GET[ 'newuseremail' ] ) && $current_user->ID ) { + $new_email = get_option( $current_user->ID . '_new_email' ); + if ( $new_email[ 'hash' ] == $_GET[ 'newuseremail' ] ) { + $user->ID = $current_user->ID; + $user->user_email = esc_html( trim( $new_email[ 'newemail' ] ) ); + if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login ) ) ) + $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, $current_user->user_login ) ); + wp_update_user( get_object_vars( $user ) ); + delete_option( $current_user->ID . '_new_email' ); + wp_redirect( add_query_arg( array('updated' => 'true'), self_admin_url( 'profile.php' ) ) ); + die(); + } +} elseif ( is_multisite() && IS_PROFILE_PAGE && !empty( $_GET['dismiss'] ) && $current_user->ID . '_new_email' == $_GET['dismiss'] ) { + delete_option( $current_user->ID . '_new_email' ); + wp_redirect( add_query_arg( array('updated' => 'true'), self_admin_url( 'profile.php' ) ) ); + die(); +} +switch ($action) { case 'update': check_admin_referer('update-user_' . $user_id); @@ -81,11 +112,38 @@ if ( IS_PROFILE_PAGE ) else do_action('edit_user_profile_update', $user_id); -$errors = edit_user($user_id); +if ( !is_multisite() ) { + $errors = edit_user($user_id); +} else { + $user = get_userdata( $user_id ); + + // Update the email address in signups, if present. + if ( $user->user_login && isset( $_POST[ 'email' ] ) && is_email( $_POST[ 'email' ] ) && $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $user->user_login ) ) ) + $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $_POST[ 'email' ], $user_login ) ); + + // WPMU must delete the user from the current blog if WP added him after editing. + $delete_role = false; + $blog_prefix = $wpdb->get_blog_prefix(); + if ( $user_id != $current_user->ID ) { + $cap = $wpdb->get_var( "SELECT meta_value FROM {$wpdb->usermeta} WHERE user_id = '{$user_id}' AND meta_key = '{$blog_prefix}capabilities' AND meta_value = 'a:0:{}'" ); + if ( !is_network_admin() && null == $cap && $_POST[ 'role' ] == '' ) { + $_POST[ 'role' ] = 'contributor'; + $delete_role = true; + } + } + if ( !isset( $errors ) || ( isset( $errors ) && is_object( $errors ) && false == $errors->get_error_codes() ) ) + $errors = edit_user($user_id); + if ( $delete_role ) // stops users being added to current blog when they are edited + delete_user_meta( $user_id, $blog_prefix . 'capabilities' ); + + if ( is_multisite() && is_network_admin() && !IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && !isset($super_admins) && empty( $_POST['super_admin'] ) == is_super_admin( $user_id ) ) + empty( $_POST['super_admin'] ) ? revoke_super_admin( $user_id ) : grant_super_admin( $user_id ); +} if ( !is_wp_error( $errors ) ) { $redirect = (IS_PROFILE_PAGE ? "profile.php?" : "user-edit.php?user_id=$user_id&"). "updated=true"; - $redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect); + if ( $wp_http_referer ) + $redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect); wp_redirect($redirect); exit; } @@ -96,33 +154,43 @@ $profileuser = get_user_to_edit($user_id); if ( !current_user_can('edit_user', $user_id) ) wp_die(__('You do not have permission to edit this user.')); -include ('admin-header.php'); +include (ABSPATH . 'wp-admin/admin-header.php'); ?> +ID ) && current_user_can( 'manage_network_options' ) ) { ?> +

+ -
+
+ +

+

+ -

+

-
- -
+

\n

", $errors->get_error_messages() ); ?>

-

- -
+

+ + + + + +

+ +> @@ -141,39 +209,29 @@ include ('admin-header.php'); - 1 ) : ?> + 1 && has_action('admin_color_scheme_picker') ) : ?> -
- $color_info ): ?> -
/> - - - colors as $html_color ): ?> - - - -
 
- - -
- -
+ - + - More information'); ?> + More information'); ?> - + + + +
+
+
+ + + - + - + - + + + +user_email != get_site_option( 'admin_email' ) ) : ?> +

+ +

+ + + - + - + @@ -232,20 +301,27 @@ else $public_display = array(); $public_display['display_nickname'] = $profileuser->nickname; $public_display['display_username'] = $profileuser->user_login; + if ( !empty($profileuser->first_name) ) $public_display['display_firstname'] = $profileuser->first_name; + if ( !empty($profileuser->last_name) ) $public_display['display_lastname'] = $profileuser->last_name; + if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) { $public_display['display_firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name; $public_display['display_lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name; } - if ( !in_array( $profileuser->display_name, $public_display ) )// Only add this if it isn't duplicated elsewhere + + if ( !in_array( $profileuser->display_name, $public_display ) ) // Only add this if it isn't duplicated elsewhere $public_display = array( 'display_displayname' => $profileuser->display_name ) + $public_display; + $public_display = array_map( 'trim', $public_display ); + $public_display = array_unique( $public_display ); + foreach ( $public_display as $id => $item ) { ?> - + @@ -259,7 +335,15 @@ else - + @@ -268,7 +352,7 @@ else $desc) { + foreach (_wp_get_user_contactmethods( $profileuser ) as $name => $desc) { ?> @@ -284,7 +368,7 @@ else
+ ID . '_new_email' ); + if ( $new_email && $new_email != $current_user->user_email ) : ?> +
+

%1$s. Cancel'), $new_email['newemail'], esc_url( self_admin_url( 'profile.php?dismiss=' . $current_user->ID . '_new_email' ) ) ); ?>

+
+ +
- @@ -304,11 +388,10 @@ if ( $show_password_fields ) :

+

caps) > count($profileuser->roles) && apply_filters('additional_capabilities_display', true, $profileuser) ) { ?> @@ -331,16 +414,22 @@ if ( $show_password_fields ) : -

- - - -

+ + + + +
+ +