From a70deb779fa614d9867f634c94a2cd9e84681ee9 Mon Sep 17 00:00:00 2001
From: root <root@rivolta.investici.org>
Date: Mon, 14 Feb 2011 21:40:37 +0000
Subject: [PATCH] Import wordpress 3.0.5
---
readme.html | 4 +-
wp-admin/async-upload.php | 7 +
wp-admin/includes/post.php | 2 +
wp-admin/includes/template.php | 8 +-
wp-admin/includes/update-core.php | 2 +-
wp-admin/js/post.dev.js | 35 +-
wp-admin/js/post.js | 2 +-
wp-content/plugins/akismet/admin.php | 282 +----
wp-content/plugins/akismet/akismet.php | 1013 ++++++++++++-----
wp-content/plugins/akismet/readme.txt | 51 +-
.../themes/twentyten/languages/twentyten.pot | 285 ++---
wp-includes/default-filters.php | 7 +-
wp-includes/kses.php | 33 +-
wp-includes/pluggable.php | 2 +-
wp-includes/script-loader.php | 2 +-
wp-includes/version.php | 22 +-
16 files changed, 972 insertions(+), 785 deletions(-)
diff --git a/readme.html b/readme.html
index 16433f0d5..09747ce27 100644
--- a/readme.html
+++ b/readme.html
@@ -8,7 +8,7 @@
<body>
<h1 id="logo">
<a href="http://wordpress.org/"><img alt="WordPress" src="wp-admin/images/wordpress-logo.png" width="250" height="68" /></a>
- <br /> Version 3.0.4
+ <br /> Version 3.0.5
</h1>
<p style="text-align: center">Semantic Personal Publishing Platform</p>
@@ -102,7 +102,7 @@
<p>WordPress is the official continuation of <a href="http://cafelog.com/">b2/cafélog</a>, which came from Michel V. The work has been continued by the <a href="http://wordpress.org/about/">WordPress developers</a>. If you would like to support WordPress, please consider <a href="http://wordpress.org/donate/" title="Donate to WordPress">donating</a>.</p>
<h1>Copyright</h1>
-<p>WordPress is released under the <abbr title="GNU Public License">GPL</abbr> (see <a href="license.txt">license.txt</a>).</p>
+<p>WordPress is free software, and is released under the terms of the <abbr title="GNU General Public License">GPL</abbr> version 2 or (at your option) any later version. See <a href="license.txt">license.txt</a>.</p>
</body>
diff --git a/wp-admin/async-upload.php b/wp-admin/async-upload.php
index 4210b0e0c..6fa651817 100644
--- a/wp-admin/async-upload.php
+++ b/wp-admin/async-upload.php
@@ -30,6 +30,13 @@ if ( !current_user_can('upload_files') )
// just fetch the detail form for that attachment
if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
+ $post = get_post( $id );
+ if ( 'attachment' != $post->post_type )
+ wp_die( __( 'Unknown post type.' ) );
+ $post_type_object = get_post_type_object( 'attachment' );
+ if ( ! current_user_can( $post_type_object->cap->edit_post, $id ) )
+ wp_die( __( 'You are not allowed to edit this item.' ) );
+
if ( 2 == $_REQUEST['fetch'] ) {
add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
echo get_media_item($id, array( 'send' => false, 'delete' => true ));
diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
index 6448c9e91..040cd6cab 100644
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -689,6 +689,8 @@ function get_post_meta_by_id( $mid ) {
$mid = (int) $mid;
$meta = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->postmeta WHERE meta_id = %d", $mid) );
+ if ( empty($meta) )
+ return false;
if ( is_serialized_string( $meta->meta_value ) )
$meta->meta_value = maybe_unserialize( $meta->meta_value );
return $meta;
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index ea1c80565..fd7e76f9e 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -1185,16 +1185,16 @@ function get_inline_data($post) {
if ( ! current_user_can($post_type_object->cap->edit_post, $post->ID) )
return;
- $title = esc_attr( get_the_title( $post->ID ) );
+ $title = htmlspecialchars( trim( $post->post_title ), ENT_QUOTES );
echo '
<div class="hidden" id="inline_' . $post->ID . '">
<div class="post_title">' . $title . '</div>
<div class="post_name">' . apply_filters('editable_slug', $post->post_name) . '</div>
<div class="post_author">' . $post->post_author . '</div>
- <div class="comment_status">' . $post->comment_status . '</div>
- <div class="ping_status">' . $post->ping_status . '</div>
- <div class="_status">' . $post->post_status . '</div>
+ <div class="comment_status">' . esc_html( $post->comment_status ) . '</div>
+ <div class="ping_status">' . esc_html( $post->ping_status ) . '</div>
+ <div class="_status">' . esc_html( $post->post_status ) . '</div>
<div class="jj">' . mysql2date( 'd', $post->post_date, false ) . '</div>
<div class="mm">' . mysql2date( 'm', $post->post_date, false ) . '</div>
<div class="aa">' . mysql2date( 'Y', $post->post_date, false ) . '</div>
diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php
index eae7f2428..ca2a1ee04 100644
--- a/wp-admin/includes/update-core.php
+++ b/wp-admin/includes/update-core.php
@@ -274,7 +274,7 @@ function update_core($from, $to) {
$mysql_version = $wpdb->db_version();
$required_php_version = '4.3';
$required_mysql_version = '4.1.2';
- $wp_version = '3.0.4';
+ $wp_version = '3.0.5';
$php_compat = version_compare( $php_version, $required_php_version, '>=' );
$mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
diff --git a/wp-admin/js/post.dev.js b/wp-admin/js/post.dev.js
index fb9a00f08..9a39e08f5 100644
--- a/wp-admin/js/post.dev.js
+++ b/wp-admin/js/post.dev.js
@@ -36,30 +36,39 @@ tagBox = {
},
quickClicks : function(el) {
- var thetags = $('.the-tags', el), tagchecklist = $('.tagchecklist', el), current_tags;
+ var thetags = $('.the-tags', el),
+ tagchecklist = $('.tagchecklist', el),
+ id = $(el).attr('id'),
+ current_tags, disabled;
if ( !thetags.length )
return;
- var disabled = thetags.attr('disabled');
+ disabled = thetags.attr('disabled');
current_tags = thetags.val().split(',');
tagchecklist.empty();
$.each( current_tags, function( key, val ) {
- var txt, button_id, id = $(el).attr('id');
+ var span, xbutton;
- val = $.trim(val);
- if ( !val.match(/^\s+$/) && '' != val ) {
- button_id = id + '-check-num-' + key;
- if ( disabled )
- txt = '<span>' + val + '</span> ';
- else
- txt = '<span><a id="' + button_id + '" class="ntdelbutton">X</a> ' + val + '</span> ';
- tagchecklist.append(txt);
- if ( ! disabled )
- $( '#' + button_id ).click( function(){ tagBox.parseTags(this); });
+ val = $.trim( val );
+
+ if ( ! val )
+ return;
+
+ // Create a new span, and ensure the text is properly escaped.
+ span = $('<span />').text( val );
+
+ // If tags editing isn't disabled, create the X button.
+ if ( ! disabled ) {
+ xbutton = $( '<a id="' + id + '-check-num-' + key + '" class="ntdelbutton">X</a>' );
+ xbutton.click( function(){ tagBox.parseTags(this); });
+ span.prepend(' ').prepend( xbutton );
}
+
+ // Append the span to the tag list.
+ tagchecklist.append( span );
});
},
diff --git a/wp-admin/js/post.js b/wp-admin/js/post.js
index 15733ad5d..6cbcf38a4 100644
--- a/wp-admin/js/post.js
+++ b/wp-admin/js/post.js
@@ -1 +1 @@
-var tagBox,commentsBox,editPermalink,makeSlugeditClickable,WPSetThumbnailHTML,WPSetThumbnailID,WPRemoveThumbnail;function array_unique_noempty(b){var c=[];jQuery.each(b,function(a,d){d=jQuery.trim(d);if(d&&jQuery.inArray(d,c)==-1){c.push(d)}});return c}(function(a){tagBox={clean:function(b){return b.replace(/\s*,\s*/g,",").replace(/,+/g,",").replace(/[,\s]+$/,"").replace(/^[,\s]+/,"")},parseTags:function(e){var h=e.id,b=h.split("-check-num-")[1],d=a(e).closest(".tagsdiv"),g=d.find(".the-tags"),c=g.val().split(","),f=[];delete c[b];a.each(c,function(i,j){j=a.trim(j);if(j){f.push(j)}});g.val(this.clean(f.join(",")));this.quickClicks(d);return false},quickClicks:function(d){var f=a(".the-tags",d),e=a(".tagchecklist",d),b;if(!f.length){return}var c=f.attr("disabled");b=f.val().split(",");e.empty();a.each(b,function(i,j){var g,h,k=a(d).attr("id");j=a.trim(j);if(!j.match(/^\s+$/)&&""!=j){h=k+"-check-num-"+i;if(c){g="<span>"+j+"</span> "}else{g='<span><a id="'+h+'" class="ntdelbutton">X</a> '+j+"</span> "}e.append(g);if(!c){a("#"+h).click(function(){tagBox.parseTags(this)})}}})},flushTags:function(e,b,g){b=b||false;var i,c=a(".the-tags",e),h=a("input.newtag",e),d;i=b?a(b).text():h.val();tagsval=c.val();d=tagsval?tagsval+","+i:i;d=this.clean(d);d=array_unique_noempty(d.split(",")).join(",");c.val(d);this.quickClicks(e);if(!b){h.val("")}if("undefined"==typeof(g)){h.focus()}return false},get:function(c){var b=c.substr(c.indexOf("-")+1);a.post(ajaxurl,{action:"get-tagcloud",tax:b},function(e,d){if(0==e||"success"!=d){e=wpAjax.broken}e=a('<p id="tagcloud-'+b+'" class="the-tagcloud">'+e+"</p>");a("a",e).click(function(){tagBox.flushTags(a(this).closest(".inside").children(".tagsdiv"),this);return false});a("#"+c).after(e)})},init:function(){var b=this,c=a("div.ajaxtag");a(".tagsdiv").each(function(){tagBox.quickClicks(this)});a("input.tagadd",c).click(function(){b.flushTags(a(this).closest(".tagsdiv"))});a("div.taghint",c).click(function(){a(this).css("visibility","hidden").parent().siblings(".newtag").focus()});a("input.newtag",c).blur(function(){if(this.value==""){a(this).parent().siblings(".taghint").css("visibility","")}}).focus(function(){a(this).parent().siblings(".taghint").css("visibility","hidden")}).keyup(function(d){if(13==d.which){tagBox.flushTags(a(this).closest(".tagsdiv"));return false}}).keypress(function(d){if(13==d.which){d.preventDefault();return false}}).each(function(){var d=a(this).closest("div.tagsdiv").attr("id");a(this).suggest(ajaxurl+"?action=ajax-tag-search&tax="+d,{delay:500,minchars:2,multiple:true,multipleSep:","})});a("#post").submit(function(){a("div.tagsdiv").each(function(){tagBox.flushTags(this,false,1)})});a("a.tagcloud-link").click(function(){tagBox.get(a(this).attr("id"));a(this).unbind().click(function(){a(this).siblings(".the-tagcloud").toggle();return false});return false})}};commentsBox={st:0,get:function(d,c){var b=this.st,e;if(!c){c=20}this.st+=c;this.total=d;a("#commentsdiv img.waiting").show();e={action:"get-comments",mode:"single",_ajax_nonce:a("#add_comment_nonce").val(),post_ID:a("#post_ID").val(),start:b,num:c};a.post(ajaxurl,e,function(f){f=wpAjax.parseAjaxResponse(f);a("#commentsdiv .widefat").show();a("#commentsdiv img.waiting").hide();if("object"==typeof f&&f.responses[0]){a("#the-comment-list").append(f.responses[0].data);theList=theExtraList=null;a("a[className*=':']").unbind();setCommentsList();if(commentsBox.st>commentsBox.total){a("#show-comments").hide()}else{a("#show-comments").html(postL10n.showcomm)}return}else{if(1==f){a("#show-comments").parent().html(postL10n.endcomm);return}}a("#the-comment-list").append('<tr><td colspan="2">'+wpAjax.broken+"</td></tr>")});return false}};WPSetThumbnailHTML=function(b){a(".inside","#postimagediv").html(b)};WPSetThumbnailID=function(c){var b=a("input[value=_thumbnail_id]","#list-table");if(b.size()>0){a("#meta\\["+b.attr("id").match(/[0-9]+/)+"\\]\\[value\\]").text(c)}};WPRemoveThumbnail=function(b){a.post(ajaxurl,{action:"set-post-thumbnail",post_id:a("#post_ID").val(),thumbnail_id:-1,_ajax_nonce:b,cookie:encodeURIComponent(document.cookie)},function(c){if(c=="0"){alert(setPostThumbnailL10n.error)}else{WPSetThumbnailHTML(c)}})}})(jQuery);jQuery(document).ready(function(e){var b,a,f="";postboxes.add_postbox_toggles(pagenow);if(e("#tagsdiv-post_tag").length){tagBox.init()}else{e("#side-sortables, #normal-sortables, #advanced-sortables").children("div.postbox").each(function(){if(this.id.indexOf("tagsdiv-")===0){tagBox.init();return false}})}e(".categorydiv").each(function(){var l=e(this).attr("id"),h=false,k,m,j,g,i;j=l.split("-");j.shift();g=j.join("-");i=g+"_tab";if(g=="category"){i="cats"}e("a","#"+g+"-tabs").click(function(){var n=e(this).attr("href");e(this).parent().addClass("tabs").siblings("li").removeClass("tabs");e("#"+g+"-tabs").siblings(".tabs-panel").hide();e(n).show();if("#"+g+"-all"==n){deleteUserSetting(i)}else{setUserSetting(i,"pop")}return false});if(getUserSetting(i)){e('a[href="#'+g+'-pop"]',"#"+g+"-tabs").click()}e("#new"+g).one("focus",function(){e(this).val("").removeClass("form-input-tip")});e("#"+g+"-add-submit").click(function(){e("#new"+g).focus()});k=function(){if(h){return}h=true;var n=jQuery(this),p=n.is(":checked"),o=n.val().toString();e("#in-"+g+"-"+o+", #in-"+g+"-category-"+o).attr("checked",p);h=false};catAddBefore=function(n){if(!e("#new"+g).val()){return false}n.data+="&"+e(":checked","#"+g+"checklist").serialize();return n};m=function(q,p){var o,n=e("#new"+g+"_parent");if("undefined"!=p.parsed.responses[0]&&(o=p.parsed.responses[0].supplemental.newcat_parent)){n.before(o);n.remove()}};e("#"+g+"checklist").wpList({alt:"",response:g+"-ajax-response",addBefore:catAddBefore,addAfter:m});e("#"+g+"-add-toggle").click(function(){e("#"+g+"-adder").toggleClass("wp-hidden-children");e('a[href="#'+g+'-all"]',"#"+g+"-tabs").click();e("#new"+g).focus();return false});e("#"+g+"checklist li.popular-category :checkbox, #"+g+"checklist-pop :checkbox").live("click",function(){var n=e(this),p=n.is(":checked"),o=n.val();if(o&&n.parents("#taxonomy-"+g).length){e("#in-"+g+"-"+o+", #in-popular-"+g+"-"+o).attr("checked",p)}})});if(e("#postcustom").length){e("#the-list").wpList({addAfter:function(g,h){e("table#list-table").show()},addBefore:function(g){g.data+="&post_id="+e("#post_ID").val();return g}})}if(e("#submitdiv").length){b=e("#timestamp").html();a=e("#post-visibility-display").html();function d(){var g=e("#post-visibility-select");if(e("input:radio:checked",g).val()!="public"){e("#sticky").attr("checked",false);e("#sticky-span").hide()}else{e("#sticky-span").show()}if(e("input:radio:checked",g).val()!="password"){e("#password-span").hide()}else{e("#password-span").show()}}function c(){var n,p,h,r,o="page"==pagenow||"page-new"==pagenow,q=e("#post_status"),i=e("option[value=publish]",q),g=e("#aa").val(),l=e("#mm").val(),m=e("#jj").val(),k=e("#hh").val(),j=e("#mn").val();n=new Date(g,l-1,m,k,j);p=new Date(e("#hidden_aa").val(),e("#hidden_mm").val()-1,e("#hidden_jj").val(),e("#hidden_hh").val(),e("#hidden_mn").val());h=new Date(e("#cur_aa").val(),e("#cur_mm").val()-1,e("#cur_jj").val(),e("#cur_hh").val(),e("#cur_mn").val());if(n.getFullYear()!=g||(1+n.getMonth())!=l||n.getDate()!=m||n.getMinutes()!=j){e(".timestamp-wrap","#timestampdiv").addClass("form-invalid");return false}else{e(".timestamp-wrap","#timestampdiv").removeClass("form-invalid")}if(n>h&&e("#original_post_status").val()!="future"){r=postL10n.publishOnFuture;e("#publish").val(postL10n.schedule)}else{if(n<=h&&e("#original_post_status").val()!="publish"){r=postL10n.publishOn;e("#publish").val(postL10n.publish)}else{r=postL10n.publishOnPast;if(o){e("#publish").val(postL10n.updatePage)}else{e("#publish").val(postL10n.updatePost)}}}if(p.toUTCString()==n.toUTCString()){e("#timestamp").html(b)}else{e("#timestamp").html(r+" <b>"+e("option[value="+e("#mm").val()+"]","#mm").text()+" "+m+", "+g+" @ "+k+":"+j+"</b> ")}if(e("input:radio:checked","#post-visibility-select").val()=="private"){if(o){e("#publish").val(postL10n.updatePage)}else{e("#publish").val(postL10n.updatePost)}if(i.length==0){q.append('<option value="publish">'+postL10n.privatelyPublished+"</option>")}else{i.html(postL10n.privatelyPublished)}e("option[value=publish]",q).attr("selected",true);e(".edit-post-status","#misc-publishing-actions").hide()}else{if(e("#original_post_status").val()=="future"||e("#original_post_status").val()=="draft"){if(i.length){i.remove();q.val(e("#hidden_post_status").val())}}else{i.html(postL10n.published)}if(q.is(":hidden")){e(".edit-post-status","#misc-publishing-actions").show()}}e("#post-status-display").html(e("option:selected",q).text());if(e("option:selected",q).val()=="private"||e("option:selected",q).val()=="publish"){e("#save-post").hide()}else{e("#save-post").show();if(e("option:selected",q).val()=="pending"){e("#save-post").show().val(postL10n.savePending)}else{e("#save-post").show().val(postL10n.saveDraft)}}return true}e(".edit-visibility","#visibility").click(function(){if(e("#post-visibility-select").is(":hidden")){d();e("#post-visibility-select").slideDown("normal");e(this).hide()}return false});e(".cancel-post-visibility","#post-visibility-select").click(function(){e("#post-visibility-select").slideUp("normal");e("#visibility-radio-"+e("#hidden-post-visibility").val()).attr("checked",true);e("#post_password").val(e("#hidden_post_password").val());e("#sticky").attr("checked",e("#hidden-post-sticky").attr("checked"));e("#post-visibility-display").html(a);e(".edit-visibility","#visibility").show();c();return false});e(".save-post-visibility","#post-visibility-select").click(function(){var g=e("#post-visibility-select");g.slideUp("normal");e(".edit-visibility","#visibility").show();c();if(e("input:radio:checked",g).val()!="public"){e("#sticky").attr("checked",false)}if(true==e("#sticky").attr("checked")){f="Sticky"}else{f=""}e("#post-visibility-display").html(postL10n[e("input:radio:checked",g).val()+f]);return false});e("input:radio","#post-visibility-select").change(function(){d()});e("#timestampdiv").siblings("a.edit-timestamp").click(function(){if(e("#timestampdiv").is(":hidden")){e("#timestampdiv").slideDown("normal");e(this).hide()}return false});e(".cancel-timestamp","#timestampdiv").click(function(){e("#timestampdiv").slideUp("normal");e("#mm").val(e("#hidden_mm").val());e("#jj").val(e("#hidden_jj").val());e("#aa").val(e("#hidden_aa").val());e("#hh").val(e("#hidden_hh").val());e("#mn").val(e("#hidden_mn").val());e("#timestampdiv").siblings("a.edit-timestamp").show();c();return false});e(".save-timestamp","#timestampdiv").click(function(){if(c()){e("#timestampdiv").slideUp("normal");e("#timestampdiv").siblings("a.edit-timestamp").show()}return false});e("#post-status-select").siblings("a.edit-post-status").click(function(){if(e("#post-status-select").is(":hidden")){e("#post-status-select").slideDown("normal");e(this).hide()}return false});e(".save-post-status","#post-status-select").click(function(){e("#post-status-select").slideUp("normal");e("#post-status-select").siblings("a.edit-post-status").show();c();return false});e(".cancel-post-status","#post-status-select").click(function(){e("#post-status-select").slideUp("normal");e("#post_status").val(e("#hidden_post_status").val());e("#post-status-select").siblings("a.edit-post-status").show();c();return false})}if(e("#edit-slug-box").length){editPermalink=function(g){var h,l=0,k=e("#editable-post-name"),m=k.html(),p=e("#post_name"),q=p.val(),n=e("#edit-slug-buttons"),o=n.html(),j=e("#editable-post-name-full").html();e("#view-post-btn").hide();n.html('<a href="#" class="save button">'+postL10n.ok+'</a> <a class="cancel" href="#">'+postL10n.cancel+"</a>");n.children(".save").click(function(){var i=k.children("input").val();e.post(ajaxurl,{action:"sample-permalink",post_id:g,new_slug:i,new_title:e("#title").val(),samplepermalinknonce:e("#samplepermalinknonce").val()},function(r){e("#edit-slug-box").html(r);n.html(o);p.attr("value",i);makeSlugeditClickable();e("#view-post-btn").show()});return false});e(".cancel","#edit-slug-buttons").click(function(){e("#view-post-btn").show();k.html(m);n.html(o);p.attr("value",q);return false});for(h=0;h<j.length;++h){if("%"==j.charAt(h)){l++}}slug_value=(l>j.length/4)?"":j;k.html('<input type="text" id="new-post-slug" value="'+slug_value+'" />').children("input").keypress(function(r){var i=r.keyCode||0;if(13==i){n.children(".save").click();return false}if(27==i){n.children(".cancel").click();return false}p.attr("value",this.value)}).focus()};makeSlugeditClickable=function(){e("#editable-post-name").click(function(){e("#edit-slug-buttons").children(".edit-slug").click()})};makeSlugeditClickable()}if(e("#title").val()==""){e("#title").siblings("#title-prompt-text").css("visibility","")}e("#title-prompt-text").click(function(){e(this).css("visibility","hidden").siblings("#title").focus()});e("#title").blur(function(){if(this.value==""){e(this).siblings("#title-prompt-text").css("visibility","")}}).focus(function(){e(this).siblings("#title-prompt-text").css("visibility","hidden")}).keydown(function(g){e(this).siblings("#title-prompt-text").css("visibility","hidden");e(this).unbind(g)})});
\ No newline at end of file
+var tagBox,commentsBox,editPermalink,makeSlugeditClickable,WPSetThumbnailHTML,WPSetThumbnailID,WPRemoveThumbnail;function array_unique_noempty(b){var c=[];jQuery.each(b,function(a,d){d=jQuery.trim(d);if(d&&jQuery.inArray(d,c)==-1){c.push(d)}});return c}(function(a){tagBox={clean:function(b){return b.replace(/\s*,\s*/g,",").replace(/,+/g,",").replace(/[,\s]+$/,"").replace(/^[,\s]+/,"")},parseTags:function(e){var h=e.id,b=h.split("-check-num-")[1],d=a(e).closest(".tagsdiv"),g=d.find(".the-tags"),c=g.val().split(","),f=[];delete c[b];a.each(c,function(i,j){j=a.trim(j);if(j){f.push(j)}});g.val(this.clean(f.join(",")));this.quickClicks(d);return false},quickClicks:function(d){var g=a(".the-tags",d),e=a(".tagchecklist",d),f=a(d).attr("id"),b,c;if(!g.length){return}c=g.attr("disabled");b=g.val().split(",");e.empty();a.each(b,function(i,k){var j,h;k=a.trim(k);if(!k){return}j=a("<span />").text(k);if(!c){h=a('<a id="'+f+"-check-num-"+i+'" class="ntdelbutton">X</a>');h.click(function(){tagBox.parseTags(this)});j.prepend(" ").prepend(h)}e.append(j)})},flushTags:function(e,b,g){b=b||false;var i,c=a(".the-tags",e),h=a("input.newtag",e),d;i=b?a(b).text():h.val();tagsval=c.val();d=tagsval?tagsval+","+i:i;d=this.clean(d);d=array_unique_noempty(d.split(",")).join(",");c.val(d);this.quickClicks(e);if(!b){h.val("")}if("undefined"==typeof(g)){h.focus()}return false},get:function(c){var b=c.substr(c.indexOf("-")+1);a.post(ajaxurl,{action:"get-tagcloud",tax:b},function(e,d){if(0==e||"success"!=d){e=wpAjax.broken}e=a('<p id="tagcloud-'+b+'" class="the-tagcloud">'+e+"</p>");a("a",e).click(function(){tagBox.flushTags(a(this).closest(".inside").children(".tagsdiv"),this);return false});a("#"+c).after(e)})},init:function(){var b=this,c=a("div.ajaxtag");a(".tagsdiv").each(function(){tagBox.quickClicks(this)});a("input.tagadd",c).click(function(){b.flushTags(a(this).closest(".tagsdiv"))});a("div.taghint",c).click(function(){a(this).css("visibility","hidden").parent().siblings(".newtag").focus()});a("input.newtag",c).blur(function(){if(this.value==""){a(this).parent().siblings(".taghint").css("visibility","")}}).focus(function(){a(this).parent().siblings(".taghint").css("visibility","hidden")}).keyup(function(d){if(13==d.which){tagBox.flushTags(a(this).closest(".tagsdiv"));return false}}).keypress(function(d){if(13==d.which){d.preventDefault();return false}}).each(function(){var d=a(this).closest("div.tagsdiv").attr("id");a(this).suggest(ajaxurl+"?action=ajax-tag-search&tax="+d,{delay:500,minchars:2,multiple:true,multipleSep:","})});a("#post").submit(function(){a("div.tagsdiv").each(function(){tagBox.flushTags(this,false,1)})});a("a.tagcloud-link").click(function(){tagBox.get(a(this).attr("id"));a(this).unbind().click(function(){a(this).siblings(".the-tagcloud").toggle();return false});return false})}};commentsBox={st:0,get:function(d,c){var b=this.st,e;if(!c){c=20}this.st+=c;this.total=d;a("#commentsdiv img.waiting").show();e={action:"get-comments",mode:"single",_ajax_nonce:a("#add_comment_nonce").val(),post_ID:a("#post_ID").val(),start:b,num:c};a.post(ajaxurl,e,function(f){f=wpAjax.parseAjaxResponse(f);a("#commentsdiv .widefat").show();a("#commentsdiv img.waiting").hide();if("object"==typeof f&&f.responses[0]){a("#the-comment-list").append(f.responses[0].data);theList=theExtraList=null;a("a[className*=':']").unbind();setCommentsList();if(commentsBox.st>commentsBox.total){a("#show-comments").hide()}else{a("#show-comments").html(postL10n.showcomm)}return}else{if(1==f){a("#show-comments").parent().html(postL10n.endcomm);return}}a("#the-comment-list").append('<tr><td colspan="2">'+wpAjax.broken+"</td></tr>")});return false}};WPSetThumbnailHTML=function(b){a(".inside","#postimagediv").html(b)};WPSetThumbnailID=function(c){var b=a("input[value=_thumbnail_id]","#list-table");if(b.size()>0){a("#meta\\["+b.attr("id").match(/[0-9]+/)+"\\]\\[value\\]").text(c)}};WPRemoveThumbnail=function(b){a.post(ajaxurl,{action:"set-post-thumbnail",post_id:a("#post_ID").val(),thumbnail_id:-1,_ajax_nonce:b,cookie:encodeURIComponent(document.cookie)},function(c){if(c=="0"){alert(setPostThumbnailL10n.error)}else{WPSetThumbnailHTML(c)}})}})(jQuery);jQuery(document).ready(function(e){var b,a,f="";postboxes.add_postbox_toggles(pagenow);if(e("#tagsdiv-post_tag").length){tagBox.init()}else{e("#side-sortables, #normal-sortables, #advanced-sortables").children("div.postbox").each(function(){if(this.id.indexOf("tagsdiv-")===0){tagBox.init();return false}})}e(".categorydiv").each(function(){var l=e(this).attr("id"),h=false,k,m,j,g,i;j=l.split("-");j.shift();g=j.join("-");i=g+"_tab";if(g=="category"){i="cats"}e("a","#"+g+"-tabs").click(function(){var n=e(this).attr("href");e(this).parent().addClass("tabs").siblings("li").removeClass("tabs");e("#"+g+"-tabs").siblings(".tabs-panel").hide();e(n).show();if("#"+g+"-all"==n){deleteUserSetting(i)}else{setUserSetting(i,"pop")}return false});if(getUserSetting(i)){e('a[href="#'+g+'-pop"]',"#"+g+"-tabs").click()}e("#new"+g).one("focus",function(){e(this).val("").removeClass("form-input-tip")});e("#"+g+"-add-submit").click(function(){e("#new"+g).focus()});k=function(){if(h){return}h=true;var n=jQuery(this),p=n.is(":checked"),o=n.val().toString();e("#in-"+g+"-"+o+", #in-"+g+"-category-"+o).attr("checked",p);h=false};catAddBefore=function(n){if(!e("#new"+g).val()){return false}n.data+="&"+e(":checked","#"+g+"checklist").serialize();return n};m=function(q,p){var o,n=e("#new"+g+"_parent");if("undefined"!=p.parsed.responses[0]&&(o=p.parsed.responses[0].supplemental.newcat_parent)){n.before(o);n.remove()}};e("#"+g+"checklist").wpList({alt:"",response:g+"-ajax-response",addBefore:catAddBefore,addAfter:m});e("#"+g+"-add-toggle").click(function(){e("#"+g+"-adder").toggleClass("wp-hidden-children");e('a[href="#'+g+'-all"]',"#"+g+"-tabs").click();e("#new"+g).focus();return false});e("#"+g+"checklist li.popular-category :checkbox, #"+g+"checklist-pop :checkbox").live("click",function(){var n=e(this),p=n.is(":checked"),o=n.val();if(o&&n.parents("#taxonomy-"+g).length){e("#in-"+g+"-"+o+", #in-popular-"+g+"-"+o).attr("checked",p)}})});if(e("#postcustom").length){e("#the-list").wpList({addAfter:function(g,h){e("table#list-table").show()},addBefore:function(g){g.data+="&post_id="+e("#post_ID").val();return g}})}if(e("#submitdiv").length){b=e("#timestamp").html();a=e("#post-visibility-display").html();function d(){var g=e("#post-visibility-select");if(e("input:radio:checked",g).val()!="public"){e("#sticky").attr("checked",false);e("#sticky-span").hide()}else{e("#sticky-span").show()}if(e("input:radio:checked",g).val()!="password"){e("#password-span").hide()}else{e("#password-span").show()}}function c(){var n,p,h,r,o="page"==pagenow||"page-new"==pagenow,q=e("#post_status"),i=e("option[value=publish]",q),g=e("#aa").val(),l=e("#mm").val(),m=e("#jj").val(),k=e("#hh").val(),j=e("#mn").val();n=new Date(g,l-1,m,k,j);p=new Date(e("#hidden_aa").val(),e("#hidden_mm").val()-1,e("#hidden_jj").val(),e("#hidden_hh").val(),e("#hidden_mn").val());h=new Date(e("#cur_aa").val(),e("#cur_mm").val()-1,e("#cur_jj").val(),e("#cur_hh").val(),e("#cur_mn").val());if(n.getFullYear()!=g||(1+n.getMonth())!=l||n.getDate()!=m||n.getMinutes()!=j){e(".timestamp-wrap","#timestampdiv").addClass("form-invalid");return false}else{e(".timestamp-wrap","#timestampdiv").removeClass("form-invalid")}if(n>h&&e("#original_post_status").val()!="future"){r=postL10n.publishOnFuture;e("#publish").val(postL10n.schedule)}else{if(n<=h&&e("#original_post_status").val()!="publish"){r=postL10n.publishOn;e("#publish").val(postL10n.publish)}else{r=postL10n.publishOnPast;if(o){e("#publish").val(postL10n.updatePage)}else{e("#publish").val(postL10n.updatePost)}}}if(p.toUTCString()==n.toUTCString()){e("#timestamp").html(b)}else{e("#timestamp").html(r+" <b>"+e("option[value="+e("#mm").val()+"]","#mm").text()+" "+m+", "+g+" @ "+k+":"+j+"</b> ")}if(e("input:radio:checked","#post-visibility-select").val()=="private"){if(o){e("#publish").val(postL10n.updatePage)}else{e("#publish").val(postL10n.updatePost)}if(i.length==0){q.append('<option value="publish">'+postL10n.privatelyPublished+"</option>")}else{i.html(postL10n.privatelyPublished)}e("option[value=publish]",q).attr("selected",true);e(".edit-post-status","#misc-publishing-actions").hide()}else{if(e("#original_post_status").val()=="future"||e("#original_post_status").val()=="draft"){if(i.length){i.remove();q.val(e("#hidden_post_status").val())}}else{i.html(postL10n.published)}if(q.is(":hidden")){e(".edit-post-status","#misc-publishing-actions").show()}}e("#post-status-display").html(e("option:selected",q).text());if(e("option:selected",q).val()=="private"||e("option:selected",q).val()=="publish"){e("#save-post").hide()}else{e("#save-post").show();if(e("option:selected",q).val()=="pending"){e("#save-post").show().val(postL10n.savePending)}else{e("#save-post").show().val(postL10n.saveDraft)}}return true}e(".edit-visibility","#visibility").click(function(){if(e("#post-visibility-select").is(":hidden")){d();e("#post-visibility-select").slideDown("normal");e(this).hide()}return false});e(".cancel-post-visibility","#post-visibility-select").click(function(){e("#post-visibility-select").slideUp("normal");e("#visibility-radio-"+e("#hidden-post-visibility").val()).attr("checked",true);e("#post_password").val(e("#hidden_post_password").val());e("#sticky").attr("checked",e("#hidden-post-sticky").attr("checked"));e("#post-visibility-display").html(a);e(".edit-visibility","#visibility").show();c();return false});e(".save-post-visibility","#post-visibility-select").click(function(){var g=e("#post-visibility-select");g.slideUp("normal");e(".edit-visibility","#visibility").show();c();if(e("input:radio:checked",g).val()!="public"){e("#sticky").attr("checked",false)}if(true==e("#sticky").attr("checked")){f="Sticky"}else{f=""}e("#post-visibility-display").html(postL10n[e("input:radio:checked",g).val()+f]);return false});e("input:radio","#post-visibility-select").change(function(){d()});e("#timestampdiv").siblings("a.edit-timestamp").click(function(){if(e("#timestampdiv").is(":hidden")){e("#timestampdiv").slideDown("normal");e(this).hide()}return false});e(".cancel-timestamp","#timestampdiv").click(function(){e("#timestampdiv").slideUp("normal");e("#mm").val(e("#hidden_mm").val());e("#jj").val(e("#hidden_jj").val());e("#aa").val(e("#hidden_aa").val());e("#hh").val(e("#hidden_hh").val());e("#mn").val(e("#hidden_mn").val());e("#timestampdiv").siblings("a.edit-timestamp").show();c();return false});e(".save-timestamp","#timestampdiv").click(function(){if(c()){e("#timestampdiv").slideUp("normal");e("#timestampdiv").siblings("a.edit-timestamp").show()}return false});e("#post-status-select").siblings("a.edit-post-status").click(function(){if(e("#post-status-select").is(":hidden")){e("#post-status-select").slideDown("normal");e(this).hide()}return false});e(".save-post-status","#post-status-select").click(function(){e("#post-status-select").slideUp("normal");e("#post-status-select").siblings("a.edit-post-status").show();c();return false});e(".cancel-post-status","#post-status-select").click(function(){e("#post-status-select").slideUp("normal");e("#post_status").val(e("#hidden_post_status").val());e("#post-status-select").siblings("a.edit-post-status").show();c();return false})}if(e("#edit-slug-box").length){editPermalink=function(g){var h,l=0,k=e("#editable-post-name"),m=k.html(),p=e("#post_name"),q=p.val(),n=e("#edit-slug-buttons"),o=n.html(),j=e("#editable-post-name-full").html();e("#view-post-btn").hide();n.html('<a href="#" class="save button">'+postL10n.ok+'</a> <a class="cancel" href="#">'+postL10n.cancel+"</a>");n.children(".save").click(function(){var i=k.children("input").val();e.post(ajaxurl,{action:"sample-permalink",post_id:g,new_slug:i,new_title:e("#title").val(),samplepermalinknonce:e("#samplepermalinknonce").val()},function(r){e("#edit-slug-box").html(r);n.html(o);p.attr("value",i);makeSlugeditClickable();e("#view-post-btn").show()});return false});e(".cancel","#edit-slug-buttons").click(function(){e("#view-post-btn").show();k.html(m);n.html(o);p.attr("value",q);return false});for(h=0;h<j.length;++h){if("%"==j.charAt(h)){l++}}slug_value=(l>j.length/4)?"":j;k.html('<input type="text" id="new-post-slug" value="'+slug_value+'" />').children("input").keypress(function(r){var i=r.keyCode||0;if(13==i){n.children(".save").click();return false}if(27==i){n.children(".cancel").click();return false}p.attr("value",this.value)}).focus()};makeSlugeditClickable=function(){e("#editable-post-name").click(function(){e("#edit-slug-buttons").children(".edit-slug").click()})};makeSlugeditClickable()}if(e("#title").val()==""){e("#title").siblings("#title-prompt-text").css("visibility","")}e("#title-prompt-text").click(function(){e(this).css("visibility","hidden").siblings("#title").focus()});e("#title").blur(function(){if(this.value==""){e(this).siblings("#title-prompt-text").css("visibility","")}}).focus(function(){e(this).siblings("#title-prompt-text").css("visibility","hidden")}).keydown(function(g){e(this).siblings("#title-prompt-text").css("visibility","hidden");e(this).unbind(g)})});
\ No newline at end of file
diff --git a/wp-content/plugins/akismet/admin.php b/wp-content/plugins/akismet/admin.php
index eaef99ce9..a19540394 100644
--- a/wp-content/plugins/akismet/admin.php
+++ b/wp-content/plugins/akismet/admin.php
@@ -7,11 +7,11 @@ 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', '<' ) ) {
+ if ( 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>
+ <div id='akismet-warning' class='updated fade'><p><strong>".sprintf(__('Akismet %s required 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');
@@ -24,11 +24,7 @@ function akismet_admin_init() {
else
$hook = 'dashboard_page_akismet-stats-display';
add_action('admin_head-'.$hook, 'akismet_stats_script');
- add_meta_box('akismet-status', __('Comment History'), 'akismet_comment_status_meta_box', 'comment', 'normal');
- wp_register_style('akismet.css', AKISMET_PLUGIN_URL . 'akismet.css');
- wp_enqueue_style('akismet.css');
- wp_register_script('akismet.js', AKISMET_PLUGIN_URL . 'akismet.js', array('jquery'));
- wp_enqueue_script('akismet.js');
+ add_meta_box('akismet-status', __('Akismet Status'), 'akismet_comment_status_meta_box', 'comment', 'normal');
}
add_action('admin_init', 'akismet_admin_init');
@@ -38,18 +34,9 @@ $akismet_nonce = 'akismet-update-key';
function akismet_config_page() {
if ( function_exists('add_submenu_page') )
add_submenu_page('plugins.php', __('Akismet Configuration'), __('Akismet Configuration'), 'manage_options', 'akismet-key-config', 'akismet_conf');
-}
-
-function akismet_plugin_action_links( $links, $file ) {
- if ( $file == plugin_basename( dirname(__FILE__).'/akismet.php' ) ) {
- $links[] = '<a href="plugins.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, $wpcom_api_key;
@@ -59,15 +46,11 @@ function akismet_conf() {
check_admin_referer( $akismet_nonce );
$key = preg_replace( '/[^a-h0-9]/i', '', $_POST['key'] );
- $home_url = parse_url( get_bloginfo('url') );
if ( empty($key) ) {
$key_status = 'empty';
$ms[] = 'new_key_empty';
delete_option('wordpress_api_key');
- } elseif ( empty($home_url['host']) ) {
- $key_status = 'empty';
- $ms[] = 'bad_home_url';
} else {
$key_status = akismet_verify_key( $key );
}
@@ -85,12 +68,6 @@ function akismet_conf() {
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' );
-
} elseif ( isset($_POST['check']) ) {
akismet_get_server_connectivity(0);
}
@@ -120,24 +97,19 @@ function akismet_conf() {
$messages = array(
'new_key_empty' => array('color' => 'aa0', 'text' => __('Your key has been cleared.')),
- 'new_key_valid' => array('color' => '4AB915', 'text' => __('Your key has been verified. Happy blogging!')),
- 'new_key_invalid' => array('color' => '888', 'text' => __('The key you entered is invalid. Please double-check it.')),
- 'new_key_failed' => array('color' => '888', 'text' => __('The key you entered could not be verified because a connection to akismet.com could not be established. Please check your server configuration.')),
- 'no_connection' => array('color' => '888', 'text' => __('There was a problem connecting to the Akismet server. Please check your server configuration.')),
+ 'new_key_valid' => array('color' => '2d2', 'text' => __('Your key has been verified. Happy blogging!')),
+ 'new_key_invalid' => array('color' => 'd22', 'text' => __('The key you entered is invalid. Please double-check it.')),
+ 'new_key_failed' => array('color' => 'd22', 'text' => __('The key you entered could not be verified because a connection to akismet.com could not be established. Please check your server configuration.')),
+ 'no_connection' => array('color' => 'd22', 'text' => __('There was a problem connecting to the Akismet server. Please check your server configuration.')),
'key_empty' => array('color' => 'aa0', 'text' => sprintf(__('Please enter an API key. (<a href="%s" style="color:#fff">Get your key.</a>)'), 'http://akismet.com/get/')),
- 'key_valid' => array('color' => '4AB915', 'text' => __('This key is valid.')),
- 'key_failed' => array('color' => 'aa0', 'text' => __('The key below was previously validated but a connection to akismet.com can not be established at this time. Please check your server configuration.')),
- 'bad_home_url' => array('color' => '888', 'text' => sprintf( __('Your WordPress home URL %s is invalid. Please fix the <a href="%s">home option</a>.'), esc_html( get_bloginfo('url') ), admin_url('options.php#home') ) ),
- );
+ 'key_valid' => array('color' => '2d2', 'text' => __('This key is valid.')),
+ 'key_failed' => array('color' => 'aa0', 'text' => __('The key below was previously validated but a connection to akismet.com can not be established at this time. Please check your server configuration.')));
?>
<?php if ( !empty($_POST['submit'] ) ) : ?>
<div id="message" class="updated fade"><p><strong><?php _e('Options saved.') ?></strong></p></div>
<?php endif; ?>
<div class="wrap">
<h2><?php _e('Akismet Configuration'); ?></h2>
-<?php if (isset($_GET['message']) && $_GET['message'] == 'success') { ?>
- <div class="updated below-h2" id="message"><p><?php _e( '<strong>Sign up success!</strong> Please check your email for your Akismet API Key and enter it below.' ); ?></p></div>
-<?php } ?>
<div class="narrow">
<form action="" method="post" id="akismet-conf" style="margin: auto; width: 400px; ">
<?php if ( !$wpcom_api_key ) { ?>
@@ -154,8 +126,7 @@ function akismet_conf() {
<?php } ?>
<?php } ?>
<?php akismet_nonce_field($akismet_nonce) ?>
-<p><label><input name="akismet_discard_month" id="akismet_discard_month" value="true" type="checkbox" <?php if ( get_option('akismet_discard_month') == 'true' ) echo ' checked="checked" '; ?> /> <?php _e('Auto-delete spam submitted on posts more than a month old.'); ?></label></p>
-<p><label><input name="akismet_show_user_comments_approved" id="akismet_show_user_comments_approved" value="true" type="checkbox" <?php if ( get_option('akismet_show_user_comments_approved') == 'true' ) echo ' checked="checked" '; ?> /> <?php _e('Show the number of comments you\'ve approved beside each comment author.'); ?></label></p>
+<p><label><input name="akismet_discard_month" id="akismet_discard_month" value="true" type="checkbox" <?php if ( get_option('akismet_discard_month') == 'true' ) echo ' checked="checked" '; ?> /> <?php _e('Automatically discard spam comments on posts older than a month.'); ?></label></p>
<p class="submit"><input type="submit" name="submit" value="<?php _e('Update options »'); ?>" /></p>
</form>
@@ -165,7 +136,7 @@ function akismet_conf() {
<?php
if ( !function_exists('fsockopen') || !function_exists('gethostbynamel') ) {
?>
- <p style="padding: .5em; background-color: #888; color: #fff; font-weight:bold;"><?php _e('Network functions are disabled.'); ?></p>
+ <p style="padding: .5em; background-color: #d22; color: #fff; font-weight:bold;"><?php _e('Network functions are disabled.'); ?></p>
<p><?php echo sprintf( __('Your web host or server administrator has disabled PHP\'s <code>fsockopen</code> or <code>gethostbynamel</code> functions. <strong>Akismet cannot work correctly until this is fixed.</strong> Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet\'s system requirements</a>.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
<?php
} else {
@@ -179,18 +150,18 @@ function akismet_conf() {
<?php
// all connections fail
} elseif ( $fail_count > 0 ) { ?>
- <p style="padding: .5em; background-color: #888; color: #fff; font-weight:bold;"><?php _e('Unable to reach any Akismet servers.'); ?></p>
+ <p style="padding: .5em; background-color: #d22; color: #fff; font-weight:bold;"><?php _e('Unable to reach any Akismet servers.'); ?></p>
<p><?php echo sprintf( __('A network problem or firewall is blocking all connections from your web server to Akismet.com. <strong>Akismet cannot work correctly until this is fixed.</strong> Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet and firewalls</a>.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
<?php
// all connections work
} else { ?>
- <p style="padding: .5em; background-color: #4AB915; color: #fff; font-weight:bold;"><?php _e('All Akismet servers are available.'); ?></p>
+ <p style="padding: .5em; background-color: #2d2; color: #fff; font-weight:bold;"><?php _e('All Akismet servers are available.'); ?></p>
<p><?php _e('Akismet is working correctly. All servers are accessible.'); ?></p>
<?php
}
} else {
?>
- <p style="padding: .5em; background-color: #888; color: #fff; font-weight:bold;"><?php _e('Unable to find Akismet servers.'); ?></p>
+ <p style="padding: .5em; background-color: #d22; color: #fff; font-weight:bold;"><?php _e('Unable to find Akismet servers.'); ?></p>
<p><?php echo sprintf( __('A DNS problem or firewall is preventing all access from your web server to Akismet.com. <strong>Akismet cannot work correctly until this is fixed.</strong> Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet and firewalls</a>.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
<?php
}
@@ -204,11 +175,11 @@ function akismet_conf() {
<?php
asort($servers);
foreach ( $servers as $ip => $status ) {
- $color = ( $status ? '#4AB915' : '#888');
+ $color = ( $status ? '#2d2' : '#d22');
?>
<tr>
<td><?php echo htmlspecialchars($ip); ?></td>
- <td style="padding: 0 .5em; font-weight:bold; color: #fff; background-color: <?php echo $color; ?>"><?php echo ($status ? __('Accessible') : __('Re-trying') ); ?></td>
+ <td style="padding: 0 .5em; font-weight:bold; color: #fff; background-color: <?php echo $color; ?>"><?php echo ($status ? __('No problems') : __('Obstructed') ); ?></td>
<?php
}
@@ -218,7 +189,6 @@ function akismet_conf() {
</table>
<p><?php if ( get_option('akismet_connectivity_time') ) echo sprintf( __('Last checked %s ago.'), human_time_diff( get_option('akismet_connectivity_time') ) ); ?></p>
<p class="submit"><input type="submit" name="check" value="<?php _e('Check network status »'); ?>" /></p>
- <p><?php printf( __('<a href="%s" target="_blank">Click here</a> to confirm that <a href="%s" target="_blank">Akismet.com is up</a>.'), 'http://status.automattic.com/9931/136079/Akismet-API', 'http://status.automattic.com/9931/136079/Akismet-API' ); ?></p>
</form>
</div>
@@ -254,7 +224,7 @@ addLoadEvent(resizeIframeInit);
function akismet_stats_display() {
global $akismet_api_host, $akismet_api_port, $wpcom_api_key;
- $blog = urlencode( get_bloginfo('url') );
+ $blog = urlencode( get_option('home') );
$url = 'http://';
if ( is_ssl() )
@@ -275,13 +245,13 @@ function akismet_stats() {
if ( !$count = get_option('akismet_spam_count') )
return;
$path = plugin_basename(__FILE__);
- echo '<h3>' . _x( 'Spam', 'comments' ) . '</h3>';
+ echo '<h3>'.__('Spam').'</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/', clean_url("$link?page=akismet-admin"), number_format_i18n($count) ).'</p>';
+ echo '<p>'.sprintf(__('<a href="%1$s">Akismet</a> has protected your site from <a href="%2$s">%3$s spam comments</a>.'), 'http://akismet.com/', clean_url("$link?page=akismet-admin"), number_format_i18n($count) ).'</p>';
}
add_action('activity_box_end', 'akismet_stats');
@@ -295,14 +265,10 @@ function akismet_admin_warnings() {
}
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') ) {
+ } elseif ( get_option('akismet_connectivity_time') && empty($_POST) && is_admin() && !akismet_server_connectivity_ok() ) {
function akismet_warning() {
- global $wpdb;
- $waiting = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->commentmeta WHERE meta_key = 'akismet_error'" ) );
- $next_check = human_time_diff( wp_next_scheduled('akismet_schedule_cron_recheck') );
- if ( $waiting > 0 )
- echo "
- <div id='akismet-warning' class='updated fade'><p><strong>".__('Akismet has detected a problem.')."</strong> ".sprintf(_n('A server or network problem prevented Akismet from checking %d comment. It has been temporarily held for moderation and will be automatically re-checked in %s.', 'A server or network problem prevented Akismet from checking %d comments. They have been temporarily held for moderation and will be automatically re-checked in %s.', $waiting), number_format_i18n( $waiting ), $next_check)."</p></div>
+ echo "
+ <div id='akismet-warning' class='updated fade'><p><strong>".__('Akismet has detected a problem.')."</strong> ".sprintf(__('A server or network problem is preventing Akismet from working correctly. <a href="%1$s">Click here for more information</a> about how to fix the problem.'), "plugins.php?page=akismet-key-config")."</p></div>
";
}
add_action('admin_notices', 'akismet_warning');
@@ -313,21 +279,17 @@ function akismet_admin_warnings() {
// 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 );
$user_result = get_comment_meta( $comment->comment_ID, 'akismet_user_result', true);
- $comment_status = wp_get_comment_status( $comment->comment_ID );
$desc = null;
if ( !$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' );
+ if ( $akismet_result == 'true' )
+ $desc = 'Flagged as spam by Akismet';
+ elseif ( $akismet_result == 'false' )
+ $desc = 'Cleared by Akismet';
} else {
$who = get_comment_meta( $comment->comment_ID, 'akismet_user', true );
if ( $user_result == 'true' )
@@ -335,32 +297,16 @@ function akismet_comment_row_action( $a, $comment ) {
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' )
- $b['history'] = '<a href="comment.php?action=editcomment&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&c='.$comment->comment_ID.'#akismet-status" title="' . esc_attr__( 'View comment history' ) . '">'.htmlspecialchars($desc).'</a></span>';
-
- if ( apply_filters( 'akismet_show_user_comments_approved', get_option('akismet_show_user_comments_approved') ) == 'true' ) {
- $comment_count = akimset_get_user_comments_approved( $comment->user_id, $comment->comment_author_email, $comment->comment_author, $comment->comment_author_url );
- 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 ), intval($comment_count) ).'</span></span>';
- }
+ echo '<span style="background: #EEE; border: 1px solid #E4E4E4; margin-top: 3px; color: #999; padding: 1px 8px 2px 8px; -moz-border-radius:6px; border-radius:6px; -webkit-border-radius:6px; float: right; line-height: 1.2em;"><a href="comment.php?action=editcomment&c='.$comment->comment_ID.'#akismet-status" title="' . esc_attr__( 'View comment history' ) . '">'.htmlspecialchars($desc).'</a></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 );
@@ -408,24 +354,6 @@ function akismet_comment_column_row( $column, $comment_id ) {
// 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;
@@ -448,25 +376,30 @@ function akismet_rightnow() {
if ( $count = get_option('akismet_spam_count') ) {
$intro = sprintf( $plural_func(
- '<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. ',
+ '<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/', number_format_i18n( $count ) );
} else {
- $intro = sprintf( __('<a href="%1$s">Akismet</a> blocks spam from getting to your blog. '), 'http://akismet.com/' );
+ $intro = sprintf( __('<a href="%1$s">Akismet</a> blocks spam from getting to your blog,'), 'http://akismet.com/' );
}
if ( $queue_count = akismet_spam_count() ) {
$queue_text = sprintf( $plural_func(
- '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.',
+ 'and there\'s <a href="%2$s">%1$s comment</a> in your spam queue right now.',
+ 'and there are <a href="%2$s">%1$s comments</a> in your spam queue right now.',
$queue_count
), number_format_i18n( $queue_count ), $esc_url($link) );
} else {
- $queue_text = sprintf( __( "There's nothing in your <a href='%1\$s'>spam queue</a> at the moment." ), $esc_url($link) );
+ $queue_text = sprintf( __( " but there's nothing in your <a href='%1\$s'>spam queue</a> at the moment." ), $esc_url($link) );
}
- $text = $intro . '<br />' . $queue_text;
+ // _c was deprecated in WP 2.9.0
+ if ( function_exists( '_x' ) )
+ $text = sprintf( _x( '%1$s%2$s', 'akismet_rightnow' ), $intro, $queue_text );
+ else
+ $text = sprintf( _c( '%1$s%2$s|akismet_rightnow' ), $intro, $queue_text );
+
echo "<p class='akismet-right-now'>$text</p>\n";
}
@@ -492,18 +425,10 @@ function akismet_submit_nonspam_comment ( $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 = get_option('home');
$comment->blog_lang = get_locale();
$comment->blog_charset = get_option('blog_charset');
$comment->permalink = get_permalink($comment->comment_post_ID);
- $comment->reporter_ip = $_SERVER['REMOTE_ADDR'];
if ( is_object($current_user) ) {
$comment->reporter = $current_user->user_login;
}
@@ -515,18 +440,17 @@ function akismet_submit_nonspam_comment ( $comment_id ) {
if ( isset( $comment->user_ID ) )
$comment->user_role = akismet_get_user_roles($comment->user_ID);
- if ( akismet_test_mode() )
- $comment->is_test = 'true';
-
$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' );
+ akismet_update_comment_history( $comment_id, sprintf( __('%s un-spammed this comment'), $comment->reporter ), 'report-ham' );
update_comment_meta( $comment_id, 'akismet_user_result', 'false' );
update_comment_meta( $comment_id, 'akismet_user', $comment->reporter );
+ } else {
+ akismet_update_comment_history( $comment_id, 'A plugin un-spammed this comment', 'report-ham' );
}
do_action('akismet_submit_nonspam_comment', $comment_id, $response[1]);
@@ -541,18 +465,10 @@ function akismet_submit_spam_comment ( $comment_id ) {
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 = get_option('home');
$comment->blog_lang = get_locale();
$comment->blog_charset = get_option('blog_charset');
$comment->permalink = get_permalink($comment->comment_post_ID);
- $comment->reporter_ip = $_SERVER['REMOTE_ADDR'];
if ( is_object($current_user) ) {
$comment->reporter = $current_user->user_login;
}
@@ -561,22 +477,20 @@ function akismet_submit_spam_comment ( $comment_id ) {
}
$comment->user_role = '';
- if ( isset( $comment->user_ID ) )
+ if ( !isset( $comment->user_id ) )
$comment->user_role = akismet_get_user_roles($comment->user_ID);
- if ( akismet_test_mode() )
- $comment->is_test = 'true';
-
$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' );
+ akismet_update_comment_history( $comment_id, sprintf( __('%s spammed this comment'), $comment->reporter ), 'report-spam' );
update_comment_meta( $comment_id, 'akismet_user_result', 'true' );
update_comment_meta( $comment_id, 'akismet_user', $comment->reporter );
- }
+ } else
+ akismet_update_comment_history( $comment_id, 'A plugin spammed this comment', 'report-ham' );
do_action('akismet_submit_spam_comment', $comment_id, $response[1]);
}
@@ -585,36 +499,11 @@ function akismet_transition_comment_status( $new_status, $old_status, $comment )
if ( $new_status == $old_status )
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;
-
- 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 );
- }
+ if ( $new_status == 'spam' ) {
+ akismet_submit_spam_comment( $comment->comment_ID );
+ } elseif ( $old_status == 'spam' && ( $new_status == 'approved' || $new_status == 'unapproved' ) ) {
+ akismet_submit_nonspam_comment( $comment->comment_ID );
}
-
- if ( !get_comment_meta( $comment->comment_ID, 'akismet_rechecking' ) )
- 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 );
@@ -657,7 +546,7 @@ function akismet_recheck_queue() {
$c['user_ip'] = $c['comment_author_IP'];
$c['user_agent'] = $c['comment_agent'];
$c['referrer'] = '';
- $c['blog'] = get_bloginfo('url');
+ $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']);
@@ -666,9 +555,6 @@ function akismet_recheck_queue() {
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 = '';
@@ -696,57 +582,3 @@ function akismet_recheck_queue() {
}
add_action('admin_action_akismet_recheck_queue', 'akismet_recheck_queue');
-
-// 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) );
-}
-
diff --git a/wp-content/plugins/akismet/akismet.php b/wp-content/plugins/akismet/akismet.php
index f106d79f1..7059bef4c 100644
--- a/wp-content/plugins/akismet/akismet.php
+++ b/wp-content/plugins/akismet/akismet.php
@@ -5,31 +5,29 @@
/*
Plugin Name: Akismet
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 track-back spam</strong>. It keeps your site protected from spam even while you sleep. To get started: 1) Click the "Activate" link to the left of this description, 2) <a href="http://akismet.com/get/?return=true">Sign up for an Akismet API key</a>, and 3) Go to your <a href="plugins.php?page=akismet-key-config">Akismet configuration</a> page, and save your API key.
-Version: 2.5.1
+Description: Akismet checks your comments against the Akismet web service to see if they look like spam or not. You need an <a href="http://akismet.com/get/">API key</a> to use it. You can review the spam it catches under "Comments." To show off your Akismet stats just put <code><?php akismet_counter(); ?></code> in your template. See also: <a href="http://wordpress.org/extend/plugins/stats/">WP Stats plugin</a>.
+Version: 2.4.0
Author: Automattic
Author URI: http://automattic.com/wordpress-plugins/
License: GPLv2
*/
/*
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-define('AKISMET_VERSION', '2.5.0');
-define('AKISMET_PLUGIN_URL', plugin_dir_url( __FILE__ ));
+define('AKISMET_VERSION', '2.4.0');
/** If you hardcode a WP.com API key here, all key config screens will be hidden */
if ( defined('WPCOM_API_KEY') )
@@ -43,13 +41,8 @@ if ( !function_exists( 'add_action' ) ) {
exit;
}
-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';
+if ( $wp_db_version <= 9872 )
+ include_once( dirname(__FILE__) . '/legacy.php' );
function akismet_init() {
global $wpcom_api_key, $akismet_api_host, $akismet_api_port;
@@ -60,9 +53,251 @@ function akismet_init() {
$akismet_api_host = get_option('wordpress_api_key') . '.rest.akismet.com';
$akismet_api_port = 80;
+ add_action('admin_menu', 'akismet_config_page');
+ add_action('admin_menu', 'akismet_stats_page');
+ akismet_admin_warnings();
}
add_action('init', 'akismet_init');
+function akismet_admin_init() {
+ 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_action('admin_head-'.$hook, 'akismet_stats_script');
+}
+add_action('admin_init', 'akismet_admin_init');
+
+if ( !function_exists('wp_nonce_field') ) {
+ function akismet_nonce_field($action = -1) { return; }
+ $akismet_nonce = -1;
+} else {
+ function akismet_nonce_field($action = -1) { return wp_nonce_field($action); }
+ $akismet_nonce = 'akismet-update-key';
+}
+
+if ( !function_exists('number_format_i18n') ) {
+ function number_format_i18n( $number, $decimals = null ) { return number_format( $number, $decimals ); }
+}
+
+function akismet_config_page() {
+ if ( function_exists('add_submenu_page') )
+ add_submenu_page('plugins.php', __('Akismet Configuration'), __('Akismet Configuration'), 'manage_options', 'akismet-key-config', 'akismet_conf');
+
+}
+
+function akismet_conf() {
+ global $akismet_nonce, $wpcom_api_key;
+
+ if ( isset($_POST['submit']) ) {
+ if ( function_exists('current_user_can') && !current_user_can('manage_options') )
+ die(__('Cheatin’ uh?'));
+
+ check_admin_referer( $akismet_nonce );
+ $key = preg_replace( '/[^a-h0-9]/i', '', $_POST['key'] );
+
+ if ( empty($key) ) {
+ $key_status = 'empty';
+ $ms[] = 'new_key_empty';
+ delete_option('wordpress_api_key');
+ } else {
+ $key_status = akismet_verify_key( $key );
+ }
+
+ if ( $key_status == 'valid' ) {
+ update_option('wordpress_api_key', $key);
+ $ms[] = 'new_key_valid';
+ } else if ( $key_status == 'invalid' ) {
+ $ms[] = 'new_key_invalid';
+ } else if ( $key_status == 'failed' ) {
+ $ms[] = 'new_key_failed';
+ }
+
+ if ( isset( $_POST['akismet_discard_month'] ) )
+ update_option( 'akismet_discard_month', 'true' );
+ else
+ update_option( 'akismet_discard_month', 'false' );
+ } elseif ( isset($_POST['check']) ) {
+ akismet_get_server_connectivity(0);
+ }
+
+ if ( empty( $key_status) || $key_status != 'valid' ) {
+ $key = get_option('wordpress_api_key');
+ if ( empty( $key ) ) {
+ if ( empty( $key_status ) || $key_status != 'failed' ) {
+ if ( akismet_verify_key( '1234567890ab' ) == 'failed' )
+ $ms[] = 'no_connection';
+ else
+ $ms[] = 'key_empty';
+ }
+ $key_status = 'empty';
+ } else {
+ $key_status = akismet_verify_key( $key );
+ }
+ if ( $key_status == 'valid' ) {
+ $ms[] = 'key_valid';
+ } else if ( $key_status == 'invalid' ) {
+ delete_option('wordpress_api_key');
+ $ms[] = 'key_empty';
+ } else if ( !empty($key) && $key_status == 'failed' ) {
+ $ms[] = 'key_failed';
+ }
+ }
+
+ $messages = array(
+ 'new_key_empty' => array('color' => 'aa0', 'text' => __('Your key has been cleared.')),
+ 'new_key_valid' => array('color' => '2d2', 'text' => __('Your key has been verified. Happy blogging!')),
+ 'new_key_invalid' => array('color' => 'd22', 'text' => __('The key you entered is invalid. Please double-check it.')),
+ 'new_key_failed' => array('color' => 'd22', 'text' => __('The key you entered could not be verified because a connection to akismet.com could not be established. Please check your server configuration.')),
+ 'no_connection' => array('color' => 'd22', 'text' => __('There was a problem connecting to the Akismet server. Please check your server configuration.')),
+ 'key_empty' => array('color' => 'aa0', 'text' => sprintf(__('Please enter an API key. (<a href="%s" style="color:#fff">Get your key.</a>)'), 'http://akismet.com/get/')),
+ 'key_valid' => array('color' => '2d2', 'text' => __('This key is valid.')),
+ 'key_failed' => array('color' => 'aa0', 'text' => __('The key below was previously validated but a connection to akismet.com can not be established at this time. Please check your server configuration.')));
+?>
+<?php if ( !empty($_POST['submit'] ) ) : ?>
+<div id="message" class="updated fade"><p><strong><?php _e('Options saved.') ?></strong></p></div>
+<?php endif; ?>
+<div class="wrap">
+<h2><?php _e('Akismet Configuration'); ?></h2>
+<div class="narrow">
+<form action="" method="post" id="akismet-conf" style="margin: auto; width: 400px; ">
+<?php if ( !$wpcom_api_key ) { ?>
+ <p><?php printf(__('For many people, <a href="%1$s">Akismet</a> will greatly reduce or even completely eliminate the comment and trackback spam you get on your site. If one does happen to get through, simply mark it as "spam" on the moderation screen and Akismet will learn from the mistakes. If you don\'t have an API key yet, you can get one at <a href="%2$s">Akismet.com</a>.'), 'http://akismet.com/', 'http://akismet.com/get/'); ?></p>
+
+<h3><label for="key"><?php _e('Akismet API Key'); ?></label></h3>
+<?php foreach ( $ms as $m ) : ?>
+ <p style="padding: .5em; background-color: #<?php echo $messages[$m]['color']; ?>; color: #fff; font-weight: bold;"><?php echo $messages[$m]['text']; ?></p>
+<?php endforeach; ?>
+<p><input id="key" name="key" type="text" size="15" maxlength="12" value="<?php echo get_option('wordpress_api_key'); ?>" style="font-family: 'Courier New', Courier, mono; font-size: 1.5em;" /> (<?php _e('<a href="http://akismet.com/get/">What is this?</a>'); ?>)</p>
+<?php if ( isset( $invalid_key) && $invalid_key ) { ?>
+<h3><?php _e('Why might my key be invalid?'); ?></h3>
+<p><?php _e('This can mean one of two things, either you copied the key wrong or that the plugin is unable to reach the Akismet servers, which is most often caused by an issue with your web host around firewalls or similar.'); ?></p>
+<?php } ?>
+<?php } ?>
+<?php akismet_nonce_field($akismet_nonce) ?>
+<p><label><input name="akismet_discard_month" id="akismet_discard_month" value="true" type="checkbox" <?php if ( get_option('akismet_discard_month') == 'true' ) echo ' checked="checked" '; ?> /> <?php _e('Automatically discard spam comments on posts older than a month.'); ?></label></p>
+ <p class="submit"><input type="submit" name="submit" value="<?php _e('Update options »'); ?>" /></p>
+</form>
+
+<form action="" method="post" id="akismet-connectivity" style="margin: auto; width: 400px; ">
+
+<h3><?php _e('Server Connectivity'); ?></h3>
+<?php
+ if ( !function_exists('fsockopen') || !function_exists('gethostbynamel') ) {
+ ?>
+ <p style="padding: .5em; background-color: #d22; color: #fff; font-weight:bold;"><?php _e('Network functions are disabled.'); ?></p>
+ <p><?php echo sprintf( __('Your web host or server administrator has disabled PHP\'s <code>fsockopen</code> or <code>gethostbynamel</code> functions. <strong>Akismet cannot work correctly until this is fixed.</strong> Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet\'s system requirements</a>.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
+ <?php
+ } else {
+ $servers = akismet_get_server_connectivity();
+ $fail_count = count($servers) - count( array_filter($servers) );
+ if ( is_array($servers) && count($servers) > 0 ) {
+ // some connections work, some fail
+ if ( $fail_count > 0 && $fail_count < count($servers) ) { ?>
+ <p style="padding: .5em; background-color: #aa0; color: #fff; font-weight:bold;"><?php _e('Unable to reach some Akismet servers.'); ?></p>
+ <p><?php echo sprintf( __('A network problem or firewall is blocking some connections from your web server to Akismet.com. Akismet is working but this may cause problems during times of network congestion. Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet and firewalls</a>.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
+ <?php
+ // all connections fail
+ } elseif ( $fail_count > 0 ) { ?>
+ <p style="padding: .5em; background-color: #d22; color: #fff; font-weight:bold;"><?php _e('Unable to reach any Akismet servers.'); ?></p>
+ <p><?php echo sprintf( __('A network problem or firewall is blocking all connections from your web server to Akismet.com. <strong>Akismet cannot work correctly until this is fixed.</strong> Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet and firewalls</a>.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
+ <?php
+ // all connections work
+ } else { ?>
+ <p style="padding: .5em; background-color: #2d2; color: #fff; font-weight:bold;"><?php _e('All Akismet servers are available.'); ?></p>
+ <p><?php _e('Akismet is working correctly. All servers are accessible.'); ?></p>
+ <?php
+ }
+ } else {
+ ?>
+ <p style="padding: .5em; background-color: #d22; color: #fff; font-weight:bold;"><?php _e('Unable to find Akismet servers.'); ?></p>
+ <p><?php echo sprintf( __('A DNS problem or firewall is preventing all access from your web server to Akismet.com. <strong>Akismet cannot work correctly until this is fixed.</strong> Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet and firewalls</a>.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
+ <?php
+ }
+ }
+
+ if ( !empty($servers) ) {
+?>
+<table style="width: 100%;">
+<thead><th><?php _e('Akismet server'); ?></th><th><?php _e('Network Status'); ?></th></thead>
+<tbody>
+<?php
+ asort($servers);
+ foreach ( $servers as $ip => $status ) {
+ $color = ( $status ? '#2d2' : '#d22');
+ ?>
+ <tr>
+ <td><?php echo htmlspecialchars($ip); ?></td>
+ <td style="padding: 0 .5em; font-weight:bold; color: #fff; background-color: <?php echo $color; ?>"><?php echo ($status ? __('No problems') : __('Obstructed') ); ?></td>
+
+ <?php
+ }
+ }
+?>
+</tbody>
+</table>
+ <p><?php if ( get_option('akismet_connectivity_time') ) echo sprintf( __('Last checked %s ago.'), human_time_diff( get_option('akismet_connectivity_time') ) ); ?></p>
+ <p class="submit"><input type="submit" name="check" value="<?php _e('Check network status »'); ?>" /></p>
+</form>
+
+</div>
+</div>
+<?php
+}
+
+function akismet_stats_page() {
+ if ( function_exists('add_submenu_page') )
+ add_submenu_page('index.php', __('Akismet Stats'), __('Akismet Stats'), 'manage_options', 'akismet-stats-display', 'akismet_stats_display');
+
+}
+
+function akismet_stats_script() {
+ ?>
+<script type="text/javascript">
+function resizeIframe() {
+ var height = document.documentElement.clientHeight;
+ height -= document.getElementById('akismet-stats-frame').offsetTop;
+ height += 100; // magic padding
+
+ document.getElementById('akismet-stats-frame').style.height = height +"px";
+
+};
+function resizeIframeInit() {
+ document.getElementById('akismet-stats-frame').onload = resizeIframe;
+ window.onresize = resizeIframe;
+}
+addLoadEvent(resizeIframeInit);
+</script><?php
+}
+
+
+function akismet_stats_display() {
+ global $akismet_api_host, $akismet_api_port, $wpcom_api_key;
+ $blog = urlencode( get_option('home') );
+ $url = "http://".akismet_get_key().".web.akismet.com/1.0/user-stats.php?blog={$blog}";
+ ?>
+ <div class="wrap">
+ <iframe src="<?php echo $url; ?>" width="100%" height="100%" frameborder="0" id="akismet-stats-frame"></iframe>
+ </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>'.__('Spam').'</h3>';
+ global $submenu;
+ if ( isset( $submenu['edit-comments.php'] ) )
+ $link = 'edit-comments.php';
+ else
+ $link = 'edit.php';
+ echo '<p>'.sprintf(__('<a href="%1$s">Akismet</a> has protected your site from <a href="%2$s">%3$s spam comments</a>.'), 'http://akismet.com/', clean_url("$link?page=akismet-admin"), number_format_i18n($count) ).'</p>';
+}
+add_action('activity_box_end', 'akismet_stats');
+
function akismet_get_key() {
global $wpcom_api_key;
if ( !empty($wpcom_api_key) )
@@ -81,11 +316,104 @@ function akismet_verify_key( $key, $ip = null ) {
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 )
+// 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;
- return false;
+ $servers = akismet_get_server_connectivity();
+ return !( empty($servers) || !count($servers) || count( array_filter($servers) ) < count($servers) );
+}
+
+function akismet_admin_warnings() {
+ global $wpcom_api_key;
+ if ( !get_option('wordpress_api_key') && !$wpcom_api_key && !isset($_POST['submit']) ) {
+ function akismet_warning() {
+ echo "
+ <div id='akismet-warning' class='updated fade'><p><strong>".__('Akismet is almost ready.')."</strong> ".sprintf(__('You must <a href="%1$s">enter your Akismet API key</a> for it to work.'), "plugins.php?page=akismet-key-config")."</p></div>
+ ";
+ }
+ add_action('admin_notices', 'akismet_warning');
+ return;
+ } elseif ( get_option('akismet_connectivity_time') && empty($_POST) && is_admin() && !akismet_server_connectivity_ok() ) {
+ function akismet_warning() {
+ echo "
+ <div id='akismet-warning' class='updated fade'><p><strong>".__('Akismet has detected a problem.')."</strong> ".sprintf(__('A server or network problem is preventing Akismet from working correctly. <a href="%1$s">Click here for more information</a> about how to fix the problem.'), "plugins.php?page=akismet-key-config")."</p></div>
+ ";
+ }
+ add_action('admin_notices', 'akismet_warning');
+ return;
+ }
+}
+
+function akismet_get_host($host) {
+ // if all servers are accessible, just return the host name.
+ // if not, return an IP that was known to be accessible at the last check.
+ if ( akismet_server_connectivity_ok() ) {
+ return $host;
+ } else {
+ $ips = akismet_get_server_connectivity();
+ // a firewall may be blocking access to some Akismet IPs
+ if ( count($ips) > 0 && count(array_filter($ips)) < count($ips) ) {
+ // use DNS to get current IPs, but exclude any known to be unreachable
+ $dns = (array)gethostbynamel( rtrim($host, '.') . '.' );
+ $dns = array_filter($dns);
+ foreach ( $dns as $ip ) {
+ if ( array_key_exists( $ip, $ips ) && empty( $ips[$ip] ) )
+ unset($dns[$ip]);
+ }
+ // return a random IP from those available
+ if ( count($dns) )
+ return $dns[ array_rand($dns) ];
+
+ }
+ }
+ // if all else fails try the host name
+ return $host;
}
// return a comma-separated list of role names for the given user
@@ -107,59 +435,35 @@ function akismet_get_user_roles($user_id ) {
// 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' );
-
- $content_length = strlen( $request );
-
+
+ $akismet_version = constant('AKISMET_VERSION');
+
+ $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: " . strlen($request) . "\r\n";
+ $http_request .= "User-Agent: WordPress/$wp_version | Akismet/$akismet_version\r\n";
+ $http_request .= "\r\n";
+ $http_request .= $request;
+
$http_host = $host;
- // use a specific IP if provided
- // needed by akismet_check_server_connectivity()
- if ( $ip && long2ip( ip2long( $ip ) ) ) {
+ // use a specific IP if provided - needed by akismet_check_server_connectivity()
+ if ( $ip && long2ip(ip2long($ip)) ) {
$http_host = $ip;
} else {
- $http_host = $host;
+ $http_host = akismet_get_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'
- );
- $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;
+
+ $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
@@ -167,122 +471,11 @@ 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 akimset_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;
-
- // failsafe for old WP versions
- if ( !function_exists('add_comment_meta') )
- return false;
-
- // 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 ( 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.'), $akismet_last_comment['akismet_result']), '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'] );
- }
- }
-}
-
-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;
+ global $akismet_api_host, $akismet_api_port;
$comment = $commentdata;
$comment['user_ip'] = $_SERVER['REMOTE_ADDR'];
@@ -295,41 +488,17 @@ function akismet_auto_check_comment( $commentdata ) {
$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 ) {
+ foreach ( $_SERVER as $key => $value )
if ( !in_array( $key, $ignore ) && is_string($value) )
$comment["$key"] = $value;
else
$comment["$key"] = '';
- }
$query_string = '';
foreach ( $comment as $key => $data )
$query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
-
- $commentdata['comment_as_submitted'] = $comment;
$response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port);
$commentdata['akismet_result'] = $response[1];
@@ -348,17 +517,10 @@ function akismet_auto_check_comment( $commentdata ) {
// 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 );
- wp_redirect( $_SERVER['HTTP_REFERER'] );
- die();
+ 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] ) {
- add_filter('pre_comment_approved', 'akismet_result_hold');
- 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') )
@@ -367,25 +529,18 @@ function akismet_auto_check_comment( $commentdata ) {
// WP 2.0: run this one time in ten
akismet_delete_old();
}
- $akismet_last_comment = $commentdata;
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 );
+ $wpdb->query("DELETE FROM $wpdb->comments WHERE comment_id IN ( " . implode( ', ', $comment_ids ) . " )");
$n = mt_rand(1, 5000);
if ( apply_filters('akismet_optimize_table', ($n == 11)) ) // lucky number
$wpdb->query("OPTIMIZE TABLE $wpdb->comments");
@@ -394,103 +549,341 @@ function akismet_delete_old() {
add_action('akismet_scheduled_delete', 'akismet_delete_old');
-function akismet_check_db_comment( $id, $recheck_reason = 'recheck_queue' ) {
- global $wpdb, $akismet_api_host, $akismet_api_port;
+function akismet_submit_nonspam_comment ( $comment_id ) {
+ global $wpdb, $akismet_api_host, $akismet_api_port, $current_user, $current_site;
+ $comment_id = (int) $comment_id;
- $id = (int) $id;
- $c = $wpdb->get_row( "SELECT * FROM $wpdb->comments WHERE comment_ID = '$id'", ARRAY_A );
- if ( !$c )
- return;
+ $comment = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID = '$comment_id'");
+ if ( !$comment ) // it was deleted
+ return;
+ $comment->blog = get_option('home');
+ $comment->blog_lang = get_locale();
+ $comment->blog_charset = get_option('blog_charset');
+ $comment->permalink = get_permalink($comment->comment_post_ID);
+ if ( is_object($current_user) ) {
+ $comment->reporter = $current_user->user_login;
+ }
+ if ( is_object($current_site) ) {
+ $comment->site_domain = $current_site->domain;
+ }
- $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;
+ $comment->user_role = '';
+ if ( isset( $comment->user_ID ) )
+ $comment->user_role = akismet_get_user_roles($comment->user_ID);
- $query_string = '';
- foreach ( $c as $key => $data )
- $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
+ $query_string = '';
+ foreach ( $comment as $key => $data )
+ $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
+
+ $response = akismet_http_post($query_string, $akismet_api_host, "/1.1/submit-ham", $akismet_api_port);
+ do_action('akismet_submit_nonspam_comment', $comment_id, $response[1]);
+}
+
+function akismet_submit_spam_comment ( $comment_id ) {
+ global $wpdb, $akismet_api_host, $akismet_api_port, $current_user, $current_site;
+ $comment_id = (int) $comment_id;
+
+ $comment = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID = '$comment_id'");
+ if ( !$comment ) // it was deleted
+ return;
+ if ( 'spam' != $comment->comment_approved )
+ return;
+ $comment->blog = get_option('home');
+ $comment->blog_lang = get_locale();
+ $comment->blog_charset = get_option('blog_charset');
+ $comment->permalink = get_permalink($comment->comment_post_ID);
+ if ( is_object($current_user) ) {
+ $comment->reporter = $current_user->user_login;
+ }
+ if ( is_object($current_site) ) {
+ $comment->site_domain = $current_site->domain;
+ }
+
+ $comment->user_role = '';
+ if ( !isset( $comment->user_id ) )
+ $comment->user_role = akismet_get_user_roles($comment->user_ID);
+
+ $query_string = '';
+ foreach ( $comment as $key => $data )
+ $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
- $response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port);
- return $response[1];
+ $response = akismet_http_post($query_string, $akismet_api_host, "/1.1/submit-spam", $akismet_api_port);
+ do_action('akismet_submit_spam_comment', $comment_id, $response[1]);
}
-function akismet_cron_recheck() {
+add_action('preprocess_comment', 'akismet_auto_check_comment', 1);
+
+// For old versions of WP only
+function akismet_set_comment_status( $comment_id, $status ) {
+ if ( $status == 'spam' ) {
+ akismet_submit_spam_comment( $comment_id );
+ } elseif ( $status == 'approve' ) {
+ akismet_submit_nonspam_comment( $comment_id );
+ }
+}
+
+// For WP 2.7+
+function akismet_transition_comment_status( $new_status, $old_status, $comment ) {
+ if ( $new_status == $old_status )
+ return;
+
+ if ( $new_status == 'spam' ) {
+ akismet_submit_spam_comment( $comment->comment_ID );
+ } elseif ( $old_status == 'spam' && ( $new_status == 'approved' || $new_status == 'unapproved' ) ) {
+ akismet_submit_nonspam_comment( $comment->comment_ID );
+ }
+}
+
+function akismet_spamtoham( $comment ) { akismet_submit_nonspam_comment( $comment->comment_ID ); }
+
+if ( function_exists( 'wp_transition_comment_status' ) ) {
+ add_action( 'transition_comment_status', 'akismet_transition_comment_status', 10, 3 );
+} else {
+ add_action('wp_set_comment_status', 'akismet_set_comment_status', 10, 2);
+ add_action('edit_comment', 'akismet_submit_spam_comment');
+ add_filter( 'comment_spam_to_approved', 'akismet_spamtoham' );
+ add_filter( 'comment_spam_to_unapproved', 'akismet_spamtoham' );
+}
+// Total spam in queue
+// get_option( 'akismet_spam_count' ) is the total caught ever
+function akismet_spam_count( $type = false ) {
global $wpdb;
- delete_option('akismet_available_servers');
+ 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'");
+}
+
- $comment_errors = $wpdb->get_col( "
- SELECT comment_id
- FROM {$wpdb->prefix}commentmeta
- WHERE meta_key = 'akismet_error'
- LIMIT 100
- " );
+// WP 2.5+
+function akismet_rightnow() {
+ global $submenu, $wp_db_version;
+
+ // clean_url was deprecated in WP 3.0
+ $esc_url = 'clean_url';
+ if ( function_exists( 'esc_url' ) )
+ $esc_url = 'esc_url';
+
+ if ( 8645 < $wp_db_version ) // 2.7
+ $link = 'edit-comments.php?comment_status=spam';
+ elseif ( isset( $submenu['edit-comments.php'] ) )
+ $link = 'edit-comments.php?page=akismet-admin';
+ else
+ $link = 'edit.php?page=akismet-admin';
+
+ if ( $count = get_option('akismet_spam_count') ) {
+ $intro = sprintf( __ngettext(
+ '<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/', number_format_i18n( $count ) );
+ } else {
+ $intro = sprintf( __('<a href="%1$s">Akismet</a> blocks spam from getting to your blog,'), 'http://akismet.com/' );
+ }
+
+ if ( $queue_count = akismet_spam_count() ) {
+ $queue_text = sprintf( __ngettext(
+ 'and there\'s <a href="%2$s">%1$s comment</a> in your spam queue right now.',
+ 'and there are <a href="%2$s">%1$s comments</a> in your spam queue right now.',
+ $queue_count
+ ), number_format_i18n( $queue_count ), clean_url($link) );
+ } else {
+ $queue_text = sprintf( __( "but there's nothing in your <a href='%1\$s'>spam queue</a> at the moment." ), $esc_url($link) );
+ }
+
+ // _c was deprecated in WP 2.9.0
+ if ( function_exists( '_x' ) )
+ $text = sprintf( _x( '%1$s %2$s', 'akismet_rightnow' ), $intro, $queue_text );
+ else
+ $text = sprintf( _c( '%1$s %2$s|akismet_rightnow' ), $intro, $queue_text );
+
+ echo "<p class='akismet-right-now'>$text</p>\n";
+}
- foreach ( (array) $comment_errors as $comment_id ) {
- // if the comment no longer exists, remove the meta entry from the queue to avoid getting stuck
- if ( !get_comment( $comment_id ) ) {
- delete_comment_meta( $comment_id, 'akismet_error' );
- continue;
+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&recheckqueue=true&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_recheck_queue() {
+ global $wpdb, $akismet_api_host, $akismet_api_port;
+
+ if ( ! ( isset( $_GET['recheckqueue'] ) || ( isset( $_REQUEST['action'] ) && 'akismet_recheck_queue' == $_REQUEST['action'] ) ) )
+ return;
+
+ $moderation = $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE comment_approved = '0'", ARRAY_A );
+ foreach ( (array) $moderation as $c ) {
+ $c['user_ip'] = $c['comment_author_IP'];
+ $c['user_agent'] = $c['comment_agent'];
+ $c['referrer'] = '';
+ $c['blog'] = get_option('home');
+ $c['blog_lang'] = get_locale();
+ $c['blog_charset'] = get_option('blog_charset');
+ $c['permalink'] = get_permalink($c['comment_post_ID']);
+
+ $c['user_role'] = '';
+ if ( isset( $c['user_ID'] ) )
+ $c['user_role'] = akismet_get_user_roles($c['user_ID']);
+
+ $id = (int) $c['comment_ID'];
+
+ $query_string = '';
+ foreach ( $c as $key => $data )
+ $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
+
+ $response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port);
+ if ( 'true' == $response[1] ) {
+ if ( function_exists('wp_set_comment_status') )
+ wp_set_comment_status($id, 'spam');
+ else
+ $wpdb->query("UPDATE $wpdb->comments SET comment_approved = 'spam' WHERE comment_ID = $id");
+
}
-
- 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.' );
+ }
+ wp_redirect( $_SERVER['HTTP_REFERER'] );
+ exit;
+}
+
+add_action('admin_action_akismet_recheck_queue', 'akismet_recheck_queue');
+
+function akismet_check_db_comment( $id ) {
+ 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'];
+
+ $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 $response[1];
+}
+
+// Widget stuff
+function widget_akismet_register() {
+ if ( function_exists('register_sidebar_widget') ) :
+ function widget_akismet($args) {
+ extract($args);
+ $options = get_option('widget_akismet');
+ $count = number_format_i18n(get_option('akismet_spam_count'));
+ ?>
+ <?php echo $before_widget; ?>
+ <?php echo $before_title . $options['title'] . $after_title; ?>
+ <div id="akismetwrap"><div id="akismetstats"><a id="aka" href="http://akismet.com" title=""><?php printf( __( '%1$s %2$sspam comments%3$s %4$sblocked by%5$s<br />%6$sAkismet%7$s' ), '<span id="akismet1"><span id="akismetcount">' . $count . '</span>', '<span id="akismetsc">', '</span></span>', '<span id="akismet2"><span id="akismetbb">', '</span>', '<span id="akismeta">', '</span></span>' ); ?></a></div></div>
+ <?php echo $after_widget; ?>
+ <?php
+ }
+
+ function widget_akismet_style() {
+ $plugin_dir = '/wp-content/plugins';
+ if ( defined( 'PLUGINDIR' ) )
+ $plugin_dir = '/' . PLUGINDIR;
+
+ ?>
+<style type="text/css">
+#aka,#aka:link,#aka:hover,#aka:visited,#aka:active{color:#fff;text-decoration:none}
+#aka:hover{border:none;text-decoration:none}
+#aka:hover #akismet1{display:none}
+#aka:hover #akismet2,#akismet1{display:block}
+#akismet2{display:none;padding-top:2px}
+#akismeta{font-size:16px;font-weight:bold;line-height:18px;text-decoration:none}
+#akismetcount{display:block;font:15px Verdana,Arial,Sans-Serif;font-weight:bold;text-decoration:none}
+#akismetwrap #akismetstats{background:url(<?php echo get_option('siteurl'), $plugin_dir; ?>/akismet/akismet.gif) no-repeat top left;border:none;color:#fff;font:11px 'Trebuchet MS','Myriad Pro',sans-serif;height:40px;line-height:100%;overflow:hidden;padding:8px 0 0;text-align:center;width:120px}
+</style>
+ <?php
+ }
+
+ function widget_akismet_control() {
+ $options = $newoptions = get_option('widget_akismet');
+ if ( isset( $_POST['akismet-submit'] ) && $_POST["akismet-submit"] ) {
+ $newoptions['title'] = strip_tags(stripslashes($_POST["akismet-title"]));
+ if ( empty($newoptions['title']) ) $newoptions['title'] = __('Spam Blocked');
}
-
- // 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;
+ if ( $options != $newoptions ) {
+ $options = $newoptions;
+ update_option('widget_akismet', $options);
}
+ $title = htmlspecialchars($options['title'], ENT_QUOTES);
+ ?>
+ <p><label for="akismet-title"><?php _e('Title:'); ?> <input style="width: 250px;" id="akismet-title" name="akismet-title" type="text" value="<?php echo $title; ?>" /></label></p>
+ <input type="hidden" id="akismet-submit" name="akismet-submit" value="1" />
+ <?php
}
-
- $remaining = $wpdb->get_var( $wpdb->prepare( "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' );
+
+ if ( function_exists( 'wp_register_sidebar_widget' ) ) {
+ wp_register_sidebar_widget( 'akismet', 'Akismet', 'widget_akismet', null, 'akismet');
+ wp_register_widget_control( 'akismet', 'Akismet', 'widget_akismet_control', null, 75, 'akismet');
+ } else {
+ register_sidebar_widget('Akismet', 'widget_akismet', null, 'akismet');
+ register_widget_control('Akismet', 'widget_akismet_control', null, 75, 'akismet');
}
+ if ( is_active_widget('widget_akismet') )
+ add_action('wp_head', 'widget_akismet_style');
+ endif;
}
-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>';
+add_action('init', 'widget_akismet_register');
+
+// Counter for non-widget users
+function akismet_counter() {
+ $plugin_dir = '/wp-content/plugins';
+ if ( defined( 'PLUGINDIR' ) )
+ $plugin_dir = '/' . PLUGINDIR;
+
+?>
+<style type="text/css">
+#akismetwrap #aka,#aka:link,#aka:hover,#aka:visited,#aka:active{color:#fff;text-decoration:none}
+#aka:hover{border:none;text-decoration:none}
+#aka:hover #akismet1{display:none}
+#aka:hover #akismet2,#akismet1{display:block}
+#akismet2{display:none;padding-top:2px}
+#akismeta{font-size:16px;font-weight:bold;line-height:18px;text-decoration:none}
+#akismetcount{display:block;font:15px Verdana,Arial,Sans-Serif;font-weight:bold;text-decoration:none}
+#akismetwrap #akismetstats{background:url(<?php echo get_option('siteurl'), $plugin_dir; ?>/akismet/akismet.gif) no-repeat top left;border:none;color:#fff;font:11px 'Trebuchet MS','Myriad Pro',sans-serif;height:40px;line-height:100%;overflow:hidden;padding:8px 0 0;text-align:center;width:120px}
+</style>
+<?php
+$count = number_format_i18n(get_option('akismet_spam_count'));
+?>
+<div id="akismetwrap"><div id="akismetstats"><a id="aka" href="http://akismet.com" title=""><div id="akismet1"><span id="akismetcount"><?php echo $count; ?></span> <span id="akismetsc"><?php _e('spam comments') ?></span></div> <div id="akismet2"><span id="akismetbb"><?php _e('blocked by') ?></span><br /><span id="akismeta">Akismet</span></div></a></div></div>
+<?php
}
-$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' );
+?>
diff --git a/wp-content/plugins/akismet/readme.txt b/wp-content/plugins/akismet/readme.txt
index 97962ef2c..db8234fce 100644
--- a/wp-content/plugins/akismet/readme.txt
+++ b/wp-content/plugins/akismet/readme.txt
@@ -1,9 +1,9 @@
=== Akismet ===
-Contributors: matt, ryan, andy, mdawaffe, tellyworth, josephscott, lessbloat, automattic
+Contributors: matt, ryan, andy, mdawaffe, tellyworth, automattic
Tags: akismet, comments, spam
-Requires at least: 3.0
-Tested up to: 3.1
-Stable tag: 2.5.1
+Requires at least: 2.0
+Tested up to: 3.0
+Stable tag: 2.4.0
License: GPLv2
Akismet checks your comments against the Akismet web service to see if they look like spam or not.
@@ -13,15 +13,11 @@ Akismet checks your comments against the Akismet web service to see if they look
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:
+Want to show off how much spam Akismet has caught for you? Just put `<?php akismet_counter(); ?>` in your template.
-* 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
+See also: [WP Stats plugin](http://wordpress.org/extend/plugins/stats/).
-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.
== Installation ==
@@ -31,39 +27,6 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
== Changelog ==
-= 2.5.1 =
-
-* 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
-* Fixed padding bug in "author" column of posts screen
-* Added margin-top to "cleared by ..." badges on dashboard
-* Fix possible error when calling akismet_cron_recheck()
-* Fix more PHP warnings
-* Clean up XHTML warnings for comment nonce
-* Fix for possible condition where scheduled comment re-checks could get stuck
-* Clean up the comment meta details after deleting a comment
-* Only show the status badge if the comment status has been changed by someone/something other than Akismet
-* Show a 'History' link in the row-actions
-* Translation fixes
-* Reduced font-size on author name
-* Moved "flagged by..." notification to top right corner of comment container and removed heavy styling
-* Hid "flagged by..." notification while on dashboard
-
-= 2.5.0 =
-
-* Track comment actions under 'Akismet Status' on the edit comment screen
-* Fix a few remaining deprecated function calls ( props Mike Glendinning )
-* Use HTTPS for the stats IFRAME when wp-admin is using HTTPS
-* Use the WordPress HTTP class if available
-* Move the admin UI code to a separate file, only loaded when needed
-* Add cron retry feature, to replace the old connectivity check
-* Display Akismet status badge beside each comment
-* Record history for each comment, and display it on the edit page
-* Record the complete comment as originally submitted in comment_meta, to use when reporting spam and ham
-* Highlight links in comment content
-* New option, "Show the number of comments you've approved beside each comment author."
-* New option, "Use a nonce on the comment form."
-
= 2.4.0 =
* Spell out that the license is GPLv2
diff --git a/wp-content/themes/twentyten/languages/twentyten.pot b/wp-content/themes/twentyten/languages/twentyten.pot
index f3bfcd23a..1febb300e 100644
--- a/wp-content/themes/twentyten/languages/twentyten.pot
+++ b/wp-content/themes/twentyten/languages/twentyten.pot
@@ -1,200 +1,191 @@
-# Translation of the WordPress theme Twenty Ten 1.1 by the WordPress team.
-# Copyright (C) 2010 the WordPress team
+# Copyright (C) 2010 Twenty Ten
# This file is distributed under the same license as the Twenty Ten package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Twenty Ten 1.1\n"
"Report-Msgid-Bugs-To: http://wordpress.org/tag/twentyten\n"
-"POT-Creation-Date: 2010-07-14 16:21+0000\n"
+"POT-Creation-Date: 2011-01-01 21:26:51+00:00\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
"PO-Revision-Date: 2010-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: 404.php:16 loop.php:33
-msgid "Not Found"
+#. #-#-#-#-# twentyten.pot (Twenty Ten 1.1) #-#-#-#-#
+#. Theme URI of the plugin/theme
+#: footer.php:33
+msgid "http://wordpress.org/"
msgstr ""
-#: 404.php:18
-msgid ""
-"Apologies, but the page you requested could not be found. Perhaps searching "
-"will help."
+#: footer.php:34
+msgid "Semantic Personal Publishing Platform"
msgstr ""
-#: archive.php:33
-#, php-format
-msgid "Daily Archives: <span>%s</span>"
+#: footer.php:35
+msgid "Proudly powered by %s."
msgstr ""
-#: archive.php:35
-#, php-format
-msgid "Monthly Archives: <span>%s</span>"
+#: category.php:16
+msgid "Category Archives: %s"
msgstr ""
-#: archive.php:37
-#, php-format
-msgid "Yearly Archives: <span>%s</span>"
+#: sidebar.php:27
+msgid "Archives"
msgstr ""
-#: archive.php:39
-msgid "Blog Archives"
+#: sidebar.php:34
+msgid "Meta"
msgstr ""
-#: attachment.php:18
-#, php-format
-msgid "Return to %s"
+#: tag.php:16
+msgid "Tag Archives: %s"
msgstr ""
-#. translators: %s - title of parent post
-#: attachment.php:20
-#, php-format
-msgid "<span class=\"meta-nav\">←</span> %s"
+#: comments.php:18
+msgid ""
+"This post is password protected. Enter the password to view any comments."
msgstr ""
-#: attachment.php:29
-#, php-format
-msgid "<span class=\"%1$s\">By</span> %2$s"
+#: comments.php:35
+msgid "One Response to %2$s"
+msgid_plural "%1$s Responses to %2$s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: comments.php:41 comments.php:60
+msgid "<span class=\"meta-nav\">←</span> Older Comments"
msgstr ""
-#: attachment.php:33 functions.php:451
-#, php-format
-msgid "View all posts by %s"
+#: comments.php:42 comments.php:61
+msgid "Newer Comments <span class=\"meta-nav\">→</span>"
msgstr ""
-#: attachment.php:40
-#, php-format
-msgid "<span class=\"%1$s\">Published</span> %2$s"
+#: comments.php:72
+msgid "Comments are closed."
msgstr ""
-#: attachment.php:50
-#, php-format
-msgid "Full size is %s pixels"
+#: 404.php:16 loop.php:33
+msgid "Not Found"
msgstr ""
-#: attachment.php:53
-msgid "Link to full-size image"
+#: 404.php:18
+msgid ""
+"Apologies, but the page you requested could not be found. Perhaps searching "
+"will help."
msgstr ""
-#: attachment.php:60 attachment.php:107 loop.php:95 loop.php:118 loop.php:160
-#: onecolumn-page.php:27 page.php:32 single.php:53
-msgid "Edit"
+#: loop.php:25 loop.php:173
+msgid "<span class=\"meta-nav\">←</span> Older posts"
msgstr ""
-#: attachment.php:100 functions.php:241 loop.php:110 loop.php:138
-msgid "Continue reading <span class=\"meta-nav\">→</span>"
+#: loop.php:26 loop.php:174
+msgid "Newer posts <span class=\"meta-nav\">→</span>"
msgstr ""
-#: attachment.php:101 loop.php:139 onecolumn-page.php:26 page.php:31
-#: single.php:31
-msgid "Pages:"
+#: loop.php:35
+msgid ""
+"Apologies, but no results were found for the requested archive. Perhaps "
+"searching will help find a related post."
msgstr ""
-#: author.php:27
-#, php-format
-msgid "Author Archives: %s"
+#: loop.php:60 loop.php:92
+msgctxt "gallery category slug"
+msgid "gallery"
msgstr ""
-#: author.php:37 single.php:40
-#, php-format
-msgid "About %s"
+#: loop.php:62 loop.php:83 loop.php:126
+msgid "Permalink to %s"
msgstr ""
-#: category.php:16
-#, php-format
-msgid "Category Archives: %s"
+#: loop.php:82
+msgid "This gallery contains <a %1$s>%2$s photos</a>."
msgstr ""
-#: comments.php:18
-msgid ""
-"This post is password protected. Enter the password to view any comments."
+#: loop.php:92
+msgid "View posts in the Gallery category"
msgstr ""
-#: comments.php:35
-#, php-format
-msgid "One Response to %2$s"
-msgid_plural "%1$s Responses to %2$s"
-msgstr[0] ""
-msgstr[1] ""
+#: loop.php:92
+msgid "More Galleries"
+msgstr ""
-#: comments.php:41 comments.php:60
-msgid "<span class=\"meta-nav\">←</span> Older Comments"
+#: loop.php:94 loop.php:117 loop.php:159
+msgid "Leave a comment"
msgstr ""
-#: comments.php:42 comments.php:61
-msgid "Newer Comments <span class=\"meta-nav\">→</span>"
+#: loop.php:94 loop.php:117 loop.php:159
+msgid "1 Comment"
msgstr ""
-#: comments.php:72
-msgid "Comments are closed."
+#: loop.php:94 loop.php:117 loop.php:159
+msgid "% Comments"
msgstr ""
-#. #-#-#-#-# twentyten.pot (Twenty Ten 1.1) #-#-#-#-#
-#. Theme URI of the plugin/theme
-#: footer.php:33
-msgid "http://wordpress.org/"
+#: loop.php:95 loop.php:118 loop.php:160 page.php:32 attachment.php:60
+#: attachment.php:107 onecolumn-page.php:27 single.php:53
+msgid "Edit"
msgstr ""
-#: footer.php:34
-msgid "Semantic Personal Publishing Platform"
+#: loop.php:101
+msgctxt "asides category slug"
+msgid "asides"
msgstr ""
-#: footer.php:35
-#, php-format
-msgid "Proudly powered by %s."
+#: loop.php:110 loop.php:138 functions.php:241 attachment.php:100
+msgid "Continue reading <span class=\"meta-nav\">→</span>"
+msgstr ""
+
+#: loop.php:139 page.php:31 attachment.php:101 onecolumn-page.php:26
+#: single.php:31
+msgid "Pages:"
+msgstr ""
+
+#: loop.php:146
+msgid "<span class=\"%1$s\">Posted in</span> %2$s"
+msgstr ""
+
+#: loop.php:155
+msgid "<span class=\"%1$s\">Tagged</span> %2$s"
msgstr ""
#: functions.php:97
msgid "Primary Navigation"
msgstr ""
-#. translators: header image description
#: functions.php:133
msgid "Berries"
msgstr ""
-#. translators: header image description
#: functions.php:139
msgid "Cherry Blossoms"
msgstr ""
-#. translators: header image description
#: functions.php:145
msgid "Concave"
msgstr ""
-#. translators: header image description
#: functions.php:151
msgid "Fern"
msgstr ""
-#. translators: header image description
#: functions.php:157
msgid "Forest Floor"
msgstr ""
-#. translators: header image description
#: functions.php:163
msgid "Inkwell"
msgstr ""
-#. translators: header image description
#: functions.php:169
msgid "Path"
msgstr ""
-#. translators: header image description
#: functions.php:175
msgid "Sunset"
msgstr ""
#: functions.php:308
-#, php-format
msgid "%s <span class=\"says\">says:</span>"
msgstr ""
@@ -202,9 +193,7 @@ msgstr ""
msgid "Your comment is awaiting moderation."
msgstr ""
-#. translators: 1: date, 2: time
#: functions.php:318
-#, php-format
msgid "%1$s at %2$s"
msgstr ""
@@ -265,35 +254,34 @@ msgid "The fourth footer widget area"
msgstr ""
#: functions.php:442
-#, php-format
msgid ""
"<span class=\"%1$s\">Posted on</span> %2$s <span class=\"meta-sep\">by</"
"span> %3$s"
msgstr ""
+#: functions.php:451 attachment.php:33
+msgid "View all posts by %s"
+msgstr ""
+
#: functions.php:468
-#, php-format
msgid ""
"This entry was posted in %1$s and tagged %2$s. Bookmark the <a href=\"%3$s\" "
"title=\"Permalink to %4$s\" rel=\"bookmark\">permalink</a>."
msgstr ""
#: functions.php:470
-#, php-format
msgid ""
"This entry was posted in %1$s. Bookmark the <a href=\"%3$s\" title="
"\"Permalink to %4$s\" rel=\"bookmark\">permalink</a>."
msgstr ""
#: functions.php:472
-#, php-format
msgid ""
"Bookmark the <a href=\"%3$s\" title=\"Permalink to %4$s\" rel=\"bookmark"
"\">permalink</a>."
msgstr ""
#: header.php:33
-#, php-format
msgid "Page %s"
msgstr ""
@@ -301,72 +289,39 @@ msgstr ""
msgid "Skip to content"
msgstr ""
-#: loop.php:25 loop.php:173
-msgid "<span class=\"meta-nav\">←</span> Older posts"
-msgstr ""
-
-#: loop.php:26 loop.php:174
-msgid "Newer posts <span class=\"meta-nav\">→</span>"
-msgstr ""
-
-#: loop.php:35
-msgid ""
-"Apologies, but no results were found for the requested archive. Perhaps "
-"searching will help find a related post."
-msgstr ""
-
-#: loop.php:60 loop.php:92
-msgctxt "gallery category slug"
-msgid "gallery"
-msgstr ""
-
-#: loop.php:62 loop.php:83 loop.php:126
-#, php-format
-msgid "Permalink to %s"
-msgstr ""
-
-#: loop.php:82
-#, php-format
-msgid "This gallery contains <a %1$s>%2$s photos</a>."
-msgstr ""
-
-#: loop.php:92
-msgid "View posts in the Gallery category"
+#: author.php:27
+msgid "Author Archives: %s"
msgstr ""
-#: loop.php:92
-msgid "More Galleries"
+#: author.php:37 single.php:40
+msgid "About %s"
msgstr ""
-#: loop.php:94 loop.php:117 loop.php:159
-msgid "Leave a comment"
+#: attachment.php:18
+msgid "Return to %s"
msgstr ""
-#: loop.php:94 loop.php:117 loop.php:159
-msgid "1 Comment"
+#: attachment.php:20
+msgid "<span class=\"meta-nav\">←</span> %s"
msgstr ""
-#: loop.php:94 loop.php:117 loop.php:159
-msgid "% Comments"
+#: attachment.php:29
+msgid "<span class=\"%1$s\">By</span> %2$s"
msgstr ""
-#: loop.php:101
-msgctxt "asides category slug"
-msgid "asides"
+#: attachment.php:40
+msgid "<span class=\"%1$s\">Published</span> %2$s"
msgstr ""
-#: loop.php:146
-#, php-format
-msgid "<span class=\"%1$s\">Posted in</span> %2$s"
+#: attachment.php:50
+msgid "Full size is %s pixels"
msgstr ""
-#: loop.php:155
-#, php-format
-msgid "<span class=\"%1$s\">Tagged</span> %2$s"
+#: attachment.php:53
+msgid "Link to full-size image"
msgstr ""
#: search.php:16
-#, php-format
msgid "Search Results for: %s"
msgstr ""
@@ -380,12 +335,20 @@ msgid ""
"different keywords."
msgstr ""
-#: sidebar.php:27
-msgid "Archives"
+#: archive.php:33
+msgid "Daily Archives: <span>%s</span>"
msgstr ""
-#: sidebar.php:34
-msgid "Meta"
+#: archive.php:35
+msgid "Monthly Archives: <span>%s</span>"
+msgstr ""
+
+#: archive.php:37
+msgid "Yearly Archives: <span>%s</span>"
+msgstr ""
+
+#: archive.php:39
+msgid "Blog Archives"
msgstr ""
#: single.php:18 single.php:58
@@ -399,15 +362,9 @@ msgid "→"
msgstr ""
#: single.php:44
-#, php-format
msgid "View all posts by %s <span class=\"meta-nav\">→</span>"
msgstr ""
-#: tag.php:16
-#, php-format
-msgid "Tag Archives: %s"
-msgstr ""
-
#. Theme Name of the plugin/theme
msgid "Twenty Ten"
msgstr ""
diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php
index c2b5216bb..3fb31bcfa 100644
--- a/wp-includes/default-filters.php
+++ b/wp-includes/default-filters.php
@@ -31,8 +31,8 @@ foreach ( array( 'pre_term_description', 'pre_link_description', 'pre_link_notes
add_filter( $filter, 'wp_filter_kses' );
}
-// Kses only for textarea saves displays
-foreach ( array( 'term_description', 'link_description', 'link_notes', 'user_description' ) as $filter ) {
+// Kses only for textarea admin displays
+foreach ( array( 'term_description', 'link_description', 'link_notes', 'user_description', 'comment_text' ) as $filter ) {
add_filter( $filter, 'wp_kses_data' );
}
@@ -73,6 +73,9 @@ foreach ( array( 'pre_term_slug' ) as $filter ) {
foreach ( array( 'pre_post_type' ) as $filter ) {
add_filter( $filter, 'sanitize_user' );
}
+foreach ( array( 'pre_post_status', 'pre_post_comment_status', 'pre_post_ping_status' ) as $filter ) {
+ add_filter( $filter, 'sanitize_key' );
+}
// Places to balance tags on input
foreach ( array( 'content_save_pre', 'excerpt_save_pre', 'comment_save_pre', 'pre_comment_content' ) as $filter ) {
diff --git a/wp-includes/kses.php b/wp-includes/kses.php
index 792b15e7e..7ca692f51 100644
--- a/wp-includes/kses.php
+++ b/wp-includes/kses.php
@@ -1,26 +1,33 @@
<?php
/**
- * HTML/XHTML filter that only allows some elements and attributes
+ * kses 0.2.2 - HTML/XHTML filter that only allows some elements and attributes
+ * Copyright (C) 2002, 2003, 2005 Ulf Harnhammar
+ *
+ * This program is free software and open source software; you can redistribute
+ * it and/or modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * [kses strips evil scripts!]
*
* Added wp_ prefix to avoid conflicts with existing kses users
*
* @version 0.2.2
* @copyright (C) 2002, 2003, 2005
- * @author Ulf Harnhammar <metaur@users.sourceforge.net>
+ * @author Ulf Harnhammar <http://advogato.org/person/metaur/>
*
* @package External
* @subpackage KSES
- *
- * @internal
- * *** CONTACT INFORMATION ***
- * E-mail: metaur at users dot sourceforge dot net
- * Web page: http://sourceforge.net/projects/kses
- * Paper mail: Ulf Harnhammar
- * Ymergatan 17 C
- * 753 25 Uppsala
- * SWEDEN
- *
- * [kses strips evil scripts!]
*/
/**
diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index b51983230..a36bd1ed2 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -825,7 +825,7 @@ function check_admin_referer($action = -1, $query_arg = '_wpnonce') {
$adminurl = strtolower(admin_url());
$referer = strtolower(wp_get_referer());
$result = isset($_REQUEST[$query_arg]) ? wp_verify_nonce($_REQUEST[$query_arg], $action) : false;
- if ( !$result && !(-1 == $action && strpos($referer, $adminurl) !== false) ) {
+ if ( !$result && !(-1 == $action && strpos($referer, $adminurl) === 0) ) {
wp_nonce_ays($action);
die();
}
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index fcd8f55cf..a22e93598 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -275,7 +275,7 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'postbox', "/wp-admin/js/postbox$suffix.js", array('jquery-ui-sortable'), '20091012' );
$scripts->add_data( 'postbox', 'group', 1 );
- $scripts->add( 'post', "/wp-admin/js/post$suffix.js", array('suggest', 'wp-lists', 'postbox'), '20100526' );
+ $scripts->add( 'post', "/wp-admin/js/post$suffix.js", array('suggest', 'wp-lists', 'postbox'), '20110203' );
$scripts->add_data( 'post', 'group', 1 );
$scripts->localize( 'post', 'postL10n', array(
'tagsUsed' => __('Tags used on this post:'),
diff --git a/wp-includes/version.php b/wp-includes/version.php
index a19d30f91..5977122f1 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -1,14 +1,28 @@
<?php
-/**
- * This holds the version number in a separate file so we can bump it without cluttering the SVN
- */
+/*
+WordPress - Web publishing software
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
/**
* The WordPress version string
*
* @global string $wp_version
*/
-$wp_version = '3.0.4';
+$wp_version = '3.0.5';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
--
GitLab