WordPress 3.8

[autoinstalls/wordpress.git] / wp-admin / edit-comments.php

diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index 43eecffc87dd9f54097ce1f18f6a7c99f0f428db..b12264a02c2012c9d361c25e7dc7f2bc468d7116 100644 (file)
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -1,393 +1,254 @@
 <?php
 /**
 <?php
 /**

- * Edit Comments Administration Panel.
+ * Edit Comments Administration Screen.

  *
  * @package WordPress
  * @subpackage Administration
  */
 
 /** WordPress Administration Bootstrap */
  *
  * @package WordPress
  * @subpackage Administration
  */
 
 /** WordPress Administration Bootstrap */

-require_once('admin.php');
-
-wp_enqueue_script('admin-comments');
-enqueue_comment_hotkeys_js();
+require_once( dirname( __FILE__ ) . '/admin.php' );
+if ( !current_user_can('edit_posts') )
+       wp_die(__('Cheatin&#8217; uh?'));
+
+$wp_list_table = _get_list_table('WP_Comments_List_Table');
+$pagenum = $wp_list_table->get_pagenum();
+
+$doaction = $wp_list_table->current_action();
+
+if ( $doaction ) {
+       check_admin_referer( 'bulk-comments' );
+
+       if ( 'delete_all' == $doaction && !empty( $_REQUEST['pagegen_timestamp'] ) ) {
+               $comment_status = wp_unslash( $_REQUEST['comment_status'] );
+               $delete_time = wp_unslash( $_REQUEST['pagegen_timestamp'] );
+               $comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_approved = %s AND %s > comment_date_gmt", $comment_status, $delete_time ) );
+               $doaction = 'delete';
+       } elseif ( isset( $_REQUEST['delete_comments'] ) ) {
+               $comment_ids = $_REQUEST['delete_comments'];
+               $doaction = ( $_REQUEST['action'] != -1 ) ? $_REQUEST['action'] : $_REQUEST['action2'];
+       } elseif ( isset( $_REQUEST['ids'] ) ) {
+               $comment_ids = array_map( 'absint', explode( ',', $_REQUEST['ids'] ) );
+       } elseif ( wp_get_referer() ) {
+               wp_safe_redirect( wp_get_referer() );
+               exit;
+       }

 
 

-$post_id = isset($_REQUEST['p']) ? (int) $_REQUEST['p'] : 0;
+       $approved = $unapproved = $spammed = $unspammed = $trashed = $untrashed = $deleted = 0;

 
 

-if ( ( isset( $_REQUEST['delete_all_spam'] ) || isset( $_REQUEST['delete_all_spam2'] ) ) && !empty( $_REQUEST['pagegen_timestamp'] ) ) {
-       check_admin_referer('bulk-spam-delete', '_spam_nonce');
+       $redirect_to = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'spammed', 'unspammed', 'approved', 'unapproved', 'ids' ), wp_get_referer() );
+       $redirect_to = add_query_arg( 'paged', $pagenum, $redirect_to );

 
 

