Changeset 21031 for trunk/wp-login.php

Timestamp:

06/08/2012 07:22:11 PM (14 years ago)

Author:

ryan

Message:

Customizer: Gravefully handle cookie expipration. Prompt for log in in the preview. Props ocean90, koopersmith, nacin. fixes #20876

File:

• trunk/wp-login.php (modified) (7 diffs)

trunk/wp-login.php

@@ -40 +40 @@
  */
 function login_header($title = 'Log In', $message = '', $wp_error = '') {
-    global $error, $interim_login, $current_site;
+    global $error, $interim_login, $current_site, $customize_login;
 
     // Don't index any of these forms
@@ -69 +69 @@
     }
 
+    if ( $customize_login )
+        wp_enqueue_script( 'customize-base' );
+
     do_action( 'login_enqueue_scripts' );
     do_action( 'login_head' );
@@ -82 +85 @@
     $login_header_url   = apply_filters( 'login_headerurl',   $login_header_url   );
     $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 = '#';
 
     ?>
@@ -127 +134 @@
  */
 function login_footer($input_id = '') {
-    ?>
+    global $interim_login;
+
+    // Don't allow interim logins to navigate away from the page.
+    if ( ! $interim_login ): ?>
     <p id="backtoblog"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php esc_attr_e( 'Are you lost?' ); ?>"><?php printf( __( '&larr; Back to %s' ), get_bloginfo( 'title', 'display' ) ); ?></a></p>
+    <?php endif; ?>
+
     </div>
 
@@ -556 +568 @@
     $secure_cookie = '';
     $interim_login = isset($_REQUEST['interim-login']);
+    $customize_login = isset( $_REQUEST['customize-login'] );
 
     // If the user wants ssl but the session is not ssl, force a secure cookie.
@@ -592 +605 @@
         if ( $interim_login ) {
             $message = '<p class="message">' . __('You have logged in successfully.') . '</p>';
-            login_header( '', $message ); ?>
-            <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>
-            </div></body></html>
+            login_header( '', $message );
+
+            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');
+
+            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;
         }
@@ -667 +691 @@
         <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>