diff --git a/wp-admin/moderation.php b/wp-admin/moderation.php index caa37ec75..c359e9c49 100644 --- a/wp-admin/moderation.php +++ b/wp-admin/moderation.php @@ -1,206 +1,226 @@ $v) { - $comment[intval($k)] = $v; + +if ( isset( $_POST['comment'] ) && is_array( $_POST['comment'] ) ) { + foreach ( $_POST['comment'] as $k => $v ) { + $comment[intval( $k )] = $v; } } -switch($action) { - -case 'update': - - check_admin_referer('moderate-comments'); - - if ( !current_user_can('moderate_comments') ) - wp_die(__('Your level is not high enough to moderate comments.')); - +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 $key => $value) { - if ($feelinglucky && 'later' == $value) - $value = 'delete'; - switch($value) { - case 'later': - // do nothing with that comment - // wp_set_comment_status($key, "hold"); - ++$item_ignored; - break; - case 'delete': - wp_set_comment_status($key, 'delete'); - ++$item_deleted; - break; - case 'spam': - wp_set_comment_status($key, 'spam'); - ++$item_spam; - break; - case 'approve': - wp_set_comment_status($key, 'approve'); - if ( get_option('comments_notify') == true ) { - wp_notify_postauthor($key); + + 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; + + $item_approved++; + break; } } + + wp_redirect( basename( __FILE__ ) . '?ignored=' . $item_ignored . '&deleted=' . $item_deleted . '&approved=' . $item_approved . '&spam=' . $item_spam ); + exit; +} - $file = basename(__FILE__); - wp_redirect("$file?ignored=$item_ignored&deleted=$item_deleted&approved=$item_approved&spam=$item_spam"); - exit(); +require_once './admin-header.php'; -break; +if ( !current_user_can( 'moderate_comments' ) ) { + echo '
' . __( 'Your level is not high enough to moderate comments.' ) . '
";
- $approved = (int) $_GET['approved'];
- $deleted = (int) $_GET['deleted'];
- $ignored = (int) $_GET['ignored'];
- $spam = (int) $_GET['spam'];
- if ($approved) {
- printf(__ngettext('%s comment approved', '%s comments approved', $approved), $approved);
- echo "
\n";
+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 '