Changeset 23504

Timestamp:

02/28/2013 08:57:17 AM (13 years ago)

Author:

azaozz

Message:

Improved logged out warnings, first run, props mintindeed, see #23295

Location:

trunk

Files:

• wp-admin/css/wp-admin.css (modified) (1 diff)
• wp-includes/class-wp-auth-check.php (added)
• wp-includes/default-filters.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• wp-login.php (modified) (5 diffs)

trunk/wp-admin/css/wp-admin.css

@@ -6786 +6786 @@
 }
 
+.interim-login #login {
+    padding: 0;
+    width: 300px;
+}
+
+.interim-login.login h1 a {
+    width: auto;
+}
+
+.interim-login #login_error,
+.interim-login.login .message {
+    margin: 0 0 16px;
+}
+
+.interim-login.login form {
+    margin: 0;
+}
 
 /* ms */

trunk/wp-includes/default-filters.php

@@ -295 +295 @@
 add_filter( 'heartbeat_settings', 'wp_heartbeat_settings' );
 
+// Check if the user is logged out
+add_action( 'admin_init', 'wp_auth_check_load' );
+
 unset($filter, $action);

trunk/wp-includes/functions.php

@@ -3885 +3885 @@
     return apply_filters( 'wp_checkdate', checkdate( $month, $day, $year ), $source_date );
 }
+
+/**
+ * Load the auth check, for monitoring whether the user is still logged in
+ *
+ * @since 3.6.0
+ *
+ * @return void
+ */
+function wp_auth_check_load() {
+    if ( ! class_exists('WP_Auth_Check') ) {
+        require( ABSPATH . WPINC . '/class-wp-auth-check.php' );
+        WP_Auth_Check::get_instance();
+    }
+}

trunk/wp-login.php

@@ -52 +52 @@
     $shake_error_codes = apply_filters( 'shake_error_codes', $shake_error_codes );
 
-    if ( $shake_error_codes && $wp_error->get_error_code() && in_array( $wp_error->get_error_code(), $shake_error_codes ) )
+    if ( ! $interim_login && $shake_error_codes && $wp_error->get_error_code() && in_array( $wp_error->get_error_code(), $shake_error_codes ) )
         add_action( 'login_head', 'wp_shake_js', 12 );
 
@@ -83 +83 @@
     $login_header_title = apply_filters( 'login_headertitle', $login_header_title );
 
-    // Don't allow interim logins to navigate away from the page.
-    if ( $interim_login )
-        $login_header_url = '#';
-
     $classes = array( 'login-action-' . $action, 'wp-core-ui' );
     if ( wp_is_mobile() )
@@ -92 +88 @@
     if ( is_rtl() )
         $classes[] = 'rtl';
+    if ( $interim_login ) {
+        // Don't allow interim logins to navigate away from the page.
+        $login_header_url = '#';
+        $classes[] = 'interim-login';
+    }
+
     $classes = apply_filters( 'login_body_class', $classes, $action );
+
     ?>
     </head>
@@ -614 +617 @@
             $message = '<p class="message">' . __('You have logged in successfully.') . '</p>';
             login_header( '', $message ); ?>
-
-            <?php if ( ! $customize_login ) : ?>
-            <script type="text/javascript">setTimeout( function(){window.close()}, 8000);</script>
-            <p class="alignright">
-            <input type="button" class="button-primary" value="<?php esc_attr_e('Close'); ?>" onclick="window.close()" /></p>
-            <?php endif; ?>
             </div>
             <?php do_action( 'login_footer' ); ?>
@@ -663 +660 @@
         $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');
+        $errors->add('expired', __('Please log-in again. You will not move away from this page.'), 'message');
     elseif ( strpos( $redirect_to, 'about.php?updated' ) )
         $errors->add('updated', __( '<strong>You have successfully updated WordPress!</strong> Please log back in to experience the awesomeness.' ), 'message' );