enmi-conf.org: comparison wp/wp-login.php

equal deleted inserted replaced

-:3d4e9c994f10
+:a86126ab1dd4
 *
 * @package WordPress
 */
 /** Make sure that the WordPress bootstrap has run before continuing. */
-require( dirname( __FILE__ ) . '/wp-load.php' );
+require __DIR__ . '/wp-load.php';
 // Redirect to HTTPS login if forced to use SSL.
 if ( force_ssl_admin() && ! is_ssl() ) {
 	if ( 0 === strpos( $_SERVER['REQUEST_URI'], 'http' ) ) {
 		wp_safe_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) );
-		exit();
+		exit;
 	} else {
 		wp_safe_redirect( 'https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
-		exit();
+		exit;
 	}
 }
 /**
 * Output the login page header.
 *
 * @since 2.1.0
+*
+* @global string      $error         Login error message set by deprecated pluggable wp_login() function
+*                                    or plugins replacing it.
+* @global bool|string $interim_login Whether interim login modal is being displayed. String 'success'
+*                                    upon successful login.
+* @global string      $action        The action that brought the visitor to the login page.
 *
 * @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 is a WP_Error instance.
 */
 function login_header( $title = 'Log In', $message = '', $wp_error = null ) {
 	global $error, $interim_login, $action;
-	// Don't index any of these forms
+	// Don't index any of these forms.
 	add_action( 'login_head', 'wp_sensitive_page_meta' );
 	add_action( 'login_head', 'wp_login_viewport_meta' );
 	if ( ! is_wp_error( $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 = array( 'empty_password', 'empty_email', 'invalid_email', 'invalidcombo', 'empty_username', 'invalid_username', 'incorrect_password', 'retrieve_password_email_failure' );
 	/**
 	 * Filters 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->has_errors() && in_array( $wp_error->get_error_code(), $shake_error_codes ) ) {
+	if ( $shake_error_codes && $wp_error->has_errors() && in_array( $wp_error->get_error_code(), $shake_error_codes, true ) ) {
-		add_action( 'login_head', 'wp_shake_js', 12 );
+		add_action( 'login_footer', 'wp_shake_js', 12 );
 	}
 	$login_title = get_bloginfo( 'name', 'display' );
-	/* translators: Login screen title. 1: Login screen name, 2: Network or site name */
+	/* translators: Login screen title. 1: Login screen name, 2: Network or site name. */
 	$login_title = sprintf( __( '%1$s &lsaquo; %2$s &#8212; WordPress' ), $title, $login_title );
 	if ( wp_is_recovery_mode() ) {
 		/* translators: %s: Login screen title. */
 		$login_title = sprintf( __( 'Recovery Mode &#8212; %s' ), $login_title );
 	 * @param string $title       The original page title.
 	 */
 	$login_title = apply_filters( 'login_title', $login_title, $title );
 	?><!DOCTYPE html>
-	<!--[if IE 8]>
+	<html <?php language_attributes(); ?>>
-		<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 echo $login_title; ?></title>
 	<?php
 	/*
 	 * Remove all stored post data on logging out.
 	 * This could be added by add_action('login_head'...) like wp_shake_js(),
 	 * but maybe better if it's not removable by plugins.
 	 */
-	if ( 'loggedout' == $wp_error->get_error_code() ) {
+	if ( 'loggedout' === $wp_error->get_error_code() ) {
 		?>
 		<script>if("sessionStorage" in window){try{for(var key in sessionStorage){if(key.indexOf("wp-autosave-")!=-1){sessionStorage.removeItem(key)}}}catch(e){}};</script>
 		<?php
 	}
 	/**
 	 * Filters the title attribute of the header logo above login form.
 	 *
 	 * @since 2.1.0
-	 * @deprecated 5.2.0 Use login_headertext
+	 * @deprecated 5.2.0 Use {@see 'login_headertext'} instead.
 	 *
 	 * @param string $login_header_title Login header logo title attribute.
 	 */
 	$login_header_title = apply_filters_deprecated(
 		'login_headertitle',
 	 * @param string $login_header_text The login header logo link text.
 	 */
 	$login_header_text = apply_filters( 'login_headertext', $login_header_text );
 	$classes = array( 'login-action-' . $action, 'wp-core-ui' );
 	if ( is_rtl() ) {
 		$classes[] = 'rtl';
 	}
 	if ( $interim_login ) {
 		$classes[] = 'interim-login';
 		?>
 		<style type="text/css">html{background-color: transparent;}</style>
 		<?php
 		if ( 'success' === $interim_login ) {
 			$classes[] = 'interim-login-success';
 		}
 	}
 	$classes[] = ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
 	/**
 	 * Filters the login page body classes.
 	 *
 	 */
 	$classes = apply_filters( 'login_body_class', $classes, $action );
 	?>
 	</head>
-	<body class="login <?php echo esc_attr( implode( ' ', $classes ) ); ?>">
+	<body class="login no-js <?php echo esc_attr( implode( ' ', $classes ) ); ?>">
+	<script type="text/javascript">
+		document.body.className = document.body.className.replace('no-js','js');
+	</script>
 	<?php
 	/**
 	 * Fires in the login page header after the body tag is opened.
 	 *
 	 * @since 4.6.0
 	 */
 	do_action( 'login_header' );
 	?>
 	<div id="login">
 		<h1><a href="<?php echo esc_url( $login_header_url ); ?>"><?php echo $login_header_text; ?></a></h1>
 	<?php
 	/**
 	 * @since 2.1.0
 	 *
 	 * @param string $message Login message text.
 	 */
 	$message = apply_filters( 'login_message', $message );
 	if ( ! empty( $message ) ) {
 		echo $message . "\n";
 	}
 	// In case a plugin uses $error rather than the $wp_errors object.
 	}
 	if ( $wp_error->has_errors() ) {
 		$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_message ) {
-				if ( 'message' == $severity ) {
+				if ( 'message' === $severity ) {
 					$messages .= '	' . $error_message . "<br />\n";
 				} else {
 					$errors .= '	' . $error_message . "<br />\n";
 				}
 			}
 		}
 		if ( ! empty( $errors ) ) {
 			/**
 			 * Filters the error messages displayed above the login form.
 			 *
 			 * @since 2.1.0
 			 *
 			 * @param string $errors Login error message.
 			 */
 			echo '<div id="login_error">' . apply_filters( 'login_errors', $errors ) . "</div>\n";
 		}
 		if ( ! empty( $messages ) ) {
 			/**
 			 * Filters instructional messages displayed above the login form.
 			 *
 			 * @since 2.5.0
 			 * @param string $messages Login messages.
 			 */
 			echo '<p class="message">' . apply_filters( 'login_messages', $messages ) . "</p>\n";
 		}
 	}
-} // End of login_header()
+} // End of login_header().
 /**
 * Outputs the footer for the login page.
 *
 * @since 3.1.0
+*
+* @global bool|string $interim_login Whether interim login modal is being displayed. String 'success'
+*                                    upon successful login.
 *
 * @param string $input_id Which input to auto-focus.
 */
 function login_footer( $input_id = '' ) {
 	global $interim_login;
 	// Don't allow interim logins to navigate away from the page.
-	if ( ! $interim_login ) :
+	if ( ! $interim_login ) {
 		?>
-	<p id="backtoblog"><a href="<?php echo esc_url( home_url( '/' ) ); ?>">
+		<p id="backtoblog"><a href="<?php echo esc_url( home_url( '/' ) ); ?>">
 		<?php
-		/* translators: %s: site title */
+		/* translators: %s: Site title. */
 		printf( _x( '&larr; Back to %s', 'site' ), get_bloginfo( 'title', 'display' ) );
 		?>
-	</a></p>
+		</a></p>
-		<?php the_privacy_policy_link( '<div class="privacy-policy-page-link">', '</div>' ); ?>
+		<?php
-	<?php endif; ?>
+		the_privacy_policy_link( '<div class="privacy-policy-page-link">', '</div>' );
-	</div>
+	}
-	<?php if ( ! empty( $input_id ) ) : ?>
+	?>
-	<script type="text/javascript">
+	</div><?php // End of <div id="login">. ?>
-	try{document.getElementById('<?php echo $input_id; ?>').focus();}catch(e){}
-	if(typeof wpOnload=='function')wpOnload();
-	</script>
-	<?php endif; ?>
 	<?php
+	if ( ! empty( $input_id ) ) {
+		?>
+		<script type="text/javascript">
+		try{document.getElementById('<?php echo $input_id; ?>').focus();}catch(e){}
+		if(typeof wpOnload=='function')wpOnload();
+		</script>
+		<?php
+	}
 	/**
 	 * Fires in the login page footer.
 	 *
 	 * @since 3.1.0
 	 */
 	do_action( 'login_footer' );
 	?>
 	<div class="clear"></div>
 	</body>
 	</html>
 	<?php
 *
 * @since 3.0.0
 */
 function wp_shake_js() {
 	?>
-<script type="text/javascript">
+	<script type="text/javascript">
-addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
+	document.querySelector('form').classList.add('shake');
-function s(id,pos){g(id).left=pos+'px';}
+	</script>
-function g(id){return document.getElementById(id).style;}
-function shake(id,a,d){c=a.shift();s(id,c);if(a.length>0){setTimeout(function(){shake(id,a,d);},d);}else{try{g(id).position='static';wp_attempt_focus();}catch(e){}}}
-addLoadEvent(function(){ var p=new Array(15,30,15,0,-15,-30,-15,0);p=p.concat(p.concat(p));var i=document.forms[0].id;g(i).position='relative';shake(i,p,20);});
-</script>
 	<?php
 }
 /**
 * Outputs the viewport meta tag.
 * @since 2.5.0
 *
 * @return bool|WP_Error True: when finish. WP_Error on error
 */
 function retrieve_password() {
-	$errors = new WP_Error();
+	$errors    = new WP_Error();
+	$user_data = false;
 	if ( empty( $_POST['user_login'] ) || ! is_string( $_POST['user_login'] ) ) {
-		$errors->add( 'empty_username', __( '<strong>ERROR</strong>: Enter a username or email address.' ) );
+		$errors->add( 'empty_username', __( '<strong>Error</strong>: Please enter a username or email address.' ) );
 	} elseif ( strpos( $_POST['user_login'], '@' ) ) {
 		$user_data = get_user_by( 'email', trim( wp_unslash( $_POST['user_login'] ) ) );
 		if ( empty( $user_data ) ) {
-			$errors->add( 'invalid_email', __( '<strong>ERROR</strong>: There is no account with that username or email address.' ) );
+			$errors->add( 'invalid_email', __( '<strong>Error</strong>: There is no account with that username or email address.' ) );
 		}
 	} else {
-		$login     = trim( $_POST['user_login'] );
+		$login     = trim( wp_unslash( $_POST['user_login'] ) );
 		$user_data = get_user_by( 'login', $login );
 	}
 	/**
 	 * Fires before errors are returned from a password reset request.
 	 *
 	 * @since 2.1.0
 	 * @since 4.4.0 Added the `$errors` parameter.
-	 *
+	 * @since 5.4.0 Added the `$user_data` parameter.
-	 * @param WP_Error $errors A WP_Error object containing any errors generated
+	 *
-	 *                         by using invalid credentials.
+	 * @param WP_Error      $errors    A WP_Error object containing any errors generated
+	 *                                 by using invalid credentials.
+	 * @param WP_User|false $user_data WP_User object if found, false if the user does not exist.
 	 */
-	do_action( 'lostpassword_post', $errors );
+	do_action( 'lostpassword_post', $errors, $user_data );
+	/**
+	 * Filters the errors encountered on a password reset request.
+	 *
+	 * The filtered WP_Error object may, for example, contain errors for an invalid
+	 * username or email address. A WP_Error object should always be returned,
+	 * but may or may not contain errors.
+	 *
+	 * If any errors are present in $errors, this will abort the password reset request.
+	 *
+	 * @since 5.5.0
+	 *
+	 * @param WP_Error      $errors    A WP_Error object containing any errors generated
+	 *                                 by using invalid credentials.
+	 * @param WP_User|false $user_data WP_User object if found, false if the user does not exist.
+	 */
+	$errors = apply_filters( 'lostpassword_errors', $errors, $user_data );
 	if ( $errors->has_errors() ) {
 		return $errors;
 	}
 	if ( ! $user_data ) {
-		$errors->add( 'invalidcombo', __( '<strong>ERROR</strong>: There is no account with that username or email address.' ) );
+		$errors->add( 'invalidcombo', __( '<strong>Error</strong>: There is no account with that username or email address.' ) );
 		return $errors;
 	}
 	// Redefining user_login ensures we return the right case in the email.
 	$user_login = $user_data->user_login;
 		 */
 		$site_name = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
 	}
 	$message = __( 'Someone has requested a password reset for the following account:' ) . "\r\n\r\n";
-	/* translators: %s: site name */
+	/* translators: %s: Site name. */
 	$message .= sprintf( __( 'Site Name: %s' ), $site_name ) . "\r\n\r\n";
-	/* translators: %s: user login */
+	/* translators: %s: User login. */
 	$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";
+	$message .= network_site_url( "wp-login.php?action=rp&key=$key&login=" . rawurlencode( $user_login ), 'login' ) . "\r\n";
-	/* translators: Password reset notification email subject. %s: Site title */
+	/* translators: Password reset notification email subject. %s: Site title. */
 	$title = sprintf( __( '[%s] Password Reset' ), $site_name );
 	/**
 	 * Filters the subject of the password reset email.
 	 *
 	 * @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. Possible reason: your host may have disabled the mail() function.' ) );
+		$errors->add(
+			'retrieve_password_email_failure',
+			sprintf(
+				/* translators: %s: Documentation URL. */
+				__( '<strong>Error</strong>: The email could not be sent. Your site may not be correctly configured to send emails. <a href="%s">Get support for resetting your password</a>.' ),
+				esc_url( __( 'https://wordpress.org/support/article/resetting-your-password/' ) )
+			)
+		);
+		return $errors;
 	}
 	return true;
 }
 if ( isset( $_GET['key'] ) ) {
 	$action = 'resetpass';
 }
