--- a/wp/wp-admin/edit-comments.php Mon Oct 14 18:06:33 2019 +0200
+++ b/wp/wp-admin/edit-comments.php Mon Oct 14 18:28:13 2019 +0200
@@ -16,22 +16,22 @@
);
}
-$wp_list_table = _get_list_table('WP_Comments_List_Table');
-$pagenum = $wp_list_table->get_pagenum();
+$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'] ) ) {
+ 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';
+ $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'];
+ $doaction = ( $_REQUEST['action'] != -1 ) ? $_REQUEST['action'] : $_REQUEST['action2'];
} elseif ( isset( $_REQUEST['ids'] ) ) {
$comment_ids = array_map( 'absint', explode( ',', $_REQUEST['ids'] ) );
} elseif ( wp_get_referer() ) {
@@ -47,35 +47,36 @@
wp_defer_comment_counting( true );
foreach ( $comment_ids as $comment_id ) { // Check the permissions on each
- if ( !current_user_can( 'edit_comment', $comment_id ) )
+ if ( ! current_user_can( 'edit_comment', $comment_id ) ) {
continue;
+ }
switch ( $doaction ) {
- case 'approve' :
+ case 'approve':
wp_set_comment_status( $comment_id, 'approve' );
$approved++;
break;
- case 'unapprove' :
+ case 'unapprove':
wp_set_comment_status( $comment_id, 'hold' );
$unapproved++;
break;
- case 'spam' :
+ case 'spam':
wp_spam_comment( $comment_id );
$spammed++;
break;
- case 'unspam' :
+ case 'unspam':
wp_unspam_comment( $comment_id );
$unspammed++;
break;
- case 'trash' :
+ case 'trash':
wp_trash_comment( $comment_id );
$trashed++;
break;
- case 'untrash' :
+ case 'untrash':
wp_untrash_comment( $comment_id );
$untrashed++;
break;
- case 'delete' :
+ case 'delete':
wp_delete_comment( $comment_id );
$deleted++;
break;
@@ -104,47 +105,57 @@
wp_defer_comment_counting( false );
- if ( $approved )
+ if ( $approved ) {
$redirect_to = add_query_arg( 'approved', $approved, $redirect_to );
- if ( $unapproved )
+ }
+ if ( $unapproved ) {
$redirect_to = add_query_arg( 'unapproved', $unapproved, $redirect_to );
- if ( $spammed )
+ }
+ if ( $spammed ) {
$redirect_to = add_query_arg( 'spammed', $spammed, $redirect_to );
- if ( $unspammed )
+ }
+ if ( $unspammed ) {
$redirect_to = add_query_arg( 'unspammed', $unspammed, $redirect_to );
- if ( $trashed )
+ }
+ if ( $trashed ) {
$redirect_to = add_query_arg( 'trashed', $trashed, $redirect_to );
- if ( $untrashed )
+ }
+ if ( $untrashed ) {
$redirect_to = add_query_arg( 'untrashed', $untrashed, $redirect_to );
- if ( $deleted )
+ }
+ if ( $deleted ) {
$redirect_to = add_query_arg( 'deleted', $deleted, $redirect_to );
- if ( $trashed || $spammed )
+ }
+ 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;
+ wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+ exit;
}
$wp_list_table->prepare_items();
-wp_enqueue_script('admin-comments');
+wp_enqueue_script( 'admin-comments' );
enqueue_comment_hotkeys_js();
if ( $post_id ) {
- $comments_count = wp_count_comments( $post_id );
+ $comments_count = wp_count_comments( $post_id );
$draft_or_post_title = wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '…' );
if ( $comments_count->moderated > 0 ) {
- /* translators: 1: comments count 2: post title */
- $title = sprintf( __( 'Comments (%1$s) on “%2$s”' ),
+ /* translators: 1: comments count, 2: post title */
+ $title = sprintf(
+ __( 'Comments (%1$s) on “%2$s”' ),
number_format_i18n( $comments_count->moderated ),
$draft_or_post_title
);
} else {
/* translators: %s: post title */
- $title = sprintf( __( 'Comments on “%s”' ),
+ $title = sprintf(
+ __( 'Comments on “%s”' ),
$draft_or_post_title
);
}
@@ -152,7 +163,8 @@
$comments_count = wp_count_comments();
if ( $comments_count->moderated > 0 ) {
/* translators: %s: comments count */
- $title = sprintf( __( 'Comments (%s)' ),
+ $title = sprintf(
+ __( 'Comments (%s)' ),
number_format_i18n( $comments_count->moderated )
);
} else {
@@ -162,47 +174,56 @@
add_screen_option( 'per_page' );
-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 red bar on the left means the comment is waiting for you to moderate it.' ) . '</p>' .
- '<p>' . __( 'In the <strong>Author</strong> column, in addition to the author’s name, email address, and blog URL, the commenter’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, 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 there are pending comments, a red notification circle with the number of pending comments is displayed. Clicking the notification circle will filter the comments screen to show only pending comments on that post.' ) . '</p>' .
- '<p>' . __( 'In the <strong>Submitted On</strong> column, the date and time the comment was left on your site appears. Clicking on the date/time link will take you to that comment on your live site.' ) . '</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()->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 red bar on the left means the comment is waiting for you to moderate it.' ) . '</p>' .
+ '<p>' . __( 'In the <strong>Author</strong> column, in addition to the author’s name, email address, and blog URL, the commenter’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, 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 there are pending comments, a red notification circle with the number of pending comments is displayed. Clicking the notification circle will filter the comments screen to show only pending comments on that post.' ) . '</p>' .
+ '<p>' . __( 'In the <strong>Submitted On</strong> column, the date and time the comment was left on your site appears. Clicking on the date/time link will take you to that comment on your live site.' ) . '</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="https://codex.wordpress.org/Administration_Screens#Comments">Documentation on Comments</a>' ) . '</p>' .
'<p>' . __( '<a href="https://codex.wordpress.org/Comment_Spam">Documentation on Comment Spam</a>' ) . '</p>' .
'<p>' . __( '<a href="https://codex.wordpress.org/Keyboard_Shortcuts">Documentation on Keyboard Shortcuts</a>' ) . '</p>' .
- '<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
+ '<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
);
-get_current_screen()->set_screen_reader_content( array(
- 'heading_views' => __( 'Filter comments list' ),
- 'heading_pagination' => __( 'Comments list navigation' ),
- 'heading_list' => __( 'Comments list' ),
-) );
+get_current_screen()->set_screen_reader_content(
+ array(
+ 'heading_views' => __( 'Filter comments list' ),
+ 'heading_pagination' => __( 'Comments list navigation' ),
+ 'heading_list' => __( 'Comments list' ),
+ )
+);
require_once( ABSPATH . 'wp-admin/admin-header.php' );
?>
<div class="wrap">
-<h1 class="wp-heading-inline"><?php
+<h1 class="wp-heading-inline">
+<?php
if ( $post_id ) {
/* translators: %s: link to post */
- printf( __( 'Comments on “%s”' ),
- sprintf( '<a href="%1$s">%2$s</a>',
+ printf(
+ __( 'Comments on “%s”' ),
+ sprintf(
+ '<a href="%1$s">%2$s</a>',
get_edit_post_link( $post_id ),
wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '…' )
)
@@ -210,13 +231,15 @@
} else {
_e( 'Comments' );
}
-?></h1>
+?>
+</h1>
<?php
-if ( isset($_REQUEST['s']) && strlen( $_REQUEST['s'] ) ) {
+if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
echo '<span class="subtitle">';
/* translators: %s: search keywords */
- printf( __( 'Search results for “%s”' ),
+ printf(
+ __( 'Search results for “%s”' ),
wp_html_excerpt( esc_html( wp_unslash( $_REQUEST['s'] ) ), 50, '…' )
);
echo '</span>';
@@ -227,28 +250,29 @@
<?php
if ( isset( $_REQUEST['error'] ) ) {
- $error = (int) $_REQUEST['error'];
+ $error = (int) $_REQUEST['error'];
$error_msg = '';
switch ( $error ) {
- case 1 :
+ case 1:
$error_msg = __( 'Invalid comment ID.' );
break;
- case 2 :
+ case 2:
$error_msg = __( 'Sorry, you are not allowed to edit comments on this post.' );
break;
}
- if ( $error_msg )
+ if ( $error_msg ) {
echo '<div id="moderated" class="error"><p>' . $error_msg . '</p></div>';
+ }
}
-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;
+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;
+ $spammed = isset( $_REQUEST['spammed'] ) ? (int) $_REQUEST['spammed'] : 0;
$unspammed = isset( $_REQUEST['unspammed'] ) ? (int) $_REQUEST['unspammed'] : 0;
- $same = isset( $_REQUEST['same'] ) ? (int) $_REQUEST['same'] : 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 ) {
@@ -257,9 +281,9 @@
}
if ( $spammed > 0 ) {
- $ids = isset($_REQUEST['ids']) ? $_REQUEST['ids'] : 0;
+ $ids = isset( $_REQUEST['ids'] ) ? $_REQUEST['ids'] : 0;
/* translators: %s: number of comments marked as spam */
- $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 />';
+ $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 ( $unspammed > 0 ) {
@@ -268,9 +292,9 @@
}
if ( $trashed > 0 ) {
- $ids = isset($_REQUEST['ids']) ? $_REQUEST['ids'] : 0;
+ $ids = isset( $_REQUEST['ids'] ) ? $_REQUEST['ids'] : 0;
/* translators: %s: number of comments moved to the Trash */
- $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 />';
+ $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 ( $untrashed > 0 ) {
@@ -285,13 +309,13 @@
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>';
+ 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' :
+ 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' :
+ 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;
}
@@ -311,14 +335,14 @@
<?php if ( $post_id ) : ?>
<input type="hidden" name="p" value="<?php echo esc_attr( intval( $post_id ) ); ?>" />
<?php endif; ?>
-<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)); ?>" />
+<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 ) ); ?>" />
-<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') ); ?>" />
+<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 ( isset($_REQUEST['paged']) ) { ?>
+<?php if ( isset( $_REQUEST['paged'] ) ) { ?>
<input type="hidden" name="paged" value="<?php echo esc_attr( absint( $_REQUEST['paged'] ) ); ?>" />
<?php } ?>
@@ -329,6 +353,6 @@
<div id="ajax-response"></div>
<?php
-wp_comment_reply('-1', true, 'detail');
+wp_comment_reply( '-1', true, 'detail' );
wp_comment_trashnotice();
include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>