summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>2015-05-01 00:40:49 +0000
committerJorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>2015-05-01 00:40:49 +0000
commitc64ce3ae8de09092f9570ab88a68fe920b0fd970 (patch)
treea9959002055a8bdff0ee46bf82ca6a2a39bf00cd /plugins/akismet
parentAdd easy-table plugin, requested by hwoarang (diff)
downloadblogs-gentoo-c64ce3ae8de09092f9570ab88a68fe920b0fd970.tar.gz
blogs-gentoo-c64ce3ae8de09092f9570ab88a68fe920b0fd970.tar.bz2
blogs-gentoo-c64ce3ae8de09092f9570ab88a68fe920b0fd970.zip
Update plugins and themes to the latest versions.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
Diffstat (limited to 'plugins/akismet')
-rw-r--r--plugins/akismet/.htaccess34
-rw-r--r--plugins/akismet/_inc/akismet.css366
-rw-r--r--plugins/akismet/_inc/akismet.js160
-rw-r--r--plugins/akismet/_inc/form.js30
-rw-r--r--plugins/akismet/_inc/img/logo-full-2x.pngbin0 -> 4970 bytes
-rw-r--r--plugins/akismet/admin.php925
-rw-r--r--plugins/akismet/akismet.css1
-rw-r--r--plugins/akismet/akismet.gifbin2777 -> 0 bytes
-rw-r--r--plugins/akismet/akismet.js126
-rw-r--r--plugins/akismet/akismet.php593
-rw-r--r--plugins/akismet/class.akismet-admin.php885
-rw-r--r--plugins/akismet/class.akismet-widget.php (renamed from plugins/akismet/widget.php)22
-rw-r--r--plugins/akismet/class.akismet.php1088
-rw-r--r--plugins/akismet/img/logo.pngbin2710 -> 0 bytes
-rw-r--r--plugins/akismet/img/logo@2x.pngbin1467 -> 0 bytes
-rw-r--r--plugins/akismet/index.php2
-rw-r--r--plugins/akismet/legacy.php396
-rw-r--r--plugins/akismet/readme.txt122
-rw-r--r--plugins/akismet/views/config.php220
-rw-r--r--plugins/akismet/views/get.php5
-rw-r--r--plugins/akismet/views/notice.php102
-rw-r--r--plugins/akismet/views/start.php95
-rw-r--r--plugins/akismet/views/stats.php4
-rw-r--r--plugins/akismet/views/strict.php7
-rw-r--r--plugins/akismet/wrapper.php213
25 files changed, 3350 insertions, 2046 deletions
diff --git a/plugins/akismet/.htaccess b/plugins/akismet/.htaccess
new file mode 100644
index 00000000..f271986e
--- /dev/null
+++ b/plugins/akismet/.htaccess
@@ -0,0 +1,34 @@
+# Only allow direct access to specific Web-available files.
+
+# Apache 2.2
+<IfModule !mod_authz_core.c>
+ Order Deny,Allow
+ Deny from all
+</IfModule>
+
+# Apache 2.4
+<IfModule mod_authz_core.c>
+ Require all denied
+</IfModule>
+
+# Akismet CSS and JS
+<FilesMatch "^(form|akismet)\.(css|js)$">
+ <IfModule !mod_authz_core.c>
+ Allow from all
+ </IfModule>
+
+ <IfModule mod_authz_core.c>
+ Require all granted
+ </IfModule>
+</FilesMatch>
+
+# Akismet images
+<FilesMatch "^(.+)\.(png|gif)$">
+ <IfModule !mod_authz_core.c>
+ Allow from all
+ </IfModule>
+
+ <IfModule mod_authz_core.c>
+ Require all granted
+ </IfModule>
+</FilesMatch> \ No newline at end of file
diff --git a/plugins/akismet/_inc/akismet.css b/plugins/akismet/_inc/akismet.css
new file mode 100644
index 00000000..b754ec67
--- /dev/null
+++ b/plugins/akismet/_inc/akismet.css
@@ -0,0 +1,366 @@
+
+#submitted-on {
+ position: relative;
+}
+#the-comment-list .author .akismet-user-comment-count {
+ display: inline;
+}
+#the-comment-list .author a span {
+ text-decoration: none;
+ color: #999;
+}
+#the-comment-list .author a span.akismet-span-link {
+ text-decoration: inherit;
+ color: inherit;
+}
+#the-comment-list .remove_url {
+ margin-left: 3px;
+ color: #999;
+ padding: 2px 3px 2px 0;
+}
+#the-comment-list .remove_url:hover {
+ color: #A7301F;
+ font-weight: bold;
+ padding: 2px 2px 2px 0;
+}
+#dashboard_recent_comments .akismet-status {
+ display: none;
+}
+.akismet-status {
+ float: right;
+}
+.akismet-status a {
+ color: #AAA;
+ font-style: italic;
+}
+span.comment-link a {
+ text-decoration: underline;
+}
+span.comment-link:after {
+ content: " "attr(title) " ";
+ color: #aaa;
+ text-decoration: none;
+}
+.mshot-arrow {
+ width: 0;
+ height: 0;
+ border-top: 10px solid transparent;
+ border-bottom: 10px solid transparent;
+ border-right: 10px solid #5C5C5C;
+ position: absolute;
+ left: -6px;
+ top: 91px;
+}
+.mshot-container {
+ background: #5C5C5C;
+ position: absolute;
+ top: -94px;
+ padding: 7px;
+ width: 450px;
+ height: 338px;
+ z-index: 20000;
+ -moz-border-radius: 6px;
+ border-radius: 6px;
+ -webkit-border-radius: 6px;
+}
+h2.ak-header {
+ padding: 30px;
+ background: #649316 url('img/logo-full-2x.png') no-repeat 20px center;
+ background-size: 185px 33px;
+ height: 33px;
+ text-indent: -9999em;
+ margin-right: 10px;
+}
+.checkforspam {
+ display: inline-block !important;
+}
+.checkforspam-spinner {
+ display: inline-block;
+ margin-top: 7px;
+}
+
+.config-wrap {
+ margin-top: 2em;
+ max-width: 700px;
+}
+
+.activate-option {
+ background: #e3e3e3;
+ border-radius: 3px;
+ margin-bottom: 30px;
+ overflow: hidden;
+ padding: 20px;
+}
+.activate-option.clicked {
+ background: #649316;
+ color: #fff;
+}
+.activate-option.clicked:hover {
+ background: #68802E;
+ color: #fff;
+}
+
+.activate-option .button.button-secondary {
+ margin: 15px 0;
+}
+
+.activate-option p {
+ margin: 10px 0 10px;
+}
+
+.activate-highlight {
+ background: #fff;
+ padding: 30px;
+ margin-right: 10px;
+}
+
+.activate-highlight.secondary {
+ background: #ddd;
+ padding: 20px 30px;
+}
+
+.activate-highlight h3 {
+ margin: 0 0 0.3em;
+}
+.activate-highlight p {
+ color: #777;
+}
+.activate-highlight .button-primary {
+ margin-top: 15px;
+}
+
+#akismet-enter-api-key .regular-text {
+ width: 18em;
+ margin-top: 15px;
+}
+
+.right {
+ float: right;
+}
+
+.alert-text {
+ color: #dd3d36;
+}
+.success {
+ color: #649316;
+}
+.option-description {
+ float: left;
+ font-size: 16px;
+}
+.option-description span {
+ color: #666;
+ display: block;
+ font-size: 14px;
+ margin-top: 5px;
+}
+.option-action {
+ float: right;
+}
+.key-config-link {
+ font-size: 14px;
+ margin-left: 20px;
+}
+.jetpack-account {
+ float: left;
+ font-size: 18px;
+ margin-right: 40px;
+}
+.small-heading {
+ color: #777;
+ display: block;
+ font-size: 12px;
+ font-weight: bold;
+ margin-bottom: 5px;
+ text-transform: uppercase;
+}
+.inline-label {
+ background: #ddd;
+ border-radius: 3px;
+ font-size: 11px;
+ padding: 3px 8px;
+ text-transform: uppercase;
+}
+.inline-label.alert {
+ background: #e54747;
+ color: #fff;
+}
+.jetpack-account .inline-label {
+ margin-left: 5px;
+}
+.option-action .manual-key {
+ margin-top: 7px;
+}
+
+.alert {
+ border: 1px solid #e5e5e5;
+ padding: 0.4em 1em 1.4em 1em;
+ border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-width: 1px;
+ border-style: solid;
+}
+
+.alert h3.key-status {
+ color: #fff;
+ margin: 1em 0 0.5em 0;
+}
+
+.alert.critical {
+ background-color: #993300;
+}
+
+.alert.active {
+ background-color: #649316;
+}
+
+.alert p.key-status {
+ font-size: 24px;
+}
+
+.alert p.description {
+ color:#fff;
+ font-size: 14px;
+ margin: 0 0;
+ font-style: normal;
+}
+
+.alert p.description a,
+.alert p.description a,
+.alert p.description a,
+.alert p.description a {
+ color: #fff;
+}
+
+.new-snapshot {
+ margin-top: 1em;
+ padding: 1em;
+ text-align: center;
+}
+
+.new-snapshot.stats {
+ background: #fff;
+ border: 1px solid #e5e5e5;
+}
+
+.new-snapshot h3 {
+ background: #f5f5f5;
+ color: #888;
+ font-size: 11px;
+ margin: 0;
+ padding: 3px;
+}
+
+.new-snapspot ul {
+ font-size: 12px;
+ width: 100%;
+}
+
+.new-snapshot ul li {
+ color: #999;
+ float: left;
+ font-size: 11px;
+ padding: 0 20px;
+ text-transform: uppercase;
+ width: 33%;
+ box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+}
+
+.new-snapshot.stats ul li:first-child,
+.new-snapshot.stats ul li:nth-child(2) {
+ border-right:1px dotted #ccc;
+}
+
+.new-snapshot.account ul li:nth-child(2) {
+ border-right: none;
+}
+
+.new-snapshot ul li span {
+ color: #52accc;
+ display: block;
+ font-size: 32px;
+ font-weight: lighter;
+ line-height: 1.5em;
+}
+
+.new-snapshot.stats {
+}
+
+.new-snapshot.account,
+.new-snapshot.settings {
+ float: left;
+ padding: 0;
+ text-align: left;
+ width: 50%;
+ box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+}
+
+.account-container {
+ background: #fff;
+ border: 1px solid #e5e5e5;
+ margin-right: 0.5em;
+}
+
+.settings-container {
+ background: #fff;
+ border: 1px solid #e5e5e5;
+ margin-left: 0.5em;
+}
+
+.new-snapshot.account ul li {
+ width:100%
+}
+
+.new-snapshot.account ul li span {
+ font-size: 14px;
+ font-weight: normal;
+}
+
+
+.new-snapshot.settings ul li {
+ border: none;
+ display: block;
+ width:100%
+}
+
+.new-snapshot.settings ul li span {
+ display: block;
+ font-size: 14px;
+ font-weight: normal;
+}
+
+.new-snapshot.settings p.submit {
+ margin: 0;
+ text-align: center;
+}
+
+.akismet-settings th:first-child {
+ vertical-align: top;
+ padding-top: 15px;
+}
+
+.akismet-settings th.akismet-api-key {
+ vertical-align: middle;
+ padding-top: 0;
+}
+
+.akismet-settings input[type=text] {
+ width: 75%;
+}
+
+.akismet-settings span.note{
+ float: left;
+ padding-left: 23px;
+ font-size: 75%;
+ margin-top: -10px;
+}
+
+.clearfix {
+ clear:both;
+} \ No newline at end of file
diff --git a/plugins/akismet/_inc/akismet.js b/plugins/akismet/_inc/akismet.js
new file mode 100644
index 00000000..5e857d16
--- /dev/null
+++ b/plugins/akismet/_inc/akismet.js
@@ -0,0 +1,160 @@
+jQuery( function ( $ ) {
+ $( 'a.activate-option' ).click( function(){
+ var link = $( this );
+ if ( link.hasClass( 'clicked' ) ) {
+ link.removeClass( 'clicked' );
+ }
+ else {
+ link.addClass( 'clicked' );
+ }
+ $( '.toggle-have-key' ).slideToggle( 'slow', function() {});
+ return false;
+ });
+ $('.akismet-status').each(function () {
+ var thisId = $(this).attr('commentid');
+ $(this).prependTo('#comment-' + thisId + ' .column-comment');
+ });
+ $('.akismet-user-comment-count').each(function () {
+ var thisId = $(this).attr('commentid');
+ $(this).insertAfter('#comment-' + thisId + ' .author strong:first').show();
+ });
+ $('#the-comment-list').find('tr.comment, tr[id ^= "comment-"]').find('.column-author a[title]').each(function () {
+ // Comment author URLs are the only URL with a title attribute in the author column.
+ var thisTitle = $(this).attr('title');
+
+ var thisCommentId = $(this).parents('tr:first').attr('id').split("-");
+
+ $(this).attr("id", "author_comment_url_"+ thisCommentId[1]);
+
+ if (thisTitle) {
+ $(this).after(
+ $( '<a href="#" class="remove_url">x</a>' )
+ .attr( 'commentid', thisCommentId[1] )
+ .attr( 'title', WPAkismet.strings['Remove this URL'] )
+ );
+ }
+ });
+ $('.remove_url').live('click', function () {
+ var thisId = $(this).attr('commentid');
+ var data = {
+ action: 'comment_author_deurl',
+ _wpnonce: WPAkismet.comment_author_url_nonce,
+ id: thisId
+ };
+ $.ajax({
+ url: ajaxurl,
+ type: 'POST',
+ data: data,
+ beforeSend: function () {
+ // Removes "x" link
+ $("a[commentid='"+ thisId +"']").hide();
+ // Show temp status
+ $("#author_comment_url_"+ thisId).html( $( '<span/>' ).text( WPAkismet.strings['Removing...'] ) );
+ },
+ success: function (response) {
+ if (response) {
+ // Show status/undo link
+ $("#author_comment_url_"+ thisId)
+ .attr('cid', thisId)
+ .addClass('akismet_undo_link_removal')
+ .html(
+ $( '<span/>' ).text( WPAkismet.strings['URL removed'] )
+ )
+ .append( ' ' )
+ .append(
+ $( '<span/>' )
+ .text( WPAkismet.strings['(undo)'] )
+ .addClass( 'akismet-span-link' )
+ );
+ }
+ }
+ });
+
+ return false;
+ });
+ $('.akismet_undo_link_removal').live('click', function () {
+ var thisId = $(this).attr('cid');
+ var thisUrl = $(this).attr('href');
+ var data = {
+ action: 'comment_author_reurl',
+ _wpnonce: WPAkismet.comment_author_url_nonce,
+ id: thisId,
+ url: thisUrl
+ };
+ $.ajax({
+ url: ajaxurl,
+ type: 'POST',
+ data: data,
+ beforeSend: function () {
+ // Show temp status
+ $("#author_comment_url_"+ thisId).html( $( '<span/>' ).text( WPAkismet.strings['Re-adding...'] ) );
+ },
+ success: function (response) {
+ if (response) {
+ // Add "x" link
+ $("a[commentid='"+ thisId +"']").show();
+ // Show link. Core strips leading http://, so let's do that too.
+ $("#author_comment_url_"+ thisId).removeClass('akismet_undo_link_removal').text( thisUrl.replace( /^http:\/\/(www\.)?/ig, '' ) );
+ }
+ }
+ });
+
+ return false;
+ });
+ $('a[id^="author_comment_url"], tr.pingback td.column-author a:first-of-type').mouseover(function () {
+ var wpcomProtocol = ( 'https:' === location.protocol ) ? 'https://' : 'http://';
+ // Need to determine size of author column
+ var thisParentWidth = $(this).parent().width();
+ // It changes based on if there is a gravatar present
+ thisParentWidth = ($(this).parent().find('.grav-hijack').length) ? thisParentWidth - 42 + 'px' : thisParentWidth + 'px';
+ if ($(this).find('.mShot').length == 0 && !$(this).hasClass('akismet_undo_link_removal')) {
+ var self = $( this );
+ $('.widefat td').css('overflow', 'visible');
+ $(this).css('position', 'relative');
+ var thisHref = $.URLEncode( $(this).attr('href') );
+ $(this).append('<div class="mShot mshot-container" style="left: '+thisParentWidth+'"><div class="mshot-arrow"></div><img src="//s0.wordpress.com/mshots/v1/'+thisHref+'?w=450" width="450" class="mshot-image" style="margin: 0;" /></div>');
+ setTimeout(function () {
+ self.find( '.mshot-image' ).attr('src', '//s0.wordpress.com/mshots/v1/'+thisHref+'?w=450&r=2');
+ }, 6000);
+ setTimeout(function () {
+ self.find( '.mshot-image' ).attr('src', '//s0.wordpress.com/mshots/v1/'+thisHref+'?w=450&r=3');
+ }, 12000);
+ } else {
+ $(this).find('.mShot').css('left', thisParentWidth).show();
+ }
+ }).mouseout(function () {
+ $(this).find('.mShot').hide();
+ });
+ $('.checkforspam:not(.button-disabled)').click( function(e) {
+ $('.checkforspam:not(.button-disabled)').addClass('button-disabled');
+ $('.checkforspam-spinner').addClass( 'spinner' );
+ akismet_check_for_spam(0, 100);
+ e.preventDefault();
+ });
+
+ function akismet_check_for_spam(offset, limit) {
+ $.post(
+ ajaxurl,
+ {
+ 'action': 'akismet_recheck_queue',
+ 'offset': offset,
+ 'limit': limit
+ },
+ function(result) {
+ if (result.processed < limit) {
+ window.location.reload();
+ }
+ else {
+ akismet_check_for_spam(offset + limit, limit);
+ }
+ }
+ );
+ }
+});
+// URL encode plugin
+jQuery.extend({URLEncode:function(c){var o='';var x=0;c=c.toString();var r=/(^[a-zA-Z0-9_.]*)/;
+ while(x<c.length){var m=r.exec(c.substr(x));
+ if(m!=null && m.length>1 && m[1]!=''){o+=m[1];x+=m[1].length;
+ }else{if(c[x]==' ')o+='+';else{var d=c.charCodeAt(x);var h=d.toString(16);
+ o+='%'+(h.length<2?'0':'')+h.toUpperCase();}x++;}}return o;}
+});
diff --git a/plugins/akismet/_inc/form.js b/plugins/akismet/_inc/form.js
new file mode 100644
index 00000000..3a5be8af
--- /dev/null
+++ b/plugins/akismet/_inc/form.js
@@ -0,0 +1,30 @@
+var ak_js = document.getElementById( "ak_js" );
+
+if ( ! ak_js ) {
+ ak_js = document.createElement( 'input' );
+ ak_js.setAttribute( 'id', 'ak_js' );
+ ak_js.setAttribute( 'name', 'ak_js' );
+ ak_js.setAttribute( 'type', 'hidden' );
+}
+else {
+ ak_js.parentNode.removeChild( ak_js );
+}
+
+ak_js.setAttribute( 'value', ( new Date() ).getTime() );
+
+var commentForm = document.getElementById( 'commentform' );
+
+if ( commentForm ) {
+ commentForm.appendChild( ak_js );
+}
+else {
+ var replyRowContainer = document.getElementById( 'replyrow' );
+
+ if ( replyRowContainer ) {
+ var children = replyRowContainer.getElementsByTagName( 'td' );
+
+ if ( children.length > 0 ) {
+ children[0].appendChild( ak_js );
+ }
+ }
+} \ No newline at end of file
diff --git a/plugins/akismet/_inc/img/logo-full-2x.png b/plugins/akismet/_inc/img/logo-full-2x.png
new file mode 100644
index 00000000..a9bed8b6
--- /dev/null
+++ b/plugins/akismet/_inc/img/logo-full-2x.png
Binary files differ
diff --git a/plugins/akismet/admin.php b/plugins/akismet/admin.php
deleted file mode 100644
index f8071916..00000000
--- a/plugins/akismet/admin.php
+++ /dev/null
@@ -1,925 +0,0 @@
-<?php
-add_action( 'admin_menu', 'akismet_admin_menu' );
-
-akismet_admin_warnings();
-
-function akismet_admin_init() {
- global $wp_version;
-
- // all admin functions are disabled in old versions
- if ( !function_exists('is_multisite') && version_compare( $wp_version, '3.0', '<' ) ) {
-
- function akismet_version_warning() {
- echo '
- <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>
- ';
- }
- add_action('admin_notices', 'akismet_version_warning');
-
- return;
- }
-
- if ( function_exists( 'get_plugin_page_hook' ) )
- $hook = get_plugin_page_hook( 'akismet-stats-display', 'index.php' );
- else
- $hook = 'dashboard_page_akismet-stats-display';
- add_meta_box('akismet-status', __('Comment History'), 'akismet_comment_status_meta_box', 'comment', 'normal');
-}
-add_action('admin_init', 'akismet_admin_init');
-
-add_action( 'admin_enqueue_scripts', 'akismet_load_js_and_css' );
-function akismet_load_js_and_css() {
- global $hook_suffix;
-
- if ( in_array( $hook_suffix, array(
- 'index.php', # dashboard
- 'edit-comments.php',
- 'comment.php',
- 'post.php',
- 'plugins_page_akismet-key-config',
- 'jetpack_page_akismet-key-config',
- ) ) ) {
- wp_register_style( 'akismet.css', AKISMET_PLUGIN_URL . 'akismet.css', array(), '2.5.9' );
- wp_enqueue_style( 'akismet.css');
-
- wp_register_script( 'akismet.js', AKISMET_PLUGIN_URL . 'akismet.js', array('jquery'), '2.5.9' );
- wp_enqueue_script( 'akismet.js' );
- wp_localize_script( 'akismet.js', 'WPAkismet', array(
- 'comment_author_url_nonce' => wp_create_nonce( 'comment_author_url_nonce' )
- ) );
- }
-}
-
-
-function akismet_nonce_field($action = -1) { return wp_nonce_field($action); }
-$akismet_nonce = 'akismet-update-key';
-
-function akismet_plugin_action_links( $links, $file ) {
- if ( $file == plugin_basename( dirname(__FILE__).'/akismet.php' ) ) {
- $links[] = '<a href="' . admin_url( 'admin.php?page=akismet-key-config' ) . '">'.__( 'Settings' ).'</a>';
- }
-
- return $links;
-}
-
-add_filter( 'plugin_action_links', 'akismet_plugin_action_links', 10, 2 );
-
-function akismet_conf() {
- global $akismet_nonce, $current_user;
-
- $new_key_link = 'https://akismet.com/get/';
- $config_link = esc_url( add_query_arg( array( 'page' => 'akismet-key-config', 'show' => 'enter-api-key' ), class_exists( 'Jetpack' ) ? admin_url( 'admin.php' ) : admin_url( 'plugins.php' ) ) );
- $stats_link = esc_url( add_query_arg( array( 'page' => 'akismet-stats-display' ), class_exists( 'Jetpack' ) ? admin_url( 'admin.php' ) : admin_url( 'index.php' ) ) );
- $api_key = akismet_get_key();
- $show_key_form = $api_key;
- $key_status = 'empty';
- $saved_ok = false;
- $key_status_text = '';
-
- $ms = array();
-
- if ( isset( $_POST['submit'] ) ) {
- if ( function_exists('current_user_can') && !current_user_can('manage_options') )
- die(__('Cheatin&#8217; uh?'));
-
- $show_key_form = true;
-
- check_admin_referer( $akismet_nonce );
- $key = preg_replace( '/[^a-h0-9]/i', '', $_POST['key'] );
- $home_url = parse_url( get_bloginfo('url') );
-
- if ( empty( $home_url['host'] ) )
- $ms[] = 'bad_home_url';
-
- if ( empty( $key ) ) {
- if ( $api_key ) {
- delete_option('wordpress_api_key');
- $saved_ok = true;
- $ms[] = 'new_key_empty';
- }
- else
- $ms[] = 'key_empty';
- }
- else
- $key_status = akismet_verify_key( $key );
-
- if ( $key != $api_key && $key_status == 'valid' ) {
- $ms[] = 'new_key_valid';
- update_option('wordpress_api_key', $key);
- }
- elseif ( $key_status == 'invalid' )
- $ms[] = 'new_key_invalid';
- elseif ( $key_status == 'failed' )
- $ms[] = 'new_key_failed';
-
- $api_key = $key_status == 'valid' ? $key : false;
-
- if ( isset( $_POST['akismet_discard_month'] ) )
- update_option( 'akismet_discard_month', 'true' );
- else
- update_option( 'akismet_discard_month', 'false' );
-
- if ( isset( $_POST['akismet_show_user_comments_approved'] ) )
- update_option( 'akismet_show_user_comments_approved', 'true' );
- else
- update_option( 'akismet_show_user_comments_approved', 'false' );
-
- if ( empty( $ms ) )
- $saved_ok = true;
-
- }
- elseif ( isset( $_POST['check'] ) ) {
- $show_key_form = true;
- check_admin_referer( $akismet_nonce );
- akismet_get_server_connectivity(0);
- }
- elseif ( isset( $_GET['show'] ) && $_GET['show'] == 'enter-api-key' ) {
- $show_key_form = true;
- }
-
- if ( $show_key_form ) {
- //check current key status
- //only get this if showing the key form otherwise takes longer for page to load for new user
- //no need to get it if we already know it and its valid
- if ( in_array( $key_status, array( 'invalid', 'failed', 'empty' ) ) ) {
- $key = get_option('wordpress_api_key');
- if ( empty( $key ) ) {
- //no key saved yet - maybe connection to Akismet down?
- if ( in_array( $key_status, array( 'invalid', 'empty' ) ) ) {
- if ( akismet_verify_key( '1234567890ab' ) == 'failed' )
- $ms[] = 'no_connection';
- }
- }
- else
- $key_status = akismet_verify_key( $key );
- }
-
- if ( !isset( $_POST['submit'] ) ) {
- if ( $key_status == 'invalid' )
- $ms[] = 'key_invalid';
- elseif ( !empty( $key ) && $key_status == 'failed' )
- $ms[] = 'key_failed';
- }
- }
-
- $key_status_strings = array(
- 'empty' => __( 'Empty' ),
- 'valid' => __( 'Valid' ),
- 'invalid' => __( 'Invalid' ),
- 'failed' => __( 'Failed' ),
- );
-
- $messages = array(
- 'new_key_empty' => array( 'class' => 'updated fade', 'text' => __('Your key has been cleared.' ) ),
- 'new_key_valid' => array( 'class' => 'updated fade', 'text' => __('Your Akismet account has been successfully set up and activated. Happy blogging!' ) ),
- 'new_key_invalid' => array( 'class' => 'error', 'text' => __('The key you entered is invalid. Please double-check it.' ) ),
- 'new_key_failed' => array( 'class' => 'error', 'text' => __('The key you entered could not be verified because a connection to akismet.com could not be established. Please check your server configuration.' ) ),
- 'no_connection' => array( 'class' => 'error', 'text' => __('There was a problem connecting to the Akismet server. Please check your server configuration.' ) ),
- 'key_empty' => array( 'class' => 'updated fade', 'text' => __('Please enter an API key' ) ),
- 'key_invalid' => array( 'class' => 'error', 'text' => __('This key is invalid.' ) ),
- 'key_failed' => array( 'class' => 'error', '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.' ) ),
- 'bad_home_url' => array( 'class' => 'error', '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') ) )
- );
-?>
-
-
-<div class="wrap">
- <?php if ( !$api_key ) : ?>
- <h2 class="ak-header"><?php _e('Akismet'); ?></h2>
- <?php else: ?>
- <h2 class="ak-header"><?php printf( __( 'Akismet <a href="%s" class="add-new-h2">Stats</a>' ), $stats_link ); ?></h2>
- <?php endif; ?>
- <div class="no-key <?php echo $show_key_form ? 'hidden' : '';?>">
- <p><?php _e('Akismet eliminates the comment and trackback spam you get on your site. To use Akismet you may need to sign up for an API key. Click the button below to get started.'); ?></p>
- <form name="akismet_activate" action="https://akismet.com/get/" method="POST">
- <input type="hidden" name="return" value="1"/>
- <input type="hidden" name="jetpack" value="<?php echo (string) class_exists( 'Jetpack' );?>"/>
- <input type="hidden" name="user" value="<?php echo esc_attr( $current_user->user_login );?>"/>
- <input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Create a new Akismet Key' ); ?>"/>
- </form>
- <br/>
- <a href="<?php echo $config_link;?>"><?php _e('I already have a key'); ?></a>
- </div>
- <div class="have-key <?php echo $show_key_form ? '' : 'hidden';?>">
- <?php if ( !empty($_POST['submit'] ) && $saved_ok ) : ?>
- <div id="message" class="updated fade"><p><strong><?php _e('Settings saved.') ?></strong></p></div>
- <?php endif; ?>
- <?php if ( isset($_GET['message']) && $_GET['message'] == 'success' ) : ?>
- <div id="message" class="updated fade"><p><?php _e('<strong>Sign up success!</strong> Please check your email for your Akismet API Key and enter it below.') ?></p></div>
- <?php endif; ?>
- <?php foreach( $ms as $m ) : ?>
- <div class="<?php echo $messages[$m]['class']; ?>"><p><strong><?php echo $messages[$m]['text']; ?></strong></p></div>
- <?php endforeach; ?>
- <form action="" method="post" id="akismet-conf">
- <table class="form-table">
- <tbody>
- <tr>
- <th><label for="key"><?php _e('Akismet API Key');?></label></th>
- <td>
- <input id="key" name="key" type="text" size="15" maxlength="12" value="<?php echo esc_attr( get_option('wordpress_api_key') ); ?>" class="regular-text code <?php echo $key_status;?>"><div class="under-input key-status <?php echo $key_status;?>"><?php echo isset( $key_status_strings[ $key_status ] ) ? $key_status_strings[ $key_status ] : '';?></div>
- <p class="need-key description"><?php printf( __('You must enter a valid Akismet API key here. If you need an API key, you can <a href="%s">create one here</a>'), '#' );?></p>
- </td>
- </tr>
- <?php if ( $api_key ):?>
- <tr valign="top">
- <th scope="row"><?php _e('Settings');?></th>
- <td>
- <fieldset><legend class="screen-reader-text"><span><?php _e('Settings');?></span></legend>
- <label for="akismet_discard_month" title="<?php esc_attr_e( 'Auto-detete old spam' ); ?>"><input name="akismet_discard_month" id="akismet_discard_month" value="true" type="checkbox" <?php echo get_option('akismet_discard_month') == 'true' ? 'checked="checked"':''; ?>> <span><?php _e('Auto-delete spam submitted on posts more than a month old.'); ?></span></label><br>
- <label for="akismet_show_user_comments_approved" title="<?php esc_attr_e( 'Show approved comments' ); ?>"><input name="akismet_show_user_comments_approved" id="akismet_show_user_comments_approved" value="true" type="checkbox" <?php echo get_option('akismet_show_user_comments_approved') == 'true' ? 'checked="checked"':''; ?>> <span><?php _e('Show the number of comments you\'ve approved beside each comment author.'); ?></span></label>
- </fieldset>
- </td>
- </tr>
- <?php endif; ?>
- </tbody>
- </table>
- <?php akismet_nonce_field($akismet_nonce) ?>
- <p class="submit">
- <input type="submit" name="submit" id="submit" class="button button-primary" value="<?php _e('Save Changes');?>">
- </p>
- </form>
-
- <?php if ( $api_key ) : ?>
- <h3><?php _e('Server Connectivity'); ?></h3>
- <form action="" method="post" id="akismet-connectivity">
- <table class="form-table">
- <tbody>
- <tr>
- <th><label for="key"><?php _e('Server Status');?></label></th>
- <td>
- <?php if ( !function_exists('fsockopen') || !function_exists('gethostbynamel') ) : ?>
- <p class="key-status failed"><?php _e('Network functions are disabled.'); ?></p>
- <p class="description"><?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>
- <?php else :
- $servers = akismet_get_server_connectivity();
- $fail_count = count( $servers ) - count( array_filter( $servers ) );
- if ( is_array( $servers ) && count( $servers ) > 0 ) {
- if ( $fail_count > 0 && $fail_count < count( $servers ) ) { // some connections work, some fail ?>
- <p class="key-status some"><?php _e('Unable to reach some Akismet servers.'); ?></p>
- <p class="description"><?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>
- <?php } elseif ( $fail_count > 0 ) { // all connections fail ?>
- <p class="key-status failed"><?php _e('Unable to reach any Akismet servers.'); ?></p>
- <p class="description"><?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>
- <?php } else { // all connections work ?>
- <p class="key-status valid"><?php _e('All Akismet servers are available.'); ?></p>
- <p class="description"><?php _e('Akismet is working correctly. All servers are accessible.'); ?></p>
- <?php }
- } else { //can't connect to any server ?>
- <p class="key-status failed"><?php _e('Unable to find Akismet servers.'); ?></p>
- <p class="description"><?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>
- <?php }
- endif; ?>
- </td>
- </tr>
- <?php if ( !empty( $servers ) ) : ?>
- <tr valign="top">
- <th scope="row"><?php _e('Network Status');?></th>
- <td>
- <table class="network-status">
- <thead>
- <th><?php _e('Akismet server'); ?></th><th><?php _e('Network Status'); ?></th>
- </thead>
- <tbody>
- <?php
- asort($servers);
- foreach ( $servers as $ip => $status ) : ?>
- <tr>
- <td align="center"><?php echo esc_html( $ip ); ?></td>
- <td class="key-status <?php echo $status ? 'valid' : 'failed'; ?>"><?php echo $status ? __('Accessible') : __('Re-trying'); ?></td>
- </tr>
- <?php endforeach; ?>
- </tbody>
- </table>
- <br/>
- <input type="submit" name="check" id="submit" class="button" style="margin-left: 13.3em;" value="<?php _e('Check Network Status');?>">
- </td>
- </tr>
- <?php endif; ?>
- <tr valign="top">
- <th scope="row"><?php _e('Last Checked');?></th>
- <td>
- <p><strong><?php echo get_option('akismet_connectivity_time') ? sprintf( __('%s Ago'), ucwords( human_time_diff( get_option('akismet_connectivity_time') ) ) ) : __( 'Not yet' ); ?></strong></p>
- <p class="description"><?php printf( __('You can confirm that Akismet.com is up by <a href="%s" target="_blank">clicking here</a>.'), 'http://status.automattic.com/9931/136079/Akismet-API' ); ?></p>
- </td>
- </tbody>
- </table>
- <?php akismet_nonce_field($akismet_nonce) ?>
- </form>
- <?php endif;?>
- </div>
-</div>
-<?php
-}
-
-function akismet_stats_display() {
- global $akismet_api_host, $akismet_api_port;
-
- $blog = urlencode( get_bloginfo('url') );
- $api_key = akismet_get_key();
- $config_link = esc_url( add_query_arg( array( 'page' => 'akismet-key-config' ), class_exists( 'Jetpack' ) ? admin_url( 'admin.php' ) : admin_url( 'plugins.php' ) ) );?>
-
-<div class="wrap"><?php
- if ( !$api_key ) :?>
- <div id="akismet-warning" class="updated fade"><p><strong><?php _e('Akismet is almost ready.');?></strong> <?php printf( __( 'You must <a href="%1$s">enter your Akismet API key</a> for it to work.' ), $config_link );?></p></div><?php
- else :?>
- <iframe src="<?php echo esc_url( sprintf( '%s://akismet.com/web/1.0/user-stats.php?blog=%s&api_key=%s', is_ssl()?'https':'http', $blog, $api_key ) ); ?>" width="100%" height="2500px" frameborder="0" id="akismet-stats-frame"></iframe><?php
- endif;?>
-</div><?php
-}
-
-function akismet_stats() {
- if ( !function_exists('did_action') || did_action( 'rightnow_end' ) ) // We already displayed this info in the "Right Now" section
- return;
- if ( !$count = get_option('akismet_spam_count') )
- return;
- $path = plugin_basename(__FILE__);
- echo '<h3>' . _x( 'Spam', 'comments' ) . '</h3>';
- global $submenu;
- if ( isset( $submenu['edit-comments.php'] ) )
- $link = 'edit-comments.php';
- else
- $link = 'edit.php';
- echo '<p>'.sprintf( _n( '<a href="%1$s">Akismet</a> has protected your site from <a href="%2$s">%3$s spam comments</a>.', '<a href="%1$s">Akismet</a> has protected your site from <a href="%2$s">%3$s spam comments</a>.', $count ), 'http://akismet.com/?return=true', clean_url("$link?page=akismet-admin"), number_format_i18n($count) ).'</p>';
-}
-add_action('activity_box_end', 'akismet_stats');
-
-function akismet_admin_warnings() {
- global $wpcom_api_key, $pagenow;
-
- if (
- $pagenow == 'edit-comments.php'
- || ( !empty( $_GET['page'] ) && $_GET['page'] == 'akismet-key-config' )
- || ( !empty( $_GET['page'] ) && $_GET['page'] == 'akismet-stats-display' )
- ) {
- if ( get_option( 'akismet_alert_code' ) ) {
- function akismet_alert() {
- $alert = array(
- 'code' => (int) get_option( 'akismet_alert_code' ),
- 'msg' => get_option( 'akismet_alert_msg' )
- );
- ?>
- <div class='error'>
- <p><strong><?php _e( 'Akismet Error Code');?>: <?php echo $alert['code']; ?></strong></p>
- <p><?php esc_html_e( $alert['msg'] ); ?></p>
- <p><?php //FIXME: need to revert this to using __() in next version
- printf( translate( 'For more information:' ) . ' <a href="%s">%s</a>' , 'https://akismet.com/errors/'.$alert['code'], 'https://akismet.com/errors/'.$alert['code'] );?>
- </p>
- </div>
- <?php
- }
-
- add_action( 'admin_notices', 'akismet_alert' );
- }
- }
-
- if ( !get_option('wordpress_api_key') && !$wpcom_api_key && !isset($_POST['submit']) ) {
- function akismet_warning() {
- global $hook_suffix, $current_user;
-
- if ( $hook_suffix == 'plugins.php' ) {
- echo '
- <div class="updated" style="padding: 0; margin: 0; border: none; background: none;">
- <style type="text/css">
-.akismet_activate{min-width:825px;border:1px solid #4F800D;padding:5px;margin:15px 0;background:#83AF24;background-image:-webkit-gradient(linear,0% 0,80% 100%,from(#83AF24),to(#4F800D));background-image:-moz-linear-gradient(80% 100% 120deg,#4F800D,#83AF24);-moz-border-radius:3px;border-radius:3px;-webkit-border-radius:3px;position:relative;overflow:hidden}.akismet_activate .aa_a{position:absolute;top:-5px;right:10px;font-size:140px;color:#769F33;font-family:Georgia, "Times New Roman", Times, serif;z-index:1}.akismet_activate .aa_button{font-weight:bold;border:1px solid #029DD6;border-top:1px solid #06B9FD;font-size:15px;text-align:center;padding:9px 0 8px 0;color:#FFF;background:#029DD6;background-image:-webkit-gradient(linear,0% 0,0% 100%,from(#029DD6),to(#0079B1));background-image:-moz-linear-gradient(0% 100% 90deg,#0079B1,#029DD6);-moz-border-radius:2px;border-radius:2px;-webkit-border-radius:2px}.akismet_activate .aa_button:hover{text-decoration:none !important;border:1px solid #029DD6;border-bottom:1px solid #00A8EF;font-size:15px;text-align:center;padding:9px 0 8px 0;color:#F0F8FB;background:#0079B1;background-image:-webkit-gradient(linear,0% 0,0% 100%,from(#0079B1),to(#0092BF));background-image:-moz-linear-gradient(0% 100% 90deg,#0092BF,#0079B1);-moz-border-radius:2px;border-radius:2px;-webkit-border-radius:2px}.akismet_activate .aa_button_border{border:1px solid #006699;-moz-border-radius:2px;border-radius:2px;-webkit-border-radius:2px;background:#029DD6;background-image:-webkit-gradient(linear,0% 0,0% 100%,from(#029DD6),to(#0079B1));background-image:-moz-linear-gradient(0% 100% 90deg,#0079B1,#029DD6)}.akismet_activate .aa_button_container{cursor:pointer;display:inline-block;background:#DEF1B8;padding:5px;-moz-border-radius:2px;border-radius:2px;-webkit-border-radius:2px;width:266px}.akismet_activate .aa_description{position:absolute;top:22px;left:285px;margin-left:25px;color:#E5F2B1;font-size:15px;z-index:1000}.akismet_activate .aa_description strong{color:#FFF;font-weight:normal}
- </style>
- <form name="akismet_activate" action="'.esc_url( add_query_arg( array( 'page' => 'akismet-key-config' ), class_exists( 'Jetpack' ) ? admin_url( 'admin.php' ) : admin_url( 'plugins.php' ) ) ).'" method="POST">
- <input type="hidden" name="return" value="1"/>
- <input type="hidden" name="jetpack" value="'.(string) class_exists( 'Jetpack' ).'"/>
- <input type="hidden" name="user" value="'.esc_attr( $current_user->user_login ).'"/>
- <div class="akismet_activate">
- <div class="aa_a">A</div>
- <div class="aa_button_container" onclick="document.akismet_activate.submit();">
- <div class="aa_button_border">
- <div class="aa_button">'.__('Activate your Akismet account').'</div>
- </div>
- </div>
- <div class="aa_description">'.__('<strong>Almost done</strong> - activate your account and say goodbye to comment spam').'</div>
- </div>
- </form>
- </div>
- ';
- }
- }
-
- add_action('admin_notices', 'akismet_warning');
- return;
- } elseif ( ( empty($_SERVER['SCRIPT_FILENAME']) || basename($_SERVER['SCRIPT_FILENAME']) == 'edit-comments.php' ) && wp_next_scheduled('akismet_schedule_cron_recheck') ) {
- function akismet_warning() {
- global $wpdb;
- akismet_fix_scheduled_recheck();
- $waiting = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->commentmeta WHERE meta_key = 'akismet_error'" );
- $next_check = wp_next_scheduled('akismet_schedule_cron_recheck');
- if ( $waiting > 0 && $next_check > time() )
- echo '
- <div id="akismet-warning" class="updated fade"><p><strong>'.__('Akismet has detected a problem.').'</strong> '.sprintf(__('Some comments have not yet been checked for spam by Akismet. They have been temporarily held for moderation. Please check your <a href="%s">Akismet configuration</a> and contact your web host if problems persist.'), 'admin.php?page=akismet-key-config').'</p></div>
- ';
- }
- add_action('admin_notices', 'akismet_warning');
- return;
- }
-}
-
-// FIXME placeholder
-
-function akismet_comment_row_action( $a, $comment ) {
-
- // failsafe for old WP versions
- if ( !function_exists('add_comment_meta') )
- return $a;
-
- $akismet_result = get_comment_meta( $comment->comment_ID, 'akismet_result', true );
- $akismet_error = get_comment_meta( $comment->comment_ID, 'akismet_error', true );
- $user_result = get_comment_meta( $comment->comment_ID, 'akismet_user_result', true);
- $comment_status = wp_get_comment_status( $comment->comment_ID );
- $desc = null;
- if ( $akismet_error ) {
- $desc = __( 'Awaiting spam check' );
- } elseif ( !$user_result || $user_result == $akismet_result ) {
- // Show the original Akismet result if the user hasn't overridden it, or if their decision was the same
- if ( $akismet_result == 'true' && $comment_status != 'spam' && $comment_status != 'trash' )
- $desc = __( 'Flagged as spam by Akismet' );
- elseif ( $akismet_result == 'false' && $comment_status == 'spam' )
- $desc = __( 'Cleared by Akismet' );
- } else {
- $who = get_comment_meta( $comment->comment_ID, 'akismet_user', true );
- if ( $user_result == 'true' )
- $desc = sprintf( __('Flagged as spam by %s'), $who );
- else
- $desc = sprintf( __('Un-spammed by %s'), $who );
- }
-
- // add a History item to the hover links, just after Edit
- if ( $akismet_result ) {
- $b = array();
- foreach ( $a as $k => $item ) {
- $b[ $k ] = $item;
- if (
- $k == 'edit'
- || ( $k == 'unspam' && $GLOBALS['wp_version'] >= 3.4 )
- ) {
- $b['history'] = '<a href="comment.php?action=editcomment&amp;c='.$comment->comment_ID.'#akismet-status" title="'. esc_attr__( 'View comment history' ) . '"> '. __('History') . '</a>';
- }
- }
-
- $a = $b;
- }
-
- if ( $desc )
- 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' ) . '">'.esc_html( $desc ).'</a></span>';
-
- if ( apply_filters( 'akismet_show_user_comments_approved', get_option('akismet_show_user_comments_approved') ) == 'true' ) {
- $comment_count = akismet_get_user_comments_approved( $comment->user_id, $comment->comment_author_email, $comment->comment_author, $comment->comment_author_url );
- $comment_count = intval( $comment_count );
- echo '<span class="akismet-user-comment-count" commentid="'.$comment->comment_ID.'" style="display:none;"><br><span class="akismet-user-comment-counts">'.sprintf( _n( '%s approved', '%s approved', $comment_count ), number_format_i18n( $comment_count ) ) . '</span></span>';
- }
-
- return $a;
-}
-
-add_filter( 'comment_row_actions', 'akismet_comment_row_action', 10, 2 );
-
-function akismet_comment_status_meta_box($comment) {
- $history = akismet_get_comment_history( $comment->comment_ID );
-
- if ( $history ) {
- echo '<div class="akismet-history" style="margin: 13px;">';
- foreach ( $history as $row ) {
- $time = date( 'D d M Y @ h:i:m a', $row['time'] ) . ' GMT';
- echo '<div style="margin-bottom: 13px;"><span style="color: #999;" alt="' . $time . '" title="' . $time . '">' . sprintf( __('%s ago'), human_time_diff( $row['time'] ) ) . '</span> - ';
- echo esc_html( $row['message'] ) . '</div>';
- }
-
- echo '</div>';
-
- }
-}
-
-
-// add an extra column header to the comments screen
-function akismet_comments_columns( $columns ) {
- $columns[ 'akismet' ] = __( 'Akismet' );
- return $columns;
-}
-
-#add_filter( 'manage_edit-comments_columns', 'akismet_comments_columns' );
-
-// Show stuff in the extra column
-function akismet_comment_column_row( $column, $comment_id ) {
- if ( $column != 'akismet' )
- return;
-
- $history = akismet_get_comment_history( $comment_id );
-
- if ( $history ) {
- echo '<dl class="akismet-history">';
- foreach ( $history as $row ) {
- echo '<dt>' . sprintf( __('%s ago'), human_time_diff( $row['time'] ) ) . '</dt>';
- echo '<dd>' . esc_html( $row['message'] ) . '</dd>';
- }
-
- echo '</dl>';
- }
-}
-
-#add_action( 'manage_comments_custom_column', 'akismet_comment_column_row', 10, 2 );
-
-// END FIXME
-
-// call out URLS in comments
-function akismet_text_add_link_callback( $m ) {
- // bare link?
- if ( $m[4] == $m[2] )
- return '<a '.$m[1].' href="'.$m[2].'" '.$m[3].' class="comment-link">'.$m[4].'</a>';
- else
- return '<span title="'.$m[2].'" class="comment-link"><a '.$m[1].' href="'.$m[2].'" '.$m[3].' class="comment-link">'.$m[4].'</a></span>';
-}
-
-function akismet_text_add_link_class( $comment_text ) {
- return preg_replace_callback( '#<a ([^>]*)href="([^"]+)"([^>]*)>(.*?)</a>#i', 'akismet_text_add_link_callback', $comment_text );
-}
-
-add_filter('comment_text', 'akismet_text_add_link_class');
-
-
-// WP 2.5+
-function akismet_rightnow() {
- global $submenu, $wp_db_version;
-
- if ( 8645 < $wp_db_version ) // 2.7
- $link = 'edit-comments.php?comment_status=spam';
- elseif ( isset( $submenu['edit-comments.php'] ) )
- $link = 'edit-comments.php?page=akismet-admin';
- else
- $link = 'edit.php?page=akismet-admin';
-
- if ( $count = get_option('akismet_spam_count') ) {
- $intro = sprintf( _n(
- '<a href="%1$s">Akismet</a> has protected your site from %2$s spam comment already. ',
- '<a href="%1$s">Akismet</a> has protected your site from %2$s spam comments already. ',
- $count
- ), 'http://akismet.com/?return=true', number_format_i18n( $count ) );
- } else {
- $intro = sprintf( __('<a href="%1$s">Akismet</a> blocks spam from getting to your blog. '), 'http://akismet.com/?return=true' );
- }
-
- $link = function_exists( 'esc_url' ) ? esc_url( $link ) : clean_url( $link );
- if ( $queue_count = akismet_spam_count() ) {
- $queue_text = sprintf( _n(
- 'There\'s <a href="%2$s">%1$s comment</a> in your spam queue right now.',
- 'There are <a href="%2$s">%1$s comments</a> in your spam queue right now.',
- $queue_count
- ), number_format_i18n( $queue_count ), $link );
- } else {
- $queue_text = sprintf( __( "There's nothing in your <a href='%1\$s'>spam queue</a> at the moment." ), $link );
- }
-
- $text = $intro . '<br />' . $queue_text;
- echo "<p class='akismet-right-now'>$text</p>\n";
-}
-
-add_action('rightnow_end', 'akismet_rightnow');
-
-
-// For WP >= 2.5
-function akismet_check_for_spam_button($comment_status) {
- if ( 'approved' == $comment_status )
- return;
- if ( function_exists('plugins_url') )
- $link = 'admin.php?action=akismet_recheck_queue';
- else
- $link = 'edit-comments.php?page=akismet-admin&amp;recheckqueue=true&amp;noheader=true';
- echo "</div><div class='alignleft'><a class='button-secondary checkforspam' href='$link'>" . __('Check for Spam') . "</a>";
-}
-add_action('manage_comments_nav', 'akismet_check_for_spam_button');
-
-function akismet_submit_nonspam_comment ( $comment_id ) {
- global $wpdb, $akismet_api_host, $akismet_api_port, $current_user, $current_site;
- $comment_id = (int) $comment_id;
-
- $comment = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID = '$comment_id'");
- if ( !$comment ) // it was deleted
- return;
-
- // use the original version stored in comment_meta if available
- $as_submitted = get_comment_meta( $comment_id, 'akismet_as_submitted', true);
- if ( $as_submitted && is_array($as_submitted) && isset($as_submitted['comment_content']) ) {
- $comment = (object) array_merge( (array)$comment, $as_submitted );
- }
-
- $comment->blog = get_bloginfo('url');
- $comment->blog_lang = get_locale();
- $comment->blog_charset = get_option('blog_charset');
- $comment->permalink = get_permalink($comment->comment_post_ID);
- if ( is_object($current_user) ) {
- $comment->reporter = $current_user->user_login;
- }
- if ( is_object($current_site) ) {
- $comment->site_domain = $current_site->domain;
- }
-
- $comment->user_role = '';
- if ( isset( $comment->user_ID ) )
- $comment->user_role = akismet_get_user_roles($comment->user_ID);
-
- if ( akismet_test_mode() )
- $comment->is_test = 'true';
-
- $post = get_post( $comment->comment_post_ID );
- $comment->comment_post_modified_gmt = $post->post_modified_gmt;
-
- $query_string = '';
- foreach ( $comment as $key => $data )
- $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
-
- $response = akismet_http_post($query_string, $akismet_api_host, "/1.1/submit-ham", $akismet_api_port);
- if ( $comment->reporter ) {
- akismet_update_comment_history( $comment_id, sprintf( __('%s reported this comment as not spam'), $comment->reporter ), 'report-ham' );
- update_comment_meta( $comment_id, 'akismet_user_result', 'false' );
- update_comment_meta( $comment_id, 'akismet_user', $comment->reporter );
- }
-
- do_action('akismet_submit_nonspam_comment', $comment_id, $response[1]);
-}
-
-function akismet_submit_spam_comment ( $comment_id ) {
- global $wpdb, $akismet_api_host, $akismet_api_port, $current_user, $current_site;
- $comment_id = (int) $comment_id;
-
- $comment = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID = '$comment_id'");
- if ( !$comment ) // it was deleted
- return;
- if ( 'spam' != $comment->comment_approved )
- return;
-
- // use the original version stored in comment_meta if available
- $as_submitted = get_comment_meta( $comment_id, 'akismet_as_submitted', true);
- if ( $as_submitted && is_array($as_submitted) && isset($as_submitted['comment_content']) ) {
- $comment = (object) array_merge( (array)$comment, $as_submitted );
- }
-
- $comment->blog = get_bloginfo('url');
- $comment->blog_lang = get_locale();
- $comment->blog_charset = get_option('blog_charset');
- $comment->permalink = get_permalink($comment->comment_post_ID);
- if ( is_object($current_user) ) {
- $comment->reporter = $current_user->user_login;
- }
- if ( is_object($current_site) ) {
- $comment->site_domain = $current_site->domain;
- }
-
- $comment->user_role = '';
- if ( isset( $comment->user_ID ) )
- $comment->user_role = akismet_get_user_roles($comment->user_ID);
-
- if ( akismet_test_mode() )
- $comment->is_test = 'true';
-
- $post = get_post( $comment->comment_post_ID );
- $comment->comment_post_modified_gmt = $post->post_modified_gmt;
-
- $query_string = '';
- foreach ( $comment as $key => $data )
- $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
-
- $response = akismet_http_post($query_string, $akismet_api_host, "/1.1/submit-spam", $akismet_api_port);
- if ( $comment->reporter ) {
- akismet_update_comment_history( $comment_id, sprintf( __('%s reported this comment as spam'), $comment->reporter ), 'report-spam' );
- update_comment_meta( $comment_id, 'akismet_user_result', 'true' );
- update_comment_meta( $comment_id, 'akismet_user', $comment->reporter );
- }
- do_action('akismet_submit_spam_comment', $comment_id, $response[1]);
-}
-
-// For WP 2.7+
-function akismet_transition_comment_status( $new_status, $old_status, $comment ) {
- if ( $new_status == $old_status )
- return;
-
- # we don't need to record a history item for deleted comments
- if ( $new_status == 'delete' )
- return;
-
- if ( !is_admin() )
- return;
-
- if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) && !current_user_can( 'moderate_comments' ) )
- return;
-
- if ( defined('WP_IMPORTING') && WP_IMPORTING == true )
- return;
-
- // if this is present, it means the status has been changed by a re-check, not an explicit user action
- if ( get_comment_meta( $comment->comment_ID, 'akismet_rechecking' ) )
- return;
-
- global $current_user;
- $reporter = '';
- if ( is_object( $current_user ) )
- $reporter = $current_user->user_login;
-
- // Assumption alert:
- // We want to submit comments to Akismet only when a moderator explicitly spams or approves it - not if the status
- // is changed automatically by another plugin. Unfortunately WordPress doesn't provide an unambiguous way to
- // determine why the transition_comment_status action was triggered. And there are several different ways by which
- // to spam and unspam comments: bulk actions, ajax, links in moderation emails, the dashboard, and perhaps others.
- // We'll assume that this is an explicit user action if POST or GET has an 'action' key.
- if ( isset($_POST['action']) || isset($_GET['action']) ) {
- if ( $new_status == 'spam' && ( $old_status == 'approved' || $old_status == 'unapproved' || !$old_status ) ) {
- return akismet_submit_spam_comment( $comment->comment_ID );
- } elseif ( $old_status == 'spam' && ( $new_status == 'approved' || $new_status == 'unapproved' ) ) {
- return akismet_submit_nonspam_comment( $comment->comment_ID );
- }
- }
-
- akismet_update_comment_history( $comment->comment_ID, sprintf( __('%s changed the comment status to %s'), $reporter, $new_status ), 'status-' . $new_status );
-}
-
-add_action( 'transition_comment_status', 'akismet_transition_comment_status', 10, 3 );
-
-// Total spam in queue
-// get_option( 'akismet_spam_count' ) is the total caught ever
-function akismet_spam_count( $type = false ) {
- global $wpdb;
-
- if ( !$type ) { // total
- $count = wp_cache_get( 'akismet_spam_count', 'widget' );
- if ( false === $count ) {
- if ( function_exists('wp_count_comments') ) {
- $count = wp_count_comments();
- $count = $count->spam;
- } else {
- $count = (int) $wpdb->get_var("SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_approved = 'spam'");
- }
- wp_cache_set( 'akismet_spam_count', $count, 'widget', 3600 );
- }
- return $count;
- } elseif ( 'comments' == $type || 'comment' == $type ) { // comments
- $type = '';
- } else { // pingback, trackback, ...
- $type = $wpdb->escape( $type );
- }
-
- return (int) $wpdb->get_var("SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_approved = 'spam' AND comment_type='$type'");
-}
-
-
-function akismet_recheck_queue() {
- global $wpdb, $akismet_api_host, $akismet_api_port;
-
- akismet_fix_scheduled_recheck();
-
- if ( ! ( isset( $_GET['recheckqueue'] ) || ( isset( $_REQUEST['action'] ) && 'akismet_recheck_queue' == $_REQUEST['action'] ) ) )
- return;
-
- $moderation = $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE comment_approved = '0'", ARRAY_A );
- foreach ( (array) $moderation as $c ) {
- $c['user_ip'] = $c['comment_author_IP'];
- $c['user_agent'] = $c['comment_agent'];
- $c['referrer'] = '';
- $c['blog'] = get_bloginfo('url');
- $c['blog_lang'] = get_locale();
- $c['blog_charset'] = get_option('blog_charset');
- $c['permalink'] = get_permalink($c['comment_post_ID']);
-
- $c['user_role'] = '';
- if ( isset( $c['user_ID'] ) )
- $c['user_role'] = akismet_get_user_roles($c['user_ID']);
-
- if ( akismet_test_mode() )
- $c['is_test'] = 'true';
-
- $id = (int) $c['comment_ID'];
-
- $query_string = '';
- foreach ( $c as $key => $data )
- $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
-
- add_comment_meta( $c['comment_ID'], 'akismet_rechecking', true );
- $response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port);
- if ( 'true' == $response[1] ) {
- wp_set_comment_status($c['comment_ID'], 'spam');
- update_comment_meta( $c['comment_ID'], 'akismet_result', 'true' );
- delete_comment_meta( $c['comment_ID'], 'akismet_error' );
- akismet_update_comment_history( $c['comment_ID'], __('Akismet re-checked and caught this comment as spam'), 'check-spam' );
-
- } elseif ( 'false' == $response[1] ) {
- update_comment_meta( $c['comment_ID'], 'akismet_result', 'false' );
- delete_comment_meta( $c['comment_ID'], 'akismet_error' );
- akismet_update_comment_history( $c['comment_ID'], __('Akismet re-checked and cleared this comment'), 'check-ham' );
- // abnormal result: error
- } else {
- update_comment_meta( $c['comment_ID'], 'akismet_result', 'error' );
- akismet_update_comment_history( $c['comment_ID'], sprintf( __('Akismet was unable to re-check this comment (response: %s)'), substr($response[1], 0, 50)), 'check-error' );
- }
-
- delete_comment_meta( $c['comment_ID'], 'akismet_rechecking' );
- }
- $redirect_to = isset( $_SERVER['HTTP_REFERER'] ) ? $_SERVER['HTTP_REFERER'] : admin_url( 'edit-comments.php' );
- wp_safe_redirect( $redirect_to );
- exit;
-}
-
-add_action('admin_action_akismet_recheck_queue', 'akismet_recheck_queue');
-
-// Adds an 'x' link next to author URLs, clicking will remove the author URL and show an undo link
-function akismet_remove_comment_author_url() {
- if ( !empty($_POST['id'] ) && check_admin_referer( 'comment_author_url_nonce' ) ) {
- global $wpdb;
- $comment = get_comment( intval($_POST['id']), ARRAY_A );
- if (current_user_can('edit_comment', $comment['comment_ID'])) {
- $comment['comment_author_url'] = '';
- do_action( 'comment_remove_author_url' );
- print(wp_update_comment( $comment ));
- die();
- }
- }
-}
-
-add_action('wp_ajax_comment_author_deurl', 'akismet_remove_comment_author_url');
-
-function akismet_add_comment_author_url() {
- if ( !empty( $_POST['id'] ) && !empty( $_POST['url'] ) && check_admin_referer( 'comment_author_url_nonce' ) ) {
- global $wpdb;
- $comment = get_comment( intval($_POST['id']), ARRAY_A );
- if (current_user_can('edit_comment', $comment['comment_ID'])) {
- $comment['comment_author_url'] = esc_url($_POST['url']);
- do_action( 'comment_add_author_url' );
- print(wp_update_comment( $comment ));
- die();
- }
- }
-}
-
-add_action('wp_ajax_comment_author_reurl', 'akismet_add_comment_author_url');
-
-// Check connectivity between the WordPress blog and Akismet's servers.
-// 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).
-function akismet_check_server_connectivity() {
- global $akismet_api_host, $akismet_api_port, $wpcom_api_key;
-
- $test_host = 'rest.akismet.com';
-
- // Some web hosts may disable one or both functions
- if ( !function_exists('fsockopen') || !function_exists('gethostbynamel') )
- return array();
-
- $ips = gethostbynamel($test_host);
- if ( !$ips || !is_array($ips) || !count($ips) )
- return array();
-
- $servers = array();
- foreach ( $ips as $ip ) {
- $response = akismet_verify_key( akismet_get_key(), $ip );
- // even if the key is invalid, at least we know we have connectivity
- if ( $response == 'valid' || $response == 'invalid' )
- $servers[$ip] = true;
- else
- $servers[$ip] = false;
- }
-
- return $servers;
-}
-
-// Check the server connectivity and store the results in an option.
-// Cached results will be used if not older than the specified timeout in seconds; use $cache_timeout = 0 to force an update.
-// Returns the same associative array as akismet_check_server_connectivity()
-function akismet_get_server_connectivity( $cache_timeout = 86400 ) {
- $servers = get_option('akismet_available_servers');
- if ( (time() - get_option('akismet_connectivity_time') < $cache_timeout) && $servers !== false )
- return $servers;
-
- // There's a race condition here but the effect is harmless.
- $servers = akismet_check_server_connectivity();
- update_option('akismet_available_servers', $servers);
- update_option('akismet_connectivity_time', time());
- return $servers;
-}
-
-// Returns true if server connectivity was OK at the last check, false if there was a problem that needs to be fixed.
-function akismet_server_connectivity_ok() {
- // skip the check on WPMU because the status page is hidden
- global $wpcom_api_key;
- if ( $wpcom_api_key )
- return true;
- $servers = akismet_get_server_connectivity();
- return !( empty($servers) || !count($servers) || count( array_filter($servers) ) < count($servers) );
-}
-
-function akismet_admin_menu() {
- if ( class_exists( 'Jetpack' ) ) {
- add_action( 'jetpack_admin_menu', 'akismet_load_menu' );
- } else {
- akismet_load_menu();
- }
-}
-
-function akismet_load_menu() {
- if ( class_exists( 'Jetpack' ) ) {
- add_submenu_page( 'jetpack', __( 'Akismet' ), __( 'Akismet' ), 'manage_options', 'akismet-key-config', 'akismet_conf' );
- add_submenu_page( 'jetpack', __( 'Akismet Stats' ), __( 'Akismet Stats' ), 'manage_options', 'akismet-stats-display', 'akismet_stats_display' );
- } else {
- add_submenu_page('plugins.php', __('Akismet'), __('Akismet'), 'manage_options', 'akismet-key-config', 'akismet_conf');
- add_submenu_page('index.php', __('Akismet Stats'), __('Akismet Stats'), 'manage_options', 'akismet-stats-display', 'akismet_stats_display');
- }
-}
diff --git a/plugins/akismet/akismet.css b/plugins/akismet/akismet.css
deleted file mode 100644
index e96bc8a5..00000000
--- a/plugins/akismet/akismet.css
+++ /dev/null
@@ -1 +0,0 @@
-#submitted-on{position:relative}#the-comment-list .author .akismet-user-comment-count{display:inline}#the-comment-list .author a span{text-decoration:none;color:#999}#the-comment-list .remove_url{margin-left:3px;color:#999;padding:2px 3px 2px 0}#the-comment-list .remove_url:hover{color:#A7301F;font-weight:bold;padding:2px 2px 2px 0}#dashboard_recent_comments .akismet-status{display:none}.akismet-status{float:right}.akismet-status a{color:#AAA;font-style:italic}span.comment-link a{text-decoration:underline}span.comment-link:after{content:" "attr(title) " ";color:#aaa;text-decoration:none}.mshot-arrow{width:0;height:0;border-top:10px solid transparent;border-bottom:10px solid transparent;border-right:10px solid #5C5C5C;position:absolute;left:-6px;top:91px}.mshot-container{background:#5C5C5C;position:absolute;top:-94px;padding:7px;width:450px;height:338px;z-index:20000;-moz-border-radius:6px;border-radius:6px;-webkit-border-radius:6px}h2.ak-header{padding-left:38px;background:url('img/logo.png') no-repeat 0 9px;margin-bottom:14px;line-height:32px}.key-status{padding:0.4em 1em;color:#fff;font-weight:bold;text-align:center;-webkit-border-radius:3px;border-radius:3px;border-width:1px;border-style:solid;max-width:23.3em}input#key{width:25.3em !important}input#key.valid{border-color:#4F800D}input#key.invalid,input#key.failed{border-color:#888}.key-status.under-input{margin-top:-5px;padding-bottom:0px}.key-status.invalid,.key-status.failed{background-color:#888}.key-status.valid{background-color:#4F800D}.key-status.some{background-color:#993300}.key-status.empty{display:none}table.network-status th,table.network-status td{padding:0.4em;margin:0;text-align:center}table.network-status{border-color:#dfdfdf;border-width:0 0 1px 1px;border-style:solid;border-spacing:0;width:25.6em}table.network-status th,table.network-status td{border-color:#dfdfdf;border-width:1px 1px 0 0;border-style:solid;margin:0;border-spacing:0}table.network-status td.key-status{border-radius:0px;-webkit-border-radius:0px} \ No newline at end of file
diff --git a/plugins/akismet/akismet.gif b/plugins/akismet/akismet.gif
deleted file mode 100644
index 0b93a89b..00000000
--- a/plugins/akismet/akismet.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/akismet/akismet.js b/plugins/akismet/akismet.js
deleted file mode 100644
index f3da8fd6..00000000
--- a/plugins/akismet/akismet.js
+++ /dev/null
@@ -1,126 +0,0 @@
-jQuery(document).ready(function () {
- jQuery( '.switch-have-key' ).click( function() {
- var no_key = jQuery( this ).parents().find('div.no-key');
- var have_key = jQuery( this ).parents().find('div.have-key');
-
- no_key.addClass( 'hidden' );
- have_key.removeClass( 'hidden' );
-
- return false;
- });
- jQuery( 'p.need-key a' ).click( function(){
- document.akismet_activate.submit();
- });
- jQuery('.akismet-status').each(function () {
- var thisId = jQuery(this).attr('commentid');
- jQuery(this).prependTo('#comment-' + thisId + ' .column-comment div:first-child');
- });
- jQuery('.akismet-user-comment-count').each(function () {
- var thisId = jQuery(this).attr('commentid');
- jQuery(this).insertAfter('#comment-' + thisId + ' .author strong:first').show();
- });
- jQuery('#the-comment-list tr.comment .column-author a[title ^= "http://"]').each(function () {
- var thisTitle = jQuery(this).attr('title');
- thisCommentId = jQuery(this).parents('tr:first').attr('id').split("-");
-
- jQuery(this).attr("id", "author_comment_url_"+ thisCommentId[1]);
-
- if (thisTitle) {
- jQuery(this).after(' <a href="#" class="remove_url" commentid="'+ thisCommentId[1] +'" title="Remove this URL">x</a>');
- }
- });
- jQuery('.remove_url').live('click', function () {
- var thisId = jQuery(this).attr('commentid');
- var data = {
- action: 'comment_author_deurl',
- _wpnonce: WPAkismet.comment_author_url_nonce,
- id: thisId
- };
- jQuery.ajax({
- url: ajaxurl,
- type: 'POST',
- data: data,
- beforeSend: function () {
- // Removes "x" link
- jQuery("a[commentid='"+ thisId +"']").hide();
- // Show temp status
- jQuery("#author_comment_url_"+ thisId).html('<span>Removing...</span>');
- },
- success: function (response) {
- if (response) {
- // Show status/undo link
- jQuery("#author_comment_url_"+ thisId).attr('cid', thisId).addClass('akismet_undo_link_removal').html('<span>URL removed (</span>undo<span>)</span>');
- }
- }
- });
-
- return false;
- });
- jQuery('.akismet_undo_link_removal').live('click', function () {
- var thisId = jQuery(this).attr('cid');
- var thisUrl = jQuery(this).attr('href').replace("http://www.", "").replace("http://", "");
- var data = {
- action: 'comment_author_reurl',
- _wpnonce: WPAkismet.comment_author_url_nonce,
- id: thisId,
- url: thisUrl
- };
- jQuery.ajax({
- url: ajaxurl,
- type: 'POST',
- data: data,
- beforeSend: function () {
- // Show temp status
- jQuery("#author_comment_url_"+ thisId).html('<span>Re-adding…</span>');
- },
- success: function (response) {
- if (response) {
- // Add "x" link
- jQuery("a[commentid='"+ thisId +"']").show();
- // Show link
- jQuery("#author_comment_url_"+ thisId).removeClass('akismet_undo_link_removal').html(thisUrl);
- }
- }
- });
-
- return false;
- });
- jQuery('a[id^="author_comment_url"]').mouseover(function () {
- var wpcomProtocol = ( 'https:' === location.protocol ) ? 'https://' : 'http://';
- // Need to determine size of author column
- var thisParentWidth = jQuery(this).parent().width();
- // It changes based on if there is a gravatar present
- thisParentWidth = (jQuery(this).parent().find('.grav-hijack').length) ? thisParentWidth - 42 + 'px' : thisParentWidth + 'px';
- if (jQuery(this).find('.mShot').length == 0 && !jQuery(this).hasClass('akismet_undo_link_removal')) {
- var thisId = jQuery(this).attr('id').replace('author_comment_url_', '');
- jQuery('.widefat td').css('overflow', 'visible');
- jQuery(this).css('position', 'relative');
- var thisHref = jQuery.URLEncode(jQuery(this).attr('href'));
- jQuery(this).append('<div class="mShot mshot-container" style="left: '+thisParentWidth+'"><div class="mshot-arrow"></div><img src="'+wpcomProtocol+'s0.wordpress.com/mshots/v1/'+thisHref+'?w=450" width="450" class="mshot-image_'+thisId+'" style="margin: 0;" /></div>');
- setTimeout(function () {
- jQuery('.mshot-image_'+thisId).attr('src', wpcomProtocol+'s0.wordpress.com/mshots/v1/'+thisHref+'?w=450&r=2');
- }, 6000);
- setTimeout(function () {
- jQuery('.mshot-image_'+thisId).attr('src', wpcomProtocol+'s0.wordpress.com/mshots/v1/'+thisHref+'?w=450&r=3');
- }, 12000);
- } else {
- jQuery(this).find('.mShot').css('left', thisParentWidth).show();
- }
- }).mouseout(function () {
- jQuery(this).find('.mShot').hide();
- });
-});
-// URL encode plugin
-jQuery.extend({URLEncode:function(c){var o='';var x=0;c=c.toString();var r=/(^[a-zA-Z0-9_.]*)/;
- while(x<c.length){var m=r.exec(c.substr(x));
- if(m!=null && m.length>1 && m[1]!=''){o+=m[1];x+=m[1].length;
- }else{if(c[x]==' ')o+='+';else{var d=c.charCodeAt(x);var h=d.toString(16);
- o+='%'+(h.length<2?'0':'')+h.toUpperCase();}x++;}}return o;}
-});
-// Preload mshot images after everything else has loaded
-jQuery(window).load(function() {
- var wpcomProtocol = ( 'https:' === location.protocol ) ? 'https://' : 'http://';
- jQuery('a[id^="author_comment_url"]').each(function () {
- jQuery.get(wpcomProtocol+'s0.wordpress.com/mshots/v1/'+jQuery.URLEncode(jQuery(this).attr('href'))+'?w=450');
- });
-});
diff --git a/plugins/akismet/akismet.php b/plugins/akismet/akismet.php
index b0b258df..c87df60f 100644
--- a/plugins/akismet/akismet.php
+++ b/plugins/akismet/akismet.php
@@ -4,12 +4,13 @@
*/
/*
Plugin Name: Akismet
-Plugin URI: http://akismet.com/?return=true
-Description: Used by millions, Akismet is quite possibly the best way in the world to <strong>protect your blog from comment and trackback 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="http://akismet.com/get/?return=true">Sign up for an Akismet API key</a>, and 3) Go to your Akismet configuration page, and save your API key.
-Version: 2.5.9
+Plugin URI: http://akismet.com/
+Description: Used by millions, Akismet is quite possibly the best way in the world to <strong>protect your blog from comment and trackback 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="http://akismet.com/get/">Sign up for an Akismet API key</a>, and 3) Go to your Akismet configuration page, and save your API key.
+Version: 3.1.1
Author: Automattic
Author URI: http://automattic.com/wordpress-plugins/
License: GPLv2 or later
+Text Domain: akismet
*/
/*
@@ -34,581 +35,27 @@ if ( !function_exists( 'add_action' ) ) {
exit;
}
-define('AKISMET_VERSION', '2.5.9');
-define('AKISMET_PLUGIN_URL', plugin_dir_url( __FILE__ ));
+define( 'AKISMET_VERSION', '3.1.1' );
+define( 'AKISMET__MINIMUM_WP_VERSION', '3.2' );
+define( 'AKISMET__PLUGIN_URL', plugin_dir_url( __FILE__ ) );
+define( 'AKISMET__PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
+define( 'AKISMET_DELETE_LIMIT', 100000 );
-/** If you hardcode a WP.com API key here, all key config screens will be hidden */
-if ( defined('WPCOM_API_KEY') )
- $wpcom_api_key = constant('WPCOM_API_KEY');
-else
- $wpcom_api_key = '';
-include '/var/www/blogs.gentoo.org/secrets/wp-apikey.php';
-
-if ( isset($wp_db_version) && $wp_db_version <= 9872 )
- include_once dirname( __FILE__ ) . '/legacy.php';
-
-include_once dirname( __FILE__ ) . '/widget.php';
-
-if ( is_admin() )
- require_once dirname( __FILE__ ) . '/admin.php';
-
-function akismet_init() {
- global $wpcom_api_key, $akismet_api_host, $akismet_api_port;
-
- if ( $wpcom_api_key )
- $akismet_api_host = $wpcom_api_key . '.rest.akismet.com';
- else
- $akismet_api_host = get_option('wordpress_api_key') . '.rest.akismet.com';
-
- $akismet_api_port = 80;
-}
-add_action('init', 'akismet_init');
-
-function akismet_get_key() {
- global $wpcom_api_key;
- if ( !empty($wpcom_api_key) )
- return $wpcom_api_key;
- return get_option('wordpress_api_key');
-}
-
-function akismet_check_key_status( $key, $ip = null ) {
- global $akismet_api_host, $akismet_api_port, $wpcom_api_key;
- $blog = urlencode( get_option('home') );
- if ( $wpcom_api_key )
- $key = $wpcom_api_key;
- $response = akismet_http_post("key=$key&blog=$blog", 'rest.akismet.com', '/1.1/verify-key', $akismet_api_port, $ip);
- return $response;
-}
-
-// given a response from an API call like akismet_check_key_status(), update the alert code options if an alert is present.
-function akismet_update_alert( $response ) {
- $code = $msg = null;
- if ( isset($response[0]['x-akismet-alert-code']) ) {
- $code = $response[0]['x-akismet-alert-code'];
- $msg = $response[0]['x-akismet-alert-msg'];
- }
-
- // only call update_option() if the value has changed
- if ( $code != get_option( 'akismet_alert_code' ) ) {
- update_option( 'akismet_alert_code', $code );
- update_option( 'akismet_alert_msg', $msg );
- }
-}
-
-function akismet_verify_key( $key, $ip = null ) {
- $response = akismet_check_key_status( $key, $ip );
- akismet_update_alert( $response );
- if ( !is_array($response) || !isset($response[1]) || $response[1] != 'valid' && $response[1] != 'invalid' )
- return 'failed';
- return $response[1];
-}
-
-// if we're in debug or test modes, use a reduced service level so as not to polute training or stats data
-function akismet_test_mode() {
- if ( defined('AKISMET_TEST_MODE') && AKISMET_TEST_MODE )
- return true;
- return false;
-}
-
-// return a comma-separated list of role names for the given user
-function akismet_get_user_roles( $user_id ) {
- $roles = false;
-
- if ( !class_exists('WP_User') )
- return false;
-
- if ( $user_id > 0 ) {
- $comment_user = new WP_User($user_id);
- if ( isset($comment_user->roles) )
- $roles = join(',', $comment_user->roles);
- }
-
- if ( is_multisite() && is_super_admin( $user_id ) ) {
- if ( empty( $roles ) ) {
- $roles = 'super_admin';
- } else {
- $comment_user->roles[] = 'super_admin';
- $roles = join( ',', $comment_user->roles );
- }
- }
-
- return $roles;
-}
-
-// Returns array with headers in $response[0] and body in $response[1]
-function akismet_http_post($request, $host, $path, $port = 80, $ip=null) {
- global $wp_version;
-
- $akismet_ua = "WordPress/{$wp_version} | ";
- $akismet_ua .= 'Akismet/' . constant( 'AKISMET_VERSION' );
-
- $akismet_ua = apply_filters( 'akismet_ua', $akismet_ua );
-
- $content_length = strlen( $request );
-
- $http_host = $host;
- // use a specific IP if provided
- // needed by akismet_check_server_connectivity()
- if ( $ip && long2ip( ip2long( $ip ) ) ) {
- $http_host = $ip;
- } else {
- $http_host = $host;
- }
-
- // use the WP HTTP class if it is available
- if ( function_exists( 'wp_remote_post' ) ) {
- $http_args = array(
- 'body' => $request,
- 'headers' => array(
- 'Content-Type' => 'application/x-www-form-urlencoded; ' .
- 'charset=' . get_option( 'blog_charset' ),
- 'Host' => $host,
- 'User-Agent' => $akismet_ua
- ),
- 'httpversion' => '1.0',
- 'timeout' => 15
- );
- $akismet_url = "http://{$http_host}{$path}";
- $response = wp_remote_post( $akismet_url, $http_args );
- if ( is_wp_error( $response ) )
- return '';
-
- return array( $response['headers'], $response['body'] );
- } else {
- $http_request = "POST $path HTTP/1.0\r\n";
- $http_request .= "Host: $host\r\n";
- $http_request .= 'Content-Type: application/x-www-form-urlencoded; charset=' . get_option('blog_charset') . "\r\n";
- $http_request .= "Content-Length: {$content_length}\r\n";
- $http_request .= "User-Agent: {$akismet_ua}\r\n";
- $http_request .= "\r\n";
- $http_request .= $request;
-
- $response = '';
- if( false != ( $fs = @fsockopen( $http_host, $port, $errno, $errstr, 10 ) ) ) {
- fwrite( $fs, $http_request );
-
- while ( !feof( $fs ) )
- $response .= fgets( $fs, 1160 ); // One TCP-IP packet
- fclose( $fs );
- $response = explode( "\r\n\r\n", $response, 2 );
- }
- return $response;
- }
-}
-
-// filter handler used to return a spam result to pre_comment_approved
-function akismet_result_spam( $approved ) {
- // bump the counter here instead of when the filter is added to reduce the possibility of overcounting
- if ( $incr = apply_filters('akismet_spam_count_incr', 1) )
- update_option( 'akismet_spam_count', get_option('akismet_spam_count') + $incr );
- // this is a one-shot deal
- remove_filter( 'pre_comment_approved', 'akismet_result_spam' );
- return 'spam';
-}
-
-function akismet_result_hold( $approved ) {
- // once only
- remove_filter( 'pre_comment_approved', 'akismet_result_hold' );
- return '0';
-}
-
-// how many approved comments does this author have?
-function akismet_get_user_comments_approved( $user_id, $comment_author_email, $comment_author, $comment_author_url ) {
- global $wpdb;
-
- if ( !empty($user_id) )
- return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->comments WHERE user_id = %d AND comment_approved = 1", $user_id ) );
-
- if ( !empty($comment_author_email) )
- 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 ) );
-
- return 0;
-}
-
-function akismet_microtime() {
- $mtime = explode( ' ', microtime() );
- return $mtime[1] + $mtime[0];
-}
-
-// log an event for a given comment, storing it in comment_meta
-function akismet_update_comment_history( $comment_id, $message, $event=null ) {
- global $current_user;
-
- // failsafe for old WP versions
- if ( !function_exists('add_comment_meta') )
- return false;
-
- $user = '';
- if ( is_object($current_user) && isset($current_user->user_login) )
- $user = $current_user->user_login;
-
- $event = array(
- 'time' => akismet_microtime(),
- 'message' => $message,
- 'event' => $event,
- 'user' => $user,
- );
-
- // $unique = false so as to allow multiple values per comment
- $r = add_comment_meta( $comment_id, 'akismet_history', $event, false );
-}
-
-// get the full comment history for a given comment, as an array in reverse chronological order
-function akismet_get_comment_history( $comment_id ) {
-
- // failsafe for old WP versions
- if ( !function_exists('add_comment_meta') )
- return false;
-
- $history = get_comment_meta( $comment_id, 'akismet_history', false );
- usort( $history, 'akismet_cmp_time' );
- return $history;
-}
-
-function akismet_cmp_time( $a, $b ) {
- return $a['time'] > $b['time'] ? -1 : 1;
-}
-
-// this fires on wp_insert_comment. we can't update comment_meta when akismet_auto_check_comment() runs
-// because we don't know the comment ID at that point.
-function akismet_auto_check_update_meta( $id, $comment ) {
- global $akismet_last_comment;
+register_activation_hook( __FILE__, array( 'Akismet', 'plugin_activation' ) );
+register_deactivation_hook( __FILE__, array( 'Akismet', 'plugin_deactivation' ) );
- // failsafe for old WP versions
- if ( !function_exists('add_comment_meta') )
- return false;
+require_once( AKISMET__PLUGIN_DIR . 'class.akismet.php' );
+require_once( AKISMET__PLUGIN_DIR . 'class.akismet-widget.php' );
- if ( !isset( $akismet_last_comment['comment_author_email'] ) )
- $akismet_last_comment['comment_author_email'] = '';
+add_action( 'init', array( 'Akismet', 'init' ) );
- // wp_insert_comment() might be called in other contexts, so make sure this is the same comment
- // as was checked by akismet_auto_check_comment
- if ( is_object($comment) && !empty($akismet_last_comment) && is_array($akismet_last_comment) ) {
- if ( isset($akismet_last_comment['comment_post_ID']) && intval($akismet_last_comment['comment_post_ID']) == intval($comment->comment_post_ID)
- && $akismet_last_comment['comment_author'] == $comment->comment_author
- && $akismet_last_comment['comment_author_email'] == $comment->comment_author_email ) {
- // normal result: true or false
- if ( $akismet_last_comment['akismet_result'] == 'true' ) {
- update_comment_meta( $comment->comment_ID, 'akismet_result', 'true' );
- akismet_update_comment_history( $comment->comment_ID, __('Akismet caught this comment as spam'), 'check-spam' );
- if ( $comment->comment_approved != 'spam' )
- akismet_update_comment_history( $comment->comment_ID, sprintf( __('Comment status was changed to %s'), $comment->comment_approved), 'status-changed'.$comment->comment_approved );
- } elseif ( $akismet_last_comment['akismet_result'] == 'false' ) {
- update_comment_meta( $comment->comment_ID, 'akismet_result', 'false' );
- akismet_update_comment_history( $comment->comment_ID, __('Akismet cleared this comment'), 'check-ham' );
- if ( $comment->comment_approved == 'spam' ) {
- 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) )
- akismet_update_comment_history( $comment->comment_ID, __('Comment was caught by wp_blacklist_check'), 'wp-blacklisted' );
- else
- akismet_update_comment_history( $comment->comment_ID, sprintf( __('Comment status was changed to %s'), $comment->comment_approved), 'status-changed-'.$comment->comment_approved );
- }
- // abnormal result: error
- } else {
- update_comment_meta( $comment->comment_ID, 'akismet_error', time() );
- akismet_update_comment_history( $comment->comment_ID, sprintf( __('Akismet was unable to check this comment (response: %s), will automatically retry again later.'), substr($akismet_last_comment['akismet_result'], 0, 50)), 'check-error' );
- }
-
- // record the complete original data as submitted for checking
- if ( isset($akismet_last_comment['comment_as_submitted']) )
- update_comment_meta( $comment->comment_ID, 'akismet_as_submitted', $akismet_last_comment['comment_as_submitted'] );
- }
- }
+if ( is_admin() ) {
+ require_once( AKISMET__PLUGIN_DIR . 'class.akismet-admin.php' );
+ add_action( 'init', array( 'Akismet_Admin', 'init' ) );
}
-add_action( 'wp_insert_comment', 'akismet_auto_check_update_meta', 10, 2 );
-
-
-function akismet_auto_check_comment( $commentdata ) {
- global $akismet_api_host, $akismet_api_port, $akismet_last_comment;
-
- $comment = $commentdata;
- $comment['user_ip'] = $_SERVER['REMOTE_ADDR'];
- $comment['user_agent'] = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : null;
- $comment['referrer'] = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : null;
- $comment['blog'] = get_option('home');
- $comment['blog_lang'] = get_locale();
- $comment['blog_charset'] = get_option('blog_charset');
- $comment['permalink'] = get_permalink($comment['comment_post_ID']);
-
- if ( !empty( $comment['user_ID'] ) ) {
- $comment['user_role'] = akismet_get_user_roles( $comment['user_ID'] );
- }
-
- $akismet_nonce_option = apply_filters( 'akismet_comment_nonce', get_option( 'akismet_comment_nonce' ) );
- $comment['akismet_comment_nonce'] = 'inactive';
- if ( $akismet_nonce_option == 'true' || $akismet_nonce_option == '' ) {
- $comment['akismet_comment_nonce'] = 'failed';
- if ( isset( $_POST['akismet_comment_nonce'] ) && wp_verify_nonce( $_POST['akismet_comment_nonce'], 'akismet_comment_nonce_' . $comment['comment_post_ID'] ) )
- $comment['akismet_comment_nonce'] = 'passed';
-
- // comment reply in wp-admin
- if ( isset( $_POST['_ajax_nonce-replyto-comment'] ) && check_ajax_referer( 'replyto-comment', '_ajax_nonce-replyto-comment' ) )
- $comment['akismet_comment_nonce'] = 'passed';
-
- }
-
- if ( akismet_test_mode() )
- $comment['is_test'] = 'true';
-
- foreach ($_POST as $key => $value ) {
- if ( is_string($value) )
- $comment["POST_{$key}"] = $value;
- }
-
- $ignore = array( 'HTTP_COOKIE', 'HTTP_COOKIE2', 'PHP_AUTH_PW' );
-
- foreach ( $_SERVER as $key => $value ) {
- if ( !in_array( $key, $ignore ) && is_string($value) )
- $comment["$key"] = $value;
- else
- $comment["$key"] = '';
- }
-
- $post = get_post( $comment['comment_post_ID'] );
- $comment[ 'comment_post_modified_gmt' ] = $post->post_modified_gmt;
-
- $query_string = '';
- foreach ( $comment as $key => $data )
- $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
-
- $commentdata['comment_as_submitted'] = $comment;
-
- $response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port);
- do_action( 'akismet_comment_check_response', $response );
- akismet_update_alert( $response );
- $commentdata['akismet_result'] = $response[1];
- if ( 'true' == $response[1] ) {
- // akismet_spam_count will be incremented later by akismet_result_spam()
- add_filter('pre_comment_approved', 'akismet_result_spam');
-
- do_action( 'akismet_spam_caught' );
-
- $last_updated = strtotime( $post->post_modified_gmt );
- $diff = time() - $last_updated;
- $diff = $diff / 86400;
-
- if ( $post->post_type == 'post' && $diff > 30 && get_option( 'akismet_discard_month' ) == 'true' && empty($comment['user_ID']) ) {
- // akismet_result_spam() won't be called so bump the counter here
- if ( $incr = apply_filters('akismet_spam_count_incr', 1) )
- update_option( 'akismet_spam_count', get_option('akismet_spam_count') + $incr );
- $redirect_to = isset( $_SERVER['HTTP_REFERER'] ) ? $_SERVER['HTTP_REFERER'] : get_permalink( $post );
- wp_safe_redirect( $redirect_to );
- die();
- }
- }
-
- // if the response is neither true nor false, hold the comment for moderation and schedule a recheck
- if ( 'true' != $response[1] && 'false' != $response[1] ) {
- if ( !current_user_can('moderate_comments') ) {
- add_filter('pre_comment_approved', 'akismet_result_hold');
- }
- if ( !wp_next_scheduled( 'akismet_schedule_cron_recheck' ) ) {
- wp_schedule_single_event( time() + 1200, 'akismet_schedule_cron_recheck' );
- }
- }
-
- if ( function_exists('wp_next_scheduled') && function_exists('wp_schedule_event') ) {
- // WP 2.1+: delete old comments daily
- if ( !wp_next_scheduled('akismet_scheduled_delete') )
- wp_schedule_event(time(), 'daily', 'akismet_scheduled_delete');
- } elseif ( (mt_rand(1, 10) == 3) ) {
- // WP 2.0: run this one time in ten
- akismet_delete_old();
- }
- $akismet_last_comment = $commentdata;
-
- akismet_fix_scheduled_recheck();
- return $commentdata;
-}
-
-add_action('preprocess_comment', 'akismet_auto_check_comment', 1);
-
-function akismet_delete_old() {
- global $wpdb;
- $now_gmt = current_time('mysql', 1);
- $comment_ids = $wpdb->get_col("SELECT comment_id FROM $wpdb->comments WHERE DATE_SUB('$now_gmt', INTERVAL 15 DAY) > comment_date_gmt AND comment_approved = 'spam'");
- if ( empty( $comment_ids ) )
- return;
-
- $comma_comment_ids = implode( ', ', array_map('intval', $comment_ids) );
-
- do_action( 'delete_comment', $comment_ids );
- $wpdb->query("DELETE FROM $wpdb->comments WHERE comment_id IN ( $comma_comment_ids )");
- $wpdb->query("DELETE FROM $wpdb->commentmeta WHERE comment_id IN ( $comma_comment_ids )");
- clean_comment_cache( $comment_ids );
- $n = mt_rand(1, 5000);
- if ( apply_filters('akismet_optimize_table', ($n == 11)) ) // lucky number
- $wpdb->query("OPTIMIZE TABLE $wpdb->comments");
-
-}
-
-function akismet_delete_old_metadata() {
- global $wpdb;
-
- $now_gmt = current_time( 'mysql', 1 );
- $interval = apply_filters( 'akismet_delete_commentmeta_interval', 15 );
-
- # enfore a minimum of 1 day
- $interval = absint( $interval );
- if ( $interval < 1 ) {
- return;
- }
-
- // akismet_as_submitted meta values are large, so expire them
- // after $interval days regardless of the comment status
- while ( TRUE ) {
- $comment_ids = $wpdb->get_col( "SELECT $wpdb->comments.comment_id FROM $wpdb->commentmeta INNER JOIN $wpdb->comments USING(comment_id) WHERE meta_key = 'akismet_as_submitted' AND DATE_SUB('$now_gmt', INTERVAL {$interval} DAY) > comment_date_gmt LIMIT 10000" );
-
- if ( empty( $comment_ids ) ) {
- return;
- }
-
- foreach ( $comment_ids as $comment_id ) {
- delete_comment_meta( $comment_id, 'akismet_as_submitted' );
- }
- }
-
- /*
- $n = mt_rand( 1, 5000 );
- if ( apply_filters( 'akismet_optimize_table', ( $n == 11 ), 'commentmeta' ) ) { // lucky number
- $wpdb->query( "OPTIMIZE TABLE $wpdb->commentmeta" );
- }
- */
-}
-
-add_action('akismet_scheduled_delete', 'akismet_delete_old');
-add_action('akismet_scheduled_delete', 'akismet_delete_old_metadata');
-
-function akismet_check_db_comment( $id, $recheck_reason = 'recheck_queue' ) {
- global $wpdb, $akismet_api_host, $akismet_api_port;
-
- $id = (int) $id;
- $c = $wpdb->get_row( "SELECT * FROM $wpdb->comments WHERE comment_ID = '$id'", ARRAY_A );
- if ( !$c )
- return;
-
- $c['user_ip'] = $c['comment_author_IP'];
- $c['user_agent'] = $c['comment_agent'];
- $c['referrer'] = '';
- $c['blog'] = get_option('home');
- $c['blog_lang'] = get_locale();
- $c['blog_charset'] = get_option('blog_charset');
- $c['permalink'] = get_permalink($c['comment_post_ID']);
- $id = $c['comment_ID'];
- if ( akismet_test_mode() )
- $c['is_test'] = 'true';
- $c['recheck_reason'] = $recheck_reason;
-
- $query_string = '';
- foreach ( $c as $key => $data )
- $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
-
- $response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port);
- return ( is_array( $response ) && isset( $response[1] ) ) ? $response[1] : false;
-}
-
-function akismet_cron_recheck() {
- global $wpdb;
-
- $status = akismet_verify_key( akismet_get_key() );
- if ( get_option( 'akismet_alert_code' ) || $status == 'invalid' ) {
- // since there is currently a problem with the key, reschedule a check for 6 hours hence
- wp_schedule_single_event( time() + 21600, 'akismet_schedule_cron_recheck' );
- return false;
- }
-
- delete_option('akismet_available_servers');
-
- $comment_errors = $wpdb->get_col( "
- SELECT comment_id
- FROM {$wpdb->prefix}commentmeta
- WHERE meta_key = 'akismet_error'
- LIMIT 100
- " );
-
- foreach ( (array) $comment_errors as $comment_id ) {
- // if the comment no longer exists, or is too old, remove the meta entry from the queue to avoid getting stuck
- $comment = get_comment( $comment_id );
- if ( !$comment || strtotime( $comment->comment_date_gmt ) < strtotime( "-15 days" ) ) {
- delete_comment_meta( $comment_id, 'akismet_error' );
- continue;
- }
-
- add_comment_meta( $comment_id, 'akismet_rechecking', true );
- $status = akismet_check_db_comment( $comment_id, 'retry' );
-
- $msg = '';
- if ( $status == 'true' ) {
- $msg = __( 'Akismet caught this comment as spam during an automatic retry.' );
- } elseif ( $status == 'false' ) {
- $msg = __( 'Akismet cleared this comment during an automatic retry.' );
- }
-
- // If we got back a legit response then update the comment history
- // other wise just bail now and try again later. No point in
- // re-trying all the comments once we hit one failure.
- if ( !empty( $msg ) ) {
- delete_comment_meta( $comment_id, 'akismet_error' );
- akismet_update_comment_history( $comment_id, $msg, 'cron-retry' );
- update_comment_meta( $comment_id, 'akismet_result', $status );
- // make sure the comment status is still pending. if it isn't, that means the user has already moved it elsewhere.
- $comment = get_comment( $comment_id );
- if ( $comment && 'unapproved' == wp_get_comment_status( $comment_id ) ) {
- if ( $status == 'true' ) {
- wp_spam_comment( $comment_id );
- } elseif ( $status == 'false' ) {
- // comment is good, but it's still in the pending queue. depending on the moderation settings
- // we may need to change it to approved.
- 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) )
- wp_set_comment_status( $comment_id, 1 );
- }
- }
- } else {
- delete_comment_meta( $comment_id, 'akismet_rechecking' );
- wp_schedule_single_event( time() + 1200, 'akismet_schedule_cron_recheck' );
- return;
- }
- delete_comment_meta( $comment_id, 'akismet_rechecking' );
- }
-
- $remaining = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->commentmeta WHERE meta_key = 'akismet_error'" );
- if ( $remaining && !wp_next_scheduled('akismet_schedule_cron_recheck') ) {
- wp_schedule_single_event( time() + 1200, 'akismet_schedule_cron_recheck' );
- }
-}
-add_action( 'akismet_schedule_cron_recheck', 'akismet_cron_recheck' );
-
-function akismet_add_comment_nonce( $post_id ) {
- echo '<p style="display: none;">';
- wp_nonce_field( 'akismet_comment_nonce_' . $post_id, 'akismet_comment_nonce', FALSE );
- echo '</p>';
-}
-
-$akismet_comment_nonce_option = apply_filters( 'akismet_comment_nonce', get_option( 'akismet_comment_nonce' ) );
-
-if ( $akismet_comment_nonce_option == 'true' || $akismet_comment_nonce_option == '' )
- add_action( 'comment_form', 'akismet_add_comment_nonce' );
-
-global $wp_version;
-if ( '3.0.5' == $wp_version ) {
- remove_filter( 'comment_text', 'wp_kses_data' );
- if ( is_admin() )
- add_filter( 'comment_text', 'wp_kses_post' );
-}
-
-function akismet_fix_scheduled_recheck() {
- $future_check = wp_next_scheduled( 'akismet_schedule_cron_recheck' );
- if ( !$future_check ) {
- return;
- }
+include '/var/www/blogs.gentoo.org/secrets/wp-apikey.php';
- if ( get_option( 'akismet_alert_code' ) > 0 ) {
- return;
- }
+//add wrapper class around deprecated akismet functions that are referenced elsewhere
+require_once( AKISMET__PLUGIN_DIR . 'wrapper.php' );
- $check_range = time() + 1200;
- if ( $future_check > $check_range ) {
- wp_clear_scheduled_hook( 'akismet_schedule_cron_recheck' );
- wp_schedule_single_event( time() + 300, 'akismet_schedule_cron_recheck' );
- }
-}
diff --git a/plugins/akismet/class.akismet-admin.php b/plugins/akismet/class.akismet-admin.php
new file mode 100644
index 00000000..840b3674
--- /dev/null
+++ b/plugins/akismet/class.akismet-admin.php
@@ -0,0 +1,885 @@
+<?php
+
+class Akismet_Admin {
+ const NONCE = 'akismet-update-key';
+
+ private static $initiated = false;
+ private static $notices = array();
+
+ public static function init() {
+ if ( ! self::$initiated ) {
+ self::init_hooks();
+ }
+
+ if ( isset( $_POST['action'] ) && $_POST['action'] == 'enter-key' ) {
+ self::enter_api_key();
+ }
+ }
+
+ public static function init_hooks() {
+ // The standalone stats page was removed in 3.0 for an all-in-one config and stats page.
+ // Redirect any links that might have been bookmarked or in browser history.
+ if ( isset( $_GET['page'] ) && 'akismet-stats-display' == $_GET['page'] ) {
+ wp_safe_redirect( esc_url_raw( self::get_page_url( 'stats' ) ), 301 );
+ die;
+ }
+
+ self::$initiated = true;
+
+ add_action( 'admin_init', array( 'Akismet_Admin', 'admin_init' ) );
+ add_action( 'admin_menu', array( 'Akismet_Admin', 'admin_menu' ), 5 ); # Priority 5, so it's called before Jetpack's admin_menu.
+ add_action( 'admin_notices', array( 'Akismet_Admin', 'display_notice' ) );
+ add_action( 'admin_enqueue_scripts', array( 'Akismet_Admin', 'load_resources' ) );
+ add_action( 'activity_box_end', array( 'Akismet_Admin', 'dashboard_stats' ) );
+ add_action( 'rightnow_end', array( 'Akismet_Admin', 'rightnow_stats' ) );
+ add_action( 'manage_comments_nav', array( 'Akismet_Admin', 'check_for_spam_button' ) );
+ add_action( 'admin_action_akismet_recheck_queue', array( 'Akismet_Admin', 'recheck_queue' ) );
+ add_action( 'wp_ajax_akismet_recheck_queue', array( 'Akismet_Admin', 'recheck_queue' ) );
+ add_action( 'wp_ajax_comment_author_deurl', array( 'Akismet_Admin', 'remove_comment_author_url' ) );
+ add_action( 'wp_ajax_comment_author_reurl', array( 'Akismet_Admin', 'add_comment_author_url' ) );
+ add_action( 'jetpack_auto_activate_akismet', array( 'Akismet_Admin', 'connect_jetpack_user' ) );
+
+ add_filter( 'plugin_action_links', array( 'Akismet_Admin', 'plugin_action_links' ), 10, 2 );
+ add_filter( 'comment_row_actions', array( 'Akismet_Admin', 'comment_row_action' ), 10, 2 );
+ add_filter( 'comment_text', array( 'Akismet_Admin', 'text_add_link_class' ) );
+
+ add_filter( 'plugin_action_links_'.plugin_basename( plugin_dir_path( __FILE__ ) . 'akismet.php'), array( 'Akismet_Admin', 'admin_plugin_settings_link' ) );
+
+ add_filter( 'wxr_export_skip_commentmeta', array( 'Akismet_Admin', 'exclude_commentmeta_from_export' ), 10, 3 );
+ }
+
+ public static function admin_init() {
+ load_plugin_textdomain( 'akismet' );
+ add_meta_box( 'akismet-status', __('Comment History', 'akismet'), array( 'Akismet_Admin', 'comment_status_meta_box' ), 'comment', 'normal' );
+ }
+
+ public static function admin_menu() {
+ if ( class_exists( 'Jetpack' ) )
+ add_action( 'jetpack_admin_menu', array( 'Akismet_Admin', 'load_menu' ) );
+ else
+ self::load_menu();
+ }
+
+ public static function admin_head() {
+ if ( !current_user_can( 'manage_options' ) )
+ return;
+ }
+
+ public static function admin_plugin_settings_link( $links ) {
+ $settings_link = '<a href="'.esc_url( self::get_page_url() ).'">'.__('Settings', 'akismet').'</a>';
+ array_unshift( $links, $settings_link );
+ return $links;
+ }
+
+ public static function load_menu() {
+ if ( class_exists( 'Jetpack' ) )
+ $hook = add_submenu_page( 'jetpack', __( 'Akismet' , 'akismet'), __( 'Akismet' , 'akismet'), 'manage_options', 'akismet-key-config', array( 'Akismet_Admin', 'display_page' ) );
+ else
+ $hook = add_options_page( __('Akismet', 'akismet'), __('Akismet', 'akismet'), 'manage_options', 'akismet-key-config', array( 'Akismet_Admin', 'display_page' ) );
+
+ if ( version_compare( $GLOBALS['wp_version'], '3.3', '>=' ) ) {
+ add_action( "load-$hook", array( 'Akismet_Admin', 'admin_help' ) );
+ }
+ }
+
+ public static function load_resources() {
+ global $hook_suffix;
+
+ if ( in_array( $hook_suffix, array(
+ 'index.php', # dashboard
+ 'edit-comments.php',
+ 'comment.php',
+ 'post.php',
+ 'settings_page_akismet-key-config',
+ 'jetpack_page_akismet-key-config',
+ ) ) ) {
+ wp_register_style( 'akismet.css', AKISMET__PLUGIN_URL . '_inc/akismet.css', array(), AKISMET_VERSION );
+ wp_enqueue_style( 'akismet.css');
+
+ wp_register_script( 'akismet.js', AKISMET__PLUGIN_URL . '_inc/akismet.js', array('jquery','postbox'), AKISMET_VERSION );
+ wp_enqueue_script( 'akismet.js' );
+ wp_localize_script( 'akismet.js', 'WPAkismet', array(
+ 'comment_author_url_nonce' => wp_create_nonce( 'comment_author_url_nonce' ),
+ 'strings' => array(
+ 'Remove this URL' => __( 'Remove this URL' , 'akismet'),
+ 'Removing...' => __( 'Removing...' , 'akismet'),
+ 'URL removed' => __( 'URL removed' , 'akismet'),
+ '(undo)' => __( '(undo)' , 'akismet'),
+ 'Re-adding...' => __( 'Re-adding...' , 'akismet'),
+ )
+ ) );
+ }
+ }
+
+ /**
+ * Add help to the Akismet page
+ *
+ * @return false if not the Akismet page
+ */
+ public static function admin_help() {
+ $current_screen = get_current_screen();
+
+ // Screen Content
+ if ( current_user_can( 'manage_options' ) ) {
+ if ( !Akismet::get_api_key() || ( isset( $_GET['view'] ) && $_GET['view'] == 'start' ) ) {
+ //setup page
+ $current_screen->add_help_tab(
+ array(
+ 'id' => 'overview',
+ 'title' => __( 'Overview' , 'akismet'),
+ 'content' =>
+ '<p><strong>' . esc_html__( 'Akismet Setup' , 'akismet') . '</strong></p>' .
+ '<p>' . esc_html__( 'Akismet filters out your comment and trackback spam for you, so you can focus on more important things.' , 'akismet') . '</p>' .
+ '<p>' . esc_html__( 'On this page, you are able to setup the Akismet plugin.' , 'akismet') . '</p>',
+ )
+ );
+
+ $current_screen->add_help_tab(
+ array(
+ 'id' => 'setup-signup',
+ 'title' => __( 'New to Akismet' , 'akismet'),
+ 'content' =>
+ '<p><strong>' . esc_html__( 'Akismet Setup' , 'akismet') . '</strong></p>' .
+ '<p>' . esc_html__( 'You need to enter an API key to activate the Akismet service on your site.' , 'akismet') . '</p>' .
+ '<p>' . sprintf( __( 'Signup for an account on %s to get an API Key.' , 'akismet'), '<a href="https://akismet.com/plugin-signup/" target="_blank">Akismet.com</a>' ) . '</p>',
+ )
+ );
+
+ $current_screen->add_help_tab(
+ array(
+ 'id' => 'setup-manual',
+ 'title' => __( 'Enter an API Key' , 'akismet'),
+ 'content' =>
+ '<p><strong>' . esc_html__( 'Akismet Setup' , 'akismet') . '</strong></p>' .
+ '<p>' . esc_html__( 'If you already have an API key' , 'akismet') . '</p>' .
+ '<ol>' .
+ '<li>' . esc_html__( 'Copy and paste the API key into the text field.' , 'akismet') . '</li>' .
+ '<li>' . esc_html__( 'Click the Use this Key button.' , 'akismet') . '</li>' .
+ '</ol>',
+ )
+ );
+ }
+ elseif ( isset( $_GET['view'] ) && $_GET['view'] == 'stats' ) {
+ //stats page
+ $current_screen->add_help_tab(
+ array(
+ 'id' => 'overview',
+ 'title' => __( 'Overview' , 'akismet'),
+ 'content' =>
+ '<p><strong>' . esc_html__( 'Akismet Stats' , 'akismet') . '</strong></p>' .
+ '<p>' . esc_html__( 'Akismet filters out your comment and trackback spam for you, so you can focus on more important things.' , 'akismet') . '</p>' .
+ '<p>' . esc_html__( 'On this page, you are able to view stats on spam filtered on your site.' , 'akismet') . '</p>',
+ )
+ );
+ }
+ else {
+ //configuration page
+ $current_screen->add_help_tab(
+ array(
+ 'id' => 'overview',
+ 'title' => __( 'Overview' , 'akismet'),
+ 'content' =>
+ '<p><strong>' . esc_html__( 'Akismet Configuration' , 'akismet') . '</strong></p>' .
+ '<p>' . esc_html__( 'Akismet filters out your comment and trackback spam for you, so you can focus on more important things.' , 'akismet') . '</p>' .
+ '<p>' . esc_html__( 'On this page, you are able to enter/remove an API key, view account information and view spam stats.' , 'akismet') . '</p>',
+ )
+ );
+
+ $current_screen->add_help_tab(
+ array(
+ 'id' => 'settings',
+ 'title' => __( 'Settings' , 'akismet'),
+ 'content' =>
+ '<p><strong>' . esc_html__( 'Akismet Configuration' , 'akismet') . '</strong></p>' .
+ '<p><strong>' . esc_html__( 'API Key' , 'akismet') . '</strong> - ' . esc_html__( 'Enter/remove an API key.' , 'akismet') . '</p>' .
+ '<p><strong>' . esc_html__( 'Comments' , 'akismet') . '</strong> - ' . esc_html__( 'Show the number of approved comments beside each comment author in the comments list page.' , 'akismet') . '</p>' .
+ '<p><strong>' . esc_html__( 'Strictness' , 'akismet') . '</strong> - ' . esc_html__( 'Choose to either discard the worst spam automatically or to always put all spam in spam folder.' , 'akismet') . '</p>',
+ )
+ );
+
+ $current_screen->add_help_tab(
+ array(
+ 'id' => 'account',
+ 'title' => __( 'Account' , 'akismet'),
+ 'content' =>
+ '<p><strong>' . esc_html__( 'Akismet Configuration' , 'akismet') . '</strong></p>' .
+ '<p><strong>' . esc_html__( 'Subscription Type' , 'akismet') . '</strong> - ' . esc_html__( 'The Akismet subscription plan' , 'akismet') . '</p>' .
+ '<p><strong>' . esc_html__( 'Status' , 'akismet') . '</strong> - ' . esc_html__( 'The subscription status - active, cancelled or suspended' , 'akismet') . '</p>',
+ )
+ );
+ }
+ }
+
+ // Help Sidebar
+ $current_screen->set_help_sidebar(
+ '<p><strong>' . esc_html__( 'For more information:' , 'akismet') . '</strong></p>' .
+ '<p><a href="https://akismet.com/faq/" target="_blank">' . esc_html__( 'Akismet FAQ' , 'akismet') . '</a></p>' .
+ '<p><a href="https://akismet.com/support/" target="_blank">' . esc_html__( 'Akismet Support' , 'akismet') . '</a></p>'
+ );
+ }
+
+ public static function enter_api_key() {
+ if ( function_exists('current_user_can') && !current_user_can('manage_options') )
+ die(__('Cheatin&#8217; uh?', 'akismet'));
+
+ if ( !wp_verify_nonce( $_POST['_wpnonce'], self::NONCE ) )
+ return false;
+
+ foreach( array( 'akismet_strictness', 'akismet_show_user_comments_approved' ) as $option ) {
+ update_option( $option, isset( $_POST[$option] ) && (int) $_POST[$option] == 1 ? '1' : '0' );
+ }
+
+ if ( defined( 'WPCOM_API_KEY' ) )
+ return false; //shouldn't have option to save key if already defined
+
+ $new_key = preg_replace( '/[^a-h0-9]/i', '', $_POST['key'] );
+ $old_key = Akismet::get_api_key();
+
+ if ( empty( $new_key ) ) {
+ if ( !empty( $old_key ) ) {
+ delete_option( 'wordpress_api_key' );
+ self::$notices[] = 'new-key-empty';
+ }
+ }
+ elseif ( $new_key != $old_key ) {
+ self::save_key( $new_key );
+ }
+
+ return true;
+ }
+
+ public static function save_key( $api_key ) {
+ $key_status = Akismet::verify_key( $api_key );
+
+ if ( $key_status == 'valid' ) {
+ $akismet_user = self::get_akismet_user( $api_key );
+
+ if ( $akismet_user ) {
+ if ( in_array( $akismet_user->status, array( 'active', 'active-dunning', 'no-sub' ) ) )
+ update_option( 'wordpress_api_key', $api_key );
+
+ if ( $akismet_user->status == 'active' )
+ self::$notices['status'] = 'new-key-valid';
+ else
+ self::$notices['status'] = $akismet_user->status;
+ }
+ else
+ self::$notices['status'] = 'new-key-invalid';
+ }
+ elseif ( in_array( $key_status, array( 'invalid', 'failed' ) ) )
+ self::$notices['status'] = 'new-key-'.$key_status;
+ }
+
+ public static function dashboard_stats() {
+ if ( !function_exists('did_action') || did_action( 'rightnow_end' ) )
+ return; // We already displayed this info in the "Right Now" section
+
+ if ( !$count = get_option('akismet_spam_count') )
+ return;
+
+ global $submenu;
+
+ echo '<h3>' . esc_html( _x( 'Spam', 'comments' , 'akismet') ) . '</h3>';
+
+ echo '<p>'.sprintf( _n(
+ '<a href="%1$s">Akismet</a> has protected your site from <a href="%2$s">%3$s spam comment</a>.',
+ '<a href="%1$s">Akismet</a> has protected your site from <a href="%2$s">%3$s spam comments</a>.',
+ $count
+ , 'akismet'), 'https://akismet.com/wordpress/', esc_url( add_query_arg( array( 'page' => 'akismet-admin' ), admin_url( isset( $submenu['edit-comments.php'] ) ? 'edit-comments.php' : 'edit.php' ) ) ), number_format_i18n($count) ).'</p>';
+ }
+
+ // WP 2.5+
+ public static function rightnow_stats() {
+ global $submenu, $wp_db_version;
+
+ if ( 8645 < $wp_db_version ) // 2.7
+ $link = add_query_arg( array( 'comment_status' => 'spam' ), admin_url( 'edit-comments.php' ) );
+ elseif ( isset( $submenu['edit-comments.php'] ) )
+ $link = add_query_arg( array( 'page' => 'akismet-admin' ), admin_url( 'edit-comments.php' ) );
+ else
+ $link = add_query_arg( array( 'page' => 'akismet-admin' ), admin_url( 'edit.php' ) );
+
+ if ( $count = get_option('akismet_spam_count') ) {
+ $intro = sprintf( _n(
+ '<a href="%1$s">Akismet</a> has protected your site from %2$s spam comment already. ',
+ '<a href="%1$s">Akismet</a> has protected your site from %2$s spam comments already. ',
+ $count
+ , 'akismet'), 'https://akismet.com/wordpress/', number_format_i18n( $count ) );
+ } else {
+ $intro = sprintf( __('<a href="%s">Akismet</a> blocks spam from getting to your blog. ', 'akismet'), 'https://akismet.com/wordpress/' );
+ }
+
+ $link = function_exists( 'esc_url' ) ? esc_url( $link ) : clean_url( $link );
+ if ( $queue_count = self::get_spam_count() ) {
+ $queue_text = sprintf( _n(
+ 'There&#8217;s <a href="%2$s">%1$s comment</a> in your spam queue right now.',
+ 'There are <a href="%2$s">%1$s comments</a> in your spam queue right now.',
+ $queue_count
+ , 'akismet'), number_format_i18n( $queue_count ), $link );
+ } else {
+ $queue_text = sprintf( __( "There&#8217;s nothing in your <a href='%s'>spam queue</a> at the moment." , 'akismet'), $link );
+ }
+
+ $text = $intro . '<br />' . $queue_text;
+ echo "<p class='akismet-right-now'>$text</p>\n";
+ }
+
+ public static function check_for_spam_button( $comment_status ) {
+ // The "Check for Spam" button should only appear when the page might be showing
+ // a comment with comment_approved=0, which means an un-trashed, un-spammed,
+ // not-yet-moderated comment.
+ if ( 'all' != $comment_status && 'moderated' != $comment_status ) {
+ return;
+ }
+
+ if ( function_exists('plugins_url') )
+ $link = add_query_arg( array( 'action' => 'akismet_recheck_queue' ), admin_url( 'admin.php' ) );
+ else
+ $link = add_query_arg( array( 'page' => 'akismet-admin', 'recheckqueue' => 'true', 'noheader' => 'true' ), admin_url( 'edit-comments.php' ) );
+
+ echo '</div><div class="alignleft"><a class="button-secondary checkforspam" href="' . esc_url( $link ) . '">' . esc_html__('Check for Spam', 'akismet') . '</a><span class="checkforspam-spinner"></span>';
+ }
+
+ public static function recheck_queue() {
+ global $wpdb;
+
+ Akismet::fix_scheduled_recheck();
+
+ if ( ! ( isset( $_GET['recheckqueue'] ) || ( isset( $_REQUEST['action'] ) && 'akismet_recheck_queue' == $_REQUEST['action'] ) ) )
+ return;
+
+ $paginate = '';
+ if ( isset( $_POST['limit'] ) && isset( $_POST['offset'] ) ) {
+ $paginate = $wpdb->prepare( " LIMIT %d OFFSET %d", array( $_POST['limit'], $_POST['offset'] ) );
+ }
+ $moderation = $wpdb->get_results( "SELECT * FROM {$wpdb->comments} WHERE comment_approved = '0'{$paginate}", ARRAY_A );
+
+ foreach ( (array) $moderation as $c ) {
+ $c['user_ip'] = $c['comment_author_IP'];
+ $c['user_agent'] = $c['comment_agent'];
+ $c['referrer'] = '';
+ $c['blog'] = get_bloginfo('url');
+ $c['blog_lang'] = get_locale();
+ $c['blog_charset'] = get_option('blog_charset');
+ $c['permalink'] = get_permalink($c['comment_post_ID']);
+
+ $c['user_role'] = '';
+ if ( isset( $c['user_ID'] ) )
+ $c['user_role'] = Akismet::get_user_roles($c['user_ID']);
+
+ if ( Akismet::is_test_mode() )
+ $c['is_test'] = 'true';
+
+ add_comment_meta( $c['comment_ID'], 'akismet_rechecking', true );
+
+ $response = Akismet::http_post( Akismet::build_query( $c ), 'comment-check' );
+
+ if ( 'true' == $response[1] ) {
+ wp_set_comment_status( $c['comment_ID'], 'spam' );
+ update_comment_meta( $c['comment_ID'], 'akismet_result', 'true' );
+ delete_comment_meta( $c['comment_ID'], 'akismet_error' );
+ delete_comment_meta( $c['comment_ID'], 'akismet_delayed_moderation_email' );
+ Akismet::update_comment_history( $c['comment_ID'], __('Akismet re-checked and caught this comment as spam', 'akismet'), 'check-spam' );
+
+ } elseif ( 'false' == $response[1] ) {
+ update_comment_meta( $c['comment_ID'], 'akismet_result', 'false' );
+ delete_comment_meta( $c['comment_ID'], 'akismet_error' );
+ delete_comment_meta( $c['comment_ID'], 'akismet_delayed_moderation_email' );
+ Akismet::update_comment_history( $c['comment_ID'], __('Akismet re-checked and cleared this comment', 'akismet'), 'check-ham' );
+ // abnormal result: error
+ } else {
+ update_comment_meta( $c['comment_ID'], 'akismet_result', 'error' );
+ Akismet::update_comment_history( $c['comment_ID'], sprintf( __('Akismet was unable to re-check this comment (response: %s)', 'akismet'), substr($response[1], 0, 50)), 'check-error' );
+ }
+
+ delete_comment_meta( $c['comment_ID'], 'akismet_rechecking' );
+ }
+ if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+ wp_send_json( array(
+ 'processed' => count((array) $moderation),
+ ));
+ }
+ else {
+ $redirect_to = isset( $_SERVER['HTTP_REFERER'] ) ? $_SERVER['HTTP_REFERER'] : admin_url( 'edit-comments.php' );
+ wp_safe_redirect( $redirect_to );
+ exit;
+ }
+ }
+
+ // Adds an 'x' link next to author URLs, clicking will remove the author URL and show an undo link
+ public static function remove_comment_author_url() {
+ if ( !empty( $_POST['id'] ) && check_admin_referer( 'comment_author_url_nonce' ) ) {
+ $comment = get_comment( intval( $_POST['id'] ), ARRAY_A );
+ if ( $comment && current_user_can( 'edit_comment', $comment['comment_ID'] ) ) {
+ $comment['comment_author_url'] = '';
+ do_action( 'comment_remove_author_url' );
+ print( wp_update_comment( $comment ) );
+ die();
+ }
+ }
+ }
+
+ public static function add_comment_author_url() {
+ if ( !empty( $_POST['id'] ) && !empty( $_POST['url'] ) && check_admin_referer( 'comment_author_url_nonce' ) ) {
+ $comment = get_comment( intval( $_POST['id'] ), ARRAY_A );
+ if ( $comment && current_user_can( 'edit_comment', $comment['comment_ID'] ) ) {
+ $comment['comment_author_url'] = esc_url( $_POST['url'] );
+ do_action( 'comment_add_author_url' );
+ print( wp_update_comment( $comment ) );
+ die();
+ }
+ }
+ }
+
+ public static function comment_row_action( $a, $comment ) {
+
+ // failsafe for old WP versions
+ if ( !function_exists('add_comment_meta') )
+ return $a;
+
+ $akismet_result = get_comment_meta( $comment->comment_ID, 'akismet_result', true );
+ $akismet_error = get_comment_meta( $comment->comment_ID, 'akismet_error', true );
+ $user_result = get_comment_meta( $comment->comment_ID, 'akismet_user_result', true);
+ $comment_status = wp_get_comment_status( $comment->comment_ID );
+ $desc = null;
+ if ( $akismet_error ) {
+ $desc = __( 'Awaiting spam check' , 'akismet');
+ } elseif ( !$user_result || $user_result == $akismet_result ) {
+ // Show the original Akismet result if the user hasn't overridden it, or if their decision was the same
+ if ( $akismet_result == 'true' && $comment_status != 'spam' && $comment_status != 'trash' )
+ $desc = __( 'Flagged as spam by Akismet' , 'akismet');
+ elseif ( $akismet_result == 'false' && $comment_status == 'spam' )
+ $desc = __( 'Cleared by Akismet' , 'akismet');
+ } else {
+ $who = get_comment_meta( $comment->comment_ID, 'akismet_user', true );
+ if ( $user_result == 'true' )
+ $desc = sprintf( __('Flagged as spam by %s', 'akismet'), $who );
+ else
+ $desc = sprintf( __('Un-spammed by %s', 'akismet'), $who );
+ }
+
+ // add a History item to the hover links, just after Edit
+ if ( $akismet_result ) {
+ $b = array();
+ foreach ( $a as $k => $item ) {
+ $b[ $k ] = $item;
+ if (
+ $k == 'edit'
+ || ( $k == 'unspam' && $GLOBALS['wp_version'] >= 3.4 )
+ ) {
+ $b['history'] = '<a href="comment.php?action=editcomment&amp;c='.$comment->comment_ID.'#akismet-status" title="'. esc_attr__( 'View comment history' , 'akismet') . '"> '. esc_html__('History', 'akismet') . '</a>';
+ }
+ }
+
+ $a = $b;
+ }
+
+ if ( $desc )
+ 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' , 'akismet') . '">'.esc_html( $desc ).'</a></span>';
+
+ $show_user_comments = apply_filters( 'akismet_show_user_comments_approved', get_option('akismet_show_user_comments_approved') );
+ $show_user_comments = $show_user_comments === 'false' ? false : $show_user_comments; //option used to be saved as 'false' / 'true'
+
+ if ( $show_user_comments ) {
+ $comment_count = Akismet::get_user_comments_approved( $comment->user_id, $comment->comment_author_email, $comment->comment_author, $comment->comment_author_url );
+ $comment_count = intval( $comment_count );
+ echo '<span class="akismet-user-comment-count" commentid="'.$comment->comment_ID.'" style="display:none;"><br><span class="akismet-user-comment-counts">'. sprintf( esc_html( _n( '%s approved', '%s approved', $comment_count , 'akismet') ), number_format_i18n( $comment_count ) ) . '</span></span>';
+ }
+
+ return $a;
+ }
+
+ public static function comment_status_meta_box( $comment ) {
+ $history = Akismet::get_comment_history( $comment->comment_ID );
+
+ if ( $history ) {
+ echo '<div class="akismet-history" style="margin: 13px;">';
+ foreach ( $history as $row ) {
+ $time = date( 'D d M Y @ h:i:m a', $row['time'] ) . ' GMT';
+ echo '<div style="margin-bottom: 13px;"><span style="color: #999;" alt="' . $time . '" title="' . $time . '">' . sprintf( esc_html__('%s ago', 'akismet'), human_time_diff( $row['time'] ) ) . '</span> - ';
+ echo esc_html( $row['message'] ) . '</div>';
+ }
+ echo '</div>';
+ }
+ }
+
+ public static function plugin_action_links( $links, $file ) {
+ if ( $file == plugin_basename( AKISMET__PLUGIN_URL . '/akismet.php' ) ) {
+ $links[] = '<a href="' . esc_url( self::get_page_url() ) . '">'.esc_html__( 'Settings' , 'akismet').'</a>';
+ }
+
+ return $links;
+ }
+
+ public static function text_add_link_callback( $m ) {
+ // bare link?
+ if ( $m[4] == $m[2] )
+ return '<a '.$m[1].' href="'.$m[2].'" '.$m[3].' class="comment-link">'.$m[4].'</a>';
+ else
+ return '<span title="'.$m[2].'" class="comment-link"><a '.$m[1].' href="'.$m[2].'" '.$m[3].' class="comment-link">'.$m[4].'</a></span>';
+ }
+
+ public static function text_add_link_class( $comment_text ) {
+ return preg_replace_callback( '#<a ([^>]*)href="([^"]+)"([^>]*)>(.*?)</a>#i', array( 'Akismet_Admin', 'text_add_link_callback' ), $comment_text );
+ }
+
+ // Total spam in queue
+ // get_option( 'akismet_spam_count' ) is the total caught ever
+ public static function get_spam_count( $type = false ) {
+ global $wpdb;
+
+ if ( !$type ) { // total
+ $count = wp_cache_get( 'akismet_spam_count', 'widget' );
+ if ( false === $count ) {
+ if ( function_exists('wp_count_comments') ) {
+ $count = wp_count_comments();
+ $count = $count->spam;
+ } else {
+ $count = (int) $wpdb->get_var("SELECT COUNT(comment_ID) FROM {$wpdb->comments} WHERE comment_approved = 'spam'");
+ }
+ wp_cache_set( 'akismet_spam_count', $count, 'widget', 3600 );
+ }
+ return $count;
+ } elseif ( 'comments' == $type || 'comment' == $type ) { // comments
+ $type = '';
+ }
+
+ return (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(comment_ID) FROM {$wpdb->comments} WHERE comment_approved = 'spam' AND comment_type = %s", $type ) );
+ }
+
+ // Check connectivity between the WordPress blog and Akismet's servers.
+ // 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).
+ public static function check_server_ip_connectivity() {
+
+ $servers = $ips = array();
+
+ // Some web hosts may disable this function
+ if ( function_exists('gethostbynamel') ) {
+
+ $ips = gethostbynamel( 'rest.akismet.com' );
+ if ( $ips && is_array($ips) && count($ips) ) {
+ $api_key = Akismet::get_api_key();
+
+ foreach ( $ips as $ip ) {
+ $response = Akismet::verify_key( $api_key, $ip );
+ // even if the key is invalid, at least we know we have connectivity
+ if ( $response == 'valid' || $response == 'invalid' )
+ $servers[$ip] = 'connected';
+ else
+ $servers[$ip] = $response ? $response : 'unable to connect';
+ }
+ }
+ }
+
+ return $servers;
+ }
+
+ // Simpler connectivity check
+ public static function check_server_connectivity($cache_timeout = 86400) {
+
+ $debug = array();
+ $debug[ 'PHP_VERSION' ] = PHP_VERSION;
+ $debug[ 'WORDPRESS_VERSION' ] = $GLOBALS['wp_version'];
+ $debug[ 'AKISMET_VERSION' ] = AKISMET_VERSION;
+ $debug[ 'AKISMET__PLUGIN_DIR' ] = AKISMET__PLUGIN_DIR;
+ $debug[ 'SITE_URL' ] = site_url();
+ $debug[ 'HOME_URL' ] = home_url();
+
+ $servers = get_option('akismet_available_servers');
+ if ( (time() - get_option('akismet_connectivity_time') < $cache_timeout) && $servers !== false ) {
+ $servers = self::check_server_ip_connectivity();
+ update_option('akismet_available_servers', $servers);
+ update_option('akismet_connectivity_time', time());
+ }
+
+ $response = wp_remote_get( 'http://rest.akismet.com/1.1/test' );
+
+ $debug[ 'gethostbynamel' ] = function_exists('gethostbynamel') ? 'exists' : 'not here';
+ $debug[ 'Servers' ] = $servers;
+ $debug[ 'Test Connection' ] = $response;
+
+ Akismet::log( $debug );
+
+ if ( $response && 'connected' == wp_remote_retrieve_body( $response ) )
+ return true;
+
+ return false;
+ }
+
+ // Check the server connectivity and store the available servers in an option.
+ public static function get_server_connectivity($cache_timeout = 86400) {
+ return self::check_server_connectivity( $cache_timeout );
+ }
+
+ public static function get_number_spam_waiting() {
+ global $wpdb;
+ return (int) $wpdb->get_var( "SELECT COUNT(*) FROM {$wpdb->commentmeta} WHERE meta_key = 'akismet_error'" );
+ }
+
+ public static function get_page_url( $page = 'config' ) {
+
+ $args = array( 'page' => 'akismet-key-config' );
+
+ if ( $page == 'stats' )
+ $args = array( 'page' => 'akismet-key-config', 'view' => 'stats' );
+ elseif ( $page == 'delete_key' )
+ $args = array( 'page' => 'akismet-key-config', 'view' => 'start', 'action' => 'delete-key', '_wpnonce' => wp_create_nonce( self::NONCE ) );
+
+ $url = add_query_arg( $args, class_exists( 'Jetpack' ) ? admin_url( 'admin.php' ) : admin_url( 'options-general.php' ) );
+
+ return $url;
+ }
+
+ public static function get_akismet_user( $api_key ) {
+ $akismet_user = Akismet::http_post( Akismet::build_query( array( 'key' => $api_key ) ), 'get-subscription' );
+
+ if ( ! empty( $akismet_user[1] ) )
+ $akismet_user = json_decode( $akismet_user[1] );
+ else
+ $akismet_user = false;
+
+ return $akismet_user;
+ }
+
+ public static function get_stats( $api_key ) {
+ $stat_totals = array();
+
+ foreach( array( '6-months', 'all' ) as $interval ) {
+ $response = Akismet::http_post( Akismet::build_query( array( 'blog' => urlencode( get_bloginfo('url') ), 'key' => $api_key, 'from' => $interval ) ), 'get-stats' );
+
+ if ( ! empty( $response[1] ) ) {
+ $stat_totals[$interval] = json_decode( $response[1] );
+ }
+ }
+ return $stat_totals;
+ }
+
+ public static function verify_wpcom_key( $api_key, $user_id, $extra = array() ) {
+ $akismet_account = Akismet::http_post( Akismet::build_query( array_merge( array(
+ 'user_id' => $user_id,
+ 'api_key' => $api_key,
+ 'get_account_type' => 'true'
+ ), $extra ) ), 'verify-wpcom-key' );
+
+ if ( ! empty( $akismet_account[1] ) )
+ $akismet_account = json_decode( $akismet_account[1] );
+
+ Akismet::log( compact( 'akismet_account' ) );
+
+ return $akismet_account;
+ }
+
+ public static function connect_jetpack_user() {
+
+ if ( $jetpack_user = self::get_jetpack_user() ) {
+ if ( isset( $jetpack_user['user_id'] ) && isset( $jetpack_user['api_key'] ) ) {
+ $akismet_user = self::verify_wpcom_key( $jetpack_user['api_key'], $jetpack_user['user_id'], array( 'action' => 'connect_jetpack_user' ) );
+
+ if ( is_object( $akismet_user ) ) {
+ self::save_key( $akismet_user->api_key );
+ return in_array( $akismet_user->status, array( 'active', 'active-dunning', 'no-sub' ) );
+ }
+ }
+ }
+
+ return false;
+ }
+
+ public static function display_alert() {
+ Akismet::view( 'notice', array(
+ 'type' => 'alert',
+ 'code' => (int) get_option( 'akismet_alert_code' ),
+ 'msg' => get_option( 'akismet_alert_msg' )
+ ) );
+ }
+
+ public static function display_spam_check_warning() {
+ Akismet::fix_scheduled_recheck();
+
+ if ( wp_next_scheduled('akismet_schedule_cron_recheck') > time() && self::get_number_spam_waiting() > 0 ) {
+ $link_text = apply_filters( 'akismet_spam_check_warning_link_text', sprintf( __( 'Please check your <a href="%s">Akismet configuration</a> and contact your web host if problems persist.', 'akismet'), esc_url( self::get_page_url() ) ) );
+ Akismet::view( 'notice', array( 'type' => 'spam-check', 'link_text' => $link_text ) );
+ }
+ }
+
+ public static function display_invalid_version() {
+ Akismet::view( 'notice', array( 'type' => 'version' ) );
+ }
+
+ public static function display_api_key_warning() {
+ Akismet::view( 'notice', array( 'type' => 'plugin' ) );
+ }
+
+ public static function display_page() {
+ if ( !Akismet::get_api_key() || ( isset( $_GET['view'] ) && $_GET['view'] == 'start' ) )
+ self::display_start_page();
+ elseif ( isset( $_GET['view'] ) && $_GET['view'] == 'stats' )
+ self::display_stats_page();
+ else
+ self::display_configuration_page();
+ }
+
+ public static function display_start_page() {
+ if ( isset( $_GET['action'] ) ) {
+ if ( $_GET['action'] == 'delete-key' ) {
+ if ( isset( $_GET['_wpnonce'] ) && wp_verify_nonce( $_GET['_wpnonce'], self::NONCE ) )
+ delete_option( 'wordpress_api_key' );
+ }
+ }
+
+ if ( $api_key = Akismet::get_api_key() ) {
+ self::display_configuration_page();
+ return;
+ }
+
+ //the user can choose to auto connect their API key by clicking a button on the akismet done page
+ //if jetpack, get verified api key by using connected wpcom user id
+ //if no jetpack, get verified api key by using an akismet token
+
+ $akismet_user = false;
+
+ if ( isset( $_GET['token'] ) && preg_match('/^(\d+)-[0-9a-f]{20}$/', $_GET['token'] ) )
+ $akismet_user = self::verify_wpcom_key( '', '', array( 'token' => $_GET['token'] ) );
+ elseif ( $jetpack_user = self::get_jetpack_user() )
+ $akismet_user = self::verify_wpcom_key( $jetpack_user['api_key'], $jetpack_user['user_id'] );
+
+ if ( isset( $_GET['action'] ) ) {
+ if ( $_GET['action'] == 'save-key' ) {
+ if ( is_object( $akismet_user ) ) {
+ self::save_key( $akismet_user->api_key );
+ self::display_notice();
+ self::display_configuration_page();
+ return;
+ }
+ }
+ }
+
+ echo '<h2 class="ak-header">'.esc_html__('Akismet', 'akismet').'</h2>';
+
+ self::display_status();
+
+ Akismet::view( 'start', compact( 'akismet_user' ) );
+ }
+
+ public static function display_stats_page() {
+ Akismet::view( 'stats' );
+ }
+
+ public static function display_configuration_page() {
+ $api_key = Akismet::get_api_key();
+ $akismet_user = self::get_akismet_user( $api_key );
+ $stat_totals = self::get_stats( $api_key );
+
+ // If unset, create the new strictness option using the old discard option to determine its default
+ if ( get_option( 'akismet_strictness' ) === false )
+ add_option( 'akismet_strictness', (get_option('akismet_discard_month') === 'true' ? '1' : '0') );
+
+ if ( empty( self::$notices ) ) {
+ //show status
+ if ( ! empty( $stat_totals['all'] ) && isset( $stat_totals['all']->time_saved ) && $akismet_user->status == 'active' && $akismet_user->account_type == 'free-api-key' ) {
+
+ $time_saved = false;
+
+ if ( $stat_totals['all']->time_saved > 1800 ) {
+ $total_in_minutes = round( $stat_totals['all']->time_saved / 60 );
+ $total_in_hours = round( $total_in_minutes / 60 );
+ $total_in_days = round( $total_in_hours / 8 );
+ $cleaning_up = __( 'Cleaning up spam takes time.' , 'akismet');
+
+ if ( $total_in_days > 1 )
+ $time_saved = $cleaning_up . ' ' . sprintf( __( 'Since you joined us, Akismet has saved you %s days!' , 'akismet'), number_format_i18n( $total_in_days ) );
+ elseif ( $total_in_hours > 1 )
+ $time_saved = $cleaning_up . ' ' . sprintf( __( 'Since you joined us, Akismet has saved you %d hours!' , 'akismet'), $total_in_hours );
+ elseif ( $total_in_minutes >= 30 )
+ $time_saved = $cleaning_up . ' ' . sprintf( __( 'Since you joined us, Akismet has saved you %d minutes!' , 'akismet'), $total_in_minutes );
+ }
+
+ Akismet::view( 'notice', array( 'type' => 'active-notice', 'time_saved' => $time_saved ) );
+ }
+
+ if ( !empty( $akismet_user->limit_reached ) && in_array( $akismet_user->limit_reached, array( 'yellow', 'red' ) ) ) {
+ Akismet::view( 'notice', array( 'type' => 'limit-reached', 'level' => $akismet_user->limit_reached ) );
+ }
+ }
+
+ if ( !isset( self::$notices['status'] ) && in_array( $akismet_user->status, array( 'cancelled', 'suspended', 'missing', 'no-sub' ) ) )
+ Akismet::view( 'notice', array( 'type' => $akismet_user->status ) );
+
+ Akismet::log( compact( 'stat_totals', 'akismet_user' ) );
+ Akismet::view( 'config', compact( 'api_key', 'akismet_user', 'stat_totals' ) );
+ }
+
+ public static function display_notice() {
+ global $hook_suffix;
+
+ if ( in_array( $hook_suffix, array( 'jetpack_page_akismet-key-config', 'settings_page_akismet-key-config', 'edit-comments.php' ) ) && (int) get_option( 'akismet_alert_code' ) > 0 ) {
+ Akismet::verify_key( Akismet::get_api_key() ); //verify that the key is still in alert state
+
+ if ( get_option( 'akismet_alert_code' ) > 0 )
+ self::display_alert();
+ }
+ elseif ( $hook_suffix == 'plugins.php' && !Akismet::get_api_key() ) {
+ self::display_api_key_warning();
+ }
+ elseif ( $hook_suffix == 'edit-comments.php' && wp_next_scheduled( 'akismet_schedule_cron_recheck' ) ) {
+ self::display_spam_check_warning();
+ }
+ elseif ( in_array( $hook_suffix, array( 'jetpack_page_akismet-key-config', 'settings_page_akismet-key-config' ) ) && Akismet::get_api_key() ) {
+ self::display_status();
+ }
+ }
+
+ public static function display_status() {
+ $type = '';
+
+ if ( !self::get_server_connectivity() )
+ $type = 'servers-be-down';
+
+ if ( !empty( $type ) )
+ Akismet::view( 'notice', compact( 'type' ) );
+ elseif ( !empty( self::$notices ) ) {
+ foreach ( self::$notices as $type )
+ Akismet::view( 'notice', compact( 'type' ) );
+ }
+ }
+
+ private static function get_jetpack_user() {
+ if ( !class_exists('Jetpack') )
+ return false;
+
+ Jetpack::load_xml_rpc_client();
+ $xml = new Jetpack_IXR_ClientMulticall( array( 'user_id' => get_current_user_id() ) );
+
+ $xml->addCall( 'wpcom.getUserID' );
+ $xml->addCall( 'akismet.getAPIKey' );
+ $xml->query();
+
+ Akismet::log( compact( 'xml' ) );
+
+ if ( !$xml->isError() ) {
+ $responses = $xml->getResponse();
+ if ( count( $responses ) > 1 ) {
+ $api_key = array_shift( $responses[0] );
+ $user_id = (int) array_shift( $responses[1] );
+ return compact( 'api_key', 'user_id' );
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Some commentmeta isn't useful in an export file. Suppress it (when supported).
+ *
+ * @param bool $exclude
+ * @param string $key The meta key
+ * @param object $meta The meta object
+ * @return bool Whether to exclude this meta entry from the export.
+ */
+ public static function exclude_commentmeta_from_export( $exclude, $key, $meta ) {
+ if ( in_array( $key, array( 'akismet_as_submitted', 'akismet_rechecking', 'akismet_delayed_moderation_email' ) ) ) {
+ return true;
+ }
+
+ return $exclude;
+ }
+} \ No newline at end of file
diff --git a/plugins/akismet/widget.php b/plugins/akismet/class.akismet-widget.php
index 8c5a120f..a60ae603 100644
--- a/plugins/akismet/widget.php
+++ b/plugins/akismet/class.akismet-widget.php
@@ -5,10 +5,12 @@
class Akismet_Widget extends WP_Widget {
function __construct() {
+ load_plugin_textdomain( 'akismet' );
+
parent::__construct(
'akismet_widget',
- __( 'Akismet Widget' ),
- array( 'description' => __( 'Display the number of spam comments Akismet has caught' ) )
+ __( 'Akismet Widget' , 'akismet'),
+ array( 'description' => __( 'Display the number of spam comments Akismet has caught' , 'akismet') )
);
if ( is_active_widget( false, false, $this->id_base ) ) {
@@ -23,7 +25,7 @@ class Akismet_Widget extends WP_Widget {
.a-stats {
width: auto;
}
-.a-stats a {
+.a-stats a {
background: #7CA821;
background-image:-moz-linear-gradient(0% 100% 90deg,#5F8E14,#7CA821);
background-image:-webkit-gradient(linear,0% 0,0% 100%,from(#7CA821),to(#5F8E14));
@@ -41,7 +43,7 @@ class Akismet_Widget extends WP_Widget {
-webkit-border-radius:3px;
width: 100%;
}
-.a-stats a:hover {
+.a-stats a:hover {
text-decoration: none;
background-image:-moz-linear-gradient(0% 100% 90deg,#6F9C1B,#659417);
background-image:-webkit-gradient(linear,0% 0,0% 100%,from(#659417),to(#6F9C1B));
@@ -61,19 +63,19 @@ class Akismet_Widget extends WP_Widget {
function form( $instance ) {
if ( $instance ) {
- $title = esc_attr( $instance['title'] );
+ $title = $instance['title'];
}
else {
- $title = __( 'Spam Blocked' );
+ $title = __( 'Spam Blocked' , 'akismet');
}
?>
<p>
- <label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:' ); ?></label>
- <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" />
+ <label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php esc_html_e( 'Title:' , 'akismet'); ?></label>
+ <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" />
</p>
-<?php
+<?php
}
function update( $new_instance, $old_instance ) {
@@ -93,7 +95,7 @@ class Akismet_Widget extends WP_Widget {
?>
<div class="a-stats">
- <a href="http://akismet.com" target="_blank" title=""><?php printf( _n( '<strong class="count">%1$s spam</strong> blocked by <strong>Akismet</strong>', '<strong class="count">%1$s spam</strong> blocked by <strong>Akismet</strong>', $count ), number_format_i18n( $count ) ); ?></a>
+ <a href="http://akismet.com" target="_blank" title=""><?php printf( _n( '<strong class="count">%1$s spam</strong> blocked by <strong>Akismet</strong>', '<strong class="count">%1$s spam</strong> blocked by <strong>Akismet</strong>', $count , 'akismet'), number_format_i18n( $count ) ); ?></a>
</div>
<?php
diff --git a/plugins/akismet/class.akismet.php b/plugins/akismet/class.akismet.php
new file mode 100644
index 00000000..5c786526
--- /dev/null
+++ b/plugins/akismet/class.akismet.php
@@ -0,0 +1,1088 @@
+<?php
+
+class Akismet {
+ const API_HOST = 'rest.akismet.com';
+ const API_PORT = 80;
+ const MAX_DELAY_BEFORE_MODERATION_EMAIL = 86400; // One day in seconds
+
+ private static $last_comment = '';
+ private static $initiated = false;
+ private static $prevent_moderation_email_for_these_comments = array();
+ private static $last_comment_result = null;
+
+ public static function init() {
+ if ( ! self::$initiated ) {
+ self::init_hooks();
+ }
+ }
+
+ /**
+ * Initializes WordPress hooks
+ */
+ private static function init_hooks() {
+ self::$initiated = true;
+
+ add_action( 'wp_insert_comment', array( 'Akismet', 'auto_check_update_meta' ), 10, 2 );
+ add_filter( 'preprocess_comment', array( 'Akismet', 'auto_check_comment' ), 1 );
+ add_action( 'akismet_scheduled_delete', array( 'Akismet', 'delete_old_comments' ) );
+ add_action( 'akismet_scheduled_delete', array( 'Akismet', 'delete_old_comments_meta' ) );
+ add_action( 'akismet_schedule_cron_recheck', array( 'Akismet', 'cron_recheck' ) );
+
+ $akismet_comment_nonce_option = apply_filters( 'akismet_comment_nonce', get_option( 'akismet_comment_nonce' ) );
+
+ if ( $akismet_comment_nonce_option == 'true' || $akismet_comment_nonce_option == '' )
+ add_action( 'comment_form', array( 'Akismet', 'add_comment_nonce' ), 1 );
+
+ add_action( 'admin_head-edit-comments.php', array( 'Akismet', 'load_form_js' ) );
+ add_action( 'comment_form', array( 'Akismet', 'load_form_js' ) );
+ add_action( 'comment_form', array( 'Akismet', 'inject_ak_js' ) );
+
+ add_filter( 'comment_moderation_recipients', array( 'Akismet', 'disable_moderation_emails_if_unreachable' ), 1000, 2 );
+ add_filter( 'pre_comment_approved', array( 'Akismet', 'last_comment_status' ), 10, 2 );
+
+ add_action( 'transition_comment_status', array( 'Akismet', 'transition_comment_status' ), 10, 3 );
+
+ // Run this early in the pingback call, before doing a remote fetch of the source uri
+ add_action( 'xmlrpc_call', array( 'Akismet', 'pre_check_pingback' ) );
+
+ if ( '3.0.5' == $GLOBALS['wp_version'] ) {
+ remove_filter( 'comment_text', 'wp_kses_data' );
+ if ( is_admin() )
+ add_filter( 'comment_text', 'wp_kses_post' );
+ }
+ }
+
+ public static function get_api_key() {
+ return apply_filters( 'akismet_get_api_key', defined('WPCOM_API_KEY') ? constant('WPCOM_API_KEY') : get_option('wordpress_api_key') );
+ }
+
+ public static function check_key_status( $key, $ip = null ) {
+ return self::http_post( Akismet::build_query( array( 'key' => $key, 'blog' => get_option('home') ) ), 'verify-key', $ip );
+ }
+
+ public static function verify_key( $key, $ip = null ) {
+ $response = self::check_key_status( $key, $ip );
+
+ if ( $response[1] != 'valid' && $response[1] != 'invalid' )
+ return 'failed';
+
+ self::update_alert( $response );
+
+ return $response[1];
+ }
+
+ public static function auto_check_comment( $commentdata ) {
+ self::$last_comment_result = null;
+
+ $comment = $commentdata;
+
+ $comment['user_ip'] = self::get_ip_address();
+ $comment['user_agent'] = self::get_user_agent();
+ $comment['referrer'] = self::get_referer();
+ $comment['blog'] = get_option('home');
+ $comment['blog_lang'] = get_locale();
+ $comment['blog_charset'] = get_option('blog_charset');
+ $comment['permalink'] = get_permalink( $comment['comment_post_ID'] );
+
+ if ( !empty( $comment['user_ID'] ) )
+ $comment['user_role'] = Akismet::get_user_roles( $comment['user_ID'] );
+
+ $akismet_nonce_option = apply_filters( 'akismet_comment_nonce', get_option( 'akismet_comment_nonce' ) );
+ $comment['akismet_comment_nonce'] = 'inactive';
+ if ( $akismet_nonce_option == 'true' || $akismet_nonce_option == '' ) {
+ $comment['akismet_comment_nonce'] = 'failed';
+ if ( isset( $_POST['akismet_comment_nonce'] ) && wp_verify_nonce( $_POST['akismet_comment_nonce'], 'akismet_comment_nonce_' . $comment['comment_post_ID'] ) )
+ $comment['akismet_comment_nonce'] = 'passed';
+
+ // comment reply in wp-admin
+ if ( isset( $_POST['_ajax_nonce-replyto-comment'] ) && check_ajax_referer( 'replyto-comment', '_ajax_nonce-replyto-comment' ) )
+ $comment['akismet_comment_nonce'] = 'passed';
+
+ }
+
+ if ( self::is_test_mode() )
+ $comment['is_test'] = 'true';
+
+ foreach( $_POST as $key => $value ) {
+ if ( is_string( $value ) )
+ $comment["POST_{$key}"] = $value;
+ }
+
+ $ignore = array( 'HTTP_COOKIE', 'HTTP_COOKIE2', 'PHP_AUTH_PW' );
+
+ foreach ( $_SERVER as $key => $value ) {
+ if ( !in_array( $key, $ignore ) && is_string($value) )
+ $comment["$key"] = $value;
+ else
+ $comment["$key"] = '';
+ }
+
+ $post = get_post( $comment['comment_post_ID'] );
+ $comment[ 'comment_post_modified_gmt' ] = $post->post_modified_gmt;
+
+ $response = self::http_post( Akismet::build_query( $comment ), 'comment-check' );
+
+ do_action( 'akismet_comment_check_response', $response );
+
+ self::update_alert( $response );
+
+ $commentdata['comment_as_submitted'] = array_intersect_key( $comment, array( 'blog' => '', 'blog_charset' => '', 'blog_lang' => '', 'blog_ua' => '', 'comment_agent' => '', 'comment_author' => '', 'comment_author_IP' => '', 'comment_author_email' => '', 'comment_author_url' => '', 'comment_content' => '', 'comment_date_gmt' => '', 'comment_tags' => '', 'comment_type' => '', 'guid' => '', 'is_test' => '', 'permalink' => '', 'reporter' => '', 'site_domain' => '', 'submit_referer' => '', 'submit_uri' => '', 'user_ID' => '', 'user_agent' => '', 'user_id' => '', 'user_ip' => '' ) );
+ $commentdata['akismet_result'] = $response[1];
+
+ if ( isset( $response[0]['x-akismet-pro-tip'] ) )
+ $commentdata['akismet_pro_tip'] = $response[0]['x-akismet-pro-tip'];
+
+ if ( isset( $response[0]['x-akismet-error'] ) ) {
+ // An error occurred that we anticipated (like a suspended key) and want the user to act on.
+ // Send to moderation.
+ self::$last_comment_result = '0';
+ }
+ else if ( 'true' == $response[1] ) {
+ // akismet_spam_count will be incremented later by comment_is_spam()
+ self::$last_comment_result = 'spam';
+
+ $discard = ( isset( $commentdata['akismet_pro_tip'] ) && $commentdata['akismet_pro_tip'] === 'discard' && self::allow_discard() );
+
+ do_action( 'akismet_spam_caught', $discard );
+
+ if ( $discard ) {
+ // akismet_result_spam() won't be called so bump the counter here
+ if ( $incr = apply_filters('akismet_spam_count_incr', 1) )
+ update_option( 'akismet_spam_count', get_option('akismet_spam_count') + $incr );
+ $redirect_to = isset( $_SERVER['HTTP_REFERER'] ) ? $_SERVER['HTTP_REFERER'] : get_permalink( $post );
+ wp_safe_redirect( esc_url_raw( $redirect_to ) );
+ die();
+ }
+ }
+
+ // if the response is neither true nor false, hold the comment for moderation and schedule a recheck
+ if ( 'true' != $response[1] && 'false' != $response[1] ) {
+ if ( !current_user_can('moderate_comments') ) {
+ // Comment status should be moderated
+ self::$last_comment_result = '0';
+ }
+ if ( function_exists('wp_next_scheduled') && function_exists('wp_schedule_single_event') ) {
+ if ( !wp_next_scheduled( 'akismet_schedule_cron_recheck' ) ) {
+ wp_schedule_single_event( time() + 1200, 'akismet_schedule_cron_recheck' );
+ do_action( 'akismet_scheduled_recheck', 'invalid-response-' . $response[1] );
+ }
+ }
+
+ self::$prevent_moderation_email_for_these_comments[] = $commentdata;
+ }
+
+ if ( function_exists('wp_next_scheduled') && function_exists('wp_schedule_event') ) {
+ // WP 2.1+: delete old comments daily
+ if ( !wp_next_scheduled( 'akismet_scheduled_delete' ) )
+ wp_schedule_event( time(), 'daily', 'akismet_scheduled_delete' );
+ }
+ elseif ( (mt_rand(1, 10) == 3) ) {
+ // WP 2.0: run this one time in ten
+ self::delete_old_comments();
+ }
+
+ self::set_last_comment( $commentdata );
+ self::fix_scheduled_recheck();
+
+ return $commentdata;
+ }
+
+ public static function get_last_comment() {
+ return self::$last_comment;
+ }
+
+ public static function set_last_comment( $comment ) {
+ if ( is_null( $comment ) ) {
+ self::$last_comment = null;
+ }
+ else {
+ // We filter it here so that it matches the filtered comment data that we'll have to compare against later.
+ // wp_filter_comment expects comment_author_IP
+ self::$last_comment = wp_filter_comment(
+ array_merge(
+ array( 'comment_author_IP' => self::get_ip_address() ),
+ $comment
+ )
+ );
+ }
+ }
+
+ // this fires on wp_insert_comment. we can't update comment_meta when auto_check_comment() runs
+ // because we don't know the comment ID at that point.
+ public static function auto_check_update_meta( $id, $comment ) {
+
+ // failsafe for old WP versions
+ if ( !function_exists('add_comment_meta') )
+ return false;
+
+ if ( !isset( self::$last_comment['comment_author_email'] ) )
+ self::$last_comment['comment_author_email'] = '';
+
+ // wp_insert_comment() might be called in other contexts, so make sure this is the same comment
+ // as was checked by auto_check_comment
+ if ( is_object( $comment ) && !empty( self::$last_comment ) && is_array( self::$last_comment ) ) {
+ if ( self::matches_last_comment( $comment ) ) {
+
+ load_plugin_textdomain( 'akismet' );
+
+ // normal result: true or false
+ if ( self::$last_comment['akismet_result'] == 'true' ) {
+ update_comment_meta( $comment->comment_ID, 'akismet_result', 'true' );
+ self::update_comment_history( $comment->comment_ID, __('Akismet caught this comment as spam', 'akismet'), 'check-spam' );
+ if ( $comment->comment_approved != 'spam' )
+ self::update_comment_history( $comment->comment_ID, sprintf( __('Comment status was changed to %s', 'akismet'), $comment->comment_approved), 'status-changed'.$comment->comment_approved );
+ }
+ elseif ( self::$last_comment['akismet_result'] == 'false' ) {
+ update_comment_meta( $comment->comment_ID, 'akismet_result', 'false' );
+ self::update_comment_history( $comment->comment_ID, __('Akismet cleared this comment', 'akismet'), 'check-ham' );
+ if ( $comment->comment_approved == 'spam' ) {
+ 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) )
+ self::update_comment_history( $comment->comment_ID, __('Comment was caught by wp_blacklist_check', 'akismet'), 'wp-blacklisted' );
+ else
+ self::update_comment_history( $comment->comment_ID, sprintf( __('Comment status was changed to %s', 'akismet'), $comment->comment_approved), 'status-changed-'.$comment->comment_approved );
+ }
+ } // abnormal result: error
+ else {
+ update_comment_meta( $comment->comment_ID, 'akismet_error', time() );
+ self::update_comment_history( $comment->comment_ID, sprintf( __('Akismet was unable to check this comment (response: %s), will automatically retry again later.', 'akismet'), substr(self::$last_comment['akismet_result'], 0, 50)), 'check-error' );
+ }
+
+ // record the complete original data as submitted for checking
+ if ( isset( self::$last_comment['comment_as_submitted'] ) )
+ update_comment_meta( $comment->comment_ID, 'akismet_as_submitted', self::$last_comment['comment_as_submitted'] );
+
+ if ( isset( self::$last_comment['akismet_pro_tip'] ) )
+ update_comment_meta( $comment->comment_ID, 'akismet_pro_tip', self::$last_comment['akismet_pro_tip'] );
+ }
+ }
+ }
+
+ public static function delete_old_comments() {
+ global $wpdb;
+
+ /**
+ * Determines how many comments will be deleted in each batch.
+ *
+ * @param int The default, as defined by AKISMET_DELETE_LIMIT.
+ */
+ $delete_limit = apply_filters( 'akismet_delete_comment_limit', defined( 'AKISMET_DELETE_LIMIT' ) ? AKISMET_DELETE_LIMIT : 10000 );
+ $delete_limit = max( 1, intval( $delete_limit ) );
+
+ /**
+ * Determines how many days a comment will be left in the Spam queue before being deleted.
+ *
+ * @param int The default number of days.
+ */
+ $delete_interval = apply_filters( 'akismet_delete_comment_interval', 15 );
+ $delete_interval = max( 1, intval( $delete_interval ) );
+
+ while ( $comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_id FROM {$wpdb->comments} WHERE DATE_SUB(NOW(), INTERVAL %d DAY) > comment_date_gmt AND comment_approved = 'spam' LIMIT %d", $delete_interval, $delete_limit ) ) ) {
+ if ( empty( $comment_ids ) )
+ return;
+
+ $wpdb->queries = array();
+
+ foreach ( $comment_ids as $comment_id ) {
+ do_action( 'delete_comment', $comment_id );
+ }
+
+ $comma_comment_ids = implode( ', ', array_map('intval', $comment_ids) );
+
+ $wpdb->query("DELETE FROM {$wpdb->comments} WHERE comment_id IN ( $comma_comment_ids )");
+ $wpdb->query("DELETE FROM {$wpdb->commentmeta} WHERE comment_id IN ( $comma_comment_ids )");
+
+ clean_comment_cache( $comment_ids );
+ }
+
+ if ( apply_filters( 'akismet_optimize_table', ( mt_rand(1, 5000) == 11), $wpdb->comments ) ) // lucky number
+ $wpdb->query("OPTIMIZE TABLE {$wpdb->comments}");
+ }
+
+ public static function delete_old_comments_meta() {
+ global $wpdb;
+
+ $interval = apply_filters( 'akismet_delete_commentmeta_interval', 15 );
+
+ # enfore a minimum of 1 day
+ $interval = absint( $interval );
+ if ( $interval < 1 )
+ $interval = 1;
+
+ // akismet_as_submitted meta values are large, so expire them
+ // after $interval days regardless of the comment status
+ while ( $comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT m.comment_id FROM {$wpdb->commentmeta} as m INNER JOIN {$wpdb->comments} as c USING(comment_id) WHERE m.meta_key = 'akismet_as_submitted' AND DATE_SUB(NOW(), INTERVAL %d DAY) > c.comment_date_gmt LIMIT 10000", $interval ) ) ) {
+ if ( empty( $comment_ids ) )
+ return;
+
+ $wpdb->queries = array();
+
+ foreach ( $comment_ids as $comment_id ) {
+ delete_comment_meta( $comment_id, 'akismet_as_submitted' );
+ }
+ }
+
+ if ( apply_filters( 'akismet_optimize_table', ( mt_rand(1, 5000) == 11), $wpdb->commentmeta ) ) // lucky number
+ $wpdb->query("OPTIMIZE TABLE {$wpdb->commentmeta}");
+ }
+
+ // how many approved comments does this author have?
+ public static function get_user_comments_approved( $user_id, $comment_author_email, $comment_author, $comment_author_url ) {
+ global $wpdb;
+
+ if ( !empty( $user_id ) )
+ return (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM {$wpdb->comments} WHERE user_id = %d AND comment_approved = 1", $user_id ) );
+
+ if ( !empty( $comment_author_email ) )
+ return (int) $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 ) );
+
+ return 0;
+ }
+
+ // get the full comment history for a given comment, as an array in reverse chronological order
+ public static function get_comment_history( $comment_id ) {
+
+ // failsafe for old WP versions
+ if ( !function_exists('add_comment_meta') )
+ return false;
+
+ $history = get_comment_meta( $comment_id, 'akismet_history', false );
+ usort( $history, array( 'Akismet', '_cmp_time' ) );
+ return $history;
+ }
+
+ // log an event for a given comment, storing it in comment_meta
+ public static function update_comment_history( $comment_id, $message, $event=null ) {
+ global $current_user;
+
+ // failsafe for old WP versions
+ if ( !function_exists('add_comment_meta') )
+ return false;
+
+ $user = '';
+ if ( is_object( $current_user ) && isset( $current_user->user_login ) )
+ $user = $current_user->user_login;
+
+ $event = array(
+ 'time' => self::_get_microtime(),
+ 'message' => $message,
+ 'event' => $event,
+ 'user' => $user,
+ );
+
+ // $unique = false so as to allow multiple values per comment
+ $r = add_comment_meta( $comment_id, 'akismet_history', $event, false );
+ }
+
+ public static function check_db_comment( $id, $recheck_reason = 'recheck_queue' ) {
+ global $wpdb;
+
+ $c = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->comments} WHERE comment_ID = %d", $id ), ARRAY_A );
+ if ( !$c )
+ return;
+
+ $c['user_ip'] = $c['comment_author_IP'];
+ $c['user_agent'] = $c['comment_agent'];
+ $c['referrer'] = '';
+ $c['blog'] = get_option('home');
+ $c['blog_lang'] = get_locale();
+ $c['blog_charset'] = get_option('blog_charset');
+ $c['permalink'] = get_permalink($c['comment_post_ID']);
+ $c['recheck_reason'] = $recheck_reason;
+
+ if ( self::is_test_mode() )
+ $c['is_test'] = 'true';
+
+ $response = self::http_post( Akismet::build_query( $c ), 'comment-check' );
+
+ return ( is_array( $response ) && ! empty( $response[1] ) ) ? $response[1] : false;
+ }
+
+
+
+ public static function transition_comment_status( $new_status, $old_status, $comment ) {
+
+ if ( $new_status == $old_status )
+ return;
+
+ # we don't need to record a history item for deleted comments
+ if ( $new_status == 'delete' )
+ return;
+
+ if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) && !current_user_can( 'moderate_comments' ) )
+ return;
+
+ if ( defined('WP_IMPORTING') && WP_IMPORTING == true )
+ return;
+
+ // if this is present, it means the status has been changed by a re-check, not an explicit user action
+ if ( get_comment_meta( $comment->comment_ID, 'akismet_rechecking' ) )
+ return;
+
+ global $current_user;
+ $reporter = '';
+ if ( is_object( $current_user ) )
+ $reporter = $current_user->user_login;
+
+ // Assumption alert:
+ // We want to submit comments to Akismet only when a moderator explicitly spams or approves it - not if the status
+ // is changed automatically by another plugin. Unfortunately WordPress doesn't provide an unambiguous way to
+ // determine why the transition_comment_status action was triggered. And there are several different ways by which
+ // to spam and unspam comments: bulk actions, ajax, links in moderation emails, the dashboard, and perhaps others.
+ // We'll assume that this is an explicit user action if certain POST/GET variables exist.
+ if ( ( isset( $_POST['status'] ) && in_array( $_POST['status'], array( 'spam', 'unspam' ) ) ) ||
+ ( isset( $_POST['spam'] ) && (int) $_POST['spam'] == 1 ) ||
+ ( isset( $_POST['unspam'] ) && (int) $_POST['unspam'] == 1 ) ||
+ ( isset( $_POST['comment_status'] ) && in_array( $_POST['comment_status'], array( 'spam', 'unspam' ) ) ) ||
+ ( isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'spam', 'unspam' ) ) ) ||
+ ( isset( $_POST['action'] ) && in_array( $_POST['action'], array( 'editedcomment' ) ) )
+ ) {
+ if ( $new_status == 'spam' && ( $old_status == 'approved' || $old_status == 'unapproved' || !$old_status ) ) {
+ return self::submit_spam_comment( $comment->comment_ID );
+ } elseif ( $old_status == 'spam' && ( $new_status == 'approved' || $new_status == 'unapproved' ) ) {
+ return self::submit_nonspam_comment( $comment->comment_ID );
+ }
+ }
+
+ self::update_comment_history( $comment->comment_ID, sprintf( __('%1$s changed the comment status to %2$s', 'akismet'), $reporter, $new_status ), 'status-' . $new_status );
+ }
+
+ public static function submit_spam_comment( $comment_id ) {
+ global $wpdb, $current_user, $current_site;
+
+ $comment_id = (int) $comment_id;
+
+ $comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->comments} WHERE comment_ID = %d", $comment_id ) );
+
+ if ( !$comment ) // it was deleted
+ return;
+
+ if ( 'spam' != $comment->comment_approved )
+ return;
+
+ // use the original version stored in comment_meta if available
+ $as_submitted = get_comment_meta( $comment_id, 'akismet_as_submitted', true);
+
+ if ( $as_submitted && is_array( $as_submitted ) && isset( $as_submitted['comment_content'] ) )
+ $comment = (object) array_merge( (array)$comment, $as_submitted );
+
+ $comment->blog = get_bloginfo('url');
+ $comment->blog_lang = get_locale();
+ $comment->blog_charset = get_option('blog_charset');
+ $comment->permalink = get_permalink($comment->comment_post_ID);
+
+ if ( is_object($current_user) )
+ $comment->reporter = $current_user->user_login;
+
+ if ( is_object($current_site) )
+ $comment->site_domain = $current_site->domain;
+
+ $comment->user_role = '';
+ if ( isset( $comment->user_ID ) )
+ $comment->user_role = Akismet::get_user_roles( $comment->user_ID );
+
+ if ( self::is_test_mode() )
+ $comment->is_test = 'true';
+
+ $post = get_post( $comment->comment_post_ID );
+ $comment->comment_post_modified_gmt = $post->post_modified_gmt;
+
+ $response = Akismet::http_post( Akismet::build_query( $comment ), 'submit-spam' );
+ if ( $comment->reporter ) {
+ self::update_comment_history( $comment_id, sprintf( __('%s reported this comment as spam', 'akismet'), $comment->reporter ), 'report-spam' );
+ update_comment_meta( $comment_id, 'akismet_user_result', 'true' );
+ update_comment_meta( $comment_id, 'akismet_user', $comment->reporter );
+ }
+
+ do_action('akismet_submit_spam_comment', $comment_id, $response[1]);
+ }
+
+ public static function submit_nonspam_comment( $comment_id ) {
+ global $wpdb, $current_user, $current_site;
+
+ $comment_id = (int) $comment_id;
+
+ $comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->comments} WHERE comment_ID = %d", $comment_id ) );
+ if ( !$comment ) // it was deleted
+ return;
+
+ // use the original version stored in comment_meta if available
+ $as_submitted = get_comment_meta( $comment_id, 'akismet_as_submitted', true);
+
+ if ( $as_submitted && is_array($as_submitted) && isset($as_submitted['comment_content']) )
+ $comment = (object) array_merge( (array)$comment, $as_submitted );
+
+ $comment->blog = get_bloginfo('url');
+ $comment->blog_lang = get_locale();
+ $comment->blog_charset = get_option('blog_charset');
+ $comment->permalink = get_permalink( $comment->comment_post_ID );
+ $comment->user_role = '';
+
+ if ( is_object($current_user) )
+ $comment->reporter = $current_user->user_login;
+
+ if ( is_object($current_site) )
+ $comment->site_domain = $current_site->domain;
+
+ if ( isset( $comment->user_ID ) )
+ $comment->user_role = Akismet::get_user_roles($comment->user_ID);
+
+ if ( Akismet::is_test_mode() )
+ $comment->is_test = 'true';
+
+ $post = get_post( $comment->comment_post_ID );
+ $comment->comment_post_modified_gmt = $post->post_modified_gmt;
+
+ $response = self::http_post( Akismet::build_query( $comment ), 'submit-ham' );
+ if ( $comment->reporter ) {
+ self::update_comment_history( $comment_id, sprintf( __('%s reported this comment as not spam', 'akismet'), $comment->reporter ), 'report-ham' );
+ update_comment_meta( $comment_id, 'akismet_user_result', 'false' );
+ update_comment_meta( $comment_id, 'akismet_user', $comment->reporter );
+ }
+
+ do_action('akismet_submit_nonspam_comment', $comment_id, $response[1]);
+ }
+
+ public static function cron_recheck() {
+ global $wpdb;
+
+ $api_key = self::get_api_key();
+
+ $status = self::verify_key( $api_key );
+ if ( get_option( 'akismet_alert_code' ) || $status == 'invalid' ) {
+ // since there is currently a problem with the key, reschedule a check for 6 hours hence
+ wp_schedule_single_event( time() + 21600, 'akismet_schedule_cron_recheck' );
+ do_action( 'akismet_scheduled_recheck', 'key-problem-' . get_option( 'akismet_alert_code' ) . '-' . $status );
+ return false;
+ }
+
+ delete_option('akismet_available_servers');
+
+ $comment_errors = $wpdb->get_col( "SELECT comment_id FROM {$wpdb->commentmeta} WHERE meta_key = 'akismet_error' LIMIT 100" );
+
+ load_plugin_textdomain( 'akismet' );
+
+ foreach ( (array) $comment_errors as $comment_id ) {
+ // if the comment no longer exists, or is too old, remove the meta entry from the queue to avoid getting stuck
+ $comment = get_comment( $comment_id );
+ if ( !$comment || strtotime( $comment->comment_date_gmt ) < strtotime( "-15 days" ) ) {
+ delete_comment_meta( $comment_id, 'akismet_error' );
+ delete_comment_meta( $comment_id, 'akismet_delayed_moderation_email' );
+ continue;
+ }
+
+ add_comment_meta( $comment_id, 'akismet_rechecking', true );
+ $status = self::check_db_comment( $comment_id, 'retry' );
+
+ $msg = '';
+ if ( $status == 'true' ) {
+ $msg = __( 'Akismet caught this comment as spam during an automatic retry.' , 'akismet');
+ } elseif ( $status == 'false' ) {
+ $msg = __( 'Akismet cleared this comment during an automatic retry.' , 'akismet');
+ }
+
+ // If we got back a legit response then update the comment history
+ // other wise just bail now and try again later. No point in
+ // re-trying all the comments once we hit one failure.
+ if ( !empty( $msg ) ) {
+ delete_comment_meta( $comment_id, 'akismet_error' );
+ self::update_comment_history( $comment_id, $msg, 'cron-retry' );
+ update_comment_meta( $comment_id, 'akismet_result', $status );
+ // make sure the comment status is still pending. if it isn't, that means the user has already moved it elsewhere.
+ $comment = get_comment( $comment_id );
+ if ( $comment && 'unapproved' == wp_get_comment_status( $comment_id ) ) {
+ if ( $status == 'true' ) {
+ wp_spam_comment( $comment_id );
+ } elseif ( $status == 'false' ) {
+ // comment is good, but it's still in the pending queue. depending on the moderation settings
+ // we may need to change it to approved.
+ 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) )
+ wp_set_comment_status( $comment_id, 1 );
+ else if ( get_comment_meta( $comment_id, 'akismet_delayed_moderation_email', true ) )
+ wp_notify_moderator( $comment_id );
+ }
+ }
+
+ delete_comment_meta( $comment_id, 'akismet_delayed_moderation_email' );
+ } else {
+ // If this comment has been pending moderation for longer than MAX_DELAY_BEFORE_MODERATION_EMAIL,
+ // send a moderation email now.
+ if ( ( intval( gmdate( 'U' ) ) - strtotime( $comment->comment_date_gmt ) ) < self::MAX_DELAY_BEFORE_MODERATION_EMAIL ) {
+ delete_comment_meta( $comment_id, 'akismet_delayed_moderation_email' );
+ wp_notify_moderator( $comment_id );
+ }
+
+ delete_comment_meta( $comment_id, 'akismet_rechecking' );
+ wp_schedule_single_event( time() + 1200, 'akismet_schedule_cron_recheck' );
+ do_action( 'akismet_scheduled_recheck', 'check-db-comment-' . $status );
+ return;
+ }
+ delete_comment_meta( $comment_id, 'akismet_rechecking' );
+ }
+
+ $remaining = $wpdb->get_var( "SELECT COUNT(*) FROM {$wpdb->commentmeta} WHERE meta_key = 'akismet_error'" );
+ if ( $remaining && !wp_next_scheduled('akismet_schedule_cron_recheck') ) {
+ wp_schedule_single_event( time() + 1200, 'akismet_schedule_cron_recheck' );
+ do_action( 'akismet_scheduled_recheck', 'remaining' );
+ }
+ }
+
+ public static function fix_scheduled_recheck() {
+ $future_check = wp_next_scheduled( 'akismet_schedule_cron_recheck' );
+ if ( !$future_check ) {
+ return;
+ }
+
+ if ( get_option( 'akismet_alert_code' ) > 0 ) {
+ return;
+ }
+
+ $check_range = time() + 1200;
+ if ( $future_check > $check_range ) {
+ wp_clear_scheduled_hook( 'akismet_schedule_cron_recheck' );
+ wp_schedule_single_event( time() + 300, 'akismet_schedule_cron_recheck' );
+ do_action( 'akismet_scheduled_recheck', 'fix-scheduled-recheck' );
+ }
+ }
+
+ public static function add_comment_nonce( $post_id ) {
+ echo '<p style="display: none;">';
+ wp_nonce_field( 'akismet_comment_nonce_' . $post_id, 'akismet_comment_nonce', FALSE );
+ echo '</p>';
+ }
+
+ public static function is_test_mode() {
+ return defined('AKISMET_TEST_MODE') && AKISMET_TEST_MODE;
+ }
+
+ public static function allow_discard() {
+ if ( defined( 'DOING_AJAX' ) && DOING_AJAX )
+ return false;
+ if ( is_user_logged_in() )
+ return false;
+
+ return ( get_option( 'akismet_strictness' ) === '1' );
+ }
+
+ public static function get_ip_address() {
+ return isset( $_SERVER['REMOTE_ADDR'] ) ? $_SERVER['REMOTE_ADDR'] : null;
+ }
+
+ /**
+ * Do these two comments, without checking the comment_ID, "match"?
+ *
+ * @param mixed $comment1 A comment object or array.
+ * @param mixed $comment2 A comment object or array.
+ * @return bool Whether the two comments should be treated as the same comment.
+ */
+ private static function comments_match( $comment1, $comment2 ) {
+ $comment1 = (array) $comment1;
+ $comment2 = (array) $comment2;
+
+ return (
+ isset( $comment1['comment_post_ID'], $comment2['comment_post_ID'] )
+ && intval( $comment1['comment_post_ID'] ) == intval( $comment2['comment_post_ID'] )
+ && $comment1['comment_author'] == $comment2['comment_author']
+ && $comment1['comment_author_email'] == $comment2['comment_author_email']
+ );
+ }
+
+ // Does the supplied comment match the details of the one most recently stored in self::$last_comment?
+ public static function matches_last_comment( $comment ) {
+ if ( is_object( $comment ) )
+ $comment = (array) $comment;
+
+ return self::comments_match( self::$last_comment, $comment );
+ }
+
+ private static function get_user_agent() {
+ return isset( $_SERVER['HTTP_USER_AGENT'] ) ? $_SERVER['HTTP_USER_AGENT'] : null;
+ }
+
+ private static function get_referer() {
+ return isset( $_SERVER['HTTP_REFERER'] ) ? $_SERVER['HTTP_REFERER'] : null;
+ }
+
+ // return a comma-separated list of role names for the given user
+ public static function get_user_roles( $user_id ) {
+ $roles = false;
+
+ if ( !class_exists('WP_User') )
+ return false;
+
+ if ( $user_id > 0 ) {
+ $comment_user = new WP_User( $user_id );
+ if ( isset( $comment_user->roles ) )
+ $roles = join( ',', $comment_user->roles );
+ }
+
+ if ( is_multisite() && is_super_admin( $user_id ) ) {
+ if ( empty( $roles ) ) {
+ $roles = 'super_admin';
+ } else {
+ $comment_user->roles[] = 'super_admin';
+ $roles = join( ',', $comment_user->roles );
+ }
+ }
+
+ return $roles;
+ }
+
+ // filter handler used to return a spam result to pre_comment_approved
+ public static function last_comment_status( $approved, $comment ) {
+ // Only do this if it's the correct comment
+ if ( is_null(self::$last_comment_result) || ! self::matches_last_comment( $comment ) ) {
+ self::log( "comment_is_spam mismatched comment, returning unaltered $approved" );
+ return $approved;
+ }
+
+ // bump the counter here instead of when the filter is added to reduce the possibility of overcounting
+ if ( $incr = apply_filters('akismet_spam_count_incr', 1) )
+ update_option( 'akismet_spam_count', get_option('akismet_spam_count') + $incr );
+
+ return self::$last_comment_result;
+ }
+
+ /**
+ * If Akismet is temporarily unreachable, we don't want to "spam" the blogger with
+ * moderation emails for comments that will be automatically cleared or spammed on
+ * the next retry.
+ *
+ * For comments that will be rechecked later, empty the list of email addresses that
+ * the moderation email would be sent to.
+ *
+ * @param array $emails An array of email addresses that the moderation email will be sent to.
+ * @param int $comment_id The ID of the relevant comment.
+ * @return array An array of email addresses that the moderation email will be sent to.
+ */
+ public static function disable_moderation_emails_if_unreachable( $emails, $comment_id ) {
+ if ( ! empty( self::$prevent_moderation_email_for_these_comments ) && ! empty( $emails ) ) {
+ $comment = get_comment( $comment_id );
+
+ foreach ( self::$prevent_moderation_email_for_these_comments as $possible_match ) {
+ if ( self::comments_match( $possible_match, $comment ) ) {
+ update_comment_meta( $comment_id, 'akismet_delayed_moderation_email', true );
+ return array();
+ }
+ }
+ }
+
+ return $emails;
+ }
+
+ public static function _cmp_time( $a, $b ) {
+ return $a['time'] > $b['time'] ? -1 : 1;
+ }
+
+ public static function _get_microtime() {
+ $mtime = explode( ' ', microtime() );
+ return $mtime[1] + $mtime[0];
+ }
+
+ /**
+ * Make a POST request to the Akismet API.
+ *
+ * @param string $request The body of the request.
+ * @param string $path The path for the request.
+ * @param string $ip The specific IP address to hit.
+ * @return array A two-member array consisting of the headers and the response body, both empty in the case of a failure.
+ */
+ public static function http_post( $request, $path, $ip=null ) {
+
+ $akismet_ua = sprintf( 'WordPress/%s | Akismet/%s', $GLOBALS['wp_version'], constant( 'AKISMET_VERSION' ) );
+ $akismet_ua = apply_filters( 'akismet_ua', $akismet_ua );
+
+ $content_length = strlen( $request );
+
+ $api_key = self::get_api_key();
+ $host = self::API_HOST;
+
+ if ( !empty( $api_key ) )
+ $host = $api_key.'.'.$host;
+
+ $http_host = $host;
+ // use a specific IP if provided
+ // needed by Akismet_Admin::check_server_connectivity()
+ if ( $ip && long2ip( ip2long( $ip ) ) ) {
+ $http_host = $ip;
+ }
+
+ $http_args = array(
+ 'body' => $request,
+ 'headers' => array(
+ 'Content-Type' => 'application/x-www-form-urlencoded; charset=' . get_option( 'blog_charset' ),
+ 'Host' => $host,
+ 'User-Agent' => $akismet_ua,
+ ),
+ 'httpversion' => '1.0',
+ 'timeout' => 15
+ );
+
+ $akismet_url = $http_akismet_url = "http://{$http_host}/1.1/{$path}";
+
+ /**
+ * Try SSL first; if that fails, try without it and don't try it again for a while.
+ */
+
+ $ssl = $ssl_failed = false;
+
+ // Check if SSL requests were disabled fewer than X hours ago.
+ $ssl_disabled = get_option( 'akismet_ssl_disabled' );
+
+ if ( $ssl_disabled && $ssl_disabled < ( time() - 60 * 60 * 24 ) ) { // 24 hours
+ $ssl_disabled = false;
+ delete_option( 'akismet_ssl_disabled' );
+ }
+ else if ( $ssl_disabled ) {
+ do_action( 'akismet_ssl_disabled' );
+ }
+
+ if ( ! $ssl_disabled && function_exists( 'wp_http_supports') && ( $ssl = wp_http_supports( array( 'ssl' ) ) ) ) {
+ $akismet_url = set_url_scheme( $akismet_url, 'https' );
+
+ do_action( 'akismet_https_request_pre' );
+ }
+
+ $response = wp_remote_post( $akismet_url, $http_args );
+
+ Akismet::log( compact( 'akismet_url', 'http_args', 'response' ) );
+
+ if ( $ssl && is_wp_error( $response ) ) {
+ do_action( 'akismet_https_request_failure', $response );
+
+ // Intermittent connection problems may cause the first HTTPS
+ // request to fail and subsequent HTTP requests to succeed randomly.
+ // Retry the HTTPS request once before disabling SSL for a time.
+ $response = wp_remote_post( $akismet_url, $http_args );
+
+ Akismet::log( compact( 'akismet_url', 'http_args', 'response' ) );
+
+ if ( is_wp_error( $response ) ) {
+ $ssl_failed = true;
+
+ do_action( 'akismet_https_request_failure', $response );
+
+ do_action( 'akismet_http_request_pre' );
+
+ // Try the request again without SSL.
+ $response = wp_remote_post( $http_akismet_url, $http_args );
+
+ Akismet::log( compact( 'http_akismet_url', 'http_args', 'response' ) );
+ }
+ }
+
+ if ( is_wp_error( $response ) ) {
+ do_action( 'akismet_request_failure', $response );
+
+ return array( '', '' );
+ }
+
+ if ( $ssl_failed ) {
+ // The request failed when using SSL but succeeded without it. Disable SSL for future requests.
+ update_option( 'akismet_ssl_disabled', time() );
+
+ do_action( 'akismet_https_disabled' );
+ }
+
+ return array( $response['headers'], $response['body'] );
+ }
+
+ // given a response from an API call like check_key_status(), update the alert code options if an alert is present.
+ private static function update_alert( $response ) {
+ $code = $msg = null;
+ if ( isset( $response[0]['x-akismet-alert-code'] ) ) {
+ $code = $response[0]['x-akismet-alert-code'];
+ $msg = $response[0]['x-akismet-alert-msg'];
+ }
+
+ // only call update_option() if the value has changed
+ if ( $code != get_option( 'akismet_alert_code' ) ) {
+ if ( ! $code ) {
+ delete_option( 'akismet_alert_code' );
+ delete_option( 'akismet_alert_msg' );
+ }
+ else {
+ update_option( 'akismet_alert_code', $code );
+ update_option( 'akismet_alert_msg', $msg );
+ }
+ }
+ }
+
+ public static function load_form_js() {
+ // WP < 3.3 can't enqueue a script this late in the game and still have it appear in the footer.
+ // Once we drop support for everything pre-3.3, this can change back to a single enqueue call.
+ wp_register_script( 'akismet-form', AKISMET__PLUGIN_URL . '_inc/form.js', array(), AKISMET_VERSION, true );
+ add_action( 'wp_footer', array( 'Akismet', 'print_form_js' ) );
+ add_action( 'admin_footer', array( 'Akismet', 'print_form_js' ) );
+ }
+
+ public static function print_form_js() {
+ wp_print_scripts( 'akismet-form' );
+ }
+
+ public static function inject_ak_js( $fields ) {
+ echo '<p style="display: none;">';
+ echo '<input type="hidden" id="ak_js" name="ak_js" value="' . mt_rand( 0, 250 ) . '"/>';
+ echo '</p>';
+ }
+
+ private static function bail_on_activation( $message, $deactivate = true ) {
+?>
+<!doctype html>
+<html>
+<head>
+<meta charset="<?php bloginfo( 'charset' ); ?>">
+<style>
+* {
+ text-align: center;
+ margin: 0;
+ padding: 0;
+ font-family: "Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;
+}
+p {
+ margin-top: 1em;
+ font-size: 18px;
+}
+</style>
+<body>
+<p><?php echo esc_html( $message ); ?></p>
+</body>
+</html>
+<?php
+ if ( $deactivate ) {
+ $plugins = get_option( 'active_plugins' );
+ $akismet = plugin_basename( AKISMET__PLUGIN_DIR . 'akismet.php' );
+ $update = false;
+ foreach ( $plugins as $i => $plugin ) {
+ if ( $plugin === $akismet ) {
+ $plugins[$i] = false;
+ $update = true;
+ }
+ }
+
+ if ( $update ) {
+ update_option( 'active_plugins', array_filter( $plugins ) );
+ }
+ }
+ exit;
+ }
+
+ public static function view( $name, array $args = array() ) {
+ $args = apply_filters( 'akismet_view_arguments', $args, $name );
+
+ foreach ( $args AS $key => $val ) {
+ $$key = $val;
+ }
+
+ load_plugin_textdomain( 'akismet' );
+
+ $file = AKISMET__PLUGIN_DIR . 'views/'. $name . '.php';
+
+ include( $file );
+ }
+
+ /**
+ * Attached to activate_{ plugin_basename( __FILES__ ) } by register_activation_hook()
+ * @static
+ */
+ public static function plugin_activation() {
+ if ( version_compare( $GLOBALS['wp_version'], AKISMET__MINIMUM_WP_VERSION, '<' ) ) {
+ load_plugin_textdomain( 'akismet' );
+
+ $message = '<strong>'.sprintf(esc_html__( 'Akismet %s requires WordPress %s or higher.' , 'akismet'), AKISMET_VERSION, AKISMET__MINIMUM_WP_VERSION ).'</strong> '.sprintf(__('Please <a href="%1$s">upgrade WordPress</a> to a current version, or <a href="%2$s">downgrade to version 2.4 of the Akismet plugin</a>.', 'akismet'), 'https://codex.wordpress.org/Upgrading_WordPress', 'http://wordpress.org/extend/plugins/akismet/download/');
+
+ Akismet::bail_on_activation( $message );
+ }
+ }
+
+ /**
+ * Removes all connection options
+ * @static
+ */
+ public static function plugin_deactivation( ) {
+ //tidy up
+ }
+
+ /**
+ * Essentially a copy of WP's build_query but one that doesn't expect pre-urlencoded values.
+ *
+ * @param array $args An array of key => value pairs
+ * @return string A string ready for use as a URL query string.
+ */
+ public static function build_query( $args ) {
+ return _http_build_query( $args, '', '&' );
+ }
+
+ /**
+ * Log debugging info to the error log.
+ *
+ * Enabled when WP_DEBUG_LOG is enabled, but can be disabled via the akismet_debug_log filter.
+ *
+ * @param mixed $akismet_debug The data to log.
+ */
+ public static function log( $akismet_debug ) {
+ if ( apply_filters( 'akismet_debug_log', defined( 'WP_DEBUG_LOG' ) && WP_DEBUG_LOG ) ) {
+ error_log( print_r( compact( 'akismet_debug' ), true ) );
+ }
+ }
+
+ public static function pre_check_pingback( $method ) {
+ if ( $method !== 'pingback.ping' )
+ return;
+
+ global $wp_xmlrpc_server;
+
+ if ( !is_object( $wp_xmlrpc_server ) )
+ return false;
+
+ // Lame: tightly coupled with the IXR class.
+ $args = $wp_xmlrpc_server->message->params;
+
+ if ( !empty( $args[1] ) ) {
+ $post_id = url_to_postid( $args[1] );
+
+ // If this gets through the pre-check, make sure we properly identify the outbound request as a pingback verification
+ Akismet::pingback_forwarded_for( null, $args[0] );
+ add_filter( 'http_request_args', array( 'Akismet', 'pingback_forwarded_for' ), 10, 2 );
+
+ $comment = array(
+ 'comment_author_url' => $args[0],
+ 'comment_post_ID' => $post_id,
+ 'comment_author' => '',
+ 'comment_author_email' => '',
+ 'comment_content' => '',
+ 'comment_type' => 'pingback',
+ 'akismet_pre_check' => '1',
+ 'comment_pingback_target' => $args[1],
+ );
+
+ $comment = Akismet::auto_check_comment( $comment );
+
+ if ( isset( $comment['akismet_result'] ) && 'true' == $comment['akismet_result'] ) {
+ // Lame: tightly coupled with the IXR classes. Unfortunately the action provides no context and no way to return anything.
+ $wp_xmlrpc_server->error( new IXR_Error( 0, 'Invalid discovery target' ) );
+ }
+ }
+ }
+
+ public static function pingback_forwarded_for( $r, $url ) {
+ static $urls = array();
+
+ // Call this with $r == null to prime the callback to add headers on a specific URL
+ if ( is_null( $r ) && !in_array( $url, $urls ) ) {
+ $urls[] = $url;
+ }
+
+ // Add X-Pingback-Forwarded-For header, but only for requests to a specific URL (the apparent pingback source)
+ if ( is_array( $r ) && is_array( $r['headers'] ) && !isset( $r['headers']['X-Pingback-Forwarded-For'] ) && in_array( $url, $urls ) ) {
+ $remote_ip = preg_replace( '/[^a-fx0-9:.,]/i', '', $_SERVER['REMOTE_ADDR'] );
+
+ // Note: this assumes REMOTE_ADDR is correct, and it may not be if a reverse proxy or CDN is in use
+ $r['headers']['X-Pingback-Forwarded-For'] = $remote_ip;
+
+ // Also identify the request as a pingback verification in the UA string so it appears in logs
+ $r['user-agent'] .= '; verifying pingback from ' . $remote_ip;
+ }
+
+ return $r;
+ }
+} \ No newline at end of file
diff --git a/plugins/akismet/img/logo.png b/plugins/akismet/img/logo.png
deleted file mode 100644
index b5f5b9a1..00000000
--- a/plugins/akismet/img/logo.png
+++ /dev/null
Binary files differ
diff --git a/plugins/akismet/img/logo@2x.png b/plugins/akismet/img/logo@2x.png
deleted file mode 100644
index 80c835b0..00000000
--- a/plugins/akismet/img/logo@2x.png
+++ /dev/null
Binary files differ
diff --git a/plugins/akismet/index.php b/plugins/akismet/index.php
index a6ce9c89..cf879a5e 100644
--- a/plugins/akismet/index.php
+++ b/plugins/akismet/index.php
@@ -1,2 +1,2 @@
<?php
-# Silence is golden.
+# Silence is golden. \ No newline at end of file
diff --git a/plugins/akismet/legacy.php b/plugins/akismet/legacy.php
deleted file mode 100644
index e6de8cb3..00000000
--- a/plugins/akismet/legacy.php
+++ /dev/null
@@ -1,396 +0,0 @@
-<?php
-
-function akismet_spam_comments( $type = false, $page = 1, $per_page = 50 ) {
- global $wpdb;
-
- $page = (int) $page;
- if ( $page < 2 )
- $page = 1;
-
- $per_page = (int) $per_page;
- if ( $per_page < 1 )
- $per_page = 50;
-
- $start = ( $page - 1 ) * $per_page;
- $end = $start + $per_page;
-
- if ( $type ) {
- if ( 'comments' == $type || 'comment' == $type )
- $type = '';
- else
- $type = $wpdb->escape( $type );
- return $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE comment_approved = 'spam' AND comment_type='$type' ORDER BY comment_date DESC LIMIT $start, $end");
- }
-
- // All
- return $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE comment_approved = 'spam' ORDER BY comment_date DESC LIMIT $start, $end");
-}
-
-// Totals for each comment type
-// returns array( type => count, ... )
-function akismet_spam_totals() {
- global $wpdb;
- $totals = $wpdb->get_results( "SELECT comment_type, COUNT(*) AS cc FROM $wpdb->comments WHERE comment_approved = 'spam' GROUP BY comment_type" );
- $return = array();
- foreach ( $totals as $total )
- $return[$total->comment_type ? $total->comment_type : 'comment'] = $total->cc;
- return $return;
-}
-
-function akismet_manage_page() {
- global $wpdb, $submenu, $wp_db_version;
-
- // WP 2.7 has its own spam management page
- if ( 8645 <= $wp_db_version )
- return;
-
- $count = sprintf(__('Akismet Spam (%s)'), akismet_spam_count());
- if ( isset( $submenu['edit-comments.php'] ) )
- add_submenu_page('edit-comments.php', __('Akismet Spam'), $count, 'moderate_comments', 'akismet-admin', 'akismet_caught' );
- elseif ( function_exists('add_management_page') )
- add_management_page(__('Akismet Spam'), $count, 'moderate_comments', 'akismet-admin', 'akismet_caught');
-}
-
-function akismet_caught() {
- global $wpdb, $comment, $akismet_caught, $akismet_nonce;
-
- akismet_recheck_queue();
- if (isset($_POST['submit']) && 'recover' == $_POST['action'] && ! empty($_POST['not_spam'])) {
- check_admin_referer( $akismet_nonce );
- if ( function_exists('current_user_can') && !current_user_can('moderate_comments') )
- die(__('You do not have sufficient permission to moderate comments.'));
-
- $i = 0;
- foreach ($_POST['not_spam'] as $comment):
- $comment = (int) $comment;
- if ( function_exists('wp_set_comment_status') )
- wp_set_comment_status($comment, 'approve');
- else
- $wpdb->query("UPDATE $wpdb->comments SET comment_approved = '1' WHERE comment_ID = '$comment'");
- akismet_submit_nonspam_comment($comment);
- ++$i;
- endforeach;
- $to = add_query_arg( 'recovered', $i, $_SERVER['HTTP_REFERER'] );
- wp_safe_redirect( $to );
- exit;
- }
- if ('delete' == $_POST['action']) {
- check_admin_referer( $akismet_nonce );
- if ( function_exists('current_user_can') && !current_user_can('moderate_comments') )
- die(__('You do not have sufficient permission to moderate comments.'));
-
- $delete_time = $wpdb->escape( $_POST['display_time'] );
- $comment_ids = $wpdb->get_col( "SELECT comment_id FROM $wpdb->comments WHERE comment_approved = 'spam' AND '$delete_time' > comment_date_gmt" );
- if ( !empty( $comment_ids ) ) {
- do_action( 'delete_comment', $comment_ids );
- $wpdb->query( "DELETE FROM $wpdb->comments WHERE comment_id IN ( " . implode( ', ', $comment_ids ) . " )");
- wp_cache_delete( 'akismet_spam_count', 'widget' );
- }
- $to = add_query_arg( 'deleted', 'all', $_SERVER['HTTP_REFERER'] );
- wp_safe_redirect( $to );
- exit;
- }
-
-if ( isset( $_GET['recovered'] ) ) {
- $i = (int) $_GET['recovered'];
- echo '<div class="updated"><p>' . sprintf(__('%1$s comments recovered.'), $i) . "</p></div>";
-}
-
-if (isset( $_GET['deleted'] ) )
- echo '<div class="updated"><p>' . __('All spam deleted.') . '</p></div>';
-
-if ( isset( $GLOBALS['submenu']['edit-comments.php'] ) )
- $link = 'edit-comments.php';
-else
- $link = 'edit.php';
-?>
-<style type="text/css">
-.akismet-tabs {
- list-style: none;
- margin: 0;
- padding: 0;
- clear: both;
- border-bottom: 1px solid #ccc;
- height: 31px;
- margin-bottom: 20px;
- background: #ddd;
- border-top: 1px solid #bdbdbd;
-}
-.akismet-tabs li {
- float: left;
- margin: 5px 0 0 20px;
-}
-.akismet-tabs a {
- display: block;
- padding: 4px .5em 3px;
- border-bottom: none;
- color: #036;
-}
-.akismet-tabs .active a {
- background: #fff;
- border: 1px solid #ccc;
- border-bottom: none;
- color: #000;
- font-weight: bold;
- padding-bottom: 4px;
-}
-#akismetsearch {
- float: right;
- margin-top: -.5em;
-}
-
-#akismetsearch p {
- margin: 0;
- padding: 0;
-}
-</style>
-<div class="wrap">
-<h2><?php _e('Caught Spam') ?></h2>
-<?php
-$count = get_option( 'akismet_spam_count' );
-if ( $count ) {
-?>
-<p><?php printf(__('Akismet has caught <strong>%1$s spam</strong> for you since you first installed it.'), number_format_i18n($count) ); ?></p>
-<?php
-}
-
-$spam_count = akismet_spam_count();
-
-if ( 0 == $spam_count ) {
- echo '<p>'.__('You have no spam currently in the queue. Must be your lucky day. :)').'</p>';
- echo '</div>';
-} else {
- echo '<p>'.__('You can delete all of the spam from your database with a single click. This operation cannot be undone, so you may wish to check to ensure that no legitimate comments got through first. Spam is automatically deleted after 15 days, so don&#8217;t sweat it.').'</p>';
-?>
-<?php if ( !isset( $_POST['s'] ) ) { ?>
-<form method="post" action="<?php echo attribute_escape( add_query_arg( 'noheader', 'true' ) ); ?>">
-<?php akismet_nonce_field($akismet_nonce) ?>
-<input type="hidden" name="action" value="delete" />
-<?php printf(__('There are currently %1$s comments identified as spam.'), $spam_count); ?>&nbsp; &nbsp; <input type="submit" class="button delete" name="Submit" value="<?php _e('Delete all'); ?>" />
-<input type="hidden" name="display_time" value="<?php echo current_time('mysql', 1); ?>" />
-</form>
-<?php } ?>
-</div>
-<div class="wrap">
-<?php if ( isset( $_POST['s'] ) ) { ?>
-<h2><?php _e('Search'); ?></h2>
-<?php } else { ?>
-<?php echo '<p>'.__('These are the latest comments identified as spam by Akismet. If you see any mistakes, simply mark the comment as "not spam" and Akismet will learn from the submission. If you wish to recover a comment from spam, simply select the comment, and click Not Spam. After 15 days we clean out the junk for you.').'</p>'; ?>
-<?php } ?>
-<?php
-if ( isset( $_POST['s'] ) ) {
- $s = $wpdb->escape($_POST['s']);
- $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE
- (comment_author LIKE '%$s%' OR
- comment_author_email LIKE '%$s%' OR
- comment_author_url LIKE ('%$s%') OR
- comment_author_IP LIKE ('%$s%') OR
- comment_content LIKE ('%$s%') ) AND
- comment_approved = 'spam'
- ORDER BY comment_date DESC");
-} else {
- if ( isset( $_GET['apage'] ) )
- $page = (int) $_GET['apage'];
- else
- $page = 1;
-
- if ( $page < 2 )
- $page = 1;
-
- $current_type = false;
- if ( isset( $_GET['ctype'] ) )
- $current_type = preg_replace( '|[^a-z]|', '', $_GET['ctype'] );
-
- $comments = akismet_spam_comments( $current_type, $page );
- $total = akismet_spam_count( $current_type );
- $totals = akismet_spam_totals();
-?>
-<ul class="akismet-tabs">
-<li <?php if ( !isset( $_GET['ctype'] ) ) echo ' class="active"'; ?>><a href="edit-comments.php?page=akismet-admin"><?php _e('All'); ?></a></li>
-<?php
-foreach ( $totals as $type => $type_count ) {
- if ( 'comment' == $type ) {
- $type = 'comments';
- $show = __('Comments');
- } else {
- $show = ucwords( $type );
- }
- $type_count = number_format_i18n( $type_count );
- $extra = $current_type === $type ? ' class="active"' : '';
- echo "<li $extra><a href='edit-comments.php?page=akismet-admin&amp;ctype=$type'>$show ($type_count)</a></li>";
-}
-do_action( 'akismet_tabs' ); // so plugins can add more tabs easily
-?>
-</ul>
-<?php
-}
-
-if ($comments) {
-?>
-<form method="post" action="<?php echo attribute_escape("$link?page=akismet-admin"); ?>" id="akismetsearch">
-<p> <input type="text" name="s" value="<?php if (isset($_POST['s'])) echo attribute_escape($_POST['s']); ?>" size="17" />
- <input type="submit" class="button" name="submit" value="<?php echo attribute_escape(__('Search Spam &raquo;')) ?>" /> </p>
-</form>
-<?php if ( $total > 50 ) {
-$total_pages = ceil( $total / 50 );
-$r = '';
-if ( 1 < $page ) {
- $args['apage'] = ( 1 == $page - 1 ) ? '' : $page - 1;
- $r .= '<a class="prev" href="' . clean_url(add_query_arg( $args )) . '">'. __('&laquo; Previous Page') .'</a>' . "\n";
-}
-if ( ( $total_pages = ceil( $total / 50 ) ) > 1 ) {
- for ( $page_num = 1; $page_num <= $total_pages; $page_num++ ) :
- if ( $page == $page_num ) :
- $r .= "<strong>$page_num</strong>\n";
- else :
- $p = false;
- if ( $page_num < 3 || ( $page_num >= $page - 3 && $page_num <= $page + 3 ) || $page_num > $total_pages - 3 ) :
- $args['apage'] = ( 1 == $page_num ) ? '' : $page_num;
- $r .= '<a class="page-numbers" href="' . clean_url(add_query_arg($args)) . '">' . ( $page_num ) . "</a>\n";
- $in = true;
- elseif ( $in == true ) :
- $r .= "...\n";
- $in = false;
- endif;
- endif;
- endfor;
-}
-if ( ( $page ) * 50 < $total || -1 == $total ) {
- $args['apage'] = $page + 1;
- $r .= '<a class="next" href="' . clean_url(add_query_arg($args)) . '">'. __('Next Page &raquo;') .'</a>' . "\n";
-}
-echo "<p>$r</p>";
-?>
-
-<?php } ?>
-<form style="clear: both;" method="post" action="<?php echo attribute_escape( add_query_arg( 'noheader', 'true' ) ); ?>">
-<?php akismet_nonce_field($akismet_nonce) ?>
-<input type="hidden" name="action" value="recover" />
-<ul id="spam-list" class="commentlist" style="list-style: none; margin: 0; padding: 0;">
-<?php
-$i = 0;
-foreach($comments as $comment) {
- $i++;
- $comment_date = mysql2date(get_option("date_format") . " @ " . get_option("time_format"), $comment->comment_date);
- $post = get_post($comment->comment_post_ID);
- $post_title = $post->post_title;
- if ($i % 2) $class = 'class="alternate"';
- else $class = '';
- echo "\n\t<li id='comment-$comment->comment_ID' $class>";
- ?>
-
-<p><strong><?php comment_author() ?></strong> <?php if ($comment->comment_author_email) { ?>| <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_url && 'http://' != $comment->comment_author_url) { ?> | <?php comment_author_url_link() ?> <?php } ?>| <?php _e('IP:') ?> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></p>
-
-<?php comment_text() ?>
-
-<p><label for="spam-<?php echo $comment->comment_ID; ?>">
-<input type="checkbox" id="spam-<?php echo $comment->comment_ID; ?>" name="not_spam[]" value="<?php echo $comment->comment_ID; ?>" />
-<?php _e('Not Spam') ?></label> &#8212; <?php comment_date('M j, g:i A'); ?> &#8212; [
-<?php
-$post = get_post($comment->comment_post_ID);
-$post_title = wp_specialchars( $post->post_title, 'double' );
-$post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title;
-?>
- <a href="<?php echo get_permalink($comment->comment_post_ID); ?>" title="<?php echo $post_title; ?>"><?php _e('View Post') ?></a> ] </p>
-
-
-<?php
-}
-?>
-</ul>
-<?php if ( $total > 50 ) {
-$total_pages = ceil( $total / 50 );
-$r = '';
-if ( 1 < $page ) {
- $args['apage'] = ( 1 == $page - 1 ) ? '' : $page - 1;
- $r .= '<a class="prev" href="' . clean_url(add_query_arg( $args )) . '">'. __('&laquo; Previous Page') .'</a>' . "\n";
-}
-if ( ( $total_pages = ceil( $total / 50 ) ) > 1 ) {
- for ( $page_num = 1; $page_num <= $total_pages; $page_num++ ) :
- if ( $page == $page_num ) :
- $r .= "<strong>$page_num</strong>\n";
- else :
- $p = false;
- if ( $page_num < 3 || ( $page_num >= $page - 3 && $page_num <= $page + 3 ) || $page_num > $total_pages - 3 ) :
- $args['apage'] = ( 1 == $page_num ) ? '' : $page_num;
- $r .= '<a class="page-numbers" href="' . clean_url(add_query_arg($args)) . '">' . ( $page_num ) . "</a>\n";
- $in = true;
- elseif ( $in == true ) :
- $r .= "...\n";
- $in = false;
- endif;
- endif;
- endfor;
-}
-if ( ( $page ) * 50 < $total || -1 == $total ) {
- $args['apage'] = $page + 1;
- $r .= '<a class="next" href="' . clean_url(add_query_arg($args)) . '">'. __('Next Page &raquo;') .'</a>' . "\n";
-}
-echo "<p>$r</p>";
-}
-?>
-<p class="submit">
-<input type="submit" name="submit" value="<?php echo attribute_escape(__('De-spam marked comments &raquo;')); ?>" />
-</p>
-<p><?php _e('Comments you de-spam will be submitted to Akismet as mistakes so it can learn and get better.'); ?></p>
-</form>
-<?php
-} else {
-?>
-<p><?php _e('No results found.'); ?></p>
-<?php } ?>
-
-<?php if ( !isset( $_POST['s'] ) ) { ?>
-<form method="post" action="<?php echo attribute_escape( add_query_arg( 'noheader', 'true' ) ); ?>">
-<?php akismet_nonce_field($akismet_nonce) ?>
-<p><input type="hidden" name="action" value="delete" />
-<?php printf(__('There are currently %1$s comments identified as spam.'), $spam_count); ?>&nbsp; &nbsp; <input type="submit" name="Submit" class="button" value="<?php echo attribute_escape(__('Delete all')); ?>" />
-<input type="hidden" name="display_time" value="<?php echo current_time('mysql', 1); ?>" /></p>
-</form>
-<?php } ?>
-</div>
-<?php
- }
-}
-
-add_action('admin_menu', 'akismet_manage_page');
-
-function redirect_old_akismet_urls( ) {
- global $wp_db_version;
- $script_name = array_pop( split( '/', $_SERVER['PHP_SELF'] ) );
-
- $page = '';
- if ( !empty( $_GET['page'] ) )
- $page = $_GET['page'];
-
- // 2.7 redirect for people who might have bookmarked the old page
- if ( 8204 < $wp_db_version && ( 'edit-comments.php' == $script_name || 'edit.php' == $script_name ) && 'akismet-admin' == $page ) {
- $new_url = esc_url( 'edit-comments.php?comment_status=spam' );
- wp_safe_redirect( $new_url, 301 );
- exit;
- }
-}
-add_action( 'admin_init', 'redirect_old_akismet_urls' );
-
-// For WP <= 2.3.x
-global $pagenow;
-
-if ( 'moderation.php' == $pagenow ) {
- function akismet_recheck_button( $page ) {
- global $submenu;
- if ( isset( $submenu['edit-comments.php'] ) )
- $link = 'edit-comments.php';
- else
- $link = 'edit.php';
- $button = "<a href='$link?page=akismet-admin&amp;recheckqueue=true&amp;noheader=true' style='display: block; width: 100px; position: absolute; right: 7%; padding: 5px; font-size: 14px; text-decoration: underline; background: #fff; border: 1px solid #ccc;'>" . __('Recheck Queue for Spam') . "</a>";
- $page = str_replace( '<div class="wrap">', '<div class="wrap">' . $button, $page );
- return $page;
- }
-
- if ( $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '0'" ) )
- ob_start( 'akismet_recheck_button' );
-}
-
-// This option causes tons of FPs, was removed in 2.1
-function akismet_kill_proxy_check( $option ) { return 0; }
-add_filter('option_open_proxy_check', 'akismet_kill_proxy_check');
diff --git a/plugins/akismet/readme.txt b/plugins/akismet/readme.txt
index d0094d20..00fcd6ae 100644
--- a/plugins/akismet/readme.txt
+++ b/plugins/akismet/readme.txt
@@ -1,27 +1,26 @@
=== Akismet ===
-Contributors: matt, ryan, andy, mdawaffe, tellyworth, josephscott, lessbloat, eoigal, automattic
+Contributors: matt, ryan, andy, mdawaffe, tellyworth, josephscott, lessbloat, eoigal, cfinke, automattic, jgs
Tags: akismet, comments, spam
-Requires at least: 3.0
-Tested up to: 3.6
-Stable tag: 2.5.9
+Requires at least: 3.2
+Tested up to: 4.2.1
+Stable tag: 3.1.1
License: GPLv2 or later
-Akismet checks your comments against the Akismet web service to see if they look like spam or not.
+Akismet checks your comments against the Akismet Web service to see if they look like spam or not.
== Description ==
-Akismet checks your comments against the Akismet web service to see if they look like spam or not and lets you
-review the spam it catches under your blog's "Comments" admin screen.
+Akismet checks your comments against the Akismet Web service to see if they look like spam or not and lets you review the spam it catches under your blog's "Comments" admin screen.
-Major new features in Akismet 2.5 include:
+Major features in Akismet include:
-* 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
-* Links are highlighted in the comment body, to reveal hidden or misleading links
-* If your web host is unable to reach Akismet's servers, the plugin will automatically retry when your connection is back up
-* Moderators can see the number of approved comments for each user
-* Spam and Unspam reports now include more information, to help improve accuracy
+* Automatically checks all comments and filters out the ones that look like spam.
+* Each comment has a status history, so you can easily see which comments were caught or cleared by Akismet and which were spammed or unspammed by a moderator.
+* URLs are shown in the comment body to reveal hidden or misleading links.
+* Moderators can see the number of approved comments for each user.
+* A discard feature that outright blocks the worst spam, saving you disk space and speeding up your site.
-PS: You'll need an [Akismet.com API key](http://akismet.com/get/) to use it. Keys are free for personal blogs, with paid subscriptions available for businesses and commercial sites.
+PS: You'll need an [Akismet.com API key](http://akismet.com/get/) to use it. Keys are free for personal blogs; paid subscriptions are available for businesses and commercial sites.
== Installation ==
@@ -31,17 +30,93 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
== Changelog ==
+= 3.1.1 =
+*Release Date - 17th March, 2015*
+
+* Improvements to the "Remove comment author URL" JavaScript
+* Include the pingback pre-check from the 2.6 branch.
+
+= 3.1 =
+*Release Date - 11th March, 2015*
+
+* Use HTTPS by default for all requests to Akismet.
+* Fix for a situation where Akismet might strip HTML from a comment.
+
+= 3.0.4 =
+*Release Date - 11th December, 2014*
+
+* Fix to make .htaccess compatible with Apache 2.4.
+* Fix to allow removal of https author URLs.
+* Fix to avoid stripping part of the author URL when removing and re-adding.
+* Removed the "Check for Spam" button from the "Trash" and "Approved" queues, where it would have no effect.
+* Allow automatic API key configuration when Jetpack is installed and connected to a WordPress.com account
+
+= 3.0.3 =
+*Release Date - 3rd November, 2014*
+
+* Fix for sending the wrong data to delete_comment action that could have prevented old spam comments from being deleted.
+* Added a filter to disable logging of Akismet debugging information.
+* Added a filter for the maximum comment age when deleting old spam comments.
+* Added a filter for the number per batch when deleting old spam comments.
+* Removed the "Check for Spam" button from the Spam folder.
+
+= 3.0.2 =
+*Release Date - 18th August, 2014*
+
+* Performance improvements.
+* Fixed a bug that could truncate the comment data being sent to Akismet for checking.
+
+= 3.0.1 =
+*Release Date - 9th July, 2014*
+
+* Removed dependency on PHP's fsockopen function
+* Fix spam/ham reports to work when reported outside of the WP dashboard, e.g., from Notifications or the WP app
+* Remove jQuery dependency for comment form JavaScript
+* Remove unnecessary data from some Akismet comment meta
+* Suspended keys will now result in all comments being put in moderation, not spam.
+
+= 3.0.0 =
+*Release Date - 15th April, 2014*
+
+* Move Akismet to Settings menu
+* Drop Akismet Stats menu
+* Add stats snapshot to Akismet settings
+* Add Akismet subscription details and status to Akismet settings
+* Add contextual help for each page
+* Improve Akismet setup to use Jetpack to automate plugin setup
+* Fix "Check for Spam" to use AJAX to avoid page timing out
+* Fix Akismet settings page to be responsive
+* Drop legacy code
+* Tidy up CSS and Javascript
+* Replace the old discard setting with a new "discard pervasive spam" feature.
+
+= 2.6.0 =
+*Release Date - 18th March, 2014*
+
+* Add ajax paging to the check for spam button to handle large volumes of comments
+* Optimize javascript and add localization support
+* Fix bug in link to spam comments from right now dashboard widget
+* Fix bug with deleting old comments to avoid timeouts dealing with large volumes of comments
+* Include X-Pingback-Forwarded-For header in outbound WordPress pingback verifications
+* Add pre-check for pingbacks, to stop spam before an outbound verification request is made
+
= 2.5.9 =
+*Release Date - 1st August, 2013*
+
* Update 'Already have a key' link to redirect page rather than depend on javascript
* Fix some non-translatable strings to be translatable
* Update Activation banner in plugins page to redirect user to Akismet config page
= 2.5.8 =
+*Release Date - 20th January, 2013*
+
* Simplify the activation process for new users
* Remove the reporter_ip parameter
* Minor preventative security improvements
= 2.5.7 =
+*Release Date - 13th December, 2012*
+
* FireFox Stats iframe preview bug
* Fix mshots preview when using https
* Add .htaccess to block direct access to files
@@ -51,6 +126,8 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
* Fix prepare() warnings in WP 3.5
= 2.5.6 =
+*Release Date - 26th April, 2012*
+
* Prevent retry scheduling problems on sites where wp_cron is misbehaving
* Preload mshot previews
* Modernize the widget code
@@ -62,10 +139,14 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
* Improve error messages when verifying an API key
= 2.5.5 =
+*Release Date - 11th January, 2012*
+
* Add nonce check for comment author URL remove action
* Fix the settings link
= 2.5.4 =
+*Release Date - 5th January, 2012*
+
* Limit Akismet CSS and Javascript loading in wp-admin to just the pages that need it
* Added author URL quick removal functionality
* Added mShot preview on Author URL hover
@@ -74,11 +155,14 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
* Purge old Akismet comment meta data, default of 15 days
= 2.5.3 =
+*Release Date - 8th Febuary, 2011*
+
* Specify the license is GPL v2 or later
* Fix a bug that could result in orphaned commentmeta entries
* Include hotfix for WordPress 3.0.5 filter issue
= 2.5.2 =
+*Release Date - 14th January, 2011*
* Properly format the comment count for author counts
* Look for super admins on multisite installs when looking up user roles
@@ -88,6 +172,7 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
* Set Akismet stats iframe height to fixed 2500px. Better to have one tall scroll bar than two side by side.
= 2.5.1 =
+*Release Date - 17th December, 2010*
* Fix a bug that caused the "Auto delete" option to fail to discard comments correctly
* Remove the comment nonce form field from the 'Akismet Configuration' page in favor of using a filter, akismet_comment_nonce
@@ -106,6 +191,7 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
* Hid "flagged by..." notification while on dashboard
= 2.5.0 =
+*Release Date - 7th December, 2010*
* Track comment actions under 'Akismet Status' on the edit comment screen
* Fix a few remaining deprecated function calls ( props Mike Glendinning )
@@ -121,6 +207,7 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
* New option, "Use a nonce on the comment form."
= 2.4.0 =
+*Release Date - 23rd August, 2010*
* Spell out that the license is GPLv2
* Fix PHP warnings
@@ -130,6 +217,7 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
* General code clean up
= 2.3.0 =
+*Release Date - 5th June, 2010*
* Fix "Are you sure" nonce message on config screen in WPMU
* Fix XHTML compliance issue in sidebar widget
@@ -137,10 +225,12 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
* Localize the widget title (core ticket #13879)
= 2.2.9 =
+*Release Date - 2nd June, 2010*
* Eliminate a potential conflict with some plugins that may cause spurious reports
= 2.2.8 =
+*Release Date - 27th May, 2010*
* Fix bug in initial comment check for ipv6 addresses
* Report comments as ham when they are moved from spam to moderation
@@ -150,12 +240,14 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
* Better handling of comments by logged-in users
= 2.2.7 =
+*Release Date - 17th December, 2009*
* Add a new AKISMET_VERSION constant
* Reduce the possibility of over-counting spam when another spam filter plugin is in use
* Disable the connectivity check when the API key is hard-coded for WPMU
= 2.2.6 =
+*Release Date - 20th July, 2009*
* Fix a global warning introduced in 2.2.5
* Add changelog and additional readme.txt tags
@@ -163,10 +255,12 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
* Support a new WPCOM_API_KEY constant for easier use with WordPress MU
= 2.2.5 =
+*Release Date - 13th July, 2009*
* Include a new Server Connectivity diagnostic check, to detect problems caused by firewalls
= 2.2.4 =
+*Release Date - 3rd June, 2009*
* Fixed a key problem affecting the stats feature in WordPress MU
* Provide additional blog information in Akismet API calls
diff --git a/plugins/akismet/views/config.php b/plugins/akismet/views/config.php
new file mode 100644
index 00000000..232d1078
--- /dev/null
+++ b/plugins/akismet/views/config.php
@@ -0,0 +1,220 @@
+<div class="wrap">
+
+ <h2><?php esc_html_e( 'Akismet' , 'akismet');?></h2>
+
+ <div class="have-key">
+
+ <?php if ( $stat_totals && isset( $stat_totals['all'] ) && (int) $stat_totals['all']->spam > 0 ) : ?>
+
+ <div class="new-snapshot stats">
+
+ <span style="float:right;margin:10px 15px -5px 0px">
+ <a href="<?php echo esc_url( Akismet_Admin::get_page_url( 'stats' ) ); ?>" class=""><?php esc_html_e( 'Summaries' , 'akismet');?></a>
+ </span>
+
+ <iframe allowtransparency="true" scrolling="no" frameborder="0" style="width: 100%; height: 215px; overflow: hidden;" src="<?php printf( '//akismet.com/web/1.0/snapshot.php?blog=%s&api_key=%s&height=180&locale=%s', urlencode( get_bloginfo('url') ), Akismet::get_api_key(), get_locale() );?>"></iframe>
+ <ul>
+ <li>
+ <h3><?php esc_html_e( 'Past six months' , 'akismet');?></h3>
+ <span><?php echo number_format( $stat_totals['6-months']->spam );?></span>
+ <?php esc_html_e( 'Spam blocked' , 'akismet');?>
+ </li>
+ <li>
+ <h3><?php esc_html_e( 'All time' , 'akismet');?></h3>
+ <span><?php echo number_format( $stat_totals['all']->spam );?></span>
+ <?php esc_html_e( 'Spam blocked' , 'akismet');?>
+ </li>
+ <li>
+ <h3><?php esc_html_e( 'Accuracy' , 'akismet');?></h3>
+ <span><?php echo $stat_totals['all']->accuracy; ?>%</span>
+ <?php printf(
+ esc_html(
+ _n( '%s missed spam, %s false positive', '%s missed spam, %s false positives', $stat_totals['all']->false_positives , 'akismet')
+ ),
+ number_format( $stat_totals['all']->missed_spam ),
+ number_format( $stat_totals['all']->false_positives )
+ ); ?>
+ </li>
+ </ul>
+ <div class="clearfix"></div>
+ </div>
+ <?php endif;?>
+
+ <?php if ( $akismet_user ):?>
+
+ <div id="wpcom-stats-meta-box-container" class="metabox-holder"><?php
+ wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
+ wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
+ ?>
+ <script type="text/javascript">
+ jQuery(document).ready( function($) {
+ jQuery('.if-js-closed').removeClass('if-js-closed').addClass('closed');
+ if(typeof postboxes !== 'undefined')
+ postboxes.add_postbox_toggles( 'plugins_page_akismet-key-config' );
+ });
+ </script>
+ <div class="postbox-container" style="width: 55%;margin-right: 10px;">
+ <div id="normal-sortables" class="meta-box-sortables ui-sortable">
+ <div id="referrers" class="postbox ">
+ <div class="handlediv" title="Click to toggle"><br></div>
+ <h3 class="hndle"><span><?php esc_html_e( 'Settings' , 'akismet');?></span></h3>
+ <form name="akismet_conf" id="akismet-conf" action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="POST">
+ <div class="inside">
+ <table cellspacing="0" class="akismet-settings">
+ <tbody>
+ <?php if ( !defined( 'WPCOM_API_KEY' ) ):?>
+ <tr>
+ <th class="akismet-api-key" width="10%" align="left" scope="row"><?php esc_html_e('API Key', 'akismet');?></th>
+ <td width="5%"/>
+ <td align="left">
+ <span class="api-key"><input id="key" name="key" type="text" size="15" maxlength="12" value="<?php echo esc_attr( get_option('wordpress_api_key') ); ?>" class="regular-text code <?php echo $akismet_user->status;?>"></span>
+ </td>
+ </tr>
+ <?php endif; ?>
+ <?php if ( isset( $_GET['ssl_status'] ) ) { ?>
+ <tr>
+ <th align="left" scope="row"><?php esc_html_e( 'SSL Status', 'akismet' ); ?></th>
+ <td></td>
+ <td align="left">
+ <p>
+ <?php
+
+ if ( ! function_exists( 'wp_http_supports' ) ) {
+ ?><b><?php esc_html_e( 'Disabled.', 'akismet' ); ?></b> <?php printf( esc_html( 'Your WordPress installation does not include the function %s; upgrade to the latest version of WordPress.', 'akismet' ), '<code>wp_http_supports</code>' ); ?><?php
+ }
+ else if ( ! wp_http_supports( array( 'ssl' ) ) ) {
+ ?><b><?php esc_html_e( 'Disabled.', 'akismet' ); ?></b> <?php esc_html_e( 'Your Web server cannot make SSL requests; contact your Web host and ask them to add support for SSL requests.', 'akismet' ); ?><?php
+ }
+ else {
+ $ssl_disabled = get_option( 'akismet_ssl_disabled' );
+
+ if ( $ssl_disabled ) {
+ ?><b><?php esc_html_e( 'Temporarily disabled.', 'akismet' ); ?></b> <?php esc_html_e( 'Akismet encountered a problem with a previous SSL request and disabled it temporarily. It will begin using SSL for requests again shortly.', 'akismet' ); ?><?php
+ }
+ else {
+ ?><b><?php esc_html_e( 'Enabled.', 'akismet' ); ?></b> <?php esc_html_e( 'All systems functional.', 'akismet' ); ?><?php
+ }
+ }
+
+ ?>
+ </p>
+ </td>
+ </tr>
+ <?php } ?>
+ <tr>
+ <th align="left" scope="row"><?php esc_html_e('Comments', 'akismet');?></th>
+ <td></td>
+ <td align="left">
+ <p>
+ <label for="akismet_show_user_comments_approved" title="<?php esc_attr_e( 'Show approved comments' , 'akismet'); ?>"><input name="akismet_show_user_comments_approved" id="akismet_show_user_comments_approved" value="1" type="checkbox" <?php checked('1', get_option('akismet_show_user_comments_approved')); ?>> <?php esc_html_e('Show the number of approved comments beside each comment author', 'akismet'); ?></label>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <th class="strictness" align="left" scope="row"><?php esc_html_e('Strictness', 'akismet'); ?></th>
+ <td></td>
+ <td align="left">
+ <fieldset><legend class="screen-reader-text"><span><?php esc_html_e('Akismet anti-spam strictness', 'akismet'); ?></span></legend>
+ <p><label for="akismet_strictness_1"><input type="radio" name="akismet_strictness" id="akismet_strictness_1" value="1" <?php checked('1', get_option('akismet_strictness')); ?> /> <?php esc_html_e('Silently discard the worst and most pervasive spam so I never see it.', 'akismet'); ?></label></p>
+ <p><label for="akismet_strictness_0"><input type="radio" name="akismet_strictness" id="akismet_strictness_0" value="0" <?php checked('0', get_option('akismet_strictness')); ?> /> <?php esc_html_e('Always put spam in the Spam folder for review.', 'akismet'); ?></label></p>
+ </fieldset>
+ <span class="note"><strong><?php esc_html_e('Note:', 'akismet');?></strong>
+ <?php
+
+ $delete_interval = max( 1, intval( apply_filters( 'akismet_delete_comment_interval', 15 ) ) );
+
+ printf(
+ _n(
+ 'Spam in the <a href="%1$s">spam folder</a> older than 1 day is deleted automatically.',
+ 'Spam in the <a href="%1$s">spam folder</a> older than %2$d days is deleted automatically.',
+ $delete_interval,
+ 'akismet'
+ ),
+ admin_url( 'edit-comments.php?comment_status=spam' ),
+ $delete_interval
+ );
+
+ ?>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div id="major-publishing-actions">
+ <?php if ( !defined( 'WPCOM_API_KEY' ) ):?>
+ <div id="delete-action">
+ <a class="submitdelete deletion" href="<?php echo esc_url( Akismet_Admin::get_page_url( 'delete_key' ) ); ?>"><?php esc_html_e('Disconnect this account', 'akismet'); ?></a>
+ </div>
+ <?php endif; ?>
+ <?php wp_nonce_field(Akismet_Admin::NONCE) ?>
+ <div id="publishing-action">
+ <input type="hidden" name="action" value="enter-key">
+ <input type="submit" name="submit" id="submit" class="button button-primary" value="<?php esc_attr_e('Save Changes', 'akismet');?>">
+
+ </div>
+ <div class="clear"></div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <div class="postbox-container" style="width:44%;">
+ <div id="normal-sortables" class="meta-box-sortables ui-sortable">
+ <div id="referrers" class="postbox ">
+ <div class="handlediv" title="Click to toggle"><br></div>
+ <h3 class="hndle"><span><?php esc_html_e( 'Account' , 'akismet');?></span></h3>
+ <div class="inside">
+ <table cellspacing="0">
+ <tbody>
+ <tr>
+ <th scope="row" align="left"><?php esc_html_e( 'Subscription Type' , 'akismet');?></th>
+ <td width="5%"/>
+ <td align="left">
+ <span><?php echo $akismet_user->account_name; ?></span>
+ </td>
+ </tr>
+ <tr>
+ <th scope="row" align="left"><?php esc_html_e( 'Status' , 'akismet');?></th>
+ <td width="5%"/>
+ <td align="left">
+ <span><?php
+ if ( 'cancelled' == $akismet_user->status ) :
+ esc_html_e( 'Cancelled', 'akismet' );
+ elseif ( 'suspended' == $akismet_user->status ) :
+ esc_html_e( 'Suspended', 'akismet' );
+ elseif ( 'missing' == $akismet_user->status ) :
+ esc_html_e( 'Missing', 'akismet' );
+ elseif ( 'no-sub' == $akismet_user->status ) :
+ esc_html_e( 'No Subscription Found', 'akismet' );
+ else :
+ esc_html_e( 'Active', 'akismet' );
+ endif; ?></span>
+ </td>
+ </tr>
+ <?php if ( $akismet_user->next_billing_date ) : ?>
+ <tr>
+ <th scope="row" align="left"><?php esc_html_e( 'Next Billing Date' , 'akismet');?></th>
+ <td width="5%"/>
+ <td align="left">
+ <span><?php echo date( 'F j, Y', $akismet_user->next_billing_date ); ?></span>
+ </td>
+ </tr>
+ <?php endif; ?>
+ </tbody>
+ </table>
+ </div>
+ <div id="major-publishing-actions">
+ <div id="publishing-action">
+ <?php Akismet::view( 'get', array( 'text' => ( $akismet_user->account_type == 'free-api-key' && $akismet_user->status == 'active' ? __( 'Upgrade' , 'akismet') : __( 'Change' , 'akismet') ), 'redirect' => 'upgrade' ) ); ?>
+ </div>
+ <div class="clear"></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <?php endif;?>
+
+ </div>
+</div> \ No newline at end of file
diff --git a/plugins/akismet/views/get.php b/plugins/akismet/views/get.php
new file mode 100644
index 00000000..70727f6a
--- /dev/null
+++ b/plugins/akismet/views/get.php
@@ -0,0 +1,5 @@
+<form name="akismet_activate" action="https://akismet.com/get/" method="POST" target="_blank">
+ <input type="hidden" name="passback_url" value="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>"/>
+ <input type="hidden" name="redirect" value="<?php echo isset( $redirect ) ? $redirect : 'plugin-signup'; ?>"/>
+ <input type="submit" class="<?php echo isset( $classes ) && count( $classes ) > 0 ? implode( ' ', $classes ) : 'button button-primary';?>" value="<?php echo esc_attr( $text ); ?>"/>
+</form> \ No newline at end of file
diff --git a/plugins/akismet/views/notice.php b/plugins/akismet/views/notice.php
new file mode 100644
index 00000000..c2fc45af
--- /dev/null
+++ b/plugins/akismet/views/notice.php
@@ -0,0 +1,102 @@
+<?php if ( $type == 'plugin' ) :?>
+<div class="updated" style="padding: 0; margin: 0; border: none; background: none;">
+ <style type="text/css">
+.akismet_activate{min-width:825px;border:1px solid #4F800D;padding:5px;margin:15px 0;background:#83AF24;background-image:-webkit-gradient(linear,0% 0,80% 100%,from(#83AF24),to(#4F800D));background-image:-moz-linear-gradient(80% 100% 120deg,#4F800D,#83AF24);-moz-border-radius:3px;border-radius:3px;-webkit-border-radius:3px;position:relative;overflow:hidden}.akismet_activate .aa_a{position:absolute;top:-5px;right:10px;font-size:140px;color:#769F33;font-family:Georgia, "Times New Roman", Times, serif;z-index:1}.akismet_activate .aa_button{font-weight:bold;border:1px solid #029DD6;border-top:1px solid #06B9FD;font-size:15px;text-align:center;padding:9px 0 8px 0;color:#FFF;background:#029DD6;background-image:-webkit-gradient(linear,0% 0,0% 100%,from(#029DD6),to(#0079B1));background-image:-moz-linear-gradient(0% 100% 90deg,#0079B1,#029DD6);-moz-border-radius:2px;border-radius:2px;-webkit-border-radius:2px}.akismet_activate .aa_button:hover{text-decoration:none !important;border:1px solid #029DD6;border-bottom:1px solid #00A8EF;font-size:15px;text-align:center;padding:9px 0 8px 0;color:#F0F8FB;background:#0079B1;background-image:-webkit-gradient(linear,0% 0,0% 100%,from(#0079B1),to(#0092BF));background-image:-moz-linear-gradient(0% 100% 90deg,#0092BF,#0079B1);-moz-border-radius:2px;border-radius:2px;-webkit-border-radius:2px}.akismet_activate .aa_button_border{border:1px solid #006699;-moz-border-radius:2px;border-radius:2px;-webkit-border-radius:2px;background:#029DD6;background-image:-webkit-gradient(linear,0% 0,0% 100%,from(#029DD6),to(#0079B1));background-image:-moz-linear-gradient(0% 100% 90deg,#0079B1,#029DD6)}.akismet_activate .aa_button_container{cursor:pointer;display:inline-block;background:#DEF1B8;padding:5px;-moz-border-radius:2px;border-radius:2px;-webkit-border-radius:2px;width:266px}.akismet_activate .aa_description{position:absolute;top:22px;left:285px;margin-left:25px;color:#E5F2B1;font-size:15px;z-index:1000}.akismet_activate .aa_description strong{color:#FFF;font-weight:normal}
+ </style>
+ <form name="akismet_activate" action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="POST">
+ <div class="akismet_activate">
+ <div class="aa_a">A</div>
+ <div class="aa_button_container" onclick="document.akismet_activate.submit();">
+ <div class="aa_button_border">
+ <div class="aa_button"><?php esc_html_e('Activate your Akismet account', 'akismet');?></div>
+ </div>
+ </div>
+ <div class="aa_description"><?php _e('<strong>Almost done</strong> - activate your account and say goodbye to comment spam', 'akismet');?></div>
+ </div>
+ </form>
+</div>
+<?php elseif ( $type == 'spam-check' ) :?>
+<div id="akismet-warning" class="updated fade">
+ <p><strong><?php esc_html_e( 'Akismet has detected a problem.', 'akismet' );?></strong></p>
+ <p><?php printf( __( 'Some comments have not yet been checked for spam by Akismet. They have been temporarily held for moderation and will automatically be rechecked later.', 'akismet' ) ); ?></p>
+ <?php if ( $link_text ) { ?>
+ <p><?php echo $link_text; ?></p>
+ <?php } ?>
+</div>
+<?php elseif ( $type == 'version' ) :?>
+<div id="akismet-warning" class="updated fade"><p><strong><?php printf( esc_html__('Akismet %s requires WordPress 3.0 or higher.', 'akismet'), AKISMET_VERSION);?></strong> <?php printf(__('Please <a href="%1$s">upgrade WordPress</a> to a current version, or <a href="%2$s">downgrade to version 2.4 of the Akismet plugin</a>.', 'akismet'), 'https://codex.wordpress.org/Upgrading_WordPress', 'https://wordpress.org/extend/plugins/akismet/download/');?></p></div>
+<?php elseif ( $type == 'alert' ) :?>
+<div class='error'>
+ <p><strong><?php printf( esc_html__( 'Akismet Error Code: %s', 'akismet' ), $code ); ?></strong></p>
+ <p><?php echo esc_html( $msg ); ?></p>
+ <p><?php
+
+ /* translators: the placeholder is a clickable URL that leads to more information regarding an error code. */
+ printf( esc_html__( 'For more information: %s' , 'akismet'), '<a href="https://akismet.com/errors/' . $code . '">https://akismet.com/errors/' . $code . '</a>' );
+
+ ?>
+ </p>
+</div>
+<?php elseif ( $type == 'missing-functions' ) :?>
+<div class="wrap alert critical">
+ <h3 class="key-status failed"><?php esc_html_e('Network functions are disabled.', 'akismet'); ?></h3>
+ <p class="description"><?php printf( __('Your web host or server administrator has disabled PHP&#8217;s <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&#8217;s system requirements</a>.', 'akismet'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
+</div>
+<?php elseif ( $type == 'servers-be-down' ) :?>
+<div class="wrap alert critical">
+ <h3 class="key-status failed"><?php esc_html_e("We can&#8217;t connect to your site.", 'akismet'); ?></h3>
+ <p class="description"><?php printf( __('Your firewall may be blocking us. Please contact your host and refer to <a href="%s" target="_blank">our guide about firewalls</a>.', 'akismet'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
+</div>
+<?php elseif ( $type == 'active-dunning' ) :?>
+<div class="wrap alert critical">
+ <h3 class="key-status"><?php esc_html_e("Please update your payment details.", 'akismet'); ?></h3>
+ <p class="description"><?php printf( __('We cannot process your transaction. Please contact your bank for assistance, and <a href="%s" target="_blank">update your payment details</a>.', 'akismet'), 'https://akismet.com/account/'); ?></p>
+</div>
+<?php elseif ( $type == 'cancelled' ) :?>
+<div class="wrap alert critical">
+ <h3 class="key-status"><?php esc_html_e("Your subscription is cancelled.", 'akismet'); ?></h3>
+ <p class="description"><?php printf( __('Please visit the <a href="%s" target="_blank">Akismet account page</a> to reactivate your subscription.', 'akismet'), 'https://akismet.com/account/'); ?></p>
+</div>
+<?php elseif ( $type == 'suspended' ) :?>
+<div class="wrap alert critical">
+ <h3 class="key-status failed"><?php esc_html_e("Your subscription is suspended.", 'akismet'); ?></h3>
+ <p class="description"><?php printf( __('Please contact <a href="%s" target="_blank">Akismet support</a> for assistance.', 'akismet'), 'https://akismet.com/contact/'); ?></p>
+</div>
+<?php elseif ( $type == 'active-notice' && $time_saved ) :?>
+<div class="wrap alert active">
+ <h3 class="key-status"><?php echo esc_html( $time_saved ); ?></h3>
+ <p class="description"><?php printf( __('You can help us fight spam and upgrade your account by <a href="%s" target="_blank">contributing a token amount</a>.', 'akismet'), 'https://akismet.com/account/upgrade/'); ?></p>
+</div>
+<?php elseif ( $type == 'missing' ) :?>
+<div class="wrap alert critical">
+ <h3 class="key-status failed"><?php esc_html_e( 'There is a problem with your key.', 'akismet'); ?></h3>
+ <p class="description"><?php printf( __('Please contact <a href="%s" target="_blank">Akismet support</a> for assistance.', 'akismet'), 'https://akismet.com/contact/'); ?></p>
+</div>
+<?php elseif ( $type == 'no-sub' ) :?>
+<div class="wrap alert critical">
+ <h3 class="key-status failed"><?php esc_html_e( 'Your subscription is missing.', 'akismet'); ?></h3>
+ <p class="description"><?php printf( __('Since 2012, Akismet began using subscriptions for all accounts (even free ones). It looks like a subscription has not been assigned to your account, and we’d appreciate it if you’d <a href="%s" target="_blank">sign into your account</a> and choose one. Please <a href="%s" target="_blank">contact our support team</a> with any questions.', 'akismet'), 'https://akismet.com/account/upgrade/', 'https://akismet.com/contact/' ); ?></p>
+</div>
+<?php elseif ( $type == 'new-key-valid' ) :?>
+<div class="wrap alert active">
+ <h3 class="key-status"><?php esc_html_e('Your Akismet account has been successfully set up and activated. Happy blogging!', 'akismet'); ?></h3>
+</div>
+<?php elseif ( $type == 'new-key-invalid' ) :?>
+<div class="wrap alert critical">
+ <h3 class="key-status"><?php esc_html_e( 'The key you entered is invalid. Please double-check it.' , 'akismet'); ?></h3>
+</div>
+<?php elseif ( $type == 'new-key-failed' ) :?>
+<div class="wrap alert critical">
+ <h3 class="key-status"><?php esc_html_e( 'The key you entered could not be verified because a connection to akismet.com could not be established. Please check your server configuration.' , 'akismet'); ?></h3>
+</div>
+<?php elseif ( $type == 'limit-reached' && in_array( $level, array( 'yellow', 'red' ) ) ) :?>
+<div class="wrap alert critical">
+ <?php if ( $level == 'yellow' ): ?>
+ <h3 class="key-status failed"><?php esc_html_e("You're using your Akismet key on more sites than your Pro subscription allows.", 'akismet'); ?></h3>
+ <p class="description"><?php printf( __('Your Pro subscription allows the use of Akismet on only one site. Please <a href="http://docs.akismet.com/billing/add-more-sites/">purchase additional Pro subscriptions</a> or upgrade to an Enterprise subscription that allows the use of Akismet on unlimited sites.<br /><br />If you have any questions, please get in touch with our support team.', 'akismet'), 'https://akismet.com/account/upgrade/', 'https://akismet.com/contact/'); ?></p>
+ <?php elseif ( $level == 'red' ): ?>
+ <h3 class="key-status failed"><?php esc_html_e("You're using Akismet on far too many sites for your Pro subscription.", 'akismet'); ?></h3>
+ <p class="description"><?php printf( __('To continue your service, <a href="%s" target="_blank">upgrade to an Enterprise subscription</a>, which covers an unlimited number of sites. Please <a href="%s" target="_blank">contact our support team</a> with any questions.', 'akismet'), 'https://akismet.com/account/upgrade/', 'https://akismet.com/contact/'); ?></p>
+ <?php endif; ?>
+</div>
+<?php endif;?>
diff --git a/plugins/akismet/views/start.php b/plugins/akismet/views/start.php
new file mode 100644
index 00000000..692b8afe
--- /dev/null
+++ b/plugins/akismet/views/start.php
@@ -0,0 +1,95 @@
+<div class="no-key config-wrap"><?php
+ if ( $akismet_user && in_array( $akismet_user->status, array( 'active', 'active-dunning', 'no-sub', 'missing', 'cancelled', 'suspended' ) ) ) :
+ if ( $akismet_user->status == 'missing' ) :?>
+<p><?php esc_html_e('Akismet eliminates the comment and trackback spam you get on your site. Register your email address below to get started.', 'akismet'); ?></p>
+<div class="activate-highlight activate-option">
+ <div class="option-description">
+ <strong class="small-heading"><?php esc_html_e('Connected via Jetpack', 'akismet'); ?></strong>
+ <?php echo esc_attr( $akismet_user->user_email ); ?>
+ </div>
+ <form name="akismet_activate" id="akismet_activate" action="https://akismet.com/get/" method="post" class="right" target="_blank">
+ <input type="hidden" name="passback_url" value="<?php echo esc_attr( Akismet_Admin::get_page_url() ); ?>"/>
+ <input type="hidden" name="auto-connect" value="<?php echo $akismet_user->ID;?>"/>
+ <input type="hidden" name="redirect" value="plugin-signup"/>
+ <input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Register Akismet' , 'akismet'); ?>"/>
+ </form>
+</div>
+<?php elseif ( $akismet_user->status == 'cancelled' ) :?>
+<p><?php esc_html_e('Akismet eliminates the comment and trackback spam you get on your site.', 'akismet'); ?></p>
+<div class="activate-highlight activate-option">
+ <div class="option-description" style="width:75%;">
+ <strong class="small-heading"><?php esc_html_e('Connected via Jetpack', 'akismet'); ?></strong>
+ <?php printf( esc_html__( 'Your subscription for %s is cancelled' , 'akismet'), $akismet_user->user_email ); ?>
+ </div>
+ <form name="akismet_activate" id="akismet_activate" action="https://akismet.com/get/" method="post" class="right" target="_blank">
+ <input type="hidden" name="passback_url" value="<?php echo esc_attr( Akismet_Admin::get_page_url() ); ?>"/>
+ <input type="hidden" name="user_id" value="<?php echo $akismet_user->ID;?>"/>
+ <input type="hidden" name="redirect" value="upgrade"/>
+ <input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Reactivate Akismet' , 'akismet'); ?>"/>
+ </form>
+</div>
+<?php elseif ( $akismet_user->status == 'suspended' ) : ?>
+<p><?php esc_html_e('Akismet eliminates the comment and trackback spam you get on your site.', 'akismet'); ?></p>
+<div class="activate-highlight centered activate-option">
+ <strong class="small-heading"><?php esc_html_e( 'Connected via Jetpack' , 'akismet'); ?></strong>
+ <h3 class="alert-text"><?php printf( esc_html__( 'Your subscription for %s is suspended' , 'akismet'), $akismet_user->user_email ); ?></h3>
+ <p><?php esc_html_e('No worries! Get in touch and we&#8217;ll help sort this out.', 'akismet'); ?></p>
+ <a href="https://akismet.com/contact" class="button button-primary"><?php esc_html_e( 'Contact Akismet support' , 'akismet'); ?></a>
+</div>
+<?php else : // ask do they want to use akismet account found using jetpack wpcom connection ?>
+<p style="margin-right:10px"><?php esc_html_e('Akismet eliminates the comment and trackback spam you get on your site. To setup Akismet, select one of the options below.', 'akismet'); ?></p>
+<div class="activate-highlight activate-option">
+ <div class="option-description">
+ <strong class="small-heading"><?php esc_html_e('Connected via Jetpack', 'akismet'); ?></strong>
+ <?php echo esc_attr( $akismet_user->user_email ); ?>
+ </div>
+ <form name="akismet_use_wpcom_key" action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="post" id="akismet-activate" class="right">
+ <input type="hidden" name="key" value="<?php echo esc_attr( $akismet_user->api_key );?>"/>
+ <input type="hidden" name="action" value="enter-key">
+ <?php wp_nonce_field( Akismet_Admin::NONCE ) ?>
+ <input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Use this Akismet account' , 'akismet'); ?>"/>
+ </form>
+</div>
+<?php endif;?>
+<div class="activate-highlight secondary activate-option">
+ <div class="option-description">
+ <strong><?php esc_html_e('Create a new API key with a different email address', 'akismet'); ?></strong>
+ <p><?php esc_html_e('Use this option if you want to setup a new Akismet account.', 'akismet'); ?></p>
+ </div>
+ <?php Akismet::view( 'get', array( 'text' => __( 'Register a different email address' , 'akismet'), 'classes' => array( 'right', 'button', 'button-secondary' ) ) ); ?>
+</div>
+<div class="activate-highlight secondary activate-option">
+ <div class="option-description">
+ <strong><?php esc_html_e('Manually enter an API key', 'akismet'); ?></strong>
+ <p><?php esc_html_e('If you already know your API key.', 'akismet'); ?></p>
+ </div>
+ <form action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="post" id="akismet-enter-api-key" class="right">
+ <input id="key" name="key" type="text" size="15" maxlength="12" value="" class="regular-text code">
+ <input type="hidden" name="action" value="enter-key">
+ <?php wp_nonce_field( Akismet_Admin::NONCE ) ?>
+ <input type="submit" name="submit" id="submit" class="button button-secondary" value="<?php esc_attr_e('Use this key', 'akismet');?>">
+ </form>
+</div>
+<?php else :?>
+<p><?php esc_html_e('Akismet eliminates the comment and trackback spam you get on your site. To setup Akismet, select one of the options below.', 'akismet'); ?></p>
+<div class="activate-highlight activate-option">
+ <div class="option-description">
+ <strong><?php esc_html_e( 'Activate Akismet' , 'akismet');?></strong>
+ <p><?php esc_html_e('Log in or create an account to get your API key.', 'akismet'); ?></p>
+ </div>
+ <?php Akismet::view( 'get', array( 'text' => __( 'Get your API key' , 'akismet'), 'classes' => array( 'right', 'button', 'button-primary' ) ) ); ?>
+</div>
+<div class="activate-highlight secondary activate-option">
+ <div class="option-description">
+ <strong><?php esc_html_e('Manually enter an API key', 'akismet'); ?></strong>
+ <p><?php esc_html_e('If you already know your API key.', 'akismet'); ?></p>
+ </div>
+ <form action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="post" id="akismet-enter-api-key" class="right">
+ <input id="key" name="key" type="text" size="15" maxlength="12" value="" class="regular-text code">
+ <input type="hidden" name="action" value="enter-key">
+ <?php wp_nonce_field( Akismet_Admin::NONCE ); ?>
+ <input type="submit" name="submit" id="submit" class="button button-secondary" value="<?php esc_attr_e('Use this key', 'akismet');?>">
+ </form>
+</div><?php
+ endif;?>
+</div> \ No newline at end of file
diff --git a/plugins/akismet/views/stats.php b/plugins/akismet/views/stats.php
new file mode 100644
index 00000000..1ca76611
--- /dev/null
+++ b/plugins/akismet/views/stats.php
@@ -0,0 +1,4 @@
+<div class="wrap">
+ <h2><?php esc_html_e( 'Akismet Stats' , 'akismet');?><?php if ( !isset( $hide_settings_link ) ): ?> <a href="<?php echo esc_url( Akismet_Admin::get_page_url() );?>" class="add-new-h2"><?php esc_html_e( 'Settings' , 'akismet');?></a><?php endif;?></h2>
+ <iframe src="<?php echo esc_url( sprintf( '//akismet.com/web/1.0/user-stats.php?blog=%s&api_key=%s&locale=%s', urlencode( get_bloginfo('url') ), Akismet::get_api_key(), get_locale() ) ); ?>" width="100%" height="2500px" frameborder="0" id="akismet-stats-frame"></iframe>
+</div> \ No newline at end of file
diff --git a/plugins/akismet/views/strict.php b/plugins/akismet/views/strict.php
new file mode 100644
index 00000000..3cf197cd
--- /dev/null
+++ b/plugins/akismet/views/strict.php
@@ -0,0 +1,7 @@
+<tr valign="top">
+ <th scope="row"><?php esc_html_e('Akismet anti-spam strictness', 'akismet'); ?></th>
+ <td><fieldset><legend class="screen-reader-text"><span><?php esc_html_e('Akismet anti-spam strictness', 'akismet'); ?></span></legend>
+ <p><label for="akismet_strictness_1"><input type="radio" name="akismet_strictness" id="akismet_strictness_1" value="1" <?php checked('1', get_option('akismet_strictness')); ?> /> <?php esc_html_e('Strict: silently discard the worst and most pervasive spam.', 'akismet'); ?></label></p>
+ <p><label for="akismet_strictness_0"><input type="radio" name="akismet_strictness" id="akismet_strictness_0" value="0" <?php checked('0', get_option('akismet_strictness')); ?> /> <?php esc_html_e('Safe: always put spam in the Spam folder for review.', 'akismet'); ?></label></p>
+ </fieldset></td>
+</tr> \ No newline at end of file
diff --git a/plugins/akismet/wrapper.php b/plugins/akismet/wrapper.php
new file mode 100644
index 00000000..a77d4ce9
--- /dev/null
+++ b/plugins/akismet/wrapper.php
@@ -0,0 +1,213 @@
+<?php
+
+global $wpcom_api_key, $akismet_api_host, $akismet_api_port;
+
+$wpcom_api_key = defined( 'WPCOM_API_KEY' ) ? constant( 'WPCOM_API_KEY' ) : '';
+$akismet_api_host = Akismet::get_api_key() . '.rest.akismet.com';
+$akismet_api_port = 80;
+
+function akismet_test_mode() {
+ return Akismet::is_test_mode();
+}
+
+function akismet_http_post( $request, $host, $path, $port = 80, $ip = null ) {
+ $path = str_replace( '/1.1/', '', $path );
+
+ return Akismet::http_post( $request, $path, $ip );
+}
+
+function akismet_microtime() {
+ return Akismet::_get_microtime();
+}
+
+function akismet_delete_old() {
+ return Akismet::delete_old_comments();
+}
+
+function akismet_delete_old_metadata() {
+ return Akismet::delete_old_comments_meta();
+}
+
+function akismet_check_db_comment( $id, $recheck_reason = 'recheck_queue' ) {
+ return Akismet::check_db_comment( $id, $recheck_reason );
+}
+
+function akismet_rightnow() {
+ if ( !class_exists( 'Akismet_Admin' ) )
+ return false;
+
+ return Akismet_Admin::rightnow_stats();
+}
+
+function akismet_admin_init() {
+ _deprecated_function( __FUNCTION__, '3.0' );
+}
+function akismet_version_warning() {
+ _deprecated_function( __FUNCTION__, '3.0' );
+}
+function akismet_load_js_and_css() {
+ _deprecated_function( __FUNCTION__, '3.0' );
+}
+function akismet_nonce_field( $action = -1 ) {
+ return wp_nonce_field( $action );
+}
+function akismet_plugin_action_links( $links, $file ) {
+ return Akismet_Admin::plugin_action_links( $links, $file );
+}
+function akismet_conf() {
+ _deprecated_function( __FUNCTION__, '3.0' );
+}
+function akismet_stats_display() {
+ _deprecated_function( __FUNCTION__, '3.0' );
+}
+function akismet_stats() {
+ return Akismet_Admin::dashboard_stats();
+}
+function akismet_admin_warnings() {
+ _deprecated_function( __FUNCTION__, '3.0' );
+}
+function akismet_comment_row_action( $a, $comment ) {
+ return Akismet_Admin::comment_row_actions( $a, $comment );
+}
+function akismet_comment_status_meta_box( $comment ) {
+ return Akismet_Admin::comment_status_meta_box( $comment );
+}
+function akismet_comments_columns( $columns ) {
+ _deprecated_function( __FUNCTION__, '3.0' );
+
+ return $columns;
+}
+function akismet_comment_column_row( $column, $comment_id ) {
+ _deprecated_function( __FUNCTION__, '3.0' );
+}
+function akismet_text_add_link_callback( $m ) {
+ return Akismet_Admin::text_add_link_callback( $m );
+}
+function akismet_text_add_link_class( $comment_text ) {
+ return Akismet_Admin::text_add_link_class( $comment_text );
+}
+function akismet_check_for_spam_button( $comment_status ) {
+ return Akismet_Admin::check_for_spam_button( $comment_status );
+}
+function akismet_submit_nonspam_comment( $comment_id ) {
+ return Akismet::submit_nonspam_comment( $comment_id );
+}
+function akismet_submit_spam_comment( $comment_id ) {
+ return Akismet::submit_spam_comment( $comment_id );
+}
+function akismet_transition_comment_status( $new_status, $old_status, $comment ) {
+ return Akismet::transition_comment_status( $new_status, $old_status, $comment );
+}
+function akismet_spam_count( $type = false ) {
+ return Akismet_Admin::get_spam_count( $type );
+}
+function akismet_recheck_queue() {
+ return Akismet_Admin::recheck_queue();
+}
+function akismet_remove_comment_author_url() {
+ return Akismet_Admin::remove_comment_author_url();
+}
+function akismet_add_comment_author_url() {
+ return Akismet_Admin::add_comment_author_url();
+}
+function akismet_check_server_connectivity() {
+ return Akismet_Admin::check_server_connectivity();
+}
+function akismet_get_server_connectivity( $cache_timeout = 86400 ) {
+ return Akismet_Admin::get_server_connectivity( $cache_timeout );
+}
+function akismet_server_connectivity_ok() {
+ _deprecated_function( __FUNCTION__, '3.0' );
+
+ return true;
+}
+function akismet_admin_menu() {
+ return Akismet_Admin::admin_menu();
+}
+function akismet_load_menu() {
+ return Akismet_Admin::load_menu();
+}
+function akismet_init() {
+ _deprecated_function( __FUNCTION__, '3.0' );
+}
+function akismet_get_key() {
+ return Akismet::get_api_key();
+}
+function akismet_check_key_status( $key, $ip = null ) {
+ return Akismet::check_key_status( $key, $ip );
+}
+function akismet_update_alert( $response ) {
+ return Akismet::update_alert( $response );
+}
+function akismet_verify_key( $key, $ip = null ) {
+ return Akismet::verify_key( $key, $ip );
+}
+function akismet_get_user_roles( $user_id ) {
+ return Akismet::get_user_roles( $user_id );
+}
+function akismet_result_spam( $approved ) {
+ return Akismet::comment_is_spam( $approved );
+}
+function akismet_result_hold( $approved ) {
+ return Akismet::comment_needs_moderation( $approved );
+}
+function akismet_get_user_comments_approved( $user_id, $comment_author_email, $comment_author, $comment_author_url ) {
+ return Akismet::get_user_comments_approved( $user_id, $comment_author_email, $comment_author, $comment_author_url );
+}
+function akismet_update_comment_history( $comment_id, $message, $event = null ) {
+ return Akismet::update_comment_history( $comment_id, $message, $event );
+}
+function akismet_get_comment_history( $comment_id ) {
+ return Akismet::get_comment_history( $comment_id );
+}
+function akismet_cmp_time( $a, $b ) {
+ return Akismet::_cmp_time( $a, $b );
+}
+function akismet_auto_check_update_meta( $id, $comment ) {
+ return Akismet::auto_check_update_meta( $id, $comment );
+}
+function akismet_auto_check_comment( $commentdata ) {
+ return Akismet::auto_check_comment( $commentdata );
+}
+function akismet_get_ip_address() {
+ return Akismet::get_ip_address();
+}
+function akismet_cron_recheck() {
+ return Akismet::cron_recheck();
+}
+function akismet_add_comment_nonce() {
+ return Akismet::add_comment_nonce( $post_id );
+}
+function akismet_fix_scheduled_recheck() {
+ return Akismet::fix_scheduled_recheck();
+}
+function akismet_spam_comments() {
+ _deprecated_function( __FUNCTION__, '3.0' );
+
+ return array();
+}
+function akismet_spam_totals() {
+ _deprecated_function( __FUNCTION__, '3.0' );
+
+ return array();
+}
+function akismet_manage_page() {
+ _deprecated_function( __FUNCTION__, '3.0' );
+}
+function akismet_caught() {
+ _deprecated_function( __FUNCTION__, '3.0' );
+}
+function redirect_old_akismet_urls() {
+ _deprecated_function( __FUNCTION__, '3.0' );
+}
+function akismet_kill_proxy_check( $option ) {
+ _deprecated_function( __FUNCTION__, '3.0' );
+
+ return 0;
+}
+function akismet_pingback_forwarded_for( $r, $url ) {
+ return Akismet::pingback_forwarded_for( $r, $url );
+}
+function akismet_pre_check_pingback( $method ) {
+ return Akismet::pre_check_pingback( $method );
+} \ No newline at end of file