Changeset 24179

Timestamp:

05/06/2013 09:35:50 PM (13 years ago)

Author:

azaozz

Message:

Logged out warnings:

• Don't remove login error messages coming from wp_signon().
• When the login form is shown in iframe, open all links in a new tab/window.
• Add filter for the login form error message.

See #23295

Location:

trunk

Files:

• wp-includes/js/wp-auth-check.js (modified) (2 diffs)
• wp-login.php (modified) (7 diffs)

trunk/wp-includes/js/wp-auth-check.js

@@ -12 +12 @@
                         });
 
-                        // Add 'sandbox' for browsers that support it, only restrict access to the top window.
-                        frame = $('<iframe id="wp-auth-check-frame" sandbox="allow-same-origin allow-forms allow-scripts" frameborder="0">').attr( 'title', noframe.text() );
+                        frame = $('<iframe id="wp-auth-check-frame" frameborder="0">').attr( 'title', noframe.text() );
                         frame.load( function(e) {
                                 var height, body;
@@ -26 +25 @@
                                         form.remove();
                                         noframe.focus();
+                                        return;
                                 }
 

trunk/wp-login.php

@@ -49 +49 @@
 
         // Shake it!
-        $shake_error_codes = array( 'interim_login_error', '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' );
         $shake_error_codes = apply_filters( 'shake_error_codes', $shake_error_codes );
 
@@ -98 +98 @@
                 $classes[] = 'rtl';
         if ( $interim_login ) {
-                // Don't allow interim logins to navigate away from the page.
-                $login_header_url = '#';
                 $classes[] = 'interim-login';
                 ?>
                 <style type="text/css">html{background-color: transparent;}</style>
+                <base target="_blank">
                 <?php
 
@@ -405 +404 @@
 
 $http_post = ('POST' == $_SERVER['REQUEST_METHOD']);
+$interim_login = isset($_REQUEST['interim-login']);
+
 switch ($action) {
 
@@ -591 +592 @@
 default:
         $secure_cookie = '';
-        $interim_login = isset($_REQUEST['interim-login']);
         $customize_login = isset( $_REQUEST['customize-login'] );
         if ( $customize_login )
@@ -664 +664 @@
                 $errors->add('test_cookie', __("<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href='http://www.google.com/cookies.html'>enable cookies</a> to use WordPress."));
 
-        // Clear most errors if interim login
+        $form_target = '';
         if ( $interim_login ) {
-                $error_code = $errors->get_error_code();
-                $errors = new WP_Error();
-
-                if ( $error_code ) {
-                        if ( in_array( $error_code, array( 'empty_password', 'empty_username', 'invalid_username', 'incorrect_password' ) ) )
-                                $errors->add('interim_login_error', __('<strong>ERROR</strong>: Invalid username or password.'));
-                        else
-                                $errors->add('interim_login_error_other', sprintf( __( '<strong>ERROR</strong>: Please contact the site administrator or try to <a href="%s" target="_blank">log in from a new window</a>.' ), wp_login_url() ) );
-                } else {
+                $form_target = ' target="_self"';
+                if ( ! $errors->get_error_code() )
                         $errors->add('expired', __('Session expired. Please log in again. You will not move away from this page.'), 'message');
-                }
         } else {
                 // Some parts of this script use the main login form to display a message
@@ -693 +685 @@
         }
 
+        $errors = apply_filters( 'wp_login_errors', $errors, $redirect_to );
+
         // Clear any stale cookies.
         if ( $reauth )
@@ -704 +698 @@
 ?>
 
-<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"<?php echo $form_target; ?>>
         <p>
                 <label for="user_login"><?php _e('Username') ?><br />