-       $delete_time = $wpdb->escape( $_REQUEST['pagegen_timestamp'] );
-       if ( current_user_can('moderate_comments')) {
-               $deleted_spam = $wpdb->query( "DELETE FROM $wpdb->comments WHERE comment_approved = 'spam' AND '$delete_time' > comment_date_gmt" );
-       } else {
-               $deleted_spam = 0;
-       }
-       $redirect_to = 'edit-comments.php?comment_status=spam&deleted=' . (int) $deleted_spam;
-       if ( $post_id )
-               $redirect_to = add_query_arg( 'p', absint( $post_id ), $redirect_to );
-       wp_redirect( $redirect_to );
-} elseif ( isset($_REQUEST['delete_comments']) && isset($_REQUEST['action']) && ( -1 != $_REQUEST['action'] || -1 != $_REQUEST['action2'] ) ) {
-       check_admin_referer('bulk-comments');
-       $doaction = ( -1 != $_REQUEST['action'] ) ? $_REQUEST['action'] : $_REQUEST['action2'];
-
-       $deleted = $approved = $unapproved = $spammed = 0;
-       foreach ( (array) $_REQUEST['delete_comments'] as $comment_id) : // Check the permissions on each
-               $comment_id = (int) $comment_id;
-               $_post_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT comment_post_ID FROM $wpdb->comments WHERE comment_ID = %d", $comment_id) );
-
-               if ( !current_user_can('edit_post', $_post_id) )
+       foreach ( $comment_ids as $comment_id ) { // Check the permissions on each
+               if ( !current_user_can( 'edit_comment', $comment_id ) )

                        continue;
 
                        continue;
 

-               switch( $doaction ) {
-                       case 'markspam' :
-                               wp_set_comment_status($comment_id, 'spam');
-                               $spammed++;
-                               break;
-                       case 'delete' :
-                               wp_set_comment_status($comment_id, 'delete');
-                               $deleted++;
-                               break;
+               switch ( $doaction ) {

                        case 'approve' :
                        case 'approve' :

-                               wp_set_comment_status($comment_id, 'approve');
+                               wp_set_comment_status( $comment_id, 'approve' );

                                $approved++;
                                break;
                        case 'unapprove' :
                                $approved++;
                                break;
                        case 'unapprove' :

-                               wp_set_comment_status($comment_id, 'hold');
+                               wp_set_comment_status( $comment_id, 'hold' );

                                $unapproved++;
                                break;
                                $unapproved++;
                                break;

+                       case 'spam' :
+                               wp_spam_comment( $comment_id );
+                               $spammed++;
+                               break;
+                       case 'unspam' :
+                               wp_unspam_comment( $comment_id );
+                               $unspammed++;
+                               break;
+                       case 'trash' :
+                               wp_trash_comment( $comment_id );
+                               $trashed++;
+                               break;
+                       case 'untrash' :
+                               wp_untrash_comment( $comment_id );
+                               $untrashed++;
+                               break;
+                       case 'delete' :
+                               wp_delete_comment( $comment_id );
+                               $deleted++;
+                               break;

                }
                }

-       endforeach;
-
-       $redirect_to = 'edit-comments.php?deleted=' . $deleted . '&approved=' . $approved . '&spam=' . $spammed . '&unapproved=' . $unapproved;
-       if ( $post_id )
-               $redirect_to = add_query_arg( 'p', absint( $post_id ), $redirect_to );
-       if ( isset($_REQUEST['apage']) )
-               $redirect_to = add_query_arg( 'apage', absint($_REQUEST['apage']), $redirect_to );
-       if ( !empty($_REQUEST['mode']) )
-               $redirect_to = add_query_arg('mode', $_REQUEST['mode'], $redirect_to);
-       if ( !empty($_REQUEST['comment_status']) )
-               $redirect_to = add_query_arg('comment_status', $_REQUEST['comment_status'], $redirect_to);
-       if ( !empty($_REQUEST['s']) )
-               $redirect_to = add_query_arg('s', $_REQUEST['s'], $redirect_to);
-       wp_redirect( $redirect_to );
-} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {
-        wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );
+       }
+
+       if ( $approved )
+               $redirect_to = add_query_arg( 'approved', $approved, $redirect_to );
+       if ( $unapproved )
+               $redirect_to = add_query_arg( 'unapproved', $unapproved, $redirect_to );
+       if ( $spammed )
+               $redirect_to = add_query_arg( 'spammed', $spammed, $redirect_to );
+       if ( $unspammed )
+               $redirect_to = add_query_arg( 'unspammed', $unspammed, $redirect_to );
+       if ( $trashed )
+               $redirect_to = add_query_arg( 'trashed', $trashed, $redirect_to );
+       if ( $untrashed )
+               $redirect_to = add_query_arg( 'untrashed', $untrashed, $redirect_to );
+       if ( $deleted )
+               $redirect_to = add_query_arg( 'deleted', $deleted, $redirect_to );
+       if ( $trashed || $spammed )
+               $redirect_to = add_query_arg( 'ids', join( ',', $comment_ids ), $redirect_to );
+
+       wp_safe_redirect( $redirect_to );
+       exit;
+} elseif ( ! empty( $_GET['_wp_http_referer'] ) ) {
+        wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );

         exit;
 }
 
         exit;
 }
 

-if ( $post_id )
-       $title = sprintf(__('Edit Comments on &#8220;%s&#8221;'), wp_html_excerpt(_draft_or_post_title($post_id), 50));
-else
-       $title = __('Edit Comments');
-
-require_once('admin-header.php');
-
-$mode = ( ! isset($_GET['mode']) || empty($_GET['mode']) ) ? 'detail' : attribute_escape($_GET['mode']);
-
-$comment_status = !empty($_GET['comment_status']) ? attribute_escape($_GET['comment_status']) : '';
+$wp_list_table->prepare_items();

 
 

-$comment_type = !empty($_GET['comment_type']) ? attribute_escape($_GET['comment_type']) : '';
+wp_enqueue_script('admin-comments');
+enqueue_comment_hotkeys_js();

 
 

-$search_dirty = ( isset($_GET['s']) ) ? $_GET['s'] : '';
-$search = attribute_escape( $search_dirty ); ?>
+if ( $post_id )
+       $title = sprintf( __( 'Comments on &#8220;%s&#8221;' ), wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '&hellip;' ) );
+else
+       $title = __('Comments');
+
+add_screen_option( 'per_page', array('label' => _x( 'Comments', 'comments per page (screen options)' )) );
+
+get_current_screen()->add_help_tab( array(
+'id'           => 'overview',
+'title'                => __('Overview'),
+'content'      =>
+       '<p>' . __( 'You can manage comments made on your site similar to the way you manage posts and other content. This screen is customizable in the same ways as other management screens, and you can act on comments using the on-hover action links or the Bulk Actions.' ) . '</p>'
+) );
+get_current_screen()->add_help_tab( array(
+'id'           => 'moderating-comments',
+'title'                => __('Moderating Comments'),
+'content'      =>
+               '<p>' . __( 'A yellow row means the comment is waiting for you to moderate it.' ) . '</p>' .
+               '<p>' . __( 'In the <strong>Author</strong> column, in addition to the author&#8217;s name, email address, and blog URL, the commenter&#8217;s IP address is shown. Clicking on this link will show you all the comments made from this IP address.' ) . '</p>' .
+               '<p>' . __( 'In the <strong>Comment</strong> column, above each comment it says &#8220;Submitted on,&#8221; followed by the date and time the comment was left on your site. Clicking on the date/time link will take you to that comment on your live site. Hovering over any comment gives you options to approve, reply (and approve), quick edit, edit, spam mark, or trash that comment.' ) . '</p>' .
+               '<p>' . __( 'In the <strong>In Response To</strong> column, there are three elements. The text is the name of the post that inspired the comment, and links to the post editor for that entry. The View Post link leads to that post on your live site. The small bubble with the number in it shows the number of approved comments that post has received. If the bubble is gray, you have moderated all comments for that post. If it is blue, there are pending comments. Clicking the bubble will filter the comments screen to show only comments on that post.' ) . '</p>' .
+               '<p>' . __( 'Many people take advantage of keyboard shortcuts to moderate their comments more quickly. Use the link to the side to learn more.' ) . '</p>'
+) );
+
+get_current_screen()->set_help_sidebar(
+       '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+       '<p>' . __( '<a href="http://codex.wordpress.org/Administration_Screens#Comments" target="_blank">Documentation on Comments</a>' ) . '</p>' .
+       '<p>' . __( '<a href="http://codex.wordpress.org/Comment_Spam" target="_blank">Documentation on Comment Spam</a>' ) . '</p>' .
+       '<p>' . __( '<a href="http://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">Documentation on Keyboard Shortcuts</a>' ) . '</p>' .
+       '<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
+);
+
+require_once( ABSPATH . 'wp-admin/admin-header.php' );
+?>

 
 <div class="wrap">
 
 <div class="wrap">

