WordPress is the official continuation of b2/cafélog, which came from Michel V. The work has been continued by the WordPress developers. If you would like to support WordPress, please consider donating.

".sprintf(__('Akismet %s required WordPress 3.0 or higher.'), AKISMET_VERSION) ." ".sprintf(__('Please upgrade WordPress to a current version, or downgrade to version 2.4 of the Akismet plugin.'), 'http://codex.wordpress.org/Upgrading_WordPress', 'http://wordpress.org/extend/plugins/akismet/download/'). "

+ + +

+ +

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/'); ?>

+ 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/'); ?>

+ +

+ + + + + $status ) { + $color = ( $status ? '#2d2' : '#d22'); + ?> + + + + + + +

+ +

'.sprintf(__('Akismet has protected your site from %3$s spam comments.'), 'http://akismet.com/', clean_url("$link?page=akismet-admin"), number_format_i18n($count) ).'

" . __('Check for Spam') . ""; +} +add_action('manage_comments_nav', 'akismet_check_for_spam_button'); + +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; + $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); + if ( is_object($current_user) ) { + $comment->reporter = $current_user->user_login; + } + if ( is_object($current_site) ) { + $comment->site_domain = $current_site->domain; + } + + $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); + if ( $comment->reporter ) { + akismet_update_comment_history( $comment_id, sprintf( __('%s un-spammed this comment'), $comment->reporter ), 'report-ham' ); + update_comment_meta( $comment_id, 'akismet_user_result', 'false' ); + update_comment_meta( $comment_id, 'akismet_user', $comment->reporter ); + } else { + akismet_update_comment_history( $comment_id, 'A plugin un-spammed this comment', 'report-ham' ); + } + + do_action('akismet_submit_nonspam_comment', $comment_id, $response[1]); +} + +function akismet_submit_spam_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; + if ( 'spam' != $comment->comment_approved ) + return; + $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); + if ( is_object($current_user) ) { + $comment->reporter = $current_user->user_login; + } + if ( is_object($current_site) ) { + $comment->site_domain = $current_site->domain; + } + + $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); + if ( $comment->reporter ) { + akismet_update_comment_history( $comment_id, sprintf( __('%s spammed this comment'), $comment->reporter ), 'report-spam' ); + update_comment_meta( $comment_id, 'akismet_user_result', 'true' ); + update_comment_meta( $comment_id, 'akismet_user', $comment->reporter ); + } else + akismet_update_comment_history( $comment_id, 'A plugin spammed this comment', 'report-ham' ); + do_action('akismet_submit_spam_comment', $comment_id, $response[1]); +} + +// 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 ); + } +} + +add_action( 'transition_comment_status', 'akismet_transition_comment_status', 10, 3 ); + +// Total spam in queue +// get_option( 'akismet_spam_count' ) is the total caught ever +function akismet_spam_count( $type = false ) { + global $wpdb; + + if ( !$type ) { // total + $count = wp_cache_get( 'akismet_spam_count', 'widget' ); + if ( false === $count ) { + if ( function_exists('wp_count_comments') ) { + $count = wp_count_comments(); + $count = $count->spam; + } else { + $count = (int) $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; + } elseif ( 'comments' == $type || 'comment' == $type ) { // comments + $type = ''; + } else { // pingback, trackback, ... + $type = $wpdb->escape( $type ); + } + + return (int) $wpdb->get_var("SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_approved = 'spam' AND comment_type='$type'"); +} + + +function akismet_recheck_queue() { + global $wpdb, $akismet_api_host, $akismet_api_port; + + 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 ); + foreach ( (array) $moderation as $c ) { + $c['user_ip'] = $c['comment_author_IP']; + $c['user_agent'] = $c['comment_agent']; + $c['referrer'] = ''; + $c['blog'] = get_option('home'); + $c['blog_lang'] = get_locale(); + $c['blog_charset'] = get_option('blog_charset'); + $c['permalink'] = get_permalink($c['comment_post_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 = ''; + foreach ( $c 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); + if ( 'true' == $response[1] ) { + wp_set_comment_status($c['comment_ID'], 'spam'); + update_comment_meta( $c['comment_ID'], 'akismet_result', 'true' ); + 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' ); + 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' ); + } + + } + wp_redirect( $_SERVER['HTTP_REFERER'] ); + exit; +} + +add_action('admin_action_akismet_recheck_queue', 'akismet_recheck_queue'); 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(); -?> -

>
$show ($type_count)

- - - 50 ) { -$total_pages = ceil( $total / 50 ); -$r = ''; -if ( 1 < $page ) { - $args['apage'] = ( 1 == $page - 1 ) ? '' : $page - 1; - $r .= ''. __('« Previous Page') .'' . "\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 .= ''. __('Next Page »') .'' . "\n"; -} -echo "

"; -?> - - -

- - -

"; - ?> - -
comment_author_email) { ?>| comment_author_url && 'http://' != $comment->comment_author_url) { ?> | |
- - - -
- - — — [ -comment_post_ID); -$post_title = wp_specialchars( $post->post_title, 'double' ); -$post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title; -?> - ]
- - - -

- 50 ) { -$total_pages = ceil( $total / 50 ); -$r = ''; -if ( 1 < $page ) { - $args['apage'] = ( 1 == $page - 1 ) ? '' : $page - 1; - $r .= ''. __('« Previous Page') .'' . "\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 .= ''. __('Next Page »') .'' . "\n"; -} -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) ).'

', '

' . $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; + ?> 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'] ); + $comment_ids = $wpdb->get_col( "SELECT comment_id FROM $wpdb->comments WHERE comment_approved = 'spam' AND '$delete_time' > comment_date_gmt" ); + if ( !empty( $comment_ids ) ) { + do_action( 'delete_comment', $comment_ids ); + $wpdb->query( "DELETE FROM $wpdb->comments WHERE comment_id IN ( " . implode( ', ', $comment_ids ) . " )"); + 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 '

'; +?> + + + +

+ +

+ +'.__('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(); +?> +

>
$show ($type_count)

+ + + 50 ) { +$total_pages = ceil( $total / 50 ); +$r = ''; +if ( 1 < $page ) { + $args['apage'] = ( 1 == $page - 1 ) ? '' : $page - 1; + $r .= ''. __('« Previous Page') .'' . "\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 .= ''. __('Next Page »') .'' . "\n"; +} +echo "

"; +?> + + +

+ + +

"; + ?> + +
comment_author_email) { ?>| comment_author_url && 'http://' != $comment->comment_author_url) { ?> | |
+ + + +
+ + — — [ +comment_post_ID); +$post_title = wp_specialchars( $post->post_title, 'double' ); +$post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title; +?> + ]
+ + + +

+ 50 ) { +$total_pages = ceil( $total / 50 ); +$r = ''; +if ( 1 < $page ) { + $args['apage'] = ( 1 == $page - 1 ) ? '' : $page - 1; + $r .= ''. __('« Previous Page') .'' . "\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 .= ''. __('Next Page »') .'' . "\n"; +} +echo "

"; +} +?> +

+ +

+ + + + + +

+" . __('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' ); +} + +// 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'); diff --git a/wp-content/plugins/akismet/readme.txt b/wp-content/plugins/akismet/readme.txt index f6b27fc2..db8234fc 100644 --- a/wp-content/plugins/akismet/readme.txt +++ b/wp-content/plugins/akismet/readme.txt @@ -3,7 +3,8 @@ Contributors: matt, ryan, andy, mdawaffe, tellyworth, automattic Tags: akismet, comments, spam Requires at least: 2.0 Tested up to: 3.0 -Stable tag: 2.3.0 +Stable tag: 2.4.0 +License: GPLv2 Akismet checks your comments against the Akismet web service to see if they look like spam or not. @@ -26,6 +27,17 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co == Changelog == += 2.4.0 = + +* Spell out that the license is GPLv2 +* Fix PHP warnings +* Fix WordPress deprecated function calls +* Fire the delete_comment action when deleting comments +* Move code specific for older WP versions to legacy.php +* General code clean up + += 2.3.0 = + * Fix "Are you sure" nonce message on config screen in WPMU * Fix XHTML compliance issue in sidebar widget * Change author link; remove some old references to WordPress.com accounts diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php index 20520a41..91b394b9 100644 --- a/wp-includes/canonical.php +++ b/wp-includes/canonical.php @@ -103,10 +103,6 @@ function redirect_canonical($requested_url=null, $do_redirect=true) { } elseif ( is_single() && !empty($_GET['p']) && ! $redirect_url ) { if ( $redirect_url = get_permalink(get_query_var('p')) ) $redirect['query'] = remove_query_arg(array('p', 'post_type'), $redirect['query']); - if ( get_query_var( 'page' ) ) { - $redirect_url = trailingslashit( $redirect_url ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' ); - $redirect['query'] = remove_query_arg( 'page', $redirect['query'] ); - } } elseif ( is_single() && !empty($_GET['name']) && ! $redirect_url ) { if ( $redirect_url = get_permalink( $wp_query->get_queried_object_id() ) ) $redirect['query'] = remove_query_arg('name', $redirect['query']); @@ -180,12 +176,18 @@ function redirect_canonical($requested_url=null, $do_redirect=true) { } } elseif ( is_single() && strpos($wp_rewrite->permalink_structure, '%category%') !== false ) { - $category = get_term_by('slug', get_query_var('category_name'), 'category'); + $category = get_category_by_path(get_query_var('category_name')); $post_terms = wp_get_object_terms($wp_query->get_queried_object_id(), 'category', array('fields' => 'tt_ids')); if ( (!$category || is_wp_error($category)) || ( !is_wp_error($post_terms) && !empty($post_terms) && !in_array($category->term_taxonomy_id, $post_terms) ) ) $redirect_url = get_permalink($wp_query->get_queried_object_id()); } + // Post Paging + if ( is_singular() && get_query_var('page') && $redirect_url ) { + $redirect_url = trailingslashit( $redirect_url ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' ); + $redirect['query'] = remove_query_arg( 'page', $redirect['query'] ); + } + // paging and feeds if ( get_query_var('paged') || is_feed() || get_query_var('cpage') ) { if ( !$redirect_url ) diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php index 3773b4a8..57a7cd78 100644 --- a/wp-includes/capabilities.php +++ b/wp-includes/capabilities.php @@ -799,9 +799,6 @@ function map_meta_cap( $cap, $user_id ) { case 'remove_user': $caps[] = 'remove_users'; break; - case 'delete_user': - $caps[] = 'delete_users'; - break; case 'promote_user': $caps[] = 'promote_users'; break; @@ -1028,10 +1025,13 @@ function map_meta_cap( $cap, $user_id ) { case 'delete_user': case 'delete_users': // If multisite these caps are allowed only for super admins. - if ( is_multisite() && !is_super_admin( $user_id ) ) + if ( is_multisite() && !is_super_admin( $user_id ) ) { $caps[] = 'do_not_allow'; - else + } else { + if ( 'delete_user' == $cap ) + $cap = 'delete_users'; $caps[] = $cap; + } break; case 'create_users': if ( is_multisite() && !get_site_option( 'add_new_users' ) ) @@ -1079,9 +1079,6 @@ function current_user_can( $capability ) { function current_user_can_for_blog( $blog_id, $capability ) { $current_user = wp_get_current_user(); - if ( is_multisite() && is_super_admin() ) - return true; - if ( empty( $current_user ) ) return false; diff --git a/wp-includes/comment.php b/wp-includes/comment.php index 4956fa77..517cb9a7 100644 --- a/wp-includes/comment.php +++ b/wp-includes/comment.php @@ -18,9 +18,8 @@ * check fails. If any of the parameter contents match the blacklist of words, * then the check fails. * - * If the comment is a trackback and part of the blogroll, then the trackback is - * automatically whitelisted. If the comment author was approved before, then - * the comment is automatically whitelisted. + * If the comment author was approved before, then the comment is + * automatically whitelisted. * * If none of the checks fail, then the failback is to set the check to pass * (return true). @@ -80,16 +79,7 @@ function check_comment($author, $email, $url, $comment, $user_ip, $user_agent, $ // Comment whitelisting: if ( 1 == get_option('comment_whitelist')) { - if ( 'trackback' == $comment_type || 'pingback' == $comment_type ) { // check if domain is in blogroll - $uri = parse_url($url); - $domain = $uri['host']; - $uri = parse_url( home_url() ); - $home_domain = $uri['host']; - if ( $wpdb->get_var($wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_url LIKE (%s) LIMIT 1", '%'.$domain.'%')) || $domain == $home_domain ) - return true; - else - return false; - } elseif ( $author != '' && $email != '' ) { + if ( 'trackback' != $comment_type && 'pingback' != $comment_type && $author != '' && $email != '' ) { // expected_slashed ($author, $email) $ok_to_comment = $wpdb->get_var("SELECT comment_approved FROM $wpdb->comments WHERE comment_author = '$author' AND comment_author_email = '$email' and comment_approved = '1' LIMIT 1"); if ( ( 1 == $ok_to_comment ) && @@ -1654,7 +1644,7 @@ function do_trackbacks($post_id) { trackback($tb_ping, $post_title, $excerpt, $post_id); $pinged[] = $tb_ping; } else { - $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, '$tb_ping', '')) WHERE ID = %d", $post_id) ); + $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $tb_ping, $post_id) ); } } } diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 9606f016..8cd9ba79 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -2125,7 +2125,7 @@ function wp_upload_dir( $time = null ) { $siteurl = get_option( 'siteurl' ); $upload_path = get_option( 'upload_path' ); $upload_path = trim($upload_path); - $main_override = defined( 'MULTISITE' ) && is_main_site(); + $main_override = is_multisite() && defined( 'MULTISITE' ) && is_main_site(); if ( empty($upload_path) ) { $dir = WP_CONTENT_DIR . '/uploads'; } else { diff --git a/wp-includes/load.php b/wp-includes/load.php index a514498a..94058caf 100644 --- a/wp-includes/load.php +++ b/wp-includes/load.php @@ -579,7 +579,7 @@ function is_multisite() { if ( defined( 'MULTISITE' ) ) return MULTISITE; - if ( defined( 'VHOST' ) || defined( 'SUNRISE' ) ) + if ( defined( 'SUBDOMAIN_INSTALL' ) || defined( 'VHOST' ) || defined( 'SUNRISE' ) ) return true; return false; diff --git a/wp-includes/ms-files.php b/wp-includes/ms-files.php index f5af8e03..5ec6d1dd 100644 --- a/wp-includes/ms-files.php +++ b/wp-includes/ms-files.php @@ -29,14 +29,14 @@ if ( !is_file( $file ) ) { die( '404 — File not found.' ); } -$mime = wp_check_filetype( $_SERVER[ 'REQUEST_URI' ] ); +$mime = wp_check_filetype( $file ); if( false === $mime[ 'type' ] && function_exists( 'mime_content_type' ) ) $mime[ 'type' ] = mime_content_type( $file ); if( $mime[ 'type' ] ) $mimetype = $mime[ 'type' ]; else - $mimetype = 'image/' . substr( $_SERVER[ 'REQUEST_URI' ], strrpos( $_SERVER[ 'REQUEST_URI' ], '.' ) + 1 ); + $mimetype = 'image/' . substr( $file, strrpos( $file, '.' ) + 1 ); header( 'Content-type: ' . $mimetype ); // always send this if ( false === strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS' ) ) diff --git a/wp-includes/version.php b/wp-includes/version.php index 731ce598..150a31cd 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -8,7 +8,7 @@ * * @global string $wp_version */ -$wp_version = '3.0.1'; +$wp_version = '3.0.2'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. -- 2.44.0

-comment_date); - $post = get_post($comment->comment_post_ID); - $post_title = $post->post_title; - if ($i % 2) $class = 'class="alternate"'; - else $class = ''; - echo "\n\t

"; - ?> - -

comment_author_email) { ?>| comment_author_url && 'http://' != $comment->comment_author_url) { ?> | |

- - - -

- - — — [ -comment_post_ID); -$post_title = wp_specialchars( $post->post_title, 'double' ); -$post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title; -?> - ]

-
Version 3.0.1 +
Version 3.0.2

Copyright

- Version 3.0.1 + Version 3.0.2

Copyright

-
Version 3.0.1 +
Version 3.0.2