WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@532 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 11 insertions, 295 deletions

diff --git a/wp-inst/wp-admin/post.php b/wp-inst/wp-admin/post.php
index 11d46c2..9139584 100644
--- a/wp-inst/wp-admin/post.php
+++ b/wp-inst/wp-admin/post.php
@@ -18,15 +18,8 @@ for ($i=0; $i<count($wpvarstoreset); $i += 1) {
 	}
 }
 
-if (isset($_POST['deletepost'])) {
+if (isset($_POST['deletepost']))
 $action = "delete";
-}
-
-// Fix submenu highlighting for pages.
-if ( isset($_REQUEST['post']) && 'page' == get_post_type($_REQUEST['post']) )
-	$submenu_file = 'page-new.php';
-
-$editing = true;
 
 switch($action) {
 case 'post':
@@ -43,16 +36,13 @@ case 'post':
 			$location = 'sidebar.php?a=b';
 			break;
 		default:
-			$location = 'post.php';
+			$location = 'post-new.php';
 			break;
 		}
 	} else {
-		$location = 'post.php?posted=true';
+		$location = 'post-new.php?posted=true';
 	}
 
-	if ( 'page' == $_POST['post_type'] )
-		$location = "page-new.php?saved=true";
-
 	if ( isset($_POST['save']) )
 		$location = "post.php?action=edit&post=$post_ID";
 
@@ -62,20 +52,20 @@ case 'post':
 
 case 'edit':
 	$title = __('Edit');
-
+	$parent_file = 'edit.php';
+	$submenu_file = 'edit.php';
+	$editing = true;
 	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.') );
 
 	$post = get_post_to_edit($post_ID);
 
-	if ($post->post_type == 'page')
-		include('edit-page-form.php');
-	else
-		include('edit-form-advanced.php');
+	include('edit-form-advanced.php');
 
 	?>
 	<div id='preview' class='wrap'>
@@ -131,7 +121,7 @@ case 'delete':
 
 	$post = & get_post($post_id);
 
-	if ( !current_user_can('edit_post', $post_id) )
+	if ( !current_user_can('delete_post', $post_id) )
 		die( __('You are not allowed to delete this post.') );
 
 	if ( $post->post_type == 'attachment' ) {
@@ -143,289 +133,15 @@ case 'delete':
 	}
 
 	$sendback = $_SERVER['HTTP_REFERER'];
-	if (strstr($sendback, 'post.php')) $sendback = get_settings('siteurl') .'/wp-admin/post.php';
+	if (strstr($sendback, 'post.php')) $sendback = get_settings('siteurl') .'/wp-admin/post-new.php';
 	elseif (strstr($sendback, 'attachments.php')) $sendback = get_settings('siteurl') .'/wp-admin/attachments.php';
 	$sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);
 	header ('Location: ' . $sendback);