-<?php screen_icon(); ?>
-<h2><?php echo wp_specialchars( $title );
-if ( isset($_GET['s']) && $_GET['s'] )
-       printf( '<span class="subtitle">' . sprintf( __( 'Search results for &#8220;%s&#8221;' ), wp_html_excerpt( wp_specialchars( stripslashes( $_GET['s'] ) ), 50 ) ) . '</span>' ); ?>
+<h2><?php
+if ( $post_id )
+       echo sprintf( __( 'Comments on &#8220;%s&#8221;' ),
+               sprintf( '<a href="%s">%s</a>',
+                       get_edit_post_link( $post_id ),
+                       wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '&hellip;' )
+               )
+       );
+else
+       echo __('Comments');
+
+if ( isset($_REQUEST['s']) && $_REQUEST['s'] )
+       echo '<span class="subtitle">' . sprintf( __( 'Search results for &#8220;%s&#8221;' ), wp_html_excerpt( esc_html( wp_unslash( $_REQUEST['s'] ) ), 50, '&hellip;' ) ) . '</span>'; ?>

 </h2>
 
 <?php
 </h2>
 
 <?php

-if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['spam'] ) ) {
-       $approved = isset( $_GET['approved'] ) ? (int) $_GET['approved'] : 0;
-       $deleted = isset( $_GET['deleted'] ) ? (int) $_GET['deleted'] : 0;
-       $spam = isset( $_GET['spam'] ) ? (int) $_GET['spam'] : 0;
-
-       if ( $approved > 0 || $deleted > 0 || $spam > 0 ) {
-               echo '<div id="moderated" class="updated fade"><p>';
+if ( isset( $_REQUEST['error'] ) ) {
+       $error = (int) $_REQUEST['error'];
+       $error_msg = '';
+       switch ( $error ) {
+               case 1 :
+                       $error_msg = __( 'Oops, no comment with this ID.' );
+                       break;
+               case 2 :
+                       $error_msg = __( 'You are not allowed to edit comments on this post.' );
+                       break;
+       }
+       if ( $error_msg )
+               echo '<div id="moderated" class="error"><p>' . $error_msg . '</p></div>';
+}

 
 

-               if ( $approved > 0 ) {
-                       printf( __ngettext( '%s comment approved', '%s comments approved', $approved ), $approved );
-                       echo '<br />';
+if ( isset($_REQUEST['approved']) || isset($_REQUEST['deleted']) || isset($_REQUEST['trashed']) || isset($_REQUEST['untrashed']) || isset($_REQUEST['spammed']) || isset($_REQUEST['unspammed']) || isset($_REQUEST['same']) ) {
+       $approved  = isset( $_REQUEST['approved']  ) ? (int) $_REQUEST['approved']  : 0;
+       $deleted   = isset( $_REQUEST['deleted']   ) ? (int) $_REQUEST['deleted']   : 0;
+       $trashed   = isset( $_REQUEST['trashed']   ) ? (int) $_REQUEST['trashed']   : 0;
+       $untrashed = isset( $_REQUEST['untrashed'] ) ? (int) $_REQUEST['untrashed'] : 0;
+       $spammed   = isset( $_REQUEST['spammed']   ) ? (int) $_REQUEST['spammed']   : 0;
+       $unspammed = isset( $_REQUEST['unspammed'] ) ? (int) $_REQUEST['unspammed'] : 0;
+       $same      = isset( $_REQUEST['same'] )      ? (int) $_REQUEST['same']      : 0;
+
+       if ( $approved > 0 || $deleted > 0 || $trashed > 0 || $untrashed > 0 || $spammed > 0 || $unspammed > 0 || $same > 0 ) {
+               if ( $approved > 0 )
+                       $messages[] = sprintf( _n( '%s comment approved', '%s comments approved', $approved ), $approved );
+
+               if ( $spammed > 0 ) {
+                       $ids = isset($_REQUEST['ids']) ? $_REQUEST['ids'] : 0;
+                       $messages[] = sprintf( _n( '%s comment marked as spam.', '%s comments marked as spam.', $spammed ), $spammed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=unspam&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo') . '</a><br />';

                }
 
                }
 

-               if ( $deleted > 0 ) {
-                       printf( __ngettext( '%s comment deleted', '%s comments deleted', $deleted ), $deleted );
-                       echo '<br />';
+               if ( $unspammed > 0 )
+                       $messages[] = sprintf( _n( '%s comment restored from the spam', '%s comments restored from the spam', $unspammed ), $unspammed );
+
+               if ( $trashed > 0 ) {
+                       $ids = isset($_REQUEST['ids']) ? $_REQUEST['ids'] : 0;
+                       $messages[] = sprintf( _n( '%s comment moved to the Trash.', '%s comments moved to the Trash.', $trashed ), $trashed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=untrash&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo') . '</a><br />';

                }
 
                }
 

-               if ( $spam > 0 ) {
-                       printf( __ngettext( '%s comment marked as spam', '%s comments marked as spam', $spam ), $spam );
-                       echo '<br />';
+               if ( $untrashed > 0 )
+                       $messages[] = sprintf( _n( '%s comment restored from the Trash', '%s comments restored from the Trash', $untrashed ), $untrashed );
+
+               if ( $deleted > 0 )
+                       $messages[] = sprintf( _n( '%s comment permanently deleted', '%s comments permanently deleted', $deleted ), $deleted );
+
+               if ( $same > 0 && $comment = get_comment( $same ) ) {
+                       switch ( $comment->comment_approved ) {
+                               case '1' :
+                                       $messages[] = __('This comment is already approved.') . ' <a href="' . esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ) . '">' . __( 'Edit comment' ) . '</a>';
+                                       break;
+                               case 'trash' :
+                                       $messages[] = __( 'This comment is already in the Trash.' ) . ' <a href="' . esc_url( admin_url( 'edit-comments.php?comment_status=trash' ) ) . '"> ' . __( 'View Trash' ) . '</a>';
+                                       break;
+                               case 'spam' :
+                                       $messages[] = __( 'This comment is already marked as spam.' ) . ' <a href="' . esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ) . '">' . __( 'Edit comment' ) . '</a>';
+                                       break;
+                       }

                }
 
                }
 

-               echo '</p></div>';
+               echo '<div id="moderated" class="updated"><p>' . implode( "<br/>\n", $messages ) . '</p></div>';

        }
 }
 ?>
 
        }
 }
 ?>
 

