X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/58f607a1de715c9bca69340a4d6fb9e1b9c2bed2..d954c87a1e3f0e671855614661da9e5825279134:/wp-content/plugins/akismet/akismet.php diff --git a/wp-content/plugins/akismet/akismet.php b/wp-content/plugins/akismet/akismet.php index 89c061f5..7059bef4 100644 --- a/wp-content/plugins/akismet/akismet.php +++ b/wp-content/plugins/akismet/akismet.php @@ -1,21 +1,49 @@ 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 +Version: 2.4.0 Author: Automattic Author URI: http://automattic.com/wordpress-plugins/ +License: GPLv2 */ -define('AKISMET_VERSION', '2.3.0'); +/* +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; version 2 of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +define('AKISMET_VERSION', '2.4.0'); -// If you hardcode a WP.com API key here, all key config screens will be hidden +/** If you hardcode a WP.com API key here, all key config screens will be hidden */ if ( defined('WPCOM_API_KEY') ) $wpcom_api_key = constant('WPCOM_API_KEY'); else $wpcom_api_key = ''; +// Make sure we don't expose any info if called directly +if ( !function_exists( 'add_action' ) ) { + echo "Hi there! I'm just a plugin, not much I can do when called directly."; + exit; +} + +if ( $wp_db_version <= 9872 ) + include_once( dirname(__FILE__) . '/legacy.php' ); + function akismet_init() { global $wpcom_api_key, $akismet_api_host, $akismet_api_port; @@ -93,10 +121,10 @@ function akismet_conf() { akismet_get_server_connectivity(0); } - if ( $key_status != 'valid' ) { + if ( empty( $key_status) || $key_status != 'valid' ) { $key = get_option('wordpress_api_key'); if ( empty( $key ) ) { - if ( $key_status != 'failed' ) { + if ( empty( $key_status ) || $key_status != 'failed' ) { if ( akismet_verify_key( '1234567890ab' ) == 'failed' ) $ms[] = 'no_connection'; else @@ -141,7 +169,7 @@ function akismet_conf() {