-	break;
-
-case 'editcomment':
-	$title = __('Edit Comment');
-	$parent_file = 'edit.php';
-	require_once ('admin-header.php');
-
-	get_currentuserinfo();
-
-	$comment = (int) $_GET['comment'];
-
-	if ( ! $comment = get_comment($comment) )
-		die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'javascript:history.go(-1)'));
-
-	if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-		die( __('You are not allowed to edit comments on this post.') );
-
-	$comment = get_comment_to_edit($comment);
-
-	include('edit-form-comment.php');
-
-	break;
-
-case 'confirmdeletecomment':
-
-	require_once('./admin-header.php');
-
-	$comment = (int) $_GET['comment'];
-	$p = (int) $_GET['p'];
-
-	if ( ! $comment = get_comment($comment) )
-		die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
-
-	if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-		die( __('You are not allowed to delete comments on this post.') );
-
-	echo "<div class='wrap'>\n";
-	if ( 'spam' == $_GET['delete_type'] )
-		echo "<p>" . __('<strong>Caution:</strong> You are about to mark the following comment as spam:') . "</p>\n";
-	else
-		echo "<p>" . __('<strong>Caution:</strong> You are about to delete the following comment:') . "</p>\n";
-	echo "<table border='0'>\n";
-	echo "<tr><td>" . __('Author:') . "</td><td>$comment->comment_author</td></tr>\n";
-	echo "<tr><td>" . __('E-mail:') . "</td><td>$comment->comment_author_email</td></tr>\n";
-	echo "<tr><td>". __('URL:') . "</td><td>$comment->comment_author_url</td></tr>\n";
-	echo "<tr><td>". __('Comment:') . "</td><td>$comment->comment_content</td></tr>\n";
-	echo "</table>\n";
-	echo "<p>" . __('Are you sure you want to do that?') . "</p>\n";
-
-	echo "<form action='".get_settings('siteurl')."/wp-admin/post.php' method='get'>\n";
-	echo "<input type='hidden' name='action' value='deletecomment' />\n";
-	if ( 'spam' == $_GET['delete_type'] )
-		echo "<input type='hidden' name='delete_type' value='spam' />\n";
-	echo "<input type='hidden' name='p' value='$p' />\n";
-	echo "<input type='hidden' name='comment' value='{$comment->comment_ID}' />\n";
-	echo "<input type='hidden' name='noredir' value='1' />\n";
-	echo "<input type='submit' value='" . __('Yes') . "' />";
-	echo "&nbsp;&nbsp;";
-	echo "<input type='button' value='" . __('No') . "' onclick=\"self.location='". get_settings('siteurl') ."/wp-admin/edit.php?p=$p&amp;c=1#comments';\" />\n";
-	echo "</form>\n";
-	echo "</div>\n";
-
-	break;
-
-case 'deletecomment':
-
-	check_admin_referer();
-
-	$comment = (int) $_GET['comment'];
-	$p = (int) $_GET['p'];
-	if (isset($_GET['noredir'])) {
-		$noredir = true;
-	} else {
-		$noredir = false;
-	}
-
-	$postdata = get_post($p) or die(sprintf(__('Oops, no post with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
-
-	if ( ! $comment = get_comment($comment) )
-			 die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'post.php'));
-
-	if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-		die( __('You are not allowed to edit comments on this post.') );
-
-	if ( 'spam' == $_GET['delete_type'] )
-		wp_set_comment_status($comment->comment_ID, 'spam');
-	else
-		wp_delete_comment($comment->comment_ID);
-
-	if (($_SERVER['HTTP_REFERER'] != "") && (false == $noredir)) {
-		header('Location: ' . $_SERVER['HTTP_REFERER']);
-	} else {
-		header('Location: '. get_settings('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments');
-	}
-
-	break;
-
-case 'unapprovecomment':
-
-	check_admin_referer();
-
-	$comment = (int) $_GET['comment'];
-	$p = (int) $_GET['p'];
-	if (isset($_GET['noredir'])) {
-		$noredir = true;
-	} else {
-		$noredir = false;
-	}
-
-	if ( ! $comment = get_comment($comment) )
-		die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
-
-	if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-		die( __('You are not allowed to edit comments on this post, so you cannot disapprove this comment.') );
-
-	wp_set_comment_status($comment->comment_ID, "hold");
-
-	if (($_SERVER['HTTP_REFERER'] != "") && (false == $noredir)) {
-		header('Location: ' . $_SERVER['HTTP_REFERER']);
-	} else {
-		header('Location: '. get_settings('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments');
-	}
-
-	break;
-
-case 'mailapprovecomment':
-
-	$comment = (int) $_GET['comment'];
-
-	if ( ! $comment = get_comment($comment) )
-			 die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
-
-	if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-		die( __('You are not allowed to edit comments on this post, so you cannot approve this comment.') );
-
-	if ('1' != $comment->comment_approved) {
-		wp_set_comment_status($comment->comment_ID, 'approve');
-		if (true == get_option('comments_notify'))
-			wp_notify_postauthor($comment->comment_ID);
-	}
-
-	header('Location: ' . get_option('siteurl') . '/wp-admin/moderation.php?approved=1');
-
-	break;
-
-case 'approvecomment':
-
-	$comment = (int) $_GET['comment'];
-	$p = (int) $_GET['p'];
-	if (isset($_GET['noredir'])) {
-		$noredir = true;
-	} else {
-		$noredir = false;
-	}
-
-	if ( ! $comment = get_comment($comment) )
-		die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
-
-	if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-		die( __('You are not allowed to edit comments on this post, so you cannot approve this comment.') );
-
-	wp_set_comment_status($comment->comment_ID, "approve");
-	if (get_settings("comments_notify") == true) {
-		wp_notify_postauthor($comment->comment_ID);
-	}
-
-
-	if (($_SERVER['HTTP_REFERER'] != "") && (false == $noredir)) {
-		header('Location: ' . $_SERVER['HTTP_REFERER']);
-	} else {
-		header('Location: '. get_settings('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments');
-	}
-
-	break;
-
-case 'editedcomment':
-
-	edit_comment();
-
-	$referredby = $_POST['referredby'];
-	if (!empty($referredby)) {
-		header('Location: ' . $referredby);
-	} else {
-		header ("Location: edit.php?p=$comment_post_ID&c=1#comments");
-	}
-
+	exit();
 	break;
 
 default:
-	$title = __('Create New Post');
-	require_once ('./admin-header.php');
-?>
-<?php if ( isset($_GET['posted']) ) : ?>
-<div id="message" class="updated fade"><p><?php printf(__('Post saved. <a href="%s">View site &raquo;</a>'), get_bloginfo('home') . '/'); ?></p></div>
-<?php endif; ?>
-<?php
-	if ( current_user_can('edit_posts') ) {
-		$action = 'post';
-		get_currentuserinfo();
-		if ( $drafts = get_users_drafts( $user_ID ) ) {
-			?>
-			<div class="wrap">
-			<p><strong><?php _e('Your Drafts:') ?></strong>
-			<?php
-			$num_drafts = count($drafts);
-			if ( $num_drafts > 15 ) $num_drafts = 15;
-			for ( $i = 0; $i < $num_drafts; $i++ ) {
-				$draft = $drafts[$i];
-				if ( 0 != $i )
-					echo ', ';
-				$draft->post_title = stripslashes($draft->post_title);
-				if ( empty($draft->post_title) )
-					$draft->post_title = sprintf(__('Post # %s'), $draft->ID);
-				echo "<a href='post.php?action=edit&amp;post=$draft->ID' title='" . __('Edit this draft') . "'>$draft->post_title</a>";
-			}
-			?>
-			<?php if ( 15 < count($drafts) ) { ?>
-			, <a href="edit.php"><?php echo sprintf(__('and %s more'), (count($drafts) - 15) ); ?> &raquo;</a>
-			<?php } ?>
-			.</p>
-			</div>
-			<?php
-		}
-
-		$post = get_default_post_to_edit();
-
-		include('edit-form-advanced.php');
-?>
-<div class="wrap">
-<?php echo '<h3>'.__('WordPress bookmarklet').'</h3>
-<p>'.__('Right click on the following link and choose "Add to favorites" to create a posting shortcut.').'</p>'; ?>
-<p>
-
-<?php
-if ($is_NS4 || $is_gecko) {
-?>
-<a href="javascript:if(navigator.userAgent.indexOf('Safari') >= 0){Q=getSelection();}else{Q=document.selection?document.selection.createRange().text:document.getSelection();}location.href='<?php echo get_settings('siteurl') ?>/wp-admin/post.php?text='+encodeURIComponent(Q)+'&amp;popupurl='+encodeURIComponent(location.href)+'&amp;popuptitle='+encodeURIComponent(document.title);"><?php printf(__('Press It - %s'), wp_specialchars(get_settings('blogname'))); ?></a> 
-<?php
-} else if ($is_winIE) {
-?>
-<a href="javascript:Q='';if(top.frames.length==0)Q=document.selection.createRange().text;location.href='<?php echo get_settings('siteurl') ?>/wp-admin/post.php?text='+encodeURIComponent(Q)+'&amp;popupurl='+encodeURIComponent(location.href)+'&amp;popuptitle='+encodeURIComponent(document.title);"><?php printf(__('Press it - %s'), get_settings('blogname')); ?></a>
-<script type="text/javascript">
-<!--
-function oneclickbookmarklet(blah) {
-window.open ("profile.php?action=IErightclick", "oneclickbookmarklet", "width=500, height=450, location=0, menubar=0, resizable=0, scrollbars=1, status=1, titlebar=0, toolbar=0, screenX=120, left=120, screenY=120, top=120");
-}
-// -->
-</script>
-<br />
-<br />
-<?php _e('One-click bookmarklet:') ?><br />
-<a href="javascript:oneclickbookmarklet(0);"><?php _e('click here') ?></a> 
-<?php
-} else if ($is_opera) {
-?>
-<a href="javascript:location.href='<?php echo get_settings('siteurl'); ?>/wp-admin/post.php?popupurl='+escape(location.href)+'&popuptitle='+escape(document.title);"><?php printf(__('Press it - %s'), get_settings('blogname')); ?></a> 
-<?php
-} else if ($is_macIE) {
-?>
-<a href="javascript:Q='';location.href='<?php echo get_settings('siteurl'); ?>/wp-admin/bookmarklet.php?text='+escape(document.getSelection())+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title);"><?php printf(__('Press it - %s'), get_settings('blogname')); ?></a> 
-<?php
-}
-?>
-</p>
-</div>
-<?php
-} else {
-?>
-<div class="wrap">
-<p><?php printf(__('Since you&#8217;re a newcomer, you&#8217;ll have to wait for an admin to raise your level to 1, in order to be authorized to post.<br />
-You can also <a href="mailto:%s?subject=Promotion?">e-mail the admin</a> to ask for a promotion.<br />
-When you&#8217;re promoted, just reload this page and you&#8217;ll be able to blog. :)'), get_settings('admin_email')); ?>
-</p>
-</div>
-<?php
-}
-
 	break;
 } // end switch
-/* </Edit> */
 include('admin-footer.php');
 ?>