-<form id="comments-form" action="" method="get">
-<ul class="subsubsub">
-<?php
-$status_links = array();
-$num_comments = ( $post_id ) ? wp_count_comments( $post_id ) : wp_count_comments();
-//, number_format_i18n($num_comments->moderated) ), "<span class='comment-count'>" . number_format_i18n($num_comments->moderated) . "</span>"),
-//, number_format_i18n($num_comments->spam) ), "<span class='spam-comment-count'>" . number_format_i18n($num_comments->spam) . "</span>")
-$stati = array(
-               'all' => __ngettext_noop('All', 'All'), // singular not used
-               'moderated' => __ngettext_noop('Pending (<span class="pending-count">%s</span>)', 'Pending (<span class="pending-count">%s</span>)'),
-               'approved' => __ngettext_noop('Approved', 'Approved'), // singular not used
-               'spam' => __ngettext_noop('Spam (<span class="spam-count">%s</span>)', 'Spam (<span class="spam-count">%s</span>)')
-       );
-$class = ( '' === $comment_status ) ? ' class="current"' : '';
-// $status_links[] = "<li><a href='edit-comments.php'$class>" . __( 'All' ) . '</a>';
-$link = 'edit-comments.php';
-if ( !empty($comment_type) && 'all' != $comment_type )
-       $link = add_query_arg( 'comment_type', $comment_type, $link );
-foreach ( $stati as $status => $label ) {
-       $class = '';
-
-       if ( str_replace( 'all', '', $status ) == $comment_status )
-               $class = ' class="current"';
-       if ( !isset( $num_comments->$status ) )
-               $num_comments->$status = 10;
-       if ( 'all' != $status )
-               $link = add_query_arg( 'comment_status', $status, $link );
-       if ( $post_id )
-               $link = add_query_arg( 'p', absint( $post_id ), $link );
-       /*
-       // I toyed with this, but decided against it. Leaving it in here in case anyone thinks it is a good idea. ~ Mark
-       if ( !empty( $_GET['s'] ) )
-               $link = add_query_arg( 's', attribute_escape( stripslashes( $_GET['s'] ) ), $link );
-       */
-       $status_links[] = "<li class='$status'><a href='$link'$class>" . sprintf(
-               __ngettext( $label[0], $label[1], $num_comments->$status ),
-               number_format_i18n( $num_comments->$status )
-       ) . '</a>';
-}
-
-$status_links = apply_filters( 'comment_status_links', $status_links );
-
-echo implode( " |</li>\n", $status_links) . '</li>';
-unset($status_links);
-?>
-</ul>
-
-<p class="search-box">
-       <label class="hidden" for="comment-search-input"><?php _e( 'Search Comments' ); ?>:</label>
-       <input type="text" class="search-input" id="comment-search-input" name="s" value="<?php _admin_search_query(); ?>" />
-       <input type="submit" value="<?php _e( 'Search Comments' ); ?>" class="button" />
-</p>
-
-<?php
-$comments_per_page = apply_filters('comments_per_page', 20, $comment_status);
+<?php $wp_list_table->views(); ?>

 
 

