Akismet Anti-Spam - Version 2.4.0

Version Description

  • 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
Download this release

Release Info

Developer tellyworth
Plugin Icon 128x128 Akismet Anti-Spam
Version 2.4.0
Comparing to
See all releases

Code changes from version 2.3.0 to 2.4.0

Files changed (3) hide show
  1. akismet.php +126 -413
  2. legacy.php +396 -0
  3. readme.txt +13 -1
akismet.php CHANGED
@@ -1,21 +1,49 @@
1
  <?php
 
 
 
2
  /*
3
  Plugin Name: Akismet
4
  Plugin URI: http://akismet.com/
5
  Description: Akismet checks your comments against the Akismet web service to see if they look like spam or not. You need an <a href="http://akismet.com/get/">API key</a> to use it. You can review the spam it catches under "Comments." To show off your Akismet stats just put <code>&lt;?php akismet_counter(); ?&gt;</code> in your template. See also: <a href="http://wordpress.org/extend/plugins/stats/">WP Stats plugin</a>.
6
- Version: 2.3.0
7
  Author: Automattic
8
  Author URI: http://automattic.com/wordpress-plugins/
 
9
  */
10
 
11
- define('AKISMET_VERSION', '2.3.0');
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
12
 
13
- // If you hardcode a WP.com API key here, all key config screens will be hidden
14
  if ( defined('WPCOM_API_KEY') )
15
  $wpcom_api_key = constant('WPCOM_API_KEY');
16
  else
17
  $wpcom_api_key = '';
