From 3a4570b0fc8b3d6339bef71d17d7701554e0bbf7 Mon Sep 17 00:00:00 2001 From: donncha Date: Fri, 12 Oct 2007 16:21:15 +0000 Subject: Merge with WP 2.3 - testing use only! Move pluggable functions out of wpmu-functions and into pluggable.php, fixes #439 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1069 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-admin/moderation.php | 344 +++++++++++++++++++++++++----------------------- 1 file changed, 182 insertions(+), 162 deletions(-) (limited to 'wp-admin/moderation.php') diff --git a/wp-admin/moderation.php b/wp-admin/moderation.php index e24a9a1..2048a6e 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': +if ( $action == 'update' ) { + check_admin_referer( 'moderate-comments' ); - check_admin_referer('moderate-comments'); - - if ( !current_user_can('moderate_comments') ) - wp_die(__('Your level is not high enough to 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); - } - ++$item_approved; - break; + foreach ( $comment as $k => $v ) { + if ( $feelinglucky && $v == 'later' ) { + $v = 'delete'; } - } - $file = basename(__FILE__); - wp_redirect("$file?ignored=$item_ignored&deleted=$item_deleted&approved=$item_approved&spam=$item_spam"); - exit(); + switch ( $v ) { + case 'later' : + $item_ignored++; + break; -break; + case 'delete' : + wp_set_comment_status( $k, 'delete' ); + $item_deleted++; + break; -default: + case 'spam' : + wp_set_comment_status( $k, 'spam' ); + $item_spam++; + break; -require_once('admin-header.php'); + case 'approve' : + wp_set_comment_status( $k, 'approve' ); -if ( isset($_GET['deleted']) || isset($_GET['approved']) || isset($_GET['ignored']) ) { - echo "
\n

"; - $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 ($deleted) { - printf(__ngettext('%s comment deleted', '%s comments deleted', $deleted), $deleted); - echo "
\n"; - } - if ($spam) { - printf(__ngettext('%s comment marked as spam', '%s comments marked as spam', $spam), $spam); - echo "
\n"; - } - if ($ignored) { - printf(__ngettext('%s comment unchanged', '%s comments unchanged', $ignored), $ignored); - echo "
\n"; + if ( get_option( 'comments_notify' ) == true ) { + wp_notify_postauthor( $k ); + } + + $item_approved++; + break; + } } - echo "

\n"; + + 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; +} -get_results("SELECT * FROM $wpdb->comments WHERE comment_approved = '0'"); -else - $comments = ''; - -if ($comments) { - // list all comments that are waiting for approval - $file = basename(__FILE__); -?> -

-
- - -
    -comment_date); - $post_title = $wpdb->get_var("SELECT post_title FROM $wpdb->posts WHERE ID='$comment->comment_post_ID'"); - if ($i % 2) $class = 'js-unapproved alternate'; - else $class = 'js-unapproved'; - echo "\n\t
  1. "; - ?> -

    comment_author_email) { ?>| comment_author_url && 'http://' != $comment->comment_author_url) { ?> | |

    - -

    — [ comment_ID.'">' . __('Edit') . ' | '; -echo " comment_post_ID."&comment=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment', $comment->comment_ID, '" . js_escape(sprintf(__("You are about to delete this comment by '%s'.\n'Cancel' to stop, 'OK' to delete."), $comment->comment_author )) . "', theCommentList );\">" . __('Delete') . " | "; ?> -comment_post_ID); -$post_title = wp_specialchars( $post->post_title, 'double' ); -$post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title; -?> - ] — - -   -   -   - -

    - -
    2. - -
+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 '

'; -

- - - - -'.__("Currently there are no comments for you to moderate.") . "

\n"; -} + ?> +
+ +$comments = $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE comment_approved = '0'" ); -' . __( 'Currently there are no comments for you to moderate.' ) . '

'; + include_once './admin-footer.php'; + exit; +} -break; +$total = count( $comments ); +$per = 100; + +if ( isset( $_GET['paged'] ) ) { + $page = (int) $_GET['paged']; +} else { + $page = 1; } +$start = ( $page * $per ) - $per; +$stop = $start + $per; -include('admin-footer.php'); +$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 . '

'; + } + ?> + +
+ + +
    + +
  1. +

    + + comment_author_email ) ) { ?>| + comment_author_url ) && $comment->comment_author_url != 'http://' ) { ?>| + | +

    + +

    + +

    + +

    + — + [ | + ', theCommentList );"> ] — + comment_post_ID ) ); ?> +

    + +

    + +   +   +   + +

    +
    2. + +
+ + ' . $page_links . '

'; + } + ?> + +
+ + + +

+ +

+ + +
+
+ -- cgit