diff --git a/src/wp-admin/css/login.css b/src/wp-admin/css/login.css index 329cf01f60..e276d9522b 100644 --- a/src/wp-admin/css/login.css +++ b/src/wp-admin/css/login.css @@ -134,6 +134,19 @@ p { box-shadow: 0 1px 3px rgba(0, 0, 0, 0.13); } +.login-action-confirm_admin_email #login { + width: 60vw; + margin-top: -2vh; + +} + +@media screen and (max-width: 700px) { + .login-action-confirm_admin_email #login { + width: 100vw; + margin-top: -2vh; + } +} + .login form .forgetmenot { font-weight: 400; float: left; @@ -144,6 +157,45 @@ p { float: right; } +.login .adminemailconfirmform .submit { + text-align: center; +} + +.admin-email__later { + text-align: left; +} + +#login form p.admin-email__details { + margin-bottom: 20px; + margin-top: 20px; +} + +.admin-email__details--small { + font-size: .9em; +} + +.login h1.admin-email__heading { + border-bottom: 1px rgb(241, 241, 241) solid; + color: rgb(95, 95, 95); + font-weight: normal; + padding-bottom: 2%; + text-align: left; +} + +.login h2.admin-email__heading { + font-weight: normal; + padding-bottom: 1%; + padding-top: 3%; +} + +.admin-email__actions div { + padding-top: 2em; +} + +.login .adminemailconfirmform .button-primary { + float: none; +} + #login form p { margin-bottom: 0; } diff --git a/src/wp-includes/default-constants.php b/src/wp-includes/default-constants.php index a004c9e663..9c3efcae9b 100644 --- a/src/wp-includes/default-constants.php +++ b/src/wp-includes/default-constants.php @@ -138,6 +138,13 @@ function wp_initial_constants() { define( 'MONTH_IN_SECONDS', 30 * DAY_IN_SECONDS ); define( 'YEAR_IN_SECONDS', 365 * DAY_IN_SECONDS ); /**#@-*/ + + /** + * Admin email maximmum age + */ + if ( ! defined( 'ADMIN_EMAIL_MAX_AGE' ) ) { + define( 'ADMIN_EMAIL_MAX_AGE', 180 * DAY_IN_SECONDS ); + } } /** diff --git a/src/wp-includes/default-filters.php b/src/wp-includes/default-filters.php index ecdc87cb3a..82ca0ef294 100644 --- a/src/wp-includes/default-filters.php +++ b/src/wp-includes/default-filters.php @@ -428,6 +428,7 @@ add_filter( 'authenticate', 'wp_authenticate_spam_check', 99 ); add_filter( 'determine_current_user', 'wp_validate_auth_cookie' ); add_filter( 'determine_current_user', 'wp_validate_logged_in_cookie', 20 ); +add_filter( 'login_redirect', 'wp_confirm_admin_email', 20, 3 ); // Split term updates. add_action( 'admin_init', '_wp_check_for_scheduled_split_terms' ); diff --git a/src/wp-includes/user.php b/src/wp-includes/user.php index 3819f21f6f..64457b0eba 100644 --- a/src/wp-includes/user.php +++ b/src/wp-includes/user.php @@ -187,6 +187,28 @@ function wp_authenticate_username_password( $user, $username, $password ) { return $user; } +function wp_confirm_admin_email( $redirect_to, $requested_redirect_to, $user ) { + + if ( ! is_a ( $user , 'WP_User' ) || ! $user->exists() ) { + return $redirect_to; + } + + if ( ! $user->has_cap( 'manage_options' ) ) { + return $redirect_to; + } + + $admin_email_lifespan = get_option( 'admin_email_lifespan' ); + + if ( ! empty( $admin_email_lifespan ) ) { + if ( time() < $admin_email_lifespan ) { + return $redirect_to; + } + } + + return wp_login_url( $redirect_to ) . '&' . 'action=confirm_admin_email'; + +} + /** * Authenticates a user using the email and password. * diff --git a/src/wp-login.php b/src/wp-login.php index 5ecf5f0dbf..4052de5024 100644 --- a/src/wp-login.php +++ b/src/wp-login.php @@ -11,6 +11,8 @@ /** Make sure that the WordPress bootstrap has run before continuing. */ require( dirname( __FILE__ ) . '/wp-load.php' ); + delete_option( 'admin_email_lifespan' ); + // Redirect to HTTPS login if forced to use SSL. if ( force_ssl_admin() && ! is_ssl() ) { if ( 0 === strpos( $_SERVER['REQUEST_URI'], 'http' ) ) { @@ -444,7 +446,7 @@ function retrieve_password() { } // 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, array( 'confirm_admin_email', 'postpass', 'logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login', 'confirmaction', WP_Recovery_Mode_Link_Service::LOGIN_ACTION_ENTERED ), true ) && false === has_filter( 'login_form_' . $action ) ) { $action = 'login'; } @@ -501,6 +503,132 @@ function retrieve_password() { $login_link_separator = apply_filters( 'login_link_separator', ' | ' ); switch ( $action ) { + + case 'confirm_admin_email': + + if( ! is_user_logged_in() ) { + wp_safe_redirect( wp_login_url( $redirect_to ) ); + } + + 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 ); + } + + $admin_email_lifespan = time() + ADMIN_EMAIL_MAX_AGE; + $admin_email_remind_in = time() + round ( ADMIN_EMAIL_MAX_AGE/4 ); + + if ( ! empty( $_GET[ 'remind_me_later' ] ) ) { + update_option( 'admin_email_lifespan', $admin_email_remind_in ); + wp_safe_redirect( $redirect_to ); + } + + if ( ! empty( $_POST[ 'correct_email' ] ) ) { + update_option( 'admin_email_lifespan', $admin_email_lifespan ); + wp_safe_redirect( $redirect_to ); + } + + /** + * Fires before the admin email confirm form. + * + * @since 5.2.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( 'confirm_admin_email' ); + + login_header( __( 'Confirm your admin email' ), '', $errors ); + ?> + +
+ + + +

+ +

+

+ general admin email for this website is still correct.' ); + ?> + + + +

+

+ +

+

+ general admin email:' ); ?> +

+ +

+ +

+

+ + + + +

+ +
+
+ + + + + +
+
+

+ + +

+
+ +
+
+ +