sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Manage comments rework. WIP. 

git-svn-id: https://develop.svn.wordpress.org/trunk@6993 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren 2008-02-23 08:01:51 +00:00
parent d3e38c175d
commit 761816fa76
2 changed files with 117 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,23 +6,6 @@ $parent_file = 'edit-comments.php';
wp_enqueue_script( 'admin-comments' ); wp_enqueue_script( 'admin-comments' );
wp_enqueue_script('admin-forms'); wp_enqueue_script('admin-forms');
require_once('admin-header.php');
if (empty($_GET['mode'])) $mode = 'view';
else $mode = attribute_escape($_GET['mode']);
?>
<div class="wrap">
<h2><?php _e('Comments'); ?></h2>
<form name="searchform" action="" method="get" id="editcomments">
<fieldset>
<legend><?php _e('Show Comments That Contain...') ?></legend>
<input type="text" name="s" value="<?php if (isset($_GET['s'])) echo attribute_escape($_GET['s']); ?>" size="17" />
<input type="submit" name="submit" value="<?php _e('Search') ?>" class="button" />
<input type="hidden" name="mode" value="<?php echo $mode; ?>" />
<?php _e('(Searches within comment text, e-mail, URL, and IP address.)') ?>
</fieldset>
</form>
<p><a href="?mode=view"><?php _e('View Mode') ?></a> | <a href="?mode=edit"><?php _e('Mass Edit Mode') ?></a></p>
<?php
if ( !empty( $_POST['delete_comments'] ) ) : if ( !empty( $_POST['delete_comments'] ) ) :
check_admin_referer('bulk-comments'); check_admin_referer('bulk-comments');
@ -39,6 +22,7 @@ if ( !empty( $_POST['delete_comments'] ) ) :
++$i; ++$i;
} }
endforeach; endforeach;
/*
echo '<div style="background-color: rgb(207, 235, 247);" id="message" class="updated fade"><p>'; echo '<div style="background-color: rgb(207, 235, 247);" id="message" class="updated fade"><p>';
if ( !empty( $_POST['spam_button'] ) ) { if ( !empty( $_POST['spam_button'] ) ) {
printf(__ngettext('%s comment marked as spam.', '%s comments marked as spam.', $i), $i); printf(__ngettext('%s comment marked as spam.', '%s comments marked as spam.', $i), $i);
@ -46,8 +30,54 @@ if ( !empty( $_POST['delete_comments'] ) ) :
printf(__ngettext('%s comment deleted.', '%s comments deleted.', $i), $i); printf(__ngettext('%s comment deleted.', '%s comments deleted.', $i), $i);
} }
echo '</p></div>'; echo '</p></div>';
*/
// TODO redirect with message
endif; endif;
require_once('admin-header.php');
if (empty($_GET['mode'])) $mode = 'view';
else $mode = attribute_escape($_GET['mode']);
?>
<div class="wrap">
<form id="posts-filter" action="" method="get">
<h2><?php _e('Manage Comments'); ?></h2>
<ul class="subsubsub">
<?php
if ( isset($_GET['comment_status']) )
$comment_status = $_GET['comment_status'];
else
$comment_status = '';
$status_links = array();
$num_posts = wp_count_posts('post');
$stati = array('moderated' => __('Awaiting Moderation'), 'approved' => __('Approved'));
foreach ( $stati as $status => $label ) {
$class = '';
if ( $status == $comment_status )
$class = ' class="current"';
$status_links[] = "<li><a href=\"edit-comments.php?comment_status=$status\"$class>" . $label . '</a>';
}
$class = ( '' === $comment_status ) ? ' class="current"' : '';
$status_links[] = "<li><a href=\"edit-comments.php\"$class>".__('All Comments')."</a>";
echo implode(' |</li>', $status_links) . '</li>';
unset($status_links);
?>
</ul>
<p id="post-search">
<input type="text" id="post-search-input" name="s" value="<?php if (isset($_GET['s'])) echo attribute_escape($_GET['s']); ?>" />
<input type="submit" value="<?php _e( 'Search Comments' ); ?>" class="button" />
</p>
<input type="hidden" name="mode" value="<?php echo $mode; ?>" />
<p><a href="?mode=view"><?php _e('View Mode') ?></a> | <a href="?mode=edit"><?php _e('Mass Edit Mode') ?></a></p>
<?php
if ( isset( $_GET['apage'] ) ) if ( isset( $_GET['apage'] ) )
$page = abs( (int) $_GET['apage'] ); $page = abs( (int) $_GET['apage'] );
else else
@ -55,7 +85,7 @@ else
$start = $offset = ( $page - 1 ) * 20; $start = $offset = ( $page - 1 ) * 20;
list($_comments, $total) = _wp_get_comment_list( isset($_GET['s']) ? $_GET['s'] : false, $start, 25 ); // Grab a few extra list($_comments, $total) = _wp_get_comment_list( $comment_status, isset($_GET['s']) ? $_GET['s'] : false, $start, 25 ); // Grab a few extra
$comments = array_slice($_comments, 0, 20); $comments = array_slice($_comments, 0, 20);
$extra_comments = array_slice($_comments, 20); $extra_comments = array_slice($_comments, 20);
@ -67,117 +97,98 @@ $page_links = paginate_links( array(
'current' => $page 'current' => $page
)); ));
if ( $page_links )
echo "<p class='pagenav'>$page_links</p>";
if ('view' == $mode) {
if ($comments) {
$offset = $offset + 1;
$start = " start='$offset'";
echo "<ol id='the-comment-list' class='list:comment commentlist' $start>\n";
$i = 0;
foreach ( $comments as $comment ) {
_wp_comment_list_item( $comment->comment_ID, ++$i );
}
echo "</ol>\n\n";
if ( $extra_comments ) : ?>
<div id="extra-comments" style="display:none">
<ol id="the-extra-comment-list" class="list:comment commentlist" style="color:red">
<?php
foreach ( $extra_comments as $comment ) {
get_comment( $comment ); // Cache it
_wp_comment_list_item( $comment->comment_ID, 0 );
}
?> ?>
</ol>
<form action="" method="get" id="get-extra-comments" class="add:the-extra-comment-list:">
<input type="hidden" name="page" value="<?php echo $page; ?>" />
<input type="hidden" name="s" value="<?php echo attribute_escape(@$_GET['s']); ?>" />
<?php wp_nonce_field( 'add-comment', '_ajax_nonce', false ); ?>
</form>
</div>
<?php endif; // $extra_comments ?>
<div id="ajax-response"></div> <br style="clear:both;" />
<div class="tablenav">
<?php <?php
} else { //no comments to show if ( $page_links )
echo "<div class='tablenav-pages'>$page_links</div>";
?>
?> <div style="float: left">
<p> <input type="submit" value="<?php _e('Approve'); ?>" name="approveit" class="button-secondary" />
<strong><?php _e('No comments found.') ?></strong></p> <input type="submit" value="<?php _e('Mark as Spam'); ?>" name="spamit" class="button-secondary" />
<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary" />
<?php wp_nonce_field('bulk-comments'); ?>
</div>
<?php <br style="clear:both;" />
} // end if ($comments) </div>
} elseif ('edit' == $mode) {
if ($comments) { <br style="clear:both;" />
echo '<form name="deletecomments" id="deletecomments" action="" method="post"> '; <?php
wp_nonce_field('bulk-comments'); if ($comments) {
echo '<table class="widefat"> ?>
<table class="widefat">
<thead> <thead>
<tr> <tr>
<th scope="col" style="text-align: center"><input type="checkbox" onclick="checkAll(document.getElementById(\'deletecomments\'));" /></th> <th scope="col" style="text-align: center"><input type="checkbox" onclick="checkAll(document.getElementById('posts-filter'));" /></th>
<th scope="col">' . __('Name') . '</th> <th scope="col"><?php _e('Comment') ?></th>
<th scope="col">' . __('E-mail') . '</th> <th scope="col"><?php _e('Date') ?></th>
<th scope="col">' . __('IP') . '</th> <th scope="col"><?php _e('Actions') ?></th>
<th scope="col">' . __('Comment Excerpt') . '</th>
<th scope="col" colspan="3" style="text-align: center">' . __('Actions') . '</th>
</tr> </tr>
</thead> </thead>
<tbody id="the-comment-list" class="list:comment">'; <tbody id="the-comment-list" class="list:comment">
foreach ($comments as $comment) { <?php
foreach ($comments as $comment) {
$post = get_post($comment->comment_post_ID); $post = get_post($comment->comment_post_ID);
$authordata = get_userdata($post->post_author); $authordata = get_userdata($post->post_author);
$comment_status = wp_get_comment_status($comment->comment_ID); $comment_status = wp_get_comment_status($comment->comment_ID);
$class = ('alternate' == $class) ? '' : 'alternate'; $class = ('alternate' == $class) ? '' : 'alternate';
$class .= ('unapproved' == $comment_status) ? ' unapproved' : ''; $class .= ('unapproved' == $comment_status) ? ' unapproved' : '';
$post_link = '<a href="' . get_comment_link() . '">' . get_the_title($comment->comment_post_ID) . '</a>';
$author_url = get_comment_author_url();
if ( 'http://' == $author_url )
$author_url = '';
?> ?>
<tr id="comment-<?php echo $comment->comment_ID; ?>" class='<?php echo $class; ?>'> <tr id="comment-<?php echo $comment->comment_ID; ?>" class='<?php echo $class; ?>'>
<td style="text-align: center"><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) { ?><input type="checkbox" name="delete_comments[]" value="<?php echo $comment->comment_ID; ?>" /><?php } ?></td> <td style="text-align: center; vertical-align: text-top"><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) { ?><input type="checkbox" name="delete_comments[]" value="<?php echo $comment->comment_ID; ?>" /><?php } ?></td>
<td class="comment-author"><?php comment_author_link() ?></td> <td style="vertical-align: text-top">
<td><?php comment_author_email_link() ?></td> <?php comment_author_link(); ?><br />
<td><a href="edit-comments.php?s=<?php comment_author_IP() ?>&amp;mode=edit"><?php comment_author_IP() ?></a></td> <?php if ( !empty($author_url) ) : ?>
<td><?php comment_excerpt(); ?></td> <a href="<?php echo $author_url ?>"><?php echo $author_url; ?></a> |
<td> <?php endif; ?>
<?php if ('unapproved' == $comment_status) { <?php if ( !empty($comment->comment_author_email) ): ?>
_e('Unapproved'); <?php comment_author_email_link() ?> |
} else { ?> <?php endif; ?>
<a href="<?php echo get_permalink($comment->comment_post_ID); ?>#comment-<?php comment_ID() ?>" class="edit"><?php _e('View') ?></a> <a href="edit-comments.php?s=<?php comment_author_IP() ?>&amp;mode=edit"><?php comment_author_IP() ?></a>
<?php } ?> <p><?php comment_excerpt(); ?></p>
<?php printf(__('From %1$s, %2$s at %3$s'), $post_link, get_the_time(get_option('date_format')), get_the_time()) ?>
</td> </td>
<td><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) { <td style="vertical-align: text-top"><?php comment_date(); ?></td>
echo "<a href='comment.php?action=editcomment&amp;c=$comment->comment_ID' class='edit'>" . __('Edit') . "</a>"; } ?></td> <td style="vertical-align: text-top">
<td><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) { <?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
echo "<a href='comment.php?action=editcomment&amp;c=$comment->comment_ID' class='edit'>" . __('Edit') . "</a> | ";
$url = clean_url( wp_nonce_url( "comment.php?action=deletecomment&p=$comment->comment_post_ID&c=$comment->comment_ID", "delete-comment_$comment->comment_ID" ) ); $url = clean_url( wp_nonce_url( "comment.php?action=deletecomment&p=$comment->comment_post_ID&c=$comment->comment_ID", "delete-comment_$comment->comment_ID" ) );
echo "<a href='$url' class='delete:the-comment-list:comment-$comment->comment_ID delete'>" . __('Delete') . "</a> "; echo "<a href='$url' class='delete:the-comment-list:comment-$comment->comment_ID delete'>" . __('Delete') . "</a> ";
} ?></td> }
?>
</td>
</tr> </tr>
<?php <?php
} // end foreach } // end foreach
?></tbody> ?></tbody>
</table> </table>
<p class="submit"><input type="submit" name="delete_button" class="delete" value="<?php _e('Delete Checked Comments') ?>" onclick="var numchecked = getNumChecked(document.getElementById('deletecomments')); if(numchecked < 1) { alert('<?php echo js_escape(__("Please select some comments to delete")); ?>'); return false } return confirm('<?php echo sprintf(js_escape(__("You are about to delete %s comments permanently \n 'Cancel' to stop, 'OK' to delete.")), "' + numchecked + '"); ?>')" />
<input type="submit" name="spam_button" value="<?php _e('Mark Checked Comments as Spam') ?>" onclick="var numchecked = getNumChecked(document.getElementById('deletecomments')); if(numchecked < 1) { alert('<?php echo js_escape(__("Please select some comments to mark as spam")); ?>'); return false } return confirm('<?php echo sprintf(js_escape(__("You are about to mark %s comments as spam \n 'Cancel' to stop, 'OK' to mark as spam.")), "' + numchecked + '"); ?>')" /></p>
</form>
<div id="ajax-response"></div> <div id="ajax-response"></div>
<?php <?php
} else { } else {
?> ?>
<p> <p>
<strong><?php _e('No results found.') ?></strong> <strong><?php _e('No results found.') ?></strong>
</p> </p>
<?php <?php
} // end if ($comments)
} }
if ( $page_links )
echo "<p class='pagenav'>$page_links</p>";
?> ?>
<div class="tablenav">
<?php
if ( $page_links )
echo "<div class='tablenav-pages'>$page_links</div>";
?>
<br style="clear:both;" />
</div> </div>
<?php include('admin-footer.php'); ?> <?php include('admin-footer.php'); ?>

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

