X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/fa11948979fd6a4ea5705dc613b239699a459db3..a7cd4c052013b423c6301153f68c7fdbaa2a447b:/wp-login.php diff --git a/wp-login.php b/wp-login.php index 042f29a8..3dabec4a 100644 --- a/wp-login.php +++ b/wp-login.php @@ -25,13 +25,13 @@ if ( force_ssl_admin() && ! is_ssl() ) { /** * Output the login page header. * - * @param string $title Optional. WordPress Log In Page title to display in element. Default 'Log In'. - * @param string $message Optional. Message to display in header. Default empty. - * @param string $wp_error Optional. The error to pass. Default empty. - * @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' ); @@ -57,18 +57,24 @@ function login_header($title = 'Log In', $message = '', $wp_error = '') { 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() ) { ?> @@ -90,9 +96,9 @@ function login_header($title = 'Log In', $message = '', $wp_error = '') { if ( is_multisite() ) { $login_header_url = network_home_url(); - $login_header_title = $current_site->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' ); } @@ -127,6 +133,7 @@ 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. @@ -142,7 +149,7 @@ function login_header($title = 'Log In', $message = '', $wp_error = '') {
-

+

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 ) ) { @@ -257,12 +264,13 @@ function wp_login_viewport_meta() { /** * Handles sending password retrieval email to user. * - * @uses $wpdb WordPress Database object + * @global wpdb $wpdb WordPress database abstraction object. + * @global PasswordHash $wp_hasher Portable PHP password hashing framework. * * @return bool|WP_Error True: when finish. WP_Error on error */ function retrieve_password() { - global $wpdb, $current_site, $wp_hasher; + global $wpdb, $wp_hasher; $errors = new WP_Error(); @@ -292,23 +300,24 @@ function retrieve_password() { 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; /** * Fires before a new password is retrieved. * - * @since 1.5.2 - * @deprecated 1.5.2 Misspelled. Use 'retrieve_password' hook instead. + * @since 1.5.0 + * @deprecated 1.5.1 Misspelled. Use 'retrieve_password' hook instead. * * @param string $user_login The user login name. */ do_action( 'retreive_password', $user_login ); + /** * Fires before a new password is retrieved. * - * @since 1.5.2 + * @since 1.5.1 * * @param string $user_login The user login name. */ @@ -344,7 +353,7 @@ function retrieve_password() { // Now insert the key, hashed, into the DB. if ( empty( $wp_hasher ) ) { - require_once ABSPATH . 'wp-includes/class-phpass.php'; + require_once ABSPATH . WPINC . '/class-phpass.php'; $wp_hasher = new PasswordHash( 8, true ); } $hashed = $wp_hasher->HashPassword( $key ); @@ -360,8 +369,10 @@ 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 ); @@ -374,17 +385,21 @@ function retrieve_password() { * @param string $title Default email title. */ $title = apply_filters( 'retrieve_password_title', $title ); + /** * 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 $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 ); + $message = apply_filters( 'retrieve_password_message', $message, $key, $user_login, $user_data ); - if ( $message && !wp_mail($user_email, $title, $message) ) + if ( $message && !wp_mail( $user_email, wp_specialchars_decode( $title ), $message ) ) wp_die( __('The e-mail could not be sent.') . "
\n" . __('Possible reason: your host may have disabled the mail() function.') ); return true; @@ -418,9 +433,10 @@ 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( site_url(), PHP_URL_SCHEME ) && 'https' === parse_url( home_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 ); /** * Fires when the login form is initialized. @@ -431,7 +447,7 @@ do_action( 'login_init' ); /** * Fires before a specified login form action. * - * The dynamic portion of the hook name, $action, refers to the 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. * @@ -445,7 +461,7 @@ $interim_login = isset($_REQUEST['interim-login']); switch ($action) { case 'postpass' : - require_once ABSPATH . 'wp-includes/class-phpass.php'; + require_once ABSPATH . WPINC . '/class-phpass.php'; $hasher = new PasswordHash( 8, true ); /** @@ -459,13 +475,12 @@ case 'postpass' : * @param int $expires The expiry time, as passed to setcookie(). */ $expire = apply_filters( 'post_password_expires', time() + 10 * DAY_IN_SECONDS ); - setcookie( 'wp-postpass_' . COOKIEHASH, $hasher->HashPassword( wp_unslash( $_POST['post_password'] ) ), $expire, COOKIEPATH ); + $secure = ( 'https' === parse_url( home_url(), PHP_URL_SCHEME ) ); + 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'); wp_logout(); @@ -474,8 +489,6 @@ case 'logout' : wp_safe_redirect( $redirect_to ); exit(); -break; - case 'lostpassword' : case 'retrievepassword' : @@ -508,7 +521,7 @@ case 'retrievepassword' : /** * Fires before the lost password form. * - * @since 1.5.2 + * @since 1.5.1 */ do_action( 'lost_password' ); @@ -518,14 +531,14 @@ case 'retrievepassword' : ?> -
+

tags, before the hidden fields. + * Fires inside the lostpassword form tags, before the hidden fields. * * @since 2.1.0 */ @@ -539,13 +552,8 @@ case 'retrievepassword' : %s', esc_url( wp_registration_url() ), __( 'Register' ) ); - /** - * Filter the registration URL below the login form. - * - * @since 1.5.2 - * - * @param string $registration_url Registration URL. - */ + + /** This filter is documented in wp-includes/general-template.php */ echo ' | ' . apply_filters( 'register', $registration_url ); endif; ?> @@ -557,10 +565,28 @@ break; case 'resetpass' : case 'rp' : - $user = check_password_reset_key($_GET['key'], $_GET['login']); + list( $rp_path ) = explode( '?', wp_unslash( $_SERVER['REQUEST_URI'] ) ); + $rp_cookie = 'wp-resetpass-' . COOKIEHASH; + if ( isset( $_GET['key'] ) ) { + $value = sprintf( '%s:%s', wp_unslash( $_GET['login'] ), wp_unslash( $_GET['key'] ) ); + setcookie( $rp_cookie, $value, 0, $rp_path, COOKIE_DOMAIN, is_ssl(), true ); + wp_safe_redirect( remove_query_arg( array( 'key', 'login' ) ) ); + exit; + } + + if ( isset( $_COOKIE[ $rp_cookie ] ) && 0 < strpos( $_COOKIE[ $rp_cookie ], ':' ) ) { + list( $rp_login, $rp_key ) = explode( ':', wp_unslash( $_COOKIE[ $rp_cookie ] ), 2 ); + $user = check_password_reset_key( $rp_key, $rp_login ); + if ( isset( $_POST['pass1'] ) && ! hash_equals( $rp_key, $_POST['rp_key'] ) ) { + $user = false; + } + } else { + $user = false; + } - if ( is_wp_error($user) ) { - if ( $user->get_error_code() === 'expired_key' ) + if ( ! $user || is_wp_error( $user ) ) { + setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true ); + if ( $user && $user->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' ) ); @@ -584,6 +610,7 @@ case 'rp' : 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; @@ -595,8 +622,8 @@ case 'rp' : login_header(__('Reset Password'), '

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

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

-

- +


+ + +

@@ -619,7 +657,8 @@ case 'rp' : %s', esc_url( wp_registration_url() ), __( 'Register' ) ); - /** This filter is documented in wp-login.php */ + + /** This filter is documented in wp-includes/general-template.php */ echo ' | ' . apply_filters( 'register', $registration_url ); endif; ?> @@ -631,7 +670,6 @@ break; case 'register' : if ( is_multisite() ) { - $sign_up_url = network_site_url( 'wp-signup.php' ); /** * Filter the Multisite sign up URL. * @@ -639,7 +677,7 @@ case 'register' : * * @param string $sign_up_url The sign up URL. */ - wp_redirect( apply_filters( 'wp_signup_location', $sign_up_url ) ); + wp_redirect( apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) ) ); exit; } @@ -673,14 +711,14 @@ case 'register' : login_header(__('Registration Form'), '

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

', $errors); ?> -
+

+

ERROR: Cookies are blocked or not supported by your browser. You must enable cookies to use WordPress.")); - else - $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.' ), + __( 'http://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.' ), + __( 'http://codex.wordpress.org/Cookies' ) ) ); + } + } $requested_redirect_to = isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : ''; /** @@ -808,7 +847,7 @@ default: elseif ( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] ) $errors->add('registered', __('Registration complete. Please check your e-mail.'), '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' ); } /** @@ -869,7 +908,8 @@ default: %s', esc_url( wp_registration_url() ), __( 'Register' ) ); - /** This filter is documented in wp-login.php */ + + /** This filter is documented in wp-includes/general-template.php */ echo apply_filters( 'register', $registration_url ) . ' | '; endif; ?> @@ -881,7 +921,7 @@ default: