Changeset 7103

Timestamp:

02/29/08 09:51:36 (8 months ago)

Author:

ryan

Message:

Post Edit Collision Detection from mdawaffe. fixes #6043

Files:

• trunk/wp-admin/admin-ajax.php (modified) (3 diffs)
• trunk/wp-admin/edit-form-advanced.php (modified) (2 diffs)
• trunk/wp-admin/edit-page-form.php (modified) (2 diffs)
• trunk/wp-admin/includes/post.php (modified) (2 diffs)
• trunk/wp-admin/includes/upgrade.php (modified) (2 diffs)
• trunk/wp-admin/page.php (modified) (1 diff)
• trunk/wp-admin/post.php (modified) (1 diff)
• trunk/wp-admin/wp-admin.css (modified) (1 diff)
• trunk/wp-includes/classes.php (modified) (1 diff)
• trunk/wp-includes/js/autosave.js (modified) (4 diffs)
• trunk/wp-includes/js/wp-ajax-response.js (added)
• trunk/wp-includes/js/wp-lists.js (modified) (7 diffs)
• trunk/wp-includes/script-loader.php (modified) (2 diffs)
• trunk/wp-includes/version.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -471 +471 @@
-case 'autosave' : // The name of this action is hardcoded in edit_post()
-    check_ajax_referer( 'autosave', 'autosavenonce' );
+    global $current_user;
+
-    $_POST['post_content'] = $_POST['content'];
-    $_POST['post_excerpt'] = $_POST['excerpt'];
@@ -479 +481 @@
-        unset($_POST['post_category']);
-
+    $do_autosave = (bool) $_POST['autosave'];
+    $do_lock = true;
+
+    $data = '<div class="updated"><p>' . sprintf( __('Saved at %s.'), date( __('g:i:s a'), current_time( 'timestamp', true ) ) ) . '</p></div>';
+
+    $supplemental = array();
+
+    $id = 0;
-    if($_POST['post_ID'] < 0) {
-        $_POST['temp_ID'] = $_POST['post_ID'];
-
-
-
-
-
+
+
-    } else {
-        $post_ID = (int) $_POST['post_ID'];
-        $_POST['ID'] = $post_ID;
-        $post = get_post($post_ID);
+
+        if ( $last = wp_check_post_lock( $post->ID ) ) {
+            $do_autosave = $do_lock = false;
+
+            $last_user = get_userdata( $last );
+            $last_user_name = $last_user ? $last_user->display_name : __( 'Someone' );
+            $data = new WP_Error( 'locked', sprintf(
+                $_POST['post_type'] == 'page' ? __( 'Autosave disabled: %s is currently editing this page.' ) : __( 'Autosave disabled: %s is currently editing this post.' ),
+                wp_specialchars( $last_user_name )
+            ) );
+
+            $supplemental['disable_autosave'] = 'disable';
+        }
+
-        if ( 'page' == $post->post_type ) {
-            if ( !current_user_can('edit_page', $post_ID) )
@@ -497 +518 @@
-                die(__('You are not allowed to edit this post.'));
-        }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-case 'autosave-generate-nonces' :
-    check_ajax_referer( 'autosave', 'autosavenonce' );

trunk/wp-admin/edit-form-advanced.php

@@ -56 +56 @@
-<input type="hidden" name="post_author" value="<?php echo attribute_escape( $post->post_author ); ?>" />
-<input type="hidden" id="post_type" name="post_type" value="<?php echo $post->post_type ?>" />
+<input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo $post->post_status ?>" />
+<input name="referredby" type="hidden" id="referredby" value="<?php
+if ( !empty($_REQUEST['popupurl']) )
+    echo clean_url(stripslashes($_REQUEST['popupurl']));
+else if ( url_to_postid(wp_get_referer()) == $post_ID )
+    echo 'redo';
+else
+    echo clean_url(stripslashes(wp_get_referer()));
+?>" />
-
-<?php echo $form_extra ?>
@@ -190 +199 @@
-<?php echo $form_prevstatus ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-<div id="tagsdiv" class="postbox <?php echo postbox_classes('tagsdiv', 'post'); ?>">

trunk/wp-admin/edit-page-form.php

@@ -37 +37 @@
-<?php echo $form_extra ?>
-<input type="hidden" id="post_type" name="post_type" value="<?php echo $post->post_type ?>" />
+<input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo $post->post_status ?>" />
-<input name="referredby" type="hidden" id="referredby" value="<?php
-if ( url_to_postid(wp_get_referer()) == $post_ID )
@@ -170 +171 @@
-</div>
-
-
-
-
-
-
+
-
-<?php do_meta_boxes('page', 'normal', $post); ?>

trunk/wp-admin/includes/post.php

@@ -19 +19 @@
-        $now = time();
-        $then = strtotime($post->post_date_gmt . ' +0000');
-
-
+
-        if ( ($now - $then) < $delta )
-            return $post_ID;
@@ -620 +619 @@
-}
-
+// false: not locked or locked by current user
+// int: user ID of user with lock
+function wp_check_post_lock( $post_id ) {
+    global $current_user;
+
+    if ( !$post = get_post( $post_id ) )
+        return false;
+
+    $lock = get_post_meta( $post->ID, '_edit_lock', true );
+    $last = get_post_meta( $post->ID, '_edit_last', true );
+
+    $time_window = apply_filters( 'wp_check_post_lock_window', get_option( 'autosave_interval' ) * 2 );
+
+    if ( $lock && $lock > time() - $time_window && $last != $current_user->ID )
+        return $last;
+    return false;
+}
+
+function wp_set_post_lock( $post_id ) {
+    global $current_user;
+    if ( !$post = get_post( $post_id ) )
+        return false;
+    if ( !$current_user || !$current_user->ID )
+        return false;
+    
+    $now = time();
+
+    if ( !add_post_meta( $post->ID, '_edit_lock', $now, true ) )
+        update_post_meta( $post->ID, '_edit_lock', $now );
+    if ( !add_post_meta( $post->ID, '_edit_last', $current_user->ID, true ) )
+        update_post_meta( $post->ID, '_edit_last', $current_user->ID );
+}
+
-?>

