Ticket #23697: 23697-2.patch

wp-admin/css/wp-admin.css

@@ -3407 +3407 @@
         border-style: solid;
 }
 
+#notification-dialog {
+        position: fixed;
+        top: 30%;
+        left: 30%;
+        right: 30%;
+        padding: 20px;
+        background: #fff;
+        z-index: 1000005;
+}
+
+#notification-dialog-wrap {
+        position: fixed;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background-color: rgba(0, 0, 0, 0.5);
+        z-index: 1000000;
+}
+
+.post-locked-avatar {
+        float: left;
+        margin-right: 20px;
+}
+
+.currently-editing {
+        margin-bottom: 20px;
+}
+
 
 /*------------------------------------------------------------------------------
   11.1 - Custom Fields

wp-admin/includes/ajax-actions.php

@@ -1057 +1057 @@
                 $_POST['post_status'] = 'draft';
 
         if ( $last = wp_check_post_lock( $post->ID ) ) {
+                // This will change after we have per-user autosaves
                 $do_autosave = $do_lock = false;
 
                 $last_user = get_userdata( $last );
@@ -1064 +1065 @@
                 $data = __( 'Autosave disabled.' );
 
                 $supplemental['disable_autosave'] = 'disable';
-                $alert .= sprintf( __( '%s is currently editing this article. If you update it, you will overwrite the changes.' ), esc_html( $last_user_name ) );
         }
 
         if ( 'page' == $post->post_type ) {
@@ -1094 +1094 @@
                         $id = $post->ID;
         }
 
-        if ( $do_lock && empty( $_POST['auto_draft'] ) && $id && is_numeric( $id ) ) {
-                $lock_result = wp_set_post_lock( $id );
-                $supplemental['active-post-lock'] = implode( ':', $lock_result );
-        }
-
         if ( $nonce_age == 2 ) {
                 $supplemental['replace-autosavenonce'] = wp_create_nonce('autosave');
                 $supplemental['replace-getpermalinknonce'] = wp_create_nonce('getpermalink');
@@ -1777 +1772 @@
         if ( $active_lock[1] != get_current_user_id() )
                 wp_die( 0 );
 
-        $new_lock = ( time() - apply_filters( 'wp_check_post_lock_window', AUTOSAVE_INTERVAL * 2 ) + 5 ) . ':' . $active_lock[1];
+        $new_lock = ( time() - apply_filters( 'wp_check_post_lock_window', 120 ) + 5 ) . ':' . $active_lock[1];
         update_post_meta( $post_id, '_edit_lock', $new_lock, implode( ':', $active_lock ) );
         wp_die( 1 );
 }

wp-admin/includes/misc.php

@@ -586 +586 @@
         return $response;
 }
 add_filter( 'heartbeat_received', 'wp_check_locked_posts', 10, 2 );
+
+/**
+ * Check lock status on the New/Edit Post screen and refresh the lock
+ *
+ * @since 3.6
+ */
+function wp_refresh_post_lock( $response, $data, $screen_id ) {
+        if ( 'post' == $screen_id && array_key_exists( 'wp-refresh-post-lock', $data ) ) {
+                $received = $data['wp-refresh-post-lock'];
+                $send = array();
+
+                if ( !$post_id = absint( $received['post_id'] ) )
+                        return $response;
+
+                if ( !current_user_can('edit_post', $post_id) )
+                        return $response;
+
+                if ( $user_id = wp_check_post_lock( $post_id ) ) {
+                        $user = get_userdata( $user_id );
+                        $send['lock_error'] = '<div class="post-locked-avatar">' . get_avatar( $user->ID, 64 ) . '</div>' .
+                                '<p>' . sprintf( __( '%s has taken over and is currently editing.' ), $user->display_name ) . '</p>';
+                } else {
+                        if ( $new_lock = wp_set_post_lock( $post_id ) )
+                                $send['new_lock'] = implode( ':', $new_lock );
+                }
+
+                $response['wp-refresh-post-lock'] = $send;
+        }
+
+        return $response;
+}
+add_filter( 'heartbeat_received', 'wp_refresh_post_lock', 10, 3 );

wp-admin/includes/post.php

@@ -1162 +1162 @@
         $time = $lock[0];
         $user = isset( $lock[1] ) ? $lock[1] : get_post_meta( $post->ID, '_edit_last', true );
 
-        $time_window = apply_filters( 'wp_check_post_lock_window', AUTOSAVE_INTERVAL * 2 );
+        $time_window = apply_filters( 'wp_check_post_lock_window', 120 );
 
         if ( $time && $time > time() - $time_window && $user != get_current_user_id() )
                 return $user;
