' . esc_html__('Check for Spam') . '';
+ echo '
 ) . ')
';
}
add_action('manage_comments_nav', 'akismet_check_for_spam_button');
@@ -497,7 +616,6 @@ function akismet_submit_nonspam_comment ( $comment_id ) {
$comment->blog_lang = get_locale();
$comment->blog_charset = get_option('blog_charset');
$comment->permalink = get_permalink($comment->comment_post_ID);
- $comment->reporter_ip = $_SERVER['REMOTE_ADDR'];
if ( is_object($current_user) ) {
$comment->reporter = $current_user->user_login;
}
@@ -512,6 +630,9 @@ function akismet_submit_nonspam_comment ( $comment_id ) {
if ( akismet_test_mode() )
$comment->is_test = 'true';
+ $post = get_post( $comment->comment_post_ID );
+ $comment->comment_post_modified_gmt = $post->post_modified_gmt;
+
$query_string = '';
foreach ( $comment as $key => $data )
$query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
@@ -546,7 +667,6 @@ function akismet_submit_spam_comment ( $comment_id ) {
$comment->blog_lang = get_locale();
$comment->blog_charset = get_option('blog_charset');
$comment->permalink = get_permalink($comment->comment_post_ID);
- $comment->reporter_ip = $_SERVER['REMOTE_ADDR'];
if ( is_object($current_user) ) {
$comment->reporter = $current_user->user_login;
}
@@ -561,6 +681,9 @@ function akismet_submit_spam_comment ( $comment_id ) {
if ( akismet_test_mode() )
$comment->is_test = 'true';
+ $post = get_post( $comment->comment_post_ID );
+ $comment->comment_post_modified_gmt = $post->post_modified_gmt;
+
$query_string = '';
foreach ( $comment as $key => $data )
$query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
@@ -591,6 +714,10 @@ function akismet_transition_comment_status( $new_status, $old_status, $comment )
if ( defined('WP_IMPORTING') && WP_IMPORTING == true )
return;
+
+ // if this is present, it means the status has been changed by a re-check, not an explicit user action
+ if ( get_comment_meta( $comment->comment_ID, 'akismet_rechecking' ) )
+ return;
global $current_user;
$reporter = '';
@@ -611,8 +738,7 @@ function akismet_transition_comment_status( $new_status, $old_status, $comment )
}
}
- if ( !get_comment_meta( $comment->comment_ID, 'akismet_rechecking' ) )
- akismet_update_comment_history( $comment->comment_ID, sprintf( __('%s changed the comment status to %s'), $reporter, $new_status ), 'status-' . $new_status );
+ akismet_update_comment_history( $comment->comment_ID, sprintf( __('%s changed the comment status to %s'), $reporter, $new_status ), 'status-' . $new_status );
}
add_action( 'transition_comment_status', 'akismet_transition_comment_status', 10, 3 );
@@ -647,10 +773,16 @@ function akismet_spam_count( $type = false ) {
function akismet_recheck_queue() {
global $wpdb, $akismet_api_host, $akismet_api_port;
+ akismet_fix_scheduled_recheck();
+
if ( ! ( isset( $_GET['recheckqueue'] ) || ( isset( $_REQUEST['action'] ) && 'akismet_recheck_queue' == $_REQUEST['action'] ) ) )
return;
-
- $moderation = $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE comment_approved = '0'", ARRAY_A );
+
+ $paginate = '';
+ if ( isset( $_POST['limit'] ) && isset( $_POST['offset'] ) ) {
+ $paginate = $wpdb->prepare( " LIMIT %d OFFSET %d", array( $_POST['limit'], $_POST['offset'] ) );
+ }
+ $moderation = $wpdb->get_results( "SELECT * FROM {$wpdb->comments} WHERE comment_approved = '0'{$paginate}", ARRAY_A );
foreach ( (array) $moderation as $c ) {
$c['user_ip'] = $c['comment_author_IP'];
$c['user_agent'] = $c['comment_agent'];
@@ -658,7 +790,7 @@ function akismet_recheck_queue() {
$c['blog'] = get_bloginfo('url');
$c['blog_lang'] = get_locale();
$c['blog_charset'] = get_option('blog_charset');
- $c['permalink'] = get_permalink($c['comment_post_ID']);
+ $c['permalink'] = get_permalink($c['comment_post_ID']);
$c['user_role'] = '';
if ( isset( $c['user_ID'] ) )
@@ -673,27 +805,71 @@ function akismet_recheck_queue() {
foreach ( $c as $key => $data )
$query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
+ add_comment_meta( $c['comment_ID'], 'akismet_rechecking', true );
$response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port);
if ( 'true' == $response[1] ) {
wp_set_comment_status($c['comment_ID'], 'spam');
update_comment_meta( $c['comment_ID'], 'akismet_result', 'true' );
+ delete_comment_meta( $c['comment_ID'], 'akismet_error' );
akismet_update_comment_history( $c['comment_ID'], __('Akismet re-checked and caught this comment as spam'), 'check-spam' );
} elseif ( 'false' == $response[1] ) {
update_comment_meta( $c['comment_ID'], 'akismet_result', 'false' );
+ delete_comment_meta( $c['comment_ID'], 'akismet_error' );
akismet_update_comment_history( $c['comment_ID'], __('Akismet re-checked and cleared this comment'), 'check-ham' );
// abnormal result: error
} else {
update_comment_meta( $c['comment_ID'], 'akismet_result', 'error' );
- akismet_update_comment_history( $c['comment_ID'], sprintf( __('Akismet was unable to re-check this comment (response: %s)'), $response[1]), 'check-error' );
+ akismet_update_comment_history( $c['comment_ID'], sprintf( __('Akismet was unable to re-check this comment (response: %s)'), substr($response[1], 0, 50)), 'check-error' );
}
+ delete_comment_meta( $c['comment_ID'], 'akismet_rechecking' );
}
- wp_redirect( $_SERVER['HTTP_REFERER'] );
- exit;
+ if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+ wp_send_json( array(
+ 'processed' => count((array) $moderation),
+ ));
+ }
+ else {
+ $redirect_to = isset( $_SERVER['HTTP_REFERER'] ) ? $_SERVER['HTTP_REFERER'] : admin_url( 'edit-comments.php' );
+ wp_safe_redirect( $redirect_to );
+ exit;
+ }
}
add_action('admin_action_akismet_recheck_queue', 'akismet_recheck_queue');
+add_action('wp_ajax_akismet_recheck_queue', 'akismet_recheck_queue');
+
+// Adds an 'x' link next to author URLs, clicking will remove the author URL and show an undo link
+function akismet_remove_comment_author_url() {
+ if ( !empty($_POST['id'] ) && check_admin_referer( 'comment_author_url_nonce' ) ) {
+ global $wpdb;
+ $comment = get_comment( intval($_POST['id']), ARRAY_A );
+ if (current_user_can('edit_comment', $comment['comment_ID'])) {
+ $comment['comment_author_url'] = '';
+ do_action( 'comment_remove_author_url' );
+ print(wp_update_comment( $comment ));
+ die();
+ }
+ }
+}
+
+add_action('wp_ajax_comment_author_deurl', 'akismet_remove_comment_author_url');
+
+function akismet_add_comment_author_url() {
+ if ( !empty( $_POST['id'] ) && !empty( $_POST['url'] ) && check_admin_referer( 'comment_author_url_nonce' ) ) {
+ global $wpdb;
+ $comment = get_comment( intval($_POST['id']), ARRAY_A );
+ if (current_user_can('edit_comment', $comment['comment_ID'])) {
+ $comment['comment_author_url'] = esc_url($_POST['url']);
+ do_action( 'comment_add_author_url' );
+ print(wp_update_comment( $comment ));
+ die();
+ }
+ }
+}
+
+add_action('wp_ajax_comment_author_reurl', 'akismet_add_comment_author_url');
// Check connectivity between the WordPress blog and Akismet's servers.
// Returns an associative array of server IP addresses, where the key is the IP address, and value is true (available) or false (unable to connect).
@@ -748,3 +924,20 @@ function akismet_server_connectivity_ok() {
return !( empty($servers) || !count($servers) || count( array_filter($servers) ) < count($servers) );
}
+function akismet_admin_menu() {
+ if ( class_exists( 'Jetpack' ) ) {
+ add_action( 'jetpack_admin_menu', 'akismet_load_menu' );
+ } else {
+ akismet_load_menu();
+ }
+}
+
+function akismet_load_menu() {
+ if ( class_exists( 'Jetpack' ) ) {
+ add_submenu_page( 'jetpack', __( 'Akismet' ), __( 'Akismet' ), 'manage_options', 'akismet-key-config', 'akismet_conf' );
+ add_submenu_page( 'jetpack', __( 'Akismet Stats' ), __( 'Akismet Stats' ), 'manage_options', 'akismet-stats-display', 'akismet_stats_display' );
+ } else {
+ add_submenu_page('plugins.php', __('Akismet'), __('Akismet'), 'manage_options', 'akismet-key-config', 'akismet_conf');
+ add_submenu_page('index.php', __('Akismet Stats'), __('Akismet Stats'), 'manage_options', 'akismet-stats-display', 'akismet_stats_display');
+ }
+}