Index: wp-login.php =================================================================== --- wp-login.php (revision 20252) +++ wp-login.php (working copy) @@ -22,323 +22,8 @@ } } -/** - * Outputs the header for the login page. - * - * @uses do_action() Calls the 'login_head' for outputting HTML in the Log In - * header. - * @uses apply_filters() Calls 'login_headerurl' for the top login link. - * @uses apply_filters() Calls 'login_headertitle' for the top login title. - * @uses apply_filters() Calls 'login_message' on the message to display in the - * header. - * @uses $error The error global, which is checked for displaying errors. - * - * @param string $title Optional. WordPress Log In Page title to display in - * element. - * @param string $message Optional. Message to display in header. - * @param WP_Error $wp_error Optional. WordPress Error Object - */ -function login_header($title = 'Log In', $message = '', $wp_error = '') { - global $error, $is_iphone, $interim_login, $current_site; +require ABSPATH . WPINC . '/functions.wp-login.php'; - // Don't index any of these forms - add_action( 'login_head', 'wp_no_robots' ); - - if ( empty($wp_error) ) - $wp_error = new WP_Error(); - - // Shake it! - $shake_error_codes = array( 'empty_password', 'empty_email', 'invalid_email', 'invalidcombo', 'empty_username', 'invalid_username', 'incorrect_password' ); - $shake_error_codes = apply_filters( 'shake_error_codes', $shake_error_codes ); - - if ( $shake_error_codes && $wp_error->get_error_code() && in_array( $wp_error->get_error_code(), $shake_error_codes ) ) - add_action( 'login_head', 'wp_shake_js', 12 ); - - ?> -<!DOCTYPE html> -<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>> -<head> - <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" /> - <title><?php bloginfo('name'); ?> › <?php echo $title; ?> - - - -site_name; - } else { - $login_header_url = __( 'http://wordpress.org/' ); - $login_header_title = __( 'Powered by WordPress' ); - } - - $login_header_url = apply_filters( 'login_headerurl', $login_header_url ); - $login_header_title = apply_filters( 'login_headertitle', $login_header_title ); -?> - - -
-

-add('error', $error); - unset($error); - } - - if ( $wp_error->get_error_code() ) { - $errors = ''; - $messages = ''; - foreach ( $wp_error->get_error_codes() as $code ) { - $severity = $wp_error->get_error_data($code); - foreach ( $wp_error->get_error_messages($code) as $error ) { - if ( 'message' == $severity ) - $messages .= ' ' . $error . "
\n"; - else - $errors .= ' ' . $error . "
\n"; - } - } - if ( !empty($errors) ) - echo '
' . apply_filters('login_errors', $errors) . "
\n"; - if ( !empty($messages) ) - echo '

' . apply_filters('login_messages', $messages) . "

\n"; - } -} // End of login_header() - -/** - * Outputs the footer for the login page. - * - * @param string $input_id Which input to auto-focus - */ -function login_footer($input_id = '') { - ?> -

-
- - - - - - -
- - - - -add('empty_username', __('ERROR: Enter a username or e-mail address.')); - } else if ( strpos( $_POST['user_login'], '@' ) ) { - $user_data = get_user_by( 'email', trim( $_POST['user_login'] ) ); - if ( empty( $user_data ) ) - $errors->add('invalid_email', __('ERROR: There is no user registered with that email address.')); - } else { - $login = trim($_POST['user_login']); - $user_data = get_user_by('login', $login); - } - - do_action('lostpassword_post'); - - if ( $errors->get_error_code() ) - return $errors; - - if ( !$user_data ) { - $errors->add('invalidcombo', __('ERROR: Invalid username or e-mail.')); - return $errors; - } - - // redefining user_login ensures we return the right case in the email - $user_login = $user_data->user_login; - $user_email = $user_data->user_email; - - do_action('retreive_password', $user_login); // Misspelled and deprecated - do_action('retrieve_password', $user_login); - - $allow = apply_filters('allow_password_reset', true, $user_data->ID); - - if ( ! $allow ) - return new WP_Error('no_password_reset', __('Password reset is not allowed for this user')); - else if ( is_wp_error($allow) ) - return $allow; - - $key = $wpdb->get_var($wpdb->prepare("SELECT user_activation_key FROM $wpdb->users WHERE user_login = %s", $user_login)); - if ( empty($key) ) { - // Generate something random for a key... - $key = wp_generate_password(20, false); - do_action('retrieve_password_key', $user_login, $key); - // Now insert the new md5 key into the db - $wpdb->update($wpdb->users, array('user_activation_key' => $key), array('user_login' => $user_login)); - } - $message = __('Someone requested that the password be reset for the following account:') . "\r\n\r\n"; - $message .= network_home_url( '/' ) . "\r\n\r\n"; - $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n"; - $message .= __('If this was a mistake, just ignore this email and nothing will happen.') . "\r\n\r\n"; - $message .= __('To reset your password, visit the following address:') . "\r\n\r\n"; - $message .= '<' . network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . ">\r\n"; - - if ( is_multisite() ) - $blogname = $GLOBALS['current_site']->site_name; - else - // The blogname option is escaped with esc_html on the way into the database in sanitize_option - // we want to reverse this for the plain text arena of emails. - $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); - - $title = sprintf( __('[%s] Password Reset'), $blogname ); - - $title = apply_filters('retrieve_password_title', $title); - $message = apply_filters('retrieve_password_message', $message, $key); - - if ( $message && !wp_mail($user_email, $title, $message) ) - wp_die( __('The e-mail could not be sent.') . "
\n" . __('Possible reason: your host may have disabled the mail() function...') ); - - 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); - - 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', __( 'ERROR: Please enter a username.' ) ); - } elseif ( ! validate_username( $user_login ) ) { - $errors->add( 'invalid_username', __( 'ERROR: 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', __( 'ERROR: This username is already registered, please choose another one.' ) ); - } - - // Check the e-mail address - if ( $user_email == '' ) { - $errors->add( 'empty_email', __( 'ERROR: Please type your e-mail address.' ) ); - } elseif ( ! is_email( $user_email ) ) { - $errors->add( 'invalid_email', __( 'ERROR: The email address isn’t correct.' ) ); - $user_email = ''; - } elseif ( email_exists( $user_email ) ) { - $errors->add( 'email_exists', __( 'ERROR: 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 ) { - $errors->add( 'registerfail', sprintf( __( 'ERROR: Couldn’t register you... please contact the webmaster !' ), 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; -} - // // Main // Index: wp-includes/functions.wp-login.php =================================================================== --- wp-includes/functions.wp-login.php (revision 0) +++ wp-includes/functions.wp-login.php (revision 0) @@ -0,0 +1,318 @@ + element. + * @param string $message Optional. Message to display in header. + * @param WP_Error $wp_error Optional. WordPress Error Object + */ +function login_header($title = 'Log In', $message = '', $wp_error = '') { + global $error, $is_iphone, $interim_login, $current_site; + + // Don't index any of these forms + add_action( 'login_head', 'wp_no_robots' ); + + if ( empty($wp_error) ) + $wp_error = new WP_Error(); + + // Shake it! + $shake_error_codes = array( 'empty_password', 'empty_email', 'invalid_email', 'invalidcombo', 'empty_username', 'invalid_username', 'incorrect_password' ); + $shake_error_codes = apply_filters( 'shake_error_codes', $shake_error_codes ); + + if ( $shake_error_codes && $wp_error->get_error_code() && in_array( $wp_error->get_error_code(), $shake_error_codes ) ) + add_action( 'login_head', 'wp_shake_js', 12 ); + + ?> + +> + + + <?php bloginfo('name'); ?> › <?php echo $title; ?> + + + +site_name; + } else { + $login_header_url = __( 'http://wordpress.org/' ); + $login_header_title = __( 'Powered by WordPress' ); + } + + $login_header_url = apply_filters( 'login_headerurl', $login_header_url ); + $login_header_title = apply_filters( 'login_headertitle', $login_header_title ); +?> + + +
+

+add('error', $error); + unset($error); + } + + if ( $wp_error->get_error_code() ) { + $errors = ''; + $messages = ''; + foreach ( $wp_error->get_error_codes() as $code ) { + $severity = $wp_error->get_error_data($code); + foreach ( $wp_error->get_error_messages($code) as $error ) { + if ( 'message' == $severity ) + $messages .= ' ' . $error . "
\n"; + else + $errors .= ' ' . $error . "
\n"; + } + } + if ( !empty($errors) ) + echo '
' . apply_filters('login_errors', $errors) . "
\n"; + if ( !empty($messages) ) + echo '

' . apply_filters('login_messages', $messages) . "

\n"; + } +} // End of login_header() + +/** + * Outputs the footer for the login page. + * + * @param string $input_id Which input to auto-focus + */ +function login_footer($input_id = '') { + ?> +

+
+ + + + + + +
+ + + + +add('empty_username', __('ERROR: Enter a username or e-mail address.')); + } else if ( strpos( $_POST['user_login'], '@' ) ) { + $user_data = get_user_by( 'email', trim( $_POST['user_login'] ) ); + if ( empty( $user_data ) ) + $errors->add('invalid_email', __('ERROR: There is no user registered with that email address.')); + } else { + $login = trim($_POST['user_login']); + $user_data = get_user_by('login', $login); + } + + do_action('lostpassword_post'); + + if ( $errors->get_error_code() ) + return $errors; + + if ( !$user_data ) { + $errors->add('invalidcombo', __('ERROR: Invalid username or e-mail.')); + return $errors; + } + + // redefining user_login ensures we return the right case in the email + $user_login = $user_data->user_login; + $user_email = $user_data->user_email; + + do_action('retreive_password', $user_login); // Misspelled and deprecated + do_action('retrieve_password', $user_login); + + $allow = apply_filters('allow_password_reset', true, $user_data->ID); + + if ( ! $allow ) + return new WP_Error('no_password_reset', __('Password reset is not allowed for this user')); + else if ( is_wp_error($allow) ) + return $allow; + + $key = $wpdb->get_var($wpdb->prepare("SELECT user_activation_key FROM $wpdb->users WHERE user_login = %s", $user_login)); + if ( empty($key) ) { + // Generate something random for a key... + $key = wp_generate_password(20, false); + do_action('retrieve_password_key', $user_login, $key); + // Now insert the new md5 key into the db + $wpdb->update($wpdb->users, array('user_activation_key' => $key), array('user_login' => $user_login)); + } + $message = __('Someone requested that the password be reset for the following account:') . "\r\n\r\n"; + $message .= network_home_url( '/' ) . "\r\n\r\n"; + $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n"; + $message .= __('If this was a mistake, just ignore this email and nothing will happen.') . "\r\n\r\n"; + $message .= __('To reset your password, visit the following address:') . "\r\n\r\n"; + $message .= '<' . network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . ">\r\n"; + + if ( is_multisite() ) + $blogname = $GLOBALS['current_site']->site_name; + else + // The blogname option is escaped with esc_html on the way into the database in sanitize_option + // we want to reverse this for the plain text arena of emails. + $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); + + $title = sprintf( __('[%s] Password Reset'), $blogname ); + + $title = apply_filters('retrieve_password_title', $title); + $message = apply_filters('retrieve_password_message', $message, $key); + + if ( $message && !wp_mail($user_email, $title, $message) ) + wp_die( __('The e-mail could not be sent.') . "
\n" . __('Possible reason: your host may have disabled the mail() function...') ); + + 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); + + 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', __( 'ERROR: Please enter a username.' ) ); + } elseif ( ! validate_username( $user_login ) ) { + $errors->add( 'invalid_username', __( 'ERROR: 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', __( 'ERROR: This username is already registered, please choose another one.' ) ); + } + + // Check the e-mail address + if ( $user_email == '' ) { + $errors->add( 'empty_email', __( 'ERROR: Please type your e-mail address.' ) ); + } elseif ( ! is_email( $user_email ) ) { + $errors->add( 'invalid_email', __( 'ERROR: The email address isn’t correct.' ) ); + $user_email = ''; + } elseif ( email_exists( $user_email ) ) { + $errors->add( 'email_exists', __( 'ERROR: 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 ) { + $errors->add( 'registerfail', sprintf( __( 'ERROR: Couldn’t register you... please contact the webmaster !' ), 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; +}