X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/61343b82c4f0da4c68e4c6373daafff4a81efdd1..refs/tags/wordpress-4.3:/wp-admin/includes/class-wp-comments-list-table.php diff --git a/wp-admin/includes/class-wp-comments-list-table.php b/wp-admin/includes/class-wp-comments-list-table.php index 23f3169d..fcfcd1e3 100644 --- a/wp-admin/includes/class-wp-comments-list-table.php +++ b/wp-admin/includes/class-wp-comments-list-table.php @@ -17,11 +17,27 @@ */ class WP_Comments_List_Table extends WP_List_Table { - var $checkbox = true; - - var $pending_count = array(); - - function __construct( $args = array() ) { + public $checkbox = true; + + public $pending_count = array(); + + public $extra_items; + + private $user_can; + + /** + * Constructor. + * + * @since 3.1.0 + * @access public + * + * @see WP_List_Table::__construct() for more information on default arguments. + * + * @global int $post_id + * + * @param array $args An associative array of arguments. + */ + public function __construct( $args = array() ) { global $post_id; $post_id = isset( $_REQUEST['p'] ) ? absint( $_REQUEST['p'] ) : 0; @@ -37,11 +53,21 @@ class WP_Comments_List_Table extends WP_List_Table { ) ); } - function ajax_user_can() { + /** + * @return bool + */ + public function ajax_user_can() { return current_user_can('edit_posts'); } - function prepare_items() { + /** + * + * @global int $post_id + * @global string $comment_status + * @global string $search + * @global string $comment_type + */ + public function prepare_items() { global $post_id, $comment_status, $search, $comment_type; $comment_status = isset( $_REQUEST['comment_status'] ) ? $_REQUEST['comment_status'] : 'all'; @@ -52,6 +78,8 @@ class WP_Comments_List_Table extends WP_List_Table { $search = ( isset( $_REQUEST['s'] ) ) ? $_REQUEST['s'] : ''; + $post_type = ( isset( $_REQUEST['post_type'] ) ) ? sanitize_key( $_REQUEST['post_type'] ) : ''; + $user_id = ( isset( $_REQUEST['user_id'] ) ) ? $_REQUEST['user_id'] : ''; $orderby = ( isset( $_REQUEST['orderby'] ) ) ? $_REQUEST['orderby'] : ''; @@ -96,25 +124,26 @@ class WP_Comments_List_Table extends WP_List_Table { 'type' => $comment_type, 'orderby' => $orderby, 'order' => $order, + 'post_type' => $post_type, ); $_comments = get_comments( $args ); + if ( is_array( $_comments ) ) { + update_comment_cache( $_comments ); - update_comment_cache( $_comments ); + $this->items = array_slice( $_comments, 0, $comments_per_page ); + $this->extra_items = array_slice( $_comments, $comments_per_page ); - $this->items = array_slice( $_comments, 0, $comments_per_page ); - $this->extra_items = array_slice( $_comments, $comments_per_page ); + $_comment_post_ids = array_unique( wp_list_pluck( $_comments, 'comment_post_ID' ) ); - $total_comments = get_comments( array_merge( $args, array('count' => true, 'offset' => 0, 'number' => 0) ) ); - - $_comment_post_ids = array(); - foreach ( $_comments as $_c ) { - $_comment_post_ids[] = $_c->comment_post_ID; + $this->pending_count = get_pending_comments_num( $_comment_post_ids ); } - $_comment_post_ids = array_unique( $_comment_post_ids ); - - $this->pending_count = get_pending_comments_num( $_comment_post_ids ); + $total_comments = get_comments( array_merge( $args, array( + 'count' => true, + 'offset' => 0, + 'number' => 0 + ) ) ); $this->set_pagination_args( array( 'total_items' => $total_comments, @@ -122,13 +151,29 @@ class WP_Comments_List_Table extends WP_List_Table { ) ); } - function get_per_page( $comment_status = 'all' ) { + /** + * + * @param string $comment_status + * @return int + */ + public function get_per_page( $comment_status = 'all' ) { $comments_per_page = $this->get_items_per_page( 'edit_comments_per_page' ); - $comments_per_page = apply_filters( 'comments_per_page', $comments_per_page, $comment_status ); - return $comments_per_page; + /** + * Filter the number of comments listed per page in the comments list table. + * + * @since 2.6.0 + * + * @param int $comments_per_page The number of comments to list per page. + * @param string $comment_status The comment status name. Default 'All'. + */ + return apply_filters( 'comments_per_page', $comments_per_page, $comment_status ); } - function no_items() { + /** + * + * @global string $comment_status + */ + public function no_items() { global $comment_status; if ( 'moderated' == $comment_status ) @@ -137,7 +182,13 @@ class WP_Comments_List_Table extends WP_List_Table { _e( 'No comments found.' ); } - function get_views() { + /** + * + * @global int $post_id + * @global string $comment_status + * @global string $comment_type + */ + protected function get_views() { global $post_id, $comment_status, $comment_type; $status_links = array(); @@ -178,11 +229,24 @@ class WP_Comments_List_Table extends WP_List_Table { ) . ''; } - $status_links = apply_filters( 'comment_status_links', $status_links ); - return $status_links; + /** + * Filter the comment status links. + * + * @since 2.5.0 + * + * @param array $status_links An array of fully-formed status links. Default 'All'. + * Accepts 'All', 'Pending', 'Approved', 'Spam', and 'Trash'. + */ + return apply_filters( 'comment_status_links', $status_links ); } - function get_bulk_actions() { + /** + * + * @global string $comment_status + * + * @return array + */ + protected function get_bulk_actions() { global $comment_status; $actions = array(); @@ -190,7 +254,7 @@ class WP_Comments_List_Table extends WP_List_Table { $actions['unapprove'] = __( 'Unapprove' ); if ( in_array( $comment_status, array( 'all', 'moderated' ) ) ) $actions['approve'] = __( 'Approve' ); - if ( in_array( $comment_status, array( 'all', 'moderated', 'approved' ) ) ) + if ( in_array( $comment_status, array( 'all', 'moderated', 'approved', 'trash' ) ) ) $actions['spam'] = _x( 'Mark as Spam', 'comment' ); if ( 'trash' == $comment_status ) @@ -206,28 +270,48 @@ class WP_Comments_List_Table extends WP_List_Table { return $actions; } - function extra_tablenav( $which ) { + /** + * + * @global string $comment_status + * @global string $comment_type + * + * @param string $which + */ + protected function extra_tablenav( $which ) { global $comment_status, $comment_type; ?>
- + __( 'Comments' ), 'pings' => __( 'Pings' ), ) ); foreach ( $comment_types as $type => $label ) - echo "\t\n"; + echo "\t" . '\n"; ?> 'post-query-submit' ) ); + submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) ); } if ( ( 'spam' == $comment_status || 'trash' == $comment_status ) && current_user_can( 'moderate_comments' ) ) { @@ -235,18 +319,34 @@ class WP_Comments_List_Table extends WP_List_Table { $title = ( 'spam' == $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' ); submit_button( $title, 'apply', 'delete_all', false ); } + /** + * Fires after the Filter submit button for comment types. + * + * @since 2.5.0 + * + * @param string $comment_status The comment status name. Default 'All'. + */ do_action( 'manage_comments_nav', $comment_status ); echo '
'; } - function current_action() { + /** + * @return string|false + */ + public function current_action() { if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) ) return 'delete_all'; return parent::current_action(); } - function get_columns() { + /** + * + * @global int $post_id + * + * @return array + */ + public function get_columns() { global $post_id; $columns = array(); @@ -257,40 +357,53 @@ class WP_Comments_List_Table extends WP_List_Table { $columns['author'] = __( 'Author' ); $columns['comment'] = _x( 'Comment', 'column name' ); - if ( !$post_id ) - $columns['response'] = _x( 'In Response To', 'column name' ); + if ( ! $post_id ) { + /* translators: column name or table row header */ + $columns['response'] = __( 'In Response To' ); + } return $columns; } - function get_sortable_columns() { + /** + * + * @return array + */ + protected function get_sortable_columns() { return array( 'author' => 'comment_author', 'response' => 'comment_post_ID' ); } - function display() { - extract( $this->_args ); + /** + * Get the name of the default primary column. + * + * @since 4.3.0 + * @access protected + * + * @return string Name of the default primary column, in this case, 'comment'. + */ + protected function get_default_primary_column_name() { + return 'comment'; + } + /** + * @access public + */ + public function display() { wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' ); $this->display_tablenav( 'top' ); ?> - +
print_column_headers(); ?> - - - print_column_headers( false ); ?> - - - display_rows_or_placeholder(); ?> @@ -298,17 +411,35 @@ class WP_Comments_List_Table extends WP_List_Table { items = $this->extra_items; $this->display_rows(); ?> + + + + print_column_headers( false ); ?> + + +
display_tablenav( 'bottom' ); } - function single_row( $a_comment ) { + /** + * + * @global WP_Post $post + * @global object $comment + * + * @param object $a_comment + */ + public function single_row( $a_comment ) { global $post, $comment; $comment = $a_comment; - $the_comment_class = join( ' ', get_comment_class( wp_get_comment_status( $comment->comment_ID ) ) ); + $the_comment_class = wp_get_comment_status( $comment->comment_ID ); + if ( ! $the_comment_class ) { + $the_comment_class = ''; + } + $the_comment_class = join( ' ', get_comment_class( $the_comment_class, $comment->comment_ID, $comment->comment_post_ID ) ); $post = get_post( $comment->comment_post_ID ); @@ -319,7 +450,126 @@ class WP_Comments_List_Table extends WP_List_Table { echo "\n"; } - function column_cb( $comment ) { + /** + * Generate and display row actions links. + * + * @since 4.3.0 + * @access protected + * + * @param object $comment Comment being acted upon. + * @param string $column_name Current column name. + * @param string $primary Primary column name. + * @return string|void Comment row actions output. + */ + protected function handle_row_actions( $comment, $column_name, $primary ) { + global $comment_status; + + if ( $primary !== $column_name ) { + return ''; + } + + if ( ! $this->user_can ) { + return; + } + + $the_comment_status = wp_get_comment_status( $comment->comment_ID ); + + $out = ''; + + $del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) ); + $approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) ); + + $url = "comment.php?c=$comment->comment_ID"; + + $approve_url = esc_url( $url . "&action=approvecomment&$approve_nonce" ); + $unapprove_url = esc_url( $url . "&action=unapprovecomment&$approve_nonce" ); + $spam_url = esc_url( $url . "&action=spamcomment&$del_nonce" ); + $unspam_url = esc_url( $url . "&action=unspamcomment&$del_nonce" ); + $trash_url = esc_url( $url . "&action=trashcomment&$del_nonce" ); + $untrash_url = esc_url( $url . "&action=untrashcomment&$del_nonce" ); + $delete_url = esc_url( $url . "&action=deletecomment&$del_nonce" ); + + // Preorder it: Approve | Reply | Quick Edit | Edit | Spam | Trash. + $actions = array( + 'approve' => '', 'unapprove' => '', + 'reply' => '', + 'quickedit' => '', + 'edit' => '', + 'spam' => '', 'unspam' => '', + 'trash' => '', 'untrash' => '', 'delete' => '' + ); + + // Not looking at all comments. + if ( $comment_status && 'all' != $comment_status ) { + if ( 'approved' == $the_comment_status ) { + $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; + } elseif ( 'unapproved' == $the_comment_status ) { + $actions['approve'] = "" . __( 'Approve' ) . ''; + } + } else { + $actions['approve'] = "" . __( 'Approve' ) . ''; + $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; + } + + if ( 'spam' != $the_comment_status ) { + $actions['spam'] = "" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . ''; + } elseif ( 'spam' == $the_comment_status ) { + $actions['unspam'] = "" . _x( 'Not Spam', 'comment' ) . ''; + } + + if ( 'trash' == $the_comment_status ) { + $actions['untrash'] = "" . __( 'Restore' ) . ''; + } + + if ( 'spam' == $the_comment_status || 'trash' == $the_comment_status || !EMPTY_TRASH_DAYS ) { + $actions['delete'] = "" . __( 'Delete Permanently' ) . ''; + } else { + $actions['trash'] = "" . _x( 'Trash', 'verb' ) . ''; + } + + if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) { + $actions['edit'] = "". __( 'Edit' ) . ''; + + $format = '%s'; + + $actions['quickedit'] = sprintf( $format, $comment->comment_ID, $comment->comment_post_ID, 'edit', 'vim-q comment-inline',esc_attr__( 'Edit this item inline' ), __( 'Quick Edit' ) ); + + $actions['reply'] = sprintf( $format, $comment->comment_ID, $comment->comment_post_ID, 'replyto', 'vim-r comment-inline', esc_attr__( 'Reply to this comment' ), __( 'Reply' ) ); + } + + /** This filter is documented in wp-admin/includes/dashboard.php */ + $actions = apply_filters( 'comment_row_actions', array_filter( $actions ), $comment ); + + $i = 0; + $out .= '
'; + foreach ( $actions as $action => $link ) { + ++$i; + ( ( ( 'approve' == $action || 'unapprove' == $action ) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | '; + + // Reply and quickedit need a hide-if-no-js span when not added with ajax + if ( ( 'reply' == $action || 'quickedit' == $action ) && ! defined('DOING_AJAX') ) + $action .= ' hide-if-no-js'; + elseif ( ( $action == 'untrash' && $the_comment_status == 'trash' ) || ( $action == 'unspam' && $the_comment_status == 'spam' ) ) { + if ( '1' == get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true ) ) + $action .= ' approve'; + else + $action .= ' unapprove'; + } + + $out .= "$sep$link"; + } + $out .= '
'; + + $out .= ''; + + return $out; + } + + /** + * + * @param object $comment + */ + public function column_cb( $comment ) { if ( $this->user_can ) { ?> @@ -327,29 +577,15 @@ class WP_Comments_List_Table extends WP_List_Table { } } - function column_comment( $comment ) { - global $comment_status; - $post = get_post(); - - $user_can = $this->user_can; - + /** + * @param object $comment + */ + public function column_comment( $comment ) { $comment_url = esc_url( get_comment_link( $comment->comment_ID ) ); - $the_comment_status = wp_get_comment_status( $comment->comment_ID ); - - if ( $user_can ) { - $del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) ); - $approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) ); - - $url = "comment.php?c=$comment->comment_ID"; - $approve_url = esc_url( $url . "&action=approvecomment&$approve_nonce" ); - $unapprove_url = esc_url( $url . "&action=unapprovecomment&$approve_nonce" ); - $spam_url = esc_url( $url . "&action=spamcomment&$del_nonce" ); - $unspam_url = esc_url( $url . "&action=unspamcomment&$del_nonce" ); - $trash_url = esc_url( $url . "&action=trashcomment&$del_nonce" ); - $untrash_url = esc_url( $url . "&action=untrashcomment&$del_nonce" ); - $delete_url = esc_url( $url . "&action=deletecomment&$del_nonce" ); - } + echo '
'; + $this->column_author( $comment ); + echo '
'; echo '
'; /* translators: 2: comment date, 3: comment time */ @@ -368,9 +604,12 @@ class WP_Comments_List_Table extends WP_List_Table { echo '
'; comment_text(); - if ( $user_can ) { ?> + if ( $this->user_can ) { ?> '', 'unapprove' => '', - 'reply' => '', - 'quickedit' => '', - 'edit' => '', - 'spam' => '', 'unspam' => '', - 'trash' => '', 'untrash' => '', 'delete' => '' - ); - - if ( $comment_status && 'all' != $comment_status ) { // not looking at all comments - if ( 'approved' == $the_comment_status ) - $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; - else if ( 'unapproved' == $the_comment_status ) - $actions['approve'] = "" . __( 'Approve' ) . ''; - } else { - $actions['approve'] = "" . __( 'Approve' ) . ''; - $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; - } - - if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) { - $actions['spam'] = "" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . ''; - } elseif ( 'spam' == $the_comment_status ) { - $actions['unspam'] = "" . _x( 'Not Spam', 'comment' ) . ''; - } elseif ( 'trash' == $the_comment_status ) { - $actions['untrash'] = "" . __( 'Restore' ) . ''; - } - - if ( 'spam' == $the_comment_status || 'trash' == $the_comment_status || !EMPTY_TRASH_DAYS ) { - $actions['delete'] = "" . __( 'Delete Permanently' ) . ''; - } else { - $actions['trash'] = "" . _x( 'Trash', 'verb' ) . ''; - } - - if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) { - $actions['edit'] = "". __( 'Edit' ) . ''; - $actions['quickedit'] = '' . __( 'Quick Edit' ) . ''; - $actions['reply'] = '' . __( 'Reply' ) . ''; - } - - $actions = apply_filters( 'comment_row_actions', array_filter( $actions ), $comment ); - - $i = 0; - echo '
'; - foreach ( $actions as $action => $link ) { - ++$i; - ( ( ( 'approve' == $action || 'unapprove' == $action ) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | '; - - // Reply and quickedit need a hide-if-no-js span when not added with ajax - if ( ( 'reply' == $action || 'quickedit' == $action ) && ! defined('DOING_AJAX') ) - $action .= ' hide-if-no-js'; - elseif ( ( $action == 'untrash' && $the_comment_status == 'trash' ) || ( $action == 'unspam' && $the_comment_status == 'spam' ) ) { - if ( '1' == get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true ) ) - $action .= ' approve'; - else - $action .= ' unapprove'; - } - - echo "$sep$link"; - } - echo '
'; - } } - function column_author( $comment ) { + /** + * + * @global string $comment_status + * + * @param object $comment + */ + public function column_author( $comment ) { global $comment_status; $author_url = get_comment_author_url(); @@ -463,24 +644,36 @@ class WP_Comments_List_Table extends WP_List_Table { comment_author_email_link(); echo '
'; } - echo ''; - comment_author_IP(); - echo ''; + + $author_ip = get_comment_author_IP(); + if ( $author_ip ) { + $author_ip_url = add_query_arg( array( 's' => $author_ip, 'mode' => 'detail' ), 'edit-comments.php' ); + if ( 'spam' == $comment_status ) { + $author_ip_url = add_query_arg( 'comment_status', 'spam', $author_ip_url ); + } + printf( '%s', esc_url( $author_ip_url ), $author_ip ); + } } } - function column_date( $comment ) { - return get_comment_date( __( 'Y/m/d \a\t g:ia' ) ); + /** + * + * @return string + */ + public function column_date() { + return get_comment_date( __( 'Y/m/d \a\t g:i a' ) ); } - function column_response( $comment ) { + /** + * @access public + */ + public function column_response() { $post = get_post(); + if ( ! $post ) { + return; + } + if ( isset( $this->pending_count[$post->ID] ) ) { $pending_comments = $this->pending_count[$post->ID]; } else { @@ -489,24 +682,39 @@ class WP_Comments_List_Table extends WP_List_Table { } if ( current_user_can( 'edit_post', $post->ID ) ) { - $post_link = ""; - $post_link .= get_the_title( $post->ID ) . ''; + $post_link = ""; + $post_link .= esc_html( get_the_title( $post->ID ) ) . ''; } else { - $post_link = get_the_title( $post->ID ); + $post_link = esc_html( get_the_title( $post->ID ) ); } - echo '
'; - echo $post_link . '
'; + echo '
'; + if ( 'attachment' == $post->post_type && ( $thumb = wp_get_attachment_image( $post->ID, array( 80, 60 ), true ) ) ) { + echo $thumb; + } + echo $post_link; + $post_type_object = get_post_type_object( $post->post_type ); + echo "" . $post_type_object->labels->view_item . ''; + echo ''; $this->comments_bubble( $post->ID, $pending_comments ); echo ' '; - $post_type_object = get_post_type_object( $post->post_type ); - echo "" . $post_type_object->labels->view_item . ''; echo '
'; - if ( 'attachment' == $post->post_type && ( $thumb = wp_get_attachment_image( $post->ID, array( 80, 60 ), true ) ) ) - echo $thumb; } - function column_default( $comment, $column_name ) { + /** + * + * @param object $comment + * @param string $column_name + */ + public function column_default( $comment, $column_name ) { + /** + * Fires when the default column output is displayed for a single row. + * + * @since 2.8.0 + * + * @param string $column_name The custom column's name. + * @param int $comment->comment_ID The custom column's unique ID number. + */ do_action( 'manage_comments_custom_column', $column_name, $comment->comment_ID ); } } @@ -523,39 +731,61 @@ class WP_Comments_List_Table extends WP_List_Table { */ class WP_Post_Comments_List_Table extends WP_Comments_List_Table { - function get_column_info() { - $this->_column_headers = array( + /** + * + * @return array + */ + protected function get_column_info() { + return array( array( - 'author' => __( 'Author' ), - 'comment' => _x( 'Comment', 'column name' ), + 'author' => __( 'Author' ), + 'comment' => _x( 'Comment', 'column name' ), ), array(), array(), + 'comment', ); - - return $this->_column_headers; } - function get_table_classes() { + /** + * + * @return array + */ + protected function get_table_classes() { $classes = parent::get_table_classes(); + $classes[] = 'wp-list-table'; $classes[] = 'comments-box'; return $classes; } - function display( $output_empty = false ) { - extract( $this->_args ); + /** + * + * @param bool $output_empty + */ + public function display( $output_empty = false ) { + $singular = $this->_args['singular']; wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' ); ?> - - > - display_rows_or_placeholder(); ?> + + > + display_rows_or_placeholder(); + } ?>