-if ( isset( $_GET['apage'] ) )
-       $page = abs( (int) $_GET['apage'] );
-else
-       $page = 1;
-
-$start = $offset = ( $page - 1 ) * $comments_per_page;
-
-list($_comments, $total) = _wp_get_comment_list( $comment_status, $search_dirty, $start, $comments_per_page + 5, $post_id, $comment_type ); // Grab a few extra
-
-$_comment_post_ids = array();
-foreach ( $_comments as $_c ) {
-       $_comment_post_ids[] = $_c->comment_post_ID;
-}
-$_comment_pending_count_temp = (array) get_pending_comments_num($_comment_post_ids);
-foreach ( (array) $_comment_post_ids as $_cpid )
-       $_comment_pending_count[$_cpid] = isset( $_comment_pending_count_temp[$_cpid] ) ? $_comment_pending_count_temp[$_cpid] : 0;
-if ( empty($_comment_pending_count) )
-       $_comment_pending_count = array();
-
-$comments = array_slice($_comments, 0, $comments_per_page);
-$extra_comments = array_slice($_comments, $comments_per_page);
-
-$page_links = paginate_links( array(
-       'base' => add_query_arg( 'apage', '%#%' ),
-       'format' => '',
-       'prev_text' => __('&laquo;'),
-       'next_text' => __('&raquo;'),
-       'total' => ceil($total / $comments_per_page),
-       'current' => $page
-));
+<form id="comments-form" action="" method="get">

 
 

-?>
+<?php $wp_list_table->search_box( __( 'Search Comments' ), 'comment' ); ?>

 
 

-<input type="hidden" name="mode" value="<?php echo $mode; ?>" />

 <?php if ( $post_id ) : ?>
 <?php if ( $post_id ) : ?>

