X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/61343b82c4f0da4c68e4c6373daafff4a81efdd1..03f2fa83c13c1b532284205fa7efcab9b8b2c41f:/wp-login.php diff --git a/wp-login.php b/wp-login.php index 532ffd97..ea3afc6c 100644 --- a/wp-login.php +++ b/wp-login.php @@ -23,72 +23,100 @@ if ( force_ssl_admin() && ! is_ssl() ) { } /** - * Outputs the header for the login page. + * Output the login page header. * - * @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 + * @param string $title Optional. WordPress login Page title to display in the `<title>` element. + * Default 'Log In'. + * @param string $message Optional. Message to display in header. Default empty. + * @param WP_Error $wp_error Optional. The error to pass. Default empty. */ -function login_header($title = 'Log In', $message = '', $wp_error = '') { - global $error, $interim_login, $current_site, $action; +function login_header( $title = 'Log In', $message = '', $wp_error = '' ) { + global $error, $interim_login, $action; // Don't index any of these forms add_action( 'login_head', 'wp_no_robots' ); + if ( wp_is_mobile() ) + add_action( 'login_head', 'wp_login_viewport_meta' ); + 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' ); + /** + * Filter the error codes array for shaking the login form. + * + * @since 3.0.0 + * + * @param array $shake_error_codes Error codes that shake the login form. + */ $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(); ?>> + <!--[if IE 8]> + <html xmlns="http://www.w3.org/1999/xhtml" class="ie8" <?php language_attributes(); ?>> + <![endif]--> + <!--[if !(IE 8) ]><!--> + <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>> + <!--<![endif]--> <head> <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" /> <title><?php bloginfo('name'); ?> › <?php echo $title; ?> - get_error_code() ) { ?> site_name; + $login_header_title = get_current_site()->site_name; } else { - $login_header_url = __( 'http://wordpress.org/' ); + $login_header_url = __( 'https://wordpress.org/' ); $login_header_title = __( 'Powered by WordPress' ); } - $login_header_url = apply_filters( 'login_headerurl', $login_header_url ); + /** + * Filter link URL of the header logo above login form. + * + * @since 2.1.0 + * + * @param string $login_header_url Login header logo URL. + */ + $login_header_url = apply_filters( 'login_headerurl', $login_header_url ); + /** + * Filter the title attribute of the header logo above login form. + * + * @since 2.1.0 + * + * @param string $login_header_title Login header logo title attribute. + */ $login_header_title = apply_filters( 'login_headertitle', $login_header_title ); $classes = array( 'login-action-' . $action, 'wp-core-ui' ); @@ -105,19 +133,35 @@ function login_header($title = 'Log In', $message = '', $wp_error = '') { if ( 'success' === $interim_login ) $classes[] = 'interim-login-success'; } - + $classes[] =' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) ); + + /** + * Filter the login page body classes. + * + * @since 3.5.0 + * + * @param array $classes An array of body classes. + * @param string $action The action that brought the visitor to the login page. + */ $classes = apply_filters( 'login_body_class', $classes, $action ); ?>
-

+

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

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

\n"; + if ( ! empty( $errors ) ) { + /** + * Filter the error messages displayed above the login form. + * + * @since 2.1.0 + * + * @param string $errors Login error message. + */ + echo '
' . apply_filters( 'login_errors', $errors ) . "
\n"; + } + if ( ! empty( $messages ) ) { + /** + * Filter instructional messages displayed above the login form. + * + * @since 2.5.0 + * + * @param string $messages Login messages. + */ + echo '

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

\n"; + } } } // End of login_header() @@ -168,13 +228,22 @@ function login_footer($input_id = '') { - +
+ + add('empty_username', __('ERROR: Enter a username or e-mail address.')); - } else if ( strpos( $_POST['user_login'], '@' ) ) { + $errors->add('empty_username', __('ERROR: Enter a username or email address.')); + } elseif ( 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.')); @@ -212,39 +291,35 @@ function retrieve_password() { $user_data = get_user_by('login', $login); } - do_action('lostpassword_post'); + /** + * Fires before errors are returned from a password reset request. + * + * @since 2.1.0 + * @since 4.4.0 Added the `$errors` parameter. + * + * @param WP_Error $errors A WP_Error object containing any errors generated + * by using invalid credentials. + */ + do_action( 'lostpassword_post', $errors ); if ( $errors->get_error_code() ) return $errors; if ( !$user_data ) { - $errors->add('invalidcombo', __('ERROR: Invalid username or e-mail.')); + $errors->add('invalidcombo', __('ERROR: Invalid username or email.')); return $errors; } - // redefining user_login ensures we return the right case in the email + // Redefining user_login ensures we return the right case in the email. $user_login = $user_data->user_login; $user_email = $user_data->user_email; + $key = get_password_reset_key( $user_data ); - 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)); + if ( is_wp_error( $key ) ) { + return $key; } - $message = __('Someone requested that the password be reset for the following account:') . "\r\n\r\n"; + + $message = __('Someone has requested a password 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"; @@ -254,117 +329,45 @@ function retrieve_password() { 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. + /* + * 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.') ); + /** + * Filter the subject of the password reset email. + * + * @since 2.8.0 + * @since 4.4.0 Added the `$user_login` and `$user_data` parameters. + * + * @param string $title Default email title. + * @param string $user_login The username for the user. + * @param WP_User $user_data WP_User object. + */ + $title = apply_filters( 'retrieve_password_title', $title, $user_login, $user_data ); + + /** + * Filter the message body of the password reset mail. + * + * @since 2.8.0 + * @since 4.1.0 Added `$user_login` and `$user_data` parameters. + * + * @param string $message Default mail message. + * @param string $key The activation key. + * @param string $user_login The username for the user. + * @param WP_User $user_data WP_User object. + */ + $message = apply_filters( 'retrieve_password_message', $message, $key, $user_login, $user_data ); + + if ( $message && !wp_mail( $user_email, wp_specialchars_decode( $title ), $message ) ) + wp_die( __('The email 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 // @@ -393,12 +396,26 @@ if ( defined( 'RELOCATE' ) && RELOCATE ) { // Move flag is set } //Set a cookie now to see if they are supported by the browser. -setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN); +$secure = ( 'https' === parse_url( wp_login_url(), PHP_URL_SCHEME ) ); +setcookie( TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN, $secure ); if ( SITECOOKIEPATH != COOKIEPATH ) - setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN); + setcookie( TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN, $secure ); -// allow plugins to override the default actions, and to add extra actions if they want +/** + * Fires when the login form is initialized. + * + * @since 3.2.0 + */ do_action( 'login_init' ); +/** + * Fires before a specified login form action. + * + * The dynamic portion of the hook name, `$action`, refers to the action + * that brought the visitor to the login form. Actions include 'postpass', + * 'logout', 'lostpassword', etc. + * + * @since 2.8.0 + */ do_action( 'login_form_' . $action ); $http_post = ('POST' == $_SERVER['REQUEST_METHOD']); @@ -407,27 +424,63 @@ $interim_login = isset($_REQUEST['interim-login']); switch ($action) { case 'postpass' : - require_once ABSPATH . 'wp-includes/class-phpass.php'; + if ( ! array_key_exists( 'post_password', $_POST ) ) { + wp_safe_redirect( wp_get_referer() ); + exit(); + } + + require_once ABSPATH . WPINC . '/class-phpass.php'; $hasher = new PasswordHash( 8, true ); - // 10 days - setcookie( 'wp-postpass_' . COOKIEHASH, $hasher->HashPassword( wp_unslash( $_POST['post_password'] ) ), time() + 10 * DAY_IN_SECONDS, COOKIEPATH ); + /** + * Filter the life span of the post password cookie. + * + * By default, the cookie expires 10 days from creation. To turn this + * into a session cookie, return 0. + * + * @since 3.7.0 + * + * @param int $expires The expiry time, as passed to setcookie(). + */ + $expire = apply_filters( 'post_password_expires', time() + 10 * DAY_IN_SECONDS ); + $referer = wp_get_referer(); + if ( $referer ) { + $secure = ( 'https' === parse_url( $referer, PHP_URL_SCHEME ) ); + } else { + $secure = false; + } + setcookie( 'wp-postpass_' . COOKIEHASH, $hasher->HashPassword( wp_unslash( $_POST['post_password'] ) ), $expire, COOKIEPATH, COOKIE_DOMAIN, $secure ); wp_safe_redirect( wp_get_referer() ); exit(); -break; - case 'logout' : check_admin_referer('log-out'); + + $user = wp_get_current_user(); + wp_logout(); - $redirect_to = !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : 'wp-login.php?loggedout=true'; + if ( ! empty( $_REQUEST['redirect_to'] ) ) { + $redirect_to = $requested_redirect_to = $_REQUEST['redirect_to']; + } else { + $redirect_to = 'wp-login.php?loggedout=true'; + $requested_redirect_to = ''; + } + + /** + * Filter the log out redirect URL. + * + * @since 4.2.0 + * + * @param string $redirect_to The redirect destination URL. + * @param string $requested_redirect_to The requested redirect destination URL passed as a parameter. + * @param WP_User $user The WP_User object for the user that's logging out. + */ + $redirect_to = apply_filters( 'logout_redirect', $redirect_to, $requested_redirect_to, $user ); wp_safe_redirect( $redirect_to ); exit(); -break; - case 'lostpassword' : case 'retrievepassword' : @@ -440,31 +493,63 @@ case 'retrievepassword' : } } - if ( isset($_GET['error']) && 'invalidkey' == $_GET['error'] ) $errors->add('invalidkey', __('Sorry, that key does not appear to be valid.')); - $redirect_to = apply_filters( 'lostpassword_redirect', !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '' ); + if ( isset( $_GET['error'] ) ) { + if ( 'invalidkey' == $_GET['error'] ) { + $errors->add( 'invalidkey', __( 'Your password reset link appears to be invalid. Please request a new link below.' ) ); + } elseif ( 'expiredkey' == $_GET['error'] ) { + $errors->add( 'expiredkey', __( 'Your password reset link has expired. Please request a new link below.' ) ); + } + } + + $lostpassword_redirect = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : ''; + /** + * Filter the URL redirected to after submitting the lostpassword/retrievepassword form. + * + * @since 3.0.0 + * + * @param string $lostpassword_redirect The redirect destination URL. + */ + $redirect_to = apply_filters( 'lostpassword_redirect', $lostpassword_redirect ); + + /** + * Fires before the lost password form. + * + * @since 1.5.1 + */ + do_action( 'lost_password' ); - do_action('lost_password'); login_header(__('Lost Password'), '

' . __('Please enter your username or email address. You will receive a link to create a new password via email.') . '

', $errors); $user_login = isset($_POST['user_login']) ? wp_unslash($_POST['user_login']) : ''; ?> -
+

-

- +

get_error_code() === 'expired_key' ) + wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=expiredkey' ) ); + else + wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=invalidkey' ) ); exit; } @@ -485,10 +591,19 @@ case 'rp' : if ( isset($_POST['pass1']) && $_POST['pass1'] != $_POST['pass2'] ) $errors->add( 'password_reset_mismatch', __( 'The passwords do not match.' ) ); + /** + * Fires before the password reset procedure is validated. + * + * @since 3.5.0 + * + * @param object $errors WP Error object. + * @param WP_User|WP_Error $user WP_User object if the login and reset key match. WP_Error object otherwise. + */ do_action( 'validate_password_reset', $errors, $user ); if ( ( ! $errors->get_error_code() ) && isset( $_POST['pass1'] ) && !empty( $_POST['pass1'] ) ) { reset_password($user, $_POST['pass1']); + setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true ); login_header( __( 'Password Reset' ), '

' . __( 'Your password has been reset.' ) . ' ' . __( 'Log in' ) . '

' ); login_footer(); exit; @@ -500,30 +615,54 @@ case 'rp' : login_header(__('Reset Password'), '

' . __('Enter your new password below.') . '

', $errors ); ?> -
- + + + +
+

+ +

+ +
+ + + +
+
+
-

- +

+
+

-

- -

- -
-

+


+ + +

' . __('Register For This Site') . '

', $errors); ?> -
+

- +

- -

+ +


@@ -613,15 +773,30 @@ default: $reauth = empty($_REQUEST['reauth']) ? false : true; - // If the user was redirected to a secure login form from a non-secure admin page, and secure login is required but secure admin is not, then don't use a secure - // cookie and redirect back to the referring non-secure admin page. This allows logins to always be POSTed over SSL while allowing the user to choose visiting - // the admin via http or https. - if ( !$secure_cookie && is_ssl() && force_ssl_login() && !force_ssl_admin() && ( 0 !== strpos($redirect_to, 'https') ) && ( 0 === strpos($redirect_to, 'http') ) ) - $secure_cookie = false; + $user = wp_signon( '', $secure_cookie ); - $user = wp_signon('', $secure_cookie); + if ( empty( $_COOKIE[ LOGGED_IN_COOKIE ] ) ) { + if ( headers_sent() ) { + $user = new WP_Error( 'test_cookie', sprintf( __( 'ERROR: Cookies are blocked due to unexpected output. For help, please see this documentation or try the support forums.' ), + __( 'https://codex.wordpress.org/Cookies' ), __( 'https://wordpress.org/support/' ) ) ); + } elseif ( isset( $_POST['testcookie'] ) && empty( $_COOKIE[ TEST_COOKIE ] ) ) { + // If cookies are disabled we can't log in even with a valid user+pass + $user = new WP_Error( 'test_cookie', sprintf( __( 'ERROR: Cookies are blocked or not supported by your browser. You must enable cookies to use WordPress.' ), + __( 'https://codex.wordpress.org/Cookies' ) ) ); + } + } - $redirect_to = apply_filters('login_redirect', $redirect_to, isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '', $user); + $requested_redirect_to = isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : ''; + /** + * Filter the login redirect URL. + * + * @since 3.0.0 + * + * @param string $redirect_to The redirect destination URL. + * @param string $requested_redirect_to The requested redirect destination URL passed as a parameter. + * @param WP_User|WP_Error $user WP_User object if login was successful, WP_Error object otherwise. + */ + $redirect_to = apply_filters( 'login_redirect', $redirect_to, $requested_redirect_to, $user ); if ( !is_wp_error($user) && !$reauth ) { if ( $interim_login ) { @@ -629,7 +804,9 @@ default: $interim_login = 'success'; login_header( '', $message ); ?>
- + @@ -644,7 +821,7 @@ default: elseif ( is_multisite() && !$user->has_cap('read') ) $redirect_to = get_dashboard_url( $user->ID ); elseif ( !$user->has_cap('edit_posts') ) - $redirect_to = admin_url('profile.php'); + $redirect_to = $user->has_cap( 'read' ) ? admin_url( 'profile.php' ) : home_url(); } wp_safe_redirect($redirect_to); exit(); @@ -655,10 +832,6 @@ default: if ( !empty($_GET['loggedout']) || $reauth ) $errors = new WP_Error(); - // If cookies are disabled we can't log in even with a valid user+pass - if ( isset($_POST['testcookie']) && empty($_COOKIE[TEST_COOKIE]) ) - $errors->add('test_cookie', __("ERROR: Cookies are blocked or not supported by your browser. You must enable cookies to use WordPress.")); - if ( $interim_login ) { if ( ! $errors->get_error_code() ) $errors->add('expired', __('Session expired. Please log in again. You will not move away from this page.'), 'message'); @@ -669,15 +842,23 @@ default: elseif ( isset($_GET['registration']) && 'disabled' == $_GET['registration'] ) $errors->add('registerdisabled', __('User registration is currently not allowed.')); elseif ( isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail'] ) - $errors->add('confirm', __('Check your e-mail for the confirmation link.'), 'message'); + $errors->add('confirm', __('Check your email for the confirmation link.'), 'message'); elseif ( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] ) - $errors->add('newpass', __('Check your e-mail for your new password.'), 'message'); + $errors->add('newpass', __('Check your email for your new password.'), 'message'); elseif ( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] ) - $errors->add('registered', __('Registration complete. Please check your e-mail.'), 'message'); + $errors->add('registered', __('Registration complete. Please check your email.'), 'message'); elseif ( strpos( $redirect_to, 'about.php?updated' ) ) - $errors->add('updated', __( 'You have successfully updated WordPress! Please log back in to experience the awesomeness.' ), 'message' ); + $errors->add('updated', __( 'You have successfully updated WordPress! Please log back in to see what’s new.' ), 'message' ); } + /** + * Filter the login page errors. + * + * @since 3.6.0 + * + * @param object $errors WP Error object. + * @param string $redirect_to Redirect destination URL. + */ $errors = apply_filters( 'wp_login_errors', $errors, $redirect_to ); // Clear any stale cookies. @@ -689,18 +870,31 @@ default: if ( isset($_POST['log']) ) $user_login = ( 'incorrect_password' == $errors->get_error_code() || 'empty_password' == $errors->get_error_code() ) ? esc_attr(wp_unslash($_POST['log'])) : ''; $rememberme = ! empty( $_POST['rememberme'] ); + + if ( ! empty( $errors->errors ) ) { + $aria_describedby_error = ' aria-describedby="login_error"'; + } else { + $aria_describedby_error = ''; + } ?> - +

+ class="input" value="" size="20" />

+ class="input" value="" size="20" />

- +

@@ -718,10 +912,14 @@ default:

@@ -730,7 +928,7 @@ default: