X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/ff81ee6e8304a1982a3ec4f5b134764a29d502cf..7688c6ba71852cd89123b62b2d57683535e4702a:/wp-content/plugins/akismet/akismet.php
diff --git a/wp-content/plugins/akismet/akismet.php b/wp-content/plugins/akismet/akismet.php
index 6adb649b..eac40559 100644
--- a/wp-content/plugins/akismet/akismet.php
+++ b/wp-content/plugins/akismet/akismet.php
@@ -2,92 +2,172 @@
/*
Plugin Name: Akismet
Plugin URI: http://akismet.com/
-Description: Akismet checks your comments against the Akismet web serivce to see if they look like spam or not. You need a WordPress.com API key to use this service. You can review the spam it catches under "Manage" and it automatically deletes old spam after 15 days. Hat tip: Michael Hampton and Chris J. Davis for help with the plugin.
+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.1.3
Author: Matt Mullenweg
-Version: 1.14
Author URI: http://photomatt.net/
*/
-add_action('admin_menu', 'ksd_config_page');
+// If you hardcode a WP.com API key here, all key config screens will be hidden
+$wpcom_api_key = '';
-function ksd_config_page() {
- global $wpdb;
+function akismet_init() {
+ global $wpcom_api_key, $akismet_api_host, $akismet_api_port;
+
+ if ( $wpcom_api_key )
+ $akismet_api_host = $wpcom_api_key . '.rest.akismet.com';
+ else
+ $akismet_api_host = get_option('wordpress_api_key') . '.rest.akismet.com';
+
+ $akismet_api_port = 80;
+ add_action('admin_menu', 'akismet_config_page');
+}
+add_action('init', 'akismet_init');
+
+if ( !function_exists('wp_nonce_field') ) {
+ function akismet_nonce_field($action = -1) { return; }
+ $akismet_nonce = -1;
+} else {
+ function akismet_nonce_field($action = -1) { return wp_nonce_field($action); }
+ $akismet_nonce = 'akismet-update-key';
+}
+
+function akismet_config_page() {
if ( function_exists('add_submenu_page') )
- add_submenu_page('plugins.php', __('Akismet Configuration'), __('Akismet Configuration'), 1, __FILE__, 'akismet_conf');
+ add_submenu_page('plugins.php', __('Akismet Configuration'), __('Akismet Configuration'), 'manage_options', 'akismet-key-config', 'akismet_conf');
+
}
function akismet_conf() {
+ global $akismet_nonce, $wpcom_api_key;
+
if ( isset($_POST['submit']) ) {
- check_admin_referer();
- $key = preg_replace('/[^a-h0-9]/i', '', $_POST['key']);
- if ( akismet_verify_key( $key ) )
+ if ( function_exists('current_user_can') && !current_user_can('manage_options') )
+ die(__('Cheatin’ uh?'));
+
+ check_admin_referer( $akismet_nonce );
+ $key = preg_replace( '/[^a-h0-9]/i', '', $_POST['key'] );
+
+ if ( empty($key) ) {
+ $key_status = 'empty';
+ $ms[] = 'new_key_empty';
+ delete_option('wordpress_api_key');
+ } else {
+ $key_status = akismet_verify_key( $key );
+ }
+
+ if ( $key_status == 'valid' ) {
update_option('wordpress_api_key', $key);
+ $ms[] = 'new_key_valid';
+ } else if ( $key_status == 'invalid' ) {
+ $ms[] = 'new_key_invalid';
+ } else if ( $key_status == 'failed' ) {
+ $ms[] = 'new_key_failed';
+ }
+
+ if ( isset( $_POST['akismet_discard_month'] ) )
+ update_option( 'akismet_discard_month', 'true' );
else
- $invalid_key = true;
+ update_option( 'akismet_discard_month', 'false' );
}
- if ( !akismet_verify_key( get_option('wordpress_api_key') ) )
- $invalid_key = true;
-?>
+ if ( $key_status != 'valid' ) {
+ $key = get_option('wordpress_api_key');
+ if ( empty( $key ) ) {
+ if ( $key_status != 'failed' ) {
+ if ( akismet_verify_key( '1234567890ab' ) == 'failed' )
+ $ms[] = 'no_connection';
+ else
+ $ms[] = 'key_empty';
+ }
+ $key_status = 'empty';
+ } else {
+ $key_status = akismet_verify_key( $key );
+ }
+ if ( $key_status == 'valid' ) {
+ $ms[] = 'key_valid';
+ } else if ( $key_status == 'invalid' ) {
+ delete_option('wordpress_api_key');
+ $ms[] = 'key_empty';
+ } else if ( !empty($key) && $key_status == 'failed' ) {
+ $ms[] = 'key_failed';
+ }
+ }
+
+ $messages = array(
+ 'new_key_empty' => array('color' => 'aa0', 'text' => __('Your key has been cleared.')),
+ 'new_key_valid' => array('color' => '2d2', 'text' => __('Your key has been verified. Happy blogging!')),
+ 'new_key_invalid' => array('color' => 'd22', 'text' => __('The key you entered is invalid. Please double-check it.')),
+ 'new_key_failed' => array('color' => 'd22', 'text' => __('The key you entered could not be verified because a connection to akismet.com could not be established. Please check your server configuration.')),
+ 'no_connection' => array('color' => 'd22', 'text' => __('There was a problem connecting to the Akismet server. Please check your server configuration.')),
+ 'key_empty' => array('color' => 'aa0', 'text' => sprintf(__('Please enter an API key. (Get your key.)'), 'http://wordpress.com/profile/')),
+ 'key_valid' => array('color' => '2d2', 'text' => __('This key is valid.')),
+ 'key_failed' => array('color' => 'aa0', 'text' => __('The key below was previously validated but a connection to akismet.com can not be established at this time. Please check your server configuration.')));
+?>
+
+
".__('Akismet is not active.')." ".sprintf(__('You must enter your WordPress.com API key for it to work.'), "plugins.php?page=$path")."
- + "; } - add_action('admin_footer', 'akismet_warning'); + add_action('admin_notices', 'akismet_warning'); return; } -$ksd_api_host = get_option('wordpress_api_key') . '.rest.akismet.com'; -$ksd_api_port = 80; -$ksd_user_agent = "WordPress/$wp_version | Akismet/1.14"; - -// Returns array with headers in $response[0] and entity in $response[1] -function ksd_http_post($request, $host, $path, $port = 80) { - global $ksd_user_agent; +// Returns array with headers in $response[0] and body in $response[1] +function akismet_http_post($request, $host, $path, $port = 80) { + global $wp_version; $http_request = "POST $path HTTP/1.0\r\n"; $http_request .= "Host: $host\r\n"; - $http_request .= "Content-Type: application/x-www-form-urlencoded; charset=" . get_settings('blog_charset') . "\r\n"; + $http_request .= "Content-Type: application/x-www-form-urlencoded; charset=" . get_option('blog_charset') . "\r\n"; $http_request .= "Content-Length: " . strlen($request) . "\r\n"; - $http_request .= "User-Agent: $ksd_user_agent\r\n"; + $http_request .= "User-Agent: WordPress/$wp_version | Akismet/2.0\r\n"; $http_request .= "\r\n"; $http_request .= $request; $response = ''; - if( false !== ( $fs = @fsockopen($host, $port, $errno, $errstr, 3) ) ) { + if( false != ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) { fwrite($fs, $http_request); while ( !feof($fs) ) @@ -98,9 +178,10 @@ function ksd_http_post($request, $host, $path, $port = 80) { return $response; } -function ksd_auto_check_comment( $comment ) { - global $auto_comment_approved, $ksd_api_host, $ksd_api_port; - $comment['user_ip'] = $_SERVER['REMOTE_ADDR']; +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_agent'] = $_SERVER['HTTP_USER_AGENT']; $comment['referrer'] = $_SERVER['HTTP_REFERER']; $comment['blog'] = get_option('home'); @@ -115,10 +196,20 @@ function ksd_auto_check_comment( $comment ) { foreach ( $comment as $key => $data ) $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&'; - $response = ksd_http_post($query_string, $ksd_api_host, '/1.1/comment-check', $ksd_api_port); + $response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port); if ( 'true' == $response[1] ) { - $auto_comment_approved = 'spam'; + add_filter('pre_comment_approved', create_function('$a', 'return \'spam\';')); update_option( 'akismet_spam_count', get_option('akismet_spam_count') + 1 ); + + do_action( 'akismet_spam_caught' ); + + $post = get_post( $comment['comment_post_ID'] ); + $last_updated = strtotime( $post->post_modified_gmt ); + $diff = time() - $last_updated; + $diff = $diff / 86400; + + if ( $post->post_type == 'post' && $diff > 30 && get_option( 'akismet_discard_month' ) == 'true' ) + die; } akismet_delete_old(); return $comment; @@ -128,20 +219,13 @@ function akismet_delete_old() { global $wpdb; $now_gmt = current_time('mysql', 1); $wpdb->query("DELETE FROM $wpdb->comments WHERE DATE_SUB('$now_gmt', INTERVAL 15 DAY) > comment_date_gmt AND comment_approved = 'spam'"); - $n = mt_rand(1, 5); - if ( $n % 5 ) + $n = mt_rand(1, 5000); + if ( $n == 11 ) // lucky number $wpdb->query("OPTIMIZE TABLE $wpdb->comments"); } -function ksd_auto_approved( $approved ) { - global $auto_comment_approved; - if ( 'spam' == $auto_comment_approved ) - $approved = $auto_comment_approved; - return $approved; -} - -function ksd_submit_nonspam_comment ( $comment_id ) { - global $wpdb, $ksd_api_host, $ksd_api_port; +function akismet_submit_nonspam_comment ( $comment_id ) { + global $wpdb, $akismet_api_host, $akismet_api_port; $comment = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID = '$comment_id'"); if ( !$comment ) // it was deleted @@ -150,11 +234,11 @@ function ksd_submit_nonspam_comment ( $comment_id ) { $query_string = ''; foreach ( $comment as $key => $data ) $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&'; - $response = ksd_http_post($query_string, $ksd_api_host, "/1.1/submit-ham", $ksd_api_port); + $response = akismet_http_post($query_string, $akismet_api_host, "/1.1/submit-ham", $akismet_api_port); } -function ksd_submit_spam_comment ( $comment_id ) { - global $wpdb, $ksd_api_host, $ksd_api_port; +function akismet_submit_spam_comment ( $comment_id ) { + global $wpdb, $akismet_api_host, $akismet_api_port; $comment = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID = '$comment_id'"); if ( !$comment ) // it was deleted @@ -166,31 +250,40 @@ function ksd_submit_spam_comment ( $comment_id ) { foreach ( $comment as $key => $data ) $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&'; - $response = ksd_http_post($query_string, $ksd_api_host, "/1.1/submit-spam", $ksd_api_port); + $response = akismet_http_post($query_string, $akismet_api_host, "/1.1/submit-spam", $akismet_api_port); } -add_action('wp_set_comment_status', 'ksd_submit_spam_comment'); -add_action('edit_comment', 'ksd_submit_spam_comment'); -add_action('preprocess_comment', 'ksd_auto_check_comment', 1); -add_filter('pre_comment_approved', 'ksd_auto_approved'); - +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); -function ksd_spam_count() { +function akismet_spam_count() { global $wpdb, $comments; - $count = $wpdb->get_var("SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_approved = 'spam'"); + $count = wp_cache_get( 'akismet_spam_count', 'widget' ); + if ( false === $count ) { + $count = $wpdb->get_var("SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_approved = 'spam'"); + wp_cache_set( 'akismet_spam_count', $count, 'widget', 3600 ); + } return $count; } -function ksd_manage_page() { - global $wpdb; - $count = sprintf(__('Akismet Spam (%s)'), ksd_spam_count()); - if ( function_exists('add_management_page') ) - add_management_page(__('Akismet Spam'), $count, 1, __FILE__, 'ksd_caught'); +function akismet_manage_page() { + global $wpdb, $submenu; + $count = sprintf(__('Akismet Spam (%s)'), akismet_spam_count()); + if ( isset( $submenu['edit-comments.php'] ) ) + add_submenu_page('edit-comments.php', __('Akismet Spam'), $count, 'moderate_comments', 'akismet-admin', 'akismet_caught' ); + elseif ( function_exists('add_management_page') ) + add_management_page(__('Akismet Spam'), $count, 'moderate_comments', 'akismet-admin', 'akismet_caught'); } -function ksd_caught() { - global $wpdb, $comment; +function akismet_caught() { + global $wpdb, $comment, $akismet_caught, $akismet_nonce; + akismet_recheck_queue(); if (isset($_POST['submit']) && 'recover' == $_POST['action'] && ! empty($_POST['not_spam'])) { + check_admin_referer( $akismet_nonce ); + if ( function_exists('current_user_can') && !current_user_can('moderate_comments') ) + die(__('You do not have sufficient permission to moderate comments.')); + $i = 0; foreach ($_POST['not_spam'] as $comment): $comment = (int) $comment; @@ -198,87 +291,294 @@ function ksd_caught() { wp_set_comment_status($comment, 'approve'); else $wpdb->query("UPDATE $wpdb->comments SET comment_approved = '1' WHERE comment_ID = '$comment'"); - ksd_submit_nonspam_comment($comment); + akismet_submit_nonspam_comment($comment); ++$i; endforeach; - echo '' . sprintf(__('%1$s comments recovered.'), $i) . "
'; - if ($nuked) { - _e('All spam deleted.'); - } - echo "
' . sprintf(__('%1$s comments recovered.'), $i) . "
' . __('All spam deleted.') . '
%1$s spam for you since you installed it.'), number_format($count) ); ?>
+%1$s spam for you since you first installed it.'), number_format($count) ); ?>
get_var( "SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = 'spam'" ); + + +if ( 0 == $gotspam ) { echo ''.__('You have no spam currently in the queue. Must be your lucky day. :)').'
'; echo ''.__('You can delete all of the spam from your database with a single click. This operation cannot be undone, so you may wish to check to ensure that no legitimate comments got through first. Spam is automatically deleted after 15 days, so don’t sweat it.').'
'; ?> - +$r
"; +?> + + + + + + + + + +'.sprintf(__('Akismet has protected your site from %3$s spam comments.'), 'http://akismet.com/', "edit.php?page=$path", number_format($count) ).'
'; + global $submenu; + if ( isset( $submenu['edit-comments.php'] ) ) + $link = 'edit-comments.php'; + else + $link = 'edit.php'; + echo ''.sprintf(__('Akismet has protected your site from %3$s spam comments.'), 'http://akismet.com/', clean_url("$link?page=akismet-admin"), number_format($count) ).'
'; } add_action('activity_box_end', 'akismet_stats'); + +if ( 'moderation.php' == $pagenow ) { + function akismet_recheck_button( $page ) { + global $submenu; + if ( isset( $submenu['edit-comments.php'] ) ) + $link = 'edit-comments.php'; + else + $link = 'edit.php'; + $button = "" . __('Recheck Queue for Spam') . ""; + $page = str_replace( '