diff -r a4642baaf829 -r 4d4862461b8d web/wp-admin/comment.php
--- a/web/wp-admin/comment.php	Tue Feb 02 14:45:47 2010 +0000
+++ b/web/wp-admin/comment.php	Tue Feb 02 15:44:16 2010 +0000
@@ -1,240 +1,269 @@
-<?php
-/**
- * Comment Management Panel
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-/** Load WordPress Bootstrap */
-require_once('admin.php');
-
-$parent_file = 'edit-comments.php';
-$submenu_file = 'edit-comments.php';
-
-wp_reset_vars( array('action') );
-
-if ( isset( $_POST['deletecomment'] ) )
-	$action = 'deletecomment';
-
-/**
- * Display error message at bottom of comments.
- *
- * @param string $msg Error Message. Assumed to contain HTML and be sanitized.
- */
-function comment_footer_die( $msg ) {
-	echo "<div class='wrap'><p>$msg</p></div>";
-	include('admin-footer.php');
-	die;
-}
-
-switch( $action ) {
-
-case 'editcomment' :
-	$title = __('Edit Comment');
-
-	wp_enqueue_script('comment');
-	require_once('admin-header.php');
-
-	$comment_id = absint( $_GET['c'] );
-
-	if ( !$comment = get_comment( $comment_id ) )
-		comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">'.__('Go back').'</a>!', 'javascript:history.go(-1)') );
-
-	if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-		comment_footer_die( __('You are not allowed to edit comments on this post.') );
-
-	$comment = get_comment_to_edit( $comment_id );
-
-	include('edit-form-comment.php');
-
-	break;
-
-case 'cdc' :
-case 'mac' :
-
-	require_once('admin-header.php');
-
-	$comment_id = absint( $_GET['c'] );
-	$formaction = 'cdc' == $action ? 'deletecomment' : 'approvecomment';
-	$nonce_action = 'cdc' == $action ? 'delete-comment_' : 'approve-comment_';
-	$nonce_action .= $comment_id;
-
-	if ( !$comment = get_comment_to_edit( $comment_id ) )
-		comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit.php') );
-
-	if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
-		comment_footer_die( 'cdc' == $action ? __('You are not allowed to delete comments on this post.') : __('You are not allowed to edit comments on this post, so you cannot approve this comment.') );
-?>
-<div class='wrap'>
-
-<div class="narrow">
-<?php
-if ( 'spam' == $_GET['dt'] ) {
-	$caution_msg = __('You are about to mark the following comment as spam:');
-	$button = __('Spam Comment');
-} elseif ( 'cdc' == $action ) {
-	$caution_msg = __('You are about to delete the following comment:');
-	$button = __('Delete Comment');
-} else {
-	$caution_msg = __('You are about to approve the following comment:');
-	$button = __('Approve Comment');
-}
-?>
-
-<p><strong><?php _e('Caution:'); ?></strong> <?php echo $caution_msg; ?></p>
-
-<p><?php _e('Are you sure you want to do that?'); ?></p>
-
-<form action='comment.php' method='get'>
-
-<table width="100%">
-<tr>
-<td><input type='button' class="button" value='<?php esc_attr_e('No'); ?>' onclick="self.location='<?php echo admin_url('edit-comments.php'); ?>" /></td>
-<td class="textright"><input type='submit' class="button" value='<?php echo esc_attr($button); ?>' /></td>
-</tr>
-</table>
-
-<?php wp_nonce_field( $nonce_action ); ?>
-<input type='hidden' name='action' value='<?php echo esc_attr($formaction); ?>' />
-<?php if ( 'spam' == $_GET['dt'] ) { ?>
-<input type='hidden' name='dt' value='spam' />
-<?php } ?>
-<input type='hidden' name='p' value='<?php echo esc_attr($comment->comment_post_ID); ?>' />
-<input type='hidden' name='c' value='<?php echo esc_attr($comment->comment_ID); ?>' />
-<input type='hidden' name='noredir' value='1' />
-</form>
-
-<table class="form-table" cellpadding="5">
-<tr class="alt">
-<th scope="row"><?php _e('Author'); ?></th>
-<td><?php echo $comment->comment_author; ?></td>
-</tr>
-<?php if ( $comment->comment_author_email ) { ?>
-<tr>
-<th scope="row"><?php _e('E-mail'); ?></th>
-<td><?php echo $comment->comment_author_email; ?></td>
-</tr>
-<?php } ?>
-<?php if ( $comment->comment_author_url ) { ?>
-<tr>
-<th scope="row"><?php _e('URL'); ?></th>
-<td><a href="<?php echo $comment->comment_author_url; ?>"><?php echo $comment->comment_author_url; ?></a></td>
-</tr>
-<?php } ?>
-<tr>
-<th scope="row" valign="top"><?php /* translators: field name in comment form */ echo _x('Comment', 'noun'); ?></th>
-<td><?php echo $comment->comment_content; ?></td>
-</tr>
-</table>
-
-</div>
-</div>
-<?php
-	break;
-
-case 'deletecomment' :
-	$comment_id = absint( $_REQUEST['c'] );
-	check_admin_referer( 'delete-comment_' . $comment_id );
-
-	if ( isset( $_REQUEST['noredir'] ) )
-		$noredir = true;
-	else
-		$noredir = false;
-
-	if ( !$comment = get_comment( $comment_id ) )
-		comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit-comments.php') );
-
-	if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
-		comment_footer_die( __('You are not allowed to edit comments on this post.') );
-
-	if ( 'spam' == $_REQUEST['dt'] )
-		wp_set_comment_status( $comment->comment_ID, 'spam' );
-	else
-		wp_delete_comment( $comment->comment_ID );
-
-	if ( '' != wp_get_referer() && false == $noredir && false === strpos(wp_get_referer(), 'comment.php' ) )
-		wp_redirect( wp_get_referer() );
-	else if ( '' != wp_get_original_referer() && false == $noredir )
-		wp_redirect( wp_get_original_referer() );
-	else
-		wp_redirect( admin_url('edit-comments.php') );
-
-	die;
-	break;
-
-case 'unapprovecomment' :
-	$comment_id = absint( $_GET['c'] );
-	check_admin_referer( 'unapprove-comment_' . $comment_id );
-
-	if ( isset( $_GET['noredir'] ) )
-		$noredir = true;
-	else
-		$noredir = false;
-
-	if ( !$comment = get_comment( $comment_id ) )
-		comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit.php') );
-
-	if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
-		comment_footer_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 ( '' != wp_get_referer() && false == $noredir )
-		wp_redirect( wp_get_referer() );
-	else
-		wp_redirect( admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) . '#comments') );
-
-	exit();
-	break;
-
-case 'approvecomment' :
-	$comment_id = absint( $_GET['c'] );
-	check_admin_referer( 'approve-comment_' . $comment_id );
-
-	if ( isset( $_GET['noredir'] ) )
-		$noredir = true;
-	else
-		$noredir = false;
-
-	if ( !$comment = get_comment( $comment_id ) )
-		comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit.php') );
-
-	if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-		comment_footer_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 ( '' != wp_get_referer() && false == $noredir )
-		wp_redirect( wp_get_referer() );
-	else
-		wp_redirect( admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) . '#comments') );
-
-	exit();
-	break;
-
-case 'editedcomment' :
-
-	$comment_id = absint( $_POST['comment_ID'] );
-	$comment_post_id = absint( $_POST['comment_post_ID'] );
-
-	check_admin_referer( 'update-comment_' . $comment_id );
-
-	edit_comment();
-
-	$location = ( empty( $_POST['referredby'] ) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id;
-	$location = apply_filters( 'comment_edit_redirect', $location, $comment_id );
-	wp_redirect( $location );
-
-	exit();
-	break;
-
-default:
-	wp_die( __('Unknown action.') );
-	break;
-
-} // end switch
-
-include('admin-footer.php');
-
-?>
\ No newline at end of file
+<?php
+/**
+ * Comment Management Panel
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/** Load WordPress Bootstrap */
+require_once('admin.php');
+
+$parent_file = 'edit-comments.php';
+$submenu_file = 'edit-comments.php';
+
+wp_reset_vars( array('action') );
+
+if ( isset( $_POST['deletecomment'] ) )
+	$action = 'deletecomment';
+
+if ( 'cdc' == $action )
+	$action = 'delete';
+elseif ( 'mac' == $action )
+	$action = 'approve';
+
+if ( isset( $_GET['dt'] ) ) {
+	if ( 'spam' == $_GET['dt'] )
+		$action = 'spam';
+	elseif ( 'trash' == $_GET['dt'] )
+		$action = 'trash';
+}
+
+/**
+ * Display error message at bottom of comments.
+ *
+ * @param string $msg Error Message. Assumed to contain HTML and be sanitized.
+ */
+function comment_footer_die( $msg ) {
+	echo "<div class='wrap'><p>$msg</p></div>";
+	include('admin-footer.php');
+	die;
+}
+
+switch( $action ) {
+
+case 'editcomment' :
+	$title = __('Edit Comment');
+
+	wp_enqueue_script('comment');
+	require_once('admin-header.php');
+
+	$comment_id = absint( $_GET['c'] );
+
+	if ( !$comment = get_comment( $comment_id ) )
+		comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">'.__('Go back').'</a>!', 'javascript:history.go(-1)') );
+
+	if ( !current_user_can('edit_post', $comment->comment_post_ID) )
+		comment_footer_die( __('You are not allowed to edit comments on this post.') );
+
+	if ( 'trash' == $comment->comment_approved )
+		comment_footer_die( __('This comment is in the Trash. Please move it out of the Trash if you want to edit it.') );
+
+	$comment = get_comment_to_edit( $comment_id );
+
+	include('edit-form-comment.php');
+
+	break;
+
+case 'delete'  :
+case 'approve' :
+case 'trash'   :
+case 'spam'    :
+
+	require_once('admin-header.php');
+
+	$comment_id = absint( $_GET['c'] );
+	$formaction    = $action . 'comment';
+	$nonce_action  = 'approve' == $action ? 'approve-comment_' : 'delete-comment_';
+	$nonce_action .= $comment_id;
+
+	if ( !$comment = get_comment_to_edit( $comment_id ) )
+		comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit.php') );
+
+	if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
+		comment_footer_die( 'approve' != $action ? __('You are not allowed to delete comments on this post.') : __('You are not allowed to edit comments on this post, so you cannot approve this comment.') );
+?>
+<div class='wrap'>
+
+<div class="narrow">
+<?php
+switch ( $action ) {
+	case 'spam' :
+		$caution_msg = __('You are about to mark the following comment as spam:');
+		$button      = __('Spam Comment');
+		break;
+	case 'trash' :
+		$caution_msg = __('You are about to move the following comment to the Trash:');
+		$button      = __('Trash Comment');
+		break;
+	case 'delete' :
+		$caution_msg = __('You are about to delete the following comment:');
+		$button      = __('Permanently Delete Comment');
+		break;
+	default :
+		$caution_msg = __('You are about to approve the following comment:');
+		$button      = __('Approve Comment');
+		break;
+}
+?>
+
+<p><strong><?php _e('Caution:'); ?></strong> <?php echo $caution_msg; ?></p>
+
+<table class="form-table comment-ays">
+<tr class="alt">
+<th scope="row"><?php _e('Author'); ?></th>
+<td><?php echo $comment->comment_author; ?></td>
+</tr>
+<?php if ( $comment->comment_author_email ) { ?>
+<tr>
+<th scope="row"><?php _e('E-mail'); ?></th>
+<td><?php echo $comment->comment_author_email; ?></td>
+</tr>
+<?php } ?>
+<?php if ( $comment->comment_author_url ) { ?>
+<tr>
+<th scope="row"><?php _e('URL'); ?></th>
+<td><a href="<?php echo $comment->comment_author_url; ?>"><?php echo $comment->comment_author_url; ?></a></td>
+</tr>
+<?php } ?>
+<tr>
+<th scope="row" valign="top"><?php /* translators: field name in comment form */ echo _x('Comment', 'noun'); ?></th>
+<td><?php echo $comment->comment_content; ?></td>
+</tr>
+</table>
+
+<p><?php _e('Are you sure you want to do that?'); ?></p>
+
+<form action='comment.php' method='get'>
+
+<table width="100%">
+<tr>
+<td><a class="button" href="<?php echo admin_url('edit-comments.php'); ?>"><?php esc_attr_e('No'); ?></a></td>
+<td class="textright"><input type='submit' class="button" value='<?php echo esc_attr($button); ?>' /></td>
+</tr>
+</table>
+
+<?php wp_nonce_field( $nonce_action ); ?>
+<input type='hidden' name='action' value='<?php echo esc_attr($formaction); ?>' />
+<input type='hidden' name='p' value='<?php echo esc_attr($comment->comment_post_ID); ?>' />
+<input type='hidden' name='c' value='<?php echo esc_attr($comment->comment_ID); ?>' />
+<input type='hidden' name='noredir' value='1' />
+</form>
+
+</div>
+</div>
+<?php
+	break;
+
+case 'deletecomment' :
+case 'trashcomment' :
+case 'untrashcomment' :
+case 'spamcomment' :
+case 'unspamcomment' :
+	$comment_id = absint( $_REQUEST['c'] );
+	check_admin_referer( 'delete-comment_' . $comment_id );
+
+	$noredir = isset($_REQUEST['noredir']);
+
+	if ( !$comment = get_comment($comment_id) )
+		comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit-comments.php') );
+	if ( !current_user_can('edit_post', $comment->comment_post_ID ) )
+		comment_footer_die( __('You are not allowed to edit comments on this post.') );
+
+	if ( '' != wp_get_referer() && false == $noredir && false === strpos(wp_get_referer(), 'comment.php') )
+		$redir = wp_get_referer();
+	elseif ( '' != wp_get_original_referer() && false == $noredir )
+		$redir = wp_get_original_referer();
+	else
+		$redir = admin_url('edit-comments.php');
+
+	$redir = remove_query_arg( array('spammed', 'unspammed', 'trashed', 'untrashed', 'deleted', 'ids'), $redir );
+
+	switch ( $action ) {
+		case 'deletecomment' :
+			wp_delete_comment( $comment_id );
+			$redir = add_query_arg( array('deleted' => '1'), $redir );
+			break;
+		case 'trashcomment' :
+			wp_trash_comment($comment_id);
+			$redir = add_query_arg( array('trashed' => '1', 'ids' => $comment_id), $redir );
+			break;
+		case 'untrashcomment' :
+			wp_untrash_comment($comment_id);
+			$redir = add_query_arg( array('untrashed' => '1'), $redir );
+			break;
+		case 'spamcomment' :
+			wp_spam_comment($comment_id);
+			$redir = add_query_arg( array('spammed' => '1', 'ids' => $comment_id), $redir );
+			break;
+		case 'unspamcomment' :
+			wp_unspam_comment($comment_id);
+			$redir = add_query_arg( array('unspammed' => '1'), $redir );
+			break;
+	}
+
+	wp_redirect( $redir );
+
+	die;
+	break;
+
+case 'approvecomment'   :
+case 'unapprovecomment' :
+	$comment_id = absint( $_GET['c'] );
+	check_admin_referer( 'approve-comment_' . $comment_id );
+
+	$noredir = isset( $_GET['noredir'] );
+
+	if ( !$comment = get_comment( $comment_id ) )
+		comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit.php') );
+
+	if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) ) {
+		if ( 'approvecomment' == $action )
+			comment_footer_die( __('You are not allowed to edit comments on this post, so you cannot approve this comment.') );
+		else
+			comment_footer_die( __('You are not allowed to edit comments on this post, so you cannot disapprove this comment.') );
+	}
+
+	if ( '' != wp_get_referer() && false == $noredir )
+		$redir = remove_query_arg( array('approved', 'unapproved'), wp_get_referer() );
+	else
+		$redir = admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) );
+
+	if ( 'approvecomment' == $action ) {
+		wp_set_comment_status( $comment_id, 'approve' );
+		$redir = add_query_arg( array( 'approved' => 1 ), $redir );
+	} else {
+		wp_set_comment_status( $comment_id, 'hold' );
+		$redir = add_query_arg( array( 'unapproved' => 1 ), $redir );
+	}
+
+	wp_redirect( $redir );
+
+	exit();
+	break;
+
+case 'editedcomment' :
+
+	$comment_id = absint( $_POST['comment_ID'] );
+	$comment_post_id = absint( $_POST['comment_post_ID'] );
+
+	check_admin_referer( 'update-comment_' . $comment_id );
+
+	edit_comment();
+
+	$location = ( empty( $_POST['referredby'] ) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id;
+	$location = apply_filters( 'comment_edit_redirect', $location, $comment_id );
+	wp_redirect( $location );
+
+	exit();
+	break;
+
+default:
+	wp_die( __('Unknown action.') );
+	break;
+
+} // end switch
+
+include('admin-footer.php');
+
+?>