X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/11be8dc178e77d0b46189bbd8e33a216a9b90942..5e031ad59895b5682d1509675cafe9f2c5081c12:/wp-admin/post.php

diff --git a/wp-admin/post.php b/wp-admin/post.php
index 5f04fa71..0c38b563 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -9,77 +9,77 @@
  */
 
 /** WordPress Administration Bootstrap */
-require_once('admin.php');
+require_once( dirname( __FILE__ ) . '/admin.php' );
 
 $parent_file = 'edit.php';
 $submenu_file = 'edit.php';
 
-wp_reset_vars(array('action', 'safe_mode', 'withcomments', 'posts', 'content', 'edited_post_title', 'comment_error', 'profile', 'trackback_url', 'excerpt', 'showcomments', 'commentstart', 'commentend', 'commentorder'));
+wp_reset_vars( array( 'action' ) );
+
+if ( isset( $_GET['post'] ) )
+ 	$post_id = $post_ID = (int) $_GET['post'];
+elseif ( isset( $_POST['post_ID'] ) )
+ 	$post_id = $post_ID = (int) $_POST['post_ID'];
+else
+ 	$post_id = $post_ID = 0;
+
+global $post_type, $post_type_object, $post;
+
+if ( $post_id )
+	$post = get_post( $post_id );
+
+if ( $post ) {
+	$post_type = $post->post_type;
+	$post_type_object = get_post_type_object( $post_type );
+}
 
 /**
  * Redirect to previous page.
  *
- * @param int $post_ID Optional. Post ID.
+ * @param int $post_id Optional. Post ID.
  */
