X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/9e77185fafaf4e60e2b73821e0e4b9b1a11fb85f..e0feb3b2e5b436a06bbb04fbc838d1cd6ec95399:/wp-login.php?ds=sidebyside diff --git a/wp-login.php b/wp-login.php index b9dbd61e..57b2a2ef 100644 --- a/wp-login.php +++ b/wp-login.php @@ -25,7 +25,8 @@ 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 $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. */ @@ -240,6 +241,9 @@ function login_footer($input_id = '') { <?php } +/** + * @since 3.0.0 + */ function wp_shake_js() { if ( wp_is_mobile() ) return; @@ -254,6 +258,9 @@ addLoadEvent(function(){ var p=new Array(15,30,15,0,-15,-30,-15,0);p=p.concat(p. <?php } +/** + * @since 3.7.0 + */ function wp_login_viewport_meta() { ?> <meta name="viewport" content="width=device-width" /> @@ -263,7 +270,8 @@ 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 */ @@ -274,7 +282,7 @@ function retrieve_password() { if ( empty( $_POST['user_login'] ) ) { $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.')); - } else if ( strpos( $_POST['user_login'], '@' ) ) { + } elseif ( strpos( $_POST['user_login'], '@' ) ) { $user_data = get_user_by( 'email', trim( $_POST['user_login'] ) ); if ( empty( $user_data ) ) $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.')); @@ -331,10 +339,11 @@ function retrieve_password() { */ $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) ) + if ( ! $allow ) { + return new WP_Error( 'no_password_reset', __('Password reset is not allowed for this user') ); + } elseif ( is_wp_error( $allow ) ) { return $allow; + } // Generate something random for a password reset key. $key = wp_generate_password( 20, false ); @@ -354,7 +363,7 @@ function retrieve_password() { require_once ABSPATH . WPINC . '/class-phpass.php'; $wp_hasher = new PasswordHash( 8, true ); } - $hashed = $wp_hasher->HashPassword( $key ); + $hashed = time() . ':' . $wp_hasher->HashPassword( $key ); $wpdb->update( $wpdb->users, array( 'user_activation_key' => $hashed ), array( 'user_login' => $user_login ) ); $message = __('Someone requested that the password be reset for the following account:') . "\r\n\r\n"; @@ -383,15 +392,19 @@ 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, wp_specialchars_decode( $title ), $message ) ) wp_die( __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function.') ); @@ -441,7 +454,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. * @@ -477,9 +490,28 @@ case 'postpass' : 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(); @@ -496,10 +528,11 @@ case 'retrievepassword' : } if ( isset( $_GET['error'] ) ) { - if ( 'invalidkey' == $_GET['error'] ) - $errors->add( 'invalidkey', __( 'Sorry, that key does not appear to be valid.' ) ); - elseif ( 'expiredkey' == $_GET['error'] ) - $errors->add( 'expiredkey', __( 'Sorry, that key has expired. Please try again.' ) ); + 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'] : ''; @@ -532,7 +565,7 @@ case 'retrievepassword' : </p> <?php /** - * Fires inside the lostpassword <form> tags, before the hidden fields. + * Fires inside the lostpassword form tags, before the hidden fields. * * @since 2.1.0 */ @@ -571,6 +604,9 @@ case 'rp' : 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; } @@ -616,18 +652,21 @@ case 'rp' : <form name="resetpassform" id="resetpassform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=resetpass', 'login_post' ) ); ?>" method="post" autocomplete="off"> <input type="hidden" id="user_login" value="<?php echo esc_attr( $rp_login ); ?>" autocomplete="off" /> - <p> - <label for="pass1"><?php _e('New password') ?><br /> - <input type="password" name="pass1" id="pass1" class="input" size="20" value="" autocomplete="off" /></label> + <p class="user-pass1-wrap"> + <label for="pass1"><?php _e('New password') ?></label><br /> + <div class="wp-pwd"> + <span class="password-input-wrapper"> + <input type="password" data-reveal="1" data-pw="<?php echo esc_attr( wp_generate_password( 16 ) ); ?>" name="pass1" id="pass1" class="input" size="20" value="" autocomplete="off" aria-describedby="pass-strength-result" /> + </span> + <div id="pass-strength-result" class="hide-if-no-js" aria-live="polite"><?php _e( 'Strength indicator' ); ?></div> + </div> </p> - <p> - <label for="pass2"><?php _e('Confirm new password') ?><br /> - <input type="password" name="pass2" id="pass2" class="input" size="20" value="" autocomplete="off" /></label> + <p class="user-pass2-wrap"> + <label for="pass2"><?php _e('Confirm new password') ?></label><br /> + <input type="password" name="pass2" id="pass2" class="input" size="20" value="" autocomplete="off" /> </p> - <div id="pass-strength-result" class="hide-if-no-js"><?php _e('Strength indicator'); ?></div> - <p class="description indicator-hint"><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers, and symbols like ! " ? $ % ^ & ).'); ?></p> - + <p class="description indicator-hint"><?php echo wp_get_password_hint(); ?></p> <br class="clear" /> <?php @@ -640,6 +679,7 @@ case 'rp' : */ do_action( 'resetpass_form', $user ); ?> + <input type="hidden" name="rp_key" value="<?php echo esc_attr( $rp_key ); ?>" /> <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e('Reset Password'); ?>" /></p> </form> @@ -719,7 +759,7 @@ case 'register' : */ do_action( 'register_form' ); ?> - <p id="reg_passmail"><?php _e('A password will be e-mailed to you.') ?></p> + <p id="reg_passmail"><?php _e( 'Registration confirmation will be e-mailed to you.' ); ?></p> <br class="clear" /> <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" /> <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e('Register'); ?>" /></p> @@ -768,11 +808,11 @@ default: if ( empty( $_COOKIE[ LOGGED_IN_COOKIE ] ) ) { if ( headers_sent() ) { $user = new WP_Error( 'test_cookie', sprintf( __( '<strong>ERROR</strong>: Cookies are blocked due to unexpected output. For help, please see <a href="%1$s">this documentation</a> or try the <a href="%2$s">support forums</a>.' ), - __( 'http://codex.wordpress.org/Cookies' ), __( 'https://wordpress.org/support/' ) ) ); + __( '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( __( '<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href="%s">enable cookies</a> to use WordPress.' ), - __( 'http://codex.wordpress.org/Cookies' ) ) ); + __( 'https://codex.wordpress.org/Cookies' ) ) ); } } @@ -860,16 +900,22 @@ 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 = ''; + } ?> <form name="loginform" id="loginform" action="<?php echo esc_url( site_url( 'wp-login.php', 'login_post' ) ); ?>" method="post"> <p> <label for="user_login"><?php _e('Username') ?><br /> - <input type="text" name="log" id="user_login" class="input" value="<?php echo esc_attr($user_login); ?>" size="20" /></label> + <input type="text" name="log" id="user_login"<?php echo $aria_describedby_error; ?> class="input" value="<?php echo esc_attr( $user_login ); ?>" size="20" /></label> </p> <p> <label for="user_pass"><?php _e('Password') ?><br /> - <input type="password" name="pwd" id="user_pass" class="input" value="" size="20" /></label> + <input type="password" name="pwd" id="user_pass"<?php echo $aria_describedby_error; ?> class="input" value="" size="20" /></label> </p> <?php /**