Akismet Anti-Spam - Version 2.5.0

Version Description

  • Track comment actions under 'Akismet Status' on the edit comment screen
  • Fix a few remaining deprecated function calls ( props Mike Glendinning )
  • Use HTTPS for the stats IFRAME when wp-admin is using HTTPS
  • Use the WordPress HTTP class if available
  • Move the admin UI code to a separate file, only loaded when needed
  • Add cron retry feature, to replace the old connectivity check
  • Display Akismet status badge beside each comment
  • Record history for each comment, and display it on the edit page
  • Record the complete comment as originally submitted in comment_meta, to use when reporting spam and ham
  • Highlight links in comment content
  • New option, "Show the number of comments you've approved beside each comment author."
  • New option, "Use a nonce on the comment form."
Download this release

Release Info

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

Code changes from version 2.4.0 to 2.5.0

Files changed (6) hide show
  1. admin.php +744 -0
  2. akismet.css +12 -0
  3. akismet.js +10 -0
  4. akismet.php +291 -703
  5. readme.txt +25 -6
  6. widget.php +92 -0
admin.php ADDED
@@ -0,0 +1,744 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ add_action( 'admin_menu', 'akismet_config_page' );
3
+ add_action( 'admin_menu', 'akismet_stats_page' );
4
+ akismet_admin_warnings();
5
+
6
+ function akismet_admin_init() {
7
+ global $wp_version;
8
+
9
+ // all admin functions are disabled in old versions
10
+ if ( !function_exists('is_multisite') && version_compare( $wp_version, '3.0', '<' ) ) {
11
+
12
+ function akismet_version_warning() {
13
+ echo "
14
+ <div id='akismet-warning' class='updated fade'><p><strong>".sprintf(__('Akismet %s requires WordPress 3.0 or higher.'), AKISMET_VERSION) ."</strong> ".sprintf(__('Please <a href="%s">upgrade WordPress</a> to a current version, or <a href="%s">downgrade to version 2.4 of the Akismet plugin</a>.'), 'http://codex.wordpress.org/Upgrading_WordPress', 'http://wordpress.org/extend/plugins/akismet/download/'). "</p></div>
15
+ ";
16
+ }
17
+ add_action('admin_notices', 'akismet_version_warning');
18
+
19
+ return;
20
+ }
21
+
22
+ if ( function_exists( 'get_plugin_page_hook' ) )
23
+ $hook = get_plugin_page_hook( 'akismet-stats-display', 'index.php' );
24
+ else
25
+ $hook = 'dashboard_page_akismet-stats-display';
26
+ add_action('admin_head-'.$hook, 'akismet_stats_script');
27
+ add_meta_box('akismet-status', __('Comment History'), 'akismet_comment_status_meta_box', 'comment', 'normal');
28
+ wp_register_style('akismet.css', AKISMET_PLUGIN_URL . '/akismet.css');
29
+ wp_enqueue_style('akismet.css');
30
+ wp_register_script('akismet.js', AKISMET_PLUGIN_URL . '/akismet.js', array('jquery'));
31
+ wp_enqueue_script('akismet.js');
32
+ }
33
+ add_action('admin_init', 'akismet_admin_init');
34
+
35
+ function akismet_nonce_field($action = -1) { return wp_nonce_field($action); }
36
+ $akismet_nonce = 'akismet-update-key';
37
+
38
+ function akismet_config_page() {
39
+ if ( function_exists('add_submenu_page') )
40
+ add_submenu_page('plugins.php', __('Akismet Configuration'), __('Akismet Configuration'), 'manage_options', 'akismet-key-config', 'akismet_conf');
41
+ }
42
+
43
+ function akismet_plugin_action_links( $links, $file ) {
44
+ if ( $file == plugin_basename( dirname(__FILE__).'/akismet.php' ) ) {
45
+ $links[] = '<a href="plugins.php?page=akismet-key-config">'.__('Settings').'</a>';
46
+ }
47
+
48
+ return $links;
49
+ }
50
+
51
+ add_filter( 'plugin_action_links', 'akismet_plugin_action_links', 10, 2 );
52
+
53
+ function akismet_conf() {
54
+ global $akismet_nonce, $wpcom_api_key;
55
+
56
+ if ( isset($_POST['submit']) ) {
57
+ if ( function_exists('current_user_can') && !current_user_can('manage_options') )
58
+ die(__('Cheatin&#8217; uh?'));
59
+
60
+ check_admin_referer( $akismet_nonce );
61
+ $key = preg_replace( '/[^a-h0-9]/i', '', $_POST['key'] );
62
+ $home_url = parse_url( get_bloginfo('url') );
63
+
64
+ if ( empty($key) ) {
65
+ $key_status = 'empty';
66
+ $ms[] = 'new_key_empty';
67
+ delete_option('wordpress_api_key');
68
+ } elseif ( empty($home_url['host']) ) {
69
+ $key_status = 'empty';
70
+ $ms[] = 'bad_home_url';
71
+ } else {
72
+ $key_status = akismet_verify_key( $key );
73
+ }
74
+
75
+ if ( $key_status == 'valid' ) {
76
+ update_option('wordpress_api_key', $key);
77
+ $ms[] = 'new_key_valid';
78
+ } else if ( $key_status == 'invalid' ) {
79
+ $ms[] = 'new_key_invalid';
80
+ } else if ( $key_status == 'failed' ) {
81
+ $ms[] = 'new_key_failed';
82
+ }
83
+
84
+ if ( isset( $_POST['akismet_discard_month'] ) )
85
+ update_option( 'akismet_discard_month', 'true' );
86
+ else
87
+ update_option( 'akismet_discard_month', 'false' );
88
+
89
+ if ( isset( $_POST['akismet_show_user_comments_approved'] ) )
90
+ update_option( 'akismet_show_user_comments_approved', 'true' );
91
+ else
92
+ update_option( 'akismet_show_user_comments_approved', 'false' );
93
+
94
+ if ( isset( $_POST['akismet_comment_nonce'] ) )
95
+ update_option( 'akismet_comment_nonce', 'true' );
96
+ else
97
+ update_option( 'akismet_comment_nonce', 'false' );
98
+
99
+ } elseif ( isset($_POST['check']) ) {
100
+ akismet_get_server_connectivity(0);
101
+ }
102
+
103
+ if ( empty( $key_status) || $key_status != 'valid' ) {
104
+ $key = get_option('wordpress_api_key');
105
+ if ( empty( $key ) ) {
106
+ if ( empty( $key_status ) || $key_status != 'failed' ) {
107
+ if ( akismet_verify_key( '1234567890ab' ) == 'failed' )
108
+ $ms[] = 'no_connection';
109
+ else
110
+ $ms[] = 'key_empty';
111
+ }
112
+ $key_status = 'empty';
113
+ } else {
114
+ $key_status = akismet_verify_key( $key );
115
+ }
116
+ if ( $key_status == 'valid' ) {
117
+ $ms[] = 'key_valid';
118
+ } else if ( $key_status == 'invalid' ) {
119
+ delete_option('wordpress_api_key');
120
+ $ms[] = 'key_empty';
121
+ } else if ( !empty($key) && $key_status == 'failed' ) {
122
+ $ms[] = 'key_failed';
123
+ }
124
+ }
125
+
126
+ $messages = array(
127
+ 'new_key_empty' => array('color' => 'aa0', 'text' => __('Your key has been cleared.')),
128
+ 'new_key_valid' => array('color' => '4AB915', 'text' => __('Your key has been verified. Happy blogging!')),
129
+ 'new_key_invalid' => array('color' => '888', 'text' => __('The key you entered is invalid. Please double-check it.')),
130
+ 'new_key_failed' => array('color' => '888', 'text' => __('The key you entered could not be verified because a connection to akismet.com could not be established. Please check your server configuration.')),
131
+ 'no_connection' => array('color' => '888', 'text' => __('There was a problem connecting to the Akismet server. Please check your server configuration.')),
132
+ 'key_empty' => array('color' => 'aa0', 'text' => sprintf(__('Please enter an API key. (<a href="%s" style="color:#fff">Get your key.</a>)'), 'http://akismet.com/get/')),
133
+ 'key_valid' => array('color' => '4AB915', 'text' => __('This key is valid.')),
134
+ 'key_failed' => array('color' => 'aa0', 'text' => __('The key below was previously validated but a connection to akismet.com can not be established at this time. Please check your server configuration.')),
135
+ 'bad_home_url' => array('color' => '888', 'text' => sprintf( __('Your WordPress home URL %s is invalid. Please fix the <a href="%s">home option</a>.'), esc_html( get_bloginfo('url') ), admin_url('options.php#home') ) ),
136
+ );
137
+ ?>
138
+ <?php if ( !empty($_POST['submit'] ) ) : ?>
139
+ <div id="message" class="updated fade"><p><strong><?php _e('Options saved.') ?></strong></p></div>
140
+ <?php endif; ?>
141
+ <div class="wrap">
142
+ <h2><?php _e('Akismet Configuration'); ?></h2>
143
+ <?php if (isset($_GET['message']) && $_GET['message'] == 'success') { ?>
144
+ <div class="updated below-h2" id="message"><p><strong>Sign up success!</strong> Please check your email for your Akismet API Key and enter it below.</p></div>
145
+ <?php } ?>
146
+ <div class="narrow">
147
+ <form action="" method="post" id="akismet-conf" style="margin: auto; width: 400px; ">
148
+ <?php if ( !$wpcom_api_key ) { ?>
149
+ <p><?php printf(__('For many people, <a href="%1$s">Akismet</a> will greatly reduce or even completely eliminate the comment and trackback spam you get on your site. If one does happen to get through, simply mark it as "spam" on the moderation screen and Akismet will learn from the mistakes. If you don\'t have an API key yet, you can get one at <a href="%2$s">Akismet.com</a>.'), 'http://akismet.com/', 'http://akismet.com/get/'); ?></p>
150
+
151
+ <h3><label for="key"><?php _e('Akismet API Key'); ?></label></h3>
152
+ <?php foreach ( $ms as $m ) : ?>
153
+ <p style="padding: .5em; background-color: #<?php echo $messages[$m]['color']; ?>; color: #fff; font-weight: bold;"><?php echo $messages[$m]['text']; ?></p>
154
+ <?php endforeach; ?>
155
+ <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>
156
+ <?php if ( isset( $invalid_key) && $invalid_key ) { ?>
157
+ <h3><?php _e('Why might my key be invalid?'); ?></h3>
158
+ <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>
159
+ <?php } ?>
160
+ <?php } ?>
161
+ <?php akismet_nonce_field($akismet_nonce) ?>
162
+ <p><label><input name="akismet_discard_month" id="akismet_discard_month" value="true" type="checkbox" <?php if ( get_option('akismet_discard_month') == 'true' ) echo ' checked="checked" '; ?> /> <?php _e('Auto-delete spam submitted on posts more than a month old.'); ?></label></p>
163
+ <p><label><input name="akismet_show_user_comments_approved" id="akismet_show_user_comments_approved" value="true" type="checkbox" <?php if ( get_option('akismet_show_user_comments_approved') == 'true' ) echo ' checked="checked" '; ?> /> <?php _e('Show the number of comments you\'ve approved beside each comment author.'); ?></label></p>
164
+ <p><label><input name="akismet_comment_nonce" id="akismet_comment_nonce" value="true" type="checkbox" <?php if ( get_option( 'akismet_comment_nonce' ) == 'true' || get_option( 'akismet_comment_nonce' ) == '' ) echo ' checked="checked" '; ?> /> <?php _e( 'Use a nonce on the comment form.' ); ?></label></p>
165
+ <p class="submit"><input type="submit" name="submit" value="<?php _e('Update options &raquo;'); ?>" /></p>
166
+ </form>
167
+
168
+ <form action="" method="post" id="akismet-connectivity" style="margin: auto; width: 400px; ">
169
+
170
+ <h3><?php _e('Server Connectivity'); ?></h3>
171
+ <?php
172
+ if ( !function_exists('fsockopen') || !function_exists('gethostbynamel') ) {
173
+ ?>
174
+ <p style="padding: .5em; background-color: #888; color: #fff; font-weight:bold;"><?php _e('Network functions are disabled.'); ?></p>
175
+ <p><?php echo sprintf( __('Your web host or server administrator has disabled PHP\'s <code>fsockopen</code> or <code>gethostbynamel</code> functions. <strong>Akismet cannot work correctly until this is fixed.</strong> Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet\'s system requirements</a>.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
176
+ <?php
177
+ } else {
178
+ $servers = akismet_get_server_connectivity();
179
+ $fail_count = count($servers) - count( array_filter($servers) );
180
+ if ( is_array($servers) && count($servers) > 0 ) {
181
+ // some connections work, some fail
182
+ if ( $fail_count > 0 && $fail_count < count($servers) ) { ?>
183
+ <p style="padding: .5em; background-color: #aa0; color: #fff; font-weight:bold;"><?php _e('Unable to reach some Akismet servers.'); ?></p>
184
+ <p><?php echo sprintf( __('A network problem or firewall is blocking some connections from your web server to Akismet.com. Akismet is working but this may cause problems during times of network congestion. Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet and firewalls</a>.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
185
+ <?php
186
+ // all connections fail
187
+ } elseif ( $fail_count > 0 ) { ?>
188
+ <p style="padding: .5em; background-color: #888; color: #fff; font-weight:bold;"><?php _e('Unable to reach any Akismet servers.'); ?></p>
189
+ <p><?php echo sprintf( __('A network problem or firewall is blocking all connections from your web server to Akismet.com. <strong>Akismet cannot work correctly until this is fixed.</strong> Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet and firewalls</a>.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
190
+ <?php
191
+ // all connections work
192
+ } else { ?>
193
+ <p style="padding: .5em; background-color: #4AB915; color: #fff; font-weight:bold;"><?php _e('All Akismet servers are available.'); ?></p>
194
+ <p><?php _e('Akismet is working correctly. All servers are accessible.'); ?></p>
195
+ <?php
196
+ }
197
+ } else {
198
+ ?>
199
+ <p style="padding: .5em; background-color: #888; color: #fff; font-weight:bold;"><?php _e('Unable to find Akismet servers.'); ?></p>
200
+ <p><?php echo sprintf( __('A DNS problem or firewall is preventing all access from your web server to Akismet.com. <strong>Akismet cannot work correctly until this is fixed.</strong> Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet and firewalls</a>.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
201
+ <?php
202
+ }
203
+ }
204
+
205
+ if ( !empty($servers) ) {
206
+ ?>
207
+ <table style="width: 100%;">
208
+ <thead><th><?php _e('Akismet server'); ?></th><th><?php _e('Network Status'); ?></th></thead>
209
+ <tbody>
210
+ <?php
211
+ asort($servers);
212
+ foreach ( $servers as $ip => $status ) {
213
+ $color = ( $status ? '#4AB915' : '#888');
214
+ ?>
215
+ <tr>
216
+ <td><?php echo htmlspecialchars($ip); ?></td>
217
+ <td style="padding: 0 .5em; font-weight:bold; color: #fff; background-color: <?php echo $color; ?>"><?php echo ($status ? __('Accessible') : __('Re-trying') ); ?></td>
218
+
219
+ <?php
220
+ }
221
+ }
222
+ ?>
223
+ </tbody>
224
+ </table>
225
+ <p><?php if ( get_option('akismet_connectivity_time') ) echo sprintf( __('Last checked %s ago.'), human_time_diff( get_option('akismet_connectivity_time') ) ); ?></p>
226
+ <p class="submit"><input type="submit" name="check" value="<?php _e('Check network status &raquo;'); ?>" /></p>
227
+ <p><?php printf( __('<a href="%s" target="_blank">Click here</a> to confirm that <a href="%s" target="_blank">Akismet.com is up</a>.'), 'http://status.automattic.com/9931/136079/Akismet-API', 'http://status.automattic.com/9931/136079/Akismet-API' ); ?></p>
228
+ </form>
229
+
230
+ </div>
231
+ </div>
232
+ <?php
233
+ }
234
+
235
+ function akismet_stats_page() {
236
+ if ( function_exists('add_submenu_page') )
237
+ add_submenu_page('index.php', __('Akismet Stats'), __('Akismet Stats'), 'manage_options', 'akismet-stats-display', 'akismet_stats_display');
238
+
239
+ }
240
+
241
+ function akismet_stats_script() {
242
+ ?>
243
+ <script type="text/javascript">
244
+ function resizeIframe() {
245
+ var height = document.documentElement.clientHeight;
246
+ height -= document.getElementById('akismet-stats-frame').offsetTop;
247
+ height += 100; // magic padding
248
+
249
+ document.getElementById('akismet-stats-frame').style.height = height +"px";
250
+
251
+ };
252
+ function resizeIframeInit() {
253
+ document.getElementById('akismet-stats-frame').onload = resizeIframe;
254
+ window.onresize = resizeIframe;
255
+ }
256
+ addLoadEvent(resizeIframeInit);
257
+ </script><?php
258
+ }
259
+
260
+
261
+ function akismet_stats_display() {
262
+ global $akismet_api_host, $akismet_api_port, $wpcom_api_key;
263
+ $blog = urlencode( get_bloginfo('url') );
264
+
265
+ $url = 'http://';
266
+ if ( is_ssl() )
267
+ $url = 'https://';
268
+
269
+ $url .= 'akismet.com/web/1.0/user-stats.php';
270
+ $url .= "?blog={$blog}&api_key=" . akismet_get_key();
271
+ ?>
272
+ <div class="wrap">
273
+ <iframe src="<?php echo $url; ?>" width="100%" height="100%" frameborder="0" id="akismet-stats-frame"></iframe>
274
+ </div>
275
+ <?php
276
+ }
277
+
278
+ function akismet_stats() {
279
+ if ( !function_exists('did_action') || did_action( 'rightnow_end' ) ) // We already displayed this info in the "Right Now" section
280
+ return;
281
+ if ( !$count = get_option('akismet_spam_count') )
282
+ return;
283
+ $path = plugin_basename(__FILE__);
284
+ echo '<h3>'.__('Spam').'</h3>';
285
+ global $submenu;
286
+ if ( isset( $submenu['edit-comments.php'] ) )
287
+ $link = 'edit-comments.php';
288
+ else
289
+ $link = 'edit.php';
290
+ 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>';
291
+ }
292
+ add_action('activity_box_end', 'akismet_stats');
293
+
294
+ function akismet_admin_warnings() {
295
+ global $wpcom_api_key;
296
+ if ( !get_option('wordpress_api_key') && !$wpcom_api_key && !isset($_POST['submit']) ) {
297
+ function akismet_warning() {
298
+ echo "
299
+ <div id='akismet-warning' class='updated fade'><p><strong>".__('Akismet is almost ready.')."</strong> ".sprintf(__('You must <a href="%1$s">enter your Akismet API key</a> for it to work.'), "plugins.php?page=akismet-key-config")."</p></div>
300
+ ";
301
+ }
302
+ add_action('admin_notices', 'akismet_warning');
303
+ return;
304
+ } elseif ( ( empty($_SERVER['SCRIPT_FILENAME']) || basename($_SERVER['SCRIPT_FILENAME']) == 'edit-comments.php' ) && wp_next_scheduled('akismet_schedule_cron_recheck') ) {
305
+ function akismet_warning() {
306
+ global $wpdb;
307
+ $waiting = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->commentmeta WHERE meta_key = 'akismet_error'" ) );
308
+ $next_check = human_time_diff( wp_next_scheduled('akismet_schedule_cron_recheck') );
309
+ if ( $waiting > 0 )
310
+ echo "
311
+ <div id='akismet-warning' class='updated fade'><p><strong>".__('Akismet has detected a problem.')."</strong> ".sprintf(_n('A server or network problem prevented Akismet from checking %d comment. It has been temporarily held for moderation and will be automatically re-checked in %s.', 'A server or network problem prevented Akismet from checking %d comments. They have been temporarily held for moderation and will be automatically re-checked in %s.', $waiting), $waiting, $next_check)."</p></div>
312
+ ";
313
+ }
314
+ add_action('admin_notices', 'akismet_warning');
315
+ return;
316
+ }
317
+ }
318
+
319
+ // FIXME placeholder
320
+
321
+ function akismet_comment_row_action( $a, $comment ) {
322
+
323
+ // failsafe for old WP versions
324
+ if ( !function_exists('add_comment_meta') )
325
+ return $a;
326
+
327
+ $akismet_result = get_comment_meta( $comment->comment_ID, 'akismet_result', true );
328
+ $user_result = get_comment_meta( $comment->comment_ID, 'akismet_user_result', true);
329
+ $desc = null;
330
+ if ( !$user_result || $user_result == $akismet_result ) {
331
+ // Show the original Akismet result if the user hasn't overridden it, or if their decision was the same
332
+ if ( $akismet_result == 'true' )
333
+ $desc = 'Flagged as spam by Akismet';
334
+ elseif ( $akismet_result == 'false' )
335
+ $desc = 'Cleared by Akismet';
336
+ } else {
337
+ $who = get_comment_meta( $comment->comment_ID, 'akismet_user', true );
338
+ if ( $user_result == 'true' )
339
+ $desc = sprintf( __('Flagged as spam by %s'), $who );
340
+ else
341
+ $desc = sprintf( __('Un-spammed by %s'), $who );
342
+ }
343
+
344
+ if ( $desc )
345
+ echo '<span class="akismet-status" commentid="'.$comment->comment_ID.'"><a href="comment.php?action=editcomment&amp;c='.$comment->comment_ID.'#akismet-status" title="' . esc_attr__( 'View comment history' ) . '">'.htmlspecialchars($desc).'</a></span>';
346
+
347
+ if ( apply_filters( 'akismet_show_user_comments_approved', get_option('akismet_show_user_comments_approved') ) == 'true' ) {
348
+ $comment_count = akimset_get_user_comments_approved( $comment->user_id, $comment->comment_author_email, $comment->comment_author, $comment->comment_author_url );
349
+ echo '<span class="akismet-user-comment-count" commentid="'.$comment->comment_ID.'" style="display:none;"><br><span class="akismet-user-comment-counts">'.sprintf( __( '%s approved' ), intval($comment_count) ).'</span></span>';
350
+ }
351
+
352
+ return $a;
353
+ }
354
+
355
+ add_filter( 'comment_row_actions', 'akismet_comment_row_action', 10, 2 );
356
+
357
+ function akismet_comment_status_meta_box($comment) {
358
+ $history = akismet_get_comment_history( $comment->comment_ID );
359
+
360
+ if ( $history ) {
361
+ echo '<div class="akismet-history" style="margin: 13px;">';
362
+ foreach ( $history as $row ) {
363
+ $time = date( 'D d M Y @ h:i:m a', $row['time'] ) . ' GMT';
364
+ echo '<div style="margin-bottom: 13px;"><span style="color: #999;" alt="' . $time . '" title="' . $time . '">' . sprintf( __('%s ago'), human_time_diff( $row['time'] ) ) . '</span> - ';
365
+ echo htmlspecialchars( $row['message'] ) . '</div>';
366
+ }
367
+
368
+ echo '</div>';
369
+
370
+ }
371
+ }
372
+
373
+
374
+ // add an extra column header to the comments screen
375
+ function akismet_comments_columns( $columns ) {
376
+ $columns[ 'akismet' ] = __( 'Akismet' );
377
+ return $columns;
378
+ }
379
+
380
+ #add_filter( 'manage_edit-comments_columns', 'akismet_comments_columns' );
381
+
382
+ // Show stuff in the extra column
383
+ function akismet_comment_column_row( $column, $comment_id ) {
384
+ if ( $column != 'akismet' )
385
+ return;
386
+
387
+ $history = akismet_get_comment_history( $comment_id );
388
+
389
+ if ( $history ) {
390
+ echo '<dl class="akismet-history">';
391
+ foreach ( $history as $row ) {
392
+ echo '<dt>' . sprintf( __('%s ago'), human_time_diff( $row['time'] ) ) . '</dt>';
393
+ echo '<dd>' . htmlspecialchars( $row['message'] ) . '</dd>';
394
+ }
395
+
396
+ echo '</dl>';
397
+ }
398
+ }
399
+
400
+ #add_action( 'manage_comments_custom_column', 'akismet_comment_column_row', 10, 2 );
401
+
402
+ // END FIXME
403
+
404
+ // call out URLS in comments
405
+ function akismet_text_add_link_callback( $m ) {
406
+
407
+ // bare link?
408
+ if ( $m[4] == $m[2] )
409
+ return '<a '.$m[1].' href="'.$m[2].'" '.$m[3].' class="comment-link">'.$m[4].'</a>';
410
+ else
411
+ return '<span title="'.$m[2].'" class="comment-link"><a '.$m[1].' href="'.$m[2].'" '.$m[3].' class="comment-link">'.$m[4].'</a></span>';
412
+ }
413
+
414
+ function akismet_text_add_link_class( $comment_text ) {
415
+
416
+ return preg_replace_callback( '#<a ([^>]*)href="([^"]+)"([^>]*)>(.*?)</a>#i', 'akismet_text_add_link_callback', $comment_text );
417
+ }
418
+
419
+ add_filter('comment_text', 'akismet_text_add_link_class');
420
+
421
+
422
+ // WP 2.5+
423
+ function akismet_rightnow() {
424
+ global $submenu, $wp_db_version;
425
+
426
+ $plural_func = '__ngettext';
427
+ if ( function_exists( '_n' ) )
428
+ $plural_func = '_n';
429
+
430
+ // clean_url was deprecated in WP 3.0
431
+ $esc_url = 'clean_url';
432
+ if ( function_exists( 'esc_url' ) )
433
+ $esc_url = 'esc_url';
434
+
435
+ if ( 8645 < $wp_db_version ) // 2.7
436
+ $link = 'edit-comments.php?comment_status=spam';
437
+ elseif ( isset( $submenu['edit-comments.php'] ) )
438
+ $link = 'edit-comments.php?page=akismet-admin';
439
+ else
440
+ $link = 'edit.php?page=akismet-admin';
441
+
442
+ if ( $count = get_option('akismet_spam_count') ) {
443
+ $intro = sprintf( $plural_func(
444
+ '<a href="%1$s">Akismet</a> has protected your site from %2$s spam comment already,',
445
+ '<a href="%1$s">Akismet</a> has protected your site from %2$s spam comments already,',
446
+ $count
447
+ ), 'http://akismet.com/', number_format_i18n( $count ) );
448
+ } else {
449
+ $intro = sprintf( __('<a href="%1$s">Akismet</a> blocks spam from getting to your blog,'), 'http://akismet.com/' );
450
+ }
451
+
452
+ if ( $queue_count = akismet_spam_count() ) {
453
+ $queue_text = sprintf( $plural_func(
454
+ 'and there\'s <a href="%2$s">%1$s comment</a> in your spam queue right now.',
455
+ 'and there are <a href="%2$s">%1$s comments</a> in your spam queue right now.',
456
+ $queue_count
457
+ ), number_format_i18n( $queue_count ), $esc_url($link) );
458
+ } else {
459
+ $queue_text = sprintf( __( " but there's nothing in your <a href='%1\$s'>spam queue</a> at the moment." ), $esc_url($link) );
460
+ }
461
+
462
+ // _c was deprecated in WP 2.9.0
463
+ if ( function_exists( '_x' ) )
464
+ $text = sprintf( _x( '%1$s%2$s', 'akismet_rightnow' ), $intro, $queue_text );
465
+ else
466
+ $text = sprintf( _c( '%1$s%2$s|akismet_rightnow' ), $intro, $queue_text );
467
+
468
+ echo "<p class='akismet-right-now'>$text</p>\n";
469
+ }
470
+
471
+ add_action('rightnow_end', 'akismet_rightnow');
472
+
473
+
474
+ // For WP >= 2.5
475
+ function akismet_check_for_spam_button($comment_status) {
476
+ if ( 'approved' == $comment_status )
477
+ return;
478
+ if ( function_exists('plugins_url') )
479
+ $link = 'admin.php?action=akismet_recheck_queue';
480
+ else
481
+ $link = 'edit-comments.php?page=akismet-admin&amp;recheckqueue=true&amp;noheader=true';
482
+ echo "</div><div class='alignleft'><a class='button-secondary checkforspam' href='$link'>" . __('Check for Spam') . "</a>";
483
+ }
484
+ add_action('manage_comments_nav', 'akismet_check_for_spam_button');
485
+
486
+ function akismet_submit_nonspam_comment ( $comment_id ) {
487
+ global $wpdb, $akismet_api_host, $akismet_api_port, $current_user, $current_site;
488
+ $comment_id = (int) $comment_id;
489
+
490
+ $comment = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID = '$comment_id'");
491
+ if ( !$comment ) // it was deleted
492
+ return;
493
+
494
+ // use the original version stored in comment_meta if available
495
+ $as_submitted = get_comment_meta( $comment_id, 'akismet_as_submitted', true);
496
+ if ( $as_submitted && is_array($as_submitted) && isset($as_submitted['comment_content']) ) {
497
+ $comment = (object) array_merge( (array)$comment, $as_submitted );
498
+ }
499
+
500
+ $comment->blog = get_bloginfo('url');
501
+ $comment->blog_lang = get_locale();
502
+ $comment->blog_charset = get_option('blog_charset');
503
+ $comment->permalink = get_permalink($comment->comment_post_ID);
504
+ $comment->reporter_ip = $_SERVER['REMOTE_ADDR'];
505
+ if ( is_object($current_user) ) {
506
+ $comment->reporter = $current_user->user_login;
507
+ }
508
+ if ( is_object($current_site) ) {
509
+ $comment->site_domain = $current_site->domain;
510
+ }
511
+
512
+ $comment->user_role = '';
513
+ if ( isset( $comment->user_ID ) )
514
+ $comment->user_role = akismet_get_user_roles($comment->user_ID);
515
+
516
+ if ( akismet_test_mode() )
517
+ $comment->is_test = 'true';
518
+
519
+ $query_string = '';
520
+ foreach ( $comment as $key => $data )
521
+ $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
522
+
523
+ $response = akismet_http_post($query_string, $akismet_api_host, "/1.1/submit-ham", $akismet_api_port);
524
+ if ( $comment->reporter ) {
525
+ akismet_update_comment_history( $comment_id, sprintf( __('%s reported this comment as not spam'), $comment->reporter ), 'report-ham' );
526
+ update_comment_meta( $comment_id, 'akismet_user_result', 'false' );
527
+ update_comment_meta( $comment_id, 'akismet_user', $comment->reporter );
528
+ }
529
+
530
+ do_action('akismet_submit_nonspam_comment', $comment_id, $response[1]);
531
+ }
532
+
533
+ function akismet_submit_spam_comment ( $comment_id ) {
534
+ global $wpdb, $akismet_api_host, $akismet_api_port, $current_user, $current_site;
535
+ $comment_id = (int) $comment_id;
536
+
537
+ $comment = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID = '$comment_id'");
538
+ if ( !$comment ) // it was deleted
539
+ return;
540
+ if ( 'spam' != $comment->comment_approved )
541
+ return;
542
+
543
+ // use the original version stored in comment_meta if available
544
+ $as_submitted = get_comment_meta( $comment_id, 'akismet_as_submitted', true);
545
+ if ( $as_submitted && is_array($as_submitted) && isset($as_submitted['comment_content']) ) {
546
+ $comment = (object) array_merge( (array)$comment, $as_submitted );
547
+ }
548
+
549
+ $comment->blog = get_bloginfo('url');
550
+ $comment->blog_lang = get_locale();
551
+ $comment->blog_charset = get_option('blog_charset');
552
+ $comment->permalink = get_permalink($comment->comment_post_ID);
553
+ $comment->reporter_ip = $_SERVER['REMOTE_ADDR'];
554
+ if ( is_object($current_user) ) {
555
+ $comment->reporter = $current_user->user_login;
556
+ }
557
+ if ( is_object($current_site) ) {
558
+ $comment->site_domain = $current_site->domain;
559
+ }
560
+
561
+ $comment->user_role = '';
562
+ if ( isset( $comment->user_ID ) )
563
+ $comment->user_role = akismet_get_user_roles($comment->user_ID);
564
+
565
+ if ( akismet_test_mode() )
566
+ $comment->is_test = 'true';
567
+
568
+ $query_string = '';
569
+ foreach ( $comment as $key => $data )
570
+ $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
571
+
572
+ $response = akismet_http_post($query_string, $akismet_api_host, "/1.1/submit-spam", $akismet_api_port);
573
+ if ( $comment->reporter ) {
574
+ akismet_update_comment_history( $comment_id, sprintf( __('%s reported this comment as spam'), $comment->reporter ), 'report-spam' );
575
+ update_comment_meta( $comment_id, 'akismet_user_result', 'true' );
576
+ update_comment_meta( $comment_id, 'akismet_user', $comment->reporter );
577
+ }
578
+ do_action('akismet_submit_spam_comment', $comment_id, $response[1]);
579
+ }
580
+
581
+ // For WP 2.7+
582
+ function akismet_transition_comment_status( $new_status, $old_status, $comment ) {
583
+ if ( $new_status == $old_status )
584
+ return;
585
+
586
+ if ( defined('WP_IMPORTING') && WP_IMPORTING == true )
587
+ return;
588
+
589
+ global $current_user;
590
+ $reporter = '';
591
+ if ( is_object( $current_user ) )
592
+ $reporter = $current_user->user_login;
593
+
594
+ // Assumption alert:
595
+ // We want to submit comments to Akismet only when a moderator explicitly spams or approves it - not if the status
596
+ // is changed automatically by another plugin. Unfortunately WordPress doesn't provide an unambiguous way to
597
+ // determine why the transition_comment_status action was triggered. And there are several different ways by which
598
+ // to spam and unspam comments: bulk actions, ajax, links in moderation emails, the dashboard, and perhaps others.
599
+ // We'll assume that this is an explicit user action if POST or GET has an 'action' key.
600
+ if ( isset($_POST['action']) || isset($_GET['action']) ) {
601
+ if ( $new_status == 'spam' && ( $old_status == 'approved' || $old_status == 'unapproved' || !$old_status ) ) {
602
+ return akismet_submit_spam_comment( $comment->comment_ID );
603
+ } elseif ( $old_status == 'spam' && ( $new_status == 'approved' || $new_status == 'unapproved' ) ) {
604
+ return akismet_submit_nonspam_comment( $comment->comment_ID );
605
+ }
606
+ }
607
+
608
+ if ( !get_comment_meta( $comment->comment_ID, 'akismet_rechecking' ) )
609
+ akismet_update_comment_history( $comment->comment_ID, sprintf( __('%s changed the comment status to %s'), $reporter, $new_status ), 'status-' . $new_status );
610
+ }
611
+
612
+ add_action( 'transition_comment_status', 'akismet_transition_comment_status', 10, 3 );
613
+
614
+ // Total spam in queue
615
+ // get_option( 'akismet_spam_count' ) is the total caught ever
616
+ function akismet_spam_count( $type = false ) {
617
+ global $wpdb;
618
+
619
+ if ( !$type ) { // total
620
+ $count = wp_cache_get( 'akismet_spam_count', 'widget' );
621
+ if ( false === $count ) {
622
+ if ( function_exists('wp_count_comments') ) {
623
+ $count = wp_count_comments();
624
+ $count = $count->spam;
625
+ } else {
626
+ $count = (int) $wpdb->get_var("SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_approved = 'spam'");
627
+ }
628
+ wp_cache_set( 'akismet_spam_count', $count, 'widget', 3600 );
629
+ }
630
+ return $count;
631
+ } elseif ( 'comments' == $type || 'comment' == $type ) { // comments
632
+ $type = '';
633
+ } else { // pingback, trackback, ...
634
+ $type = $wpdb->escape( $type );
635
+ }
636
+
637
+ return (int) $wpdb->get_var("SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_approved = 'spam' AND comment_type='$type'");
638
+ }
639
+
640
+
641
+ function akismet_recheck_queue() {
642
+ global $wpdb, $akismet_api_host, $akismet_api_port;
643
+
644
+ if ( ! ( isset( $_GET['recheckqueue'] ) || ( isset( $_REQUEST['action'] ) && 'akismet_recheck_queue' == $_REQUEST['action'] ) ) )
645
+ return;
646
+
647
+ $moderation = $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE comment_approved = '0'", ARRAY_A );
648
+ foreach ( (array) $moderation as $c ) {
649
+ $c['user_ip'] = $c['comment_author_IP'];
650
+ $c['user_agent'] = $c['comment_agent'];
651
+ $c['referrer'] = '';
652
+ $c['blog'] = get_bloginfo('url');
653
+ $c['blog_lang'] = get_locale();
654
+ $c['blog_charset'] = get_option('blog_charset');
655
+ $c['permalink'] = get_permalink($c['comment_post_ID']);
656
+
657
+ $c['user_role'] = '';
658
+ if ( isset( $c['user_ID'] ) )
659
+ $c['user_role'] = akismet_get_user_roles($c['user_ID']);
660
+
661
+ if ( akismet_test_mode() )
662
+ $c['is_test'] = 'true';
663
+
664
+ $id = (int) $c['comment_ID'];
665
+
666
+ $query_string = '';
667
+ foreach ( $c as $key => $data )
668
+ $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
669
+
670
+ $response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port);
671
+ if ( 'true' == $response[1] ) {
672
+ wp_set_comment_status($c['comment_ID'], 'spam');
673
+ update_comment_meta( $c['comment_ID'], 'akismet_result', 'true' );
674
+ akismet_update_comment_history( $c['comment_ID'], __('Akismet re-checked and caught this comment as spam'), 'check-spam' );
675
+
676
+ } elseif ( 'false' == $response[1] ) {
677
+ update_comment_meta( $c['comment_ID'], 'akismet_result', 'false' );
678
+ akismet_update_comment_history( $c['comment_ID'], __('Akismet re-checked and cleared this comment'), 'check-ham' );
679
+ // abnormal result: error
680
+ } else {
681
+ update_comment_meta( $c['comment_ID'], 'akismet_result', 'error' );
682
+ akismet_update_comment_history( $c['comment_ID'], sprintf( __('Akismet was unable to re-check this comment (response: %s)'), $response[1]), 'check-error' );
683
+ }
684
+
685
+ }
686
+ wp_redirect( $_SERVER['HTTP_REFERER'] );
687
+ exit;
688
+ }
689
+
690
+ add_action('admin_action_akismet_recheck_queue', 'akismet_recheck_queue');
691
+
692
+ // Check connectivity between the WordPress blog and Akismet's servers.
693
+ // Returns an associative array of server IP addresses, where the key is the IP address, and value is true (available) or false (unable to connect).
694
+ function akismet_check_server_connectivity() {
695
+ global $akismet_api_host, $akismet_api_port, $wpcom_api_key;
696
+
697
+ $test_host = 'rest.akismet.com';
698
+
699
+ // Some web hosts may disable one or both functions
700
+ if ( !function_exists('fsockopen') || !function_exists('gethostbynamel') )
701
+ return array();
702
+
703
+ $ips = gethostbynamel($test_host);
704
+ if ( !$ips || !is_array($ips) || !count($ips) )
705
+ return array();
706
+
707
+ $servers = array();
708
+ foreach ( $ips as $ip ) {
709
+ $response = akismet_verify_key( akismet_get_key(), $ip );
710
+ // even if the key is invalid, at least we know we have connectivity
711
+ if ( $response == 'valid' || $response == 'invalid' )
712
+ $servers[$ip] = true;
713
+ else
714
+ $servers[$ip] = false;
715
+ }
716
+
717
+ return $servers;
718
+ }
719
+
720
+ // Check the server connectivity and store the results in an option.
721
+ // Cached results will be used if not older than the specified timeout in seconds; use $cache_timeout = 0 to force an update.
722
+ // Returns the same associative array as akismet_check_server_connectivity()
723
+ function akismet_get_server_connectivity( $cache_timeout = 86400 ) {
724
+ $servers = get_option('akismet_available_servers');
725
+ if ( (time() - get_option('akismet_connectivity_time') < $cache_timeout) && $servers !== false )
726
+ return $servers;
727
+
728
+ // There's a race condition here but the effect is harmless.
729
+ $servers = akismet_check_server_connectivity();
730
+ update_option('akismet_available_servers', $servers);
731
+ update_option('akismet_connectivity_time', time());
732
+ return $servers;
733
+ }
734
+
735
+ // Returns true if server connectivity was OK at the last check, false if there was a problem that needs to be fixed.
736
+ function akismet_server_connectivity_ok() {
737
+ // skip the check on WPMU because the status page is hidden
738
+ global $wpcom_api_key;
739
+ if ( $wpcom_api_key )
740
+ return true;
741
+ $servers = akismet_get_server_connectivity();
742
+ return !( empty($servers) || !count($servers) || count( array_filter($servers) ) < count($servers) );
743
+ }
744
+
akismet.css ADDED
@@ -0,0 +1,12 @@
 
 
 
 
 
 
 
 
 
 
 
 
1
+
2
+ #submitted-on { position: relative; }
3
+ .author { padding-bottom: 5px !important; white-space: nowrap; }
4
+ .author a { padding-left: 42px !important; }
5
+ .author img { position: absolute; top: 1px; left: 0; }
6
+ .author strong { padding-left: 42px; font-size: 14px; position: relative; }
7
+ .author .akismet-user-comment-count { display: inline; }
8
+ .author .akismet-user-comment-counts { padding-left: 42px; }
9
+ .akismet-status { background: #EEE; border: 1px solid #E4E4E4; color: #999; margin-bottom: 5px; padding: 1px 8px 2px 8px; -moz-border-radius:6px; border-radius:6px; -webkit-border-radius:6px; float: right; line-height: 1.2em; }
10
+ .row-actions { margin-top: -3px; }
11
+ span.comment-link a { text-decoration: underline; }
12
+ span.comment-link:after { content: " " attr(title) " "; color: #aaa; text-decoration: none; }
akismet.js ADDED
@@ -0,0 +1,10 @@
 
 
 
 
 
 
 
 
 
 
1
+ jQuery(document).ready(function () {
2
+ jQuery('.akismet-status').each(function () {
3
+ var thisId = jQuery(this).attr('commentid');
4
+ jQuery(this).prependTo('#comment-' + thisId + ' #submitted-on');
5
+ });
6
+ jQuery('.akismet-user-comment-count').each(function () {
7
+ var thisId = jQuery(this).attr('commentid');
8
+ jQuery(this).insertAfter('#comment-' + thisId + ' .author strong:first').show();
9
+ });
10
+ });
akismet.php CHANGED
@@ -5,29 +5,31 @@
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') )
@@ -41,8 +43,13 @@ if ( !function_exists( 'add_action' ) ) {
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;
@@ -53,251 +60,9 @@ function akismet_init() {
53
  $akismet_api_host = get_option('wordpress_api_key') . '.rest.akismet.com';
54
 
55
  $akismet_api_port = 80;
56
- add_action('admin_menu', 'akismet_config_page');
57
- add_action('admin_menu', 'akismet_stats_page');
58
- akismet_admin_warnings();
59
  }
60
  add_action('init', 'akismet_init');
61
 
62
- function akismet_admin_init() {
63
- if ( function_exists( 'get_plugin_page_hook' ) )
64
- $hook = get_plugin_page_hook( 'akismet-stats-display', 'index.php' );
65
- else
66
- $hook = 'dashboard_page_akismet-stats-display';
67
- add_action('admin_head-'.$hook, 'akismet_stats_script');
68
- }
69
- add_action('admin_init', 'akismet_admin_init');
70
-
71
- if ( !function_exists('wp_nonce_field') ) {
72
- function akismet_nonce_field($action = -1) { return; }
73
- $akismet_nonce = -1;
74
- } else {
75
- function akismet_nonce_field($action = -1) { return wp_nonce_field($action); }
76
- $akismet_nonce = 'akismet-update-key';
77
- }
78
-
79
- if ( !function_exists('number_format_i18n') ) {
80
- function number_format_i18n( $number, $decimals = null ) { return number_format( $number, $decimals ); }
81
- }
82
-
83
- function akismet_config_page() {
84
- if ( function_exists('add_submenu_page') )
85
- add_submenu_page('plugins.php', __('Akismet Configuration'), __('Akismet Configuration'), 'manage_options', 'akismet-key-config', 'akismet_conf');
86
-
87
- }
88
-
89
- function akismet_conf() {
90
- global $akismet_nonce, $wpcom_api_key;
91
-
92
- if ( isset($_POST['submit']) ) {
93
- if ( function_exists('current_user_can') && !current_user_can('manage_options') )
94
- die(__('Cheatin&#8217; uh?'));
95
-
96
- check_admin_referer( $akismet_nonce );
97
- $key = preg_replace( '/[^a-h0-9]/i', '', $_POST['key'] );
98
-
99
- if ( empty($key) ) {
100
- $key_status = 'empty';
101
- $ms[] = 'new_key_empty';
102
- delete_option('wordpress_api_key');
103
- } else {
104
- $key_status = akismet_verify_key( $key );
105
- }
106
-
107
- if ( $key_status == 'valid' ) {
108
- update_option('wordpress_api_key', $key);
109
- $ms[] = 'new_key_valid';
110
- } else if ( $key_status == 'invalid' ) {
111
- $ms[] = 'new_key_invalid';
112
- } else if ( $key_status == 'failed' ) {
113
- $ms[] = 'new_key_failed';
114
- }
115
-
116
- if ( isset( $_POST['akismet_discard_month'] ) )
117
- update_option( 'akismet_discard_month', 'true' );
118
- else
119
- update_option( 'akismet_discard_month', 'false' );
120
- } elseif ( isset($_POST['check']) ) {
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
131
- $ms[] = 'key_empty';
132
- }
133
- $key_status = 'empty';
134
- } else {
135
- $key_status = akismet_verify_key( $key );
136
- }
137
- if ( $key_status == 'valid' ) {
138
- $ms[] = 'key_valid';
139
- } else if ( $key_status == 'invalid' ) {
140
- delete_option('wordpress_api_key');
141
- $ms[] = 'key_empty';
142
- } else if ( !empty($key) && $key_status == 'failed' ) {
143
- $ms[] = 'key_failed';
144
- }
145
- }
146
-
147
- $messages = array(
148
- 'new_key_empty' => array('color' => 'aa0', 'text' => __('Your key has been cleared.')),
149
- 'new_key_valid' => array('color' => '2d2', 'text' => __('Your key has been verified. Happy blogging!')),
150
- 'new_key_invalid' => array('color' => 'd22', 'text' => __('The key you entered is invalid. Please double-check it.')),
151
- 'new_key_failed' => array('color' => 'd22', 'text' => __('The key you entered could not be verified because a connection to akismet.com could not be established. Please check your server configuration.')),
152
- 'no_connection' => array('color' => 'd22', 'text' => __('There was a problem connecting to the Akismet server. Please check your server configuration.')),
153
- 'key_empty' => array('color' => 'aa0', 'text' => sprintf(__('Please enter an API key. (<a href="%s" style="color:#fff">Get your key.</a>)'), 'http://akismet.com/get/')),
154
- 'key_valid' => array('color' => '2d2', 'text' => __('This key is valid.')),
155
- 'key_failed' => array('color' => 'aa0', 'text' => __('The key below was previously validated but a connection to akismet.com can not be established at this time. Please check your server configuration.')));
156
- ?>
157
- <?php if ( !empty($_POST['submit'] ) ) : ?>
158
- <div id="message" class="updated fade"><p><strong><?php _e('Options saved.') ?></strong></p></div>
159
- <?php endif; ?>
160
- <div class="wrap">
161
- <h2><?php _e('Akismet Configuration'); ?></h2>
162
- <div class="narrow">
163
- <form action="" method="post" id="akismet-conf" style="margin: auto; width: 400px; ">
164
- <?php if ( !$wpcom_api_key ) { ?>
165
- <p><?php printf(__('For many people, <a href="%1$s">Akismet</a> will greatly reduce or even completely eliminate the comment and trackback spam you get on your site. If one does happen to get through, simply mark it as "spam" on the moderation screen and Akismet will learn from the mistakes. If you don\'t have an API key yet, you can get one at <a href="%2$s">Akismet.com</a>.'), 'http://akismet.com/', 'http://akismet.com/get/'); ?></p>
166
-
167
- <h3><label for="key"><?php _e('Akismet API Key'); ?></label></h3>
168
- <?php foreach ( $ms as $m ) : ?>
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 } ?>
176
- <?php } ?>
177
- <?php akismet_nonce_field($akismet_nonce) ?>
178
- <p><label><input name="akismet_discard_month" id="akismet_discard_month" value="true" type="checkbox" <?php if ( get_option('akismet_discard_month') == 'true' ) echo ' checked="checked" '; ?> /> <?php _e('Automatically discard spam comments on posts older than a month.'); ?></label></p>
179
- <p class="submit"><input type="submit" name="submit" value="<?php _e('Update options &raquo;'); ?>" /></p>
180
- </form>
181
-
182
- <form action="" method="post" id="akismet-connectivity" style="margin: auto; width: 400px; ">
183
-
184
- <h3><?php _e('Server Connectivity'); ?></h3>
185
- <?php
186
- if ( !function_exists('fsockopen') || !function_exists('gethostbynamel') ) {
187
- ?>
188
- <p style="padding: .5em; background-color: #d22; color: #fff; font-weight:bold;"><?php _e('Network functions are disabled.'); ?></p>
189
- <p><?php echo sprintf( __('Your web host or server administrator has disabled PHP\'s <code>fsockopen</code> or <code>gethostbynamel</code> functions. <strong>Akismet cannot work correctly until this is fixed.</strong> Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet\'s system requirements</a>.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
190
- <?php
191
- } else {
192
- $servers = akismet_get_server_connectivity();
193
- $fail_count = count($servers) - count( array_filter($servers) );
194
- if ( is_array($servers) && count($servers) > 0 ) {
195
- // some connections work, some fail
196
- if ( $fail_count > 0 && $fail_count < count($servers) ) { ?>
197
- <p style="padding: .5em; background-color: #aa0; color: #fff; font-weight:bold;"><?php _e('Unable to reach some Akismet servers.'); ?></p>
198
- <p><?php echo sprintf( __('A network problem or firewall is blocking some connections from your web server to Akismet.com. Akismet is working but this may cause problems during times of network congestion. Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet and firewalls</a>.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
199
- <?php
200
- // all connections fail
201
- } elseif ( $fail_count > 0 ) { ?>
202
- <p style="padding: .5em; background-color: #d22; color: #fff; font-weight:bold;"><?php _e('Unable to reach any Akismet servers.'); ?></p>
203
- <p><?php echo sprintf( __('A network problem or firewall is blocking all connections from your web server to Akismet.com. <strong>Akismet cannot work correctly until this is fixed.</strong> Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet and firewalls</a>.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
204
- <?php
205
- // all connections work
206
- } else { ?>
207
- <p style="padding: .5em; background-color: #2d2; color: #fff; font-weight:bold;"><?php _e('All Akismet servers are available.'); ?></p>
208
- <p><?php _e('Akismet is working correctly. All servers are accessible.'); ?></p>
209
- <?php
210
- }
211
- } else {
212
- ?>
213
- <p style="padding: .5em; background-color: #d22; color: #fff; font-weight:bold;"><?php _e('Unable to find Akismet servers.'); ?></p>
214
- <p><?php echo sprintf( __('A DNS problem or firewall is preventing all access from your web server to Akismet.com. <strong>Akismet cannot work correctly until this is fixed.</strong> Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet and firewalls</a>.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
215
- <?php
216
- }
217
- }
218
-
219
- if ( !empty($servers) ) {
220
- ?>
221
- <table style="width: 100%;">
222
- <thead><th><?php _e('Akismet server'); ?></th><th><?php _e('Network Status'); ?></th></thead>
223
- <tbody>
224
- <?php
225
- asort($servers);
226
- foreach ( $servers as $ip => $status ) {
227
- $color = ( $status ? '#2d2' : '#d22');
228
- ?>
229
- <tr>
230
- <td><?php echo htmlspecialchars($ip); ?></td>
231
- <td style="padding: 0 .5em; font-weight:bold; color: #fff; background-color: <?php echo $color; ?>"><?php echo ($status ? __('No problems') : __('Obstructed') ); ?></td>
232
-
233
- <?php
234
- }
235
- }
236
- ?>
237
- </tbody>
238
- </table>
239
- <p><?php if ( get_option('akismet_connectivity_time') ) echo sprintf( __('Last checked %s ago.'), human_time_diff( get_option('akismet_connectivity_time') ) ); ?></p>
240
- <p class="submit"><input type="submit" name="check" value="<?php _e('Check network status &raquo;'); ?>" /></p>
241
- </form>
242
-
243
- </div>
244
- </div>
245
- <?php
246
- }
247
-
248
- function akismet_stats_page() {
249
- if ( function_exists('add_submenu_page') )
250
- add_submenu_page('index.php', __('Akismet Stats'), __('Akismet Stats'), 'manage_options', 'akismet-stats-display', 'akismet_stats_display');
251
-
252
- }
253
-
254
- function akismet_stats_script() {
255
- ?>
256
- <script type="text/javascript">
257
- function resizeIframe() {
258
- var height = document.documentElement.clientHeight;
259
- height -= document.getElementById('akismet-stats-frame').offsetTop;
260
- height += 100; // magic padding
261
-
262
- document.getElementById('akismet-stats-frame').style.height = height +"px";
263
-
264
- };
265
- function resizeIframeInit() {
266
- document.getElementById('akismet-stats-frame').onload = resizeIframe;
267
- window.onresize = resizeIframe;
268
- }
269
- addLoadEvent(resizeIframeInit);
270
- </script><?php
271
- }
272
-
273
-
274
- function akismet_stats_display() {
275
- global $akismet_api_host, $akismet_api_port, $wpcom_api_key;
276
- $blog = urlencode( get_option('home') );
277
- $url = "http://".akismet_get_key().".web.akismet.com/1.0/user-stats.php?blog={$blog}";
278
- ?>
279
- <div class="wrap">
280
- <iframe src="<?php echo $url; ?>" width="100%" height="100%" frameborder="0" id="akismet-stats-frame"></iframe>
281
- </div>
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) )
@@ -316,104 +81,13 @@ function akismet_verify_key( $key, $ip = null ) {
316
  return $response[1];
317
  }
318
 
319
- // Check connectivity between the WordPress blog and Akismet's servers.
320
- // Returns an associative array of server IP addresses, where the key is the IP address, and value is true (available) or false (unable to connect).
321
- function akismet_check_server_connectivity() {
322
- global $akismet_api_host, $akismet_api_port, $wpcom_api_key;
323
-
324
- $test_host = 'rest.akismet.com';
325
-
326
- // Some web hosts may disable one or both functions
327
- if ( !function_exists('fsockopen') || !function_exists('gethostbynamel') )
328
- return array();
329
-
330
- $ips = gethostbynamel($test_host);
331
- if ( !$ips || !is_array($ips) || !count($ips) )
332
- return array();
333
-
334
- $servers = array();
335
- foreach ( $ips as $ip ) {
336
- $response = akismet_verify_key( akismet_get_key(), $ip );
337
- // even if the key is invalid, at least we know we have connectivity
338
- if ( $response == 'valid' || $response == 'invalid' )
339
- $servers[$ip] = true;
340
- else
341
- $servers[$ip] = false;
342
- }
343
-
344
- return $servers;
345
- }
346
-
347
- // Check the server connectivity and store the results in an option.
348
- // Cached results will be used if not older than the specified timeout in seconds; use $cache_timeout = 0 to force an update.
349
- // Returns the same associative array as akismet_check_server_connectivity()
350
- function akismet_get_server_connectivity( $cache_timeout = 86400 ) {
351
- $servers = get_option('akismet_available_servers');
352
- if ( (time() - get_option('akismet_connectivity_time') < $cache_timeout) && $servers !== false )
353
- return $servers;
354
-
355
- // There's a race condition here but the effect is harmless.
356
- $servers = akismet_check_server_connectivity();
357
- update_option('akismet_available_servers', $servers);
358
- update_option('akismet_connectivity_time', time());
359
- return $servers;
360
- }
361
-
362
- // Returns true if server connectivity was OK at the last check, false if there was a problem that needs to be fixed.
363
- function akismet_server_connectivity_ok() {
364
- // skip the check on WPMU because the status page is hidden
365
- global $wpcom_api_key;
366
- if ( $wpcom_api_key )
367
  return true;
368
- $servers = akismet_get_server_connectivity();
369
- return !( empty($servers) || !count($servers) || count( array_filter($servers) ) < count($servers) );
370
- }
371
-
372
- function akismet_admin_warnings() {
373
- global $wpcom_api_key;
374
- if ( !get_option('wordpress_api_key') && !$wpcom_api_key && !isset($_POST['submit']) ) {
375
- function akismet_warning() {
376
- echo "
377
- <div id='akismet-warning' class='updated fade'><p><strong>".__('Akismet is almost ready.')."</strong> ".sprintf(__('You must <a href="%1$s">enter your Akismet API key</a> for it to work.'), "plugins.php?page=akismet-key-config")."</p></div>
378
- ";
379
- }
380
- add_action('admin_notices', 'akismet_warning');
381
- return;
382
- } elseif ( get_option('akismet_connectivity_time') && empty($_POST) && is_admin() && !akismet_server_connectivity_ok() ) {
383
- function akismet_warning() {
384
- echo "
385
- <div id='akismet-warning' class='updated fade'><p><strong>".__('Akismet has detected a problem.')."</strong> ".sprintf(__('A server or network problem is preventing Akismet from working correctly. <a href="%1$s">Click here for more information</a> about how to fix the problem.'), "plugins.php?page=akismet-key-config")."</p></div>
386
- ";
387
- }
388
- add_action('admin_notices', 'akismet_warning');
389
- return;
390
- }
391
- }
392
-
393
- function akismet_get_host($host) {
394
- // if all servers are accessible, just return the host name.
395
- // if not, return an IP that was known to be accessible at the last check.
396
- if ( akismet_server_connectivity_ok() ) {
397
- return $host;
398
- } else {
399
- $ips = akismet_get_server_connectivity();
400
- // a firewall may be blocking access to some Akismet IPs
401
- if ( count($ips) > 0 && count(array_filter($ips)) < count($ips) ) {
402
- // use DNS to get current IPs, but exclude any known to be unreachable
403
- $dns = (array)gethostbynamel( rtrim($host, '.') . '.' );
404
- $dns = array_filter($dns);
405
- foreach ( $dns as $ip ) {
406
- if ( array_key_exists( $ip, $ips ) && empty( $ips[$ip] ) )
407
- unset($dns[$ip]);
408
- }
409
- // return a random IP from those available
410
- if ( count($dns) )
411
- return $dns[ array_rand($dns) ];
412
-
413
- }
414
- }
415
- // if all else fails try the host name
416
- return $host;
417
  }
418
 
419
  // return a comma-separated list of role names for the given user
@@ -435,35 +109,59 @@ function akismet_get_user_roles($user_id ) {
435
  // Returns array with headers in $response[0] and body in $response[1]
436
  function akismet_http_post($request, $host, $path, $port = 80, $ip=null) {
437
  global $wp_version;
438
-
439
- $akismet_version = constant('AKISMET_VERSION');
440
-
441
- $http_request = "POST $path HTTP/1.0\r\n";
442
- $http_request .= "Host: $host\r\n";
443
- $http_request .= "Content-Type: application/x-www-form-urlencoded; charset=" . get_option('blog_charset') . "\r\n";
444
- $http_request .= "Content-Length: " . strlen($request) . "\r\n";
445
- $http_request .= "User-Agent: WordPress/$wp_version | Akismet/$akismet_version\r\n";
446
- $http_request .= "\r\n";
447
- $http_request .= $request;
448
-
449
  $http_host = $host;
450
- // use a specific IP if provided - needed by akismet_check_server_connectivity()
451
- if ( $ip && long2ip(ip2long($ip)) ) {
 
452
  $http_host = $ip;
453
  } else {
454
- $http_host = akismet_get_host($host);
455
  }
456
-
457
- $response = '';
458
- if( false != ( $fs = @fsockopen($http_host, $port, $errno, $errstr, 10) ) ) {
459
- fwrite($fs, $http_request);
460
-
461
- while ( !feof($fs) )
462
- $response .= fgets($fs, 1160); // One TCP-IP packet
463
- fclose($fs);
464
- $response = explode("\r\n\r\n", $response, 2);
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
465
  }
466
- return $response;
467
  }
468
 
469
  // filter handler used to return a spam result to pre_comment_approved
@@ -471,11 +169,122 @@ function akismet_result_spam( $approved ) {
471
  // bump the counter here instead of when the filter is added to reduce the possibility of overcounting
472
  if ( $incr = apply_filters('akismet_spam_count_incr', 1) )
473
  update_option( 'akismet_spam_count', get_option('akismet_spam_count') + $incr );
 
 
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'];
@@ -488,17 +297,41 @@ function akismet_auto_check_comment( $commentdata ) {
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];
@@ -517,10 +350,16 @@ function akismet_auto_check_comment( $commentdata ) {
517
  // akismet_result_spam() won't be called so bump the counter here
518
  if ( $incr = apply_filters('akismet_spam_count_incr', 1) )
519
  update_option( 'akismet_spam_count', get_option('akismet_spam_count') + $incr );
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') )
@@ -529,9 +368,12 @@ function akismet_auto_check_comment( $commentdata ) {
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);
@@ -549,341 +391,87 @@ function akismet_delete_old() {
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;
555
 
556
- $comment = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID = '$comment_id'");
557
- if ( !$comment ) // it was deleted
558
- return;
559
- $comment->blog = get_option('home');
560
- $comment->blog_lang = get_locale();
561
- $comment->blog_charset = get_option('blog_charset');
562
- $comment->permalink = get_permalink($comment->comment_post_ID);
563
- if ( is_object($current_user) ) {
564
- $comment->reporter = $current_user->user_login;
565
- }
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 ) {
583
- global $wpdb, $akismet_api_host, $akismet_api_port, $current_user, $current_site;
584
- $comment_id = (int) $comment_id;
585
-
586
- $comment = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID = '$comment_id'");
587
- if ( !$comment ) // it was deleted
588
- return;
589
- if ( 'spam' != $comment->comment_approved )
590
- return;
591
- $comment->blog = get_option('home');
592
- $comment->blog_lang = get_locale();
593
- $comment->blog_charset = get_option('blog_charset');
594
- $comment->permalink = get_permalink($comment->comment_post_ID);
595
- if ( is_object($current_user) ) {
596
- $comment->reporter = $current_user->user_login;
597
- }
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);
615
-
616
- // For old versions of WP only
617
- function akismet_set_comment_status( $comment_id, $status ) {
618
- if ( $status == 'spam' ) {
619
- akismet_submit_spam_comment( $comment_id );
620
- } elseif ( $status == 'approve' ) {
621
- akismet_submit_nonspam_comment( $comment_id );
622
- }
623
- }
624
-
625
- // For WP 2.7+
626
- function akismet_transition_comment_status( $new_status, $old_status, $comment ) {
627
- if ( $new_status == $old_status )
628
- return;
629
-
630
- if ( $new_status == 'spam' ) {
631
- akismet_submit_spam_comment( $comment->comment_ID );
632
- } elseif ( $old_status == 'spam' && ( $new_status == 'approved' || $new_status == 'unapproved' ) ) {
633
- akismet_submit_nonspam_comment( $comment->comment_ID );
634
- }
635
- }
636
-
637
- function akismet_spamtoham( $comment ) { akismet_submit_nonspam_comment( $comment->comment_ID ); }
638
-
639
- if ( function_exists( 'wp_transition_comment_status' ) ) {
640
- add_action( 'transition_comment_status', 'akismet_transition_comment_status', 10, 3 );
641
- } else {
642
- add_action('wp_set_comment_status', 'akismet_set_comment_status', 10, 2);
643
- add_action('edit_comment', 'akismet_submit_spam_comment');
644
- add_filter( 'comment_spam_to_approved', 'akismet_spamtoham' );
645
- add_filter( 'comment_spam_to_unapproved', 'akismet_spamtoham' );
646
- }
647
- // Total spam in queue
648
- // get_option( 'akismet_spam_count' ) is the total caught ever
649
- function akismet_spam_count( $type = false ) {
650
  global $wpdb;
651
 
652
- if ( !$type ) { // total
653
- $count = wp_cache_get( 'akismet_spam_count', 'widget' );
654
- if ( false === $count ) {
655
- if ( function_exists('wp_count_comments') ) {
656
- $count = wp_count_comments();
657
- $count = $count->spam;
658
- } else {
659
- $count = (int) $wpdb->get_var("SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_approved = 'spam'");
660
- }
661
- wp_cache_set( 'akismet_spam_count', $count, 'widget', 3600 );
662
- }
663
- return $count;
664
- } elseif ( 'comments' == $type || 'comment' == $type ) { // comments
665
- $type = '';
666
- } else { // pingback, trackback, ...
667
- $type = $wpdb->escape( $type );
668
- }
669
-
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'] ) )
686
- $link = 'edit-comments.php?page=akismet-admin';
687
- else
688
- $link = 'edit.php?page=akismet-admin';
689
-
690
- if ( $count = get_option('akismet_spam_count') ) {
691
- $intro = sprintf( __ngettext(
692
- '<a href="%1$s">Akismet</a> has protected your site from %2$s spam comment already,',
693
- '<a href="%1$s">Akismet</a> has protected your site from %2$s spam comments already,',
694
- $count
695
- ), 'http://akismet.com/', number_format_i18n( $count ) );
696
- } else {
697
- $intro = sprintf( __('<a href="%1$s">Akismet</a> blocks spam from getting to your blog,'), 'http://akismet.com/' );
698
- }
699
-
700
- if ( $queue_count = akismet_spam_count() ) {
701
- $queue_text = sprintf( __ngettext(
702
- 'and there\'s <a href="%2$s">%1$s comment</a> in your spam queue right now.',
703
- 'and there are <a href="%2$s">%1$s comments</a> in your spam queue right now.',
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) {
724
- if ( 'approved' == $comment_status )
725
- return;
726
- if ( function_exists('plugins_url') )
727
- $link = 'admin.php?action=akismet_recheck_queue';
728
- else
729
- $link = 'edit-comments.php?page=akismet-admin&amp;recheckqueue=true&amp;noheader=true';
730
- echo "</div><div class='alignleft'><a class='button-secondary checkforspam' href='$link'>" . __('Check for Spam') . "</a>";
731
- }
732
- add_action('manage_comments_nav', 'akismet_check_for_spam_button');
733
-
734
- function akismet_recheck_queue() {
735
- global $wpdb, $akismet_api_host, $akismet_api_port;
736
-
737
- if ( ! ( isset( $_GET['recheckqueue'] ) || ( isset( $_REQUEST['action'] ) && 'akismet_recheck_queue' == $_REQUEST['action'] ) ) )
738
- return;
739
-
740
- $moderation = $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE comment_approved = '0'", ARRAY_A );
741
- foreach ( (array) $moderation as $c ) {
742
- $c['user_ip'] = $c['comment_author_IP'];
743
- $c['user_agent'] = $c['comment_agent'];
744
- $c['referrer'] = '';
745
- $c['blog'] = get_option('home');
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 = '';
757
- foreach ( $c as $key => $data )
758
- $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
 
 
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'] );
770
- exit;
771
- }
772
-
773
- add_action('admin_action_akismet_recheck_queue', 'akismet_recheck_queue');
774
-
775
- function akismet_check_db_comment( $id ) {
776
- global $wpdb, $akismet_api_host, $akismet_api_port;
777
-
778
- $id = (int) $id;
779
- $c = $wpdb->get_row( "SELECT * FROM $wpdb->comments WHERE comment_ID = '$id'", ARRAY_A );
780
- if ( !$c )
781
- return;
782
-
783
- $c['user_ip'] = $c['comment_author_IP'];
784
- $c['user_agent'] = $c['comment_agent'];
785
- $c['referrer'] = '';
786
- $c['blog'] = get_option('home');
787
- $c['blog_lang'] = get_locale();
788
- $c['blog_charset'] = get_option('blog_charset');
789
- $c['permalink'] = get_permalink($c['comment_post_ID']);
790
- $id = $c['comment_ID'];
791
-
792
- $query_string = '';
793
- foreach ( $c as $key => $data )
794
- $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
795
-
796
- $response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port);
797
- return $response[1];
798
- }
799
-
800
- // Widget stuff
801
- function widget_akismet_register() {
802
- if ( function_exists('register_sidebar_widget') ) :
803
- function widget_akismet($args) {
804
- extract($args);
805
- $options = get_option('widget_akismet');
806
- $count = number_format_i18n(get_option('akismet_spam_count'));
807
- ?>
808
- <?php echo $before_widget; ?>
809
- <?php echo $before_title . $options['title'] . $after_title; ?>
810
- <div id="akismetwrap"><div id="akismetstats"><a id="aka" href="http://akismet.com" title=""><?php printf( __( '%1$s %2$sspam comments%3$s %4$sblocked by%5$s<br />%6$sAkismet%7$s' ), '<span id="akismet1"><span id="akismetcount">' . $count . '</span>', '<span id="akismetsc">', '</span></span>', '<span id="akismet2"><span id="akismetbb">', '</span>', '<span id="akismeta">', '</span></span>' ); ?></a></div></div>
811
- <?php echo $after_widget; ?>
812
- <?php
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}
823
- #aka:hover{border:none;text-decoration:none}
824
- #aka:hover #akismet1{display:none}
825
- #aka:hover #akismet2,#akismet1{display:block}
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
- }
840
- if ( $options != $newoptions ) {
841
- $options = $newoptions;
842
- update_option('widget_akismet', $options);
843
  }
844
- $title = htmlspecialchars($options['title'], ENT_QUOTES);
845
- ?>
846
- <p><label for="akismet-title"><?php _e('Title:'); ?> <input style="width: 250px;" id="akismet-title" name="akismet-title" type="text" value="<?php echo $title; ?>" /></label></p>
847
- <input type="hidden" id="akismet-submit" name="akismet-submit" value="1" />
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;
861
  }
 
862
 
863
- add_action('init', 'widget_akismet_register');
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}
874
- #aka:hover{border:none;text-decoration:none}
875
- #aka:hover #akismet1{display:none}
876
- #aka:hover #akismet2,#akismet1{display:block}
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'));
884
- ?>
885
- <div id="akismetwrap"><div id="akismetstats"><a id="aka" href="http://akismet.com" title=""><div id="akismet1"><span id="akismetcount"><?php echo $count; ?></span> <span id="akismetsc"><?php _e('spam comments') ?></span></div> <div id="akismet2"><span id="akismetbb"><?php _e('blocked by') ?></span><br /><span id="akismeta">Akismet</span></div></a></div></div>
886
- <?php
887
  }
888
 
889
- ?>
 
5
  /*
6
  Plugin Name: Akismet
7
  Plugin URI: http://akismet.com/
8
+ Description: Used by millions, Akismet is quite possibly the best way in the world to <strong>protect your blog from comment and track-back spam</strong>. It keeps your site protected from spam even while you sleep. To get started: 1) Click the "Activate" link to the left of this description, 2) <a href="https:akismet.com/signup/?return=true">Sign up for an Akismet API key</a>, and 3) Go to your <a href="plugins.php?page=akismet-key-config">Akismet configuration</a> page, and save your API key.
9
+ Version: 2.5.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
17
+ modify it under the terms of the GNU General Public License
18
+ as published by the Free Software Foundation; either version 2
19
+ of the License, or (at your option) any later version.
20
+
21
+ This program is distributed in the hope that it will be useful,
22
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
23
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24
+ GNU General Public License for more details.
25
+
26
+ You should have received a copy of the GNU General Public License
27
+ along with this program; if not, write to the Free Software
28
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
29
  */
30
 
31
+ define('AKISMET_VERSION', '2.5.0');
32
+ define('AKISMET_PLUGIN_URL', plugin_dir_url( __FILE__ ));
33
 
34
  /** If you hardcode a WP.com API key here, all key config screens will be hidden */
35
  if ( defined('WPCOM_API_KEY') )
43
  exit;
44
  }
45
 
46
+ if ( isset($wp_db_version) && $wp_db_version <= 9872 )
47
+ include_once dirname( __FILE__ ) . '/legacy.php';
48
+
49
+ include_once dirname( __FILE__ ) . '/widget.php';
50
+
51
+ if ( is_admin() )
52
+ require_once dirname( __FILE__ ) . '/admin.php';
53
 
54
  function akismet_init() {
55
  global $wpcom_api_key, $akismet_api_host, $akismet_api_port;
60
  $akismet_api_host = get_option('wordpress_api_key') . '.rest.akismet.com';
61
 
62
  $akismet_api_port = 80;
 
 
 
63
  }
64
  add_action('init', 'akismet_init');
65
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
66
  function akismet_get_key() {
67
  global $wpcom_api_key;
68
  if ( !empty($wpcom_api_key) )
81
  return $response[1];
82
  }
83
 
84
+ // if we're in debug or test modes, use a reduced service level so as not to polute training or stats data
85
+ function akismet_test_mode() {
86
+ if ( defined('WP_DEBUG') && WP_DEBUG )
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
87
  return true;
88
+ if ( defined('AKISMET_TEST_MODE') && AKISMET_TEST_MODE )
89
+ return true;
90
+ return false;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
91
  }
92
 
93
  // return a comma-separated list of role names for the given user
109
  // Returns array with headers in $response[0] and body in $response[1]
110
  function akismet_http_post($request, $host, $path, $port = 80, $ip=null) {
111
  global $wp_version;
112
+
113
+ $akismet_ua = "WordPress/{$wp_version} | ";
114
+ $akismet_ua .= 'Akismet/' . constant( 'AKISMET_VERSION' );
115
+
116
+ $content_length = strlen( $request );
117
+
 
 
 
 
 
118
  $http_host = $host;
119
+ // use a specific IP if provided
120
+ // needed by akismet_check_server_connectivity()
121
+ if ( $ip && long2ip( ip2long( $ip ) ) ) {
122
  $http_host = $ip;
123
  } else {
124
+ $http_host = $host;
125
  }
126
+
127
+ // use the WP HTTP class if it is available
128
+ if ( function_exists( 'wp_remote_post' ) ) {
129
+ $http_args = array(
130
+ 'body' => $request,
131
+ 'headers' => array(
132
+ 'Content-Type' => 'application/x-www-form-urlencoded; ' .
133
+ 'charset=' . get_option( 'blog_charset' ),
134
+ 'Host' => $host,
135
+ 'User-Agent' => $akismet_ua
136
+ ),
137
+ 'httpversion' => '1.0'
138
+ );
139
+ $akismet_url = "http://{$http_host}{$path}";
140
+ $response = wp_remote_post( $akismet_url, $http_args );
141
+ if ( is_wp_error( $response ) )
142
+ return '';
143
+
144
+ return array( $response['headers'], $response['body'] );
145
+ } else {
146
+ $http_request = "POST $path HTTP/1.0\r\n";
147
+ $http_request .= "Host: $host\r\n";
148
+ $http_request .= 'Content-Type: application/x-www-form-urlencoded; charset=' . get_option('blog_charset') . "\r\n";
149
+ $http_request .= "Content-Length: {$content_length}\r\n";
150
+ $http_request .= "User-Agent: {$akismet_ua}\r\n";
151
+ $http_request .= "\r\n";
152
+ $http_request .= $request;
153
+
154
+ $response = '';
155
+ if( false != ( $fs = @fsockopen( $http_host, $port, $errno, $errstr, 10 ) ) ) {
156
+ fwrite( $fs, $http_request );
157
+
158
+ while ( !feof( $fs ) )
159
+ $response .= fgets( $fs, 1160 ); // One TCP-IP packet
160
+ fclose( $fs );
161
+ $response = explode( "\r\n\r\n", $response, 2 );
162
+ }
163
+ return $response;
164
  }
 
165
  }
166
 
167
  // filter handler used to return a spam result to pre_comment_approved
169
  // bump the counter here instead of when the filter is added to reduce the possibility of overcounting
170
  if ( $incr = apply_filters('akismet_spam_count_incr', 1) )
171
  update_option( 'akismet_spam_count', get_option('akismet_spam_count') + $incr );
172
+ // this is a one-shot deal
173
+ remove_filter( 'pre_comment_approved', 'akismet_result_spam' );
174
  return 'spam';
175
  }
176
 
177
+ function akismet_result_hold( $approved ) {
178
+ // once only
179
+ remove_filter( 'pre_comment_approved', 'akismet_result_hold' );
180
+ return '0';
181
+ }
182
+
183
+ // how many approved comments does this author have?
184
+ function akimset_get_user_comments_approved( $user_id, $comment_author_email, $comment_author, $comment_author_url ) {
185
+ global $wpdb;
186
+
187
+ if ( !empty($user_id) )
188
+ return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->comments WHERE user_id = %d AND comment_approved = 1", $user_id ) );
189
+
190
+ if ( !empty($comment_author_email) )
191
+ return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->comments WHERE comment_author_email = %s AND comment_author = %s AND comment_author_url = %s AND comment_approved = 1", $comment_author_email, $comment_author, $comment_author_url ) );
192
+
193
+ return 0;
194
+ }
195
+
196
+ function akismet_microtime() {
197
+ $mtime = explode( ' ', microtime() );
198
+ return $mtime[1] + $mtime[0];
199
+ }
200
+
201
+ // log an event for a given comment, storing it in comment_meta
202
+ function akismet_update_comment_history( $comment_id, $message, $event=null ) {
203
+ global $current_user;
204
+
205
+ // failsafe for old WP versions
206
+ if ( !function_exists('add_comment_meta') )
207
+ return false;
208
+
209
+ $user = '';
210
+ if ( is_object($current_user) )
211
+ $user = $current_user->user_login;
212
+
213
+ $event = array(
214
+ 'time' => akismet_microtime(),
215
+ 'message' => $message,
216
+ 'event' => $event,
217
+ 'user' => $user,
218
+ );
219
+
220
+ // $unique = false so as to allow multiple values per comment
221
+ $r = add_comment_meta( $comment_id, 'akismet_history', $event, false );
222
+ }
223
+
224
+ // get the full comment history for a given comment, as an array in reverse chronological order
225
+ function akismet_get_comment_history( $comment_id ) {
226
+
227
+ // failsafe for old WP versions
228
+ if ( !function_exists('add_comment_meta') )
229
+ return false;
230
+
231
+ $history = get_comment_meta( $comment_id, 'akismet_history', false );
232
+ usort( $history, 'akismet_cmp_time' );
233
+ return $history;
234
+ }
235
+
236
+ function akismet_cmp_time( $a, $b ) {
237
+ return $a['time'] > $b['time'] ? -1 : 1;
238
+ }
239
+
240
+ // this fires on wp_insert_comment. we can't update comment_meta when akismet_auto_check_comment() runs
241
+ // because we don't know the comment ID at that point.
242
+ function akismet_auto_check_update_meta( $id, $comment ) {
243
+ global $akismet_last_comment;
244
+
245
+ // failsafe for old WP versions
246
+ if ( !function_exists('add_comment_meta') )
247
+ return false;
248
+
249
+ // wp_insert_comment() might be called in other contexts, so make sure this is the same comment
250
+ // as was checked by akismet_auto_check_comment
251
+ if ( is_object($comment) && !empty($akismet_last_comment) && is_array($akismet_last_comment) ) {
252
+ if ( intval($akismet_last_comment['comment_post_ID']) == intval($comment->comment_post_ID)
253
+ && $akismet_last_comment['comment_author'] == $comment->comment_author
254
+ && $akismet_last_comment['comment_author_email'] == $comment->comment_author_email ) {
255
+ // normal result: true or false
256
+ if ( $akismet_last_comment['akismet_result'] == 'true' ) {
257
+ update_comment_meta( $comment->comment_ID, 'akismet_result', 'true' );
258
+ akismet_update_comment_history( $comment->comment_ID, __('Akismet caught this comment as spam'), 'check-spam' );
259
+ if ( $comment->comment_approved != 'spam' )
260
+ akismet_update_comment_history( $comment->comment_ID, sprintf( __('Comment status was changed to %s'), $comment->comment_approved), 'status-changed'.$comment->comment_approved );
261
+ } elseif ( $akismet_last_comment['akismet_result'] == 'false' ) {
262
+ update_comment_meta( $comment->comment_ID, 'akismet_result', 'false' );
263
+ akismet_update_comment_history( $comment->comment_ID, __('Akismet cleared this comment'), 'check-ham' );
264
+ if ( $comment->comment_approved == 'spam' ) {
265
+ if ( wp_blacklist_check($comment->comment_author, $comment->comment_author_email, $comment->comment_author_url, $comment->comment_content, $comment->comment_author_IP, $comment->comment_agent) )
266
+ akismet_update_comment_history( $comment->comment_ID, __('Comment was caught by wp_blacklist_check'), 'wp-blacklisted' );
267
+ else
268
+ akismet_update_comment_history( $comment->comment_ID, sprintf( __('Comment status was changed to %s'), $comment->comment_approved), 'status-changed-'.$comment->comment_approved );
269
+ }
270
+ // abnormal result: error
271
+ } else {
272
+ update_comment_meta( $comment->comment_ID, 'akismet_error', time() );
273
+ akismet_update_comment_history( $comment->comment_ID, sprintf( __('Akismet was unable to check this comment (response: %s), will automatically retry again later.'), $akismet_last_comment['akismet_result']), 'check-error' );
274
+ }
275
+
276
+ // record the complete original data as submitted for checking
277
+ if ( isset($akismet_last_comment['comment_as_submitted']) )
278
+ update_comment_meta( $comment->comment_ID, 'akismet_as_submitted', $akismet_last_comment['comment_as_submitted'] );
279
+ }
280
+ }
281
+ }
282
+
283
+ add_action( 'wp_insert_comment', 'akismet_auto_check_update_meta', 10, 2 );
284
+
285
+
286
  function akismet_auto_check_comment( $commentdata ) {
287
+ global $akismet_api_host, $akismet_api_port, $akismet_last_comment;
288
 
289
  $comment = $commentdata;
290
  $comment['user_ip'] = $_SERVER['REMOTE_ADDR'];
297
 
298
  $comment['user_role'] = akismet_get_user_roles($comment['user_ID']);
299
 
300
+ $akismet_nonce_option = get_option( 'akismet_comment_nonce' );
301
+ $comment['akismet_comment_nonce'] = 'inactive';
302
+ if ( $akismet_nonce_option == 'true' || $akismet_nonce_option == '' ) {
303
+ $comment['akismet_comment_nonce'] = 'failed';
304
+ if ( isset( $_POST['akismet_comment_nonce'] ) && wp_verify_nonce( $_POST['akismet_comment_nonce'], 'akismet_comment_nonce_' . $comment['comment_post_ID'] ) )
305
+ $comment['akismet_comment_nonce'] = 'passed';
306
+
307
+ // comment reply in wp-admin
308
+ if ( isset( $_POST['_ajax_nonce-replyto-comment'] ) && check_ajax_referer( 'replyto-comment', '_ajax_nonce-replyto-comment' ) )
309
+ $comment['akismet_comment_nonce'] = 'passed';
310
+
311
+ }
312
+
313
+ if ( akismet_test_mode() )
314
+ $comment['is_test'] = 'true';
315
+
316
+ foreach ($_POST as $key => $value ) {
317
+ if ( is_string($value) )
318
+ $comment["POST_{$key}"] = $value;
319
+ }
320
+
321
  $ignore = array( 'HTTP_COOKIE', 'HTTP_COOKIE2', 'PHP_AUTH_PW' );
322
 
323
+ foreach ( $_SERVER as $key => $value ) {
324
  if ( !in_array( $key, $ignore ) && is_string($value) )
325
  $comment["$key"] = $value;
326
  else
327
  $comment["$key"] = '';
328
+ }
329
 
330
  $query_string = '';
331
  foreach ( $comment as $key => $data )
332
  $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
333
+
334
+ $commentdata['comment_as_submitted'] = $comment;
335
 
336
  $response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port);
337
  $commentdata['akismet_result'] = $response[1];
350
  // akismet_result_spam() won't be called so bump the counter here
351
  if ( $incr = apply_filters('akismet_spam_count_incr', 1) )
352
  update_option( 'akismet_spam_count', get_option('akismet_spam_count') + $incr );
353
+ wp_redirect( $_SERVER['HTTP_REFERER'] );
354
  }
355
  }
356
 
357
+ // if the response is neither true nor false, hold the comment for moderation and schedule a recheck
358
+ if ( 'true' != $response[1] && 'false' != $response[1] ) {
359
+ add_filter('pre_comment_approved', 'akismet_result_hold');
360
+ wp_schedule_single_event( time() + 1200, 'akismet_schedule_cron_recheck' );
361
+ }
362
+
363
  if ( function_exists('wp_next_scheduled') && function_exists('wp_schedule_event') ) {
364
  // WP 2.1+: delete old comments daily
365
  if ( !wp_next_scheduled('akismet_scheduled_delete') )
368
  // WP 2.0: run this one time in ten
369
  akismet_delete_old();
370
  }
371
+ $akismet_last_comment = $commentdata;
372
  return $commentdata;
373
  }
374
 
375
+ add_action('preprocess_comment', 'akismet_auto_check_comment', 1);
376
+
377
  function akismet_delete_old() {
378
  global $wpdb;
379
  $now_gmt = current_time('mysql', 1);
391
 
392
  add_action('akismet_scheduled_delete', 'akismet_delete_old');
393
 
394
+ function akismet_check_db_comment( $id, $recheck_reason = 'recheck_queue' ) {
395
+ global $wpdb, $akismet_api_host, $akismet_api_port;
 
396
 
397
+ $id = (int) $id;
398
+ $c = $wpdb->get_row( "SELECT * FROM $wpdb->comments WHERE comment_ID = '$id'", ARRAY_A );
399
+ if ( !$c )
400
+ return;
 
 
 
 
 
 
 
 
 
401
 
402
+ $c['user_ip'] = $c['comment_author_IP'];
403
+ $c['user_agent'] = $c['comment_agent'];
404
+ $c['referrer'] = '';
405
+ $c['blog'] = get_option('home');
406
+ $c['blog_lang'] = get_locale();
407
+ $c['blog_charset'] = get_option('blog_charset');
408
+ $c['permalink'] = get_permalink($c['comment_post_ID']);
409
+ $id = $c['comment_ID'];
410
+ if ( akismet_test_mode() )
411
+ $c['is_test'] = 'true';
412
+ $c['recheck_reason'] = $recheck_reason;
413
 
414
+ $query_string = '';
415
+ foreach ( $c as $key => $data )
416
+ $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
417
 
418
+ $response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port);
419
+ return $response[1];
420
  }
421
 
422
+ function akismet_cron_recheck( $data ) {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
423
  global $wpdb;
424
 
425
+ delete_option('akismet_available_servers');
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
426
 
427
+ $comment_errors = $wpdb->get_col( "
428
+ SELECT comment_id
429
+ FROM {$wpdb->prefix}commentmeta
430
+ WHERE meta_key = 'akismet_error'
431
+ " );
432
 
433
+ foreach ( (array) $comment_errors as $comment_id ) {
434
+ add_comment_meta( $comment_id, 'akismet_rechecking', true );
435
+ $status = akismet_check_db_comment( $comment_id, 'retry' );
 
 
 
436
 
437
+ $msg = '';
438
+ if ( $status == 'true' ) {
439
+ $msg = __( 'Akismet caught this comment as spam during an automatic retry.' );
440
+ } elseif ( $status == 'false' ) {
441
+ $msg = __( 'Akismet cleared this comment during an automatic retry.' );
442
  }
443
+
444
+ // If we got back a legit response then update the comment history
445
+ // other wise just bail now and try again later. No point in
446
+ // re-trying all the comments once we hit one failure.
447
+ if ( !empty( $msg ) ) {
448
+ delete_comment_meta( $comment_id, 'akismet_error' );
449
+ akismet_update_comment_history( $comment_id, $msg, 'cron-retry' );
450
+ update_comment_meta( $comment_id, 'akismet_result', $status );
451
+ // make sure the comment status is still pending. if it isn't, that means the user has already moved it elsewhere.
452
+ $comment = get_comment( $comment_id );
453
+ if ( $comment && 'unapproved' == wp_get_comment_status( $comment_id ) ) {
454
+ if ( $status == 'true' ) {
455
+ wp_spam_comment( $comment_id );
456
+ } elseif ( $status == 'false' ) {
457
+ // comment is good, but it's still in the pending queue. depending on the moderation settings
458
+ // we may need to change it to approved.
459
+ if ( check_comment($comment->comment_author, $comment->comment_author_email, $comment->comment_author_url, $comment->comment_content, $comment->comment_author_IP, $comment->comment_agent, $comment->comment_type) )
460
+ wp_set_comment_status( $comment_id, 1 );
461
+ }
462
+ }
463
+ } else {
464
+ delete_comment_meta( $comment_id, 'akismet_rechecking' );
465
+ wp_schedule_single_event( time() + 1200, 'akismet_schedule_cron_recheck' );
466
+ return;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
467
  }
 
 
 
 
 
468
  }
 
 
 
 
 
 
 
 
 
 
 
469
  }
470
+ add_action( 'akismet_schedule_cron_recheck', 'akismet_cron_recheck' );
471
 
472
+ function akismet_add_comment_nonce( $post_id ) {
473
+ wp_nonce_field( 'akismet_comment_nonce_' . $post_id, 'akismet_comment_nonce', FALSE );
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
474
  }
475
 
476
+ if ( get_option( 'akismet_comment_nonce' ) == 'true' || get_option( 'akismet_comment_nonce' ) == '' )
477
+ add_action( 'comment_form', 'akismet_add_comment_nonce' );
readme.txt CHANGED
@@ -1,9 +1,9 @@
1
  === Akismet ===
2
- 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.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.
@@ -13,11 +13,15 @@ Akismet checks your comments against the Akismet web service to see if they look
13
  Akismet checks your comments against the Akismet web service to see if they look like spam or not and lets you
14
  review the spam it catches under your blog's "Comments" admin screen.
15
 
16
- Want to show off how much spam Akismet has caught for you? Just put `<?php akismet_counter(); ?>` in your template.
17
 
18
- See also: [WP Stats plugin](http://wordpress.org/extend/plugins/stats/).
 
 
 
 
19
 
20
- PS: You'll need an [Akismet.com API key](http://akismet.com/get/) to use it.
21
 
22
  == Installation ==
23
 
@@ -27,6 +31,21 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
27
 
28
  == Changelog ==
29
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
30
  = 2.4.0 =
31
 
32
  * Spell out that the license is GPLv2
1
  === Akismet ===
2
+ Contributors: matt, ryan, andy, mdawaffe, tellyworth, josephscott, lessbloat, automattic
3
  Tags: akismet, comments, spam
4
+ Requires at least: 3.0
5
  Tested up to: 3.0
6
+ Stable tag: 2.5.0
7
  License: GPLv2
8
 
9
  Akismet checks your comments against the Akismet web service to see if they look like spam or not.
13
  Akismet checks your comments against the Akismet web service to see if they look like spam or not and lets you
14
  review the spam it catches under your blog's "Comments" admin screen.
15
 
16
+ Major new features in Akismet 2.5 include:
17
 
18
+ * A comment status history, so you can easily see which comments were caught or cleared by Akismet, and which were spammed or unspammed by a moderator
19
+ * Links are highlighted in the comment body, to reveal hidden or misleading links
20
+ * If your web host is unable to reach Akismet's servers, the plugin will automatically retry when your connection is back up
21
+ * Moderators can see the number of approved comments for each user
22
+ * Spam and Unspam reports now include more information, to help improve accuracy
23
 
24
+ PS: You'll need an [Akismet.com API key](http://akismet.com/signup/) to use it. Keys are free for personal blogs, with paid subscriptions available for businesses and commercial sites.
25
 
26
  == Installation ==
27
 
31
 
32
  == Changelog ==
33
 
34
+ = 2.5.0 =
35
+
36
+ * Track comment actions under 'Akismet Status' on the edit comment screen
37
+ * Fix a few remaining deprecated function calls ( props Mike Glendinning )
38
+ * Use HTTPS for the stats IFRAME when wp-admin is using HTTPS
39
+ * Use the WordPress HTTP class if available
40
+ * Move the admin UI code to a separate file, only loaded when needed
41
+ * Add cron retry feature, to replace the old connectivity check
42
+ * Display Akismet status badge beside each comment
43
+ * Record history for each comment, and display it on the edit page
44
+ * Record the complete comment as originally submitted in comment_meta, to use when reporting spam and ham
45
+ * Highlight links in comment content
46
+ * New option, "Show the number of comments you've approved beside each comment author."
47
+ * New option, "Use a nonce on the comment form."
48
+
49
  = 2.4.0 =
50
 
51
  * Spell out that the license is GPLv2
widget.php ADDED
@@ -0,0 +1,92 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * @package Akismet
4
+ */
5
+ // Widget stuff
6
+ function widget_akismet_register() {
7
+ if ( function_exists('register_sidebar_widget') ) :
8
+ function widget_akismet($args) {
9
+ extract($args);
10
+ $options = get_option('widget_akismet');
11
+ $count = number_format_i18n(get_option('akismet_spam_count'));
12
+ ?>
13
+ <?php echo $before_widget; ?>
14
+ <?php echo $before_title . $options['title'] . $after_title; ?>
15
+ <div id="akismetwrap"><div id="akismetstats"><a id="aka" href="http://akismet.com" title=""><?php printf( __( '%1$s %2$sspam comments%3$s %4$sblocked by%5$s<br />%6$sAkismet%7$s' ), '<span id="akismet1"><span id="akismetcount">' . $count . '</span>', '<span id="akismetsc">', '</span></span>', '<span id="akismet2"><span id="akismetbb">', '</span>', '<span id="akismeta">', '</span></span>' ); ?></a></div></div>
16
+ <?php echo $after_widget; ?>
17
+ <?php
18
+ }
19
+
20
+ function widget_akismet_style() {
21
+ $plugin_dir = '/wp-content/plugins';
22
+ if ( defined( 'PLUGINDIR' ) )
23
+ $plugin_dir = '/' . PLUGINDIR;
24
+
25
+ ?>
26
+ <style type="text/css">
27
+ #aka,#aka:link,#aka:hover,#aka:visited,#aka:active{color:#fff;text-decoration:none}
28
+ #aka:hover{border:none;text-decoration:none}
29
+ #aka:hover #akismet1{display:none}
30
+ #aka:hover #akismet2,#akismet1{display:block}
31
+ #akismet2{display:none;padding-top:2px}
32
+ #akismeta{font-size:16px;font-weight:bold;line-height:18px;text-decoration:none}
33
+ #akismetcount{display:block;font:15px Verdana,Arial,Sans-Serif;font-weight:bold;text-decoration:none}
34
+ #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}
35
+ </style>
36
+ <?php
37
+ }
38
+
39
+ function widget_akismet_control() {
40
+ $options = $newoptions = get_option('widget_akismet');
41
+ if ( isset( $_POST['akismet-submit'] ) && $_POST["akismet-submit"] ) {
42
+ $newoptions['title'] = strip_tags(stripslashes($_POST["akismet-title"]));
43
+ if ( empty($newoptions['title']) ) $newoptions['title'] = __('Spam Blocked');
44
+ }
45
+ if ( $options != $newoptions ) {
46
+ $options = $newoptions;
47
+ update_option('widget_akismet', $options);
48
+ }
49
+ $title = htmlspecialchars($options['title'], ENT_QUOTES);
50
+ ?>
51
+ <p><label for="akismet-title"><?php _e('Title:'); ?> <input style="width: 250px;" id="akismet-title" name="akismet-title" type="text" value="<?php echo $title; ?>" /></label></p>
52
+ <input type="hidden" id="akismet-submit" name="akismet-submit" value="1" />
53
+ <?php
54
+ }
55
+
56
+ if ( function_exists( 'wp_register_sidebar_widget' ) ) {
57
+ wp_register_sidebar_widget( 'akismet', 'Akismet', 'widget_akismet', null, 'akismet');
58
+ wp_register_widget_control( 'akismet', 'Akismet', 'widget_akismet_control', null, 75, 'akismet');
59
+ } else {
60
+ register_sidebar_widget('Akismet', 'widget_akismet', null, 'akismet');
61
+ register_widget_control('Akismet', 'widget_akismet_control', null, 75, 'akismet');
62
+ }
63
+ if ( is_active_widget('widget_akismet') )
64
+ add_action('wp_head', 'widget_akismet_style');
65
+ endif;
66
+ }
67
+
68
+ add_action('init', 'widget_akismet_register');
69
+
70
+ // Counter for non-widget users
71
+ function akismet_counter() {
72
+ $plugin_dir = '/wp-content/plugins';
73
+ if ( defined( 'PLUGINDIR' ) )
74
+ $plugin_dir = '/' . PLUGINDIR;
75
+
76
+ ?>
77
+ <style type="text/css">
78
+ #akismetwrap #aka,#aka:link,#aka:hover,#aka:visited,#aka:active{color:#fff;text-decoration:none}
79
+ #aka:hover{border:none;text-decoration:none}
80
+ #aka:hover #akismet1{display:none}
81
+ #aka:hover #akismet2,#akismet1{display:block}
82
+ #akismet2{display:none;padding-top:2px}
83
+ #akismeta{font-size:16px;font-weight:bold;line-height:18px;text-decoration:none}
84
+ #akismetcount{display:block;font:15px Verdana,Arial,Sans-Serif;font-weight:bold;text-decoration:none}
85
+ #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}
86
+ </style>
87
+ <?php
88
+ $count = number_format_i18n(get_option('akismet_spam_count'));
89
+ ?>
90
+ <div id="akismetwrap"><div id="akismetstats"><a id="aka" href="http://akismet.com" title=""><div id="akismet1"><span id="akismetcount"><?php echo $count; ?></span> <span id="akismetsc"><?php _e('spam comments') ?></span></div> <div id="akismet2"><span id="akismetbb"><?php _e('blocked by') ?></span><br /><span id="akismeta">Akismet</span></div></a></div></div>
91
+ <?php
92
+ }