Changeset 21031

Timestamp:

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

Author:

ryan

Message:

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

Location:

trunk

Files:

• wp-admin/css/customize-controls.dev.css (modified) (1 diff)
• wp-admin/customize.php (modified) (2 diffs)
• wp-admin/js/customize-controls.dev.js (modified) (4 diffs)
• wp-includes/class-wp-customize-manager.php (modified) (3 diffs)
• wp-includes/script-loader.php (modified) (1 diff)
• wp-login.php (modified) (7 diffs)

trunk/wp-admin/css/customize-controls.dev.css

@@ -515 +515 @@
 }
 
+/**
+ * Handle cheaters.
+ */
+body.cheatin {
+    min-width: 0;
+    background: #f9f9f9;
+    padding: 50px;
+}
+
+body.cheatin p {
+    max-width: 700px;
+    margin: 0 auto;
+    padding: 2em;
+    font-size: 14px;
+
+    background: #fff;
+    border: 1px solid #dfdfdf;
+
+    -webkit-border-radius: 3px;
+    border-radius:         3px;
+}

trunk/wp-admin/customize.php

@@ -149 +149 @@
     ), home_url( '/' ) );
 
+    $login_url = add_query_arg( array(
+        'interim-login' => 1,
+        'customize-login' => 1
+    ), wp_login_url() );
+
     $settings = array(
         'theme'    => array(
@@ -163 +168 @@
             'fallback'      => $fallback_url,
             'home'          => esc_url( home_url( '/' ) ),
+            'login'         => $login_url,
         ),
         'browser'  => array(

trunk/wp-admin/js/customize-controls.dev.js

@@ -332 +332 @@
                 if ( location && location != self.url() ) {
                     deferred.rejectWith( self, [ 'redirect', location ] );
+                    return;
+                }
+
+                // Check if the user is not logged in.
+                if ( '0' === response ) {
+                    deferred.rejectWith( self, [ 'logged out' ] );
+                    return;
+                }
+
+                // Check for cheaters.
+                if ( '-1' === response ) {
+                    deferred.rejectWith( self, [ 'cheatin' ] );
                     return;
                 }
@@ -549 +561 @@
                 if ( 'redirect' === reason && location )
                     self.url( location );
-            });
+
+                if ( 'logged out' === reason ) {
+                    if ( self.iframe ) {
+                        self.iframe.destroy();
+                        delete self.iframe;
+                    }
+
+                    self.login().done( self.refresh );
+                }
+
+                if ( 'cheatin' === reason )
+                    self.cheatin();
+            });
+        },
+
+        login: function() {
+            var previewer = this,
+                deferred, messenger, iframe;
+
+            if ( this._login )
+                return this._login;
+
+            deferred = $.Deferred();
+            this._login = deferred.promise();
+
+            messenger = new api.Messenger({
+                channel: 'login',
+                url:     api.settings.url.login
+            });
+
+            iframe = $('<iframe src="' + api.settings.url.login + '" />').appendTo( this.container );
+
+            messenger.targetWindow( iframe[0].contentWindow );
+
+            messenger.bind( 'login', function() {
+                iframe.remove();
+                messenger.destroy();
+                delete previewer._login;
+                deferred.resolve();
+            });
+
+            return this._login;
+        },
+
+        cheatin: function() {
+            $( document.body ).empty().addClass('cheatin').append( '<p>' + api.l10n.cheatin + '</p>' );
         }
     });
@@ -606 +663 @@
 
             save: function() {
-                var query = $.extend( this.query(), {
+                var self  = this,
+                    query = $.extend( this.query(), {
                         action: 'customize_save',
                         nonce:  this.nonce
@@ -620 +678 @@
                 });
 
-                request.done( function() {
+                request.done( function( response ) {
+                    // Check if the user is logged out.
+                    if ( '0' === response ) {
+                        self.iframe.iframe.hide();
+                        self.login().done( function() {
+                            self.save();
+                            self.iframe.iframe.show();
+                        });
+                        return;
+                    }
+
+                    // Check for cheaters.
+                    if ( '-1' === response ) {
+                        self.cheatin();
+                        return;
+                    }
+
                     api.trigger( 'saved' );
                 });

trunk/wp-includes/class-wp-customize-manager.php

@@ -32 +32 @@
         require( ABSPATH . WPINC . '/class-wp-customize-control.php' );
 
+        add_filter( 'wp_die_handler', array( $this, 'wp_die_handler' ) );
+
         add_action( 'setup_theme',  array( $this, 'setup_theme' ) );
         add_action( 'wp_loaded',    array( $this, 'wp_loaded' ) );
@@ -53 +55 @@
     }
 
-    /**
-     * Start preview and customize theme.
-     *
-     * Check if customize query variable exist. Init filters to filter the current theme.
+    /**
+     * Return true if it's an AJAX request.
+     *
+     * @since 3.4.0
+     */
+    public function doing_ajax() {
+        return isset( $_POST['customized'] ) || ( defined( 'DOING_AJAX' ) && DOING_AJAX );
+    }
+
+    /**
+     * Custom wp_die wrapper. Returns either the standard message for UI
+     * or the AJAX message.
+     *
+     * @param  mixed $ajax_message AJAX return
+     * @param  mixed $message      UI message
+     *
+     * @since 3.4.0
+     */
+    private function wp_die( $ajax_message, $message ) {
+        if ( $this->doing_ajax() )
+            wp_die( $ajax_message );
+
+        wp_die( $message );
+    }
+
+    /**
+     * Return the AJAX wp_die() handler if it's a customized request.
+     *
+     * @since 3.4.0
+     */
+    public function wp_die_handler() {
+        if ( $this->doing_ajax() )
+            return '_ajax_wp_die_handler';
+
+        return '_default_wp_die_handler';
+    }
+    /**
+    * Start preview and customize theme.
+    *
+    * Check if customize query variable exist. Init filters to filter the current theme.
      *
      * @since 3.4.0
      */
     public function setup_theme() {
-        if ( is_admin() && ! defined( 'DOING_AJAX' ) )
-            auth_redirect();
+        if ( is_admin() && ! $this->doing_ajax() )
+            auth_redirect();
+        elseif ( $this->doing_ajax() && ! is_user_logged_in())
+            wp_die( 0 );
 
         send_origin_headers();
@@ -72 +112 @@
         // You can't preview a theme if it doesn't exist, or if it is not allowed (unless active).
         if ( ! $this->theme->exists() )
-            wp_die( __( 'Cheatin’ uh?' ) );
+            $this->wp_die( -1, __( 'Cheatin’ uh?' ) );
 
         if ( $this->theme->get_stylesheet() != get_stylesheet() && ( ! $this->theme()->is_allowed() || ! current_user_can( 'switch_themes' ) ) )
-            wp_die( __( 'Cheatin’ uh?' ) );
+            $this->wp_die( -1, __( 'Cheatin’ uh?' ) );
 
         if ( ! current_user_can( 'edit_theme_options' ) )
-            wp_die( __( 'Cheatin’ uh?' ) );
+            $this->wp_die( -1, __( 'Cheatin’ uh?' ) );
 
         $this->start_previewing_theme();

trunk/wp-includes/script-loader.php

@@ -306 +306 @@
         'cancel'    => __( 'Cancel' ),
         'close'     => __( 'Close' ),
+        'cheatin'   => __( 'Cheatin’ uh?' ),
     ) );
 

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>