From fd18739a7ae135f30fcc96b161e7ff0ce08872da Mon Sep 17 00:00:00 2001
From: ryan
Date: Mon, 25 Feb 2008 08:24:44 +0000
Subject: [PATCH] Remove moderation.php. edit-comments.php now handles
moderation
git-svn-id: http://svn.automattic.com/wordpress/trunk@7019 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
wp-admin/menu.php | 3 -
wp-admin/moderation.php | 238 ----------------------------------------
2 files changed, 241 deletions(-)
delete mode 100644 wp-admin/moderation.php
diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index 64946eb32..be02108b3 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -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['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)"), ""), 'edit_posts', 'moderation.php');
-
$submenu['edit.php'][5] = array(__('Posts'), 'edit_posts', 'edit.php');
$submenu['edit.php'][10] = array(__('Pages'), 'edit_pages', 'edit-pages.php');
diff --git a/wp-admin/moderation.php b/wp-admin/moderation.php
deleted file mode 100644
index 3ceb7d3e2..000000000
--- a/wp-admin/moderation.php
+++ /dev/null
@@ -1,238 +0,0 @@
- $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 '' . __( 'Your level is not high enough to moderate comments.' ) . '
';
- 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 '';
-
- if ( $approved > 0 ) {
- printf( __ngettext( '%s comment approved', '%s comments approved', $approved ), $approved );
- echo '
';
- }
-
- if ( $deleted > 0 ) {
- printf( __ngettext( '%s comment deleted', '%s comments deleted', $deleted ), $deleted );
- echo '
';
- }
-
- if ( $spam > 0 ) {
- printf( __ngettext( '%s comment marked as spam', '%s comments marked as spam', $spam ), $spam );
- echo '
';
- }
-
- echo '
';
- }
-}
-
-?>
-
-get_results( "SELECT * FROM $wpdb->comments WHERE comment_approved = '0'" );
-
-if ( !$comments ) {
- echo '
' . __( 'Currently there are no comments for you to moderate.' ) . '
';
- 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 );
-
-?>
-
-
- ' . $page_links . '
';
- }
- ?>
-
-
-
-