X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/7c1a4aea7aeb083c7424823d11f24401edcba439..699231ae09f7057a4d0000cdf32e50a3df6a04ca:/wp-content/plugins/akismet/akismet.php diff --git a/wp-content/plugins/akismet/akismet.php b/wp-content/plugins/akismet/akismet.php index d71bc99b..c70d9267 100644 --- a/wp-content/plugins/akismet/akismet.php +++ b/wp-content/plugins/akismet/akismet.php @@ -2,13 +2,13 @@ /* Plugin Name: Akismet Plugin URI: http://akismet.com/ -Description: Akismet checks your comments against the Akismet web service to see if they look like spam or not. You need a WordPress.com API key to use it. You can review the spam it catches under "Comments." To show off your Akismet stats just put <?php akismet_counter(); ?> in your template. See also: WP Stats plugin. -Version: 2.2.7 -Author: Matt Mullenweg -Author URI: http://ma.tt/ +Description: Akismet checks your comments against the Akismet web service to see if they look like spam or not. You need an API key to use it. You can review the spam it catches under "Comments." To show off your Akismet stats just put <?php akismet_counter(); ?> in your template. See also: WP Stats plugin. +Version: 2.3.0 +Author: Automattic +Author URI: http://automattic.com/wordpress-plugins/ */ -define('AKISMET_VERSION', '2.2.7'); +define('AKISMET_VERSION', '2.3.0'); // If you hardcode a WP.com API key here, all key config screens will be hidden if ( defined('WPCOM_API_KEY') ) @@ -134,19 +134,19 @@ function akismet_conf() {
-

Akismet will greatly reduce or even completely eliminate the comment and trackback spam you get on your site. If one does happen to get through, simply mark it as "spam" on the moderation screen and Akismet will learn from the mistakes. If you don\'t have a WordPress.com account yet, you can get one at Akismet.com.'), 'http://akismet.com/', 'http://akismet.com/get/'); ?>

+

Akismet will greatly reduce or even completely eliminate the comment and trackback spam you get on your site. If one does happen to get through, simply mark it as "spam" on the moderation screen and Akismet will learn from the mistakes. If you don\'t have an API key yet, you can get one at Akismet.com.'), 'http://akismet.com/', 'http://akismet.com/get/'); ?>

- -

+

-