+if ( isset( $_GET['checkemail'] ) ) {
+	$action = 'checkemail';
+}
+$default_actions = array(
+	'confirm_admin_email',
+	'postpass',
+	'logout',
+	'lostpassword',
+	'retrievepassword',
+	'resetpass',
+	'rp',
+	'register',
+	'checkemail',
+	'confirmaction',
+	'login',
+	WP_Recovery_Mode_Link_Service::LOGIN_ACTION_ENTERED,
+);
 // Validate action so as to default to the login screen.
-if ( ! in_array( $action, array( 'postpass', 'logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login', 'confirmaction', WP_Recovery_Mode_Link_Service::LOGIN_ACTION_ENTERED ), true ) && false === has_filter( 'login_form_' . $action ) ) {
+if ( ! in_array( $action, $default_actions, true ) && false === has_filter( 'login_form_' . $action ) ) {
 	$action = 'login';
 }
 nocache_headers();
 header( 'Content-Type: ' . get_bloginfo( 'html_type' ) . '; charset=' . get_bloginfo( 'charset' ) );
-if ( defined( 'RELOCATE' ) && RELOCATE ) { // Move flag is set
+if ( defined( 'RELOCATE' ) && RELOCATE ) { // Move flag is set.
-	if ( isset( $_SERVER['PATH_INFO'] ) && ( $_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF'] ) ) {
+	if ( isset( $_SERVER['PATH_INFO'] ) && ( $_SERVER['PATH_INFO'] !== $_SERVER['PHP_SELF'] ) ) {
 		$_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] );
 	}
 	$url = dirname( set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] ) );
-	if ( $url != get_option( 'siteurl' ) ) {
+	if ( get_option( 'siteurl' ) !== $url ) {
 		update_option( 'siteurl', $url );
 	}
 }
-//Set a cookie now to see if they are supported by the browser.
+// Set a cookie now to see if they are supported by the browser.
 $secure = ( 'https' === parse_url( wp_login_url(), PHP_URL_SCHEME ) );
 setcookie( TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN, $secure );
-if ( SITECOOKIEPATH != COOKIEPATH ) {
+if ( SITECOOKIEPATH !== COOKIEPATH ) {
 	setcookie( TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN, $secure );
 }
 /**
 * Fires when the login form is initialized.
 *
 * @since 2.8.0
 */
 do_action( "login_form_{$action}" );
-$http_post     = ( 'POST' == $_SERVER['REQUEST_METHOD'] );
+$http_post     = ( 'POST' === $_SERVER['REQUEST_METHOD'] );
 $interim_login = isset( $_REQUEST['interim-login'] );
 /**
 * Filters the separator used between login form navigation links.
 *
 */
 $login_link_separator = apply_filters( 'login_link_separator', ' | ' );
 switch ( $action ) {
+	case 'confirm_admin_email':
+		/*
+		 * Note that `is_user_logged_in()` will return false immediately after logging in
+		 * as the current user is not set, see wp-includes/pluggable.php.
+		 * However this action runs on a redirect after logging in.
+		 */
+		if ( ! is_user_logged_in() ) {
+			wp_safe_redirect( wp_login_url() );
+			exit;
+		}
+		if ( ! empty( $_REQUEST['redirect_to'] ) ) {
+			$redirect_to = $_REQUEST['redirect_to'];
+		} else {
+			$redirect_to = admin_url();
+		}
+		if ( current_user_can( 'manage_options' ) ) {
+			$admin_email = get_option( 'admin_email' );
+		} else {
+			wp_safe_redirect( $redirect_to );
+			exit;
+		}
+		/**
+		 * Filters the interval for dismissing the admin email confirmation screen.
+		 *
+		 * If `0` (zero) is returned, the "Remind me later" link will not be displayed.
+		 *
+		 * @since 5.3.1
+		 *
+		 * @param int $interval Interval time (in seconds). Default is 3 days.
+		 */
+		$remind_interval = (int) apply_filters( 'admin_email_remind_interval', 3 * DAY_IN_SECONDS );
+		if ( ! empty( $_GET['remind_me_later'] ) ) {
+			if ( ! wp_verify_nonce( $_GET['remind_me_later'], 'remind_me_later_nonce' ) ) {
+				wp_safe_redirect( wp_login_url() );
+				exit;
+			}
+			if ( $remind_interval > 0 ) {
+				update_option( 'admin_email_lifespan', time() + $remind_interval );
+			}
+			$redirect_to = add_query_arg( 'admin_email_remind_later', 1, $redirect_to );
+			wp_safe_redirect( $redirect_to );
+			exit;
+		}
+		if ( ! empty( $_POST['correct-admin-email'] ) ) {
+			if ( ! check_admin_referer( 'confirm_admin_email', 'confirm_admin_email_nonce' ) ) {
+				wp_safe_redirect( wp_login_url() );
+				exit;
+			}
+			/**
+			 * Filters the interval for redirecting the user to the admin email confirmation screen.
+			 *
+			 * If `0` (zero) is returned, the user will not be redirected.
+			 *
+			 * @since 5.3.0
+			 *
+			 * @param int $interval Interval time (in seconds). Default is 6 months.
+			 */
+			$admin_email_check_interval = (int) apply_filters( 'admin_email_check_interval', 6 * MONTH_IN_SECONDS );
+			if ( $admin_email_check_interval > 0 ) {
+				update_option( 'admin_email_lifespan', time() + $admin_email_check_interval );
+			}
+			wp_safe_redirect( $redirect_to );
+			exit;
+		}
+		login_header( __( 'Confirm your administration email' ), '', $errors );
+		/**
+		 * Fires before the admin email confirm form.
+		 *
+		 * @since 5.3.0
+		 *
+		 * @param WP_Error $errors A `WP_Error` object containing any errors generated by using invalid
+		 *                         credentials. Note that the error object may not contain any errors.
+		 */
+		do_action( 'admin_email_confirm', $errors );
+		?>
+		<form class="admin-email-confirm-form" name="admin-email-confirm-form" action="<?php echo esc_url( site_url( 'wp-login.php?action=confirm_admin_email', 'login_post' ) ); ?>" method="post">
+			<?php
+			/**
+			 * Fires inside the admin-email-confirm-form form tags, before the hidden fields.
+			 *
+			 * @since 5.3.0
+			 */
+			do_action( 'admin_email_confirm_form' );
+			wp_nonce_field( 'confirm_admin_email', 'confirm_admin_email_nonce' );
+			?>
+			<input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
+			<h1 class="admin-email__heading">
+				<?php _e( 'Administration email verification' ); ?>
+			</h1>
+			<p class="admin-email__details">
+				<?php _e( 'Please verify that the <strong>administration email</strong> for this website is still correct.' ); ?>
+				<?php
+				/* translators: URL to the WordPress help section about admin email. */
+				$admin_email_help_url = __( 'https://wordpress.org/support/article/settings-general-screen/#email-address' );
+				/* translators: accessibility text */
+				$accessibility_text = sprintf( '<span class="screen-reader-text"> %s</span>', __( '(opens in a new tab)' ) );
+				printf(
+					'<a href="%s" rel="noopener noreferrer" target="_blank">%s%s</a>',
+					esc_url( $admin_email_help_url ),
+					__( 'Why is this important?' ),
+					$accessibility_text
+				);
+				?>
+			</p>
+			<p class="admin-email__details">
+				<?php
+				printf(
+					/* translators: %s: Admin email address. */
+					__( 'Current administration email: %s' ),
+					'<strong>' . esc_html( $admin_email ) . '</strong>'
+				);
+				?>
+			</p>
+			<p class="admin-email__details">
+				<?php _e( 'This email may be different from your personal email address.' ); ?>
+			</p>
+			<div class="admin-email__actions">
+				<div class="admin-email__actions-primary">
+					<?php
+					$change_link = admin_url( 'options-general.php' );
+					$change_link = add_query_arg( 'highlight', 'confirm_admin_email', $change_link );
+					?>
+					<a class="button button-large" href="<?php echo esc_url( $change_link ); ?>"><?php _e( 'Update' ); ?></a>
+					<input type="submit" name="correct-admin-email" id="correct-admin-email" class="button button-primary button-large" value="<?php esc_attr_e( 'The email is correct' ); ?>" />
+				</div>
+				<?php if ( $remind_interval > 0 ) : ?>
+					<div class="admin-email__actions-secondary">
+						<?php
+						$remind_me_link = wp_login_url( $redirect_to );
+						$remind_me_link = add_query_arg(
+							array(
+								'action'          => 'confirm_admin_email',
+								'remind_me_later' => wp_create_nonce( 'remind_me_later_nonce' ),
+							),
+							$remind_me_link
+						);
+						?>
+						<a href="<?php echo esc_url( $remind_me_link ); ?>"><?php _e( 'Remind me later' ); ?></a>
+					</div>
+				<?php endif; ?>
+			</div>
+		</form>
+		<?php
+		login_footer();
+		break;
 	case 'postpass':
 		if ( ! array_key_exists( 'post_password', $_POST ) ) {
 			wp_safe_redirect( wp_get_referer() );
-			exit();
+			exit;
 		}
 		require_once ABSPATH . WPINC . '/class-phpass.php';
 		$hasher = new PasswordHash( 8, true );
 		 *
 		 * @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();
+		exit;
 	case 'logout':
 		check_admin_referer( 'log-out' );
 		$user = wp_get_current_user();
 		wp_logout();
 		if ( ! empty( $_REQUEST['redirect_to'] ) ) {
-			$redirect_to = $requested_redirect_to = $_REQUEST['redirect_to'];
+			$redirect_to           = $_REQUEST['redirect_to'];
+			$requested_redirect_to = $redirect_to;
 		} else {
-			$redirect_to           = 'wp-login.php?loggedout=true';
+			$redirect_to = add_query_arg(
+				array(
+					'loggedout' => 'true',
+					'wp_lang'   => get_user_locale( $user ),
+				),
+				wp_login_url()
+			);
 			$requested_redirect_to = '';
 		}
 		/**
 		 * Filters the log out redirect URL.
 		 * @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();
+		exit;
 	case 'lostpassword':
 	case 'retrievepassword':
 		if ( $http_post ) {
 			$errors = retrieve_password();
 			if ( ! is_wp_error( $errors ) ) {
 				$redirect_to = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : 'wp-login.php?checkemail=confirm';
 				wp_safe_redirect( $redirect_to );
-				exit();
+				exit;
 			}
 		}
 		if ( isset( $_GET['error'] ) ) {
-			if ( 'invalidkey' == $_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'] ) {
+			} 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'] : '';
 		 * @param WP_Error $errors A `WP_Error` object containing any errors generated by using invalid
 		 *                         credentials. Note that the error object may not contain any errors.
 		 */
 		do_action( 'lost_password', $errors );
-		login_header( __( 'Lost Password' ), '<p class="message">' . __( 'Please enter your username or email address. You will receive a link to create a new password via email.' ) . '</p>', $errors );
+		login_header( __( 'Lost Password' ), '<p class="message">' . __( 'Please enter your username or email address. You will receive an email message with instructions on how to reset your password.' ) . '</p>', $errors );
 		$user_login = '';
 		if ( isset( $_POST['user_login'] ) && is_string( $_POST['user_login'] ) ) {
 			$user_login = wp_unslash( $_POST['user_login'] );
 		}
 		?>
-	<form name="lostpasswordform" id="lostpasswordform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=lostpassword', 'login_post' ) ); ?>" method="post">
+		<form name="lostpasswordform" id="lostpasswordform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=lostpassword', 'login_post' ) ); ?>" method="post">
-	<p>
+			<p>
-		<label for="user_login" ><?php _e( 'Username or Email Address' ); ?><br />
+				<label for="user_login"><?php _e( 'Username or Email Address' ); ?></label>
-		<input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr( $user_login ); ?>" size="20" autocapitalize="off" /></label>
+				<input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr( $user_login ); ?>" size="20" autocapitalize="off" />
-	</p>
+			</p>
+			<?php
+			/**
+			 * Fires inside the lostpassword form tags, before the hidden fields.
+			 *
+			 * @since 2.1.0
+			 */
+			do_action( 'lostpassword_form' );
+			?>
+			<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( 'Get New Password' ); ?>" />
+			</p>
+		</form>
+		<p id="nav">
+			<a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a>
+			<?php
+			if ( get_option( 'users_can_register' ) ) {
+				$registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
+				echo esc_html( $login_link_separator );
+				/** This filter is documented in wp-includes/general-template.php */
+				echo apply_filters( 'register', $registration_url );
+			}
+			?>
+		</p>
 		<?php
-		/**
-		 * Fires inside the lostpassword form tags, before the hidden fields.
-		 *
-		 * @since 2.1.0
-		 */
-		do_action( 'lostpassword_form' );
-		?>
-		<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( 'Get New Password' ); ?>" /></p>
-	</form>
-	<p id="nav">
-	<a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a>
-		<?php
-		if ( get_option( 'users_can_register' ) ) :
-			$registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
-			echo esc_html( $login_link_separator );
-			/** This filter is documented in wp-includes/general-template.php */
-			echo apply_filters( 'register', $registration_url );
-	endif;
-		?>
-	</p>
-		<?php
 		login_footer( 'user_login' );
 		break;
 	case 'resetpass':
 	case 'rp':
 		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 );
+			$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 ( ! $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' ) );
 			}
 			exit;
 		}
 		$errors = new WP_Error();
-		if ( isset( $_POST['pass1'] ) && $_POST['pass1'] != $_POST['pass2'] ) {
+		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_Error         $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->has_errors() ) && isset( $_POST['pass1'] ) && ! empty( $_POST['pass1'] ) ) {
 		wp_enqueue_script( 'user-profile' );
 		login_header( __( 'Reset Password' ), '<p class="message reset-pass">' . __( 'Enter your new password below.' ) . '</p>', $errors );
 		?>
-	<form name="resetpassform" id="resetpassform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=resetpass', 'login_post' ) ); ?>" method="post" autocomplete="off">
+		<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" />
+			<input type="hidden" id="user_login" value="<?php echo esc_attr( $rp_login ); ?>" autocomplete="off" />
-	<div class="user-pass1-wrap">
+			<div class="user-pass1-wrap">
-		<p>
+				<p>
-			<label for="pass1"><?php _e( 'New password' ); ?></label>
+					<label for="pass1"><?php _e( 'New password' ); ?></label>
+				</p>
+				<div class="wp-pwd">
+					<input type="password" data-reveal="1" data-pw="<?php echo esc_attr( wp_generate_password( 16 ) ); ?>" name="pass1" id="pass1" class="input password-input" size="24" value="" autocomplete="off" aria-describedby="pass-strength-result" />
+					<button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
+						<span class="dashicons dashicons-hidden" aria-hidden="true"></span>
+					</button>
+					<div id="pass-strength-result" class="hide-if-no-js" aria-live="polite"><?php _e( 'Strength indicator' ); ?></div>
+				</div>
+				<div class="pw-weak">
+					<input type="checkbox" name="pw_weak" id="pw-weak" class="pw-checkbox" />
+					<label for="pw-weak"><?php _e( 'Confirm use of weak password' ); ?></label>
+				</div>
+			</div>
+			<p class="user-pass2-wrap">
+				<label for="pass2"><?php _e( 'Confirm new password' ); ?></label>
+				<input type="password" name="pass2" id="pass2" class="input" size="20" value="" autocomplete="off" />
+			</p>
+			<p class="description indicator-hint"><?php echo wp_get_password_hint(); ?></p>
+			<br class="clear" />
+			<?php
+			/**
+			 * Fires following the 'Strength indicator' meter in the user password reset form.
+			 *
+			 * @since 3.9.0
+			 *
+			 * @param WP_User $user User object of the user whose password is being reset.
+			 */
+			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>
+		<p id="nav">
+			<a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a>
+			<?php
+			if ( get_option( 'users_can_register' ) ) {
+				$registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
+				echo esc_html( $login_link_separator );
+				/** This filter is documented in wp-includes/general-template.php */
+				echo apply_filters( 'register', $registration_url );
+			}
+			?>
 		</p>
-		<div class="wp-pwd">
-			<div 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 password-input" size="24" value="" autocomplete="off" aria-describedby="pass-strength-result" />
-				<button type="button" class="button button-secondary wp-hide-pw hide-if-no-js">
-					<span class="dashicons dashicons-hidden" aria-hidden="true"></span>
-				</button>
-			</div>
-			<div id="pass-strength-result" class="hide-if-no-js" aria-live="polite"><?php _e( 'Strength indicator' ); ?></div>
-		</div>
-		<div class="pw-weak">
-			<label>
-				<input type="checkbox" name="pw_weak" class="pw-checkbox" />
-				<?php _e( 'Confirm use of weak password' ); ?>
-			</label>
-		</div>
-	</div>
-	<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>
-	<p class="description indicator-hint"><?php echo wp_get_password_hint(); ?></p>
-	<br class="clear" />
 		<?php
-		/**
-		 * Fires following the 'Strength indicator' meter in the user password reset form.
-		 *
-		 * @since 3.9.0
-		 *
-		 * @param WP_User $user User object of the user whose password is being reset.
-		 */
-		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>
-	<p id="nav">
-	<a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a>
-		<?php
-		if ( get_option( 'users_can_register' ) ) :
-			$registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
-			echo esc_html( $login_link_separator );
-			/** This filter is documented in wp-includes/general-template.php */
-			echo apply_filters( 'register', $registration_url );
-	endif;
-		?>
-	</p>
-		<?php
 		login_footer( 'user_pass' );
 		break;
 	case 'register':
 		if ( is_multisite() ) {
 			/**
 			exit;
 		}
 		if ( ! get_option( 'users_can_register' ) ) {
 			wp_redirect( site_url( 'wp-login.php?registration=disabled' ) );
-			exit();
+			exit;
 		}
 		$user_login = '';
 		$user_email = '';
 		if ( $http_post ) {
 			if ( isset( $_POST['user_login'] ) && is_string( $_POST['user_login'] ) ) {
-				$user_login = $_POST['user_login'];
+				$user_login = wp_unslash( $_POST['user_login'] );
 			}
 			if ( isset( $_POST['user_email'] ) && is_string( $_POST['user_email'] ) ) {
 				$user_email = wp_unslash( $_POST['user_email'] );
 			}
 			$errors = register_new_user( $user_login, $user_email );
 			if ( ! is_wp_error( $errors ) ) {
 				$redirect_to = ! empty( $_POST['redirect_to'] ) ? $_POST['redirect_to'] : 'wp-login.php?checkemail=registered';
 				wp_safe_redirect( $redirect_to );
-				exit();
+				exit;
 			}
 		}
 		$registration_redirect = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
 		/**
 		 * Filters the registration redirect URL.
 		 *
 		 * @since 3.0.0
 		 *
 		 * @param string $registration_redirect The redirect destination URL.
 		 */
 		$redirect_to = apply_filters( 'registration_redirect', $registration_redirect );
 		login_header( __( 'Registration Form' ), '<p class="message register">' . __( 'Register For This Site' ) . '</p>', $errors );
 		?>
-	<form name="registerform" id="registerform" action="<?php echo esc_url( site_url( 'wp-login.php?action=register', 'login_post' ) ); ?>" method="post" novalidate="novalidate">
+		<form name="registerform" id="registerform" action="<?php echo esc_url( site_url( 'wp-login.php?action=register', 'login_post' ) ); ?>" method="post" novalidate="novalidate">
-	<p>
+			<p>
-		<label for="user_login"><?php _e( 'Username' ); ?><br />
+				<label for="user_login"><?php _e( 'Username' ); ?></label>
-		<input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr( wp_unslash( $user_login ) ); ?>" size="20" autocapitalize="off" /></label>
+				<input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr( wp_unslash( $user_login ) ); ?>" size="20" autocapitalize="off" />
-	</p>
+			</p>
-	<p>
+			<p>
-		<label for="user_email"><?php _e( 'Email' ); ?><br />
+				<label for="user_email"><?php _e( 'Email' ); ?></label>
-		<input type="email" name="user_email" id="user_email" class="input" value="<?php echo esc_attr( wp_unslash( $user_email ) ); ?>" size="25" /></label>
+				<input type="email" name="user_email" id="user_email" class="input" value="<?php echo esc_attr( wp_unslash( $user_email ) ); ?>" size="25" />
-	</p>
+			</p>
+			<?php
+			/**
+			 * Fires following the 'Email' field in the user registration form.
+			 *
+			 * @since 2.1.0
+			 */
+			do_action( 'register_form' );
+			?>
+			<p id="reg_passmail">
+				<?php _e( 'Registration confirmation will be emailed 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>
+		</form>
+		<p id="nav">
+			<a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a>
+				<?php echo esc_html( $login_link_separator ); ?>
+			<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a>
+		</p>
 		<?php
-		/**
-		 * Fires following the 'Email' field in the user registration form.
-		 *
-		 * @since 2.1.0
-		 */
-		do_action( 'register_form' );
-		?>
-	<p id="reg_passmail"><?php _e( 'Registration confirmation will be emailed 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>
-	</form>
-	<p id="nav">
-	<a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a>
-		<?php echo esc_html( $login_link_separator ); ?>
-	<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a>
-	</p>
-		<?php
 		login_footer( 'user_login' );
+		break;
+	case 'checkemail':
+		$redirect_to = admin_url();
+		$errors      = new WP_Error();
+		if ( 'confirm' === $_GET['checkemail'] ) {
+			$errors->add(
+				'confirm',
+				sprintf(
+					/* translators: %s: Link to the login page. */
+					__( 'Check your email for the confirmation link, then visit the <a href="%s">login page</a>.' ),
+					wp_login_url()
+				),
+				'message'
+			);
+		} elseif ( 'registered' === $_GET['checkemail'] ) {
+			$errors->add(
+				'registered',
+				sprintf(
+					/* translators: %s: Link to the login page. */
+					__( 'Registration complete. Please check your email, then visit the <a href="%s">login page</a>.' ),
+					wp_login_url()
+				),
+				'message'
+			);
+		}
+		/** This action is documented in wp-login.php */
+		$errors = apply_filters( 'wp_login_errors', $errors, $redirect_to );
+		login_header( __( 'Check your email' ), '', $errors );
+		login_footer();
 		break;
 	case 'confirmaction':
 		if ( ! isset( $_GET['request_id'] ) ) {
 			wp_die( __( 'Missing request ID.' ) );
 	case 'login':
 	default:
 		$secure_cookie   = '';
 		$customize_login = isset( $_REQUEST['customize-login'] );
 		if ( $customize_login ) {
 			wp_enqueue_script( 'customize-base' );
 		}
 		// If the user wants SSL but the session is not SSL, force a secure cookie.
 		if ( ! empty( $_POST['log'] ) && ! force_ssl_admin() ) {
-			$user_name = sanitize_user( $_POST['log'] );
+			$user_name = sanitize_user( wp_unslash( $_POST['log'] ) );
 			$user      = get_user_by( 'login', $user_name );
 			if ( ! $user && strpos( $user_name, '@' ) ) {
 				$user = get_user_by( 'email', $user_name );
 			}
 		if ( empty( $_COOKIE[ LOGGED_IN_COOKIE ] ) ) {
 			if ( headers_sent() ) {
 				$user = new WP_Error(
 					'test_cookie',
 					sprintf(
-						/* translators: 1: Browser cookie documentation URL, 2: Support forums URL */
+						/* translators: 1: Browser cookie documentation URL, 2: Support forums URL. */
-						__( '<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>.' ),
+						__( '<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>.' ),
 						__( 'https://wordpress.org/support/article/cookies/' ),
-						__( 'https://wordpress.org/support/' )
+						__( 'https://wordpress.org/support/forums/' )
 					)
 				);
 			} elseif ( isset( $_POST['testcookie'] ) && empty( $_COOKIE[ TEST_COOKIE ] ) ) {
-				// If cookies are disabled we can't log in even with a valid user+pass
+				// If cookies are disabled, we can't log in even with a valid user and password.
 				$user = new WP_Error(
 					'test_cookie',
 					sprintf(
-						/* translators: %s: Browser cookie documentation URL */
+						/* translators: %s: Browser cookie documentation URL. */
-						__( '<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href="%s">enable cookies</a> to use WordPress.' ),
+						__( '<strong>Error</strong>: Cookies are blocked or not supported by your browser. You must <a href="%s">enable cookies</a> to use WordPress.' ),
 						__( 'https://wordpress.org/support/article/cookies/#enable-cookies-in-your-browser' )
 					)
 				);
 			}
 		}
 		if ( ! is_wp_error( $user ) && ! $reauth ) {
 			if ( $interim_login ) {
 				$message       = '<p class="message">' . __( 'You have logged in successfully.' ) . '</p>';
 				$interim_login = 'success';
 				login_header( '', $message );
 				?>
 				</div>
 				<?php
 				/** This action is documented in wp-login.php */
 				do_action( 'login_footer' );
+				if ( $customize_login ) {
+					?>
+					<script type="text/javascript">setTimeout( function(){ new wp.customize.Messenger({ url: '<?php echo wp_customize_url(); ?>', channel: 'login' }).send('login') }, 1000 );</script>
+					<?php
+				}
 				?>
-				<?php if ( $customize_login ) : ?>
-				<script type="text/javascript">setTimeout( function(){ new wp.customize.Messenger({ url: '<?php echo wp_customize_url(); ?>', channel: 'login' }).send('login') }, 1000 );</script>
-			<?php endif; ?>
 				</body></html>
 				<?php
 				exit;
 			}
-			if ( ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' || $redirect_to == admin_url() ) ) {
+			// Check if it is time to add a redirect to the admin email confirmation screen.
+			if ( is_a( $user, 'WP_User' ) && $user->exists() && $user->has_cap( 'manage_options' ) ) {
+				$admin_email_lifespan = (int) get_option( 'admin_email_lifespan' );
+				// If `0` (or anything "falsey" as it is cast to int) is returned, the user will not be redirected
+				// to the admin email confirmation screen.
+				/** This filter is documented in wp-login.php */
+				$admin_email_check_interval = (int) apply_filters( 'admin_email_check_interval', 6 * MONTH_IN_SECONDS );
+				if ( $admin_email_check_interval > 0 && time() > $admin_email_lifespan ) {
+					$redirect_to = add_query_arg(
+						array(
+							'action'  => 'confirm_admin_email',
+							'wp_lang' => get_user_locale( $user ),
+						),
+						wp_login_url( $redirect_to )
+					);
+				}
+			}
+			if ( ( empty( $redirect_to ) || 'wp-admin/' === $redirect_to || admin_url() === $redirect_to ) ) {
 				// If the user doesn't belong to a blog, send them to user admin. If the user can't edit posts, send them to their profile.
 				if ( is_multisite() && ! get_active_blog_for_user( $user->ID ) && ! is_super_admin( $user->ID ) ) {
 					$redirect_to = user_admin_url();
 				} elseif ( is_multisite() && ! $user->has_cap( 'read' ) ) {
 					$redirect_to = get_dashboard_url( $user->ID );
 				} elseif ( ! $user->has_cap( 'edit_posts' ) ) {
 					$redirect_to = $user->has_cap( 'read' ) ? admin_url( 'profile.php' ) : home_url();
 				}
 				wp_redirect( $redirect_to );
-				exit();
+				exit;
 			}
 			wp_safe_redirect( $redirect_to );
-			exit();
+			exit;
 		}
 		$errors = $user;
 		// Clear errors if loggedout is set.
 		if ( ! empty( $_GET['loggedout'] ) || $reauth ) {
 			if ( ! $errors->has_errors() ) {
 				$errors->add( 'expired', __( 'Your session has expired. Please log in to continue where you left off.' ), 'message' );
 			}
 		} else {
 			// Some parts of this script use the main login form to display a message.
-			if ( isset( $_GET['loggedout'] ) && true == $_GET['loggedout'] ) {
+			if ( isset( $_GET['loggedout'] ) && $_GET['loggedout'] ) {
 				$errors->add( 'loggedout', __( 'You are now logged out.' ), 'message' );
-			} elseif ( isset( $_GET['registration'] ) && 'disabled' == $_GET['registration'] ) {
+			} 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 email for the confirmation link.' ), 'message' );
-			} elseif ( isset( $_GET['checkemail'] ) && 'newpass' == $_GET['checkemail'] ) {
-				$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 email.' ), 'message' );
 			} elseif ( strpos( $redirect_to, 'about.php?updated' ) ) {
 				$errors->add( 'updated', __( '<strong>You have successfully updated WordPress!</strong> Please log back in to see what&#8217;s new.' ), 'message' );
 			} elseif ( WP_Recovery_Mode_Link_Service::LOGIN_ACTION_ENTERED === $action ) {
 				$errors->add( 'enter_recovery_mode', __( 'Recovery Mode Initialized. Please log in to continue.' ), 'message' );
 			}
 		/**
 		 * Filters the login page errors.
 		 *
 		 * @since 3.6.0
 		 *
-		 * @param object $errors      WP Error object.
+		 * @param WP_Error $errors      WP Error object.
-		 * @param string $redirect_to Redirect destination URL.
+		 * @param string   $redirect_to Redirect destination URL.
 		 */
 		$errors = apply_filters( 'wp_login_errors', $errors, $redirect_to );
 		// Clear any stale cookies.
 		if ( $reauth ) {
 		}
 		login_header( __( 'Log In' ), '', $errors );
 		if ( isset( $_POST['log'] ) ) {
-			$user_login = ( 'incorrect_password' == $errors->get_error_code() || 'empty_password' == $errors->get_error_code() ) ? esc_attr( wp_unslash( $_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 ( $errors->has_errors() ) {
 			$aria_describedby_error = ' aria-describedby="login_error"';
 		} else {
 			$aria_describedby_error = '';
 		}
+		wp_enqueue_script( 'user-profile' );
 		?>
-	<form name="loginform" id="loginform" action="<?php echo esc_url( site_url( 'wp-login.php', 'login_post' ) ); ?>" method="post">
+		<form name="loginform" id="loginform" action="<?php echo esc_url( site_url( 'wp-login.php', 'login_post' ) ); ?>" method="post">
-	<p>
+			<p>
-		<label for="user_login"><?php _e( 'Username or Email Address' ); ?><br />
+				<label for="user_login"><?php _e( 'Username or Email Address' ); ?></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" autocapitalize="off" /></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" autocapitalize="off" />
-	</p>
+			</p>
-	<p>
-		<label for="user_pass"><?php _e( 'Password' ); ?><br />
+			<div class="user-pass-wrap">
-		<input type="password" name="pwd" id="user_pass"<?php echo $aria_describedby_error; ?> class="input" value="" size="20" /></label>
+				<label for="user_pass"><?php _e( 'Password' ); ?></label>
-	</p>
+				<div class="wp-pwd">
+					<input type="password" name="pwd" id="user_pass"<?php echo $aria_describedby_error; ?> class="input password-input" value="" size="20" />
+					<button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Show password' ); ?>">
+						<span class="dashicons dashicons-visibility" aria-hidden="true"></span>
+					</button>
+				</div>
+			</div>
+			<?php
+			/**
+			 * Fires following the 'Password' field in the login form.
+			 *
+			 * @since 2.1.0
+			 */
+			do_action( 'login_form' );
+			?>
+			<p class="forgetmenot"><input name="rememberme" type="checkbox" id="rememberme" value="forever" <?php checked( $rememberme ); ?> /> <label for="rememberme"><?php esc_html_e( 'Remember Me' ); ?></label></p>
+			<p class="submit">
+				<input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e( 'Log In' ); ?>" />
+				<?php
+				if ( $interim_login ) {
+					?>
+					<input type="hidden" name="interim-login" value="1" />
+					<?php
+				} else {
+					?>
+					<input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
+					<?php
+				}
+				if ( $customize_login ) {
+					?>
+					<input type="hidden" name="customize-login" value="1" />
+					<?php
+				}
+				?>
+				<input type="hidden" name="testcookie" value="1" />
+			</p>
+		</form>
 		<?php
-		/**
-		 * Fires following the 'Password' field in the login form.
+		if ( ! $interim_login ) {
-		 *
+			?>
-		 * @since 2.1.0
+			<p id="nav">
-		 */
+				<?php
-		do_action( 'login_form' );
-		?>
+				if ( get_option( 'users_can_register' ) ) {
-	<p class="forgetmenot"><label for="rememberme"><input name="rememberme" type="checkbox" id="rememberme" value="forever" <?php checked( $rememberme ); ?> /> <?php esc_html_e( 'Remember Me' ); ?></label></p>
-	<p class="submit">
-		<input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e( 'Log In' ); ?>" />
-		<?php	if ( $interim_login ) { ?>
-		<input type="hidden" name="interim-login" value="1" />
-	<?php	} else { ?>
-		<input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
-	<?php } ?>
-		<?php if ( $customize_login ) : ?>
-		<input type="hidden" name="customize-login" value="1" />
-	<?php endif; ?>
-		<input type="hidden" name="testcookie" value="1" />
-	</p>
-	</form>
-		<?php if ( ! $interim_login ) { ?>
-	<p id="nav">
-			<?php
-			if ( ! isset( $_GET['checkemail'] ) || ! in_array( $_GET['checkemail'], array( 'confirm', 'newpass' ) ) ) :
-				if ( get_option( 'users_can_register' ) ) :
 					$registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
 					/** This filter is documented in wp-includes/general-template.php */
 					echo apply_filters( 'register', $registration_url );
 					echo esc_html( $login_link_separator );
-				endif;
+				}
 				?>
-		<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a>
+				<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a>
-			<?php endif; ?>
+			</p>
-	</p>
+			<?php
-	<?php } ?>
+		}
-	<script type="text/javascript">
+		$login_script  = 'function wp_attempt_focus() {';
-	function wp_attempt_focus(){
+		$login_script .= 'setTimeout( function() {';
-	setTimeout( function(){ try{
+		$login_script .= 'try {';
-		<?php if ( $user_login ) { ?>
-	d = document.getElementById('user_pass');
+		if ( $user_login ) {
-	d.value = '';
+			$login_script .= 'd = document.getElementById( "user_pass" ); d.value = "";';
-	<?php } else { ?>
+		} else {
-	d = document.getElementById('user_login');
+			$login_script .= 'd = document.getElementById( "user_login" );';
-			<?php if ( 'invalid_username' == $errors->get_error_code() ) { ?>
-	if( d.value != '' )
+			if ( $errors->get_error_code() === 'invalid_username' ) {
-	d.value = '';
+				$login_script .= 'd.value = "";';
-				<?php
+			}
-			}
+		}
-	}
-	?>
+		$login_script .= 'd.focus(); d.select();';
-	d.focus();
+		$login_script .= '} catch( er ) {}';
-	d.select();
+		$login_script .= '}, 200);';
-	} catch(e){}
+		$login_script .= "}\n"; // End of wp_attempt_focus().
-	}, 200);
-	}
-		<?php
 		/**
 		 * Filters whether to print the call to `wp_attempt_focus()` on the login screen.
 		 *
 		 * @since 4.8.0
 		 *
 		 * @param bool $print Whether to print the function call. Default true.
 		 */
 		if ( apply_filters( 'enable_login_autofocus', true ) && ! $error ) {
+			$login_script .= "wp_attempt_focus();\n";
+		}
+		// Run `wpOnload()` if defined.
+		$login_script .= "if ( typeof wpOnload === 'function' ) { wpOnload() }";
+		?>
+		<script type="text/javascript">
+			<?php echo $login_script; ?>
+		</script>
+		<?php
+		if ( $interim_login ) {
 			?>
-	wp_attempt_focus();
+			<script type="text/javascript">
-		<?php } ?>
+			( function() {
-	if(typeof wpOnload=='function')wpOnload();
+				try {
-		<?php if ( $interim_login ) { ?>
+					var i, links = document.getElementsByTagName( 'a' );
-	(function(){
+					for ( i in links ) {
-	try {
+						if ( links[i].href ) {
-		var i, links = document.getElementsByTagName('a');
+							links[i].target = '_blank';
-		for ( i in links ) {
+							links[i].rel = 'noreferrer noopener';
-			if ( links[i].href )
+						}
-				links[i].target = '_blank';
+					}
-		}
+				} catch( er ) {}
-	} catch(e){}
+			}());
-	}());
+			</script>
-	<?php } ?>
+			<?php
-	</script>
+		}
-		<?php
 		login_footer();
 		break;
 } // End action switch.

changeset 16	a86126ab1dd4
parent 9	177826044cd9
child 18	be944660c56a