Index: wp-admin/admin-ajax.php =================================================================== --- wp-admin/admin-ajax.php (revision 19268) +++ wp-admin/admin-ajax.php (working copy) @@ -936,8 +936,8 @@ $message = sprintf( __('Draft saved at %s.'), date_i18n( $draft_saved_date_format ) ); $supplemental = array(); - if ( isset($login_grace_period) ) - $alert .= sprintf( __('Your login has expired. Please open a new browser window and log in again. '), add_query_arg( 'interim-login', 1, wp_login_url() ) ); + if ( isset($login_expiration_warning) ) + $alert .= _wp_login_expiration_message(false); $id = $revision_id = 0; Index: wp-admin/includes/misc.php =================================================================== --- wp-admin/includes/misc.php (revision 19268) +++ wp-admin/includes/misc.php (working copy) @@ -593,3 +593,31 @@ } add_action('admin_head', '_ipad_meta'); + +function wp_warn_login_expires($cookie_elements) { + global $login_expiration_warning; + + if ( strpos( $_SERVER['REQUEST_URI'], 'wp-login.php' ) !== false ) + return; + + if ( $cookie_elements['expiration'] < time() + 7200 ) { // less than 2 hours untill expiration + if ( empty($_POST) && !defined('DOING_AJAX') ) { + wp_redirect( add_query_arg( 'interim-login', 1, wp_login_url( $_SERVER['REQUEST_URI'], true ) ) ); + die; + } + + $login_expiration_warning = true; + add_action('all_admin_notices', '_wp_login_expiration_message'); + } +} +add_action('auth_cookie_valid', 'wp_warn_login_expires', 10, 1); + +function _wp_login_expiration_message($echo = true) { + $return = sprintf( __('Your login session will expire shortly. Please log in again. '), add_query_arg( 'interim-login', 2, wp_login_url('', true) ) ); + + if ( !$echo ) + return $return; + + echo $return; +} + Index: wp-includes/js/autosave.dev.js =================================================================== --- wp-includes/js/autosave.dev.js (revision 19268) +++ wp-includes/js/autosave.dev.js (working copy) @@ -109,6 +109,9 @@ delayed_autosave(); }); } + + // remove div#autosave-alert onclick + $('#wpcontent').delegate('#autosave-alert a', 'click', function(e){ $(e.target).closest('#autosave-alert').remove(); }); }); function autosave_parse_response(response) { Index: wp-includes/pluggable.php =================================================================== --- wp-includes/pluggable.php (revision 19268) +++ wp-includes/pluggable.php (working copy) @@ -542,8 +542,8 @@ return false; } - if ( $expiration < time() ) // AJAX/POST grace period set above - $GLOBALS['login_grace_period'] = 1; + if ( $expiration < (time() + 7200) ) // 2 hours before cookies expire + $GLOBALS['login_expiration_warning'] = 1; do_action('auth_cookie_valid', $cookie_elements, $user); Index: wp-login.php =================================================================== --- wp-login.php (revision 19268) +++ wp-login.php (working copy) @@ -118,8 +118,11 @@ * @param string $input_id Which input to auto-focus */ function login_footer($input_id = '') { - ?> -

+ global $interim_login; + + if ( empty($interim_login) ) { ?> +

@@ -534,7 +537,7 @@ case 'login' : default: $secure_cookie = ''; - $interim_login = isset($_REQUEST['interim-login']); + $interim_login = isset($_REQUEST['interim-login']) ? (int) $_REQUEST['interim-login'] : 0; // 1 = show login message, 2 = no redir after login // If the user wants ssl but the session is not ssl, force a secure cookie. if ( !empty($_POST['log']) && !force_ssl_admin() ) { @@ -568,17 +571,14 @@ $redirect_to = apply_filters('login_redirect', $redirect_to, isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '', $user); + if ( !is_wp_error($user) && 2 == $interim_login ) { + $message = '

' . __('You have logged in successfully. Close this browser window or tab and return to writing.') . '

'; + login_header( '', $message ); + echo ''; + exit; + } + if ( !is_wp_error($user) && !$reauth ) { - if ( $interim_login ) { - $message = '

' . __('You have logged in successfully.') . '

'; - login_header( '', $message ); ?> - -

-

- -ID) && !is_super_admin( $user->ID ) ) @@ -612,13 +612,15 @@ $errors->add('newpass', __('Check your e-mail for your new password.'), 'message'); elseif ( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] ) $errors->add('registered', __('Registration complete. Please check your e-mail.'), 'message'); - elseif ( $interim_login ) - $errors->add('expired', __('Your session has expired. Please log-in again.'), 'message'); // Clear any stale cookies. - if ( $reauth ) + if ( $reauth ) { wp_clear_auth_cookie(); + if ( $interim_login ) + $errors->add('expired', __('Please log in again to extend your session.'), 'message'); + } + login_header(__('Log In'), '', $errors); if ( isset($_POST['log']) ) @@ -640,10 +642,9 @@

- - + + -