(What is this?'); ?>)

- +

@@ -254,6 +282,22 @@ function akismet_stats_display() { '.__('Spam').''; + 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_i18n($count) ).'

'; +} +add_action('activity_box_end', 'akismet_stats'); + function akismet_get_key() { global $wpcom_api_key; if ( !empty($wpcom_api_key) ) @@ -430,9 +474,10 @@ function akismet_result_spam( $approved ) { return 'spam'; } -function akismet_auto_check_comment( $comment ) { +function akismet_auto_check_comment( $commentdata ) { global $akismet_api_host, $akismet_api_port; + $comment = $commentdata; $comment['user_ip'] = $_SERVER['REMOTE_ADDR']; $comment['user_agent'] = $_SERVER['HTTP_USER_AGENT']; $comment['referrer'] = $_SERVER['HTTP_REFERER']; @@ -443,17 +488,20 @@ function akismet_auto_check_comment( $comment ) { $comment['user_role'] = akismet_get_user_roles($comment['user_ID']); - $ignore = array( 'HTTP_COOKIE' ); + $ignore = array( 'HTTP_COOKIE', 'HTTP_COOKIE2', 'PHP_AUTH_PW' ); foreach ( $_SERVER as $key => $value ) if ( !in_array( $key, $ignore ) && is_string($value) ) $comment["$key"] = $value; + else + $comment["$key"] = ''; $query_string = ''; foreach ( $comment as $key => $data ) $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&'; $response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port); + $commentdata['akismet_result'] = $response[1]; if ( 'true' == $response[1] ) { // akismet_spam_count will be incremented later by akismet_result_spam() add_filter('pre_comment_approved', 'akismet_result_spam'); @@ -481,16 +529,22 @@ function akismet_auto_check_comment( $comment ) { // WP 2.0: run this one time in ten akismet_delete_old(); } - return $comment; + return $commentdata; } 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'"); + $comment_ids = $wpdb->get_col("SELECT comment_id FROM $wpdb->comments WHERE DATE_SUB('$now_gmt', INTERVAL 15 DAY) > comment_date_gmt AND comment_approved = 'spam'"); + if ( empty( $comment_ids ) ) + return; + + do_action( 'delete_comment', $comment_ids ); + $wpdb->query("DELETE FROM $wpdb->comments WHERE comment_id IN ( " . implode( ', ', $comment_ids ) . " )"); $n = mt_rand(1, 5000); if ( apply_filters('akismet_optimize_table', ($n == 11)) ) // lucky number $wpdb->query("OPTIMIZE TABLE $wpdb->comments"); + } add_action('akismet_scheduled_delete', 'akismet_delete_old'); @@ -512,13 +566,17 @@ 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); + + $comment->user_role = ''; + if ( isset( $comment->user_ID ) ) + $comment->user_role = akismet_get_user_roles($comment->user_ID); $query_string = ''; foreach ( $comment as $key => $data ) $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&'; $response = akismet_http_post($query_string, $akismet_api_host, "/1.1/submit-ham", $akismet_api_port); + do_action('akismet_submit_nonspam_comment', $comment_id, $response[1]); } function akismet_submit_spam_comment ( $comment_id ) { @@ -540,12 +598,17 @@ 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); + + $comment->user_role = ''; + if ( !isset( $comment->user_id ) ) + $comment->user_role = akismet_get_user_roles($comment->user_ID); + $query_string = ''; foreach ( $comment as $key => $data ) $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&'; $response = akismet_http_post($query_string, $akismet_api_host, "/1.1/submit-spam", $akismet_api_port); + do_action('akismet_submit_spam_comment', $comment_id, $response[1]); } add_action('preprocess_comment', 'akismet_auto_check_comment', 1); @@ -607,379 +670,16 @@ function akismet_spam_count( $type = false ) { return (int) $wpdb->get_var("SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_approved = 'spam' AND comment_type='$type'"); } -function akismet_spam_comments( $type = false, $page = 1, $per_page = 50 ) { - global $wpdb; - - $page = (int) $page; - if ( $page < 2 ) - $page = 1; - - $per_page = (int) $per_page; - if ( $per_page < 1 ) - $per_page = 50; - - $start = ( $page - 1 ) * $per_page; - $end = $start + $per_page; - - if ( $type ) { - if ( 'comments' == $type || 'comment' == $type ) - $type = ''; - else - $type = $wpdb->escape( $type ); - return $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE comment_approved = 'spam' AND comment_type='$type' ORDER BY comment_date DESC LIMIT $start, $end"); - } - - // All - return $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE comment_approved = 'spam' ORDER BY comment_date DESC LIMIT $start, $end"); -} - -// Totals for each comment type -// returns array( type => count, ... ) -function akismet_spam_totals() { - global $wpdb; - $totals = $wpdb->get_results( "SELECT comment_type, COUNT(*) AS cc FROM $wpdb->comments WHERE comment_approved = 'spam' GROUP BY comment_type" ); - $return = array(); - foreach ( $totals as $total ) - $return[$total->comment_type ? $total->comment_type : 'comment'] = $total->cc; - return $return; -} - -function akismet_manage_page() { - global $wpdb, $submenu, $wp_db_version; - - // WP 2.7 has its own spam management page - if ( 8645 <= $wp_db_version ) - return; - - $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 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; - if ( function_exists('wp_set_comment_status') ) - wp_set_comment_status($comment, 'approve'); - else - $wpdb->query("UPDATE $wpdb->comments SET comment_approved = '1' WHERE comment_ID = '$comment'"); - akismet_submit_nonspam_comment($comment); - ++$i; - endforeach; - $to = add_query_arg( 'recovered', $i, $_SERVER['HTTP_REFERER'] ); - wp_redirect( $to ); - exit; - } - if ('delete' == $_POST['action']) { - 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.')); - - $delete_time = $wpdb->escape( $_POST['display_time'] ); - $nuked = $wpdb->query( "DELETE FROM $wpdb->comments WHERE comment_approved = 'spam' AND '$delete_time' > comment_date_gmt" ); - wp_cache_delete( 'akismet_spam_count', 'widget' ); - $to = add_query_arg( 'deleted', 'all', $_SERVER['HTTP_REFERER'] ); - wp_redirect( $to ); - exit; - } - -if ( isset( $_GET['recovered'] ) ) { - $i = (int) $_GET['recovered']; - echo '

' . sprintf(__('%1$s comments recovered.'), $i) . "

"; -} - -if (isset( $_GET['deleted'] ) ) - echo '

' . __('All spam deleted.') . '

'; - -if ( isset( $GLOBALS['submenu']['edit-comments.php'] ) ) - $link = 'edit-comments.php'; -else - $link = 'edit.php'; -?> - -
-

- -

%1$s spam for you since you first installed it.'), number_format_i18n($count) ); ?>

-'.__('You have no spam currently in the queue. Must be your lucky day. :)').'

'; - echo '
'; -} else { - 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.').'