@ -567,12 +567,21 @@ function user_row( $user_object, $style = '', $role = '' ) {
return $r; return $r;
} }
function _wp_get_comment_list( $s = false, $start, $num ) { function _wp_get_comment_list( $status = '', $s = false, $start, $num ) {
global $wpdb; global $wpdb;
$start = abs( (int) $start ); $start = abs( (int) $start );
$num = (int) $num; $num = (int) $num;
if ( 'moderated' == $status )
$approved = "comment_approved = '0'";
elseif ( 'approved' == $status )
$approved = "comment_approved = '1'";
elseif ( 'spam' == $status )
$approved = "comment_approved = 'spam'";
else
$approved = "comment_approved != 'spam'";
if ( $s ) { if ( $s ) {
$s = $wpdb->escape($s); $s = $wpdb->escape($s);
$comments = $wpdb->get_results("SELECT SQL_CALC_FOUND_ROWS * FROM $wpdb->comments WHERE $comments = $wpdb->get_results("SELECT SQL_CALC_FOUND_ROWS * FROM $wpdb->comments WHERE
@ -581,10 +590,10 @@ function _wp_get_comment_list( $s = false, $start, $num ) {
comment_author_url LIKE ('%$s%') OR comment_author_url LIKE ('%$s%') OR
comment_author_IP LIKE ('%$s%') OR comment_author_IP LIKE ('%$s%') OR
comment_content LIKE ('%$s%') ) AND comment_content LIKE ('%$s%') ) AND
comment_approved != 'spam' $approved
ORDER BY comment_date_gmt DESC LIMIT $start, $num"); ORDER BY comment_date_gmt DESC LIMIT $start, $num");
} else { } else {
$comments = $wpdb->get_results( "SELECT SQL_CALC_FOUND_ROWS * FROM $wpdb->comments USE INDEX (comment_date_gmt) WHERE comment_approved = '0' OR comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT $start, $num" ); $comments = $wpdb->get_results( "SELECT SQL_CALC_FOUND_ROWS * FROM $wpdb->comments USE INDEX (comment_date_gmt) WHERE $approved ORDER BY comment_date_gmt DESC LIMIT $start, $num" );
} }
update_comment_cache($comments); update_comment_cache($comments);