X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/11be8dc178e77d0b46189bbd8e33a216a9b90942..refs/tags/wordpress-4.0:/wp-admin/user-edit.php?ds=sidebyside diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php index 0cedd29c..fd3db188 100644 --- a/wp-admin/user-edit.php +++ b/wp-admin/user-edit.php @@ -7,99 +7,56 @@ */ /** WordPress Administration Bootstrap */ -require_once('admin.php'); +require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( defined('IS_PROFILE_PAGE') && IS_PROFILE_PAGE ) - $is_profile_page = true; -else - $is_profile_page = false; - -/** - * Display JavaScript for profile page. - * - * @since 2.5.0 - */ -function profile_js ( ) { -?> - -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.') ); -if ( $is_profile_page ) { - add_action('admin_head', 'profile_js'); - wp_enqueue_script('jquery'); - wp_enqueue_script('password-strength-meter'); -} +wp_enqueue_script('user-profile'); -$title = $is_profile_page? __('Profile') : __('Edit User'); -if ( current_user_can('edit_users') && !$is_profile_page ) +$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)); +$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.') . '

'; -$user_id = (int) $user_id; +get_current_screen()->add_help_tab( array( + 'id' => 'overview', + 'title' => __('Overview'), + 'content' => $profile_help, +) ); -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()->set_help_sidebar( + '

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

' . + '

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

' . + '

' . __('Support Forums') . '

' +); + +$wp_http_referer = remove_query_arg(array('update', 'delete_count'), $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. @@ -117,15 +74,48 @@ 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.' ) ); +} -break; +// 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 = new stdClass; + $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( $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); @@ -133,16 +123,60 @@ check_admin_referer('update-user_' . $user_id); if ( !current_user_can('edit_user', $user_id) ) wp_die(__('You do not have permission to edit this user.')); -if ($is_profile_page) - do_action('personal_options_update'); -else - do_action('edit_user_profile_update'); +if ( IS_PROFILE_PAGE ) { + /** + * Fires before the page loads on the 'Your Profile' editing screen. + * + * The action only fires if the current user is editing their own profile. + * + * @since 2.0.0 + * + * @param int $user_id The user ID. + */ + do_action( 'personal_options_update', $user_id ); +} else { + /** + * Fires before the page loads on the 'Edit User' screen. + * + * @since 2.7.0 + * + * @param int $user_id The user ID. + */ + 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 ) ); + + // We must delete the user from the current blog if WP added them 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); + $redirect = add_query_arg( 'updated', true, get_edit_user_link( $user_id ) ); + if ( $wp_http_referer ) + $redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect); wp_redirect($redirect); exit; } @@ -153,86 +187,122 @@ $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() ); ?>

- -

- -
+

+ + + + + +

+ +> - +

- +

- + - + - 1 ) : ?> + 1 && has_action('admin_color_scheme_picker') ) : ?> - +/** + * Fires in the 'Admin Color Scheme' section of the user editing screen. + * + * The section is only enabled if a callback is hooked to the action, + * and if there is more than one defined color scheme for the admin. + * + * @since 3.0.0 + */ +?> + + - + + + + + +
$color_info ): ?> -
/> - - - colors as $html_color ): ?> - - - -
 
- - -
- -
More information'); ?>
+
+
+

@@ -240,65 +310,84 @@ do_action('personal_options', $profileuser); - + - - + + +'; + echo ''; ?> + + + + + - - + + - - + + - - + + - + ';
'; -$role_list = ''; -$user_has_role = false; -foreach($wp_roles->role_names as $role => $name) { - $name = translate_with_context($name); - if ( $profileuser->has_cap($role) ) { - $selected = ' selected="selected"'; - $user_has_role = true; - } else { - $selected = ''; - } - $role_list .= ""; -} -if ( $user_has_role ) - $role_list .= ''; +// Compare user role against currently editable roles +$user_roles = array_intersect( array_values( $profileuser->roles ), array_keys( get_editable_roles() ) ); +$user_role = array_shift( $user_roles ); + +// print the full list of roles with the primary one selected. +wp_dropdown_roles($user_role); + +// print the 'no role' option. Make it selected if the user has no role yet. +if ( $user_role ) + echo ''; else - $role_list .= ''; -echo $role_list . '
+user_email != get_site_option( 'admin_email' ) || ! is_super_admin( $profileuser->ID ) ) : ?> +

+ +

+
- - + + - - - - - - - - - - - + + $desc ) { +?> - - + + + +
+ ID . '_new_email' ); + if ( $new_email && $new_email['newemail'] != $current_user->user_email && $profileuser->ID == $current_user->ID ) : ?> +
+

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

+
+ +
-

+

- + + + + + - - +


+
+ +
+ +

-
- -
-

- +
+
+ +
+
+

-caps) > count($profileuser->roles)): ?> -
- - - - - -
caps as $cap => $value) { - if(!$wp_roles->is_role($cap)) { - if($output != '') $output .= ', '; - $output .= $value ? $cap : "Denied: {$cap}"; - } - } - echo $output; - ?>
+caps ) > count( $profileuser->roles ) + && apply_filters( 'additional_capabilities_display', true, $profileuser ) +) : ?> +

+ + + + + +
+caps as $cap => $value ) { + if ( ! $wp_roles->is_role( $cap ) ) { + if ( '' != $output ) + $output .= ', '; + $output .= $value ? $cap : sprintf( __( 'Denied: %s' ), $cap ); + } + } + echo $output; +?> +
-

- - - -

+ + + + +
+ +