WordPress 3.9.1-scripts

[autoinstalls/wordpress.git] / wp-admin / includes / user.php

diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php
index ff1e91dcebda385b51d6974ae2cea95201c93d80..137afcd1483d38216b81b5a40c171eeb90dcd5e3 100644 (file)
--- a/wp-admin/includes/user.php
+++ b/wp-admin/includes/user.php
@@ -9,7 +9,7 @@
 /**
  * Creates a new user from the "Users" form using $_POST information.
  *
 /**
  * Creates a new user from the "Users" form using $_POST information.
  *

- * @since 2.0
+ * @since 2.0.0

  *
  * @return null|WP_Error|int Null when adding user, WP_Error or User ID integer when no parameters.
  */
  *
  * @return null|WP_Error|int Null when adding user, WP_Error or User ID integer when no parameters.
  */


@@ -22,7 +22,7 @@ function add_user() {
  *
  * Used on user-edit.php and profile.php to manage and process user options, passwords etc.
  *
  *
  * Used on user-edit.php and profile.php to manage and process user options, passwords etc.
  *

- * @since 2.0
+ * @since 2.0.0

  *
  * @param int $user_id Optional. User ID.
  * @return int user id of the updated user
  *
  * @param int $user_id Optional. User ID.
  * @return int user id of the updated user


@@ -34,7 +34,7 @@ function edit_user( $user_id = 0 ) {
                $update = true;
                $user->ID = (int) $user_id;
                $userdata = get_userdata( $user_id );
                $update = true;
                $user->ID = (int) $user_id;
                $userdata = get_userdata( $user_id );

-               $user->user_login = $wpdb->escape( $userdata->user_login );
+               $user->user_login = wp_slash( $userdata->user_login );

        } else {
                $update = false;
        }
        } else {
                $update = false;
        }


@@ -43,9 +43,9 @@ function edit_user( $user_id = 0 ) {
                $user->user_login = sanitize_user($_POST['user_login'], true);
 
        $pass1 = $pass2 = '';
                $user->user_login = sanitize_user($_POST['user_login'], true);
 
        $pass1 = $pass2 = '';

-       if ( isset( $_POST['pass1'] ))
+       if ( isset( $_POST['pass1'] ) )

                $pass1 = $_POST['pass1'];
                $pass1 = $_POST['pass1'];

-       if ( isset( $_POST['pass2'] ))
+       if ( isset( $_POST['pass2'] ) )

                $pass2 = $_POST['pass2'];
 
        if ( isset( $_POST['role'] ) && current_user_can( 'edit_users' ) ) {
                $pass2 = $_POST['pass2'];
 
        if ( isset( $_POST['role'] ) && current_user_can( 'edit_users' ) ) {


@@ -69,7 +69,8 @@ function edit_user( $user_id = 0 ) {
                        $user->user_url = '';
                } else {
                        $user->user_url = esc_url_raw( $_POST['url'] );
                        $user->user_url = '';
                } else {
                        $user->user_url = esc_url_raw( $_POST['url'] );

-                       $user->user_url = preg_match('/^(https?|ftps?|mailto|news|irc|gopher|nntp|feed|telnet):/is', $user->user_url) ? $user->user_url : 'http://'.$user->user_url;
+                       $protocols = implode( '|', array_map( 'preg_quote', wp_allowed_protocols() ) );
+                       $user->user_url = preg_match('/^(' . $protocols . '):/is', $user->user_url) ? $user->user_url : 'http://'.$user->user_url;

                }
        }
        if ( isset( $_POST['first_name'] ) )
                }
        }
        if ( isset( $_POST['first_name'] ) )