-<input type="hidden" name="p" value="<?php echo intval( $post_id ); ?>" />
-<?php endif; ?>
-<input type="hidden" name="comment_status" value="<?php echo $comment_status; ?>" />
-<input type="hidden" name="pagegen_timestamp" value="<?php echo current_time('mysql', 1); ?>" />
-
-<div class="tablenav">
-
-<?php if ( $page_links ) : ?>
-<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
-       number_format_i18n( $start + 1 ),
-       number_format_i18n( min( $page * $comments_per_page, $total ) ),
-       number_format_i18n( $total ),
-       $page_links
-); echo $page_links_text; ?></div>
-<?php endif; ?>
-
-<div class="alignleft actions">
-<select name="action">
-<option value="-1" selected="selected"><?php _e('Bulk Actions') ?></option>
-<?php if ( empty($comment_status) || 'approved' == $comment_status ): ?>
-<option value="unapprove"><?php _e('Unapprove'); ?></option>
-<?php endif; ?>
-<?php if ( empty($comment_status) || 'moderated' == $comment_status || 'spam' == $comment_status ): ?>
-<option value="approve"><?php _e('Approve'); ?></option>
-<?php endif; ?>
-<?php if ( 'spam' != $comment_status ): ?>
-<option value="markspam"><?php _e('Mark as Spam'); ?></option>
+<input type="hidden" name="p" value="<?php echo esc_attr( intval( $post_id ) ); ?>" />

 <?php endif; ?>
 <?php endif; ?>

-<option value="delete"><?php _e('Delete'); ?></option>
-</select>
-<input type="submit" name="doaction" id="doaction" value="<?php _e('Apply'); ?>" class="button-secondary apply" />
-<?php wp_nonce_field('bulk-comments'); ?>
-
-<?php if ( $comment_status ) echo "<input type='hidden' name='comment_status' value='$comment_status' />\n"; ?>
-<select name="comment_type">
-       <option value="all"><?php _e('Show all comment types'); ?></option>
-<?php
-       $comment_types = apply_filters( 'admin_comment_types_dropdown', array(
-               'comment' => __('Comments'),
-               'pings' => __('Pings'),
-       ) );
-
-       foreach ( $comment_types as $type => $label ) {
-               echo "  <option value='$type'";
-               selected( $comment_type, $type );
-               echo ">$label</option>\n";
-       }
-?>
-</select>
-<input type="submit" id="post-query-submit" value="<?php _e('Filter'); ?>" class="button-secondary" />
-
-<?php if ( isset($_GET['apage']) ) { ?>
-       <input type="hidden" name="apage" value="<?php echo absint( $_GET['apage'] ); ?>" />
-<?php }
-
-if ( 'spam' == $comment_status ) {
-       wp_nonce_field('bulk-spam-delete', '_spam_nonce'); 
-        if ( current_user_can ('moderate_comments')) { ?>
-               <input type="submit" name="delete_all_spam" value="<?php _e('Delete All Spam'); ?>" class="button-secondary apply" />
-<?php  }
-} ?>
-<?php do_action('manage_comments_nav', $comment_status); ?>
-</div>
-
-<br class="clear" />
-
-</div>
-
-<div class="clear"></div>
-
-<?php if ( $comments ) { ?>
-<table class="widefat comments fixed" cellspacing="0">
-<thead>
-       <tr>
-<?php print_column_headers('edit-comments'); ?>
-       </tr>
-</thead>
-
-<tfoot>
-       <tr>
-<?php print_column_headers('edit-comments', false); ?>
-       </tr>
-</tfoot>
-
-<tbody id="the-comment-list" class="list:comment">
-<?php
-       foreach ($comments as $comment)
-               _wp_comment_row( $comment->comment_ID, $mode, $comment_status );
-?>
-</tbody>
-<tbody id="the-extra-comment-list" class="list:comment" style="display: none;">
-<?php
-       foreach ($extra_comments as $comment)
-               _wp_comment_row( $comment->comment_ID, $mode, $comment_status );
-?>
-</tbody>
-</table>
-
-<div class="tablenav">
-<?php
-if ( $page_links )
-       echo "<div class='tablenav-pages'>$page_links_text</div>";
-?>
+<input type="hidden" name="comment_status" value="<?php echo esc_attr($comment_status); ?>" />
+<input type="hidden" name="pagegen_timestamp" value="<?php echo esc_attr(current_time('mysql', 1)); ?>" />

 
 

-<div class="alignleft actions">
-<select name="action2">
-<option value="-1" selected="selected"><?php _e('Bulk Actions') ?></option>
-<?php if ( empty($comment_status) || 'approved' == $comment_status ): ?>
-<option value="unapprove"><?php _e('Unapprove'); ?></option>
-<?php endif; ?>
-<?php if ( empty($comment_status) || 'moderated' == $comment_status || 'spam' == $comment_status ): ?>
-<option value="approve"><?php _e('Approve'); ?></option>
-<?php endif; ?>
-<?php if ( 'spam' != $comment_status ): ?>
-<option value="markspam"><?php _e('Mark as Spam'); ?></option>
-<?php endif; ?>
-<option value="delete"><?php _e('Delete'); ?></option>
-</select>
-<input type="submit" name="doaction2" id="doaction2" value="<?php _e('Apply'); ?>" class="button-secondary apply" />
+<input type="hidden" name="_total" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg('total_items') ); ?>" />
+<input type="hidden" name="_per_page" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg('per_page') ); ?>" />
+<input type="hidden" name="_page" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg('page') ); ?>" />

 
 