'; -?> - -
- - -    - -
- - -
- -

- -'.__('These are the latest comments identified as spam by Akismet. If you see any mistakes, simply mark the comment as "not spam" and Akismet will learn from the submission. If you wish to recover a comment from spam, simply select the comment, and click Not Spam. After 15 days we clean out the junk for you.').'

'; ?> - -escape($_POST['s']); - $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE - (comment_author LIKE '%$s%' OR - comment_author_email LIKE '%$s%' OR - comment_author_url LIKE ('%$s%') OR - comment_author_IP LIKE ('%$s%') OR - comment_content LIKE ('%$s%') ) AND - comment_approved = 'spam' - ORDER BY comment_date DESC"); -} else { - if ( isset( $_GET['apage'] ) ) - $page = (int) $_GET['apage']; - else - $page = 1; - - if ( $page < 2 ) - $page = 1; - - $current_type = false; - if ( isset( $_GET['ctype'] ) ) - $current_type = preg_replace( '|[^a-z]|', '', $_GET['ctype'] ); - - $comments = akismet_spam_comments( $current_type, $page ); - $total = akismet_spam_count( $current_type ); - $totals = akismet_spam_totals(); -?> - - -
" id="akismetsearch"> -

-

-
- 50 ) { -$total_pages = ceil( $total / 50 ); -$r = ''; -if ( 1 < $page ) { - $args['apage'] = ( 1 == $page - 1 ) ? '' : $page - 1; - $r .= '' . "\n"; -} -if ( ( $total_pages = ceil( $total / 50 ) ) > 1 ) { - for ( $page_num = 1; $page_num <= $total_pages; $page_num++ ) : - if ( $page == $page_num ) : - $r .= "$page_num\n"; - else : - $p = false; - if ( $page_num < 3 || ( $page_num >= $page - 3 && $page_num <= $page + 3 ) || $page_num > $total_pages - 3 ) : - $args['apage'] = ( 1 == $page_num ) ? '' : $page_num; - $r .= '' . ( $page_num ) . "\n"; - $in = true; - elseif ( $in == true ) : - $r .= "...\n"; - $in = false; - endif; - endif; - endfor; -} -if ( ( $page ) * 50 < $total || -1 == $total ) { - $args['apage'] = $page + 1; - $r .= '' . "\n"; -} -echo "

$r

"; -?> - - -
- - - - 50 ) { -$total_pages = ceil( $total / 50 ); -$r = ''; -if ( 1 < $page ) { - $args['apage'] = ( 1 == $page - 1 ) ? '' : $page - 1; - $r .= '' . "\n"; -} -if ( ( $total_pages = ceil( $total / 50 ) ) > 1 ) { - for ( $page_num = 1; $page_num <= $total_pages; $page_num++ ) : - if ( $page == $page_num ) : - $r .= "$page_num\n"; - else : - $p = false; - if ( $page_num < 3 || ( $page_num >= $page - 3 && $page_num <= $page + 3 ) || $page_num > $total_pages - 3 ) : - $args['apage'] = ( 1 == $page_num ) ? '' : $page_num; - $r .= '' . ( $page_num ) . "\n"; - $in = true; - elseif ( $in == true ) : - $r .= "...\n"; - $in = false; - endif; - endif; - endfor; -} -if ( ( $page ) * 50 < $total || -1 == $total ) { - $args['apage'] = $page + 1; - $r .= '' . "\n"; -} -echo "

$r

"; -} -?> -

- -

-

-
- -

- - - -
- -

-    -

-
- -
-'.__('Spam').''; - 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_i18n($count) ).'

'; -} - -add_action('activity_box_end', 'akismet_stats'); // WP 2.5+ function akismet_rightnow() { global $submenu, $wp_db_version; + // clean_url was deprecated in WP 3.0 + $esc_url = 'clean_url'; + if ( function_exists( 'esc_url' ) ) + $esc_url = 'esc_url'; + if ( 8645 < $wp_db_version ) // 2.7 $link = 'edit-comments.php?comment_status=spam'; elseif ( isset( $submenu['edit-comments.php'] ) ) @@ -1004,34 +704,20 @@ function akismet_rightnow() { $queue_count ), number_format_i18n( $queue_count ), clean_url($link) ); } else { - $queue_text = sprintf( __( "but there's nothing in your spam queue at the moment." ), clean_url($link) ); + $queue_text = sprintf( __( "but there's nothing in your spam queue at the moment." ), $esc_url($link) ); } - $text = sprintf( _c( '%1$s %2$s|akismet_rightnow' ), $intro, $queue_text ); + // _c was deprecated in WP 2.9.0 + if ( function_exists( '_x' ) ) + $text = sprintf( _x( '%1$s %2$s', 'akismet_rightnow' ), $intro, $queue_text ); + else + $text = sprintf( _c( '%1$s %2$s|akismet_rightnow' ), $intro, $queue_text ); echo "

$text

\n"; } add_action('rightnow_end', 'akismet_rightnow'); -// For WP <= 2.3.x -global $pagenow; - -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( '
', '
' . $button, $page ); - return $page; - } - - if ( $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '0'" ) ) - ob_start( 'akismet_recheck_button' ); -} // For WP >= 2.5 function akismet_check_for_spam_button($comment_status) { @@ -1060,7 +746,11 @@ 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']); + + $c['user_role'] = ''; + if ( isset( $c['user_ID'] ) ) + $c['user_role'] = akismet_get_user_roles($c['user_ID']); + $id = (int) $c['comment_ID']; $query_string = ''; @@ -1069,7 +759,11 @@ function akismet_recheck_queue() { $response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port); if ( 'true' == $response[1] ) { - $wpdb->query( "UPDATE $wpdb->comments SET comment_approved = 'spam' WHERE comment_ID = $id" ); + if ( function_exists('wp_set_comment_status') ) + wp_set_comment_status($id, 'spam'); + else + $wpdb->query("UPDATE $wpdb->comments SET comment_approved = 'spam' WHERE comment_ID = $id"); + } } wp_redirect( $_SERVER['HTTP_REFERER'] ); @@ -1103,10 +797,6 @@ function akismet_check_db_comment( $id ) { return $response[1]; } -// This option causes tons of FPs, was removed in 2.1 -function akismet_kill_proxy_check( $option ) { return 0; } -add_filter('option_open_proxy_check', 'akismet_kill_proxy_check'); - // Widget stuff function widget_akismet_register() { if ( function_exists('register_sidebar_widget') ) : @@ -1123,6 +813,10 @@ function widget_akismet_register() { } function widget_akismet_style() { + $plugin_dir = '/wp-content/plugins'; + if ( defined( 'PLUGINDIR' ) ) + $plugin_dir = '/' . PLUGINDIR; + ?>