18
 
 
 
 
 
 
 
 
 
 
19
  function akismet_init() {
20
  global $wpcom_api_key, $akismet_api_host, $akismet_api_port;
21
 
@@ -93,10 +121,10 @@ function akismet_conf() {
93
  akismet_get_server_connectivity(0);
94
  }
95
 
96
- if ( $key_status != 'valid' ) {
97
  $key = get_option('wordpress_api_key');
98
  if ( empty( $key ) ) {
99
- if ( $key_status != 'failed' ) {
100
  if ( akismet_verify_key( '1234567890ab' ) == 'failed' )
101
  $ms[] = 'no_connection';
102
  else
@@ -141,7 +169,7 @@ function akismet_conf() {
141
  <p style="padding: .5em; background-color: #<?php echo $messages[$m]['color']; ?>; color: #fff; font-weight: bold;"><?php echo $messages[$m]['text']; ?></p>
142
  <?php endforeach; ?>
143
  <p><input id="key" name="key" type="text" size="15" maxlength="12" value="<?php echo get_option('wordpress_api_key'); ?>" style="font-family: 'Courier New', Courier, mono; font-size: 1.5em;" /> (<?php _e('<a href="http://akismet.com/get/">What is this?</a>'); ?>)</p>
144
- <?php if ( $invalid_key ) { ?>
145
  <h3><?php _e('Why might my key be invalid?'); ?></h3>
146
  <p><?php _e('This can mean one of two things, either you copied the key wrong or that the plugin is unable to reach the Akismet servers, which is most often caused by an issue with your web host around firewalls or similar.'); ?></p>
147
  <?php } ?>
@@ -254,6 +282,22 @@ function akismet_stats_display() {
254
  <?php
255
  }
256
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
257
  function akismet_get_key() {
258
  global $wpcom_api_key;
259
  if ( !empty($wpcom_api_key) )
@@ -430,9 +474,10 @@ function akismet_result_spam( $approved ) {
430
  return 'spam';
431
  }
432
 
433
- function akismet_auto_check_comment( $comment ) {
434
  global $akismet_api_host, $akismet_api_port;
435
 
 
436
  $comment['user_ip'] = $_SERVER['REMOTE_ADDR'];
437
  $comment['user_agent'] = $_SERVER['HTTP_USER_AGENT'];
438
  $comment['referrer'] = $_SERVER['HTTP_REFERER'];
@@ -443,17 +488,20 @@ function akismet_auto_check_comment( $comment ) {
443
 
444
  $comment['user_role'] = akismet_get_user_roles($comment['user_ID']);
445
 
446
- $ignore = array( 'HTTP_COOKIE' );
447
 
448
  foreach ( $_SERVER as $key => $value )
449
  if ( !in_array( $key, $ignore ) && is_string($value) )
450
  $comment["$key"] = $value;
 
 
451
 
452
  $query_string = '';
453
  foreach ( $comment as $key => $data )
454
  $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
455
 
456
  $response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port);
 
457
  if ( 'true' == $response[1] ) {
458
  // akismet_spam_count will be incremented later by akismet_result_spam()
459
  add_filter('pre_comment_approved', 'akismet_result_spam');
@@ -472,19 +520,35 @@ function akismet_auto_check_comment( $comment ) {
472
  die;
473
  }
474
  }
475
- akismet_delete_old();
476
- return $comment;
 
 
 
 
 
 
 
 
477
  }
478
 
479
  function akismet_delete_old() {
480
  global $wpdb;
481
  $now_gmt = current_time('mysql', 1);
482
- $wpdb->query("DELETE FROM $wpdb->comments WHERE DATE_SUB('$now_gmt', INTERVAL 15 DAY) > comment_date_gmt AND comment_approved = 'spam'");
 
 
 
 
 
483
  $n = mt_rand(1, 5000);
484
- if ( $n == 11 ) // lucky number
485
  $wpdb->query("OPTIMIZE TABLE $wpdb->comments");
 
486
  }
487
 
 
 
488
  function akismet_submit_nonspam_comment ( $comment_id ) {
489
  global $wpdb, $akismet_api_host, $akismet_api_port, $current_user, $current_site;
490
  $comment_id = (int) $comment_id;
@@ -502,13 +566,17 @@ function akismet_submit_nonspam_comment ( $comment_id ) {
502
  if ( is_object($current_site) ) {
503
  $comment->site_domain = $current_site->domain;
504
  }
505
- $comment->user_role = akismet_get_user_roles($comment->user_ID);
 
 
 
506
 
507
  $query_string = '';
508
  foreach ( $comment as $key => $data )
509
  $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
510
 
511
  $response = akismet_http_post($query_string, $akismet_api_host, "/1.1/submit-ham", $akismet_api_port);
 
512
  }
513
 
514
  function akismet_submit_spam_comment ( $comment_id ) {
@@ -530,12 +598,17 @@ function akismet_submit_spam_comment ( $comment_id ) {
530
  if ( is_object($current_site) ) {
531
  $comment->site_domain = $current_site->domain;
532
  }
533
- $comment->user_role = akismet_get_user_roles($comment->user_ID);
 
 
 
 
534
  $query_string = '';
535
  foreach ( $comment as $key => $data )
536
  $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
537
 
538
  $response = akismet_http_post($query_string, $akismet_api_host, "/1.1/submit-spam", $akismet_api_port);
 
539
  }
540
 
541
  add_action('preprocess_comment', 'akismet_auto_check_comment', 1);
@@ -597,379 +670,16 @@ function akismet_spam_count( $type = false ) {
597
  return (int) $wpdb->get_var("SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_approved = 'spam' AND comment_type='$type'");
598
  }
599
 
600
- function akismet_spam_comments( $type = false, $page = 1, $per_page = 50 ) {
601
- global $wpdb;
602
-
603
- $page = (int) $page;
604
- if ( $page < 2 )
605
- $page = 1;
606
-
607
- $per_page = (int) $per_page;
608
- if ( $per_page < 1 )
609
- $per_page = 50;
610
-
611
- $start = ( $page - 1 ) * $per_page;
612
- $end = $start + $per_page;
613
-
614
- if ( $type ) {
615
- if ( 'comments' == $type || 'comment' == $type )
616
- $type = '';
617
- else
618
- $type = $wpdb->escape( $type );
619
- return $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE comment_approved = 'spam' AND comment_type='$type' ORDER BY comment_date DESC LIMIT $start, $end");
620
- }
621
-
622
- // All
623
- return $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE comment_approved = 'spam' ORDER BY comment_date DESC LIMIT $start, $end");
624
- }
625
-
626
- // Totals for each comment type
627
- // returns array( type => count, ... )
628
- function akismet_spam_totals() {
629
- global $wpdb;
630
- $totals = $wpdb->get_results( "SELECT comment_type, COUNT(*) AS cc FROM $wpdb->comments WHERE comment_approved = 'spam' GROUP BY comment_type" );
631
- $return = array();
632
- foreach ( $totals as $total )
633
- $return[$total->comment_type ? $total->comment_type : 'comment'] = $total->cc;
634
- return $return;
635
- }
636
-
637
- function akismet_manage_page() {
638
- global $wpdb, $submenu, $wp_db_version;
639
-
640
- // WP 2.7 has its own spam management page
641
- if ( 8645 <= $wp_db_version )
642
- return;
643
-
644
- $count = sprintf(__('Akismet Spam (%s)'), akismet_spam_count());
645
- if ( isset( $submenu['edit-comments.php'] ) )
646
- add_submenu_page('edit-comments.php', __('Akismet Spam'), $count, 'moderate_comments', 'akismet-admin', 'akismet_caught' );
647
- elseif ( function_exists('add_management_page') )
648
- add_management_page(__('Akismet Spam'), $count, 'moderate_comments', 'akismet-admin', 'akismet_caught');
649
- }
650
-
651
- function akismet_caught() {
652
- global $wpdb, $comment, $akismet_caught, $akismet_nonce;
653
-
654
- akismet_recheck_queue();
655
- if (isset($_POST['submit']) && 'recover' == $_POST['action'] && ! empty($_POST['not_spam'])) {
656
- check_admin_referer( $akismet_nonce );
657
- if ( function_exists('current_user_can') && !current_user_can('moderate_comments') )
658
- die(__('You do not have sufficient permission to moderate comments.'));
659
-
660
- $i = 0;
661
- foreach ($_POST['not_spam'] as $comment):
662
- $comment = (int) $comment;
663
- if ( function_exists('wp_set_comment_status') )
664
- wp_set_comment_status($comment, 'approve');
665
- else
666
- $wpdb->query("UPDATE $wpdb->comments SET comment_approved = '1' WHERE comment_ID = '$comment'");
667
- akismet_submit_nonspam_comment($comment);
668
- ++$i;
669
- endforeach;
670
- $to = add_query_arg( 'recovered', $i, $_SERVER['HTTP_REFERER'] );
671
- wp_redirect( $to );
672
- exit;
673
- }
674
- if ('delete' == $_POST['action']) {
675
- check_admin_referer( $akismet_nonce );
676
- if ( function_exists('current_user_can') && !current_user_can('moderate_comments') )
677
- die(__('You do not have sufficient permission to moderate comments.'));
678
-
679
- $delete_time = $wpdb->escape( $_POST['display_time'] );
680
- $nuked = $wpdb->query( "DELETE FROM $wpdb->comments WHERE comment_approved = 'spam' AND '$delete_time' > comment_date_gmt" );
681
- wp_cache_delete( 'akismet_spam_count', 'widget' );
682
- $to = add_query_arg( 'deleted', 'all', $_SERVER['HTTP_REFERER'] );
683
- wp_redirect( $to );
684
- exit;
685
- }
686
-
687
- if ( isset( $_GET['recovered'] ) ) {
688
- $i = (int) $_GET['recovered'];
689
- echo '<div class="updated"><p>' . sprintf(__('%1$s comments recovered.'), $i) . "</p></div>";
690
- }
691
-
692
- if (isset( $_GET['deleted'] ) )
693
- echo '<div class="updated"><p>' . __('All spam deleted.') . '</p></div>';
694
-
695
- if ( isset( $GLOBALS['submenu']['edit-comments.php'] ) )
696
- $link = 'edit-comments.php';
697
- else
698
- $link = 'edit.php';
699
- ?>
700
- <style type="text/css">
701
- .akismet-tabs {
702
- list-style: none;
703
- margin: 0;
704
- padding: 0;
705
- clear: both;
706
- border-bottom: 1px solid #ccc;
707
- height: 31px;
708
- margin-bottom: 20px;
709
- background: #ddd;
710
- border-top: 1px solid #bdbdbd;
711
- }
712
- .akismet-tabs li {
713
- float: left;
714
- margin: 5px 0 0 20px;
715
- }
716
- .akismet-tabs a {
717
- display: block;
718
- padding: 4px .5em 3px;
719
- border-bottom: none;
720
- color: #036;
721
- }
722
- .akismet-tabs .active a {
723
- background: #fff;
724
- border: 1px solid #ccc;
725
- border-bottom: none;
726
- color: #000;
727
- font-weight: bold;
728
- padding-bottom: 4px;
729
- }
730
- #akismetsearch {
731
- float: right;
732
- margin-top: -.5em;
733
- }
734
-
735
- #akismetsearch p {
736
- margin: 0;
737
- padding: 0;
738
- }
739
- </style>
740
- <div class="wrap">
741
- <h2><?php _e('Caught Spam') ?></h2>
742
- <?php
743
- $count = get_option( 'akismet_spam_count' );
744
- if ( $count ) {
745
- ?>
746
- <p><?php printf(__('Akismet has caught <strong>%1$s spam</strong> for you since you first installed it.'), number_format_i18n($count) ); ?></p>
747
- <?php
748
- }
749
-
750
- $spam_count = akismet_spam_count();
751
-
752
- if ( 0 == $spam_count ) {
753
- echo '<p>'.__('You have no spam currently in the queue. Must be your lucky day. :)').'</p>';
754
- echo '</div>';
755
- } else {
756
- echo '<p>'.__('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&#8217;t sweat it.').'</p>';
757
- ?>
758
- <?php if ( !isset( $_POST['s'] ) ) { ?>
759
- <form method="post" action="<?php echo attribute_escape( add_query_arg( 'noheader', 'true' ) ); ?>">
760
- <?php akismet_nonce_field($akismet_nonce) ?>
761
- <input type="hidden" name="action" value="delete" />
762
- <?php printf(__('There are currently %1$s comments identified as spam.'), $spam_count); ?>&nbsp; &nbsp; <input type="submit" class="button delete" name="Submit" value="<?php _e('Delete all'); ?>" />
763
- <input type="hidden" name="display_time" value="<?php echo current_time('mysql', 1); ?>" />
764
- </form>
765
- <?php } ?>
766
- </div>
767
- <div class="wrap">
768
- <?php if ( isset( $_POST['s'] ) ) { ?>
769
- <h2><?php _e('Search'); ?></h2>
770
- <?php } else { ?>
771
- <?php echo '<p>'.__('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.').'</p>'; ?>
772
- <?php } ?>
773
- <?php
774
- if ( isset( $_POST['s'] ) ) {
775
- $s = $wpdb->escape($_POST['s']);
776
- $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE
777
- (comment_author LIKE '%$s%' OR
778
- comment_author_email LIKE '%$s%' OR
779
- comment_author_url LIKE ('%$s%') OR
780
- comment_author_IP LIKE ('%$s%') OR
781
- comment_content LIKE ('%$s%') ) AND
782
- comment_approved = 'spam'
783
- ORDER BY comment_date DESC");
784
- } else {
785
- if ( isset( $_GET['apage'] ) )
786
- $page = (int) $_GET['apage'];
787
- else
788
- $page = 1;
789
-
790
- if ( $page < 2 )
791
- $page = 1;
792
-
793
- $current_type = false;
794
- if ( isset( $_GET['ctype'] ) )
795
- $current_type = preg_replace( '|[^a-z]|', '', $_GET['ctype'] );
796
-
797
- $comments = akismet_spam_comments( $current_type, $page );
798
- $total = akismet_spam_count( $current_type );
799
- $totals = akismet_spam_totals();
800
- ?>
801
- <ul class="akismet-tabs">
802
- <li <?php if ( !isset( $_GET['ctype'] ) ) echo ' class="active"'; ?>><a href="edit-comments.php?page=akismet-admin"><?php _e('All'); ?></a></li>
803
- <?php
804
- foreach ( $totals as $type => $type_count ) {
805
- if ( 'comment' == $type ) {
806
- $type = 'comments';
807
- $show = __('Comments');
808
- } else {
809
- $show = ucwords( $type );
810
- }
811
- $type_count = number_format_i18n( $type_count );
812
- $extra = $current_type === $type ? ' class="active"' : '';
813
- echo "<li $extra><a href='edit-comments.php?page=akismet-admin&amp;ctype=$type'>$show ($type_count)</a></li>";
814
- }
815
- do_action( 'akismet_tabs' ); // so plugins can add more tabs easily
816
- ?>
817
- </ul>
818
- <?php
819
- }
820
-
821
- if ($comments) {
822
- ?>
823
- <form method="post" action="<?php echo attribute_escape("$link?page=akismet-admin"); ?>" id="akismetsearch">
824
- <p> <input type="text" name="s" value="<?php if (isset($_POST['s'])) echo attribute_escape($_POST['s']); ?>" size="17" />
825
- <input type="submit" class="button" name="submit" value="<?php echo attribute_escape(__('Search Spam &raquo;')) ?>" /> </p>
826
- </form>
827
- <?php if ( $total > 50 ) {
828
- $total_pages = ceil( $total / 50 );
829
- $r = '';
830
- if ( 1 < $page ) {
831
- $args['apage'] = ( 1 == $page - 1 ) ? '' : $page - 1;
832
- $r .= '<a class="prev" href="' . clean_url(add_query_arg( $args )) . '">'. __('&laquo; Previous Page') .'</a>' . "\n";
833
- }
834
- if ( ( $total_pages = ceil( $total / 50 ) ) > 1 ) {
835
- for ( $page_num = 1; $page_num <= $total_pages; $page_num++ ) :
836
- if ( $page == $page_num ) :
837
- $r .= "<strong>$page_num</strong>\n";
838
- else :
839
- $p = false;
840
- if ( $page_num < 3 || ( $page_num >= $page - 3 && $page_num <= $page + 3 ) || $page_num > $total_pages - 3 ) :
841
- $args['apage'] = ( 1 == $page_num ) ? '' : $page_num;
842
- $r .= '<a class="page-numbers" href="' . clean_url(add_query_arg($args)) . '">' . ( $page_num ) . "</a>\n";
843
- $in = true;
844
- elseif ( $in == true ) :
845
- $r .= "...\n";
846
- $in = false;
847
- endif;
848
- endif;
849
- endfor;
850
- }
851
- if ( ( $page ) * 50 < $total || -1 == $total ) {
852
- $args['apage'] = $page + 1;
853
- $r .= '<a class="next" href="' . clean_url(add_query_arg($args)) . '">'. __('Next Page &raquo;') .'</a>' . "\n";
854
- }
855
- echo "<p>$r</p>";
856
- ?>
857
-
858
- <?php } ?>
859
- <form style="clear: both;" method="post" action="<?php echo attribute_escape( add_query_arg( 'noheader', 'true' ) ); ?>">
860
- <?php akismet_nonce_field($akismet_nonce) ?>
861
- <input type="hidden" name="action" value="recover" />
862
- <ul id="spam-list" class="commentlist" style="list-style: none; margin: 0; padding: 0;">
863
- <?php
864
- $i = 0;
865
- foreach($comments as $comment) {
866
- $i++;
867
- $comment_date = mysql2date(get_option("date_format") . " @ " . get_option("time_format"), $comment->comment_date);
868
- $post = get_post($comment->comment_post_ID);
869
- $post_title = $post->post_title;
870
- if ($i % 2) $class = 'class="alternate"';
871
- else $class = '';
872
- echo "\n\t<li id='comment-$comment->comment_ID' $class>";
873
- ?>
874
-
875
- <p><strong><?php comment_author() ?></strong> <?php if ($comment->comment_author_email) { ?>| <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_url && 'http://' != $comment->comment_author_url) { ?> | <?php comment_author_url_link() ?> <?php } ?>| <?php _e('IP:') ?> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></p>
876
-
877
- <?php comment_text() ?>
878
-
879
- <p><label for="spam-<?php echo $comment->comment_ID; ?>">
880
- <input type="checkbox" id="spam-<?php echo $comment->comment_ID; ?>" name="not_spam[]" value="<?php echo $comment->comment_ID; ?>" />
881
- <?php _e('Not Spam') ?></label> &#8212; <?php comment_date('M j, g:i A'); ?> &#8212; [
882
- <?php
883
- $post = get_post($comment->comment_post_ID);
884
- $post_title = wp_specialchars( $post->post_title, 'double' );
885
- $post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title;
886
- ?>
887
- <a href="<?php echo get_permalink($comment->comment_post_ID); ?>" title="<?php echo $post_title; ?>"><?php _e('View Post') ?></a> ] </p>
888
-
889
-
890
- <?php
891
- }
892
- ?>
893
- </ul>
894
- <?php if ( $total > 50 ) {
895
- $total_pages = ceil( $total / 50 );
896
- $r = '';
897
- if ( 1 < $page ) {
898
- $args['apage'] = ( 1 == $page - 1 ) ? '' : $page - 1;
899
- $r .= '<a class="prev" href="' . clean_url(add_query_arg( $args )) . '">'. __('&laquo; Previous Page') .'</a>' . "\n";
900
- }
901
- if ( ( $total_pages = ceil( $total / 50 ) ) > 1 ) {
902
- for ( $page_num = 1; $page_num <= $total_pages; $page_num++ ) :
903
- if ( $page == $page_num ) :
904
- $r .= "<strong>$page_num</strong>\n";
905
- else :
906
- $p = false;
907
- if ( $page_num < 3 || ( $page_num >= $page - 3 && $page_num <= $page + 3 ) || $page_num > $total_pages - 3 ) :
908
- $args['apage'] = ( 1 == $page_num ) ? '' : $page_num;
909
- $r .= '<a class="page-numbers" href="' . clean_url(add_query_arg($args)) . '">' . ( $page_num ) . "</a>\n";
910
- $in = true;
911
- elseif ( $in == true ) :
912
- $r .= "...\n";
913
- $in = false;
914
- endif;
915
- endif;
916
- endfor;
917
- }
918
- if ( ( $page ) * 50 < $total || -1 == $total ) {
919
- $args['apage'] = $page + 1;
920
- $r .= '<a class="next" href="' . clean_url(add_query_arg($args)) . '">'. __('Next Page &raquo;') .'</a>' . "\n";
921
- }
922
- echo "<p>$r</p>";
923
- }
924
- ?>
925
- <p class="submit">
926
- <input type="submit" name="submit" value="<?php echo attribute_escape(__('De-spam marked comments &raquo;')); ?>" />
927
- </p>
928
- <p><?php _e('Comments you de-spam will be submitted to Akismet as mistakes so it can learn and get better.'); ?></p>
929
- </form>
930
- <?php
931
- } else {
932
- ?>
933
- <p><?php _e('No results found.'); ?></p>
934
- <?php } ?>
935
-
936
- <?php if ( !isset( $_POST['s'] ) ) { ?>
937
- <form method="post" action="<?php echo attribute_escape( add_query_arg( 'noheader', 'true' ) ); ?>">
938
- <?php akismet_nonce_field($akismet_nonce) ?>
939
- <p><input type="hidden" name="action" value="delete" />
940
- <?php printf(__('There are currently %1$s comments identified as spam.'), $spam_count); ?>&nbsp; &nbsp; <input type="submit" name="Submit" class="button" value="<?php echo attribute_escape(__('Delete all')); ?>" />
941
- <input type="hidden" name="display_time" value="<?php echo current_time('mysql', 1); ?>" /></p>
942
- </form>
943
- <?php } ?>
944
- </div>
945
- <?php
946
- }
947
- }
948
-
949
- add_action('admin_menu', 'akismet_manage_page');
950
-
951
- // WP < 2.5
952
- function akismet_stats() {
953
- if ( !function_exists('did_action') || did_action( 'rightnow_end' ) ) // We already displayed this info in the "Right Now" section
954
- return;
955
- if ( !$count = get_option('akismet_spam_count') )
956
- return;
957
- $path = plugin_basename(__FILE__);
958
- echo '<h3>'.__('Spam').'</h3>';
959
- global $submenu;
960
- if ( isset( $submenu['edit-comments.php'] ) )
961
- $link = 'edit-comments.php';
962
- else
963
- $link = 'edit.php';
964
- echo '<p>'.sprintf(__('<a href="%1$s">Akismet</a> has protected your site from <a href="%2$s">%3$s spam comments</a>.'), 'http://akismet.com/', clean_url("$link?page=akismet-admin"), number_format_i18n($count) ).'</p>';
965
- }
966
-
967
- add_action('activity_box_end', 'akismet_stats');
968
 
969
  // WP 2.5+
970
  function akismet_rightnow() {
971
  global $submenu, $wp_db_version;
972
 
 
 
 
 
 
973
  if ( 8645 < $wp_db_version ) // 2.7
974
  $link = 'edit-comments.php?comment_status=spam';
975
  elseif ( isset( $submenu['edit-comments.php'] ) )
@@ -994,34 +704,20 @@ function akismet_rightnow() {
994
  $queue_count
995
  ), number_format_i18n( $queue_count ), clean_url($link) );
996
  } else {
997
- $queue_text = sprintf( __( "but there's nothing in your <a href='%1\$s'>spam queue</a> at the moment." ), clean_url($link) );
998
  }
999
 
1000
- $text = sprintf( _c( '%1$s %2$s|akismet_rightnow' ), $intro, $queue_text );
 
 
 
 
1001
 
1002
  echo "<p class='akismet-right-now'>$text</p>\n";
1003
  }
1004
 
1005
  add_action('rightnow_end', 'akismet_rightnow');
1006
 
1007
- // For WP <= 2.3.x
1008
- global $pagenow;
1009
-
1010
- if ( 'moderation.php' == $pagenow ) {
1011
- function akismet_recheck_button( $page ) {
1012
- global $submenu;
1013
- if ( isset( $submenu['edit-comments.php'] ) )
1014
- $link = 'edit-comments.php';
1015
- else
1016
- $link = 'edit.php';
1017
- $button = "<a href='$link?page=akismet-admin&amp;recheckqueue=true&amp;noheader=true' style='display: block; width: 100px; position: absolute; right: 7%; padding: 5px; font-size: 14px; text-decoration: underline; background: #fff; border: 1px solid #ccc;'>" . __('Recheck Queue for Spam') . "</a>";
1018
- $page = str_replace( '<div class="wrap">', '<div class="wrap">' . $button, $page );
1019
- return $page;
1020
- }
1021
-
1022
- if ( $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '0'" ) )
1023
- ob_start( 'akismet_recheck_button' );
1024
- }
1025
 
1026
  // For WP >= 2.5
1027
  function akismet_check_for_spam_button($comment_status) {
@@ -1050,7 +746,11 @@ function akismet_recheck_queue() {
1050
  $c['blog_lang'] = get_locale();
1051
  $c['blog_charset'] = get_option('blog_charset');
1052
  $c['permalink'] = get_permalink($c['comment_post_ID']);
1053
- $c['user_role'] = akismet_get_user_roles($c['user_ID']);
 
 
 
 
1054
  $id = (int) $c['comment_ID'];
1055
 
1056
  $query_string = '';
@@ -1059,7 +759,11 @@ function akismet_recheck_queue() {
1059
 
1060
  $response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port);
1061
  if ( 'true' == $response[1] ) {
1062
- $wpdb->query( "UPDATE $wpdb->comments SET comment_approved = 'spam' WHERE comment_ID = $id" );
 
 
 
 
1063
  }
1064
  }
1065
  wp_redirect( $_SERVER['HTTP_REFERER'] );
@@ -1093,10 +797,6 @@ function akismet_check_db_comment( $id ) {
1093
  return $response[1];
1094
  }
1095
 
1096
- // This option causes tons of FPs, was removed in 2.1
1097
- function akismet_kill_proxy_check( $option ) { return 0; }
1098
- add_filter('option_open_proxy_check', 'akismet_kill_proxy_check');
1099
-
1100
  // Widget stuff
1101
  function widget_akismet_register() {
1102
  if ( function_exists('register_sidebar_widget') ) :
@@ -1113,6 +813,10 @@ function widget_akismet_register() {
1113
  }
1114
 
1115
  function widget_akismet_style() {
 
 
 
 
1116
  ?>
1117
  <style type="text/css">
1118
  #aka,#aka:link,#aka:hover,#aka:visited,#aka:active{color:#fff;text-decoration:none}
@@ -1122,14 +826,14 @@ function widget_akismet_register() {
1122
  #akismet2{display:none;padding-top:2px}
1123
  #akismeta{font-size:16px;font-weight:bold;line-height:18px;text-decoration:none}
1124
  #akismetcount{display:block;font:15px Verdana,Arial,Sans-Serif;font-weight:bold;text-decoration:none}
1125
- #akismetwrap #akismetstats{background:url(<?php echo get_option('siteurl'); ?>/wp-content/plugins/akismet/akismet.gif) no-repeat top left;border:none;color:#fff;font:11px 'Trebuchet MS','Myriad Pro',sans-serif;height:40px;line-height:100%;overflow:hidden;padding:8px 0 0;text-align:center;width:120px}
1126
  </style>
1127
  <?php
1128
  }
1129
 
1130
  function widget_akismet_control() {
1131
  $options = $newoptions = get_option('widget_akismet');
1132
- if ( $_POST["akismet-submit"] ) {
1133
  $newoptions['title'] = strip_tags(stripslashes($_POST["akismet-title"]));
1134
  if ( empty($newoptions['title']) ) $newoptions['title'] = __('Spam Blocked');
1135
  }
@@ -1144,8 +848,13 @@ function widget_akismet_register() {
1144
  <?php
1145
  }
1146
 
1147
- register_sidebar_widget('Akismet', 'widget_akismet', null, 'akismet');
1148
- register_widget_control('Akismet', 'widget_akismet_control', null, 75, 'akismet');
 
 
 
 
 
1149
  if ( is_active_widget('widget_akismet') )
1150
  add_action('wp_head', 'widget_akismet_style');
1151
  endif;
@@ -1155,6 +864,10 @@ add_action('init', 'widget_akismet_register');
1155
 
1156
  // Counter for non-widget users
1157
  function akismet_counter() {
 
 
 
 
1158
  ?>
1159
  <style type="text/css">
1160
  #akismetwrap #aka,#aka:link,#aka:hover,#aka:visited,#aka:active{color:#fff;text-decoration:none}
@@ -1164,7 +877,7 @@ function akismet_counter() {
1164
  #akismet2{display:none;padding-top:2px}
1165
  #akismeta{font-size:16px;font-weight:bold;line-height:18px;text-decoration:none}
1166
  #akismetcount{display:block;font:15px Verdana,Arial,Sans-Serif;font-weight:bold;text-decoration:none}
1167
- #akismetwrap #akismetstats{background:url(<?php echo get_option('siteurl'); ?>/wp-content/plugins/akismet/akismet.gif) no-repeat top left;border:none;color:#fff;font:11px 'Trebuchet MS','Myriad Pro',sans-serif;height:40px;line-height:100%;overflow:hidden;padding:8px 0 0;text-align:center;width:120px}
1168
  </style>
1169
  <?php
1170
  $count = number_format_i18n(get_option('akismet_spam_count'));
1
  <?php
2
+ /**
3
+ * @package Akismet
4
+ */
5
  /*
6
  Plugin Name: Akismet
7
  Plugin URI: http://akismet.com/
8
  Description: Akismet checks your comments against the Akismet web service to see if they look like spam or not. You need an <a href="http://akismet.com/get/">API key</a> to use it. You can review the spam it catches under "Comments." To show off your Akismet stats just put <code>&lt;?php akismet_counter(); ?&gt;</code> in your template. See also: <a href="http://wordpress.org/extend/plugins/stats/">WP Stats plugin</a>.
9
+ Version: 2.4.0
10
  Author: Automattic
11
  Author URI: http://automattic.com/wordpress-plugins/
12
+ License: GPLv2
13
  */
14
 
15
+ /*
16
+ This program is free software; you can redistribute it and/or modify
17
+ it under the terms of the GNU General Public License as published by
18
+ the Free Software Foundation; version 2 of the License.
19
+
20
+ This program is distributed in the hope that it will be useful,
21
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
22
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23
+ GNU General Public License for more details.
24
+
25
+ You should have received a copy of the GNU General Public License
26
+ along with this program; if not, write to the Free Software
27
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
28
+ */
29
+
30
+ define('AKISMET_VERSION', '2.4.0');
31
 
32
+ /** If you hardcode a WP.com API key here, all key config screens will be hidden */
33
  if ( defined('WPCOM_API_KEY') )
34
  $wpcom_api_key = constant('WPCOM_API_KEY');
35
  else
36
  $wpcom_api_key = '';
37
 
38
+ // Make sure we don't expose any info if called directly
39
+ if ( !function_exists( 'add_action' ) ) {
40
+ echo "Hi there! I'm just a plugin, not much I can do when called directly.";
41
+ exit;
42
+ }
43
+
44
+ if ( $wp_db_version <= 9872 )
45
+ include_once( dirname(__FILE__) . '/legacy.php' );
46
+
47
  function akismet_init() {
48
  global $wpcom_api_key, $akismet_api_host, $akismet_api_port;
49
 
121
  akismet_get_server_connectivity(0);
122
  }
123
 
124
+ if ( empty( $key_status) || $key_status != 'valid' ) {
125
  $key = get_option('wordpress_api_key');
126
  if ( empty( $key ) ) {
127
+ if ( empty( $key_status ) || $key_status != 'failed' ) {
128
  if ( akismet_verify_key( '1234567890ab' ) == 'failed' )
129
  $ms[] = 'no_connection';
130
  else
169
  <p style="padding: .5em; background-color: #<?php echo $messages[$m]['color']; ?>; color: #fff; font-weight: bold;"><?php echo $messages[$m]['text']; ?></p>
170
  <?php endforeach; ?>
171
  <p><input id="key" name="key" type="text" size="15" maxlength="12" value="<?php echo get_option('wordpress_api_key'); ?>" style="font-family: 'Courier New', Courier, mono; font-size: 1.5em;" /> (<?php _e('<a href="http://akismet.com/get/">What is this?</a>'); ?>)</p>
172
+ <?php if ( isset( $invalid_key) && $invalid_key ) { ?>
173
  <h3><?php _e('Why might my key be invalid?'); ?></h3>
174
  <p><?php _e('This can mean one of two things, either you copied the key wrong or that the plugin is unable to reach the Akismet servers, which is most often caused by an issue with your web host around firewalls or similar.'); ?></p>
175
  <?php } ?>
282
  <?php
283
  }
284
 
285
+ function akismet_stats() {
286
+ if ( !function_exists('did_action') || did_action( 'rightnow_end' ) ) // We already displayed this info in the "Right Now" section
287
+ return;
288
+ if ( !$count = get_option('akismet_spam_count') )
289
+ return;
290
+ $path = plugin_basename(__FILE__);
291
+ echo '<h3>'.__('Spam').'</h3>';
292
+ global $submenu;
293
+ if ( isset( $submenu['edit-comments.php'] ) )
294
+ $link = 'edit-comments.php';
295
+ else
296
+ $link = 'edit.php';
297
+ echo '<p>'.sprintf(__('<a href="%1$s">Akismet</a> has protected your site from <a href="%2$s">%3$s spam comments</a>.'), 'http://akismet.com/', clean_url("$link?page=akismet-admin"), number_format_i18n($count) ).'</p>';
298
+ }
299
+ add_action('activity_box_end', 'akismet_stats');
300
+
301
  function akismet_get_key() {
302
  global $wpcom_api_key;
303
  if ( !empty($wpcom_api_key) )
474
  return 'spam';
475
  }
476
 
477
+ function akismet_auto_check_comment( $commentdata ) {
478
  global $akismet_api_host, $akismet_api_port;
479
 
480
+ $comment = $commentdata;
481
  $comment['user_ip'] = $_SERVER['REMOTE_ADDR'];
482
  $comment['user_agent'] = $_SERVER['HTTP_USER_AGENT'];
483
  $comment['referrer'] = $_SERVER['HTTP_REFERER'];
488
 
489
  $comment['user_role'] = akismet_get_user_roles($comment['user_ID']);
490
 
491
+ $ignore = array( 'HTTP_COOKIE', 'HTTP_COOKIE2', 'PHP_AUTH_PW' );
492
 
493
  foreach ( $_SERVER as $key => $value )
494
  if ( !in_array( $key, $ignore ) && is_string($value) )
495
  $comment["$key"] = $value;
496
+ else
497
+ $comment["$key"] = '';
498
 
499
  $query_string = '';
500
  foreach ( $comment as $key => $data )
501
  $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
502
 
503
  $response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port);
504
+ $commentdata['akismet_result'] = $response[1];
505
  if ( 'true' == $response[1] ) {
506
  // akismet_spam_count will be incremented later by akismet_result_spam()
507
  add_filter('pre_comment_approved', 'akismet_result_spam');
520
  die;
521
  }
522
  }
523
+
524
+ if ( function_exists('wp_next_scheduled') && function_exists('wp_schedule_event') ) {
525
+ // WP 2.1+: delete old comments daily
526
+ if ( !wp_next_scheduled('akismet_scheduled_delete') )
527
+ wp_schedule_event(time(), 'daily', 'akismet_scheduled_delete');
528
+ } elseif ( (mt_rand(1, 10) == 3) ) {
529
+ // WP 2.0: run this one time in ten
530
+ akismet_delete_old();
531
+ }
532
+ return $commentdata;
533
  }
534
 
535
  function akismet_delete_old() {
536
  global $wpdb;
537
  $now_gmt = current_time('mysql', 1);
538
+ $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'");
539
+ if ( empty( $comment_ids ) )
540
+ return;
541
+
542
+ do_action( 'delete_comment', $comment_ids );
543
+ $wpdb->query("DELETE FROM $wpdb->comments WHERE comment_id IN ( " . implode( ', ', $comment_ids ) . " )");
544
  $n = mt_rand(1, 5000);
545
+ if ( apply_filters('akismet_optimize_table', ($n == 11)) ) // lucky number
546
  $wpdb->query("OPTIMIZE TABLE $wpdb->comments");
547
+
548
  }
549
 
550
+ add_action('akismet_scheduled_delete', 'akismet_delete_old');
551
+
552
  function akismet_submit_nonspam_comment ( $comment_id ) {
553
  global $wpdb, $akismet_api_host, $akismet_api_port, $current_user, $current_site;
554
  $comment_id = (int) $comment_id;
566
  if ( is_object($current_site) ) {
567
  $comment->site_domain = $current_site->domain;
568
  }
569
+
570
+ $comment->user_role = '';
571
+ if ( isset( $comment->user_ID ) )
572
+ $comment->user_role = akismet_get_user_roles($comment->user_ID);
573
 
574
  $query_string = '';
575
  foreach ( $comment as $key => $data )
576
  $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
577
 
578
  $response = akismet_http_post($query_string, $akismet_api_host, "/1.1/submit-ham", $akismet_api_port);
579
+ do_action('akismet_submit_nonspam_comment', $comment_id, $response[1]);
580
  }
581
 
582
  function akismet_submit_spam_comment ( $comment_id ) {
598
  if ( is_object($current_site) ) {
599
  $comment->site_domain = $current_site->domain;
600
  }
601
+
602
+ $comment->user_role = '';
603
+ if ( !isset( $comment->user_id ) )
604
+ $comment->user_role = akismet_get_user_roles($comment->user_ID);
605
+
606
  $query_string = '';
607
  foreach ( $comment as $key => $data )
608
  $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
609
 
610
  $response = akismet_http_post($query_string, $akismet_api_host, "/1.1/submit-spam", $akismet_api_port);
611
+ do_action('akismet_submit_spam_comment', $comment_id, $response[1]);
612
  }
613
 
614
  add_action('preprocess_comment', 'akismet_auto_check_comment', 1);
670
  return (int) $wpdb->get_var("SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_approved = 'spam' AND comment_type='$type'");
671
  }
672
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
673
 
674
  // WP 2.5+
675
  function akismet_rightnow() {
676
  global $submenu, $wp_db_version;
677
 
678
+ // clean_url was deprecated in WP 3.0
679
+ $esc_url = 'clean_url';
680
+ if ( function_exists( 'esc_url' ) )
681
+ $esc_url = 'esc_url';
682
+
683
  if ( 8645 < $wp_db_version ) // 2.7
684
  $link = 'edit-comments.php?comment_status=spam';
685
  elseif ( isset( $submenu['edit-comments.php'] ) )
704
  $queue_count
705
  ), number_format_i18n( $queue_count ), clean_url($link) );
706
  } else {
707
+ $queue_text = sprintf( __( "but there's nothing in your <a href='%1\$s'>spam queue</a> at the moment." ), $esc_url($link) );
708
  }
709
 
710
+ // _c was deprecated in WP 2.9.0
711
+ if ( function_exists( '_x' ) )
712
+ $text = sprintf( _x( '%1$s %2$s', 'akismet_rightnow' ), $intro, $queue_text );
713
+ else
714
+ $text = sprintf( _c( '%1$s %2$s|akismet_rightnow' ), $intro, $queue_text );
715
 
716
  echo "<p class='akismet-right-now'>$text</p>\n";
717
  }
718
 
719
  add_action('rightnow_end', 'akismet_rightnow');
720
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
721
 
722
  // For WP >= 2.5
723
  function akismet_check_for_spam_button($comment_status) {
746
  $c['blog_lang'] = get_locale();
747
  $c['blog_charset'] = get_option('blog_charset');
748
  $c['permalink'] = get_permalink($c['comment_post_ID']);
749
+
750
+ $c['user_role'] = '';
751
+ if ( isset( $c['user_ID'] ) )
752
+ $c['user_role'] = akismet_get_user_roles($c['user_ID']);
753
+
754
  $id = (int) $c['comment_ID'];
755
 
756
  $query_string = '';
759
 
760
  $response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port);
761
  if ( 'true' == $response[1] ) {
762
+ if ( function_exists('wp_set_comment_status') )
763
+ wp_set_comment_status($id, 'spam');
764
+ else
765
+ $wpdb->query("UPDATE $wpdb->comments SET comment_approved = 'spam' WHERE comment_ID = $id");
766
+
767
  }
768
  }
769
  wp_redirect( $_SERVER['HTTP_REFERER'] );
797
  return $response[1];
798
  }
799
 
 
 
 
 
800
  // Widget stuff
801
  function widget_akismet_register() {
802
  if ( function_exists('register_sidebar_widget') ) :
813
  }
814
 
815
  function widget_akismet_style() {
816
+ $plugin_dir = '/wp-content/plugins';
817
+ if ( defined( 'PLUGINDIR' ) )
818
+ $plugin_dir = '/' . PLUGINDIR;
819
+
820
  ?>
821
  <style type="text/css">
822
  #aka,#aka:link,#aka:hover,#aka:visited,#aka:active{color:#fff;text-decoration:none}
826
  #akismet2{display:none;padding-top:2px}
827
  #akismeta{font-size:16px;font-weight:bold;line-height:18px;text-decoration:none}
828
  #akismetcount{display:block;font:15px Verdana,Arial,Sans-Serif;font-weight:bold;text-decoration:none}
829
+ #akismetwrap #akismetstats{background:url(<?php echo get_option('siteurl'), $plugin_dir; ?>/akismet/akismet.gif) no-repeat top left;border:none;color:#fff;font:11px 'Trebuchet MS','Myriad Pro',sans-serif;height:40px;line-height:100%;overflow:hidden;padding:8px 0 0;text-align:center;width:120px}
830
  </style>
831
  <?php
832
  }
833
 
834
  function widget_akismet_control() {
835
  $options = $newoptions = get_option('widget_akismet');
836
+ if ( isset( $_POST['akismet-submit'] ) && $_POST["akismet-submit"] ) {
837
  $newoptions['title'] = strip_tags(stripslashes($_POST["akismet-title"]));
838
  if ( empty($newoptions['title']) ) $newoptions['title'] = __('Spam Blocked');
839
  }
848
  <?php
849
  }
850
 
851
+ if ( function_exists( 'wp_register_sidebar_widget' ) ) {
852
+ wp_register_sidebar_widget( 'akismet', 'Akismet', 'widget_akismet', null, 'akismet');
853
+ wp_register_widget_control( 'akismet', 'Akismet', 'widget_akismet_control', null, 75, 'akismet');
854
+ } else {
855
+ register_sidebar_widget('Akismet', 'widget_akismet', null, 'akismet');
856
+ register_widget_control('Akismet', 'widget_akismet_control', null, 75, 'akismet');
857
+ }
858
  if ( is_active_widget('widget_akismet') )
859
  add_action('wp_head', 'widget_akismet_style');
860
  endif;
864
 
865
  // Counter for non-widget users
866
  function akismet_counter() {
867
+ $plugin_dir = '/wp-content/plugins';
868
+ if ( defined( 'PLUGINDIR' ) )
869
+ $plugin_dir = '/' . PLUGINDIR;
870
+
871
  ?>
872
  <style type="text/css">
873
  #akismetwrap #aka,#aka:link,#aka:hover,#aka:visited,#aka:active{color:#fff;text-decoration:none}
877
  #akismet2{display:none;padding-top:2px}
878
  #akismeta{font-size:16px;font-weight:bold;line-height:18px;text-decoration:none}
879
  #akismetcount{display:block;font:15px Verdana,Arial,Sans-Serif;font-weight:bold;text-decoration:none}
880
+ #akismetwrap #akismetstats{background:url(<?php echo get_option('siteurl'), $plugin_dir; ?>/akismet/akismet.gif) no-repeat top left;border:none;color:#fff;font:11px 'Trebuchet MS','Myriad Pro',sans-serif;height:40px;line-height:100%;overflow:hidden;padding:8px 0 0;text-align:center;width:120px}
881
  </style>
882
  <?php
883
  $count = number_format_i18n(get_option('akismet_spam_count'));
legacy.php ADDED
@@ -0,0 +1,396 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ function akismet_spam_comments( $type = false, $page = 1, $per_page = 50 ) {
4
+ global $wpdb;
5
+
6
+ $page = (int) $page;
7
+ if ( $page < 2 )
8
+ $page = 1;
9
+
10
+ $per_page = (int) $per_page;
11
+ if ( $per_page < 1 )
12
+ $per_page = 50;
13
+
14
+ $start = ( $page - 1 ) * $per_page;
15
+ $end = $start + $per_page;
16
+
17
+ if ( $type ) {
18
+ if ( 'comments' == $type || 'comment' == $type )
19
+ $type = '';
20
+ else
21
+ $type = $wpdb->escape( $type );
22
+ return $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE comment_approved = 'spam' AND comment_type='$type' ORDER BY comment_date DESC LIMIT $start, $end");
23
+ }
24
+
25
+ // All
26
+ return $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE comment_approved = 'spam' ORDER BY comment_date DESC LIMIT $start, $end");
27
+ }
28
+
29
+ // Totals for each comment type
30
+ // returns array( type => count, ... )
31
+ function akismet_spam_totals() {
32
+ global $wpdb;
33
+ $totals = $wpdb->get_results( "SELECT comment_type, COUNT(*) AS cc FROM $wpdb->comments WHERE comment_approved = 'spam' GROUP BY comment_type" );
34
+ $return = array();
35
+ foreach ( $totals as $total )
36
+ $return[$total->comment_type ? $total->comment_type : 'comment'] = $total->cc;
37
+ return $return;
38
+ }
39
+
40
+ function akismet_manage_page() {
41
+ global $wpdb, $submenu, $wp_db_version;
42
+
43
+ // WP 2.7 has its own spam management page
44
+ if ( 8645 <= $wp_db_version )
45
+ return;
46
+
47
+ $count = sprintf(__('Akismet Spam (%s)'), akismet_spam_count());
48
+ if ( isset( $submenu['edit-comments.php'] ) )
49
+ add_submenu_page('edit-comments.php', __('Akismet Spam'), $count, 'moderate_comments', 'akismet-admin', 'akismet_caught' );
50
+ elseif ( function_exists('add_management_page') )
51
+ add_management_page(__('Akismet Spam'), $count, 'moderate_comments', 'akismet-admin', 'akismet_caught');
52
+ }
53
+
54
+ function akismet_caught() {
55
+ global $wpdb, $comment, $akismet_caught, $akismet_nonce;
56
+
57
+ akismet_recheck_queue();
58
+ if (isset($_POST['submit']) && 'recover' == $_POST['action'] && ! empty($_POST['not_spam'])) {
59
+ check_admin_referer( $akismet_nonce );
60
+ if ( function_exists('current_user_can') && !current_user_can('moderate_comments') )
61
+ die(__('You do not have sufficient permission to moderate comments.'));
62
+
63
+ $i = 0;
64
+ foreach ($_POST['not_spam'] as $comment):
65
+ $comment = (int) $comment;
66
+ if ( function_exists('wp_set_comment_status') )
67
+ wp_set_comment_status($comment, 'approve');
68
+ else
69
+ $wpdb->query("UPDATE $wpdb->comments SET comment_approved = '1' WHERE comment_ID = '$comment'");
70
+ akismet_submit_nonspam_comment($comment);
71
+ ++$i;
72
+ endforeach;
73
+ $to = add_query_arg( 'recovered', $i, $_SERVER['HTTP_REFERER'] );
74
+ wp_redirect( $to );
75
+ exit;
76
+ }
77
+ if ('delete' == $_POST['action']) {
78
+ check_admin_referer( $akismet_nonce );
79
+ if ( function_exists('current_user_can') && !current_user_can('moderate_comments') )
80
+ die(__('You do not have sufficient permission to moderate comments.'));
81
+
82
+ $delete_time = $wpdb->escape( $_POST['display_time'] );
83
+ $comment_ids = $wpdb->get_col( "SELECT comment_id FROM $wpdb->comments WHERE comment_approved = 'spam' AND '$delete_time' > comment_date_gmt" );
84
+ if ( !empty( $comment_ids ) ) {
85
+ do_action( 'delete_comment', $comment_ids );
86
+ $wpdb->query( "DELETE FROM $wpdb->comments WHERE comment_id IN ( " . implode( ', ', $comment_ids ) . " )");
87
+ wp_cache_delete( 'akismet_spam_count', 'widget' );
88
+ }
89
+ $to = add_query_arg( 'deleted', 'all', $_SERVER['HTTP_REFERER'] );
90
+ wp_redirect( $to );
91
+ exit;
92
+ }
93
+
94
+ if ( isset( $_GET['recovered'] ) ) {
95
+ $i = (int) $_GET['recovered'];
96
+ echo '<div class="updated"><p>' . sprintf(__('%1$s comments recovered.'), $i) . "</p></div>";
97
+ }
98
+
99
+ if (isset( $_GET['deleted'] ) )
100
+ echo '<div class="updated"><p>' . __('All spam deleted.') . '</p></div>';
101
+
102
+ if ( isset( $GLOBALS['submenu']['edit-comments.php'] ) )
103
+ $link = 'edit-comments.php';
104
+ else
105
+ $link = 'edit.php';
106
+ ?>
107
+ <style type="text/css">
108
+ .akismet-tabs {
109
+ list-style: none;
110
+ margin: 0;
111
+ padding: 0;
112
+ clear: both;
113
+ border-bottom: 1px solid #ccc;
114
+ height: 31px;
115
+ margin-bottom: 20px;
116
+ background: #ddd;
117
+ border-top: 1px solid #bdbdbd;
118
+ }
119
+ .akismet-tabs li {
120
+ float: left;
121
+ margin: 5px 0 0 20px;
122
+ }
123
+ .akismet-tabs a {
124
+ display: block;
125
+ padding: 4px .5em 3px;
126
+ border-bottom: none;
127
+ color: #036;
128
+ }
129
+ .akismet-tabs .active a {
130
+ background: #fff;
131
+ border: 1px solid #ccc;
132
+ border-bottom: none;
133
+ color: #000;
134
+ font-weight: bold;
135
+ padding-bottom: 4px;
136
+ }
137
+ #akismetsearch {
138
+ float: right;
139
+ margin-top: -.5em;
140
+ }
141
+
142
+ #akismetsearch p {
143
+ margin: 0;
144
+ padding: 0;
145
+ }
146
+ </style>
147
+ <div class="wrap">
148
+ <h2><?php _e('Caught Spam') ?></h2>
149
+ <?php
150
+ $count = get_option( 'akismet_spam_count' );
151
+ if ( $count ) {
152
+ ?>
153
+ <p><?php printf(__('Akismet has caught <strong>%1$s spam</strong> for you since you first installed it.'), number_format_i18n($count) ); ?></p>
154
+ <?php
155
+ }
156
+
157
+ $spam_count = akismet_spam_count();
158
+
159
+ if ( 0 == $spam_count ) {
160
+ echo '<p>'.__('You have no spam currently in the queue. Must be your lucky day. :)').'</p>';
161
+ echo '</div>';
162
+ } else {
163
+ echo '<p>'.__('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&#8217;t sweat it.').'</p>';
164
+ ?>
165
+ <?php if ( !isset( $_POST['s'] ) ) { ?>
166
+ <form method="post" action="<?php echo attribute_escape( add_query_arg( 'noheader', 'true' ) ); ?>">
167
+ <?php akismet_nonce_field($akismet_nonce) ?>
168
+ <input type="hidden" name="action" value="delete" />
169
+ <?php printf(__('There are currently %1$s comments identified as spam.'), $spam_count); ?>&nbsp; &nbsp; <input type="submit" class="button delete" name="Submit" value="<?php _e('Delete all'); ?>" />
170
+ <input type="hidden" name="display_time" value="<?php echo current_time('mysql', 1); ?>" />
171
+ </form>
172
+ <?php } ?>
173
+ </div>
174
+ <div class="wrap">
175
+ <?php if ( isset( $_POST['s'] ) ) { ?>
176
+ <h2><?php _e('Search'); ?></h2>
177
+ <?php } else { ?>
178
+ <?php echo '<p>'.__('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.').'</p>'; ?>
179
+ <?php } ?>
180
+ <?php
181
+ if ( isset( $_POST['s'] ) ) {
182
+ $s = $wpdb->escape($_POST['s']);
183
+ $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE
184
+ (comment_author LIKE '%$s%' OR
185
+ comment_author_email LIKE '%$s%' OR
186
+ comment_author_url LIKE ('%$s%') OR
187
+ comment_author_IP LIKE ('%$s%') OR
188
+ comment_content LIKE ('%$s%') ) AND
189
+ comment_approved = 'spam'
190
+ ORDER BY comment_date DESC");
191
+ } else {
192
+ if ( isset( $_GET['apage'] ) )
193
+ $page = (int) $_GET['apage'];
194
+ else
195
+ $page = 1;
196
+
197
+ if ( $page < 2 )
198
+ $page = 1;
199
+
200
+ $current_type = false;
201
+ if ( isset( $_GET['ctype'] ) )
202
+ $current_type = preg_replace( '|[^a-z]|', '', $_GET['ctype'] );
203
+
204
+ $comments = akismet_spam_comments( $current_type, $page );
205
+ $total = akismet_spam_count( $current_type );
206
+ $totals = akismet_spam_totals();
207
+ ?>
208
+ <ul class="akismet-tabs">
209
+ <li <?php if ( !isset( $_GET['ctype'] ) ) echo ' class="active"'; ?>><a href="edit-comments.php?page=akismet-admin"><?php _e('All'); ?></a></li>
210
+ <?php
211
+ foreach ( $totals as $type => $type_count ) {
212
+ if ( 'comment' == $type ) {
213
+ $type = 'comments';
214
+ $show = __('Comments');
215
+ } else {
216
+ $show = ucwords( $type );
217
+ }
218
+ $type_count = number_format_i18n( $type_count );
219
+ $extra = $current_type === $type ? ' class="active"' : '';
220
+ echo "<li $extra><a href='edit-comments.php?page=akismet-admin&amp;ctype=$type'>$show ($type_count)</a></li>";
221
+ }
222
+ do_action( 'akismet_tabs' ); // so plugins can add more tabs easily
223
+ ?>
224
+ </ul>
225
+ <?php
226
+ }
227
+
228
+ if ($comments) {
229
+ ?>
230
+ <form method="post" action="<?php echo attribute_escape("$link?page=akismet-admin"); ?>" id="akismetsearch">
231
+ <p> <input type="text" name="s" value="<?php if (isset($_POST['s'])) echo attribute_escape($_POST['s']); ?>" size="17" />
232
+ <input type="submit" class="button" name="submit" value="<?php echo attribute_escape(__('Search Spam &raquo;')) ?>" /> </p>
233
+ </form>
234
+ <?php if ( $total > 50 ) {
235
+ $total_pages = ceil( $total / 50 );
236
+ $r = '';
237
+ if ( 1 < $page ) {
238
+ $args['apage'] = ( 1 == $page - 1 ) ? '' : $page - 1;
239
+ $r .= '<a class="prev" href="' . clean_url(add_query_arg( $args )) . '">'. __('&laquo; Previous Page') .'</a>' . "\n";
240
+ }
241
+ if ( ( $total_pages = ceil( $total / 50 ) ) > 1 ) {
242
+ for ( $page_num = 1; $page_num <= $total_pages; $page_num++ ) :
243
+ if ( $page == $page_num ) :
244
+ $r .= "<strong>$page_num</strong>\n";
245
+ else :
246
+ $p = false;
247
+ if ( $page_num < 3 || ( $page_num >= $page - 3 && $page_num <= $page + 3 ) || $page_num > $total_pages - 3 ) :
248
+ $args['apage'] = ( 1 == $page_num ) ? '' : $page_num;
249
+ $r .= '<a class="page-numbers" href="' . clean_url(add_query_arg($args)) . '">' . ( $page_num ) . "</a>\n";
250
+ $in = true;
251
+ elseif ( $in == true ) :
252
+ $r .= "...\n";
253
+ $in = false;
254
+ endif;
255
+ endif;
256
+ endfor;
257
+ }
258
+ if ( ( $page ) * 50 < $total || -1 == $total ) {
259
+ $args['apage'] = $page + 1;
260
+ $r .= '<a class="next" href="' . clean_url(add_query_arg($args)) . '">'. __('Next Page &raquo;') .'</a>' . "\n";
261
+ }
262
+ echo "<p>$r</p>";
263
+ ?>
264
+
265
+ <?php } ?>
266
+ <form style="clear: both;" method="post" action="<?php echo attribute_escape( add_query_arg( 'noheader', 'true' ) ); ?>">
267
+ <?php akismet_nonce_field($akismet_nonce) ?>
268
+ <input type="hidden" name="action" value="recover" />
269
+ <ul id="spam-list" class="commentlist" style="list-style: none; margin: 0; padding: 0;">
270
+ <?php
271
+ $i = 0;
272
+ foreach($comments as $comment) {
273
+ $i++;
274
+ $comment_date = mysql2date(get_option("date_format") . " @ " . get_option("time_format"), $comment->comment_date);
275
+ $post = get_post($comment->comment_post_ID);
276
+ $post_title = $post->post_title;
277
+ if ($i % 2) $class = 'class="alternate"';
278
+ else $class = '';
279
+ echo "\n\t<li id='comment-$comment->comment_ID' $class>";
280
+ ?>
281
+
282
+ <p><strong><?php comment_author() ?></strong> <?php if ($comment->comment_author_email) { ?>| <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_url && 'http://' != $comment->comment_author_url) { ?> | <?php comment_author_url_link() ?> <?php } ?>| <?php _e('IP:') ?> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></p>
283
+
284
+ <?php comment_text() ?>
285
+
286
+ <p><label for="spam-<?php echo $comment->comment_ID; ?>">
287
+ <input type="checkbox" id="spam-<?php echo $comment->comment_ID; ?>" name="not_spam[]" value="<?php echo $comment->comment_ID; ?>" />
288
+ <?php _e('Not Spam') ?></label> &#8212; <?php comment_date('M j, g:i A'); ?> &#8212; [
289
+ <?php
290
+ $post = get_post($comment->comment_post_ID);
291
+ $post_title = wp_specialchars( $post->post_title, 'double' );
292
+ $post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title;
293
+ ?>
294
+ <a href="<?php echo get_permalink($comment->comment_post_ID); ?>" title="<?php echo $post_title; ?>"><?php _e('View Post') ?></a> ] </p>
295
+
296
+
297
+ <?php
298
+ }
299
+ ?>
300
+ </ul>
301
+ <?php if ( $total > 50 ) {
302
+ $total_pages = ceil( $total / 50 );
303
+ $r = '';
304
+ if ( 1 < $page ) {
305
+ $args['apage'] = ( 1 == $page - 1 ) ? '' : $page - 1;
306
+ $r .= '<a class="prev" href="' . clean_url(add_query_arg( $args )) . '">'. __('&laquo; Previous Page') .'</a>' . "\n";
307
+ }
308
+ if ( ( $total_pages = ceil( $total / 50 ) ) > 1 ) {
309
+ for ( $page_num = 1; $page_num <= $total_pages; $page_num++ ) :
310
+ if ( $page == $page_num ) :
311
+ $r .= "<strong>$page_num</strong>\n";
312
+ else :
313
+ $p = false;
314
+ if ( $page_num < 3 || ( $page_num >= $page - 3 && $page_num <= $page + 3 ) || $page_num > $total_pages - 3 ) :
315
+ $args['apage'] = ( 1 == $page_num ) ? '' : $page_num;
316
+ $r .= '<a class="page-numbers" href="' . clean_url(add_query_arg($args)) . '">' . ( $page_num ) . "</a>\n";
317
+ $in = true;
318
+ elseif ( $in == true ) :
319
+ $r .= "...\n";
320
+ $in = false;
321
+ endif;
322
+ endif;
323
+ endfor;
324
+ }
325
+ if ( ( $page ) * 50 < $total || -1 == $total ) {
326
+ $args['apage'] = $page + 1;
327
+ $r .= '<a class="next" href="' . clean_url(add_query_arg($args)) . '">'. __('Next Page &raquo;') .'</a>' . "\n";
328
+ }
329
+ echo "<p>$r</p>";
330
+ }
331
+ ?>
332
+ <p class="submit">
333
+ <input type="submit" name="submit" value="<?php echo attribute_escape(__('De-spam marked comments &raquo;')); ?>" />
334
+ </p>
335
+ <p><?php _e('Comments you de-spam will be submitted to Akismet as mistakes so it can learn and get better.'); ?></p>
336
+ </form>
337
+ <?php
338
+ } else {
339
+ ?>
340
+ <p><?php _e('No results found.'); ?></p>
341
+ <?php } ?>
342
+
343
+ <?php if ( !isset( $_POST['s'] ) ) { ?>
344
+ <form method="post" action="<?php echo attribute_escape( add_query_arg( 'noheader', 'true' ) ); ?>">
345
+ <?php akismet_nonce_field($akismet_nonce) ?>
346
+ <p><input type="hidden" name="action" value="delete" />
347
+ <?php printf(__('There are currently %1$s comments identified as spam.'), $spam_count); ?>&nbsp; &nbsp; <input type="submit" name="Submit" class="button" value="<?php echo attribute_escape(__('Delete all')); ?>" />
348
+ <input type="hidden" name="display_time" value="<?php echo current_time('mysql', 1); ?>" /></p>
349
+ </form>
350
+ <?php } ?>
351
+ </div>
352
+ <?php
353
+ }
354
+ }
355
+
356
+ add_action('admin_menu', 'akismet_manage_page');
357
+
358
+ function redirect_old_akismet_urls( ) {
359
+ global $wp_db_version;
360
+ $script_name = array_pop( split( '/', $_SERVER['PHP_SELF'] ) );
361
+
362
+ $page = '';
363
+ if ( !empty( $_GET['page'] ) )
364
+ $page = $_GET['page'];
365
+
366
+ // 2.7 redirect for people who might have bookmarked the old page
367
+ if ( 8204 < $wp_db_version && ( 'edit-comments.php' == $script_name || 'edit.php' == $script_name ) && 'akismet-admin' == $page ) {
368
+ $new_url = esc_url( 'edit-comments.php?comment_status=spam' );
369
+ wp_redirect( $new_url, 301 );
370
+ exit;
371
+ }
372
+ }
373
+ add_action( 'admin_init', 'redirect_old_akismet_urls' );
374
+
375
+ // For WP <= 2.3.x
376
+ global $pagenow;
377
+
378
+ if ( 'moderation.php' == $pagenow ) {
379
+ function akismet_recheck_button( $page ) {
380
+ global $submenu;
381
+ if ( isset( $submenu['edit-comments.php'] ) )
382
+ $link = 'edit-comments.php';
383
+ else
384
+ $link = 'edit.php';
385
+ $button = "<a href='$link?page=akismet-admin&amp;recheckqueue=true&amp;noheader=true' style='display: block; width: 100px; position: absolute; right: 7%; padding: 5px; font-size: 14px; text-decoration: underline; background: #fff; border: 1px solid #ccc;'>" . __('Recheck Queue for Spam') . "</a>";
386
+ $page = str_replace( '<div class="wrap">', '<div class="wrap">' . $button, $page );
387
+ return $page;
388
+ }
389
+
390
+ if ( $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '0'" ) )
391
+ ob_start( 'akismet_recheck_button' );
392
+ }
393
+
394
+ // This option causes tons of FPs, was removed in 2.1
395
+ function akismet_kill_proxy_check( $option ) { return 0; }
396
+ add_filter('option_open_proxy_check', 'akismet_kill_proxy_check');
readme.txt CHANGED
@@ -3,7 +3,8 @@ Contributors: matt, ryan, andy, mdawaffe, tellyworth, automattic
3
  Tags: akismet, comments, spam
4
  Requires at least: 2.0
5
  Tested up to: 3.0
6
- Stable tag: 2.3.0
 
7
 
8
  Akismet checks your comments against the Akismet web service to see if they look like spam or not.
9
 
@@ -26,6 +27,17 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
26
 
27
  == Changelog ==
28
 
 
 
 
 
 
 
 
 
 
 
 
29
  * Fix "Are you sure" nonce message on config screen in WPMU
30
  * Fix XHTML compliance issue in sidebar widget
31
  * Change author link; remove some old references to WordPress.com accounts
3
  Tags: akismet, comments, spam
4
  Requires at least: 2.0
5
  Tested up to: 3.0
6
+ Stable tag: 2.4.0
7
+ License: GPLv2
8
 
9
  Akismet checks your comments against the Akismet web service to see if they look like spam or not.
10
 
27
 
28
  == Changelog ==
29
 
30
+ = 2.4.0 =
31
+
32
+ * Spell out that the license is GPLv2
33
+ * Fix PHP warnings
34
+ * Fix WordPress deprecated function calls
35
+ * Fire the delete_comment action when deleting comments
36
+ * Move code specific for older WP versions to legacy.php
37
+ * General code clean up
38
+
39
+ = 2.3.0 =
40
+
41
  * Fix "Are you sure" nonce message on config screen in WPMU
42
  * Fix XHTML compliance issue in sidebar widget
43
  * Change author link; remove some old references to WordPress.com accounts