-<?php if ( 'spam' == $comment_status ) { ?>
-<input type="submit" name="delete_all_spam2" value="<?php _e('Delete All Spam'); ?>" class="button-secondary apply" />
+<?php if ( isset($_REQUEST['paged']) ) { ?>
+       <input type="hidden" name="paged" value="<?php echo esc_attr( absint( $_REQUEST['paged'] ) ); ?>" />

 <?php } ?>
 <?php } ?>

-<?php do_action('manage_comments_nav', $comment_status); ?>
-</div>
-
-<br class="clear" />
-</div>

 
 

+<?php $wp_list_table->display(); ?>

 </form>
 </form>

-
-<form id="get-extra-comments" method="post" action="" class="add:the-extra-comment-list:" style="display: none;">
-       <input type="hidden" name="s" value="<?php echo $search; ?>" />
-       <input type="hidden" name="mode" value="<?php echo $mode; ?>" />
-       <input type="hidden" name="comment_status" value="<?php echo $comment_status; ?>" />
-       <input type="hidden" name="page" value="<?php echo isset($_REQUEST['page']) ? absint( $_REQUEST['page'] ) : 1; ?>" />
-       <input type="hidden" name="p" value="<?php echo attribute_escape( $post_id ); ?>" />
-       <input type="hidden" name="comment_type" value="<?php echo attribute_escape( $comment_type ); ?>" />
-       <?php wp_nonce_field( 'add-comment', '_ajax_nonce', false ); ?>
-</form>
-
-<div id="ajax-response"></div>
-
-<?php } elseif ( 'moderated' == $_GET['comment_status'] ) { ?>
-<p><?php _e('No comments awaiting moderation&hellip; yet.') ?></p>
-</form>
-
-<?php } else { ?>
-<p><?php _e('No results found.') ?></p>
-</form>
-
-<?php } ?>

 </div>
 
 </div>
 

-<script type="text/javascript">
-/* <![CDATA[ */
-(function($){
-       $(document).ready(function(){
-               $('#doaction, #doaction2').click(function(){
-                       if ( $('select[name^="action"]').val() == 'delete' ) {
-                               var m = '<?php echo js_escape(__("You are about to delete the selected comments.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
-                               return showNotice.warn(m);
-                       }
-               });
-       });
-})(jQuery);
-/* ]]> */
-</script>
+<div id="ajax-response"></div>

 
 <?php
 wp_comment_reply('-1', true, 'detail');
 
 <?php
 wp_comment_reply('-1', true, 'detail');

-include('admin-footer.php'); ?>
+wp_comment_trashnotice();
+include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>