-function redirect_post($post_ID = '') {
-	global $action;
-
-	$referredby = '';
-	if ( !empty($_POST['referredby']) ) {
-		$referredby = preg_replace('|https?://[^/]+|i', '', $_POST['referredby']);
-		$referredby = remove_query_arg('_wp_original_http_referer', $referredby);
-	}
-	$referer = preg_replace('|https?://[^/]+|i', '', wp_get_referer());
-
-	if ( !empty($_POST['mode']) && 'bookmarklet' == $_POST['mode'] ) {
-		$location = $_POST['referredby'];
-	} elseif ( !empty($_POST['mode']) && 'sidebar' == $_POST['mode'] ) {
-		if ( isset($_POST['saveasdraft']) )
-			$location = 'sidebar.php?a=c';
-		elseif ( isset($_POST['publish']) )
-			$location = 'sidebar.php?a=b';
-	} elseif ( ( isset($_POST['save']) || isset($_POST['publish']) ) && ( empty($referredby) || $referredby == $referer || 'redo' != $referredby ) ) {
-		if ( isset($_POST['_wp_original_http_referer']) && strpos( $_POST['_wp_original_http_referer'], '/wp-admin/post.php') === false && strpos( $_POST['_wp_original_http_referer'], '/wp-admin/post-new.php') === false )
-			$location = add_query_arg( array(
-				'_wp_original_http_referer' => urlencode( stripslashes( $_POST['_wp_original_http_referer'] ) ),
-				'message' => 1
-			), get_edit_post_link( $post_ID, 'url' ) );
-		else {
-			if ( isset( $_POST['publish'] ) ) {
-				if ( 'pending' == get_post_status( $post_ID ) )
-					$location = add_query_arg( 'message', 8, get_edit_post_link( $post_ID, 'url' ) );
-				else
-					$location = add_query_arg( 'message', 6, get_edit_post_link( $post_ID, 'url' ) );
-			} else {
-				$location = add_query_arg( 'message', 7, get_edit_post_link( $post_ID, 'url' ) );
+function redirect_post($post_id = '') {
+	if ( isset($_POST['save']) || isset($_POST['publish']) ) {
+		$status = get_post_status( $post_id );
+
+		if ( isset( $_POST['publish'] ) ) {
+			switch ( $status ) {
+				case 'pending':
+					$message = 8;
+					break;
+				case 'future':
+					$message = 9;
+					break;
+				default:
+					$message = 6;
 			}
+		} else {
+				$message = 'draft' == $status ? 10 : 1;
 		}
-	} elseif (isset($_POST['addmeta']) && $_POST['addmeta']) {
+
+		$location = add_query_arg( 'message', $message, get_edit_post_link( $post_id, 'url' ) );
+	} elseif ( isset($_POST['addmeta']) && $_POST['addmeta'] ) {
 		$location = add_query_arg( 'message', 2, wp_get_referer() );
 		$location = explode('#', $location);
 		$location = $location[0] . '#postcustom';
-	} elseif (isset($_POST['deletemeta']) && $_POST['deletemeta']) {
+	} elseif ( isset($_POST['deletemeta']) && $_POST['deletemeta'] ) {
 		$location = add_query_arg( 'message', 3, wp_get_referer() );
 		$location = explode('#', $location);
 		$location = $location[0] . '#postcustom';
-	} elseif (!empty($referredby) && $referredby != $referer) {
-		$location = $_POST['referredby'];
-		$location = remove_query_arg('_wp_original_http_referer', $location);
-		if ( false !== strpos($location, 'edit.php') || false !== strpos($location, 'edit-post-drafts.php') )
-			$location = add_query_arg('posted', $post_ID, $location);
-		elseif ( false !== strpos($location, 'wp-admin') )
-			$location = "post-new.php?posted=$post_ID";
-	} elseif ( isset($_POST['publish']) ) {
-		$location = "post-new.php?posted=$post_ID";
-	} elseif ($action == 'editattachment') {
-		$location = 'attachments.php';
-	} elseif ( 'post-quickpress-save-cont' == $_POST['action'] ) {
-		$location = "post.php?action=edit&post=$post_ID&message=7";
 	} else {
-		$location = add_query_arg( 'message', 4, get_edit_post_link( $post_ID, 'url' ) );
+		$location = add_query_arg( 'message', 4, get_edit_post_link( $post_id, 'url' ) );
 	}
 
-	wp_redirect( $location );
+	/**
+	 * Filter the post redirect destination URL.
+	 *
+	 * @since 2.9.0
+	 *
+	 * @param string $location The destination URL.
+	 * @param int    $post_id  The post ID.
+	 */
+	wp_redirect( apply_filters( 'redirect_post_location', $location, $post_id ) );
+	exit;
 }
 
 if ( isset( $_POST['deletepost'] ) )
@@ -87,94 +87,133 @@ if ( isset( $_POST['deletepost'] ) )
 elseif ( isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'] )
 	$action = 'preview';
 
+$sendback = wp_get_referer();
+if ( ! $sendback ||
+     strpos( $sendback, 'post.php' ) !== false ||
+     strpos( $sendback, 'post-new.php' ) !== false ) {
+	if ( 'attachment' == $post_type ) {
+		$sendback = admin_url( 'upload.php' );
+	} else {
+		$sendback = admin_url( 'edit.php' );
+		if ( ! empty( $post_type ) ) {
+			$sendback = add_query_arg( 'post_type', $post_type, $sendback );
+		}
+	}
+} else {
+	$sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), $sendback );
+}
+
 switch($action) {
-case 'postajaxpost':
-case 'post':
-case 'post-quickpress-publish':
-case 'post-quickpress-save':
-	check_admin_referer('add-post');
+case 'post-quickdraft-save':
+	// Check nonce and capabilities
+	$nonce = $_REQUEST['_wpnonce'];
+	$error_msg = false;
 
-	if ( 'post-quickpress-publish' == $action )
-		$_POST['publish'] = 'publish'; // tell write_post() to publish
+	// For output of the quickdraft dashboard widget
+	require_once ABSPATH . 'wp-admin/includes/dashboard.php';
 
-	if ( 'post-quickpress-publish' == $action || 'post-quickpress-save' == $action ) {
-		$_POST['comment_status'] = get_option('default_comment_status');
-		$_POST['ping_status'] = get_option('default_ping_status');
-	}
+	if ( ! wp_verify_nonce( $nonce, 'add-post' ) )
+		$error_msg = __( 'Unable to submit this form, please refresh and try again.' );
 
-	if ( !empty( $_POST['quickpress_post_ID'] ) ) {
-		$_POST['post_ID'] = (int) $_POST['quickpress_post_ID'];
-		$post_ID = edit_post();
-	} else {
-		$post_ID = 'postajaxpost' == $action ? edit_post() : write_post();
-	}
+	if ( ! current_user_can( 'edit_posts' ) )
+		$error_msg = __( 'Oops, you don’t have access to add new drafts.' );
 
-	if ( 0 === strpos( $action, 'post-quickpress' ) ) {
-		$_POST['post_ID'] = $post_ID;
-		// output the quickpress dashboard widget
-		require_once(ABSPATH . 'wp-admin/includes/dashboard.php');
-		wp_dashboard_quick_press();
-		exit;
-	}
+	if ( $error_msg )
+		return wp_dashboard_quick_press( $error_msg );
 
-	redirect_post($post_ID);
+	$post = get_post( $_REQUEST['post_ID'] );
+	check_admin_referer( 'add-' . $post->post_type );
+
+	$_POST['comment_status'] = get_option( 'default_comment_status' );
+	$_POST['ping_status'] = get_option( 'default_ping_status' );
+
+	edit_post();
+	wp_dashboard_quick_press();
+	exit;
+
+case 'postajaxpost':
+case 'post':
+	check_admin_referer( 'add-' . $post_type );
+	$post_id = 'postajaxpost' == $action ? edit_post() : write_post();
+	redirect_post( $post_id );
 	exit();
-	break;
 
 case 'edit':
 	$editing = true;
 
-	if ( empty( $_GET['post'] ) ) {
-		wp_redirect("post.php");
+	if ( empty( $post_id ) ) {
+		wp_redirect( admin_url('post.php') );
 		exit();
 	}
-	$post_ID = $p = (int) $_GET['post'];
-	$post = get_post($post_ID);
 
-	if ( empty($post->ID) ) wp_die( __("You attempted to edit a post that doesn't exist. Perhaps it was deleted?") );
+	if ( ! $post )
+		wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+
+	if ( ! $post_type_object )
+		wp_die( __( 'Unknown post type.' ) );
+
+	if ( ! current_user_can( 'edit_post', $post_id ) )
+		wp_die( __( 'You are not allowed to edit this item.' ) );
 
-	if ( 'post' != $post->post_type ) {
-		wp_redirect( get_edit_post_link( $post->ID, 'url' ) );
+	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();
 	}
 
-	wp_enqueue_script('post');
-	if ( user_can_richedit() )
-		wp_enqueue_script('editor');
-	add_thickbox();
-	wp_enqueue_script('media-upload');
-	wp_enqueue_script('word-count');
-	wp_enqueue_script( 'admin-comments' );
-	enqueue_comment_hotkeys_js();
-
-	if ( current_user_can('edit_post', $post_ID) ) {
-		if ( $last = wp_check_post_lock( $post->ID ) ) {
-			$last_user = get_userdata( $last );
-			$last_user_name = $last_user ? $last_user->display_name : __('Somebody');
-			$message = sprintf( __( 'Warning: %s is currently editing this post' ), wp_specialchars( $last_user_name ) );
-			$message = str_replace( "'", "\'", "<div class='error'><p>$message</p></div>" );
-			add_action('admin_notices', create_function( '', "echo '$message';" ) );
-		} else {
-			wp_set_post_lock( $post->ID );
+	$post_type = $post->post_type;
+	if ( 'post' == $post_type ) {
+		$parent_file = "edit.php";
+		$submenu_file = "edit.php";
+		$post_new_file = "post-new.php";
+	} elseif ( 'attachment' == $post_type ) {
+		$parent_file = 'upload.php';
+		$submenu_file = 'upload.php';
+		$post_new_file = 'media-new.php';
+	} else {
+		if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true )
+			$parent_file = $post_type_object->show_in_menu;
+		else
+			$parent_file = "edit.php?post_type=$post_type";
+		$submenu_file = "edit.php?post_type=$post_type";
+		$post_new_file = "post-new.php?post_type=$post_type";
+	}
+
+	if ( ! wp_check_post_lock( $post->ID ) ) {
+		$active_post_lock = wp_set_post_lock( $post->ID );
+
+		if ( 'attachment' !== $post_type )
 			wp_enqueue_script('autosave');
-		}
 	}
 
-	$title = __('Edit Post');
+	if ( is_multisite() ) {
+		add_action( 'admin_footer', '_admin_notice_post_locked' );
+	} else {
+		$check_users = get_users( array( 'fields' => 'ID', 'number' => 2 ) );
+
+		if ( count( $check_users ) > 1 )
+			add_action( 'admin_footer', '_admin_notice_post_locked' );
+
+		unset( $check_users );
+	}
 
-	if ( !current_user_can('edit_post', $post_ID) )
-		die ( __('You are not allowed to edit this post.') );
+	$title = $post_type_object->labels->edit_item;
+	$post = get_post($post_id, OBJECT, 'edit');
 
-	$post = get_post_to_edit($post_ID);
+	if ( post_type_supports($post_type, 'comments') ) {
+		wp_enqueue_script('admin-comments');
+		enqueue_comment_hotkeys_js();
+	}
 
-	include('edit-form-advanced.php');
+	include( ABSPATH . 'wp-admin/edit-form-advanced.php' );
 
 	break;
 
 case 'editattachment':
-	$post_id = (int) $_POST['post_ID'];
-
-	check_admin_referer('update-attachment_' . $post_id);
+	check_admin_referer('update-post_' . $post_id);
 
 	// Don't let these be changed
 	unset($_POST['guid']);
@@ -187,54 +226,95 @@ case 'editattachment':
 	wp_update_attachment_metadata( $post_id, $newmeta );
 
 case 'editpost':
-	$post_ID = (int) $_POST['post_ID'];
-	check_admin_referer('update-post_' . $post_ID);
+	check_admin_referer('update-post_' . $post_id);
+
+	$post_id = edit_post();
 
-	$post_ID = edit_post();
+	// Session cookie flag that the post was saved
+	if ( isset( $_COOKIE['wp-saving-post'] ) && $_COOKIE['wp-saving-post'] === $post_id . '-check' ) {
+		setcookie( 'wp-saving-post', $post_id . '-saved', time() + DAY_IN_SECONDS );
+	}
 
-	redirect_post($post_ID); // Send user on their way while we keep working
+	redirect_post($post_id); // Send user on their way while we keep working
 
 	exit();
-	break;
+
+case 'trash':
+	check_admin_referer('trash-post_' . $post_id);
+
+	if ( ! $post )
+		wp_die( __( 'The item you are trying to move to the Trash no longer exists.' ) );
+
+	if ( ! $post_type_object )
+		wp_die( __( 'Unknown post type.' ) );
+
+	if ( ! current_user_can( '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.' ) );
+
+	wp_redirect( add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ) );
+	exit();
+
+case 'untrash':
+	check_admin_referer('untrash-post_' . $post_id);
+
+	if ( ! $post )
+		wp_die( __( 'The item you are trying to restore from the Trash no longer exists.' ) );
+
+	if ( ! $post_type_object )
+		wp_die( __( 'Unknown post type.' ) );
+
+	if ( ! current_user_can( 'delete_post', $post_id ) )
+		wp_die( __( 'You are not allowed to move this item out of the Trash.' ) );
+
+	if ( ! wp_untrash_post( $post_id ) )
+		wp_die( __( 'Error in restoring from Trash.' ) );
+
+	wp_redirect( add_query_arg('untrashed', 1, $sendback) );
+	exit();
 
 case 'delete':
-	$post_id = (isset($_GET['post']))  ? intval($_GET['post']) : intval($_POST['post_ID']);
 	check_admin_referer('delete-post_' . $post_id);
 
-	$post = & get_post($post_id);
+	if ( ! $post )
+		wp_die( __( 'This item has already been deleted.' ) );
 
-	if ( !current_user_can('delete_post', $post_id) )
-		wp_die( __('You are not allowed to delete this post.') );
+	if ( ! $post_type_object )
+		wp_die( __( 'Unknown post type.' ) );
 
+	if ( ! current_user_can( 'delete_post', $post_id ) )
+		wp_die( __( 'You are not allowed to delete this item.' ) );
+
+	$force = ! EMPTY_TRASH_DAYS;
 	if ( $post->post_type == 'attachment' ) {
-		if ( ! wp_delete_attachment($post_id) )
-			wp_die( __('Error in deleting...') );
+		$force = ( $force || ! MEDIA_TRASH );
+		if ( ! wp_delete_attachment( $post_id, $force ) )
+			wp_die( __( 'Error in deleting.' ) );
 	} else {
-		if ( !wp_delete_post($post_id) )
-			wp_die( __('Error in deleting...') );
+		if ( ! wp_delete_post( $post_id, $force ) )
+			wp_die( __( 'Error in deleting.' ) );
 	}
 
-	$sendback = wp_get_referer();
-	if (strpos($sendback, 'post.php') !== false) $sendback = admin_url('edit.php?deleted=1');
-	elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php');
-	else $sendback = add_query_arg('deleted', 1, $sendback);
-	wp_redirect($sendback);
+	wp_redirect( add_query_arg('deleted', 1, $sendback) );
 	exit();
-	break;
 
 case 'preview':
-	check_admin_referer( 'autosave', 'autosavenonce' );
+	check_admin_referer( 'update-post_' . $post_id );
 
 	$url = post_preview();
 
 	wp_redirect($url);
 	exit();
-	break;
 
 default:
-	wp_redirect('edit.php');
+	wp_redirect( admin_url('edit.php') );
 	exit();
-	break;
 } // end switch
-include('admin-footer.php');
-?>
+include( ABSPATH . 'wp-admin/admin-footer.php' );