@@ -84,7 +85,7 @@ function edit_user( $user_id = 0 ) {
        if ( isset( $_POST['description'] ) )
                $user->description = trim( $_POST['description'] );
 
        if ( isset( $_POST['description'] ) )
                $user->description = trim( $_POST['description'] );
 

-       foreach ( _wp_get_user_contactmethods( $user ) as $method => $name ) {
+       foreach ( wp_get_user_contact_methods( $user ) as $method => $name ) {

                if ( isset( $_POST[$method] ))
                        $user->$method = sanitize_text_field( $_POST[$method] );
        }
                if ( isset( $_POST[$method] ))
                        $user->$method = sanitize_text_field( $_POST[$method] );
        }


@@ -105,10 +106,19 @@ function edit_user( $user_id = 0 ) {
 
        /* checking that username has been typed */
        if ( $user->user_login == '' )
 
        /* checking that username has been typed */
        if ( $user->user_login == '' )

-               $errors->add( 'user_login', __( '<strong>ERROR</strong>: Please enter a username.' ));
+               $errors->add( 'user_login', __( '<strong>ERROR</strong>: Please enter a username.' ) );

 
        /* checking the password has been typed twice */
 
        /* checking the password has been typed twice */

-       do_action_ref_array( 'check_passwords', array ( $user->user_login, & $pass1, & $pass2 ));
+       /**
+        * Fires before the password and confirm password fields are checked for congruity.
+        *
+        * @since 1.5.1
+        *
+        * @param string $user_login The username.
+        * @param string &$pass1     The password, passed by reference.
+        * @param string &$pass2     The confirmed password, passed by reference.
+        */
+       do_action_ref_array( 'check_passwords', array( $user->user_login, &$pass1, &$pass2 ) );

 
        if ( $update ) {
                if ( empty($pass1) && !empty($pass2) )
 
        if ( $update ) {
                if ( empty($pass1) && !empty($pass2) )


@@ -123,7 +133,7 @@ function edit_user( $user_id = 0 ) {
        }
 
        /* Check for "\" in password */
        }
 
        /* Check for "\" in password */

-       if ( false !== strpos( stripslashes($pass1), "\\" ) )
+       if ( false !== strpos( wp_unslash( $pass1 ), "\\" ) )

                $errors->add( 'pass', __( '<strong>ERROR</strong>: Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) );
 
        /* checking the password has been typed twice the same */
                $errors->add( 'pass', __( '<strong>ERROR</strong>: Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) );
 
        /* checking the password has been typed twice the same */


@@ -143,22 +153,30 @@ function edit_user( $user_id = 0 ) {
        if ( empty( $user->user_email ) ) {
                $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please enter an e-mail address.' ), array( 'form-field' => 'email' ) );
        } elseif ( !is_email( $user->user_email ) ) {
        if ( empty( $user->user_email ) ) {
                $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please enter an e-mail address.' ), array( 'form-field' => 'email' ) );
        } elseif ( !is_email( $user->user_email ) ) {

-               $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The e-mail address isn&#8217;t correct.' ), array( 'form-field' => 'email' ) );
+               $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' ), array( 'form-field' => 'email' ) );

        } elseif ( ( $owner_id = email_exists($user->user_email) ) && ( !$update || ( $owner_id != $user->ID ) ) ) {
                $errors->add( 'email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.'), array( 'form-field' => 'email' ) );
        }
 
        } elseif ( ( $owner_id = email_exists($user->user_email) ) && ( !$update || ( $owner_id != $user->ID ) ) ) {
                $errors->add( 'email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.'), array( 'form-field' => 'email' ) );
        }
 

-       // Allow plugins to return their own errors.
-       do_action_ref_array('user_profile_update_errors', array ( &$errors, $update, &$user ) );
+       /**
+        * Fires before user profile update errors are returned.
+        *
+        * @since 2.8.0
+        *
+        * @param array   &$errors An array of user profile update errors, passed by reference.
+        * @param bool    $update  Whether this is a user update.
+        * @param WP_User &$user   WP_User object, passed by reference.
+        */
+       do_action_ref_array( 'user_profile_update_errors', array( &$errors, $update, &$user ) );

 
        if ( $errors->get_error_codes() )
                return $errors;
 
        if ( $update ) {
 
        if ( $errors->get_error_codes() )
                return $errors;
 
        if ( $update ) {

-               $user_id = wp_update_user( get_object_vars( $user ) );
+               $user_id = wp_update_user( $user );

        } else {
        } else {

-               $user_id = wp_insert_user( get_object_vars( $user ) );
-               wp_new_user_notification( $user_id, isset($_POST['send_password']) ? $pass1 : '' );
+               $user_id = wp_insert_user( $user );
+               wp_new_user_notification( $user_id, isset( $_POST['send_password'] ) ? wp_unslash( $pass1 ) : '' );

        }
        return $user_id;
 }
        }
        return $user_id;
 }


@@ -175,7 +193,7 @@ function edit_user( $user_id = 0 ) {
  * only editors or authors. This filter allows admins to delegate
  * user management.
  *
  * only editors or authors. This filter allows admins to delegate
  * user management.
  *

- * @since 2.8
+ * @since 2.8.0

  *
  * @return unknown
  */
  *
  * @return unknown
  */


@@ -183,7 +201,15 @@ function get_editable_roles() {
        global $wp_roles;
 
        $all_roles = $wp_roles->roles;
        global $wp_roles;
 
        $all_roles = $wp_roles->roles;

-       $editable_roles = apply_filters('editable_roles', $all_roles);
+
+       /**
+        * Filter the list of editable roles.
+        *
+        * @since 2.8.0
+        *
+        * @param array $all_roles List of roles.
+        */
+       $editable_roles = apply_filters( 'editable_roles', $all_roles );

 
        return $editable_roles;
 }
 
        return $editable_roles;
 }


@@ -194,12 +220,13 @@ function get_editable_roles() {
  * @since 2.0.5
  *
  * @param int $user_id User ID.
  * @since 2.0.5
  *
  * @param int $user_id User ID.

- * @return object WP_User object with user data.
+ * @return WP_User|bool WP_User object on success, false on failure.

  */
 function get_user_to_edit( $user_id ) {
  */
 function get_user_to_edit( $user_id ) {

-       $user = new WP_User( $user_id );
+       $user = get_userdata( $user_id );

 
 

-       $user->filter = 'edit';
+       if ( $user )
+               $user->filter = 'edit';

 
        return $user;
 }
 
        return $user;
 }


@@ -215,7 +242,15 @@ function get_user_to_edit( $user_id ) {
 function get_users_drafts( $user_id ) {
        global $wpdb;
        $query = $wpdb->prepare("SELECT ID, post_title FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'draft' AND post_author = %d ORDER BY post_modified DESC", $user_id);
 function get_users_drafts( $user_id ) {
        global $wpdb;
        $query = $wpdb->prepare("SELECT ID, post_title FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'draft' AND post_author = %d ORDER BY post_modified DESC", $user_id);

-       $query = apply_filters('get_users_drafts', $query);
+
+       /**
+        * Filter the user's drafts query string.
+        *
+        * @since 2.0.0
+        *
+        * @param string $query The user's drafts query string.
+        */
+       $query = apply_filters( 'get_users_drafts', $query );

        return $wpdb->get_results( $query );
 }
 
        return $wpdb->get_results( $query );
 }
 


@@ -233,16 +268,34 @@ function get_users_drafts( $user_id ) {
  * @param int $reassign Optional. Reassign posts and links to new User ID.
  * @return bool True when finished.
  */
  * @param int $reassign Optional. Reassign posts and links to new User ID.
  * @return bool True when finished.
  */

-function wp_delete_user( $id, $reassign = 'novalue' ) {
+function wp_delete_user( $id, $reassign = null ) {

        global $wpdb;
 
        $id = (int) $id;
        $user = new WP_User( $id );
 
        global $wpdb;
 
        $id = (int) $id;
        $user = new WP_User( $id );
 

-       // allow for transaction statement
-       do_action('delete_user', $id);
+       if ( !$user->exists() )
+               return false;
+
+       // Normalize $reassign to null or a user ID. 'novalue' was an older default.
+       if ( 'novalue' === $reassign ) {
+               $reassign = null;
+       } elseif ( null !== $reassign ) {
+               $reassign = (int) $reassign;
+       }

 
 

-       if ( 'novalue' === $reassign || null === $reassign ) {
+       /**
+        * Fires immediately before a user is deleted from the database.
+        *
+        * @since 2.0.0
+        *
+        * @param int      $id       ID of the user to delete.
+        * @param int|null $reassign ID of the user to reassign posts and links to.
+        *                           Default null, for no reassignment.
+        */
+       do_action( 'delete_user', $id, $reassign );
+
+       if ( null === $reassign ) {

                $post_types_to_delete = array();
                foreach ( get_post_types( array(), 'objects' ) as $post_type ) {
                        if ( $post_type->delete_with_user ) {
                $post_types_to_delete = array();
                foreach ( get_post_types( array(), 'objects' ) as $post_type ) {
                        if ( $post_type->delete_with_user ) {


@@ -252,6 +305,14 @@ function wp_delete_user( $id, $reassign = 'novalue' ) {
                        }
                }
 
                        }
                }
 

+               /**
+                * Filter the list of post types to delete with a user.
+                *
+                * @since 3.4.0
+                *
+                * @param array $post_types_to_delete Post types to delete.
+                * @param int   $id                   User ID.
+                */

                $post_types_to_delete = apply_filters( 'post_types_to_delete_with_user', $post_types_to_delete, $id );
                $post_types_to_delete = implode( "', '", $post_types_to_delete );
                $post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d AND post_type IN ('$post_types_to_delete')", $id ) );
                $post_types_to_delete = apply_filters( 'post_types_to_delete_with_user', $post_types_to_delete, $id );
                $post_types_to_delete = implode( "', '", $post_types_to_delete );
                $post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d AND post_type IN ('$post_types_to_delete')", $id ) );


@@ -268,9 +329,18 @@ function wp_delete_user( $id, $reassign = 'novalue' ) {
                                wp_delete_link($link_id);
                }
        } else {
                                wp_delete_link($link_id);
                }
        } else {

-               $reassign = (int) $reassign;
+               $post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d", $id ) );

                $wpdb->update( $wpdb->posts, array('post_author' => $reassign), array('post_author' => $id) );
                $wpdb->update( $wpdb->posts, array('post_author' => $reassign), array('post_author' => $id) );

+               if ( ! empty( $post_ids ) ) {
+                       foreach ( $post_ids as $post_id )
+                               clean_post_cache( $post_id );
+               }
+               $link_ids = $wpdb->get_col( $wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id) );

                $wpdb->update( $wpdb->links, array('link_owner' => $reassign), array('link_owner' => $id) );
                $wpdb->update( $wpdb->links, array('link_owner' => $reassign), array('link_owner' => $id) );

+               if ( ! empty( $link_ids ) ) {
+                       foreach ( $link_ids as $link_id )
+                               clean_bookmark_cache( $link_id );
+               }

        }
 
        // FINALLY, delete user
        }
 
        // FINALLY, delete user


@@ -286,8 +356,16 @@ function wp_delete_user( $id, $reassign = 'novalue' ) {
 
        clean_user_cache( $user );
 
 
        clean_user_cache( $user );
 

-       // allow for commit transaction
-       do_action('deleted_user', $id);
+       /**
+        * Fires immediately after a user is deleted from the database.
+        *
+        * @since 2.9.0
+        *
+        * @param int      $id       ID of the deleted user.
+        * @param int|null $reassign ID of the user to reassign posts and links to.
+        *                           Default null, for no reassignment.
+        */
+       do_action( 'deleted_user', $id, $reassign );

 
        return true;
 }
 
        return true;
 }


@@ -333,7 +411,7 @@ function default_password_nag_edit_user($user_ID, $old_data) {
        $new_data = get_userdata($user_ID);
 
        if ( $new_data->user_pass != $old_data->user_pass ) { //Remove the nag if the password has been changed.
        $new_data = get_userdata($user_ID);
 
        if ( $new_data->user_pass != $old_data->user_pass ) { //Remove the nag if the password has been changed.

-               delete_user_setting('default_password_nag', $user_ID);
+               delete_user_setting('default_password_nag');

                update_user_option($user_ID, 'default_password_nag', false, true);
        }
 }
                update_user_option($user_ID, 'default_password_nag', false, true);
        }
 }


@@ -352,7 +430,7 @@ function default_password_nag() {
        echo '<strong>' . __('Notice:') . '</strong> ';
        _e('You&rsquo;re using the auto-generated password for your account. Would you like to change it to something easier to remember?');
        echo '</p><p>';
        echo '<strong>' . __('Notice:') . '</strong> ';
        _e('You&rsquo;re using the auto-generated password for your account. Would you like to change it to something easier to remember?');
        echo '</p><p>';

-       printf( '<a href="%s">' . __('Yes, take me to my profile page') . '</a> | ', admin_url('profile.php') . '#password' );
+       printf( '<a href="%s">' . __('Yes, take me to my profile page') . '</a> | ', get_edit_profile_url() . '#password' );

        printf( '<a href="%s" id="default-password-nag-no">' . __('No thanks, do not remind me again') . '</a>', '?default_password_nag=0' );
        echo '</p></div>';
 }
        printf( '<a href="%s" id="default-password-nag-no">' . __('No thanks, do not remind me again') . '</a>', '?default_password_nag=0' );
        echo '</p></div>';
 }