trunk/wp-admin/includes/upgrade.php

@@ -199 +199 @@
-        upgrade_230_old_tables();
-
-6689
+7098
-        upgrade_250();
-
@@ -726 +726 @@
-        populate_roles_250();
-    }
+
+    add_option('autosave_interval', 60);
-}
-

trunk/wp-admin/page.php

@@ -58 +58 @@
-    wp_enqueue_script('thickbox');
-    wp_enqueue_script('media-upload');
-
-
+
+
+
+
+
+
+
+
-        wp_enqueue_script('autosave');
+    }
-
-    require_once('admin-header.php');

trunk/wp-admin/post.php

@@ -67 +67 @@
-    wp_enqueue_script('thickbox');
-    wp_enqueue_script('media-upload');
-
-
+
+
+
+
+
+
+
+
-        wp_enqueue_script('autosave');
+    }
-
-    require_once('admin-header.php');

trunk/wp-admin/wp-admin.css

@@ -1032 +1032 @@
-    margin-bottom: 10px;
-    margin-right: 8px;
+}
+
+#poststuff #autosave {
+    margin: 0;
+    padding: 0;
+}
+
+#poststuff #autosave div.updated, #poststuff #autosave div.error {
+    margin: 0 8px 10px 20px;
-}
-

trunk/wp-includes/classes.php

@@ -778 +778 @@
-
-        $s = '';
-
+ {
-            foreach ( $supplemental as $k => $v )
-                $s .= "<$k><![CDATA[$v]]></$k>";
+            $s = "<supplemental>$s</supplemental>";
+        }
-
-        if ( false === $action )

trunk/wp-includes/js/autosave.js

