Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 09:37:42 +01:00
Code Issues Projects Releases Wiki Activity

Cron order for single-post Edit Comments page. Remember Single Post when searching, switching comment statuses, and filtering comment types

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@10082 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2008-12-06 03:59:03 +00:00
parent c800a64625
commit 56935938b0
2 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
wp-admin/edit-comments.php
View File

@ -12,13 +12,18 @@ require_once('admin.php');
wp_enqueue_script('admin-comments'); wp_enqueue_script('admin-comments');
enqueue_comment_hotkeys_js(); enqueue_comment_hotkeys_js();
$post_id = isset($_REQUEST['p']) ? (int) $_REQUEST['p'] : 0;
if ( ( isset( $_REQUEST['delete_all_spam'] ) || isset( $_REQUEST['delete_all_spam2'] ) ) && !empty( $_REQUEST['pagegen_timestamp'] ) ) { if ( ( isset( $_REQUEST['delete_all_spam'] ) || isset( $_REQUEST['delete_all_spam2'] ) ) && !empty( $_REQUEST['pagegen_timestamp'] ) ) {
check_admin_referer('bulk-spam-delete', '_spam_nonce'); check_admin_referer('bulk-spam-delete', '_spam_nonce');
$delete_time = $wpdb->escape( $_REQUEST['pagegen_timestamp'] ); $delete_time = $wpdb->escape( $_REQUEST['pagegen_timestamp'] );
$deleted_spam = $wpdb->query( "DELETE FROM $wpdb->comments WHERE comment_approved = 'spam' AND '$delete_time' > comment_date_gmt" ); $deleted_spam = $wpdb->query( "DELETE FROM $wpdb->comments WHERE comment_approved = 'spam' AND '$delete_time' > comment_date_gmt" );
wp_redirect('edit-comments.php?comment_status=spam&deleted=' . (int) $deleted_spam); $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'] ) ) { } elseif ( isset($_REQUEST['delete_comments']) && isset($_REQUEST['action']) && ( -1 != $_REQUEST['action'] || -1 != $_REQUEST['action2'] ) ) {
check_admin_referer('bulk-comments'); check_admin_referer('bulk-comments');
$doaction = ( -1 != $_REQUEST['action'] ) ? $_REQUEST['action'] : $_REQUEST['action2']; $doaction = ( -1 != $_REQUEST['action'] ) ? $_REQUEST['action'] : $_REQUEST['action2'];
@ -26,9 +31,9 @@ if ( ( isset( $_REQUEST['delete_all_spam'] ) || isset( $_REQUEST['delete_all_spa
$deleted = $approved = $unapproved = $spammed = 0; $deleted = $approved = $unapproved = $spammed = 0;
foreach ( (array) $_REQUEST['delete_comments'] as $comment_id) : // Check the permissions on each foreach ( (array) $_REQUEST['delete_comments'] as $comment_id) : // Check the permissions on each
$comment_id = (int) $comment_id; $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) ); $_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) ) if ( !current_user_can('edit_post', $_post_id) )
continue; continue;
switch( $doaction ) { switch( $doaction ) {
@ -52,6 +57,8 @@ if ( ( isset( $_REQUEST['delete_all_spam'] ) || isset( $_REQUEST['delete_all_spa
endforeach; endforeach;
$redirect_to = 'edit-comments.php?deleted=' . $deleted . '&approved=' . $approved . '&spam=' . $spammed . '&unapproved=' . $unapproved; $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']) ) if ( isset($_REQUEST['apage']) )
$redirect_to = add_query_arg( 'apage', absint($_REQUEST['apage']), $redirect_to ); $redirect_to = add_query_arg( 'apage', absint($_REQUEST['apage']), $redirect_to );
if ( !empty($_REQUEST['mode']) ) if ( !empty($_REQUEST['mode']) )
@ -66,8 +73,6 @@ if ( ( isset( $_REQUEST['delete_all_spam'] ) || isset( $_REQUEST['delete_all_spa
exit; exit;
} }
$post_id = isset($_GET['p']) ? (int) $_GET['p'] : 0;
if ( $post_id ) if ( $post_id )
$title = sprintf(__('Edit Comments on “%s”'), wp_html_excerpt(_draft_or_post_title($post_id), 50)); $title = sprintf(__('Edit Comments on “%s”'), wp_html_excerpt(_draft_or_post_title($post_id), 50));
else else
@ -88,7 +93,7 @@ $search = attribute_escape( $search_dirty ); ?>
<?php screen_icon(); ?> <?php screen_icon(); ?>
<h2><?php echo wp_specialchars( $title ); <h2><?php echo wp_specialchars( $title );
if ( isset($_GET['s']) && $_GET['s'] ) if ( isset($_GET['s']) && $_GET['s'] )
printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', wp_specialchars( stripslashes($_GET['s']) ) ); ?> printf( '<span class="subtitle">' . sprintf( __( 'Search results for &#8220;%s&#8221;' ), wp_html_excerpt( wp_specialchars( stripslashes( $_GET['s'] ) ), 50 ) ) . '</span>' ); ?>
</h2> </h2>
<?php <?php
@ -124,26 +129,37 @@ if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['sp
<ul class="subsubsub"> <ul class="subsubsub">
<?php <?php
$status_links = array(); $status_links = array();
$num_comments = wp_count_comments(); $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->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>") //, number_format_i18n($num_comments->spam) ), "<span class='spam-comment-count'>" . number_format_i18n($num_comments->spam) . "</span>")
$stati = array( $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>)'), '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 '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>)') 'spam' => __ngettext_noop('Spam (<span class="spam-count">%s</span>)', 'Spam (<span class="spam-count">%s</span>)')
); );
$class = ( '' === $comment_status ) ? ' class="current"' : ''; $class = ( '' === $comment_status ) ? ' class="current"' : '';
$status_links[] = "<li><a href='edit-comments.php'$class>" . __( 'All' ) . '</a>'; // $status_links[] = "<li><a href='edit-comments.php'$class>" . __( 'All' ) . '</a>';
$type = ( !$comment_type && 'all' != $comment_type ) ? '' : "&amp;comment_type=$comment_type"; $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 ) { foreach ( $stati as $status => $label ) {
$class = ''; $class = '';
if ( $status == $comment_status ) if ( str_replace( 'all', '', $status ) == $comment_status )
$class = ' class="current"'; $class = ' class="current"';
if ( !isset( $num_comments->$status ) ) if ( !isset( $num_comments->$status ) )
$num_comments->$status = 10; $num_comments->$status = 10;
if ( 'all' != $status )
$status_links[] = "<li class='$status'><a href='edit-comments.php?comment_status=$status$type'$class>" . sprintf( $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 ), __ngettext( $label[0], $label[1], $num_comments->$status ),
number_format_i18n( $num_comments->$status ) number_format_i18n( $num_comments->$status )
) . '</a>'; ) . '</a>';
@ -189,6 +205,9 @@ $page_links = paginate_links( array(
?> ?>
<input type="hidden" name="mode" value="<?php echo $mode; ?>" /> <input type="hidden" name="mode" value="<?php echo $mode; ?>" />
<?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="comment_status" value="<?php echo $comment_status; ?>" />
<input type="hidden" name="pagegen_timestamp" value="<?php echo current_time('mysql', 1); ?>" /> <input type="hidden" name="pagegen_timestamp" value="<?php echo current_time('mysql', 1); ?>" />

11
wp-admin/includes/template.php
View File

@ -1890,10 +1890,13 @@ function _wp_get_comment_list( $status = '', $s = false, $start, $num, $post = 0
else else
$approved = "( comment_approved = '0' OR comment_approved = '1' )"; $approved = "( comment_approved = '0' OR comment_approved = '1' )";
if ( $post ) if ( $post ) {
$post = " AND comment_post_ID = '$post'"; $post = " AND comment_post_ID = '$post'";
else $orderby = "ORDER BY comment_date_gmt ASC LIMIT $start, $num";
} else {
$post = ''; $post = '';
$orderby = "ORDER BY comment_date_gmt DESC LIMIT $start, $num";
}
if ( 'comment' == $type ) if ( 'comment' == $type )
$typesql = "AND comment_type = ''"; $typesql = "AND comment_type = ''";
@ -1916,9 +1919,9 @@ function _wp_get_comment_list( $status = '', $s = false, $start, $num, $post = 0
comment_content LIKE ('%$s%') ) AND comment_content LIKE ('%$s%') ) AND
$approved $approved
$typesql $typesql
ORDER BY comment_date_gmt DESC LIMIT $start, $num"); $orderby");
} else { } else {
$comments = $wpdb->get_results( "SELECT SQL_CALC_FOUND_ROWS * FROM $wpdb->comments WHERE $approved $post $typesql ORDER BY comment_date_gmt DESC LIMIT $start, $num" ); $comments = $wpdb->get_results( "SELECT SQL_CALC_FOUND_ROWS * FROM $wpdb->comments WHERE $approved $post $typesql $orderby" );
} }
update_comment_cache($comments); update_comment_cache($comments);