Changeset 4082

Timestamp:

08/11/2006 03:54:45 AM (20 years ago)

Author:

ryan

Message:

Autosave and prototype. Props masquerade. fixes #3020 #3017

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-admin/admin-functions.php (modified) (2 diffs)
• wp-admin/page-new.php (modified) (1 diff)
• wp-admin/page.php (modified) (1 diff)
• wp-admin/post-new.php (modified) (1 diff)
• wp-admin/post.php (modified) (1 diff)
• wp-includes/js/autosave.js.php (added)
• wp-includes/js/prototype.js (added)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -217 +217 @@
         die($r);
         break;
+case 'autosave' :
+        $_POST['post_content'] = $_POST['content'];
+        $_POST['post_excerpt'] = $_POST['excerpt'];
+        $_POST['post_status'] = 'draft';
+        $_POST['post_category'] = explode(",", $_POST['catslist']);
+        if($_POST['post_type'] == 'page' || empty($_POST['post_category']))
+                unset($_POST['post_category']); 
+        
+        if($_POST['post_ID'] < 0) {
+                $_POST['temp_ID'] = $_POST['post_ID'];
+                $id = wp_write_post();
+                if(is_wp_error($id))
+                        die($id->get_error_message());
+                else
+                        die("$id");
+        } else {
+                $post_ID = (int) $_POST['post_ID'];
+                $_POST['ID'] = $post_ID;
+                $post = get_post($post_ID);
+                if ( 'page' == $post->post_type ) {
+                        if ( !current_user_can('edit_page', $post_ID) )
+                                die(__('You are not allowed to edit this page.'));
+                } else {
+                        if ( !current_user_can('edit_post', $post_ID) )
+                                die(__('You are not allowed to edit this post.'));
+                }
+                wp_update_post($_POST);
+        }
+        die('0');
+break;
 default :
         do_action( 'wp_ajax_' . $_POST['action'] );

trunk/wp-admin/admin-functions.php

@@ -1 +1 @@
 <?php
 
+function write_post() {
+        $result = wp_write_post();
+        if( is_wp_error($result) )
+                wp_die( $result->get_error_message() );
+        else
+                return $result;
+}
+
 // Creates a new post from the "Write Post" form using $_POST information.
-function write_post() {
+function wp_write_post() {
         global $user_ID;
 
         if ( 'page' == $_POST['post_type'] ) {
                 if ( !current_user_can('edit_pages') )
-                        wp_die(__('You are not allowed to create pages on this blog.'));
+                        return new WP_Error('edit_pages', __('You are not allowed to create pages on this blog.'));
         } else {
                 if ( !current_user_can('edit_posts') )
-                        wp_die(__('You are not allowed to create posts or drafts on this blog.'));
+                        return new WP_Error('edit_posts', __('You are not allowed to create posts or drafts on this blog.'));
         }
 
@@ -33 +41 @@
                 if ( 'page' == $_POST['post_type'] ) {
                         if ( !current_user_can('edit_others_pages') )
-                                wp_die(__('You cannot create pages as this user.'));
+                                return new WP_Error('edit_others_pages', __('You cannot create pages as this user.'));
                 } else {
                         if ( !current_user_can('edit_others_posts') )
-                                wp_die(__('You cannot post as this user.'));
+                                return new WP_Error('edit_others_posts', __('You cannot post as this user.'));
 
                 }

trunk/wp-admin/page-new.php

@@ -4 +4 @@
 $parent_file = 'post-new.php';
 $editing = true;
+wp_enqueue_script('prototype');
+wp_enqueue_script('autosave');
 require_once('admin-header.php');
 ?>

trunk/wp-admin/page.php

@@ -43 +43 @@
         $title = __('Edit');
         $editing = true;
+        $page_ID = $post_ID = $p = (int) $_GET['post'];
+        $post = get_post_to_edit($page_ID);
+        if($post->post_status == 'draft') {
+                wp_enqueue_script('prototype');
+                wp_enqueue_script('autosave');
+        }
         require_once('admin-header.php');
-
-        $page_ID = $post_ID = $p = (int) $_GET['post'];
 
         if ( !current_user_can('edit_page', $page_ID) )
                 die ( __('You are not allowed to edit this page.') );
-
-        $post = get_post_to_edit($page_ID);
 
         include('edit-page-form.php');

trunk/wp-admin/post-new.php

@@ -4 +4 @@
 $parent_file = 'post-new.php';
 $editing = true;
+wp_enqueue_script('prototype');
+wp_enqueue_script('autosave');
 require_once ('./admin-header.php');
 

trunk/wp-admin/post.php

@@ -46 +46 @@
         $title = __('Edit');
         $editing = true;
+        $post_ID = $p = (int) $_GET['post'];
+        $post = get_post($post_ID);
+        if($post->post_status == 'draft') {
+                wp_enqueue_script('prototype');
+                wp_enqueue_script('autosave');
+        }
         require_once('admin-header.php');
 
-        $post_ID = $p = (int) $_GET['post'];
-
-        $post = get_post($post_ID);
         if ( !current_user_can('edit_post', $post_ID) )
                 die ( __('You are not allowed to edit this post.') );

trunk/wp-includes/script-loader.php

@@ -18 +18 @@
                 $this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_gzip.php', false, '04162006' );
                 $this->add( 'wp_tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('tiny_mce'), '04162006' );
+                $this->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.5.0');
+                $this->add( 'autosave', '/wp-includes/js/autosave.js.php', array('prototype', 'sack'), '4080');
                 if ( is_admin() ) {
                         $this->add( 'dbx-admin-key', '/wp-admin/dbx-admin-key-js.php', array('dbx'), '3651' );