@@ -2 +2 @@
-var autosavePeriodical;
-
-
-
-
-
+
+
+
-
-    //Disable autosave after the form has been submitted
-
-
-
-
-
+
-
-
-jQuery
-jQuery(this).val().length % 15 ) && 1 > parseInt(jQuery
+.  Why?  Should this only be run once?
+$
+$(this).val().length % 15 ) && 1 > parseInt($
-            setTimeout(autosave, 5000);
-    });
-
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
+// called when autosaving new post
-function autosave_update_post_ID(response) {
-
-
+
-
-if(isNaN(res)) {
-   message = autosaveL10n.errorText.replace(/%response%/g, response);
-} else if( res > 0 ) {
-message = autosaveL10n.saveText.replace(/%time%/g, autosave_cur_time());
-jQuery('#post_ID').attr({name: "post_ID"});
-jQuery('#post_ID').val(res
-// We need new nonces
-jQuery.post(autosaveL10n.requestFile, {
-action: "autosave-generate-nonces",
-post_ID: res
-autosavenonce: jQuery('#autosavenonce').val()
-post_type: jQuery('#post_type').val()
-}, function(html) {
-jQuery('#_wpnonce').val(html);
-}
-jQuery('#hiddenaction').val('editpost'
-} else {
-message = autosaveL10n.failText;
+// if no errors: update post_ID from the temporary value, grab new save-nonce for that new ID
+if ( res && res.responses.length && !res.errors ) {
+   var postID = parseInt( res.responses[0].id );
+if ( !isNaN(postID) && postID > 0 ) {
+   if ( postID == parseInt(jQuery('#post_ID').val()) ) { return; } // no need to do this more than once
+   jQuery('#post_ID').attr({name: "post_ID"}
+   jQuery('#post_ID').val(postID);
+   // We need new nonces
+jQuery.post(autosaveL10n.requestFile, {
+   action: "autosave-generate-nonces"
+   post_ID: postID
+   autosavenonce: jQuery('#autosavenonce').val(),
+       post_type: jQuery('#post_type').val()
+}, function(html) {
+       jQuery('#_wpnonce').val(html
+   }
+       jQuery('#hiddenaction').val('editpost');
+}
-    }
-    jQuery('#autosave').html(message);
-    autosave_update_preview_link(res);
-    autosave_update_slug(res);
-    autosave_enable_buttons();
-}
-
-function autosave_update_preview_link(post_id) {
-    // Add preview button if not already there
- jQuery('#previewview > *').get()[0]
+jQuery('#previewview > *').size()
-        var post_type = jQuery('#post_type').val();
-        var previewText = 'page' == post_type ? autosaveL10n.previewPageText : autosaveL10n.previewPostText;
@@ -75 +85 @@
-function autosave_update_slug(post_id) {
-    // create slug area only if not already there
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                jQuery('#edit-slug-box').html(data);
-                make_slugedit_clickable();
-
+
+
-    }
-}
-
-function autosave_loading() {
-autosaveL10n.savingText
+'<div class="updated"><p>' + autosaveL10n.savingText + '</p></div>'
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-}
-
-function autosave_disable_buttons() {
-
-
-
-
-
+
+
-}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-    /* Gotta do this up here so we can check the length when tinyMCE is in use */
-
-
-
-
-
+
-    
-    post_data["content"] = jQuery("#content").val();
@@ -142 +138 @@
-        post_data["post_name"] = jQuery('#post_name').val();
-
+    // Nothing to save or no change.
-    if(post_data["post_title"].length==0 || post_data["content"].length==0 || post_data["post_title"] + post_data["content"] == autosaveLast) {
-return;
+doAutoSave = false
-    }
-
-    autosave_disable_buttons();
+
+    var origStatus = jQuery('#original_post_status').val();
+    if ( 'draft' != origStatus ) // autosave currently only turned on for drafts
+        doAutoSave = false;
-
-    autosaveLast = jQuery("#title").val()+jQuery("#content").val();
@@ -162 +163 @@
-        post_data["excerpt"] = jQuery("#excerpt").val();
-
-if ( rich ) 
-
-
-post_data["content"] = jQuery("#content").val();
+// Don't run while the TinyMCE spellcheck is on.  Why?  Who knows.
+
+
+}
-
-    if(parseInt(post_data["post_ID"]) < 1) {
-        post_data["temp_ID"] = post_data["post_ID"];
-
-
-
+
-    } else {
-
-
-
+
-    }
+
+    if ( !doAutoSave ) {
+        post_data['autosave'] = 0;
+    }
+
-    jQuery.ajax({
-        data: post_data,
-function() { autosave_loading() }
+doAutoSave ? autosave_loading : null
-        type: "POST",
-
+
+
-    });
-}

trunk/wp-includes/js/wp-lists.js

@@ -2 +2 @@
-var currentFormEl = false;
-var fs = {add:'ajaxAdd',del:'ajaxDel',dim:'ajaxDim',process:'process',recolor:'recolor'};
-
-wpAjax = {
-    unserialize: function( s ) {
-        var r = {}; if ( !s ) { return r; }
-        var q = s.split('?'); if ( q[1] ) { s = q[1]; }
-        var pp = s.split('&');
-        for ( var i in pp ) {
-            if ( $.isFunction(pp.hasOwnProperty) && !pp.hasOwnProperty(i) ) { continue; }
-            var p = pp[i].split('=');
-            r[p[0]] = p[1];
-        }
-        return r;
-    },
-    parseAjaxResponse: function( x, r, e ) { // 1 = good, 0 = strange (bad data?), -1 = you lack permission
-        var re = $('#' + r).html('');
-        if ( x && typeof x == 'object' && x.getElementsByTagName('wp_ajax') ) {
-            var errs = $('wp_error', x);
-            if ( errs.size() ) {
-                var err = '';
-                errs.each( function() {
-                    var code = $(this).attr('code');
-                    if ( formField = $('wp_error_data[code="' + code + '"] form-field', x).text() )
-                        code = formField;
-                    wpAjax.invalidateForm( $('#' + e + ' :input[name="' + code + '"]' ).parents('.form-field:first') );
-                    err += '<p>' + this.firstChild.nodeValue + '</p>';
-                } );
-                return !re.html( '<div class="error">' + err + '</div>' );
-            }
-            return true;
-        }
-        if ( isNaN(x) ) { return !re.html('<div class="error"><p>' + x + '</p></div>'); }
-        x = parseInt(x,10);
-        if ( -1 == x ) { return !re.html('<div class="error"><p>You do not have permission to do that.</p></div>'); }
-        else if ( 0 === x ) { return !re.html('<div class="error"><p>AJAX is teh b0rked.</p></div>'); }
-        return true;
-    },
-    invalidateForm: function( jQ ) {
-        jQ.addClass( 'form-invalid' ).change( function() { $(this).removeClass( 'form-invalid' ); } );
-    }
-};
-
-var wpList = {
@@ -128 +88 @@
-
-        s.success = function(r) {
-if ( !wpAjax.parseAjaxResponse(r, s.response, s.element) ) { return false; }
-
-
-   var t = $(this);
-.text()
-.parent().attr( 'position' )
-.parent().attr( 'id' )
-.parent().attr( 'old_id' )
+var res = wpAjax.parseAjaxResponse(r, s.response, s.element);
+
+
+jQuery.each( res.responses, function() {
+his.data
+his.position
+his.id
+his.oldId
-                } ) );
-            } );
@@ -142 +102 @@
-                var o = this.complete;
-                this.complete = function(x,st) {
-
+, parsed: res
-                    s.addAfter( r, _s );
-                    if ( $.isFunction(o) ) { o(x,st); }
@@ -195 +155 @@
-
-        s.success = function(r) {
-
+
+
-                element.stop().css( 'backgroundColor', '#FF3333' ).show().queue( function() { list.wpList.recolor(); $(this).dequeue(); } );
-                return false;
@@ -203 +164 @@
-                this.complete = function(x,st) {
-                    element.queue( function() {
-
+, parsed: res
-                        s.delAfter( r, _s );
-                        if ( $.isFunction(o) ) { o(x,st); }
@@ -257 +218 @@
-
-        s.success = function(r) {
-
+
+
-                element.stop().css( 'backgroundColor', '#FF3333' )[isClass?'removeClass':'addClass'](s.dimClass).show().queue( function() { list.wpList.recolor(); $(this).dequeue(); } );
-                return false;
@@ -265 +227 @@
-                this.complete = function(x,st) {
-                    element.queue( function() {
-
+, parsed: res
-                        s.dimAfter( r, _s );
-                        if ( $.isFunction(o) ) { o(x,st); }

trunk/wp-includes/script-loader.php

@@ -42 +42 @@
-        $this->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.6');
-
-
+
+
+
+
+
+
+
-        $this->localize( 'autosave', 'autosaveL10n', array(
-
-
-
-
-
-
+
+
+
-            'requestFile' => get_option( 'siteurl' ) . '/wp-admin/admin-ajax.php',
- Draft...
+…
-        ) );
-
@@ -62 +65 @@
-        ) );
-
-jquery'), '20080228' 
+wp-ajax-response'), '20080228' . mt_rand()
-        $this->localize( 'wp-lists', 'wpListL10n', array(
-            'url' => get_option( 'siteurl' ) . '/wp-admin/admin-ajax.php'

trunk/wp-includes/version.php

@@ -17 +17 @@
- * @global int $wp_db_version
- */
-6846
+7098
-
-?>