(What is this?'); ?>)

+

(What is this?'); ?>)

+

@@ -155,35 +155,37 @@ function akismet_conf() {

0 ) { - // some connections work, some fail - if ( $fail_count > 0 && $fail_count < count($servers) ) { ?> -

-

this information about Akismet and firewalls.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>

- 0 ) { ?> -

-

Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet and firewalls.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>

- -

-

-

-

fsockopen function. Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet\'s system requirements.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>

+

fsockopen or gethostbynamel functions. Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet\'s system requirements.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>

-

-

Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet and firewalls.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>

- 0 ) { + // some connections work, some fail + if ( $fail_count > 0 && $fail_count < count($servers) ) { ?> +

+

this information about Akismet and firewalls.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>

+ 0 ) { ?> +

+

Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet and firewalls.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>

+ +

+

+ +

+

Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet and firewalls.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>

+

".__('Akismet is almost ready.')." ".sprintf(__('You must enter your WordPress.com API key for it to work.'), "plugins.php?page=akismet-key-config")."

+

".__('Akismet is almost ready.')." ".sprintf(__('You must enter your Akismet API key for it to work.'), "plugins.php?page=akismet-key-config")."

"; } add_action('admin_notices', 'akismet_warning'); @@ -370,6 +372,22 @@ function akismet_get_host($host) { return $host; } +// return a comma-separated list of role names for the given user +function akismet_get_user_roles($user_id ) { + $roles = false; + + if ( !class_exists('WP_User') ) + return false; + + if ( $user_id > 0 ) { + $comment_user = new WP_User($user_id); + if ( isset($comment_user->roles) ) + $roles = join(',', $comment_user->roles); + } + + return $roles; +} + // Returns array with headers in $response[0] and body in $response[1] function akismet_http_post($request, $host, $path, $port = 80, $ip=null) { global $wp_version; @@ -415,13 +433,15 @@ function akismet_result_spam( $approved ) { function akismet_auto_check_comment( $comment ) { global $akismet_api_host, $akismet_api_port; - $comment['user_ip'] = preg_replace( '/[^0-9., ]/', '', $_SERVER['REMOTE_ADDR'] ); + $comment['user_ip'] = $_SERVER['REMOTE_ADDR']; $comment['user_agent'] = $_SERVER['HTTP_USER_AGENT']; $comment['referrer'] = $_SERVER['HTTP_REFERER']; $comment['blog'] = get_option('home'); $comment['blog_lang'] = get_locale(); $comment['blog_charset'] = get_option('blog_charset'); $comment['permalink'] = get_permalink($comment['comment_post_ID']); + + $comment['user_role'] = akismet_get_user_roles($comment['user_ID']); $ignore = array( 'HTTP_COOKIE' ); @@ -445,7 +465,7 @@ function akismet_auto_check_comment( $comment ) { $diff = time() - $last_updated; $diff = $diff / 86400; - if ( $post->post_type == 'post' && $diff > 30 && get_option( 'akismet_discard_month' ) == 'true' ) { + if ( $post->post_type == 'post' && $diff > 30 && get_option( 'akismet_discard_month' ) == 'true' && empty($comment['user_ID']) ) { // akismet_result_spam() won't be called so bump the counter here if ( $incr = apply_filters('akismet_spam_count_incr', 1) ) update_option( 'akismet_spam_count', get_option('akismet_spam_count') + $incr ); @@ -468,7 +488,7 @@ function akismet_delete_old() { function akismet_submit_nonspam_comment ( $comment_id ) { global $wpdb, $akismet_api_host, $akismet_api_port, $current_user, $current_site; $comment_id = (int) $comment_id; - + $comment = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID = '$comment_id'"); if ( !$comment ) // it was deleted return; @@ -482,6 +502,8 @@ function akismet_submit_nonspam_comment ( $comment_id ) { if ( is_object($current_site) ) { $comment->site_domain = $current_site->domain; } + $comment->user_role = akismet_get_user_roles($comment->user_ID); + $query_string = ''; foreach ( $comment as $key => $data ) $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&'; @@ -508,6 +530,7 @@ function akismet_submit_spam_comment ( $comment_id ) { if ( is_object($current_site) ) { $comment->site_domain = $current_site->domain; } + $comment->user_role = akismet_get_user_roles($comment->user_ID); $query_string = ''; foreach ( $comment as $key => $data ) $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&'; @@ -515,13 +538,39 @@ function akismet_submit_spam_comment ( $comment_id ) { $response = akismet_http_post($query_string, $akismet_api_host, "/1.1/submit-spam", $akismet_api_port); } -add_action('wp_set_comment_status', 'akismet_submit_spam_comment'); -add_action('edit_comment', 'akismet_submit_spam_comment'); add_action('preprocess_comment', 'akismet_auto_check_comment', 1); +// For old versions of WP only +function akismet_set_comment_status( $comment_id, $status ) { + if ( $status == 'spam' ) { + akismet_submit_spam_comment( $comment_id ); + } elseif ( $status == 'approve' ) { + akismet_submit_nonspam_comment( $comment_id ); + } +} + +// For WP 2.7+ +function akismet_transition_comment_status( $new_status, $old_status, $comment ) { + if ( $new_status == $old_status ) + return; + + if ( $new_status == 'spam' ) { + akismet_submit_spam_comment( $comment->comment_ID ); + } elseif ( $old_status == 'spam' && ( $new_status == 'approved' || $new_status == 'unapproved' ) ) { + akismet_submit_nonspam_comment( $comment->comment_ID ); + } +} + function akismet_spamtoham( $comment ) { akismet_submit_nonspam_comment( $comment->comment_ID ); } -add_filter( 'comment_spam_to_approved', 'akismet_spamtoham' ); +if ( function_exists( 'wp_transition_comment_status' ) ) { + add_action( 'transition_comment_status', 'akismet_transition_comment_status', 10, 3 ); +} else { + add_action('wp_set_comment_status', 'akismet_set_comment_status', 10, 2); + add_action('edit_comment', 'akismet_submit_spam_comment'); + add_filter( 'comment_spam_to_approved', 'akismet_spamtoham' ); + add_filter( 'comment_spam_to_unapproved', 'akismet_spamtoham' ); +} // Total spam in queue // get_option( 'akismet_spam_count' ) is the total caught ever function akismet_spam_count( $type = false ) { @@ -956,6 +1005,8 @@ function akismet_rightnow() { add_action('rightnow_end', 'akismet_rightnow'); // For WP <= 2.3.x +global $pagenow; + if ( 'moderation.php' == $pagenow ) { function akismet_recheck_button( $page ) { global $submenu; @@ -999,6 +1050,7 @@ function akismet_recheck_queue() { $c['blog_lang'] = get_locale(); $c['blog_charset'] = get_option('blog_charset'); $c['permalink'] = get_permalink($c['comment_post_ID']); + $c['user_role'] = akismet_get_user_roles($c['user_ID']); $id = (int) $c['comment_ID']; $query_string = ''; @@ -1055,7 +1107,7 @@ function widget_akismet_register() { ?> -
%6$sAkismet%7$s' ), '
' . $count . '', '', '
', '
', '', '', '
' ); ?>
+
%6$sAkismet%7$s' ), '' . $count . '', '', '', '', '', '', '' ); ?>