Remove moderation.php. edit-comments.php now handles moderation
git-svn-id: https://develop.svn.wordpress.org/trunk@7019 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
42e6f40f15
commit
1d1e94c7f7
|
@ -31,9 +31,6 @@ $submenu['post-new.php'][10] = array(__('Page'), 'edit_pages', 'page-new.php');
|
||||||
$submenu['post-new.php'][15] = array(__('Link'), 'manage_links', 'link-add.php');
|
$submenu['post-new.php'][15] = array(__('Link'), 'manage_links', 'link-add.php');
|
||||||
|
|
||||||
$submenu['edit-comments.php'][5] = array(__('Comments'), 'edit_posts', 'edit-comments.php');
|
$submenu['edit-comments.php'][5] = array(__('Comments'), 'edit_posts', 'edit-comments.php');
|
||||||
$awaiting_mod = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '0'");
|
|
||||||
$submenu['edit-comments.php'][25] = array(sprintf(__("Awaiting Moderation (%s)"), "<span id='awaitmod' class='comment-count'><span>$awaiting_mod</span></span>"), 'edit_posts', 'moderation.php');
|
|
||||||
|
|
||||||
|
|
||||||
$submenu['edit.php'][5] = array(__('Posts'), 'edit_posts', 'edit.php');
|
$submenu['edit.php'][5] = array(__('Posts'), 'edit_posts', 'edit.php');
|
||||||
$submenu['edit.php'][10] = array(__('Pages'), 'edit_pages', 'edit-pages.php');
|
$submenu['edit.php'][10] = array(__('Pages'), 'edit_pages', 'edit-pages.php');
|
||||||
|
|
|
@ -1,238 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
require_once './admin.php';
|
|
||||||
|
|
||||||
$title = __( 'Moderate Comments' );
|
|
||||||
$parent_file = 'edit-comments.php';
|
|
||||||
|
|
||||||
wp_enqueue_script( 'admin-comments' );
|
|
||||||
|
|
||||||
wp_reset_vars( array( 'action', 'item_ignored', 'item_deleted', 'item_approved', 'item_spam', 'feelinglucky' ) );
|
|
||||||
|
|
||||||
$comment = array();
|
|
||||||
|
|
||||||
if ( isset( $_POST['comment'] ) && is_array( $_POST['comment'] ) ) {
|
|
||||||
foreach ( $_POST['comment'] as $k => $v ) {
|
|
||||||
$comment[intval( $k )] = $v;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( $action == 'update' ) {
|
|
||||||
check_admin_referer( 'moderate-comments' );
|
|
||||||
|
|
||||||
if ( !current_user_can( 'moderate_comments' ) ) {
|
|
||||||
wp_die( __( 'Your level is not high enough to moderate comments.' ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
$item_ignored = 0;
|
|
||||||
$item_deleted = 0;
|
|
||||||
$item_approved = 0;
|
|
||||||
$item_spam = 0;
|
|
||||||
|
|
||||||
foreach ( $comment as $k => $v ) {
|
|
||||||
if ( $feelinglucky && $v == 'later' ) {
|
|
||||||
$v = 'delete';
|
|
||||||
}
|
|
||||||
|
|
||||||
switch ( $v ) {
|
|
||||||
case 'later' :
|
|
||||||
$item_ignored++;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'delete' :
|
|
||||||
wp_set_comment_status( $k, 'delete' );
|
|
||||||
$item_deleted++;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'spam' :
|
|
||||||
wp_set_comment_status( $k, 'spam' );
|
|
||||||
$item_spam++;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'approve' :
|
|
||||||
wp_set_comment_status( $k, 'approve' );
|
|
||||||
|
|
||||||
if ( get_option( 'comments_notify' ) == true ) {
|
|
||||||
wp_notify_postauthor( $k );
|
|
||||||
}
|
|
||||||
|
|
||||||
$item_approved++;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
wp_redirect( basename( __FILE__ ) . '?ignored=' . $item_ignored . '&deleted=' . $item_deleted . '&approved=' . $item_approved . '&spam=' . $item_spam );
|
|
||||||
exit;
|
|
||||||
}
|
|
||||||
|
|
||||||
require_once './admin-header.php';
|
|
||||||
|
|
||||||
if ( !current_user_can( 'moderate_comments' ) ) {
|
|
||||||
echo '<div class="wrap"><p>' . __( 'Your level is not high enough to moderate comments.' ) . '</p></div>';
|
|
||||||
include_once './admin-footer.php';
|
|
||||||
exit;
|
|
||||||
}
|
|
||||||
|
|
||||||
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['ignored'] ) ? (int) $_GET['spam'] : 0;
|
|
||||||
|
|
||||||
if ( $approved > 0 || $deleted > 0 || $spam > 0 ) {
|
|
||||||
echo '<div id="moderated" class="updated fade"><p>';
|
|
||||||
|
|
||||||
if ( $approved > 0 ) {
|
|
||||||
printf( __ngettext( '%s comment approved', '%s comments approved', $approved ), $approved );
|
|
||||||
echo '<br />';
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( $deleted > 0 ) {
|
|
||||||
printf( __ngettext( '%s comment deleted', '%s comments deleted', $deleted ), $deleted );
|
|
||||||
echo '<br />';
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( $spam > 0 ) {
|
|
||||||
printf( __ngettext( '%s comment marked as spam', '%s comments marked as spam', $spam ), $spam );
|
|
||||||
echo '<br />';
|
|
||||||
}
|
|
||||||
|
|
||||||
echo '</p></div>';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
?>
|
|
||||||
<div class="wrap">
|
|
||||||
<?php
|
|
||||||
|
|
||||||
$comments = $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE comment_approved = '0'" );
|
|
||||||
|
|
||||||
if ( !$comments ) {
|
|
||||||
echo '<p>' . __( 'Currently there are no comments for you to moderate.' ) . '</p></div>';
|
|
||||||
include_once './admin-footer.php';
|
|
||||||
exit;
|
|
||||||
}
|
|
||||||
|
|
||||||
$total = count( $comments );
|
|
||||||
$per = 100;
|
|
||||||
|
|
||||||
if ( isset( $_GET['paged'] ) ) {
|
|
||||||
$page = (int) $_GET['paged'];
|
|
||||||
} else {
|
|
||||||
$page = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
$start = ( $page * $per ) - $per;
|
|
||||||
$stop = $start + $per;
|
|
||||||
|
|
||||||
$page_links = paginate_links( array(
|
|
||||||
'base' => add_query_arg( 'paged', '%#%' ),
|
|
||||||
'format' => '',
|
|
||||||
'total' => ceil( $total / $per ),
|
|
||||||
'current' => $page,
|
|
||||||
'prev_text' => '«',
|
|
||||||
'next_text' => '»'
|
|
||||||
) );
|
|
||||||
|
|
||||||
$comments = array_slice( $comments, $start, $stop );
|
|
||||||
|
|
||||||
?>
|
|
||||||
<h2><?php _e( 'Moderation Queue' ); ?></h2>
|
|
||||||
|
|
||||||
<?php
|
|
||||||
if ( $page_links ) {
|
|
||||||
echo '<p class="pagenav">' . $page_links . '</p>';
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
|
|
||||||
<form name="approval" id="approval" action="<?php echo basename( __FILE__ ); ?>" method="post">
|
|
||||||
<?php wp_nonce_field( 'moderate-comments' ); ?>
|
|
||||||
<input type="hidden" name="action" value="update" />
|
|
||||||
<ol id="the-comment-list" class="list:comment commentlist">
|
|
||||||
<?php
|
|
||||||
$i = 0;
|
|
||||||
|
|
||||||
foreach ( $comments as $comment ) {
|
|
||||||
$class = 'js-unapproved';
|
|
||||||
|
|
||||||
if ( $i++ % 2 ) {
|
|
||||||
$class .= ' alternate';
|
|
||||||
}
|
|
||||||
|
|
||||||
$delete_url = clean_url( wp_nonce_url( "comment.php?action=deletecomment&p=$comment->comment_post_ID&c=$comment->comment_ID", "delete-comment_$comment->comment_ID" ) );
|
|
||||||
$approve_url = clean_url( wp_nonce_url( "comment.php?action=approvecomment&p=$comment->comment_post_ID&c=$comment->comment_ID", "approve-comment_$comment->comment_ID" ) );
|
|
||||||
$spam_url = clean_url( wp_nonce_url( "comment.php?action=deletecomment&dt=spam&p=$comment->comment_post_ID&c=$comment->comment_ID", "delete-comment_$comment->comment_ID" ) );
|
|
||||||
|
|
||||||
?>
|
|
||||||
<li id="comment-<?php comment_ID(); ?>" class="<?php echo $class; ?>">
|
|
||||||
<p>
|
|
||||||
<strong><?php comment_author(); ?></strong>
|
|
||||||
<?php if ( !empty( $comment->comment_author_email ) ) { ?>| <?php comment_author_email_link(); ?> <?php } ?>
|
|
||||||
<?php if ( !empty( $comment->comment_author_url ) && $comment->comment_author_url != 'http://' ) { ?>| <?php comment_author_url_link(); ?> <?php } ?>
|
|
||||||
| <?php _e( 'IP:' ); ?> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP(); ?>"><?php comment_author_IP(); ?></a>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<?php comment_text(); ?>
|
|
||||||
|
|
||||||
<p>
|
|
||||||
<?php comment_date( __( 'M j, g:i A' ) ); ?>
|
|
||||||
—
|
|
||||||
[
|
|
||||||
<a href="comment.php?action=editcomment&c=<?php comment_ID(); ?>" title="<?php _e( 'Edit this comment' ); ?>"><?php _e( 'Edit' ); ?></a>
|
|
||||||
|
|
|
||||||
<a href="<?php echo $delete_url; ?>" class="delete:the-comment-list:comment-<?php comment_ID(); ?>" title="<?php _e( 'Delete this comment' ); ?>"><?php _e( 'Delete' ); ?></a>
|
|
||||||
|
|
|
||||||
<a href="<?php echo $approve_url; ?>" class="delete:the-comment-list:comment-<?php comment_ID(); ?>:33FF33:action=dim-comment" title="<?php _e( 'Approve this comment' ); ?>"><?php _e( 'Approve' ); ?></a>
|
|
||||||
|
|
|
||||||
<a href="<?php echo $spam_url; ?>" class="delete:the-comment-list:comment-<?php comment_ID(); ?>::spam=1" title="<?php _e( 'Mark this comment as spam' ); ?>"><?php _e( 'Spam' ); ?></a>
|
|
||||||
]
|
|
||||||
—
|
|
||||||
<a href="<?php echo get_permalink( $comment->comment_post_ID ); ?>" title="<?php _e( 'View the post' ); ?>"><?php printf( __( 'View post “%s”' ), get_the_title( $comment->comment_post_ID ) ); ?></a>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<p>
|
|
||||||
<?php _e( 'Bulk action:' ); ?>
|
|
||||||
<label for="comment-<?php comment_ID(); ?>-approve"><input type="radio" name="comment[<?php comment_ID(); ?>]" id="comment-<?php comment_ID(); ?>-approve" value="approve" /> <?php _e( 'Approve' ); ?></label>
|
|
||||||
<label for="comment-<?php comment_ID(); ?>-spam"><input type="radio" name="comment[<?php comment_ID(); ?>]" id="comment-<?php comment_ID(); ?>-spam" value="spam" /> <?php _e( 'Spam' ); ?></label>
|
|
||||||
<label for="comment-<?php comment_ID(); ?>-delete"><input type="radio" name="comment[<?php comment_ID(); ?>]" id="comment-<?php comment_ID(); ?>-delete" value="delete" /> <?php _e( 'Delete' ); ?></label>
|
|
||||||
<label for="comment-<?php comment_ID(); ?>-nothing"><input type="radio" name="comment[<?php comment_ID(); ?>]" id="comment-<?php comment_ID(); ?>-nothing" value="later" checked="checked" /> <?php _e( 'No action' ); ?></label>
|
|
||||||
</p>
|
|
||||||
</li>
|
|
||||||
<?php
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</ol>
|
|
||||||
|
|
||||||
<?php
|
|
||||||
if ( $page_links ) {
|
|
||||||
echo '<p class="pagenav">' . $page_links . '</p>';
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
|
|
||||||
<div id="ajax-response"></div>
|
|
||||||
|
|
||||||
<noscript>
|
|
||||||
<p class="submit">
|
|
||||||
<label for="feelinglucky"><input name="feelinglucky" id="feelinglucky" type="checkbox" value="true" /> <?php _e( 'Delete every comment marked “defer.” <strong>Warning: This can’t be undone.</strong>' ); ?></label>
|
|
||||||
</p>
|
|
||||||
</noscript>
|
|
||||||
|
|
||||||
<p class="submit">
|
|
||||||
<input type="submit" id="submit" name="submit" value="<?php _e( 'Bulk Moderate Comments' ); ?>" />
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
|
||||||
// <![CDATA[
|
|
||||||
function mark_all_as( what ) {
|
|
||||||
for ( var i = 0; i < document.approval.length; i++ ) {
|
|
||||||
if ( document.approval[i].value == what ) {
|
|
||||||
document.approval[i].checked = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
document.write( '<p><strong><?php _e( 'Mark all:' ); ?></strong> <a href="javascript:mark_all_as(\'approve\')"><?php _e( 'Approved' ); ?></a> – <a href="javascript:mark_all_as(\'spam\')"><?php _e( 'Spam' ); ?></a> – <a href="javascript:mark_all_as(\'delete\')"><?php _e( 'Deleted' ); ?></a> – <a href="javascript:mark_all_as(\'later\')"><?php _e( 'Later' ); ?></a></p>' );
|
|
||||||
// ]]>
|
|
||||||
</script>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
<?php include_once './admin-footer.php'; ?>
|
|
Loading…
Reference in New Issue