Changeset 25231

Timestamp:

09/04/2013 08:58:41 AM (11 years ago)

Author:

SergeyBiryukov

Message:

Move check_password_reset_key(), reset_password(), and register_new_user() from wp-login.php to wp-includes/user.php, to make them reusable. props beaulebens for initial patch. fixes #20279.

Location:

trunk/src

Files:

• wp-includes/user.php (modified) (1 diff)
• wp-login.php (modified) (1 diff)

trunk/src/wp-includes/user.php

@@ -1551 +1551 @@
     return apply_filters( 'user_contactmethods', $user_contactmethods, $user );
 }
+
+/**
+ * Retrieves a user row based on password reset key and login
+ *
+ * @uses $wpdb WordPress Database object
+ *
+ * @param string $key Hash to validate sending user's password
+ * @param string $login The user login
+ * @return object|WP_Error User's database row on success, error object for invalid keys
+ */
+function check_password_reset_key( $key, $login ) {
+    global $wpdb;
+
+    $key = preg_replace( '/[^a-z0-9]/i', '', $key );
+
+    if ( empty( $key ) || ! is_string( $key ) )
+        return new WP_Error( 'invalid_key', __( 'Invalid key' ) );
+
+    if ( empty( $login ) || ! is_string( $login ) )
+        return new WP_Error( 'invalid_key', __( 'Invalid key' ) );
+
+    $user = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_login = %s", $key, $login ) );
+
+    if ( empty( $user ) )
+        return new WP_Error( 'invalid_key', __( 'Invalid key' ) );
+
+    return $user;
+}
+
+/**
+ * Handles resetting the user's password.
+ *
+ * @param object $user The user
+ * @param string $new_pass New password for the user in plaintext
+ */
+function reset_password( $user, $new_pass ) {
+    do_action( 'password_reset', $user, $new_pass );
+
+    wp_set_password( $new_pass, $user->ID );
+    update_user_option( $user->ID, 'default_password_nag', false, true );
+
+    wp_password_change_notification( $user );
+}
+
+/**
+ * Handles registering a new user.
+ *
+ * @param string $user_login User's username for logging in
+ * @param string $user_email User's email address to send password and add
+ * @return int|WP_Error Either user's ID or error on failure.
+ */
+function register_new_user( $user_login, $user_email ) {
+    $errors = new WP_Error();
+
+    $sanitized_user_login = sanitize_user( $user_login );
+    $user_email = apply_filters( 'user_registration_email', $user_email );
+
+    // Check the username
+    if ( $sanitized_user_login == '' ) {
+        $errors->add( 'empty_username', __( '<strong>ERROR</strong>: Please enter a username.' ) );
+    } elseif ( ! validate_username( $user_login ) ) {
+        $errors->add( 'invalid_username', __( '<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
+        $sanitized_user_login = '';
+    } elseif ( username_exists( $sanitized_user_login ) ) {
+        $errors->add( 'username_exists', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ) );
+    }
+
+    // Check the e-mail address
+    if ( $user_email == '' ) {
+        $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please type your e-mail address.' ) );
+    } elseif ( ! is_email( $user_email ) ) {
+        $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' ) );
+        $user_email = '';
+    } elseif ( email_exists( $user_email ) ) {
+        $errors->add( 'email_exists', __( '<strong>ERROR</strong>: This email is already registered, please choose another one.' ) );
+    }
+
+    do_action( 'register_post', $sanitized_user_login, $user_email, $errors );
+
+    $errors = apply_filters( 'registration_errors', $errors, $sanitized_user_login, $user_email );
+
+    if ( $errors->get_error_code() )
+        return $errors;
+
+    $user_pass = wp_generate_password( 12, false );
+    $user_id = wp_create_user( $sanitized_user_login, $user_pass, $user_email );
+    if ( ! $user_id || is_wp_error( $user_id ) ) {
+        $errors->add( 'registerfail', sprintf( __( '<strong>ERROR</strong>: Couldn&#8217;t register you&hellip; please contact the <a href="mailto:%s">webmaster</a> !' ), get_option( 'admin_email' ) ) );
+        return $errors;
+    }
+
+    update_user_option( $user_id, 'default_password_nag', true, true ); //Set up the Password change nag.
+
+    wp_new_user_notification( $user_id, $user_pass );
+
+    return $user_id;
+}

trunk/src/wp-login.php

@@ -268 +268 @@
 
     return true;
-}
-
-/**
- * Retrieves a user row based on password reset key and login
- *
- * @uses $wpdb WordPress Database object
- *
- * @param string $key Hash to validate sending user's password
- * @param string $login The user login
- * @return object|WP_Error User's database row on success, error object for invalid keys
- */
-function check_password_reset_key($key, $login) {
-    global $wpdb;
-
-    $key = preg_replace('/[^a-z0-9]/i', '', $key);
-
-    if ( empty( $key ) || !is_string( $key ) )
-        return new WP_Error('invalid_key', __('Invalid key'));
-
-    if ( empty($login) || !is_string($login) )
-        return new WP_Error('invalid_key', __('Invalid key'));
-
-    $user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_login = %s", $key, $login));
-
-    if ( empty( $user ) )
-        return new WP_Error('invalid_key', __('Invalid key'));
-
-    return $user;
-}
-
-/**
- * Handles resetting the user's password.
- *
- * @param object $user The user
- * @param string $new_pass New password for the user in plaintext
- */
-function reset_password( $user, $new_pass ) {
-    do_action( 'password_reset', $user, $new_pass );
-
-    wp_set_password( $new_pass, $user->ID );
-    update_user_option( $user->ID, 'default_password_nag', false, true );
-
-    wp_password_change_notification( $user );
-}
-
-/**
- * Handles registering a new user.
- *
- * @param string $user_login User's username for logging in
- * @param string $user_email User's email address to send password and add
- * @return int|WP_Error Either user's ID or error on failure.
- */
-function register_new_user( $user_login, $user_email ) {
-    $errors = new WP_Error();
-
-    $sanitized_user_login = sanitize_user( $user_login );
-    $user_email = apply_filters( 'user_registration_email', $user_email );
-
-    // Check the username
-    if ( $sanitized_user_login == '' ) {
-        $errors->add( 'empty_username', __( '<strong>ERROR</strong>: Please enter a username.' ) );
-    } elseif ( ! validate_username( $user_login ) ) {
-        $errors->add( 'invalid_username', __( '<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
-        $sanitized_user_login = '';
-    } elseif ( username_exists( $sanitized_user_login ) ) {
-        $errors->add( 'username_exists', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ) );
-    }
-
-    // Check the e-mail address
-    if ( $user_email == '' ) {
-        $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please type your e-mail address.' ) );
-    } elseif ( ! is_email( $user_email ) ) {
-        $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' ) );
-        $user_email = '';
-    } elseif ( email_exists( $user_email ) ) {
-        $errors->add( 'email_exists', __( '<strong>ERROR</strong>: This email is already registered, please choose another one.' ) );
-    }
-
-    do_action( 'register_post', $sanitized_user_login, $user_email, $errors );
-
-    $errors = apply_filters( 'registration_errors', $errors, $sanitized_user_login, $user_email );
-
-    if ( $errors->get_error_code() )
-        return $errors;
-
-    $user_pass = wp_generate_password( 12, false);
-    $user_id = wp_create_user( $sanitized_user_login, $user_pass, $user_email );
-    if ( ! $user_id || is_wp_error( $user_id ) ) {
-        $errors->add( 'registerfail', sprintf( __( '<strong>ERROR</strong>: Couldn&#8217;t register you&hellip; please contact the <a href="mailto:%s">webmaster</a> !' ), get_option( 'admin_email' ) ) );
-        return $errors;
-    }
-
-    update_user_option( $user_id, 'default_password_nag', true, true ); //Set up the Password change nag.
-
-    wp_new_user_notification( $user_id, $user_pass );
-
-    return $user_id;
 }