@@ -1192 +1192 @@
 }
 
 /**
- * Outputs the notice message to say that someone else is editing this post at the moment.
+ * Outputs the HTML for the notice to say that someone else is editing or has taken over editing of this post.
  *
  * @since 2.8.5
  * @return none
  */
 function _admin_notice_post_locked() {
-        $post = get_post();
-        $lock = explode( ':', get_post_meta( $post->ID, '_edit_lock', true ) );
-        $user = isset( $lock[1] ) ? $lock[1] : get_post_meta( $post->ID, '_edit_last', true );
-        $last_user = get_userdata( $user );
-        $last_user_name = $last_user ? $last_user->display_name : __('Somebody');
+        global $post_ID;
 
-        switch ($post->post_type) {
-                case 'post':
-                        $message = __( 'Warning: %s is currently editing this post' );
-                        break;
-                case 'page':
-                        $message = __( 'Warning: %s is currently editing this page' );
-                        break;
-                default:
-                        $message = __( 'Warning: %s is currently editing this.' );
+        if ( $post_ID && ( $user = wp_check_post_lock( $post_ID ) ) ) {
+                $user = get_userdata( $user );
+
+                $message = sprintf( __( 'This content is currently locked. If you take over, %s will be blocked from continuing to edit.' ), $user->display_name );
+        } else {
+                $message = '';
+        }
+
+        ?>
+        <div id="notification-dialog-wrap"<?php if ( ! $message ) echo ' style="display:none"'; ?>>
+        <div id="notification-dialog">
+        <?php
+
+        if ( $message ) {
+                ?>
+                <div class="post-locked-message">
+                        <div class="post-locked-avatar"><?php echo get_avatar( $user->ID, 64 ) ?></div>
+                        <p><?php echo esc_html( $message ); ?></p>
+                        <p>
+                        <a class="button" href="<?php echo esc_url( wp_get_referer() ); ?>"><?php _e('Go back'); ?></a>
+                        <a class="button button-primary" href="<?php echo esc_url( add_query_arg( 'get-post-lock', '1', get_edit_post_link( $post_ID, 'url' ) ) ); ?>"><?php _e('Take over'); ?></a>
+                        </p>
+                </div>
+                <?php
+        } else {
+                ?>
+                <div class="post-taken-over">
+                        <p class="currently-editing"></p>
+                        <p><a class="button button-primary" href="<?php echo esc_url( admin_url('edit.php') ); ?>"><?php _e('Go to All Posts'); ?></a></p>
+                </div>
+                <?php
         }
 
-        $message = sprintf( $message, esc_html( $last_user_name ) );
-        echo "<div class='error'><p>$message</p></div>";
+        ?>
+        </div>
+        </div>
+        <?php
 }
 
 /**

wp-admin/js/post.js

@@ -251 +251 @@
         );
 };
 
-})(jQuery);
+$(document).on( 'heartbeat-send.refresh-lock', function( e, data ) {
+        var lock = $('#active_post_lock').val(), post_id = $('#post_ID').val(), send = {};
+
+        if ( !post_id )
+                return;
+
+        send['post_id'] = post_id;
+
+        if ( lock )
+                send['lock'] = lock;
+
+        data['wp-refresh-post-lock'] = send;
+});
+
+$(document).on( 'heartbeat-tick.refresh-lock', function( e, data ) {
+        var received;
+
+        if ( data['wp-refresh-post-lock'] ) {
+                received = data['wp-refresh-post-lock'];
+
+                if ( received['lock_error'] ) {
+                        // show "editing taken over" message
+                        var wrap = $('#notification-dialog-wrap');
+
+                        if ( !wrap.is(':visible') ) {
+                                autosave();
+                                wrap.find('p.currently-editing').html( received['lock_error'] );
+                                wrap.show();
+                        }
+                }
+
+                if ( received['new_lock'] )
+                        $('#active_post_lock').val( received['new_lock'].replace(/[^0-9:]+/, '') );
+        }
+});
+
+}(jQuery));
 
 jQuery(document).ready( function($) {
         var stamp, visibility, sticky = '', last = 0, co = $('#content');

wp-admin/post.php

@@ -147 +147 @@
         if ( 'trash' == $post->post_status )
                 wp_die( __('You can’t edit this item because it is in the Trash. Please restore it and try again.') );
 
+        if ( !empty( $_GET['get-post-lock'] ) ) {
+                wp_set_post_lock( $post_id );
+                wp_redirect( get_edit_post_link( $post_id, 'url' ) );
+                exit();
+        }
+
         $post_type = $post->post_type;
         if ( 'post' == $post_type ) {
                 $parent_file = "edit.php";
@@ -165 +171 @@
                 $post_new_file = "post-new.php?post_type=$post_type";
         }
 
-        if ( $last = wp_check_post_lock( $post->ID ) ) {
-                add_action('admin_notices', '_admin_notice_post_locked' );
-        } else {
+        if ( ! wp_check_post_lock( $post->ID ) ) {
                 $active_post_lock = wp_set_post_lock( $post->ID );
 
                 if ( 'attachment' !== $post_type )
                         wp_enqueue_script('autosave');
         }
 
+        add_action( 'admin_footer', '_admin_notice_post_locked' );
+
         $title = $post_type_object->labels->edit_item;
         $post = get_post($post_id, OBJECT, 'edit');
 
@@ -217 +223 @@
         if ( !current_user_can($post_type_object->cap->delete_post, $post_id) )
                 wp_die( __('You are not allowed to move this item to the Trash.') );
 
+        if ( $user_id = wp_check_post_lock( $post_id ) ) {
+                $user = get_userdata( $user_id );
+                wp_die( sprintf( __( 'You cannot move this item to the Trash. %s is currently editing.' ), $user->display_name ) );
+        }
+
         if ( ! wp_trash_post($post_id) )
                 wp_die( __('Error in moving to Trash.') );