]*)?>\s*/gi, '\n\n' );
// Remove and
/gi, '');
- content = content.replace(/\s*<\/p>\s*/gi, '\n\n');
- content = content.replace(/\n[\s\u00a0]+\n/g, '\n\n');
- content = content.replace(/\s*
/gi, '' );
+ content = content.replace( /\s*<\/p>\s*/gi, '\n\n' );
+ content = content.replace( /\n[\s\u00a0]+\n/g, '\n\n' );
+ content = content.replace( /\s*
\s*/g, '
\n');
- content = content.replace(/\s*\[caption([^\[]+)\[\/caption\]\s*/gi, '\n\n[caption$1[/caption]\n\n');
- content = content.replace(/caption\]\n\n+\[caption/g, 'caption]\n\n[caption');
+ content = content.replace( /\s*\s*/g, '
\n' );
+ content = content.replace( /\s*\[caption([^\[]+)\[\/caption\]\s*/gi, '\n\n[caption$1[/caption]\n\n' );
+ content = content.replace( /caption\]\n\n+\[caption/g, 'caption]\n\n[caption' );
blocklist2 = 'blockquote|ul|ol|li|table|thead|tbody|tfoot|tr|th|td|h[1-6]|pre|fieldset';
- content = content.replace(new RegExp('\\s*<((?:'+blocklist2+')(?: [^>]*)?)\\s*>', 'g'), '\n<$1>');
- content = content.replace(new RegExp('\\s*\\s*', 'g'), '\n');
- content = content.replace(/]*)>/g, '\t');
+ content = content.replace( new RegExp('\\s*<((?:' + blocklist2 + ')(?: [^>]*)?)\\s*>', 'g' ), '\n<$1>' );
+ content = content.replace( new RegExp('\\s*\\s*', 'g' ), '\n' );
+ content = content.replace( /]*)>/g, '\t' );
- if ( content.indexOf(']*)?>\s*/g, '\n\n\n\n');
+ if ( content.indexOf( ']*)?>\s*/g, '\n\n\n\n' );
}
- if ( content.indexOf('/g, function(a){
- return a.replace(/[\r\n]+/g, '');
+ if ( content.indexOf( '/g, function( a ) {
+ return a.replace( /[\r\n]+/g, '' );
});
}
// Unmark special paragraph closing tags
- content = content.replace(/<\/p#>/g, '
\n');
- content = content.replace(/\s*(]+>[\s\S]*?<\/p>)/g, '\n$1');
+ content = content.replace( /<\/p#>/g, '
\n' );
+ content = content.replace( /\s*(]+>[\s\S]*?<\/p>)/g, '\n$1' );
// Trim whitespace
- content = content.replace(/^\s+/, '');
- content = content.replace(/[\s\u00a0]+$/, '');
+ content = content.replace( /^\s+/, '' );
+ content = content.replace( /[\s\u00a0]+$/, '' );
// put back the line breaks in pre|script
- if ( preserve_linebreaks )
- content = content.replace(//g, '\n');
+ if ( preserve_linebreaks ) {
+ content = content.replace( //g, '\n' );
+ }
// and the ]*)>/g, '');
+ if ( preserve_br ) {
+ content = content.replace( /]*)>/g, '' );
+ }
return content;
},
- _wp_Autop : function(pee) {
- var preserve_linebreaks = false, preserve_br = false,
- blocklist = 'table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|option|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|noscript|samp|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary';
+ _wp_Autop: function(pee) {
+ var preserve_linebreaks = false,
+ preserve_br = false,
+ blocklist = 'table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre' +
+ '|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|noscript|legend|section' +
+ '|article|aside|hgroup|header|footer|nav|figure|details|menu|summary';
- if ( pee.indexOf('/g, function(a){
- return a.replace(/[\r\n]+/g, '');
+ if ( pee.indexOf( '/g, function( a ) {
+ return a.replace( /[\r\n]+/g, '' );
});
}
- pee = pee.replace(/<[^<>]+>/g, function(a){
- return a.replace(/[\r\n]+/g, ' ');
+ pee = pee.replace( /<[^<>]+>/g, function( a ){
+ return a.replace( /[\r\n]+/g, ' ' );
});
// Protect pre|script tags
- if ( pee.indexOf(']*>[\s\S]+?<\/\1>/g, function(a) {
- return a.replace(/(\r\n|\n)/g, '');
+ pee = pee.replace( /<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function( a ) {
+ return a.replace( /(\r\n|\n)/g, '' );
});
}
// keep ]*)>/g, '');
+ a = a.replace( /]*)>/g, '' );
// no line breaks inside HTML tags
- a = a.replace(/<[a-zA-Z0-9]+( [^<>]+)?>/g, function(b){
- return b.replace(/[\r\n\t]+/, ' ');
+ a = a.replace( /<[a-zA-Z0-9]+( [^<>]+)?>/g, function( b ) {
+ return b.replace( /[\r\n\t]+/, ' ' );
});
// convert remaining line breaks to ]*)?>/gi, '\n\n'); // hr is self closing block element
- pee = pee.replace(/\r\n|\r/g, '\n');
- pee = pee.replace(/\n\s*\n+/g, '\n\n');
- pee = pee.replace(/([\s\S]+?)\n\n/g, '$1
\n');
- pee = pee.replace(/\s*?<\/p>/gi, '');
- pee = pee.replace(new RegExp('
\\s*(]*)?>)\\s*
', 'gi'), "$1");
- pee = pee.replace(/(/gi, '$1');
- pee = pee.replace(/\s*]*)>/gi, '');
- pee = pee.replace(/<\/blockquote>\s*<\/p>/gi, '
');
- pee = pee.replace(new RegExp('\\s*(]*)?>)', 'gi'), "$1");
- pee = pee.replace(new RegExp('(]*)?>)\\s*
', 'gi'), "$1");
- pee = pee.replace(/\s*\n/gi, '|]*)?>/gi, '\n\n' ); // hr is self closing block element
+ pee = pee.replace( /\r\n|\r/g, '\n' );
+ pee = pee.replace( /\n\s*\n+/g, '\n\n' );
+ pee = pee.replace( /([\s\S]+?)\n\n/g, '$1
\n' );
+ pee = pee.replace( /\s*?<\/p>/gi, '');
+ pee = pee.replace( new RegExp( '
\\s*(]*)?>)\\s*
', 'gi' ), '$1' );
+ pee = pee.replace( /(/gi, '$1');
+ pee = pee.replace( /\s*]*)>/gi, '');
+ pee = pee.replace( /<\/blockquote>\s*<\/p>/gi, '
');
+ pee = pee.replace( new RegExp( '\\s*(]*)?>)', 'gi' ), '$1' );
+ pee = pee.replace( new RegExp( '(]*)?>)\\s*
', 'gi' ), '$1' );
+ pee = pee.replace( /\s*\n/gi, '|]*)?>/) )
+ pee = pee.replace( /(<(?:div|th|td|form|fieldset|dd)[^>]*>)(.*?)<\/p>/g, function( a, b, c ) {
+ if ( c.match( /]*)?>/ ) ) {
return a;
+ }
return b + '' + c + '
';
});
// put back the line breaks in pre|script
- if ( preserve_linebreaks )
- pee = pee.replace(//g, '\n');
+ if ( preserve_linebreaks ) {
+ pee = pee.replace( //g, '\n' );
+ }
- if ( preserve_br )
- pee = pee.replace(/]*)>/g, '');
+ if ( preserve_br ) {
+ pee = pee.replace( /]*)>/g, '' );
+ }
return pee;
},
- pre_wpautop : function(content) {
+ pre_wpautop: function( content ) {
var t = this, o = { o: t, data: content, unfiltered: content },
- q = typeof(jQuery) != 'undefined';
+ q = typeof( jQuery ) !== 'undefined';
- if ( q )
- jQuery('body').trigger('beforePreWpautop', [o]);
- o.data = t._wp_Nop(o.data);
- if ( q )
- jQuery('body').trigger('afterPreWpautop', [o]);
+ if ( q ) {
+ jQuery( 'body' ).trigger( 'beforePreWpautop', [ o ] );
+ }
+
+ o.data = t._wp_Nop( o.data );
+
+ if ( q ) {
+ jQuery('body').trigger('afterPreWpautop', [ o ] );
+ }
return o.data;
},
- wpautop : function(pee) {
+ wpautop: function( pee ) {
var t = this, o = { o: t, data: pee, unfiltered: pee },
- q = typeof(jQuery) != 'undefined';
+ q = typeof( jQuery ) !== 'undefined';
- if ( q )
- jQuery('body').trigger('beforeWpautop', [o]);
- o.data = t._wp_Autop(o.data);
- if ( q )
- jQuery('body').trigger('afterWpautop', [o]);
+ if ( q ) {
+ jQuery( 'body' ).trigger('beforeWpautop', [ o ] );
+ }
+
+ o.data = t._wp_Autop( o.data );
+
+ if ( q ) {
+ jQuery( 'body' ).trigger('afterWpautop', [ o ] );
+ }
return o.data;
}
-}
+};
diff --git a/wp-admin/js/editor.min.js b/wp-admin/js/editor.min.js
index 70cca04..9babf7b 100644
--- a/wp-admin/js/editor.min.js
+++ b/wp-admin/js/editor.min.js
@@ -1 +1 @@
-var switchEditors={switchto:function(b){var c=b.id,a=c.length,e=c.substr(0,a-5),d=c.substr(a-4);this.go(e,d)},go:function(g,f){g=g||"content";f=f||"toggle";var c=this,b=tinyMCE.get(g),a,d,e=tinymce.DOM;a="wp-"+g+"-wrap";d=e.get(g);if("toggle"==f){if(b&&!b.isHidden()){f="html"}else{f="tmce"}}if("tmce"==f||"tinymce"==f){if(b&&!b.isHidden()){return false}if(typeof(QTags)!="undefined"){QTags.closeAllTags(g)}if(tinyMCEPreInit.mceInit[g]&&tinyMCEPreInit.mceInit[g].wpautop){d.value=c.wpautop(d.value)}if(b){b.show()}else{b=new tinymce.Editor(g,tinyMCEPreInit.mceInit[g]);b.render()}e.removeClass(a,"html-active");e.addClass(a,"tmce-active");setUserSetting("editor","tinymce")}else{if("html"==f){if(b&&b.isHidden()){return false}if(b){b.hide()}e.removeClass(a,"tmce-active");e.addClass(a,"html-active");setUserSetting("editor","html")}}return false},_wp_Nop:function(c){var d,b,e=false,a=false;if(c.indexOf("]*>[\s\S]+?<\/\1>/g,function(f){f=f.replace(/");return f.replace(/<\/?p( [^>]*)?>(\r\n|\n)?/g,"")})}if(c.indexOf("[caption")!=-1){a=true;c=c.replace(/\[caption[\s\S]+?\[\/caption\]/g,function(f){return f.replace(/]*)>/g,"").replace(/[\r\n\t]+/,"")})}d="blockquote|ul|ol|li|table|thead|tbody|tfoot|tr|th|td|div|h[1-6]|p|fieldset";c=c.replace(new RegExp("\\s*\\s*","g"),"\n");c=c.replace(new RegExp("\\s*<((?:"+d+")(?: [^>]*)?)>","g"),"\n<$1>");c=c.replace(/(]+>.*?)<\/p>/g,"$1");c=c.replace(/]*)?>\s*/gi,"\n\n");c=c.replace(/\s*/gi,"");c=c.replace(/\s*<\/p>\s*/gi,"\n\n");c=c.replace(/\n[\s\u00a0]+\n/g,"\n\n");c=c.replace(/\s*
\s*/g,"
\n");c=c.replace(/\s*\[caption([^\[]+)\[\/caption\]\s*/gi,"\n\n[caption$1[/caption]\n\n");c=c.replace(/caption\]\n\n+\[caption/g,"caption]\n\n[caption");b="blockquote|ul|ol|li|table|thead|tbody|tfoot|tr|th|td|h[1-6]|pre|fieldset";c=c.replace(new RegExp("\\s*<((?:"+b+")(?: [^>]*)?)\\s*>","g"),"\n<$1>");c=c.replace(new RegExp("\\s*\\s*","g"),"\n");c=c.replace(/]*)>/g,"\t");if(c.indexOf("]*)?>\s*/g,"\n\n\n\n")}if(c.indexOf("/g,function(f){return f.replace(/[\r\n]+/g,"")})}c=c.replace(/<\/p#>/g,"
\n");c=c.replace(/\s*(]+>[\s\S]*?<\/p>)/g,"\n$1");c=c.replace(/^\s+/,"");c=c.replace(/[\s\u00a0]+$/,"");if(e){c=c.replace(//g,"\n")}if(a){c=c.replace(/]*)>/g,"")}return c},_wp_Autop:function(a){var c=false,b=false,d="table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|option|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|noscript|samp|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary";if(a.indexOf("/g,function(e){return e.replace(/[\r\n]+/g,"")})}a=a.replace(/<[^<>]+>/g,function(e){return e.replace(/[\r\n]+/g," ")});if(a.indexOf("]*>[\s\S]+?<\/\1>/g,function(e){return e.replace(/(\r\n|\n)/g,"")})}if(a.indexOf("[caption")!=-1){b=true;a=a.replace(/\[caption[\s\S]+?\[\/caption\]/g,function(e){e=e.replace(/]*)>/g,"");e=e.replace(/<[a-zA-Z0-9]+( [^<>]+)?>/g,function(f){return f.replace(/[\r\n\t]+/," ")});return e.replace(/\s*\n\s*/g,"]*)?>/gi,"\n\n");a=a.replace(/\r\n|\r/g,"\n");a=a.replace(/\n\s*\n+/g,"\n\n");a=a.replace(/([\s\S]+?)\n\n/g,"$1
\n");a=a.replace(/\s*?<\/p>/gi,"");a=a.replace(new RegExp("
\\s*(]*)?>)\\s*
","gi"),"$1");a=a.replace(/(/gi,"$1");a=a.replace(/\s*]*)>/gi,"");a=a.replace(/<\/blockquote>\s*<\/p>/gi,"
");a=a.replace(new RegExp("\\s*(]*)?>)","gi"),"$1");a=a.replace(new RegExp("(]*)?>)\\s*
","gi"),"$1");a=a.replace(/\s*\n/gi,"|]*)?>/)){return f}return e+""+g+"
"});if(c){a=a.replace(//g,"\n")}if(b){a=a.replace(/]*)>/g,"")}return a},pre_wpautop:function(b){var a=this,d={o:a,data:b,unfiltered:b},c=typeof(jQuery)!="undefined";if(c){jQuery("body").trigger("beforePreWpautop",[d])}d.data=a._wp_Nop(d.data);if(c){jQuery("body").trigger("afterPreWpautop",[d])}return d.data},wpautop:function(b){var a=this,d={o:a,data:b,unfiltered:b},c=typeof(jQuery)!="undefined";if(c){jQuery("body").trigger("beforeWpautop",[d])}d.data=a._wp_Autop(d.data);if(c){jQuery("body").trigger("afterWpautop",[d])}return d.data}};
\ No newline at end of file
+window.switchEditors={switchto:function(a){var b=a.id,c=b.length,d=b.substr(0,c-5),e=b.substr(c-4);this.go(d,e)},go:function(a,b){function c(){var a=k.select(".mce-toolbar-grp",d.getContainer())[0],b=a&&a.clientHeight;return b&&b>10&&200>b?parseInt(b,10):30}var d,e,f,g,h,i,j=this,k=tinymce.DOM;if(a=a||"content",b=b||"toggle",d=tinymce.get(a),e="wp-"+a+"-wrap",f=k.get(a),"toggle"===b&&(b=d&&!d.isHidden()?"html":"tmce"),"tmce"===b||"tinymce"===b){if(d&&!d.isHidden())return!1;"undefined"!=typeof QTags&&QTags.closeAllTags(a),h=f?parseInt(f.style.height,10):0,tinyMCEPreInit.mceInit[a]&&tinyMCEPreInit.mceInit[a].wpautop&&(f.value=j.wpautop(f.value)),d?(d.show(),h&&(i=c(),h=h-i+14,h>50&&5e3>h&&d.theme.resizeTo(null,h))):tinymce.init(tinyMCEPreInit.mceInit[a]),k.removeClass(e,"html-active"),k.addClass(e,"tmce-active"),setUserSetting("editor","tinymce")}else if("html"===b){if(d&&d.isHidden())return!1;d?(g=k.get(a+"_ifr"),h=g?parseInt(g.style.height,10):0,h&&(i=c(),h=h+i-14,h>50&&5e3>h&&(f.style.height=h+"px")),d.hide()):(tinyMCEPreInit.mceInit[a]&&tinyMCEPreInit.mceInit[a].wpautop&&(f.value=j.pre_wpautop(f.value)),k.setStyles(f,{display:"",visibility:""})),k.removeClass(e,"tmce-active"),k.addClass(e,"html-active"),setUserSetting("editor","html")}return!1},_wp_Nop:function(a){var b,c,d=!1,e=!1;return(-1!==a.indexOf("]*>[\s\S]+?<\/\1>/g,function(a){return a=a.replace(/"),a=a.replace(/<\/?p( [^>]*)?>(\r\n|\n)?/g,""),a.replace(/\r?\n/g,"")})),-1!==a.indexOf("[caption")&&(e=!0,a=a.replace(/\[caption[\s\S]+?\[\/caption\]/g,function(a){return a.replace(/]*)>/g,"").replace(/[\r\n\t]+/,"")})),b="blockquote|ul|ol|li|table|thead|tbody|tfoot|tr|th|td|div|h[1-6]|p|fieldset",a=a.replace(new RegExp("\\s*\\s*","g"),"\n"),a=a.replace(new RegExp("\\s*<((?:"+b+")(?: [^>]*)?)>","g"),"\n<$1>"),a=a.replace(/(]+>.*?)<\/p>/g,"$1"),a=a.replace(/]*)?>\s*/gi,"\n\n"),a=a.replace(/\s*/gi,""),a=a.replace(/\s*<\/p>\s*/gi,"\n\n"),a=a.replace(/\n[\s\u00a0]+\n/g,"\n\n"),a=a.replace(/\s*
\s*/g,"
\n"),a=a.replace(/\s*\[caption([^\[]+)\[\/caption\]\s*/gi,"\n\n[caption$1[/caption]\n\n"),a=a.replace(/caption\]\n\n+\[caption/g,"caption]\n\n[caption"),c="blockquote|ul|ol|li|table|thead|tbody|tfoot|tr|th|td|h[1-6]|pre|fieldset",a=a.replace(new RegExp("\\s*<((?:"+c+")(?: [^>]*)?)\\s*>","g"),"\n<$1>"),a=a.replace(new RegExp("\\s*\\s*","g"),"\n"),a=a.replace(/]*)>/g," "),-1!==a.indexOf("]*)?>\s*/g,"\n\n\n\n")),-1!==a.indexOf("/g,function(a){return a.replace(/[\r\n]+/g,"")})),a=a.replace(/<\/p#>/g,"
\n"),a=a.replace(/\s*(]+>[\s\S]*?<\/p>)/g,"\n$1"),a=a.replace(/^\s+/,""),a=a.replace(/[\s\u00a0]+$/,""),d&&(a=a.replace(//g,"\n")),e&&(a=a.replace(/]*)>/g,"")),a},_wp_Autop:function(a){var b=!1,c=!1,d="table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|noscript|legend|section|article|aside|hgroup|header|footer|nav|figure|details|menu|summary";return-1!==a.indexOf("/g,function(a){return a.replace(/[\r\n]+/g,"")})),a=a.replace(/<[^<>]+>/g,function(a){return a.replace(/[\r\n]+/g," ")}),(-1!==a.indexOf("]*>[\s\S]+?<\/\1>/g,function(a){return a.replace(/(\r\n|\n)/g,"")})),-1!==a.indexOf("[caption")&&(c=!0,a=a.replace(/\[caption[\s\S]+?\[\/caption\]/g,function(a){return a=a.replace(/]*)>/g,""),a=a.replace(/<[a-zA-Z0-9]+( [^<>]+)?>/g,function(a){return a.replace(/[\r\n\t]+/," ")}),a.replace(/\s*\n\s*/g,"]*)?>/gi,"\n\n"),a=a.replace(/\r\n|\r/g,"\n"),a=a.replace(/\n\s*\n+/g,"\n\n"),a=a.replace(/([\s\S]+?)\n\n/g,"$1
\n"),a=a.replace(/\s*?<\/p>/gi,""),a=a.replace(new RegExp("
\\s*(]*)?>)\\s*
","gi"),"$1"),a=a.replace(/(/gi,"$1"),a=a.replace(/\s*]*)>/gi,""),a=a.replace(/<\/blockquote>\s*<\/p>/gi,"
"),a=a.replace(new RegExp("\\s*(]*)?>)","gi"),"$1"),a=a.replace(new RegExp("(]*)?>)\\s*
","gi"),"$1"),a=a.replace(/\s*\n/gi,"|]*)?>/)?a:b+""+c+"
"}),b&&(a=a.replace(//g,"\n")),c&&(a=a.replace(/]*)>/g,"")),a},pre_wpautop:function(a){var b=this,c={o:b,data:a,unfiltered:a},d="undefined"!=typeof jQuery;return d&&jQuery("body").trigger("beforePreWpautop",[c]),c.data=b._wp_Nop(c.data),d&&jQuery("body").trigger("afterPreWpautop",[c]),c.data},wpautop:function(a){var b=this,c={o:b,data:a,unfiltered:a},d="undefined"!=typeof jQuery;return d&&jQuery("body").trigger("beforeWpautop",[c]),c.data=b._wp_Autop(c.data),d&&jQuery("body").trigger("afterWpautop",[c]),c.data}};
\ No newline at end of file
diff --git a/wp-admin/js/gallery.js b/wp-admin/js/gallery.js
index d7b4bb1..5b70b7f 100644
--- a/wp-admin/js/gallery.js
+++ b/wp-admin/js/gallery.js
@@ -1,5 +1,7 @@
+/* global unescape, getUserSetting, setUserSetting */
+
jQuery(document).ready(function($) {
- var gallerySortable, gallerySortableInit, w, desc = false;
+ var gallerySortable, gallerySortableInit, sortIt, clearAll, w, desc = false;
gallerySortableInit = function() {
gallerySortable = $('#media-items').sortable( {
@@ -8,7 +10,7 @@ jQuery(document).ready(function($) {
axis: 'y',
distance: 2,
handle: 'div.filename',
- stop: function(e, ui) {
+ stop: function() {
// When an update has occurred, adjust the order for each item
var all = $('#media-items').sortable('toArray'), len = all.length;
$.each(all, function(i, id) {
@@ -17,7 +19,7 @@ jQuery(document).ready(function($) {
});
}
} );
- }
+ };
sortIt = function() {
var all = $('.menu_order_input'), len = all.length;
@@ -25,26 +27,39 @@ jQuery(document).ready(function($) {
var order = desc ? (len - i) : (1 + i);
$(this).val(order);
});
- }
+ };
clearAll = function(c) {
c = c || 0;
- $('.menu_order_input').each(function(){
- if ( this.value == '0' || c ) this.value = '';
+ $('.menu_order_input').each( function() {
+ if ( this.value === '0' || c ) {
+ this.value = '';
+ }
});
- }
+ };
- $('#asc').click(function(){desc = false; sortIt(); return false;});
- $('#desc').click(function(){desc = true; sortIt(); return false;});
- $('#clear').click(function(){clearAll(1); return false;});
- $('#showall').click(function(){
+ $('#asc').click( function() {
+ desc = false;
+ sortIt();
+ return false;
+ });
+ $('#desc').click( function() {
+ desc = true;
+ sortIt();
+ return false;
+ });
+ $('#clear').click( function() {
+ clearAll(1);
+ return false;
+ });
+ $('#showall').click( function() {
$('#sort-buttons span a').toggle();
$('a.describe-toggle-on').hide();
$('a.describe-toggle-off, table.slidetoggle').show();
$('img.pinkynail').toggle(false);
return false;
});
- $('#hideall').click(function(){
+ $('#hideall').click( function() {
$('#sort-buttons span a').toggle();
$('a.describe-toggle-on').show();
$('a.describe-toggle-off, table.slidetoggle').hide();
@@ -60,7 +75,7 @@ jQuery(document).ready(function($) {
w = wpgallery.getWin();
$('#save-all, #gallery-settings').show();
- if ( typeof w.tinyMCE != 'undefined' && w.tinyMCE.activeEditor && ! w.tinyMCE.activeEditor.isHidden() ) {
+ if ( typeof w.tinyMCE !== 'undefined' && w.tinyMCE.activeEditor && ! w.tinyMCE.activeEditor.isHidden() ) {
wpgallery.mcemode = true;
wpgallery.init();
} else {
@@ -88,7 +103,9 @@ wpgallery = {
init: function() {
var t = this, li, q, i, it, w = t.getWin();
- if ( ! t.mcemode ) return;
+ if ( ! t.mcemode ) {
+ return;
+ }
li = ('' + document.location.search).replace(/^\?/, '').split('&');
q = {};
@@ -97,8 +114,9 @@ wpgallery = {
q[unescape(it[0])] = unescape(it[1]);
}
- if (q.mce_rdomain)
+ if ( q.mce_rdomain ) {
document.domain = q.mce_rdomain;
+ }
// Find window & API
tinymce = w.tinymce;
@@ -114,18 +132,28 @@ wpgallery = {
setup : function() {
var t = this, a, ed = t.editor, g, columns, link, order, orderby;
- if ( ! t.mcemode ) return;
+ if ( ! t.mcemode ) {
+ return;
+ }
t.el = ed.selection.getNode();
- if ( t.el.nodeName != 'IMG' || ! ed.dom.hasClass(t.el, 'wpGallery') ) {
- if ( (g = ed.dom.select('img.wpGallery')) && g[0] ) {
+ if ( t.el.nodeName !== 'IMG' || ! ed.dom.hasClass(t.el, 'wpGallery') ) {
+ if ( ( g = ed.dom.select('img.wpGallery') ) && g[0] ) {
t.el = g[0];
} else {
- if ( getUserSetting('galfile') == '1' ) t.I('linkto-file').checked = "checked";
- if ( getUserSetting('galdesc') == '1' ) t.I('order-desc').checked = "checked";
- if ( getUserSetting('galcols') ) t.I('columns').value = getUserSetting('galcols');
- if ( getUserSetting('galord') ) t.I('orderby').value = getUserSetting('galord');
+ if ( getUserSetting('galfile') === '1' ) {
+ t.I('linkto-file').checked = 'checked';
+ }
+ if ( getUserSetting('galdesc') === '1' ) {
+ t.I('order-desc').checked = 'checked';
+ }
+ if ( getUserSetting('galcols') ) {
+ t.I('columns').value = getUserSetting('galcols');
+ }
+ if ( getUserSetting('galord') ) {
+ t.I('orderby').value = getUserSetting('galord');
+ }
jQuery('#insert-gallery').show();
return;
}
@@ -143,10 +171,18 @@ wpgallery = {
order = a.match(/order=['"]([^'"]+)['"]/i);
orderby = a.match(/orderby=['"]([^'"]+)['"]/i);
- if ( link && link[1] ) t.I('linkto-file').checked = "checked";
- if ( order && order[1] ) t.I('order-desc').checked = "checked";
- if ( columns && columns[1] ) t.I('columns').value = ''+columns[1];
- if ( orderby && orderby[1] ) t.I('orderby').value = orderby[1];
+ if ( link && link[1] ) {
+ t.I('linkto-file').checked = 'checked';
+ }
+ if ( order && order[1] ) {
+ t.I('order-desc').checked = 'checked';
+ }
+ if ( columns && columns[1] ) {
+ t.I('columns').value = '' + columns[1];
+ }
+ if ( orderby && orderby[1] ) {
+ t.I('orderby').value = orderby[1];
+ }
} else {
jQuery('#insert-gallery').show();
}
@@ -156,14 +192,16 @@ wpgallery = {
var t = this, ed = t.editor, all = '', s;
if ( ! t.mcemode || ! t.is_update ) {
- s = '[gallery'+t.getSettings()+']';
+ s = '[gallery' + t.getSettings() + ']';
t.getWin().send_to_editor(s);
return;
}
- if (t.el.nodeName != 'IMG') return;
+ if ( t.el.nodeName !== 'IMG' ) {
+ return;
+ }
- all = ed.dom.decode(ed.dom.getAttrib(t.el, 'title'));
+ all = ed.dom.decode( ed.dom.getAttrib( t.el, 'title' ) );
all = all.replace(/\s*(order|link|columns|orderby)=['"]([^'"]+)['"]/gi, '');
all += t.getSettings();
@@ -184,13 +222,13 @@ wpgallery = {
setUserSetting('galdesc', '1');
}
- if ( I('columns').value != 3 ) {
- s += ' columns="'+I('columns').value+'"';
+ if ( I('columns').value !== 3 ) {
+ s += ' columns="' + I('columns').value + '"';
setUserSetting('galcols', I('columns').value);
}
- if ( I('orderby').value != 'menu_order' ) {
- s += ' orderby="'+I('orderby').value+'"';
+ if ( I('orderby').value !== 'menu_order' ) {
+ s += ' orderby="' + I('orderby').value + '"';
setUserSetting('galord', I('orderby').value);
}
diff --git a/wp-admin/js/gallery.min.js b/wp-admin/js/gallery.min.js
index 9d112ca..bcfc88a 100644
--- a/wp-admin/js/gallery.min.js
+++ b/wp-admin/js/gallery.min.js
@@ -1 +1 @@
-jQuery(document).ready(function(c){var b,e,a,d=false;e=function(){b=c("#media-items").sortable({items:"div.media-item",placeholder:"sorthelper",axis:"y",distance:2,handle:"div.filename",stop:function(i,h){var g=c("#media-items").sortable("toArray"),f=g.length;c.each(g,function(k,l){var j=d?(f-k):(1+k);c("#"+l+" .menu_order input").val(j)})}})};sortIt=function(){var g=c(".menu_order_input"),f=g.length;g.each(function(j){var h=d?(f-j):(1+j);c(this).val(h)})};clearAll=function(f){f=f||0;c(".menu_order_input").each(function(){if(this.value=="0"||f){this.value=""}})};c("#asc").click(function(){d=false;sortIt();return false});c("#desc").click(function(){d=true;sortIt();return false});c("#clear").click(function(){clearAll(1);return false});c("#showall").click(function(){c("#sort-buttons span a").toggle();c("a.describe-toggle-on").hide();c("a.describe-toggle-off, table.slidetoggle").show();c("img.pinkynail").toggle(false);return false});c("#hideall").click(function(){c("#sort-buttons span a").toggle();c("a.describe-toggle-on").show();c("a.describe-toggle-off, table.slidetoggle").hide();c("img.pinkynail").toggle(true);return false});e();clearAll();if(c("#media-items>*").length>1){a=wpgallery.getWin();c("#save-all, #gallery-settings").show();if(typeof a.tinyMCE!="undefined"&&a.tinyMCE.activeEditor&&!a.tinyMCE.activeEditor.isHidden()){wpgallery.mcemode=true;wpgallery.init()}else{c("#insert-gallery").show()}}});jQuery(window).unload(function(){tinymce=tinyMCE=wpgallery=null});var tinymce=null,tinyMCE,wpgallery;wpgallery={mcemode:false,editor:{},dom:{},is_update:false,el:{},I:function(a){return document.getElementById(a)},init:function(){var d=this,a,f,c,e,b=d.getWin();if(!d.mcemode){return}a=(""+document.location.search).replace(/^\?/,"").split("&");f={};for(c=0;c*").length>1&&(f=wpgallery.getWin(),a("#save-all, #gallery-settings").show(),"undefined"!=typeof f.tinyMCE&&f.tinyMCE.activeEditor&&!f.tinyMCE.activeEditor.isHidden()?(wpgallery.mcemode=!0,wpgallery.init()):a("#insert-gallery").show())}),jQuery(window).unload(function(){tinymce=tinyMCE=wpgallery=null});var tinymce=null,tinyMCE,wpgallery;wpgallery={mcemode:!1,editor:{},dom:{},is_update:!1,el:{},I:function(a){return document.getElementById(a)},init:function(){var a,b,c,d,e=this,f=e.getWin();if(e.mcemode){for(a=(""+document.location.search).replace(/^\?/,"").split("&"),b={},c=0;c this.hold['oh'] ) || ( w1 && w1 > this.hold['ow'] ) )
+ if ( ( h1 && h1 > this.hold.oh ) || ( w1 && w1 > this.hold.ow ) ) {
warn.css('visibility', 'visible');
- else
+ } else {
warn.css('visibility', 'hidden');
+ }
},
getSelRatio : function(postid) {
- var x = this.hold['w'], y = this.hold['h'],
+ var x = this.hold.w, y = this.hold.h,
X = this.intval( $('#imgedit-crop-width-' + postid).val() ),
Y = this.intval( $('#imgedit-crop-height-' + postid).val() );
- if ( X && Y )
+ if ( X && Y ) {
return X + ':' + Y;
+ }
- if ( x && y )
+ if ( x && y ) {
return x + ':' + y;
+ }
return '1:1';
},
@@ -103,7 +110,7 @@ imageEdit = {
// apply undo state to history
var history = $('#imgedit-history-' + postid).val(), pop, n, o, i, op = [];
- if ( history != '' ) {
+ if ( history !== '' ) {
history = JSON.parse(history);
pop = this.intval( $('#imgedit-undone-' + postid).val() );
if ( pop > 0 ) {
@@ -115,8 +122,8 @@ imageEdit = {
if ( setSize ) {
if ( !history.length ) {
- this.hold['w'] = this.hold['ow'];
- this.hold['h'] = this.hold['oh'];
+ this.hold.w = this.hold.ow;
+ this.hold.h = this.hold.oh;
return '';
}
@@ -125,8 +132,8 @@ imageEdit = {
o = o.c || o.r || o.f || false;
if ( o ) {
- this.hold['w'] = o.fw;
- this.hold['h'] = o.fh;
+ this.hold.w = o.fw;
+ this.hold.h = o.fh;
}
}
@@ -158,40 +165,45 @@ imageEdit = {
'rand': t.intval(Math.random() * 1000000)
};
- img = $('' + imageEditL10n.error + '
' + imageEditL10n.error + '
this.hold.oh)||(c&&c>this.hold.ow)){g.css("visibility","visible")}else{g.css("visibility","hidden")}},getSelRatio:function(f){var b=this.hold.w,e=this.hold.h,d=this.intval(a("#imgedit-crop-width-"+f).val()),c=this.intval(a("#imgedit-crop-height-"+f).val());if(d&&c){return d+":"+c}if(b&&e){return b+":"+e}return"1:1"},filterHistory:function(j,f){var d=a("#imgedit-history-"+j).val(),b,h,e,c,g=[];if(d!=""){d=JSON.parse(d);b=this.intval(a("#imgedit-undone-"+j).val());if(b>0){while(b>0){d.pop();b--}}if(f){if(!d.length){this.hold.w=this.hold.ow;this.hold.h=this.hold.oh;return""}e=d[d.length-1];e=e.c||e.r||e.f||false;if(e){this.hold.w=e.fw;this.hold.h=e.fh}}for(h in d){c=d[h];if(c.hasOwnProperty("c")){g[h]={c:{x:c.c.x,y:c.c.y,w:c.c.w,h:c.c.h}}}else{if(c.hasOwnProperty("r")){g[h]={r:c.r.r}}else{if(c.hasOwnProperty("f")){g[h]={f:c.f.f}}}}}return JSON.stringify(g)}return""},refreshEditor:function(g,d,f){var c=this,e,b;c.toggleEditor(g,1);e={action:"imgedit-preview",_ajax_nonce:d,postid:g,history:c.filterHistory(g,1),rand:c.intval(Math.random()*1000000)};b=a(''+g.error+"
");imageEdit.close(f);return}if(g.fw&&g.fh){a("#media-dims-"+f).html(g.fw+" × "+g.fh)}if(g.thumbnail){a(".thumbnail","#thumbnail-head-"+f).attr("src",""+g.thumbnail)}if(g.msg){a("#imgedit-response-"+f).html('
")}imageEdit.close(f)})},open:function(h,d){var f,e=a("#image-editor-"+h),c=a("#media-head-"+h),b=a("#imgedit-open-btn-"+h),g=b.siblings(".spinner");b.prop("disabled",true);g.show();f={action:"image-editor",_ajax_nonce:d,postid:h,"do":"open"};e.load(ajaxurl,f,function(){e.fadeIn("fast");c.fadeOut("fast",function(){b.removeAttr("disabled");g.hide()})})},imgLoaded:function(d){var b=a("#image-preview-"+d),c=a("#imgedit-crop-"+d);this.initCrop(d,b,c);this.setCropSelection(d,0);this.toggleEditor(d,0)},initCrop:function(g,e,c){var b=this,d=a("#imgedit-sel-width-"+g),f=a("#imgedit-sel-height-"+g);b.iasapi=a(e).imgAreaSelect({parent:c,instance:true,handles:true,keys:true,minWidth:3,minHeight:3,onInit:function(h,i){c.children().mousedown(function(m){var k=false,l,j;if(m.shiftKey){l=b.iasapi.getSelection();j=b.getSelRatio(g);k=(l&&l.width&&l.height)?l.width+":"+l.height:j}b.iasapi.setOptions({aspectRatio:k})})},onSelectStart:function(h,i){imageEdit.setDisabled(a("#imgedit-crop-sel-"+g),1)},onSelectEnd:function(h,i){imageEdit.setCropSelection(g,i)},onSelectChange:function(h,j){var i=imageEdit.hold.sizer;d.val(imageEdit.round(j.width/i));f.val(imageEdit.round(j.height/i))}})},setCropSelection:function(g,f){var e,b=a("#imgedit-minthumb-"+g).val()||"128:128",d=this.hold.sizer;b=b.split(":");f=f||0;if(!f||(f.width<3&&f.height<3)){this.setDisabled(a(".imgedit-crop","#imgedit-panel-"+g),0);this.setDisabled(a("#imgedit-crop-sel-"+g),0);a("#imgedit-sel-width-"+g).val("");a("#imgedit-sel-height-"+g).val("");a("#imgedit-selection-"+g).val("");return false}if(f.width<(b[0]*d)&&f.height<(b[1]*d)){this.setDisabled(a(".imgedit-crop","#imgedit-panel-"+g),0);a("#imgedit-selection-"+g).val("");return false}e={x:f.x1,y:f.y1,w:f.width,h:f.height};this.setDisabled(a(".imgedit-crop","#imgedit-panel-"+g),1);a("#imgedit-selection-"+g).val(JSON.stringify(e))},close:function(c,b){b=b||false;if(b&&this.notsaved(c)){return false}this.iasapi={};this.hold={};a("#image-editor-"+c).fadeOut("fast",function(){a("#media-head-"+c).fadeIn("fast");a(this).empty()})},notsaved:function(e){var c=a("#imgedit-history-"+e).val(),d=(c!="")?JSON.parse(c):new Array(),b=this.intval(a("#imgedit-undone-"+e).val());if(b
0){g.pop();b--}f.val(0);g.push(i);e.val(JSON.stringify(g));c.refreshEditor(h,d,function(){c.setDisabled(a("#image-undo-"+h),true);c.setDisabled(a("#image-redo-"+h),false)})},rotate:function(d,e,c,b){if(a(b).hasClass("disabled")){return false}this.addStep({r:{r:d,fw:this.hold.h,fh:this.hold.w}},e,c)},flip:function(d,e,c,b){if(a(b).hasClass("disabled")){return false}this.addStep({f:{f:d,fw:this.hold.w,fh:this.hold.h}},e,c)},crop:function(g,e,c){var f=a("#imgedit-selection-"+g).val(),b=this.intval(a("#imgedit-sel-width-"+g).val()),d=this.intval(a("#imgedit-sel-height-"+g).val());if(a(c).hasClass("disabled")||f==""){return false}f=JSON.parse(f);if(f.w>0&&f.h>0&&b>0&&d>0){f.fw=b;f.fh=d;this.addStep({c:f},g,e)}},undo:function(g,e){var d=this,c=a("#image-undo-"+g),f=a("#imgedit-undone-"+g),b=d.intval(f.val())+1;if(c.hasClass("disabled")){return}f.val(b);d.refreshEditor(g,e,function(){var h=a("#imgedit-history-"+g),i=(h.val()!="")?JSON.parse(h.val()):new Array();d.setDisabled(a("#image-redo-"+g),true);d.setDisabled(c,b0)})},setNumSelection:function(c){var g,k=a("#imgedit-sel-width-"+c),j=a("#imgedit-sel-height-"+c),o=this.intval(k.val()),m=this.intval(j.val()),i=a("#image-preview-"+c),p=i.height(),h=i.width(),b=this.hold.sizer,f,n,e,l,d=this.iasapi;if(o<1){k.val("");return false}if(m<1){j.val("");return false}if(o&&m&&(g=d.getSelection())){e=g.x1+Math.round(o*b);l=g.y1+Math.round(m*b);f=g.x1;n=g.y1;if(e>h){f=0;e=h;k.val(Math.round(e/b))}if(l>p){n=0;l=p;j.val(Math.round(l/b))}d.setSelection(f,n,e,l);d.update();this.setCropSelection(c,d.getSelection())}},round:function(b){var c;b=Math.round(b);if(this.hold.sizer>0.6){return b}c=b.toString().slice(-1);if("1"==c){return b-1}else{if("9"==c){return b+1}}return b},setRatioSelection:function(j,i,d){var f,e,b=this.intval(a("#imgedit-crop-width-"+j).val()),g=this.intval(a("#imgedit-crop-height-"+j).val()),c=a("#image-preview-"+j).height();if(!this.intval(a(d).val())){a(d).val("");return}if(b&&g){this.iasapi.setOptions({aspectRatio:b+":"+g});if(f=this.iasapi.getSelection(true)){e=Math.ceil(f.y1+((f.x2-f.x1)/(b/g)));if(e>c){e=c;if(i){a("#imgedit-crop-height-"+j).val("")}else{a("#imgedit-crop-width-"+j).val("")}}this.iasapi.setSelection(f.x1,f.y1,f.x2,e);this.iasapi.update()}}}}})(jQuery);
\ No newline at end of file
+!function(a){var b=window.imageEdit={iasapi:{},hold:{},postid:"",_view:!1,intval:function(a){return 0|a},setDisabled:function(b,c){c?(b.removeClass("disabled"),a("input",b).removeAttr("disabled")):(b.addClass("disabled"),a("input",b).prop("disabled",!0))},init:function(b){var c=this,d=a("#image-editor-"+c.postid),e=c.intval(a("#imgedit-x-"+b).val()),f=c.intval(a("#imgedit-y-"+b).val());c.postid!==b&&d.length&&c.close(c.postid),c.hold.w=c.hold.ow=e,c.hold.h=c.hold.oh=f,c.hold.xy_ratio=e/f,c.hold.sizer=parseFloat(a("#imgedit-sizer-"+b).val()),c.postid=b,a("#imgedit-response-"+b).empty(),a('input[type="text"]',"#imgedit-panel-"+b).keypress(function(b){var c=b.keyCode;return c>36&&41>c&&a(this).blur(),13===c?(b.preventDefault(),b.stopPropagation(),!1):void 0})},toggleEditor:function(b,c){var d=a("#imgedit-wait-"+b);c?d.height(a("#imgedit-panel-"+b).height()).fadeIn("fast"):d.fadeOut("fast")},toggleHelp:function(b){return a(b).parents(".imgedit-group-top").toggleClass("imgedit-help-toggled").find(".imgedit-help").slideToggle("fast"),!1},getTarget:function(b){return a('input[name="imgedit-target-'+b+'"]:checked',"#imgedit-save-target-"+b).val()||"full"},scaleChanged:function(b,c){var d=a("#imgedit-scale-width-"+b),e=a("#imgedit-scale-height-"+b),f=a("#imgedit-scale-warn-"+b),g="",h="";c?(h=""!==d.val()?Math.round(d.val()/this.hold.xy_ratio):"",e.val(h)):(g=""!==e.val()?Math.round(e.val()*this.hold.xy_ratio):"",d.val(g)),h&&h>this.hold.oh||g&&g>this.hold.ow?f.css("visibility","visible"):f.css("visibility","hidden")},getSelRatio:function(b){var c=this.hold.w,d=this.hold.h,e=this.intval(a("#imgedit-crop-width-"+b).val()),f=this.intval(a("#imgedit-crop-height-"+b).val());return e&&f?e+":"+f:c&&d?c+":"+d:"1:1"},filterHistory:function(b,c){var d,e,f,g,h=a("#imgedit-history-"+b).val(),i=[];if(""!==h){if(h=JSON.parse(h),d=this.intval(a("#imgedit-undone-"+b).val()),d>0)for(;d>0;)h.pop(),d--;if(c){if(!h.length)return this.hold.w=this.hold.ow,this.hold.h=this.hold.oh,"";f=h[h.length-1],f=f.c||f.r||f.f||!1,f&&(this.hold.w=f.fw,this.hold.h=f.fh)}for(e in h)g=h[e],g.hasOwnProperty("c")?i[e]={c:{x:g.c.x,y:g.c.y,w:g.c.w,h:g.c.h}}:g.hasOwnProperty("r")?i[e]={r:g.r.r}:g.hasOwnProperty("f")&&(i[e]={f:g.f.f});return JSON.stringify(i)}return""},refreshEditor:function(c,d,e){var f,g,h=this;h.toggleEditor(c,1),f={action:"imgedit-preview",_ajax_nonce:d,postid:c,history:h.filterHistory(c,1),rand:h.intval(1e6*Math.random())},g=a(''+e.error+"
"),void b.close(c)):(e.fw&&e.fh&&a("#media-dims-"+c).html(e.fw+" × "+e.fh),e.thumbnail&&a(".thumbnail","#thumbnail-head-"+c).attr("src",""+e.thumbnail),e.msg&&a("#imgedit-response-"+c).html('
"),void(h._view?h._view.save():b.close(c)))}))},open:function(b,c,d){this._view=d;var e,f=a("#image-editor-"+b),g=a("#media-head-"+b),h=a("#imgedit-open-btn-"+b),i=h.siblings(".spinner");h.prop("disabled",!0),i.show(),e={action:"image-editor",_ajax_nonce:c,postid:b,"do":"open"},f.load(ajaxurl,e,function(){f.fadeIn("fast"),g.fadeOut("fast",function(){h.removeAttr("disabled"),i.hide()})})},imgLoaded:function(b){var c=a("#image-preview-"+b),d=a("#imgedit-crop-"+b);this.initCrop(b,c,d),this.setCropSelection(b,0),this.toggleEditor(b,0)},initCrop:function(c,d,e){var f,g=this,h=a("#imgedit-sel-width-"+c),i=a("#imgedit-sel-height-"+c);g.iasapi=a(d).imgAreaSelect({parent:e,instance:!0,handles:!0,keys:!0,minWidth:3,minHeight:3,onInit:function(b){f=a(b),f.next().css("position","absolute").nextAll(".imgareaselect-outer").css("position","absolute"),e.children().mousedown(function(a){var b,d,e=!1;a.shiftKey&&(b=g.iasapi.getSelection(),d=g.getSelRatio(c),e=b&&b.width&&b.height?b.width+":"+b.height:d),g.iasapi.setOptions({aspectRatio:e})})},onSelectStart:function(){b.setDisabled(a("#imgedit-crop-sel-"+c),1)},onSelectEnd:function(a,d){b.setCropSelection(c,d)},onSelectChange:function(a,c){var d=b.hold.sizer;h.val(b.round(c.width/d)),i.val(b.round(c.height/d))}})},setCropSelection:function(b,c){var d,e=a("#imgedit-minthumb-"+b).val()||"128:128",f=this.hold.sizer;return e=e.split(":"),c=c||0,!c||c.width<3&&c.height<3?(this.setDisabled(a(".imgedit-crop","#imgedit-panel-"+b),0),this.setDisabled(a("#imgedit-crop-sel-"+b),0),a("#imgedit-sel-width-"+b).val(""),a("#imgedit-sel-height-"+b).val(""),a("#imgedit-selection-"+b).val(""),!1):c.width
0;)g.pop(),i--;h.val(0),g.push(b),f.val(JSON.stringify(g)),e.refreshEditor(c,d,function(){e.setDisabled(a("#image-undo-"+c),!0),e.setDisabled(a("#image-redo-"+c),!1)})},rotate:function(b,c,d,e){return a(e).hasClass("disabled")?!1:void this.addStep({r:{r:b,fw:this.hold.h,fh:this.hold.w}},c,d)},flip:function(b,c,d,e){return a(e).hasClass("disabled")?!1:void this.addStep({f:{f:b,fw:this.hold.w,fh:this.hold.h}},c,d)},crop:function(b,c,d){var e=a("#imgedit-selection-"+b).val(),f=this.intval(a("#imgedit-sel-width-"+b).val()),g=this.intval(a("#imgedit-sel-height-"+b).val());return a(d).hasClass("disabled")||""===e?!1:(e=JSON.parse(e),void(e.w>0&&e.h>0&&f>0&&g>0&&(e.fw=f,e.fh=g,this.addStep({c:e},b,c))))},undo:function(b,c){var d=this,e=a("#image-undo-"+b),f=a("#imgedit-undone-"+b),g=d.intval(f.val())+1;e.hasClass("disabled")||(f.val(g),d.refreshEditor(b,c,function(){var c=a("#imgedit-history-"+b),f=""!==c.val()?JSON.parse(c.val()):[];d.setDisabled(a("#image-redo-"+b),!0),d.setDisabled(e,g0)}))},setNumSelection:function(b){var c,d,e,f,g,h=a("#imgedit-sel-width-"+b),i=a("#imgedit-sel-height-"+b),j=this.intval(h.val()),k=this.intval(i.val()),l=a("#image-preview-"+b),m=l.height(),n=l.width(),o=this.hold.sizer,p=this.iasapi;return 1>j?(h.val(""),!1):1>k?(i.val(""),!1):void(j&&k&&(c=p.getSelection())&&(f=c.x1+Math.round(j*o),g=c.y1+Math.round(k*o),d=c.x1,e=c.y1,f>n&&(d=0,f=n,h.val(Math.round(f/o))),g>m&&(e=0,g=m,i.val(Math.round(g/o))),p.setSelection(d,e,f,g),p.update(),this.setCropSelection(b,p.getSelection())))},round:function(a){var b;return a=Math.round(a),this.hold.sizer>.6?a:(b=a.toString().slice(-1),"1"===b?a-1:"9"===b?a+1:a)},setRatioSelection:function(b,c,d){var e,f,g=this.intval(a("#imgedit-crop-width-"+b).val()),h=this.intval(a("#imgedit-crop-height-"+b).val()),i=a("#image-preview-"+b).height();return this.intval(a(d).val())?void(g&&h&&(this.iasapi.setOptions({aspectRatio:g+":"+h}),(e=this.iasapi.getSelection(!0))&&(f=Math.ceil(e.y1+(e.x2-e.x1)/(g/h)),f>i&&(f=i,c?a("#imgedit-crop-height-"+b).val(""):a("#imgedit-crop-width-"+b).val("")),this.iasapi.setSelection(e.x1,e.y1,e.x2,f),this.iasapi.update()))):void a(d).val("")}}}(jQuery);
\ No newline at end of file
diff --git a/wp-admin/js/inline-edit-post.js b/wp-admin/js/inline-edit-post.js
index 9abf478..81f302f 100644
--- a/wp-admin/js/inline-edit-post.js
+++ b/wp-admin/js/inline-edit-post.js
@@ -1,3 +1,6 @@
+/* global inlineEditL10n, ajaxurl, typenow */
+
+var inlineEditPost;
(function($) {
inlineEditPost = {
@@ -9,12 +12,14 @@ inlineEditPost = {
// prepare the edit rows
qeRow.keyup(function(e){
- if (e.which == 27)
+ if ( e.which === 27 ) {
return inlineEditPost.revert();
+ }
});
bulkRow.keyup(function(e){
- if (e.which == 27)
+ if ( e.which === 27 ) {
return inlineEditPost.revert();
+ }
});
$('a.cancel', qeRow).click(function(){
@@ -24,8 +29,9 @@ inlineEditPost = {
return inlineEditPost.save(this);
});
$('td', qeRow).keydown(function(e){
- if ( e.which == 13 )
+ if ( e.which === 13 ) {
return inlineEditPost.save(this);
+ }
});
$('a.cancel', bulkRow).click(function(){
@@ -42,7 +48,7 @@ inlineEditPost = {
});
// add events
- $('a.editinline').live('click', function(){
+ $('#the-list').on('click', 'a.editinline', function(){
inlineEditPost.edit(this);
return false;
});
@@ -53,36 +59,22 @@ inlineEditPost = {
$('#inline-edit label.inline-edit-tags').clone()
);
- // hiearchical taxonomies expandable?
- $('span.catshow').click(function(){
- $(this).hide().next().show().parent().next().addClass("cat-hover");
- });
-
- $('span.cathide').click(function(){
- $(this).hide().prev().show().parent().next().removeClass("cat-hover");
- });
-
$('select[name="_status"] option[value="future"]', bulkRow).remove();
$('#doaction, #doaction2').click(function(e){
var n = $(this).attr('id').substr(2);
- if ( $('select[name="'+n+'"]').val() == 'edit' ) {
+ if ( 'edit' === $( 'select[name="' + n + '"]' ).val() ) {
e.preventDefault();
t.setBulk();
} else if ( $('form#posts-filter tr.inline-editor').length > 0 ) {
t.revert();
}
});
-
- $('#post-query-submit').mousedown(function(e){
- t.revert();
- $('select[name^="action"]').val('-1');
- });
},
toggle : function(el){
var t = this;
- $(t.what+t.getId(el)).css('display') == 'none' ? t.revert() : t.edit(el);
+ $( t.what + t.getId( el ) ).css( 'display' ) === 'none' ? t.revert() : t.edit( el );
},
setBulk : function(){
@@ -93,7 +85,7 @@ inlineEditPost = {
$('table.widefat tbody').prepend( $('#bulk-edit') );
$('#bulk-edit').addClass('inline-editor').show();
- $('tbody th.check-column input[type="checkbox"]').each(function(i){
+ $( 'tbody th.check-column input[type="checkbox"]' ).each( function() {
if ( $(this).prop('checked') ) {
c = false;
var id = $(this).val(), theTitle;
@@ -102,8 +94,9 @@ inlineEditPost = {
}
});
- if ( c )
+ if ( c ) {
return this.revert();
+ }
$('#bulk-titles').html(te);
$('#bulk-titles a').click(function(){
@@ -114,7 +107,7 @@ inlineEditPost = {
});
// enable autocomplete for tags
- if ( 'post' == type ) {
+ if ( 'post' === type ) {
// support multi taxonomies?
tax = 'post_tag';
$('tr.inline-editor textarea[name="tax_input['+tax+']"]').suggest( ajaxurl + '?action=ajax-tag-search&tax=' + tax, { delay: 500, minchars: 2, multiple: true, multipleSep: inlineEditL10n.comma + ' ' } );
@@ -126,19 +119,22 @@ inlineEditPost = {
var t = this, fields, editRow, rowData, status, pageOpt, pageLevel, nextPage, pageLoop = true, nextLevel, cur_format, f;
t.revert();
- if ( typeof(id) == 'object' )
+ if ( typeof(id) === 'object' ) {
id = t.getId(id);
+ }
fields = ['post_title', 'post_name', 'post_author', '_status', 'jj', 'mm', 'aa', 'hh', 'mn', 'ss', 'post_password', 'post_format', 'menu_order'];
- if ( t.type == 'page' )
+ if ( t.type === 'page' ) {
fields.push('post_parent', 'page_template');
+ }
// add the new blank row
editRow = $('#inline-edit').clone(true);
$('td', editRow).attr('colspan', $('.widefat:first thead th:visible').length);
- if ( $(t.what+id).hasClass('alternate') )
+ if ( $( t.what + id ).hasClass( 'alternate' ) ) {
$(editRow).addClass('alternate');
+ }
$(t.what+id).hide().after(editRow);
// populate the data
@@ -147,7 +143,7 @@ inlineEditPost = {
// author no longer has edit caps, so we need to add them to the list of authors
$(':input[name="post_author"]', editRow).prepend('' + $('#' + t.type + '-' + id + ' .author').text() + ' ');
}
- if ( $(':input[name="post_author"] option', editRow).length == 1 ) {
+ if ( $( ':input[name="post_author"] option', editRow ).length === 1 ) {
$('label.inline-edit-author', editRow).hide();
}
@@ -155,24 +151,29 @@ inlineEditPost = {
cur_format = $('.post_format', rowData).text();
$('option.unsupported', editRow).each(function() {
var $this = $(this);
- if ( $this.val() != cur_format )
+ if ( $this.val() !== cur_format ) {
$this.remove();
+ }
});
for ( f = 0; f < fields.length; f++ ) {
$(':input[name="' + fields[f] + '"]', editRow).val( $('.'+fields[f], rowData).text() );
}
- if ( $('.comment_status', rowData).text() == 'open' )
- $('input[name="comment_status"]', editRow).prop("checked", true);
- if ( $('.ping_status', rowData).text() == 'open' )
- $('input[name="ping_status"]', editRow).prop("checked", true);
- if ( $('.sticky', rowData).text() == 'sticky' )
- $('input[name="sticky"]', editRow).prop("checked", true);
+ if ( $( '.comment_status', rowData ).text() === 'open' ) {
+ $( 'input[name="comment_status"]', editRow ).prop( 'checked', true );
+ }
+ if ( $( '.ping_status', rowData ).text() === 'open' ) {
+ $( 'input[name="ping_status"]', editRow ).prop( 'checked', true );
+ }
+ if ( $( '.sticky', rowData ).text() === 'sticky' ) {
+ $( 'input[name="sticky"]', editRow ).prop( 'checked', true );
+ }
// hierarchical taxonomies
$('.post_category', rowData).each(function(){
- var term_ids = $(this).text();
+ var taxname,
+ term_ids = $(this).text();
if ( term_ids ) {
taxname = $(this).attr('id').replace('_'+id, '');
@@ -188,8 +189,9 @@ inlineEditPost = {
comma = inlineEditL10n.comma;
if ( terms ) {
- if ( ',' !== comma )
+ if ( ',' !== comma ) {
terms = terms.replace(/,/g, comma);
+ }
textarea.val(terms);
}
@@ -198,11 +200,12 @@ inlineEditPost = {
// handle the post status
status = $('._status', rowData).text();
- if ( 'future' != status )
+ if ( 'future' !== status ) {
$('select[name="_status"] option[value="future"]', editRow).remove();
+ }
- if ( 'private' == status ) {
- $('input[name="keep_private"]', editRow).prop("checked", true);
+ if ( 'private' === status ) {
+ $('input[name="keep_private"]', editRow).prop('checked', true);
$('input.inline-edit-password-input').val('').prop('disabled', true);
}
@@ -213,8 +216,12 @@ inlineEditPost = {
nextPage = pageOpt;
while ( pageLoop ) {
nextPage = nextPage.next('option');
- if (nextPage.length == 0) break;
+ if ( nextPage.length === 0 ) {
+ break;
+ }
+
nextLevel = nextPage[0].className.split('-')[1];
+
if ( nextLevel <= pageLevel ) {
pageLoop = false;
} else {
@@ -234,8 +241,9 @@ inlineEditPost = {
save : function(id) {
var params, fields, page = $('.post_status_page').val() || '';
- if ( typeof(id) == 'object' )
+ if ( typeof(id) === 'object' ) {
id = this.getId(id);
+ }
$('table.widefat .spinner').show();
@@ -247,7 +255,7 @@ inlineEditPost = {
post_status: page
};
- fields = $('#edit-'+id+' :input').serialize();
+ fields = $('#edit-'+id).find(':input').serialize();
params = fields + '&' + $.param(params);
// make ajax request
@@ -256,7 +264,7 @@ inlineEditPost = {
$('table.widefat .spinner').hide();
if (r) {
- if ( -1 != r.indexOf(''+a("#"+n.type+"-"+c+" .author").text()+" ")}if(a(':input[name="post_author"] option',e).length==1){a("label.inline-edit-author",e).hide()}b=a(".post_format",g).text();a("option.unsupported",e).each(function(){var f=a(this);if(f.val()!=b){f.remove()}});for(k=0;k0){m=h[0].className.split("-")[1];l=h;while(d){l=l.next("option");if(l.length==0){break}o=l[0].className.split("-")[1];if(o<=m){d=false}else{l.remove();l=h}}h.remove()}a(e).attr("id","edit-"+c).addClass("inline-editor").show();a(".ptitle",e).focus();return false},save:function(e){var d,b,c=a(".post_status_page").val()||"";if(typeof(e)=="object"){e=this.getId(e)}a("table.widefat .spinner").show();d={action:"inline-save",post_type:typenow,post_ID:e,edit_date:"true",post_status:c};b=a("#edit-"+e+" :input").serialize();d=b+"&"+a.param(d);a.post(ajaxurl,d,function(f){a("table.widefat .spinner").hide();if(f){if(-1!=f.indexOf("]*?>/g,"");a("#edit-"+e+" .inline-edit-save .error").html(f).show()}}else{a("#edit-"+e+" .inline-edit-save .error").html(inlineEditL10n.error).show()}},"html");return false},revert:function(){var b=a("table.widefat tr.inline-editor").attr("id");if(b){a("table.widefat .spinner").hide();if("bulk-edit"==b){a("table.widefat #bulk-edit").removeClass("inline-editor").hide();a("#bulk-titles").html("");a("#inlineedit").append(a("#bulk-edit"))}else{a("#"+b).remove();b=b.substr(b.lastIndexOf("-")+1);a(this.what+b).show()}}return false},getId:function(c){var d=a(c).closest("tr").attr("id"),b=d.split("-");return b[b.length-1]}};a(document).ready(function(){inlineEditPost.init()})})(jQuery);
\ No newline at end of file
+var inlineEditPost;!function(a){inlineEditPost={init:function(){var b=this,c=a("#inline-edit"),d=a("#bulk-edit");b.type=a("table.widefat").hasClass("pages")?"page":"post",b.what="#post-",c.keyup(function(a){return 27===a.which?inlineEditPost.revert():void 0}),d.keyup(function(a){return 27===a.which?inlineEditPost.revert():void 0}),a("a.cancel",c).click(function(){return inlineEditPost.revert()}),a("a.save",c).click(function(){return inlineEditPost.save(this)}),a("td",c).keydown(function(a){return 13===a.which?inlineEditPost.save(this):void 0}),a("a.cancel",d).click(function(){return inlineEditPost.revert()}),a('#inline-edit .inline-edit-private input[value="private"]').click(function(){var b=a("input.inline-edit-password-input");a(this).prop("checked")?b.val("").prop("disabled",!0):b.prop("disabled",!1)}),a("#the-list").on("click","a.editinline",function(){return inlineEditPost.edit(this),!1}),a("#bulk-title-div").parents("fieldset").after(a("#inline-edit fieldset.inline-edit-categories").clone()).siblings("fieldset:last").prepend(a("#inline-edit label.inline-edit-tags").clone()),a('select[name="_status"] option[value="future"]',d).remove(),a("#doaction, #doaction2").click(function(c){var d=a(this).attr("id").substr(2);"edit"===a('select[name="'+d+'"]').val()?(c.preventDefault(),b.setBulk()):a("form#posts-filter tr.inline-editor").length>0&&b.revert()})},toggle:function(b){var c=this;"none"===a(c.what+c.getId(b)).css("display")?c.revert():c.edit(b)},setBulk:function(){var b,c="",d=this.type,e=!0;return this.revert(),a("#bulk-edit td").attr("colspan",a(".widefat:first thead th:visible").length),a("table.widefat tbody").prepend(a("#bulk-edit")),a("#bulk-edit").addClass("inline-editor").show(),a('tbody th.check-column input[type="checkbox"]').each(function(){if(a(this).prop("checked")){e=!1;var b,d=a(this).val();b=a("#inline_"+d+" .post_title").html()||inlineEditL10n.notitle,c+='"}}),e?this.revert():(a("#bulk-titles").html(c),a("#bulk-titles a").click(function(){var b=a(this).attr("id").substr(1);a('table.widefat input[value="'+b+'"]').prop("checked",!1),a("#ttle"+b).remove()}),"post"===d&&(b="post_tag",a('tr.inline-editor textarea[name="tax_input['+b+']"]').suggest(ajaxurl+"?action=ajax-tag-search&tax="+b,{delay:500,minchars:2,multiple:!0,multipleSep:inlineEditL10n.comma+" "})),void a("html, body").animate({scrollTop:0},"fast"))},edit:function(b){var c,d,e,f,g,h,i,j,k,l,m=this,n=!0;for(m.revert(),"object"==typeof b&&(b=m.getId(b)),c=["post_title","post_name","post_author","_status","jj","mm","aa","hh","mn","ss","post_password","post_format","menu_order"],"page"===m.type&&c.push("post_parent","page_template"),d=a("#inline-edit").clone(!0),a("td",d).attr("colspan",a(".widefat:first thead th:visible").length),a(m.what+b).hasClass("alternate")&&a(d).addClass("alternate"),a(m.what+b).hide().after(d),e=a("#inline_"+b),a(':input[name="post_author"] option[value="'+a(".post_author",e).text()+'"]',d).val()||a(':input[name="post_author"]',d).prepend(''+a("#"+m.type+"-"+b+" .author").text()+" "),1===a(':input[name="post_author"] option',d).length&&a("label.inline-edit-author",d).hide(),k=a(".post_format",e).text(),a("option.unsupported",d).each(function(){var b=a(this);b.val()!==k&&b.remove()}),l=0;l0){for(h=g[0].className.split("-")[1],i=g;n&&(i=i.next("option"),0!==i.length);)j=i[0].className.split("-")[1],h>=j?n=!1:(i.remove(),i=g);g.remove()}return a(d).attr("id","edit-"+b).addClass("inline-editor").show(),a(".ptitle",d).focus(),!1},save:function(b){var c,d,e=a(".post_status_page").val()||"";return"object"==typeof b&&(b=this.getId(b)),a("table.widefat .spinner").show(),c={action:"inline-save",post_type:typenow,post_ID:b,edit_date:"true",post_status:e},d=a("#edit-"+b).find(":input").serialize(),c=d+"&"+a.param(c),a.post(ajaxurl,c,function(c){a("table.widefat .spinner").hide(),c?-1!==c.indexOf("]*?>/g,""),a("#edit-"+b+" .inline-edit-save .error").html(c).show()):a("#edit-"+b+" .inline-edit-save .error").html(inlineEditL10n.error).show(),a("#post-"+b).prev().hasClass("alternate")&&a("#post-"+b).removeClass("alternate")},"html"),!1},revert:function(){var b=a("table.widefat tr.inline-editor").attr("id");return b&&(a("table.widefat .spinner").hide(),"bulk-edit"===b?(a("table.widefat #bulk-edit").removeClass("inline-editor").hide(),a("#bulk-titles").html(""),a("#inlineedit").append(a("#bulk-edit"))):(a("#"+b).remove(),b=b.substr(b.lastIndexOf("-")+1),a(this.what+b).show())),!1},getId:function(b){var c=a(b).closest("tr").attr("id"),d=c.split("-");return d[d.length-1]}},a(document).ready(function(){inlineEditPost.init()}),a(document).on("heartbeat-tick.wp-check-locked-posts",function(b,c){var d=c["wp-check-locked-posts"]||{};a("#the-list tr").each(function(b,c){var e,f,g=c.id,h=a(c);d.hasOwnProperty(g)?h.hasClass("wp-locked")||(e=d[g],h.find(".column-title .locked-text").text(e.text),h.find(".check-column checkbox").prop("checked",!1),e.avatar_src&&(f=a('
',h="";i.css("position")==="static"&&i.css({position:"relative"}),n=c(n),e.each(n,function(e,t){if(e===s)return!1;var i=n[e+1];if(t.stop===i.stop)return;var o=100-parseFloat(i.stop)+"%";t.octoHex=(new Color(t.color)).toIEOctoHex(),i.octoHex=(new Color(i.color)).toIEOctoHex();var u="progid:DXImageTransform.Microsoft.Gradient(GradientType="+r+", StartColorStr='"+t.octoHex+"', EndColorStr='"+i.octoHex+"')";h+=l.replace("%start%",t.stop).replace("%end%",o).replace("%filter%",u)}),i.find(".iris-ie-gradient-shim").remove(),e(h).prependTo(i)}function l(t,n){var r=[];return t=t==="top"?"0% 0%,0% 100%,":"0% 100%,100% 100%,",n=c(n),e.each(n,function(e,t){r.push("color-stop("+parseFloat(t.stop)/100+", "+t.color+")")}),"-webkit-gradient(linear,"+t+r.join(",")+")"}function c(t){var n=[],r=[],i=[],s=t.length-1;return e.each(t,function(e,t){var i=t,s=!1,o=t.match(/1?[0-9]{1,2}%$/);o&&(i=t.replace(/\s?1?[0-9]{1,2}%$/,""),s=o.shift()),n.push(i),r.push(s)}),r[0]===!1&&(r[0]="0%"),r[s]===!1&&(r[s]="100%"),r=h(r),e.each(r,function(e){i[e]={color:n[e],stop:r[e]}}),i}function h(t){var n=0,r=t.length-1,i=0,s=!1,o,u,a,f;if(t.length<=2||e.inArray(!1,t)<0)return t;while(ir?(t+.05)/(r+.05):(r+.05)/(t+.05)}throw"getDistanceLuminosityFrom requires a Color object"},getMaxContrastColor:function(){var e=this.toLuminosity(),t=e>=.5?"000000":"ffffff";return new n(t)},getGrayscaleContrastingColor:function(e){if(!e)return this.getMaxContrastColor();var t=e<5?5:e,n=this.getMaxContrastColor();e=n.getDistanceLuminosityFrom(this);if(e<=t)return n;var r=0===n.toInt()?1:-1;while(e>t)n=n.incrementLightness(r),e=n.getDistanceLuminosityFrom(this);return n},getReadableContrastingColor:function(e,r){if(!e instanceof n)return this;var i=r===t?5:r,s=e.getDistanceLuminosityFrom(this),o=e.getMaxContrastColor(),u=o.getDistanceLuminosityFrom(e);if(u<=i)return o;if(s>=i)return this;var a=0===o.toInt()?-1:1;while(sn.range[1]?n.range[1]:r),s[e]=r,this._spaceFunc("from",n.space,s))}},_spaceFunc:function(e,t,n){var r=t||this._hSpace,i=e+r.charAt(0).toUpperCase()+r.substr(1);return this[i](n)}};var r={h:{mod:360},s:{range:[0,100]},l:{space:"hsl",range:[0,100]},v:{space:"hsv",range:[0,100]},r:{space:"rgb",range:[0,255]},g:{space:"rgb",range:[0,255]},b:{space:"rgb",range:[0,255]}};for(var i in r)r.hasOwnProperty(i)&&(n.fn[i]=n.fn._partial(i));e.Color=n}(typeof exports=="object"&&exports||this);
\ No newline at end of file
+* Copyright (c) 2013 Matt Wiebe; Licensed GPLv2 */
+!function(a,b){function c(){var b,c;j?k="filter":(b=a('
'),c="linear-gradient(top,#fff,#000)",a.each(l,function(a,d){return b.css("backgroundImage",d+c),b.css("backgroundImage").match("gradient")?(k=a,!1):void 0}),k===!1&&(b.css("background","-webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#000))"),b.css("backgroundImage").match("gradient")&&(k="webkit")),b.remove())}function d(b,c){return b="top"===b?"top":"left",c=a.isArray(c)?c:Array.prototype.slice.call(arguments,1),"webkit"===k?f(b,c):l[k]+"linear-gradient("+b+", "+c.join(", ")+")"}function e(b,c){var d,e,f,h,i,j,k,l,m;b="top"===b?"top":"left",c=a.isArray(c)?c:Array.prototype.slice.call(arguments,1),d="top"===b?0:1,e=a(this),f=c.length-1,h="filter",i=1===d?"left":"top",j=1===d?"right":"bottom",k=1===d?"height":"width",l='
',m="","static"===e.css("position")&&e.css({position:"relative"}),c=g(c),a.each(c,function(a,b){var e,g,h;return a===f?!1:(e=c[a+1],b.stop!==e.stop&&(g=100-parseFloat(e.stop)+"%",b.octoHex=new Color(b.color).toIEOctoHex(),e.octoHex=new Color(e.color).toIEOctoHex(),h="progid:DXImageTransform.Microsoft.Gradient(GradientType="+d+", StartColorStr='"+b.octoHex+"', EndColorStr='"+e.octoHex+"')",m+=l.replace("%start%",b.stop).replace("%end%",g).replace("%filter%",h)),void 0)}),e.find(".iris-ie-gradient-shim").remove(),a(m).prependTo(e)}function f(b,c){var d=[];return b="top"===b?"0% 0%,0% 100%,":"0% 100%,100% 100%,",c=g(c),a.each(c,function(a,b){d.push("color-stop("+parseFloat(b.stop)/100+", "+b.color+")")}),"-webkit-gradient(linear,"+b+d.join(",")+")"}function g(b){var c=[],d=[],e=[],f=b.length-1;return a.each(b,function(a,b){var e=b,f=!1,g=b.match(/1?[0-9]{1,2}%$/);g&&(e=b.replace(/\s?1?[0-9]{1,2}%$/,""),f=g.shift()),c.push(e),d.push(f)}),d[0]===!1&&(d[0]="0%"),d[f]===!1&&(d[f]="100%"),d=h(d),a.each(d,function(a){e[a]={color:c[a],stop:d[a]}}),e}function h(b){var c,d,e,f,g=0,i=b.length-1,j=0,k=!1;if(b.length<=2||a.inArray(!1,b)<0)return b;for(;jj;)b[j]=f+e*c+"%",e++,j++;return h(b)}var i,j,k,l,m,n,o,p,q;return i='',o=navigator.userAgent.toLowerCase(),p="Microsoft Internet Explorer"===navigator.appName,q=p?parseFloat(o.match(/msie ([0-9]{1,}[\.0-9]{0,})/)[1]):0,j=p&&10>q,k=!1,l=["-moz-","-webkit-","-o-","-ms-"],m='.iris-picker{display:block;position:relative}.iris-picker,.iris-picker *{-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input+.iris-picker{margin-top:4px}.iris-error{background-color:#ffafaf}.iris-border{border-radius:3px;border:1px solid #aaa;width:200px;background-color:#fff}.iris-picker-inner{position:absolute;top:0;right:0;left:0;bottom:0}.iris-border .iris-picker-inner{top:10px;right:10px;left:10px;bottom:10px}.iris-picker .iris-square-inner{position:absolute;left:0;right:0;top:0;bottom:0}.iris-picker .iris-square,.iris-picker .iris-slider,.iris-picker .iris-square-inner,.iris-picker .iris-palette{border-radius:3px;box-shadow:inset 0 0 5px rgba(0,0,0,.4);height:100%;width:12.5%;float:left;margin-right:5%}.iris-picker .iris-square{width:76%;margin-right:10%;position:relative}.iris-picker .iris-square-inner{width:auto;margin:0}.iris-ie-9 .iris-square,.iris-ie-9 .iris-slider,.iris-ie-9 .iris-square-inner,.iris-ie-9 .iris-palette{box-shadow:none;border-radius:0}.iris-ie-9 .iris-square,.iris-ie-9 .iris-slider,.iris-ie-9 .iris-palette{outline:1px solid rgba(0,0,0,.1)}.iris-ie-lt9 .iris-square,.iris-ie-lt9 .iris-slider,.iris-ie-lt9 .iris-square-inner,.iris-ie-lt9 .iris-palette{outline:1px solid #aaa}.iris-ie-lt9 .iris-square .ui-slider-handle{outline:1px solid #aaa;background-color:#fff;-ms-filter:"alpha(Opacity=30)"}.iris-ie-lt9 .iris-square .iris-square-handle{background:0;border:3px solid #fff;-ms-filter:"alpha(Opacity=50)"}.iris-picker .iris-strip{margin-right:0;position:relative}.iris-picker .iris-strip .ui-slider-handle{position:absolute;background:0;margin:0;right:-3px;left:-3px;border:4px solid #aaa;border-width:4px 3px;width:auto;height:6px;border-radius:4px;box-shadow:0 1px 2px rgba(0,0,0,.2);opacity:.9;z-index:5;cursor:ns-resize}.iris-strip .ui-slider-handle:before{content:" ";position:absolute;left:-2px;right:-2px;top:-3px;bottom:-3px;border:2px solid #fff;border-radius:3px}.iris-picker .iris-slider-offset{position:absolute;top:11px;left:0;right:0;bottom:-3px;width:auto;height:auto;background:transparent;border:0;top:none;border-radius:0}.iris-picker .iris-square-handle{background:transparent;border:5px solid #aaa;border-radius:50%;border-color:rgba(128,128,128,.5);box-shadow:none;width:12px;height:12px;position:absolute;left:-10px;top:-10px;cursor:move;opacity:1;z-index:10}.iris-picker .ui-state-focus .iris-square-handle{opacity:.8}.iris-picker .iris-square-handle:hover{border-color:#999}.iris-picker .iris-square-value:focus .iris-square-handle{box-shadow:0 0 2px rgba(0,0,0,.75);opacity:.8}.iris-picker .iris-square-handle:hover::after{border-color:#fff}.iris-picker .iris-square-handle::after{position:absolute;bottom:-4px;right:-4px;left:-4px;top:-4px;border:3px solid #f9f9f9;border-color:rgba(255,255,255,.8);border-radius:50%;content:" "}.iris-picker .iris-square-value{width:8px;height:8px;position:absolute}.iris-ie-lt9 .iris-square-value,.iris-mozilla .iris-square-value{width:1px;height:1px}.iris-palette-container{position:absolute;bottom:0;left:0;margin:0;padding:0}.iris-border .iris-palette-container{left:10px;bottom:10px}.iris-picker .iris-palette{margin:0;cursor:pointer}',j&&7>=q?(a.fn.iris=a.noop,a.support.iris=!1,void 0):(a.support.iris=!0,a.fn.gradient=function(){var b=arguments;return this.each(function(){j?e.apply(this,b):a(this).css("backgroundImage",d.apply(this,b))})},a.fn.raninbowGradient=function(b,c){var d,e,f,g;for(b=b||"top",d=a.extend({},{s:100,l:50},c),e="hsl(%h%,"+d.s+"%,"+d.l+"%)",f=0,g=[];360>=f;)g.push(e.replace("%h%",f)),f+=30;return this.each(function(){a(this).gradient(b,g)})},n={options:{color:!1,mode:"hsl",controls:{horiz:"s",vert:"l",strip:"h"},hide:!0,border:!0,target:!1,width:200,palettes:!1},_color:"",_palettes:["#000","#fff","#d33","#d93","#ee2","#81d742","#1e73be","#8224e3"],_inited:!1,_defaultHSLControls:{horiz:"s",vert:"l",strip:"h"},_defaultHSVControls:{horiz:"h",vert:"v",strip:"s"},_scale:{h:360,s:100,l:100,v:100},_create:function(){var b=this,d=b.element,e=b.options.color||d.val();k===!1&&c(),d.is("input")?(b.picker=b.options.target?a(i).appendTo(b.options.target):a(i).insertAfter(d),b._addInputListeners(d)):(d.append(i),b.picker=d.find(".iris-picker")),p?9===q?b.picker.addClass("iris-ie-9"):8>=q&&b.picker.addClass("iris-ie-lt9"):o.indexOf("compatible")<0&&o.indexOf("khtml")<0&&o.match(/mozilla/)&&b.picker.addClass("iris-mozilla"),b.options.palettes&&b._addPalettes(),b._color=new Color(e).setHSpace(b.options.mode),b.options.color=b._color.toString(),b.controls={square:b.picker.find(".iris-square"),squareDrag:b.picker.find(".iris-square-value"),horiz:b.picker.find(".iris-square-horiz"),vert:b.picker.find(".iris-square-vert"),strip:b.picker.find(".iris-strip"),stripSlider:b.picker.find(".iris-strip .iris-slider-offset")},"hsv"===b.options.mode&&b._has("l",b.options.controls)?b.options.controls=b._defaultHSVControls:"hsl"===b.options.mode&&b._has("v",b.options.controls)&&(b.options.controls=b._defaultHSLControls),b.hue=b._color.h(),b.options.hide&&b.picker.hide(),b.options.border&&b.picker.addClass("iris-border"),b._initControls(),b.active="external",b._dimensions(),b._change()},_has:function(b,c){var d=!1;return a.each(c,function(a,c){return b===c?(d=!0,!1):void 0}),d},_addPalettes:function(){var b=a('
'),c=a('c.range[1]?c.range[1]:d),f[a]=d,this._spaceFunc("from",c.space,f))}},_spaceFunc:function(a,b,c){var d=b||this._hSpace,e=a+d.charAt(0).toUpperCase()+d.substr(1);return this[e](c)}};var d={h:{mod:360},s:{range:[0,100]},l:{space:"hsl",range:[0,100]},v:{space:"hsv",range:[0,100]},r:{space:"rgb",range:[0,255]},g:{space:"rgb",range:[0,255]},b:{space:"rgb",range:[0,255]}};for(var e in d)d.hasOwnProperty(e)&&(c.fn[e]=c.fn._partial(e));a.Color=c}("object"==typeof exports&&exports||this);
\ No newline at end of file
diff --git a/wp-admin/js/link.js b/wp-admin/js/link.js
index f8b4583..0eb384e 100644
--- a/wp-admin/js/link.js
+++ b/wp-admin/js/link.js
@@ -1,3 +1,5 @@
+/* global postboxes, deleteUserSetting, setUserSetting, getUserSetting */
+
jQuery(document).ready( function($) {
var newCat, noSyncChecks = false, syncChecks, catAddAfter;
@@ -22,14 +24,14 @@ jQuery(document).ready( function($) {
$('#category-tabs a[href="#categories-pop"]').click();
// Ajax Cat
- newCat = $('#newcat').one( 'focus', function() { $(this).val( '' ).removeClass( 'form-input-tip' ) } );
+ newCat = $('#newcat').one( 'focus', function() { $(this).val( '' ).removeClass( 'form-input-tip' ); } );
$('#link-category-add-submit').click( function() { newCat.focus(); } );
syncChecks = function() {
if ( noSyncChecks )
return;
noSyncChecks = true;
var th = $(this), c = th.is(':checked'), id = th.val().toString();
- $('#in-link-category-' + id + ', #in-popular-category-' + id).prop( 'checked', c );
+ $('#in-link-category-' + id + ', #in-popular-link_category-' + id).prop( 'checked', c );
noSyncChecks = false;
};
diff --git a/wp-admin/js/link.min.js b/wp-admin/js/link.min.js
index 3f5433a..f148777 100644
--- a/wp-admin/js/link.min.js
+++ b/wp-admin/js/link.min.js
@@ -1 +1 @@
-jQuery(document).ready(function(c){var b,a=false,d,e;c("#link_name").focus();postboxes.add_postbox_toggles("link");c("#category-tabs a").click(function(){var f=c(this).attr("href");c(this).parent().addClass("tabs").siblings("li").removeClass("tabs");c(".tabs-panel").hide();c(f).show();if("#categories-all"==f){deleteUserSetting("cats")}else{setUserSetting("cats","pop")}return false});if(getUserSetting("cats")){c('#category-tabs a[href="#categories-pop"]').click()}b=c("#newcat").one("focus",function(){c(this).val("").removeClass("form-input-tip")});c("#link-category-add-submit").click(function(){b.focus()});d=function(){if(a){return}a=true;var f=c(this),h=f.is(":checked"),g=f.val().toString();c("#in-link-category-"+g+", #in-popular-category-"+g).prop("checked",h);a=false};e=function(g,f){c(f.what+" response_data",g).each(function(){var h=c(c(this).text());h.find("label").each(function(){var j=c(this),l=j.find("input").val(),m=j.find("input")[0].id,i=c.trim(j.text()),k;c("#"+m).change(d);k=c('720?720:c,f=0;return a("#wpadminbar").length&&(f=parseInt(a("#wpadminbar").css("height"),10)),b.size()&&(b.width(e-50).height(d-45-f),a("#TB_iframeContent").width(e-50).height(d-75-f),b.css({"margin-left":"-"+parseInt((e-50)/2,10)+"px"}),"undefined"!=typeof document.body.style.maxWidth&&b.css({top:20+f+"px","margin-top":"0"})),a("a.thickbox").each(function(){var b=a(this).attr("href");b&&(b=b.replace(/&width=[0-9]+/g,""),b=b.replace(/&height=[0-9]+/g,""),a(this).attr("href",b+"&width="+(e-80)+"&height="+(d-85-f)))})},a(window).resize(function(){tb_position()})}(jQuery);
\ No newline at end of file
diff --git a/wp-admin/js/media.js b/wp-admin/js/media.js
index b4ed0fb..f9fc650 100644
--- a/wp-admin/js/media.js
+++ b/wp-admin/js/media.js
@@ -1,12 +1,12 @@
+/* global ajaxurl, attachMediaBoxL10n */
var findPosts;
-(function($){
+( function( $ ){
findPosts = {
- open : function(af_name, af_val) {
- var st = document.documentElement.scrollTop || $(document).scrollTop(),
- overlay = $( '.ui-find-overlay' );
+ open: function( af_name, af_val ) {
+ var overlay = $( '.ui-find-overlay' );
- if ( overlay.length == 0 ) {
+ if ( overlay.length === 0 ) {
$( 'body' ).append( '
' );
findPosts.overlay();
}
@@ -14,14 +14,15 @@ var findPosts;
overlay.show();
if ( af_name && af_val ) {
- $('#affected').attr('name', af_name).val(af_val);
+ $( '#affected' ).attr( 'name', af_name ).val( af_val );
}
- $('#find-posts').show().draggable({
- handle: '#find-posts-head'
- }).css({'top':st + 50 + 'px','left':'50%','marginLeft':'-328px'});
- $('#find-posts-input').focus().keyup(function(e){
- if (e.which == 27) { findPosts.close(); } // close on Escape
+ $( '#find-posts' ).show();
+
+ $('#find-posts-input').focus().keyup( function( event ){
+ if ( event.which == 27 ) {
+ findPosts.close();
+ } // close on Escape
});
// Pull some results up by default
@@ -30,23 +31,21 @@ var findPosts;
return false;
},
- close : function() {
+ close: function() {
$('#find-posts-response').html('');
- $('#find-posts').draggable('destroy').hide();
+ $('#find-posts').hide();
$( '.ui-find-overlay' ).hide();
},
- overlay : function() {
- $( '.ui-find-overlay' ).css(
- { 'z-index': '999', 'width': $( document ).width() + 'px', 'height': $( document ).height() + 'px' }
- ).on('click', function () {
+ overlay: function() {
+ $( '.ui-find-overlay' ).on( 'click', function () {
findPosts.close();
});
},
- send : function() {
+ send: function() {
var post = {
- ps: $('#find-posts-input').val(),
+ ps: $( '#find-posts-input' ).val(),
action: 'find_posts',
_ajax_nonce: $('#_ajax_nonce').val()
},
@@ -54,71 +53,49 @@ var findPosts;
spinner.show();
- $.ajax({
- type : 'POST',
- url : ajaxurl,
- data : post,
- success : function(x) { findPosts.show(x); spinner.hide(); },
- error : function(r) { findPosts.error(r); spinner.hide(); }
+ $.ajax( ajaxurl, {
+ type: 'POST',
+ data: post,
+ dataType: 'json'
+ }).always( function() {
+ spinner.hide();
+ }).done( function( x ) {
+ if ( ! x.success ) {
+ $( '#find-posts-response' ).text( attachMediaBoxL10n.error );
+ }
+
+ $( '#find-posts-response' ).html( x.data );
+ }).fail( function() {
+ $( '#find-posts-response' ).text( attachMediaBoxL10n.error );
});
- },
-
- show : function(x) {
-
- if ( typeof(x) == 'string' ) {
- this.error({'responseText': x});
- return;
- }
-
- var r = wpAjax.parseAjaxResponse(x);
-
- if ( r.errors ) {
- this.error({'responseText': wpAjax.broken});
- }
- r = r.responses[0];
- $('#find-posts-response').html(r.data);
-
- // Enable whole row to be clicked
- $( '.found-posts td' ).on( 'click', function () {
- $( this ).parent().find( '.found-radio input' ).prop( 'checked', true );
- });
- },
-
- error : function(r) {
- var er = r.statusText;
-
- if ( r.responseText ) {
- er = r.responseText.replace( /<.[^<>]*?>/g, '' );
- }
- if ( er ) {
- $('#find-posts-response').html(er);
- }
}
};
- $(document).ready(function() {
- $('#find-posts-submit').click(function(e) {
- if ( '' == $('#find-posts-response').html() )
- e.preventDefault();
+ $( document ).ready( function() {
+ $( '#find-posts-submit' ).click( function( event ) {
+ if ( ! $( '#find-posts-response input[type="radio"]:checked' ).length )
+ event.preventDefault();
});
$( '#find-posts .find-box-search :input' ).keypress( function( event ) {
if ( 13 == event.which ) {
findPosts.send();
return false;
}
- } );
+ });
$( '#find-posts-search' ).click( findPosts.send );
$( '#find-posts-close' ).click( findPosts.close );
- $('#doaction, #doaction2').click(function(e){
- $('select[name^="action"]').each(function(){
- if ( $(this).val() == 'attach' ) {
- e.preventDefault();
+ $( '#doaction, #doaction2' ).click( function( event ) {
+ $( 'select[name^="action"]' ).each( function() {
+ if ( $(this).val() === 'attach' ) {
+ event.preventDefault();
findPosts.open();
}
});
});
+
+ // Enable whole row to be clicked
+ $( '.find-box-inside' ).on( 'click', 'tr', function() {
+ $( this ).find( '.found-radio input' ).prop( 'checked', true );
+ });
});
- $(window).resize(function() {
- findPosts.overlay();
- });
-})(jQuery);
+})( jQuery );
diff --git a/wp-admin/js/media.min.js b/wp-admin/js/media.min.js
index 1ddaf1a..5cd4e26 100644
--- a/wp-admin/js/media.min.js
+++ b/wp-admin/js/media.min.js
@@ -1 +1 @@
-var findPosts;(function(a){findPosts={open:function(e,d){var c=document.documentElement.scrollTop||a(document).scrollTop(),b=a(".ui-find-overlay");if(b.length==0){a("body").append('
');findPosts.overlay()}b.show();if(e&&d){a("#affected").attr("name",e).val(d)}a("#find-posts").show().draggable({handle:"#find-posts-head"}).css({top:c+50+"px",left:"50%",marginLeft:"-328px"});a("#find-posts-input").focus().keyup(function(f){if(f.which==27){findPosts.close()}});findPosts.send();return false},close:function(){a("#find-posts-response").html("");a("#find-posts").draggable("destroy").hide();a(".ui-find-overlay").hide()},overlay:function(){a(".ui-find-overlay").css({"z-index":"999",width:a(document).width()+"px",height:a(document).height()+"px"}).on("click",function(){findPosts.close()})},send:function(){var b={ps:a("#find-posts-input").val(),action:"find_posts",_ajax_nonce:a("#_ajax_nonce").val()},c=a(".find-box-search .spinner");c.show();a.ajax({type:"POST",url:ajaxurl,data:b,success:function(d){findPosts.show(d);c.hide()},error:function(d){findPosts.error(d);c.hide()}})},show:function(b){if(typeof(b)=="string"){this.error({responseText:b});return}var c=wpAjax.parseAjaxResponse(b);if(c.errors){this.error({responseText:wpAjax.broken})}c=c.responses[0];a("#find-posts-response").html(c.data);a(".found-posts td").on("click",function(){a(this).parent().find(".found-radio input").prop("checked",true)})},error:function(b){var c=b.statusText;if(b.responseText){c=b.responseText.replace(/<.[^<>]*?>/g,"")}if(c){a("#find-posts-response").html(c)}}};a(document).ready(function(){a("#find-posts-submit").click(function(b){if(""==a("#find-posts-response").html()){b.preventDefault()}});a("#find-posts .find-box-search :input").keypress(function(b){if(13==b.which){findPosts.send();return false}});a("#find-posts-search").click(findPosts.send);a("#find-posts-close").click(findPosts.close);a("#doaction, #doaction2").click(function(b){a('select[name^="action"]').each(function(){if(a(this).val()=="attach"){b.preventDefault();findPosts.open()}})})});a(window).resize(function(){findPosts.overlay()})})(jQuery);
\ No newline at end of file
+var findPosts;!function(a){findPosts={open:function(b,c){var d=a(".ui-find-overlay");return 0===d.length&&(a("body").append('
'),findPosts.overlay()),d.show(),b&&c&&a("#affected").attr("name",b).val(c),a("#find-posts").show(),a("#find-posts-input").focus().keyup(function(a){27==a.which&&findPosts.close()}),findPosts.send(),!1},close:function(){a("#find-posts-response").html(""),a("#find-posts").hide(),a(".ui-find-overlay").hide()},overlay:function(){a(".ui-find-overlay").on("click",function(){findPosts.close()})},send:function(){var b={ps:a("#find-posts-input").val(),action:"find_posts",_ajax_nonce:a("#_ajax_nonce").val()},c=a(".find-box-search .spinner");c.show(),a.ajax(ajaxurl,{type:"POST",data:b,dataType:"json"}).always(function(){c.hide()}).done(function(b){b.success||a("#find-posts-response").text(attachMediaBoxL10n.error),a("#find-posts-response").html(b.data)}).fail(function(){a("#find-posts-response").text(attachMediaBoxL10n.error)})}},a(document).ready(function(){a("#find-posts-submit").click(function(b){a('#find-posts-response input[type="radio"]:checked').length||b.preventDefault()}),a("#find-posts .find-box-search :input").keypress(function(a){return 13==a.which?(findPosts.send(),!1):void 0}),a("#find-posts-search").click(findPosts.send),a("#find-posts-close").click(findPosts.close),a("#doaction, #doaction2").click(function(b){a('select[name^="action"]').each(function(){"attach"===a(this).val()&&(b.preventDefault(),findPosts.open())})}),a(".find-box-inside").on("click","tr",function(){a(this).find(".found-radio input").prop("checked",!0)})})}(jQuery);
\ No newline at end of file
diff --git a/wp-admin/js/nav-menu.js b/wp-admin/js/nav-menu.js
index 20f0fc3..e54ed68 100644
--- a/wp-admin/js/nav-menu.js
+++ b/wp-admin/js/nav-menu.js
@@ -8,11 +8,15 @@
* @subpackage Administration
*/
+/* global menus, postboxes, columns, isRtl, navMenuL10n, ajaxurl */
+
var wpNavMenu;
(function($) {
- var api = wpNavMenu = {
+ var api;
+
+ api = wpNavMenu = {
options : {
menuItemDepthPerLevel : 30, // Do not use directly. Use depthToPx and pxToDepth instead.
@@ -42,12 +46,17 @@ var wpNavMenu;
this.attachUnsavedChangesListener();
- if( api.menuList.length ) // If no menu, we're in the + tab.
+ if ( api.menuList.length )
this.initSortables();
- this.initToggles();
+ if ( menus.oneThemeLocationNoMenus )
+ $( '#posttype-page' ).addSelectedToMenu( api.addMenuItemToBottom );
- this.initTabManager();
+ this.initManageLocations();
+
+ this.initAccessibility();
+
+ this.initToggles();
},
jQueryExtensions : function() {
@@ -84,19 +93,55 @@ var wpNavMenu;
});
return result;
},
+ shiftHorizontally : function( dir ) {
+ return this.each(function(){
+ var t = $(this),
+ depth = t.menuItemDepth(),
+ newDepth = depth + dir;
+
+ // Change .menu-item-depth-n class
+ t.moveHorizontally( newDepth, depth );
+ });
+ },
+ moveHorizontally : function( newDepth, depth ) {
+ return this.each(function(){
+ var t = $(this),
+ children = t.childMenuItems(),
+ diff = newDepth - depth,
+ subItemText = t.find('.is-submenu');
+
+ // Change .menu-item-depth-n class
+ t.updateDepthClass( newDepth, depth ).updateParentMenuItemDBId();
+
+ // If it has children, move those too
+ if ( children ) {
+ children.each(function() {
+ var t = $(this),
+ thisDepth = t.menuItemDepth(),
+ newDepth = thisDepth + diff;
+ t.updateDepthClass(newDepth, thisDepth).updateParentMenuItemDBId();
+ });
+ }
+
+ // Show "Sub item" helper text
+ if (0 === newDepth)
+ subItemText.hide();
+ else
+ subItemText.show();
+ });
+ },
updateParentMenuItemDBId : function() {
return this.each(function(){
var item = $(this),
- input = item.find('.menu-item-data-parent-id'),
- depth = item.menuItemDepth(),
- parent = item.prev();
+ input = item.find( '.menu-item-data-parent-id' ),
+ depth = parseInt( item.menuItemDepth(), 10 ),
+ parentDepth = depth - 1,
+ parent = item.prevAll( '.menu-item-depth-' + parentDepth ).first();
- if( depth == 0 ) { // Item is on the top level, has no parent
+ if ( 0 === depth ) { // Item is on the top level, has no parent
input.val(0);
} else { // Find the parent item, and retrieve its object id.
- while( ! parent[0] || ! parent[0].className || -1 == parent[0].className.indexOf('menu-item') || ( parent.menuItemDepth() != depth - 1 ) )
- parent = parent.prev();
- input.val( parent.find('.menu-item-data-db-id').val() );
+ input.val( parent.find( '.menu-item-data-db-id' ).val() );
}
});
},
@@ -114,14 +159,14 @@ var wpNavMenu;
* @param jQuery metabox The metabox jQuery object.
*/
addSelectedToMenu : function(processMethod) {
- if ( 0 == $('#menu-to-edit').length ) {
+ if ( 0 === $('#menu-to-edit').length ) {
return false;
}
return this.each(function() {
var t = $(this), menuItems = {},
- checkboxes = t.find('.tabs-panel-active .categorychecklist li input:checked'),
- re = new RegExp('menu-item\\[(\[^\\]\]*)');
+ checkboxes = ( menus.oneThemeLocationNoMenus && 0 === t.find( '.tabs-panel-active .categorychecklist li input:checked' ).length ) ? t.find( '#page-all li input[type="checkbox"]' ) : t.find( '.tabs-panel-active .categorychecklist li input:checked' ),
+ re = /menu-item\[([^\]]*)/;
processMethod = processMethod || api.addMenuItemToBottom;
@@ -137,6 +182,7 @@ var wpNavMenu;
var t = $(this),
listItemDBIDMatch = re.exec( t.attr('name') ),
listItemDBID = 'undefined' == typeof listItemDBIDMatch[1] ? 0 : parseInt(listItemDBIDMatch[1], 10);
+
if ( this.className && -1 != this.className.indexOf('add-to-top') )
processMethod = api.addMenuItemToTop;
menuItems[listItemDBID] = t.closest('li').getItemData( 'add-menu-item', listItemDBID );
@@ -223,6 +269,267 @@ var wpNavMenu;
});
},
+ countMenuItems : function( depth ) {
+ return $( '.menu-item-depth-' + depth ).length;
+ },
+
+ moveMenuItem : function( $this, dir ) {
+
+ var items, newItemPosition, newDepth,
+ menuItems = $( '#menu-to-edit li' ),
+ menuItemsCount = menuItems.length,
+ thisItem = $this.parents( 'li.menu-item' ),
+ thisItemChildren = thisItem.childMenuItems(),
+ thisItemData = thisItem.getItemData(),
+ thisItemDepth = parseInt( thisItem.menuItemDepth(), 10 ),
+ thisItemPosition = parseInt( thisItem.index(), 10 ),
+ nextItem = thisItem.next(),
+ nextItemChildren = nextItem.childMenuItems(),
+ nextItemDepth = parseInt( nextItem.menuItemDepth(), 10 ) + 1,
+ prevItem = thisItem.prev(),
+ prevItemDepth = parseInt( prevItem.menuItemDepth(), 10 ),
+ prevItemId = prevItem.getItemData()['menu-item-db-id'];
+
+ switch ( dir ) {
+ case 'up':
+ newItemPosition = thisItemPosition - 1;
+
+ // Already at top
+ if ( 0 === thisItemPosition )
+ break;
+
+ // If a sub item is moved to top, shift it to 0 depth
+ if ( 0 === newItemPosition && 0 !== thisItemDepth )
+ thisItem.moveHorizontally( 0, thisItemDepth );
+
+ // If prev item is sub item, shift to match depth
+ if ( 0 !== prevItemDepth )
+ thisItem.moveHorizontally( prevItemDepth, thisItemDepth );
+
+ // Does this item have sub items?
+ if ( thisItemChildren ) {
+ items = thisItem.add( thisItemChildren );
+ // Move the entire block
+ items.detach().insertBefore( menuItems.eq( newItemPosition ) ).updateParentMenuItemDBId();
+ } else {
+ thisItem.detach().insertBefore( menuItems.eq( newItemPosition ) ).updateParentMenuItemDBId();
+ }
+ break;
+ case 'down':
+ // Does this item have sub items?
+ if ( thisItemChildren ) {
+ items = thisItem.add( thisItemChildren ),
+ nextItem = menuItems.eq( items.length + thisItemPosition ),
+ nextItemChildren = 0 !== nextItem.childMenuItems().length;
+
+ if ( nextItemChildren ) {
+ newDepth = parseInt( nextItem.menuItemDepth(), 10 ) + 1;
+ thisItem.moveHorizontally( newDepth, thisItemDepth );
+ }
+
+ // Have we reached the bottom?
+ if ( menuItemsCount === thisItemPosition + items.length )
+ break;
+
+ items.detach().insertAfter( menuItems.eq( thisItemPosition + items.length ) ).updateParentMenuItemDBId();
+ } else {
+ // If next item has sub items, shift depth
+ if ( 0 !== nextItemChildren.length )
+ thisItem.moveHorizontally( nextItemDepth, thisItemDepth );
+
+ // Have we reached the bottom
+ if ( menuItemsCount === thisItemPosition + 1 )
+ break;
+ thisItem.detach().insertAfter( menuItems.eq( thisItemPosition + 1 ) ).updateParentMenuItemDBId();
+ }
+ break;
+ case 'top':
+ // Already at top
+ if ( 0 === thisItemPosition )
+ break;
+ // Does this item have sub items?
+ if ( thisItemChildren ) {
+ items = thisItem.add( thisItemChildren );
+ // Move the entire block
+ items.detach().insertBefore( menuItems.eq( 0 ) ).updateParentMenuItemDBId();
+ } else {
+ thisItem.detach().insertBefore( menuItems.eq( 0 ) ).updateParentMenuItemDBId();
+ }
+ break;
+ case 'left':
+ // As far left as possible
+ if ( 0 === thisItemDepth )
+ break;
+ thisItem.shiftHorizontally( -1 );
+ break;
+ case 'right':
+ // Can't be sub item at top
+ if ( 0 === thisItemPosition )
+ break;
+ // Already sub item of prevItem
+ if ( thisItemData['menu-item-parent-id'] === prevItemId )
+ break;
+ thisItem.shiftHorizontally( 1 );
+ break;
+ }
+ $this.focus();
+ api.registerChange();
+ api.refreshKeyboardAccessibility();
+ api.refreshAdvancedAccessibility();
+ },
+
+ initAccessibility : function() {
+ var menu = $( '#menu-to-edit' );
+
+ api.refreshKeyboardAccessibility();
+ api.refreshAdvancedAccessibility();
+
+ // Events
+ menu.on( 'click', '.menus-move-up', function ( e ) {
+ api.moveMenuItem( $( this ).parents( 'li.menu-item' ).find( 'a.item-edit' ), 'up' );
+ e.preventDefault();
+ });
+ menu.on( 'click', '.menus-move-down', function ( e ) {
+ api.moveMenuItem( $( this ).parents( 'li.menu-item' ).find( 'a.item-edit' ), 'down' );
+ e.preventDefault();
+ });
+ menu.on( 'click', '.menus-move-top', function ( e ) {
+ api.moveMenuItem( $( this ).parents( 'li.menu-item' ).find( 'a.item-edit' ), 'top' );
+ e.preventDefault();
+ });
+ menu.on( 'click', '.menus-move-left', function ( e ) {
+ api.moveMenuItem( $( this ).parents( 'li.menu-item' ).find( 'a.item-edit' ), 'left' );
+ e.preventDefault();
+ });
+ menu.on( 'click', '.menus-move-right', function ( e ) {
+ api.moveMenuItem( $( this ).parents( 'li.menu-item' ).find( 'a.item-edit' ), 'right' );
+ e.preventDefault();
+ });
+ },
+
+ refreshAdvancedAccessibility : function() {
+
+ // Hide all links by default
+ $( '.menu-item-settings .field-move a' ).css( 'display', 'none' );
+
+ $( '.item-edit' ).each( function() {
+ var thisLink, thisLinkText, primaryItems, itemPosition, title,
+ parentItem, parentItemId, parentItemName, subItems,
+ $this = $(this),
+ menuItem = $this.closest( 'li.menu-item' ).first(),
+ depth = menuItem.menuItemDepth(),
+ isPrimaryMenuItem = ( 0 === depth ),
+ itemName = $this.closest( '.menu-item-handle' ).find( '.menu-item-title' ).text(),
+ position = parseInt( menuItem.index(), 10 ),
+ prevItemDepth = ( isPrimaryMenuItem ) ? depth : parseInt( depth - 1, 10 ),
+ prevItemNameLeft = menuItem.prevAll('.menu-item-depth-' + prevItemDepth).first().find( '.menu-item-title' ).text(),
+ prevItemNameRight = menuItem.prevAll('.menu-item-depth-' + depth).first().find( '.menu-item-title' ).text(),
+ totalMenuItems = $('#menu-to-edit li').length,
+ hasSameDepthSibling = menuItem.nextAll( '.menu-item-depth-' + depth ).length;
+
+ // Where can they move this menu item?
+ if ( 0 !== position ) {
+ thisLink = menuItem.find( '.menus-move-up' );
+ thisLink.prop( 'title', menus.moveUp ).css( 'display', 'inline' );
+ }
+
+ if ( 0 !== position && isPrimaryMenuItem ) {
+ thisLink = menuItem.find( '.menus-move-top' );
+ thisLink.prop( 'title', menus.moveToTop ).css( 'display', 'inline' );
+ }
+
+ if ( position + 1 !== totalMenuItems && 0 !== position ) {
+ thisLink = menuItem.find( '.menus-move-down' );
+ thisLink.prop( 'title', menus.moveDown ).css( 'display', 'inline' );
+ }
+
+ if ( 0 === position && 0 !== hasSameDepthSibling ) {
+ thisLink = menuItem.find( '.menus-move-down' );
+ thisLink.prop( 'title', menus.moveDown ).css( 'display', 'inline' );
+ }
+
+ if ( ! isPrimaryMenuItem ) {
+ thisLink = menuItem.find( '.menus-move-left' ),
+ thisLinkText = menus.outFrom.replace( '%s', prevItemNameLeft );
+ thisLink.prop( 'title', menus.moveOutFrom.replace( '%s', prevItemNameLeft ) ).html( thisLinkText ).css( 'display', 'inline' );
+ }
+
+ if ( 0 !== position ) {
+ if ( menuItem.find( '.menu-item-data-parent-id' ).val() !== menuItem.prev().find( '.menu-item-data-db-id' ).val() ) {
+ thisLink = menuItem.find( '.menus-move-right' ),
+ thisLinkText = menus.under.replace( '%s', prevItemNameRight );
+ thisLink.prop( 'title', menus.moveUnder.replace( '%s', prevItemNameRight ) ).html( thisLinkText ).css( 'display', 'inline' );
+ }
+ }
+
+ if ( isPrimaryMenuItem ) {
+ primaryItems = $( '.menu-item-depth-0' ),
+ itemPosition = primaryItems.index( menuItem ) + 1,
+ totalMenuItems = primaryItems.length,
+
+ // String together help text for primary menu items
+ title = menus.menuFocus.replace( '%1$s', itemName ).replace( '%2$d', itemPosition ).replace( '%3$d', totalMenuItems );
+ } else {
+ parentItem = menuItem.prevAll( '.menu-item-depth-' + parseInt( depth - 1, 10 ) ).first(),
+ parentItemId = parentItem.find( '.menu-item-data-db-id' ).val(),
+ parentItemName = parentItem.find( '.menu-item-title' ).text(),
+ subItems = $( '.menu-item .menu-item-data-parent-id[value="' + parentItemId + '"]' ),
+ itemPosition = $( subItems.parents('.menu-item').get().reverse() ).index( menuItem ) + 1;
+
+ // String together help text for sub menu items
+ title = menus.subMenuFocus.replace( '%1$s', itemName ).replace( '%2$d', itemPosition ).replace( '%3$s', parentItemName );
+ }
+
+ $this.prop('title', title).html( title );
+ });
+ },
+
+ refreshKeyboardAccessibility : function() {
+ $( '.item-edit' ).off( 'focus' ).on( 'focus', function(){
+ $(this).off( 'keydown' ).on( 'keydown', function(e){
+
+ var arrows,
+ $this = $( this ),
+ thisItem = $this.parents( 'li.menu-item' ),
+ thisItemData = thisItem.getItemData();
+
+ // Bail if it's not an arrow key
+ if ( 37 != e.which && 38 != e.which && 39 != e.which && 40 != e.which )
+ return;
+
+ // Avoid multiple keydown events
+ $this.off('keydown');
+
+ // Bail if there is only one menu item
+ if ( 1 === $('#menu-to-edit li').length )
+ return;
+
+ // If RTL, swap left/right arrows
+ arrows = { '38': 'up', '40': 'down', '37': 'left', '39': 'right' };
+ if ( $('body').hasClass('rtl') )
+ arrows = { '38' : 'up', '40' : 'down', '39' : 'left', '37' : 'right' };
+
+ switch ( arrows[e.which] ) {
+ case 'up':
+ api.moveMenuItem( $this, 'up' );
+ break;
+ case 'down':
+ api.moveMenuItem( $this, 'down' );
+ break;
+ case 'left':
+ api.moveMenuItem( $this, 'left' );
+ break;
+ case 'right':
+ api.moveMenuItem( $this, 'right' );
+ break;
+ }
+ // Put focus back on same menu item
+ $( '#edit-' + thisItemData['menu-item-db-id'] ).focus();
+ return false;
+ });
+ });
+ },
+
initToggles : function() {
// init postboxes
postboxes.add_postbox_toggles('nav-menus');
@@ -231,12 +538,22 @@ var wpNavMenu;
columns.useCheckboxesForHidden();
columns.checked = function(field) {
$('.field-' + field).removeClass('hidden-field');
- }
+ };
columns.unchecked = function(field) {
$('.field-' + field).addClass('hidden-field');
- }
+ };
// hide fields
api.menuList.hideAdvancedMenuItemFields();
+
+ $('.hide-postbox-tog').click(function () {
+ var hidden = $( '.accordion-container li.accordion-section' ).filter(':hidden').map(function() { return this.id; }).get().join(',');
+ $.post(ajaxurl, {
+ action: 'closed-postboxes',
+ hidden: hidden,
+ closedpostboxesnonce: jQuery('#closedpostboxesnonce').val(),
+ page: 'nav-menus'
+ });
+ });
},
initSortables : function() {
@@ -246,6 +563,9 @@ var wpNavMenu;
body = $('body'), maxChildDepth,
menuMaxDepth = initialMenuMaxDepth();
+ if( 0 !== $( '#menu-to-edit li' ).length )
+ $( '.drag-instructions' ).show();
+
// Use the right edge if RTL.
menuEdge += api.isRTL ? api.menuList.width() : 0;
@@ -295,7 +615,7 @@ var wpNavMenu;
tempHolder = ui.placeholder.next();
tempHolder.css( 'margin-top', helperHeight + 'px' ); // Set the margin to absorb the placeholder
ui.placeholder.detach(); // detach or jQuery UI will think the placeholder is a menu item
- $(this).sortable( "refresh" ); // The children aren't sortable. We should let jQ UI know.
+ $(this).sortable( 'refresh' ); // The children aren't sortable. We should let jQ UI know.
ui.item.after( ui.placeholder ); // reattach the placeholder.
tempHolder.css('margin-top', 0); // reset the margin
@@ -303,13 +623,21 @@ var wpNavMenu;
updateSharedVars(ui);
},
stop: function(e, ui) {
- var children, depthChange = currentDepth - originalDepth;
+ var children, subMenuTitle,
+ depthChange = currentDepth - originalDepth;
// Return child elements to the list
children = transport.children().insertAfter(ui.item);
+ // Add "sub menu" description
+ subMenuTitle = ui.item.find( '.item-title .is-submenu' );
+ if ( 0 < currentDepth )
+ subMenuTitle.show();
+ else
+ subMenuTitle.hide();
+
// Update depth classes
- if( depthChange != 0 ) {
+ if ( 0 !== depthChange ) {
ui.item.updateDepthClass( currentDepth );
children.shiftDepthClass( depthChange );
updateMenuMaxDepth( depthChange );
@@ -328,8 +656,8 @@ var wpNavMenu;
ui.item[0].style.right = 0;
}
- // The width of the tab bar might have changed. Just in case.
- api.refreshMenuTabs( true );
+ api.refreshKeyboardAccessibility();
+ api.refreshAdvancedAccessibility();
},
change: function(e, ui) {
// Make sure the placeholder is inside the menu.
@@ -356,7 +684,7 @@ var wpNavMenu;
if( nextThreshold && offset.top + helperHeight > nextThreshold ) {
next.after( ui.placeholder );
updateSharedVars( ui );
- $(this).sortable( "refreshPositions" );
+ $( this ).sortable( 'refreshPositions' );
}
}
});
@@ -389,7 +717,7 @@ var wpNavMenu;
function initialMenuMaxDepth() {
if( ! body[0].className ) return 0;
var match = body[0].className.match(/menu-max-depth-(\d+)/);
- return match && match[1] ? parseInt(match[1]) : 0;
+ return match && match[1] ? parseInt( match[1], 10 ) : 0;
}
function updateMenuMaxDepth( depthChange ) {
@@ -410,6 +738,19 @@ var wpNavMenu;
}
},
+ initManageLocations : function () {
+ $('#menu-locations-wrap form').submit(function(){
+ window.onbeforeunload = null;
+ });
+ $('.menu-location-menus select').on('change', function () {
+ var editLink = $(this).closest('tr').find('.locations-edit-menu-link');
+ if ($(this).find('option:selected').data('orig'))
+ editLink.show();
+ else
+ editLink.hide();
+ });
+ },
+
attachMenuEditListeners : function() {
var that = this;
$('#update-nav-menu').bind('click', function(e) {
@@ -430,7 +771,7 @@ var wpNavMenu;
$('#add-custom-links input[type="text"]').keypress(function(e){
if ( e.keyCode === 13 ) {
e.preventDefault();
- $("#submit-customlinkdiv").click();
+ $( '#submit-customlinkdiv' ).click();
}
});
},
@@ -449,7 +790,7 @@ var wpNavMenu;
var $t = $(this), title = $t.attr('title'), val = $t.val();
$t.data( name, title );
- if( '' == val ) $t.val( title );
+ if( '' === val ) $t.val( title );
else if ( title == val ) return;
else $t.removeClass( name );
}).focus( function(){
@@ -458,21 +799,23 @@ var wpNavMenu;
$t.val('').removeClass( name );
}).blur( function(){
var $t = $(this);
- if( '' == $t.val() )
+ if( '' === $t.val() )
$t.addClass( name ).val( $t.data(name) );
});
+
+ $( '.blank-slate .input-with-default-title' ).focus();
},
attachThemeLocationsListeners : function() {
var loc = $('#nav-menu-theme-locations'), params = {};
- params['action'] = 'menu-locations-save';
+ params.action = 'menu-locations-save';
params['menu-settings-column-nonce'] = $('#menu-settings-column-nonce').val();
loc.find('input[type="submit"]').click(function() {
loc.find('select').each(function() {
params[this.name] = $(this).val();
});
loc.find('.spinner').show();
- $.post( ajaxurl, params, function(r) {
+ $.post( ajaxurl, params, function() {
loc.find('.spinner').hide();
});
return false;
@@ -528,7 +871,7 @@ var wpNavMenu;
processMethod = processMethod || api.addMenuItemToBottom;
- if ( '' == url || 'http://' == url )
+ if ( '' === url || 'http://' == url )
return false;
// Show the ajax spinner
@@ -557,7 +900,8 @@ var wpNavMenu;
addItemToMenu : function(menuItem, processMethod, callback) {
var menu = $('#menu').val(),
- nonce = $('#menu-settings-column-nonce').val();
+ nonce = $('#menu-settings-column-nonce').val(),
+ params;
processMethod = processMethod || function(){};
callback = callback || function(){};
@@ -571,9 +915,16 @@ var wpNavMenu;
$.post( ajaxurl, params, function(menuMarkup) {
var ins = $('#menu-instructions');
+
+ menuMarkup = $.trim( menuMarkup ); // Trim leading whitespaces
processMethod(menuMarkup, params);
- if( ! ins.hasClass('menu-instructions-inactive') && ins.siblings().length )
- ins.addClass('menu-instructions-inactive');
+
+ // Make it stand out a bit more visually, by adding a fadeIn
+ $( 'li.pending' ).hide().fadeIn('slow');
+ $( '.drag-instructions' ).show();
+ if( ! ins.hasClass( 'menu-instructions-inactive' ) && ins.siblings().length )
+ ins.addClass( 'menu-instructions-inactive' );
+
callback();
});
},
@@ -584,27 +935,31 @@ var wpNavMenu;
* @param string menuMarkup The text server response of menu item markup.
* @param object req The request arguments.
*/
- addMenuItemToBottom : function( menuMarkup, req ) {
+ addMenuItemToBottom : function( menuMarkup ) {
$(menuMarkup).hideAdvancedMenuItemFields().appendTo( api.targetList );
+ api.refreshKeyboardAccessibility();
+ api.refreshAdvancedAccessibility();
},
- addMenuItemToTop : function( menuMarkup, req ) {
+ addMenuItemToTop : function( menuMarkup ) {
$(menuMarkup).hideAdvancedMenuItemFields().prependTo( api.targetList );
+ api.refreshKeyboardAccessibility();
+ api.refreshAdvancedAccessibility();
},
attachUnsavedChangesListener : function() {
- $('#menu-management input, #menu-management select, #menu-management, #menu-management textarea').change(function(){
+ $('#menu-management input, #menu-management select, #menu-management, #menu-management textarea, .menu-location-menus select').change(function(){
api.registerChange();
});
- if ( 0 != $('#menu-to-edit').length ) {
+ if ( 0 !== $('#menu-to-edit').length || 0 !== $('.menu-location-menus select').length ) {
window.onbeforeunload = function(){
if ( api.menusChanged )
return navMenuL10n.saveAlert;
};
} else {
// Make the post boxes read-only, as they can't be used yet
- $('#menu-settings-column').find('input,select').prop('disabled', true).end().find('a').attr('href', '#').unbind('click');
+ $( '#menu-settings-column' ).find( 'input,select' ).end().find( 'a' ).attr( 'href', '#' ).unbind( 'click' );
}
},
@@ -618,13 +973,10 @@ var wpNavMenu;
target = $(e.target);
if ( target.hasClass('nav-tab-link') ) {
- panelId = /#(.*)$/.exec(e.target.href);
- if ( panelId && panelId[1] )
- panelId = panelId[1]
- else
- return false;
- wrapper = target.parents('.inside').first();
+ panelId = target.data( 'type' );
+
+ wrapper = target.parents('.accordion-section-content').first();
// upon changing tabs, we want to uncheck all checkboxes
$('input', wrapper).removeAttr('checked');
@@ -638,7 +990,7 @@ var wpNavMenu;
// select the search bar
$('.quick-search', wrapper).focus();
- return false;
+ e.preventDefault();
} else if ( target.hasClass('select-all') ) {
selectAreaMatch = /#(.*)$/.exec(e.target.href);
if ( selectAreaMatch && selectAreaMatch[1] ) {
@@ -668,10 +1020,10 @@ var wpNavMenu;
placeholder = document.createElement('div'),
wrap = document.createElement('div');
- if ( ! metaBoxData['markup'] || ! toReplace )
+ if ( ! metaBoxData.markup || ! toReplace )
return;
- wrap.innerHTML = metaBoxData['markup'] ? metaBoxData['markup'] : '';
+ wrap.innerHTML = metaBoxData.markup ? metaBoxData.markup : '';
toReplace.parentNode.insertBefore( placeholder, toReplace );
placeholder.parentNode.removeChild( toReplace );
@@ -688,146 +1040,13 @@ var wpNavMenu;
});
},
- initTabManager : function() {
- var fixed = $('.nav-tabs-wrapper'),
- fluid = fixed.children('.nav-tabs'),
- active = fluid.children('.nav-tab-active'),
- tabs = fluid.children('.nav-tab'),
- tabsWidth = 0,
- fixedRight, fixedLeft,
- arrowLeft, arrowRight, resizeTimer, css = {},
- marginFluid = api.isRTL ? 'margin-right' : 'margin-left',
- marginFixed = api.isRTL ? 'margin-left' : 'margin-right',
- msPerPx = 2;
-
- /**
- * Refreshes the menu tabs.
- * Will show and hide arrows where necessary.
- * Scrolls to the active tab by default.
- *
- * @param savePosition {boolean} Optional. Prevents scrolling so
- * that the current position is maintained. Default false.
- **/
- api.refreshMenuTabs = function( savePosition ) {
- var fixedWidth = fixed.width(),
- margin = 0, css = {};
- fixedLeft = fixed.offset().left;
- fixedRight = fixedLeft + fixedWidth;
-
- if( !savePosition )
- active.makeTabVisible();
-
- // Prevent space from building up next to the last tab if there's more to show
- if( tabs.last().isTabVisible() ) {
- margin = fixed.width() - tabsWidth;
- margin = margin > 0 ? 0 : margin;
- css[marginFluid] = margin + 'px';
- fluid.animate( css, 100, "linear" );
- }
-
- // Show the arrows only when necessary
- if( fixedWidth > tabsWidth )
- arrowLeft.add( arrowRight ).hide();
- else
- arrowLeft.add( arrowRight ).show();
- }
-
- $.fn.extend({
- makeTabVisible : function() {
- var t = this.eq(0), left, right, css = {}, shift = 0;
-
- if( ! t.length ) return this;
-
- left = t.offset().left;
- right = left + t.outerWidth();
-
- if( right > fixedRight )
- shift = fixedRight - right;
- else if ( left < fixedLeft )
- shift = fixedLeft - left;
-
- if( ! shift ) return this;
-
- css[marginFluid] = "+=" + api.negateIfRTL * shift + 'px';
- fluid.animate( css, Math.abs( shift ) * msPerPx, "linear" );
- return this;
- },
- isTabVisible : function() {
- var t = this.eq(0),
- left = t.offset().left,
- right = left + t.outerWidth();
- return ( right <= fixedRight && left >= fixedLeft ) ? true : false;
- }
- });
-
- // Find the width of all tabs
- tabs.each(function(){
- tabsWidth += $(this).outerWidth(true);
- });
-
- // Set up fixed margin for overflow, unset padding
- css['padding'] = 0;
- css[marginFixed] = (-1 * tabsWidth) + 'px';
- fluid.css( css );
-
- // Build tab navigation
- arrowLeft = $('');
- arrowRight = $('');
- // Attach to the document
- fixed.wrap('
').parent().prepend( arrowLeft ).append( arrowRight );
-
- // Set the menu tabs
- api.refreshMenuTabs();
- // Make sure the tabs reset on resize
- $(window).resize(function() {
- if( resizeTimer ) clearTimeout(resizeTimer);
- resizeTimer = setTimeout( api.refreshMenuTabs, 200);
- });
-
- // Build arrow functions
- $.each([{
- arrow : arrowLeft,
- next : "next",
- last : "first",
- operator : "+="
- },{
- arrow : arrowRight,
- next : "prev",
- last : "last",
- operator : "-="
- }], function(){
- var that = this;
- this.arrow.mousedown(function(){
- var marginFluidVal = Math.abs( parseInt( fluid.css(marginFluid) ) ),
- shift = marginFluidVal,
- css = {};
-
- if( "-=" == that.operator )
- shift = Math.abs( tabsWidth - fixed.width() ) - marginFluidVal;
-
- if( ! shift ) return;
-
- css[marginFluid] = that.operator + shift + 'px';
- fluid.animate( css, shift * msPerPx, "linear" );
- }).mouseup(function(){
- var tab, next;
- fluid.stop(true);
- tab = tabs[that.last]();
- while( (next = tab[that.next]()) && next.length && ! next.isTabVisible() ) {
- tab = next;
- }
- tab.makeTabVisible();
- });
- });
- },
-
eventOnClickEditLink : function(clickedEl) {
var settings, item,
matchedSection = /#(.*)$/.exec(clickedEl.href);
if ( matchedSection && matchedSection[1] ) {
settings = $('#'+matchedSection[1]);
item = settings.parent();
- if( 0 != item.length ) {
+ if( 0 !== item.length ) {
if( item.hasClass('menu-item-edit-inactive') ) {
if( ! settings.data('menu-item-data') ) {
settings.data( 'menu-item-data', settings.getItemData() );
@@ -846,12 +1065,14 @@ var wpNavMenu;
},
eventOnClickCancelLink : function(clickedEl) {
- var settings = $(clickedEl).closest('.menu-item-settings');
- settings.setItemData( settings.data('menu-item-data') );
+ var settings = $( clickedEl ).closest( '.menu-item-settings' ),
+ thisMenuItem = $( clickedEl ).closest( '.menu-item' );
+ thisMenuItem.removeClass('menu-item-edit-active').addClass('menu-item-edit-inactive');
+ settings.setItemData( settings.data('menu-item-data') ).hide();
return false;
},
- eventOnClickMenuSave : function(clickedEl) {
+ eventOnClickMenuSave : function() {
var locs = '',
menuName = $('#menu-name'),
menuNameVal = menuName.val();
@@ -872,9 +1093,9 @@ var wpNavMenu;
return true;
},
- eventOnClickMenuDelete : function(clickedEl) {
+ eventOnClickMenuDelete : function() {
// Delete warning AYS
- if ( confirm( navMenuL10n.warnDeleteMenu ) ) {
+ if ( window.confirm( navMenuL10n.warnDeleteMenu ) ) {
window.onbeforeunload = null;
return true;
}
@@ -899,7 +1120,7 @@ var wpNavMenu;
var matched, newID,
takenIDs = {},
form = document.getElementById('nav-menu-meta'),
- pattern = new RegExp('menu-item\\[(\[^\\]\]*)', 'g'),
+ pattern = /menu-item[(\[^]\]*/,
$items = $('').html(resp).find('li'),
$item;
@@ -944,9 +1165,11 @@ var wpNavMenu;
}, 350, function() {
var ins = $('#menu-instructions');
el.remove();
- children.shiftDepthClass(-1).updateParentMenuItemDBId();
- if( ! ins.siblings().length )
- ins.removeClass('menu-instructions-inactive');
+ children.shiftDepthClass( -1 ).updateParentMenuItemDBId();
+ if ( 0 === $( '#menu-to-edit li' ).length ) {
+ $( '.drag-instructions' ).hide();
+ ins.removeClass( 'menu-instructions-inactive' );
+ }
});
},
diff --git a/wp-admin/js/nav-menu.min.js b/wp-admin/js/nav-menu.min.js
index 1f93603..85f6953 100644
--- a/wp-admin/js/nav-menu.min.js
+++ b/wp-admin/js/nav-menu.min.js
@@ -1 +1 @@
-var wpNavMenu;(function(b){var a=wpNavMenu={options:{menuItemDepthPerLevel:30,globalMaxDepth:11},menuList:undefined,targetList:undefined,menusChanged:false,isRTL:!!("undefined"!=typeof isRtl&&isRtl),negateIfRTL:("undefined"!=typeof isRtl&&isRtl)?-1:1,init:function(){a.menuList=b("#menu-to-edit");a.targetList=a.menuList;this.jQueryExtensions();this.attachMenuEditListeners();this.setupInputWithDefaultTitle();this.attachQuickSearchListeners();this.attachThemeLocationsListeners();this.attachTabsPanelListeners();this.attachUnsavedChangesListener();if(a.menuList.length){this.initSortables()}this.initToggles();this.initTabManager()},jQueryExtensions:function(){b.fn.extend({menuItemDepth:function(){var c=a.isRTL?this.eq(0).css("margin-right"):this.eq(0).css("margin-left");return a.pxToDepth(c&&-1!=c.indexOf("px")?c.slice(0,-2):0)},updateDepthClass:function(d,c){return this.each(function(){var e=b(this);c=c||e.menuItemDepth();b(this).removeClass("menu-item-depth-"+c).addClass("menu-item-depth-"+d)})},shiftDepthClass:function(c){return this.each(function(){var d=b(this),e=d.menuItemDepth();b(this).removeClass("menu-item-depth-"+e).addClass("menu-item-depth-"+(e+c))})},childMenuItems:function(){var c=b();this.each(function(){var d=b(this),f=d.menuItemDepth(),e=d.next();while(e.length&&e.menuItemDepth()>f){c=c.add(e);e=e.next()}});return c},updateParentMenuItemDBId:function(){return this.each(function(){var e=b(this),c=e.find(".menu-item-data-parent-id"),f=e.menuItemDepth(),d=e.prev();if(f==0){c.val(0)}else{while(!d[0]||!d[0].className||-1==d[0].className.indexOf("menu-item")||(d.menuItemDepth()!=f-1)){d=d.prev()}c.val(d.find(".menu-item-data-db-id").val())}})},hideAdvancedMenuItemFields:function(){return this.each(function(){var c=b(this);b(".hide-column-tog").not(":checked").each(function(){c.find(".field-"+b(this).val()).addClass("hidden-field")})})},addSelectedToMenu:function(c){if(0==b("#menu-to-edit").length){return false}return this.each(function(){var e=b(this),d={},g=e.find(".tabs-panel-active .categorychecklist li input:checked"),f=new RegExp("menu-item\\[([^\\]]*)");c=c||a.addMenuItemToBottom;if(!g.length){return false}e.find(".spinner").show();b(g).each(function(){var i=b(this),h=f.exec(i.attr("name")),j="undefined"==typeof h[1]?0:parseInt(h[1],10);if(this.className&&-1!=this.className.indexOf("add-to-top")){c=a.addMenuItemToTop}d[j]=i.closest("li").getItemData("add-menu-item",j)});a.addItemToMenu(d,c,function(){g.removeAttr("checked");e.find(".spinner").hide()})})},getItemData:function(f,g){f=f||"menu-item";var d={},e,c=["menu-item-db-id","menu-item-object-id","menu-item-object","menu-item-parent-id","menu-item-position","menu-item-type","menu-item-title","menu-item-url","menu-item-description","menu-item-attr-title","menu-item-target","menu-item-classes","menu-item-xfn"];if(!g&&f=="menu-item"){g=this.find(".menu-item-data-db-id").val()}if(!g){return d}this.find("input").each(function(){var h;e=c.length;while(e--){if(f=="menu-item"){h=c[e]+"["+g+"]"}else{if(f=="add-menu-item"){h="menu-item["+g+"]["+c[e]+"]"}}if(this.name&&h==this.name){d[c[e]]=this.value}}});return d},setItemData:function(c,d,e){d=d||"menu-item";if(!e&&d=="menu-item"){e=b(".menu-item-data-db-id",this).val()}if(!e){return this}this.find("input").each(function(){var f=b(this),g;b.each(c,function(h,i){if(d=="menu-item"){g=h+"["+e+"]"}else{if(d=="add-menu-item"){g="menu-item["+e+"]["+h+"]"}}if(g==f.attr("name")){f.val(i)}})});return this}})},initToggles:function(){postboxes.add_postbox_toggles("nav-menus");columns.useCheckboxesForHidden();columns.checked=function(c){b(".field-"+c).removeClass("hidden-field")};columns.unchecked=function(c){b(".field-"+c).addClass("hidden-field")};a.menuList.hideAdvancedMenuItemFields()},initSortables:function(){var p=0,e,t,d,l,o,f,c,i,s,m=a.menuList.offset().left,h=b("body"),q,n=r();m+=a.isRTL?a.menuList.width():0;a.menuList.sortable({handle:".menu-item-handle",placeholder:"sortable-placeholder",start:function(A,z){var u,x,w,v,y;if(a.isRTL){z.item[0].style.right="auto"}s=z.item.children(".menu-item-transport");e=z.item.menuItemDepth();j(z,e);w=(z.item.next()[0]==z.placeholder[0])?z.item.next():z.item;v=w.childMenuItems();s.append(v);u=s.outerHeight();u+=(u>0)?(z.placeholder.css("margin-top").slice(0,-2)*1):0;u+=z.helper.outerHeight();i=u;u-=2;z.placeholder.height(u);q=e;v.each(function(){var B=b(this).menuItemDepth();q=(B>q)?B:q});x=z.helper.find(".menu-item-handle").outerWidth();x+=a.depthToPx(q-e);x-=2;z.placeholder.width(x);y=z.placeholder.next();y.css("margin-top",i+"px");z.placeholder.detach();b(this).sortable("refresh");z.item.after(z.placeholder);y.css("margin-top",0);k(z)},stop:function(x,w){var v,u=p-e;v=s.children().insertAfter(w.item);if(u!=0){w.item.updateDepthClass(p);v.shiftDepthClass(u);g(u)}a.registerChange();w.item.updateParentMenuItemDBId();w.item[0].style.top=0;if(a.isRTL){w.item[0].style.left="auto";w.item[0].style.right=0}a.refreshMenuTabs(true)},change:function(v,u){if(!u.placeholder.parent().hasClass("menu")){(l.length)?l.after(u.placeholder):a.menuList.prepend(u.placeholder)}k(u)},sort:function(w,v){var y=v.helper.offset(),u=a.isRTL?y.left+v.helper.width():y.left,x=a.negateIfRTL*a.pxToDepth(u-m);if(x>d||y.top
c){o.after(v.placeholder);k(v);b(this).sortable("refreshPositions")}}});function k(u){var v;l=u.placeholder.prev();o=u.placeholder.next();if(l[0]==u.item[0]){l=l.prev()}if(o[0]==u.item[0]){o=o.next()}f=(l.length)?l.offset().top+l.height():0;c=(o.length)?o.offset().top+o.height()/3:0;t=(o.length)?o.menuItemDepth():0;if(l.length){d=((v=l.menuItemDepth()+1)>a.options.globalMaxDepth)?a.options.globalMaxDepth:v}else{d=0}}function j(u,v){u.placeholder.updateDepthClass(v,p);p=v}function r(){if(!h[0].className){return 0}var u=h[0].className.match(/menu-max-depth-(\d+)/);return u&&u[1]?parseInt(u[1]):0}function g(u){var v,w=n;if(u===0){return}else{if(u>0){v=q+u;if(v>n){w=v}}else{if(u<0&&q==n){while(!b(".menu-item-depth-"+w,a.menuList).length&&w>0){w--}}}}h.removeClass("menu-max-depth-"+n).addClass("menu-max-depth-"+w);n=w}},attachMenuEditListeners:function(){var c=this;b("#update-nav-menu").bind("click",function(d){if(d.target&&d.target.className){if(-1!=d.target.className.indexOf("item-edit")){return c.eventOnClickEditLink(d.target)}else{if(-1!=d.target.className.indexOf("menu-save")){return c.eventOnClickMenuSave(d.target)}else{if(-1!=d.target.className.indexOf("menu-delete")){return c.eventOnClickMenuDelete(d.target)}else{if(-1!=d.target.className.indexOf("item-delete")){return c.eventOnClickMenuItemDelete(d.target)}else{if(-1!=d.target.className.indexOf("item-cancel")){return c.eventOnClickCancelLink(d.target)}}}}}}});b('#add-custom-links input[type="text"]').keypress(function(d){if(d.keyCode===13){d.preventDefault();b("#submit-customlinkdiv").click()}})},setupInputWithDefaultTitle:function(){var c="input-with-default-title";b("."+c).each(function(){var f=b(this),e=f.attr("title"),d=f.val();f.data(c,e);if(""==d){f.val(e)}else{if(e==d){return}else{f.removeClass(c)}}}).focus(function(){var d=b(this);if(d.val()==d.data(c)){d.val("").removeClass(c)}}).blur(function(){var d=b(this);if(""==d.val()){d.addClass(c).val(d.data(c))}})},attachThemeLocationsListeners:function(){var d=b("#nav-menu-theme-locations"),c={};c.action="menu-locations-save";c["menu-settings-column-nonce"]=b("#menu-settings-column-nonce").val();d.find('input[type="submit"]').click(function(){d.find("select").each(function(){c[this.name]=b(this).val()});d.find(".spinner").show();b.post(ajaxurl,c,function(e){d.find(".spinner").hide()});return false})},attachQuickSearchListeners:function(){var c;b(".quick-search").keypress(function(f){var d=b(this);if(13==f.which){a.updateQuickSearchResults(d);return false}if(c){clearTimeout(c)}c=setTimeout(function(){a.updateQuickSearchResults(d)},400)}).attr("autocomplete","off")},updateQuickSearchResults:function(d){var c,g,e=2,f=d.val();if(f.length0?0:s;r[c]=s+"px";j.animate(r,100,"linear")}if(t>e){l.add(d).hide()}else{l.add(d).show()}};b.fn.extend({makeTabVisible:function(){var u=this.eq(0),v,s,r={},q=0;if(!u.length){return this}v=u.offset().left;s=v+u.outerWidth();if(s>o){q=o-s}else{if(v=f)?true:false}});m.each(function(){e+=b(this).outerWidth(true)});i.padding=0;i[p]=(-1*e)+"px";j.css(i);l=b('');d=b('');h.wrap('
').parent().prepend(l).append(d);a.refreshMenuTabs();b(window).resize(function(){if(k){clearTimeout(k)}k=setTimeout(a.refreshMenuTabs,200)});b.each([{arrow:l,next:"next",last:"first",operator:"+="},{arrow:d,next:"prev",last:"last",operator:"-="}],function(){var q=this;this.arrow.mousedown(function(){var t=Math.abs(parseInt(j.css(c))),r=t,s={};if("-="==q.operator){r=Math.abs(e-h.width())-t}if(!r){return}s[c]=q.operator+r+"px";j.animate(s,r*n,"linear")}).mouseup(function(){var s,r;j.stop(true);s=m[q.last]();while((r=s[q.next]())&&r.length&&!r.isTabVisible()){s=r}s.makeTabVisible()})})},eventOnClickEditLink:function(d){var c,e,f=/#(.*)$/.exec(d.href);if(f&&f[1]){c=b("#"+f[1]);e=c.parent();if(0!=e.length){if(e.hasClass("menu-item-edit-inactive")){if(!c.data("menu-item-data")){c.data("menu-item-data",c.getItemData())}c.slideDown("fast");e.removeClass("menu-item-edit-inactive").addClass("menu-item-edit-active")}else{c.slideUp("fast");e.removeClass("menu-item-edit-active").addClass("menu-item-edit-inactive")}return false}}},eventOnClickCancelLink:function(d){var c=b(d).closest(".menu-item-settings");c.setItemData(c.data("menu-item-data"));return false},eventOnClickMenuSave:function(e){var f="",c=b("#menu-name"),d=c.val();if(!d||d==c.attr("title")||!d.replace(/\s+/,"")){c.parent().addClass("form-invalid");return false}b("#nav-menu-theme-locations select").each(function(){f+='").html(g).find("li"),l;if(!h.length){b(".categorychecklist",c).html("
"+navMenuL10n.noResultsFound+"
");b(".spinner",c).hide();return}h.each(function(){l=b(this);e=j.exec(l.html());if(e&&e[1]){i=e[1];while(d.elements["menu-item["+i+"][menu-item-type]"]||f[i]){i--}f[i]=true;if(i!=e[1]){l.html(l.html().replace(new RegExp("menu-item\\["+e[1]+"\\]","g"),"menu-item["+i+"]"))}}});b(".categorychecklist",c).html(h);b(".spinner",c).hide()},removeMenuItem:function(d){var c=d.childMenuItems();d.addClass("deleting").animate({opacity:0,height:0},350,function(){var e=b("#menu-instructions");d.remove();c.shiftDepthClass(-1).updateParentMenuItemDBId();if(!e.siblings().length){e.removeClass("menu-instructions-inactive")}})},depthToPx:function(c){return c*a.options.menuItemDepthPerLevel},pxToDepth:function(c){return Math.floor(c/a.options.menuItemDepthPerLevel)}};b(document).ready(function(){wpNavMenu.init()})})(jQuery);
\ No newline at end of file
+var wpNavMenu;!function(a){var b;b=wpNavMenu={options:{menuItemDepthPerLevel:30,globalMaxDepth:11},menuList:void 0,targetList:void 0,menusChanged:!1,isRTL:!("undefined"==typeof isRtl||!isRtl),negateIfRTL:"undefined"!=typeof isRtl&&isRtl?-1:1,init:function(){b.menuList=a("#menu-to-edit"),b.targetList=b.menuList,this.jQueryExtensions(),this.attachMenuEditListeners(),this.setupInputWithDefaultTitle(),this.attachQuickSearchListeners(),this.attachThemeLocationsListeners(),this.attachTabsPanelListeners(),this.attachUnsavedChangesListener(),b.menuList.length&&this.initSortables(),menus.oneThemeLocationNoMenus&&a("#posttype-page").addSelectedToMenu(b.addMenuItemToBottom),this.initManageLocations(),this.initAccessibility(),this.initToggles()},jQueryExtensions:function(){a.fn.extend({menuItemDepth:function(){var a=this.eq(0).css(b.isRTL?"margin-right":"margin-left");return b.pxToDepth(a&&-1!=a.indexOf("px")?a.slice(0,-2):0)},updateDepthClass:function(b,c){return this.each(function(){var d=a(this);c=c||d.menuItemDepth(),a(this).removeClass("menu-item-depth-"+c).addClass("menu-item-depth-"+b)})},shiftDepthClass:function(b){return this.each(function(){var c=a(this),d=c.menuItemDepth();a(this).removeClass("menu-item-depth-"+d).addClass("menu-item-depth-"+(d+b))})},childMenuItems:function(){var b=a();return this.each(function(){for(var c=a(this),d=c.menuItemDepth(),e=c.next();e.length&&e.menuItemDepth()>d;)b=b.add(e),e=e.next()}),b},shiftHorizontally:function(b){return this.each(function(){var c=a(this),d=c.menuItemDepth(),e=d+b;c.moveHorizontally(e,d)})},moveHorizontally:function(b,c){return this.each(function(){var d=a(this),e=d.childMenuItems(),f=b-c,g=d.find(".is-submenu");d.updateDepthClass(b,c).updateParentMenuItemDBId(),e&&e.each(function(){var b=a(this),c=b.menuItemDepth(),d=c+f;b.updateDepthClass(d,c).updateParentMenuItemDBId()}),0===b?g.hide():g.show()})},updateParentMenuItemDBId:function(){return this.each(function(){var b=a(this),c=b.find(".menu-item-data-parent-id"),d=parseInt(b.menuItemDepth(),10),e=d-1,f=b.prevAll(".menu-item-depth-"+e).first();c.val(0===d?0:f.find(".menu-item-data-db-id").val())})},hideAdvancedMenuItemFields:function(){return this.each(function(){var b=a(this);a(".hide-column-tog").not(":checked").each(function(){b.find(".field-"+a(this).val()).addClass("hidden-field")})})},addSelectedToMenu:function(c){return 0===a("#menu-to-edit").length?!1:this.each(function(){var d=a(this),e={},f=d.find(menus.oneThemeLocationNoMenus&&0===d.find(".tabs-panel-active .categorychecklist li input:checked").length?'#page-all li input[type="checkbox"]':".tabs-panel-active .categorychecklist li input:checked"),g=/menu-item\[([^\]]*)/;return c=c||b.addMenuItemToBottom,f.length?(d.find(".spinner").show(),a(f).each(function(){var d=a(this),f=g.exec(d.attr("name")),h="undefined"==typeof f[1]?0:parseInt(f[1],10);this.className&&-1!=this.className.indexOf("add-to-top")&&(c=b.addMenuItemToTop),e[h]=d.closest("li").getItemData("add-menu-item",h)}),void b.addItemToMenu(e,c,function(){f.removeAttr("checked"),d.find(".spinner").hide()})):!1})},getItemData:function(a,b){a=a||"menu-item";var c,d={},e=["menu-item-db-id","menu-item-object-id","menu-item-object","menu-item-parent-id","menu-item-position","menu-item-type","menu-item-title","menu-item-url","menu-item-description","menu-item-attr-title","menu-item-target","menu-item-classes","menu-item-xfn"];return b||"menu-item"!=a||(b=this.find(".menu-item-data-db-id").val()),b?(this.find("input").each(function(){var f;for(c=e.length;c--;)"menu-item"==a?f=e[c]+"["+b+"]":"add-menu-item"==a&&(f="menu-item["+b+"]["+e[c]+"]"),this.name&&f==this.name&&(d[e[c]]=this.value)}),d):d},setItemData:function(b,c,d){return c=c||"menu-item",d||"menu-item"!=c||(d=a(".menu-item-data-db-id",this).val()),d?(this.find("input").each(function(){var e,f=a(this);a.each(b,function(a,b){"menu-item"==c?e=a+"["+d+"]":"add-menu-item"==c&&(e="menu-item["+d+"]["+a+"]"),e==f.attr("name")&&f.val(b)})}),this):this}})},countMenuItems:function(b){return a(".menu-item-depth-"+b).length},moveMenuItem:function(c,d){var e,f,g,h=a("#menu-to-edit li"),i=h.length,j=c.parents("li.menu-item"),k=j.childMenuItems(),l=j.getItemData(),m=parseInt(j.menuItemDepth(),10),n=parseInt(j.index(),10),o=j.next(),p=o.childMenuItems(),q=parseInt(o.menuItemDepth(),10)+1,r=j.prev(),s=parseInt(r.menuItemDepth(),10),t=r.getItemData()["menu-item-db-id"];switch(d){case"up":if(f=n-1,0===n)break;0===f&&0!==m&&j.moveHorizontally(0,m),0!==s&&j.moveHorizontally(s,m),k?(e=j.add(k),e.detach().insertBefore(h.eq(f)).updateParentMenuItemDBId()):j.detach().insertBefore(h.eq(f)).updateParentMenuItemDBId();break;case"down":if(k){if(e=j.add(k),o=h.eq(e.length+n),p=0!==o.childMenuItems().length,p&&(g=parseInt(o.menuItemDepth(),10)+1,j.moveHorizontally(g,m)),i===n+e.length)break;e.detach().insertAfter(h.eq(n+e.length)).updateParentMenuItemDBId()}else{if(0!==p.length&&j.moveHorizontally(q,m),i===n+1)break;j.detach().insertAfter(h.eq(n+1)).updateParentMenuItemDBId()}break;case"top":if(0===n)break;k?(e=j.add(k),e.detach().insertBefore(h.eq(0)).updateParentMenuItemDBId()):j.detach().insertBefore(h.eq(0)).updateParentMenuItemDBId();break;case"left":if(0===m)break;j.shiftHorizontally(-1);break;case"right":if(0===n)break;if(l["menu-item-parent-id"]===t)break;j.shiftHorizontally(1)}c.focus(),b.registerChange(),b.refreshKeyboardAccessibility(),b.refreshAdvancedAccessibility()},initAccessibility:function(){var c=a("#menu-to-edit");b.refreshKeyboardAccessibility(),b.refreshAdvancedAccessibility(),c.on("click",".menus-move-up",function(c){b.moveMenuItem(a(this).parents("li.menu-item").find("a.item-edit"),"up"),c.preventDefault()}),c.on("click",".menus-move-down",function(c){b.moveMenuItem(a(this).parents("li.menu-item").find("a.item-edit"),"down"),c.preventDefault()}),c.on("click",".menus-move-top",function(c){b.moveMenuItem(a(this).parents("li.menu-item").find("a.item-edit"),"top"),c.preventDefault()}),c.on("click",".menus-move-left",function(c){b.moveMenuItem(a(this).parents("li.menu-item").find("a.item-edit"),"left"),c.preventDefault()}),c.on("click",".menus-move-right",function(c){b.moveMenuItem(a(this).parents("li.menu-item").find("a.item-edit"),"right"),c.preventDefault()})},refreshAdvancedAccessibility:function(){a(".menu-item-settings .field-move a").css("display","none"),a(".item-edit").each(function(){var b,c,d,e,f,g,h,i,j,k=a(this),l=k.closest("li.menu-item").first(),m=l.menuItemDepth(),n=0===m,o=k.closest(".menu-item-handle").find(".menu-item-title").text(),p=parseInt(l.index(),10),q=n?m:parseInt(m-1,10),r=l.prevAll(".menu-item-depth-"+q).first().find(".menu-item-title").text(),s=l.prevAll(".menu-item-depth-"+m).first().find(".menu-item-title").text(),t=a("#menu-to-edit li").length,u=l.nextAll(".menu-item-depth-"+m).length;0!==p&&(b=l.find(".menus-move-up"),b.prop("title",menus.moveUp).css("display","inline")),0!==p&&n&&(b=l.find(".menus-move-top"),b.prop("title",menus.moveToTop).css("display","inline")),p+1!==t&&0!==p&&(b=l.find(".menus-move-down"),b.prop("title",menus.moveDown).css("display","inline")),0===p&&0!==u&&(b=l.find(".menus-move-down"),b.prop("title",menus.moveDown).css("display","inline")),n||(b=l.find(".menus-move-left"),c=menus.outFrom.replace("%s",r),b.prop("title",menus.moveOutFrom.replace("%s",r)).html(c).css("display","inline")),0!==p&&l.find(".menu-item-data-parent-id").val()!==l.prev().find(".menu-item-data-db-id").val()&&(b=l.find(".menus-move-right"),c=menus.under.replace("%s",s),b.prop("title",menus.moveUnder.replace("%s",s)).html(c).css("display","inline")),n?(d=a(".menu-item-depth-0"),e=d.index(l)+1,t=d.length,f=menus.menuFocus.replace("%1$s",o).replace("%2$d",e).replace("%3$d",t)):(g=l.prevAll(".menu-item-depth-"+parseInt(m-1,10)).first(),h=g.find(".menu-item-data-db-id").val(),i=g.find(".menu-item-title").text(),j=a('.menu-item .menu-item-data-parent-id[value="'+h+'"]'),e=a(j.parents(".menu-item").get().reverse()).index(l)+1,f=menus.subMenuFocus.replace("%1$s",o).replace("%2$d",e).replace("%3$s",i)),k.prop("title",f).html(f)})},refreshKeyboardAccessibility:function(){a(".item-edit").off("focus").on("focus",function(){a(this).off("keydown").on("keydown",function(c){var d,e=a(this),f=e.parents("li.menu-item"),g=f.getItemData();if((37==c.which||38==c.which||39==c.which||40==c.which)&&(e.off("keydown"),1!==a("#menu-to-edit li").length)){switch(d={38:"up",40:"down",37:"left",39:"right"},a("body").hasClass("rtl")&&(d={38:"up",40:"down",39:"left",37:"right"}),d[c.which]){case"up":b.moveMenuItem(e,"up");break;case"down":b.moveMenuItem(e,"down");break;case"left":b.moveMenuItem(e,"left");break;case"right":b.moveMenuItem(e,"right")}return a("#edit-"+g["menu-item-db-id"]).focus(),!1}})})},initToggles:function(){postboxes.add_postbox_toggles("nav-menus"),columns.useCheckboxesForHidden(),columns.checked=function(b){a(".field-"+b).removeClass("hidden-field")},columns.unchecked=function(b){a(".field-"+b).addClass("hidden-field")},b.menuList.hideAdvancedMenuItemFields(),a(".hide-postbox-tog").click(function(){var b=a(".accordion-container li.accordion-section").filter(":hidden").map(function(){return this.id}).get().join(",");a.post(ajaxurl,{action:"closed-postboxes",hidden:b,closedpostboxesnonce:jQuery("#closedpostboxesnonce").val(),page:"nav-menus"})})},initSortables:function(){function c(a){var c;j=a.placeholder.prev(),k=a.placeholder.next(),j[0]==a.item[0]&&(j=j.prev()),k[0]==a.item[0]&&(k=k.next()),l=j.length?j.offset().top+j.height():0,m=k.length?k.offset().top+k.height()/3:0,h=k.length?k.menuItemDepth():0,i=j.length?(c=j.menuItemDepth()+1)>b.options.globalMaxDepth?b.options.globalMaxDepth:c:0}function d(a,b){a.placeholder.updateDepthClass(b,q),q=b}function e(){if(!s[0].className)return 0;var a=s[0].className.match(/menu-max-depth-(\d+)/);return a&&a[1]?parseInt(a[1],10):0}function f(c){var d,e=t;if(0!==c){if(c>0)d=p+c,d>t&&(e=d);else if(0>c&&p==t)for(;!a(".menu-item-depth-"+e,b.menuList).length&&e>0;)e--;s.removeClass("menu-max-depth-"+t).addClass("menu-max-depth-"+e),t=e}}var g,h,i,j,k,l,m,n,o,p,q=0,r=b.menuList.offset().left,s=a("body"),t=e();0!==a("#menu-to-edit li").length&&a(".drag-instructions").show(),r+=b.isRTL?b.menuList.width():0,b.menuList.sortable({handle:".menu-item-handle",placeholder:"sortable-placeholder",start:function(e,f){var h,i,j,k,l;b.isRTL&&(f.item[0].style.right="auto"),o=f.item.children(".menu-item-transport"),g=f.item.menuItemDepth(),d(f,g),j=f.item.next()[0]==f.placeholder[0]?f.item.next():f.item,k=j.childMenuItems(),o.append(k),h=o.outerHeight(),h+=h>0?1*f.placeholder.css("margin-top").slice(0,-2):0,h+=f.helper.outerHeight(),n=h,h-=2,f.placeholder.height(h),p=g,k.each(function(){var b=a(this).menuItemDepth();p=b>p?b:p}),i=f.helper.find(".menu-item-handle").outerWidth(),i+=b.depthToPx(p-g),i-=2,f.placeholder.width(i),l=f.placeholder.next(),l.css("margin-top",n+"px"),f.placeholder.detach(),a(this).sortable("refresh"),f.item.after(f.placeholder),l.css("margin-top",0),c(f)},stop:function(a,c){var d,e,h=q-g;d=o.children().insertAfter(c.item),e=c.item.find(".item-title .is-submenu"),q>0?e.show():e.hide(),0!==h&&(c.item.updateDepthClass(q),d.shiftDepthClass(h),f(h)),b.registerChange(),c.item.updateParentMenuItemDBId(),c.item[0].style.top=0,b.isRTL&&(c.item[0].style.left="auto",c.item[0].style.right=0),b.refreshKeyboardAccessibility(),b.refreshAdvancedAccessibility()},change:function(a,d){d.placeholder.parent().hasClass("menu")||(j.length?j.after(d.placeholder):b.menuList.prepend(d.placeholder)),c(d)},sort:function(e,f){var g=f.helper.offset(),j=b.isRTL?g.left+f.helper.width():g.left,o=b.negateIfRTL*b.pxToDepth(j-r);o>i||g.top
o&&(o=h),o!=q&&d(f,o),m&&g.top+n>m&&(k.after(f.placeholder),c(f),a(this).sortable("refreshPositions"))}})},initManageLocations:function(){a("#menu-locations-wrap form").submit(function(){window.onbeforeunload=null}),a(".menu-location-menus select").on("change",function(){var b=a(this).closest("tr").find(".locations-edit-menu-link");a(this).find("option:selected").data("orig")?b.show():b.hide()})},attachMenuEditListeners:function(){var b=this;a("#update-nav-menu").bind("click",function(a){if(a.target&&a.target.className){if(-1!=a.target.className.indexOf("item-edit"))return b.eventOnClickEditLink(a.target);if(-1!=a.target.className.indexOf("menu-save"))return b.eventOnClickMenuSave(a.target);if(-1!=a.target.className.indexOf("menu-delete"))return b.eventOnClickMenuDelete(a.target);if(-1!=a.target.className.indexOf("item-delete"))return b.eventOnClickMenuItemDelete(a.target);if(-1!=a.target.className.indexOf("item-cancel"))return b.eventOnClickCancelLink(a.target)}}),a('#add-custom-links input[type="text"]').keypress(function(b){13===b.keyCode&&(b.preventDefault(),a("#submit-customlinkdiv").click())})},setupInputWithDefaultTitle:function(){var b="input-with-default-title";a("."+b).each(function(){var c=a(this),d=c.attr("title"),e=c.val();if(c.data(b,d),""===e)c.val(d);else{if(d==e)return;c.removeClass(b)}}).focus(function(){var c=a(this);c.val()==c.data(b)&&c.val("").removeClass(b)}).blur(function(){var c=a(this);""===c.val()&&c.addClass(b).val(c.data(b))}),a(".blank-slate .input-with-default-title").focus()},attachThemeLocationsListeners:function(){var b=a("#nav-menu-theme-locations"),c={};c.action="menu-locations-save",c["menu-settings-column-nonce"]=a("#menu-settings-column-nonce").val(),b.find('input[type="submit"]').click(function(){return b.find("select").each(function(){c[this.name]=a(this).val()}),b.find(".spinner").show(),a.post(ajaxurl,c,function(){b.find(".spinner").hide()}),!1})},attachQuickSearchListeners:function(){var c;a(".quick-search").keypress(function(d){var e=a(this);return 13==d.which?(b.updateQuickSearchResults(e),!1):(c&&clearTimeout(c),void(c=setTimeout(function(){b.updateQuickSearchResults(e)},400)))}).attr("autocomplete","off")},updateQuickSearchResults:function(c){var d,e,f=2,g=c.val();g.length").html(b).find("li");return k.length?(k.each(function(){if(g=a(this),e=j.exec(g.html()),e&&e[1]){for(f=e[1];i.elements["menu-item["+f+"][menu-item-type]"]||h[f];)f--;h[f]=!0,f!=e[1]&&g.html(g.html().replace(new RegExp("menu-item\\["+e[1]+"\\]","g"),"menu-item["+f+"]"))}}),a(".categorychecklist",d).html(k),void a(".spinner",d).hide()):(a(".categorychecklist",d).html("
"+navMenuL10n.noResultsFound+"
"),void a(".spinner",d).hide())},removeMenuItem:function(b){var c=b.childMenuItems();b.addClass("deleting").animate({opacity:0,height:0},350,function(){var d=a("#menu-instructions");b.remove(),c.shiftDepthClass(-1).updateParentMenuItemDBId(),0===a("#menu-to-edit li").length&&(a(".drag-instructions").hide(),d.removeClass("menu-instructions-inactive"))})},depthToPx:function(a){return a*b.options.menuItemDepthPerLevel},pxToDepth:function(a){return Math.floor(a/b.options.menuItemDepthPerLevel)}},a(document).ready(function(){wpNavMenu.init()})}(jQuery);
\ No newline at end of file
diff --git a/wp-admin/js/password-strength-meter.js b/wp-admin/js/password-strength-meter.js
index 0f07a93..a075c26 100644
--- a/wp-admin/js/password-strength-meter.js
+++ b/wp-admin/js/password-strength-meter.js
@@ -1,36 +1,75 @@
-// Password strength meter
-function passwordStrength(password1, username, password2) {
- var shortPass = 1, badPass = 2, goodPass = 3, strongPass = 4, mismatch = 5, symbolSize = 0, natLog, score;
+/* global zxcvbn */
+window.wp = window.wp || {};
- // password 1 != password 2
- if ( (password1 != password2) && password2.length > 0)
- return mismatch
+var passwordStrength;
+(function($){
+ wp.passwordStrength = {
+ /**
+ * Determine the strength of a given password
+ *
+ * @param string password1 The password
+ * @param array blacklist An array of words that will lower the entropy of the password
+ * @param string password2 The confirmed password
+ */
+ meter : function( password1, blacklist, password2 ) {
+ if ( ! $.isArray( blacklist ) )
+ blacklist = [ blacklist.toString() ];
- //password < 4
- if ( password1.length < 4 )
- return shortPass
+ if (password1 != password2 && password2 && password2.length > 0)
+ return 5;
- //password1 == username
- if ( password1.toLowerCase() == username.toLowerCase() )
- return badPass;
+ var result = zxcvbn( password1, blacklist );
+ return result.score;
+ },
- if ( password1.match(/[0-9]/) )
- symbolSize +=10;
- if ( password1.match(/[a-z]/) )
- symbolSize +=26;
- if ( password1.match(/[A-Z]/) )
- symbolSize +=26;
- if ( password1.match(/[^a-zA-Z0-9]/) )
- symbolSize +=31;
+ /**
+ * Builds an array of data that should be penalized, because it would lower the entropy of a password if it were used
+ *
+ * @return array The array of data to be blacklisted
+ */
+ userInputBlacklist : function() {
+ var i, userInputFieldsLength, rawValuesLength, currentField,
+ rawValues = [],
+ blacklist = [],
+ userInputFields = [ 'user_login', 'first_name', 'last_name', 'nickname', 'display_name', 'email', 'url', 'description', 'weblog_title', 'admin_email' ];
- natLog = Math.log( Math.pow(symbolSize, password1.length) );
- score = natLog / Math.LN2;
+ // Collect all the strings we want to blacklist
+ rawValues.push( document.title );
+ rawValues.push( document.URL );
- if (score < 40 )
- return badPass
+ userInputFieldsLength = userInputFields.length;
+ for ( i = 0; i < userInputFieldsLength; i++ ) {
+ currentField = $( '#' + userInputFields[ i ] );
- if (score < 56 )
- return goodPass
+ if ( 0 === currentField.length ) {
+ continue;
+ }
- return strongPass;
-}
+ rawValues.push( currentField[0].defaultValue );
+ rawValues.push( currentField.val() );
+ }
+
+ // Strip out non-alphanumeric characters and convert each word to an individual entry
+ rawValuesLength = rawValues.length;
+ for ( i = 0; i < rawValuesLength; i++ ) {
+ if ( rawValues[ i ] ) {
+ blacklist = blacklist.concat( rawValues[ i ].replace( /\W/g, ' ' ).split( ' ' ) );
+ }
+ }
+
+ // Remove empty values, short words, and duplicates. Short words are likely to cause many false positives.
+ blacklist = $.grep( blacklist, function( value, key ) {
+ if ( '' === value || 4 > value.length ) {
+ return false;
+ }
+
+ return $.inArray( value, blacklist ) === key;
+ });
+
+ return blacklist;
+ }
+ };
+
+ // Backwards compatibility.
+ passwordStrength = wp.passwordStrength.meter;
+})(jQuery);
\ No newline at end of file
diff --git a/wp-admin/js/password-strength-meter.min.js b/wp-admin/js/password-strength-meter.min.js
index 957d454..da7ac00 100644
--- a/wp-admin/js/password-strength-meter.min.js
+++ b/wp-admin/js/password-strength-meter.min.js
@@ -1 +1 @@
-function passwordStrength(f,i,d){var k=1,h=2,b=3,a=4,c=5,g=0,j,e;if((f!=d)&&d.length>0){return c}if(f.length<4){return k}if(f.toLowerCase()==i.toLowerCase()){return h}if(f.match(/[0-9]/)){g+=10}if(f.match(/[a-z]/)){g+=26}if(f.match(/[A-Z]/)){g+=26}if(f.match(/[^a-zA-Z0-9]/)){g+=31}j=Math.log(Math.pow(g,f.length));e=j/Math.LN2;if(e<40){return h}if(e<56){return b}return a};
\ No newline at end of file
+window.wp=window.wp||{};var passwordStrength;!function(a){wp.passwordStrength={meter:function(b,c,d){if(a.isArray(c)||(c=[c.toString()]),b!=d&&d&&d.length>0)return 5;var e=zxcvbn(b,c);return e.score},userInputBlacklist:function(){var b,c,d,e,f=[],g=[],h=["user_login","first_name","last_name","nickname","display_name","email","url","description","weblog_title","admin_email"];for(f.push(document.title),f.push(document.URL),c=h.length,b=0;c>b;b++)e=a("#"+h[b]),0!==e.length&&(f.push(e[0].defaultValue),f.push(e.val()));for(d=f.length,b=0;d>b;b++)f[b]&&(g=g.concat(f[b].replace(/\W/g," ").split(" ")));return g=a.grep(g,function(b,c){return""===b||4>b.length?!1:a.inArray(b,g)===c})}},passwordStrength=wp.passwordStrength.meter}(jQuery);
\ No newline at end of file
diff --git a/wp-admin/js/plugin-install.js b/wp-admin/js/plugin-install.js
index f32574a..9f686fc 100644
--- a/wp-admin/js/plugin-install.js
+++ b/wp-admin/js/plugin-install.js
@@ -1,33 +1,44 @@
+/* global plugininstallL10n, tb_click, confirm */
+
/* Plugin Browser Thickbox related JS*/
var tb_position;
-jQuery(document).ready(function($) {
+jQuery( document ).ready( function( $ ) {
tb_position = function() {
- var tbWindow = $('#TB_window'), width = $(window).width(), H = $(window).height(), W = ( 720 < width ) ? 720 : width, adminbar_height = 0;
-
- if ( $('body.admin-bar').length )
- adminbar_height = 28;
+ var tbWindow = $( '#TB_window' ),
+ width = $( window ).width(),
+ H = $( window ).height() - ( ( 850 < width ) ? 60 : 20 ),
+ W = ( 850 < width ) ? 830 : width - 20;
if ( tbWindow.size() ) {
- tbWindow.width( W - 50 ).height( H - 45 - adminbar_height );
- $('#TB_iframeContent').width( W - 50 ).height( H - 75 - adminbar_height );
- tbWindow.css({'margin-left': '-' + parseInt((( W - 50 ) / 2),10) + 'px'});
- if ( typeof document.body.style.maxWidth != 'undefined' )
- tbWindow.css({'top': 20 + adminbar_height + 'px','margin-top':'0'});
- };
+ tbWindow.width( W ).height( H );
+ $( '#TB_iframeContent' ).width( W ).height( H );
+ tbWindow.css({
+ 'margin-left': '-' + parseInt( ( W / 2 ), 10 ) + 'px'
+ });
+ if ( typeof document.body.style.maxWidth !== 'undefined' ) {
+ tbWindow.css({
+ 'top': ( ( 850 < width ) ? 30 : 10 ) + 'px',
+ 'margin-top': '0'
+ });
+ }
+ }
- return $('a.thickbox').each( function() {
- var href = $(this).attr('href');
- if ( ! href )
+ return $( 'a.thickbox' ).each( function() {
+ var href = $( this ).attr( 'href' );
+ if ( ! href ) {
return;
- href = href.replace(/&width=[0-9]+/g, '');
- href = href.replace(/&height=[0-9]+/g, '');
- $(this).attr( 'href', href + '&width=' + ( W - 80 ) + '&height=' + ( H - 85 - adminbar_height ) );
+ }
+ href = href.replace( /&width=[0-9]+/g, '' );
+ href = href.replace( /&height=[0-9]+/g, '' );
+ $(this).attr( 'href', href + '&width=' + W + '&height=' + ( H ) );
});
};
- $(window).resize(function(){ tb_position(); });
+ $( window ).resize( function() {
+ tb_position();
+ });
- $('#dashboard_plugins a.thickbox, .plugins a.thickbox').click( function() {
+ $('.plugins').on( 'click', 'a.thickbox', function() {
tb_click.call(this);
$('#TB_title').css({'background-color':'#222','color':'#cfcfcf'});
@@ -36,18 +47,18 @@ jQuery(document).ready(function($) {
});
/* Plugin install related JS*/
- $('#plugin-information #sidemenu a').click( function() {
- var tab = $(this).attr('name');
+ $( '#plugin-information-tabs a' ).click( function( event ) {
+ var tab = $( this ).attr( 'name' );
+ event.preventDefault();
//Flip the tab
- $('#plugin-information-header a.current').removeClass('current');
- $(this).addClass('current');
+ $( '#plugin-information-tabs a.current' ).removeClass( 'current' );
+ $( this ).addClass( 'current' );
//Flip the content.
- $('#section-holder div.section').hide(); //Hide 'em all
- $('#section-' + tab).show();
- return false;
+ $( '#section-holder div.section' ).hide(); //Hide 'em all
+ $( '#section-' + tab ).show();
});
- $('a.install-now').click( function() {
+ $( 'a.install-now' ).click( function() {
return confirm( plugininstallL10n.ays );
});
});
diff --git a/wp-admin/js/plugin-install.min.js b/wp-admin/js/plugin-install.min.js
index 4d73265..dee8002 100644
--- a/wp-admin/js/plugin-install.min.js
+++ b/wp-admin/js/plugin-install.min.js
@@ -1 +1 @@
-var tb_position;jQuery(document).ready(function(a){tb_position=function(){var f=a("#TB_window"),e=a(window).width(),d=a(window).height(),c=(720
"+plugininstallL10n.plugin_information+" "+a(this).attr("title"));return false});a("#plugin-information #sidemenu a").click(function(){var b=a(this).attr("name");a("#plugin-information-header a.current").removeClass("current");a(this).addClass("current");a("#section-holder div.section").hide();a("#section-"+b).show();return false});a("a.install-now").click(function(){return confirm(plugininstallL10n.ays)})});
\ No newline at end of file
+var tb_position;jQuery(document).ready(function(a){tb_position=function(){var b=a("#TB_window"),c=a(window).width(),d=a(window).height()-(c>850?60:20),e=c>850?830:c-20;return b.size()&&(b.width(e).height(d),a("#TB_iframeContent").width(e).height(d),b.css({"margin-left":"-"+parseInt(e/2,10)+"px"}),"undefined"!=typeof document.body.style.maxWidth&&b.css({top:(c>850?30:10)+"px","margin-top":"0"})),a("a.thickbox").each(function(){var b=a(this).attr("href");b&&(b=b.replace(/&width=[0-9]+/g,""),b=b.replace(/&height=[0-9]+/g,""),a(this).attr("href",b+"&width="+e+"&height="+d))})},a(window).resize(function(){tb_position()}),a(".plugins").on("click","a.thickbox",function(){return tb_click.call(this),a("#TB_title").css({"background-color":"#222",color:"#cfcfcf"}),a("#TB_ajaxWindowTitle").html(""+plugininstallL10n.plugin_information+" "+a(this).attr("title")),!1}),a("#plugin-information-tabs a").click(function(b){var c=a(this).attr("name");b.preventDefault(),a("#plugin-information-tabs a.current").removeClass("current"),a(this).addClass("current"),a("#section-holder div.section").hide(),a("#section-"+c).show()}),a("a.install-now").click(function(){return confirm(plugininstallL10n.ays)})});
\ No newline at end of file
diff --git a/wp-admin/js/post.js b/wp-admin/js/post.js
index 98b7942..21f28e7 100644
--- a/wp-admin/js/post.js
+++ b/wp-admin/js/post.js
@@ -1,4 +1,11 @@
-var tagBox, commentsBox, editPermalink, makeSlugeditClickable, WPSetThumbnailHTML, WPSetThumbnailID, WPRemoveThumbnail, wptitlehint;
+/* global postL10n, ajaxurl, wpAjax, setPostThumbnailL10n, postboxes, pagenow, tinymce, alert, deleteUserSetting */
+/* global theList:true, theExtraList:true, getUserSetting, setUserSetting */
+
+var tagBox, commentsBox, WPSetThumbnailHTML, WPSetThumbnailID, WPRemoveThumbnail, wptitlehint, makeSlugeditClickable, editPermalink;
+// Back-compat: prevent fatal errors
+makeSlugeditClickable = editPermalink = function(){};
+
+window.wp = window.wp || {};
// return an array with any duplicate, whitespace or values removed
function array_unique_noempty(a) {
@@ -11,7 +18,8 @@ function array_unique_noempty(a) {
return out;
}
-(function($){
+( function($) {
+ var titleHasFocus = false;
tagBox = {
clean : function(tags) {
@@ -81,11 +89,11 @@ tagBox = {
},
flushTags : function(el, a, f) {
- a = a || false;
- var tags = $('.the-tags', el),
+ var tagsval, newtags, text,
+ tags = $('.the-tags', el),
newtag = $('input.newtag', el),
- comma = postL10n.comma,
- newtags, text;
+ comma = postL10n.comma;
+ a = a || false;
text = a ? $(a).text() : newtag.val();
tagsval = tags.val();
@@ -108,7 +116,7 @@ tagBox = {
var tax = id.substr(id.indexOf('-')+1);
$.post(ajaxurl, {'action':'get-tagcloud', 'tax':tax}, function(r, stat) {
- if ( 0 == r || 'success' != stat )
+ if ( 0 === r || 'success' != stat )
r = wpAjax.broken;
r = $(''+r+'
');
@@ -137,7 +145,7 @@ tagBox = {
});
$('input.newtag', ajaxtag).blur(function() {
- if ( this.value == '' )
+ if ( '' === this.value )
$(this).parent().siblings('.taghint').css('visibility', '');
}).focus(function(){
$(this).parent().siblings('.taghint').css('visibility', 'hidden');
@@ -206,7 +214,7 @@ commentsBox = {
$('#the-comment-list').append( r.responses[0].data );
theList = theExtraList = null;
- $("a[className*=':']").unbind();
+ $( 'a[className*=\':\']' ).unbind();
if ( commentsBox.st > commentsBox.total )
$('#show-comments').hide();
@@ -240,7 +248,7 @@ WPSetThumbnailID = function(id){
WPRemoveThumbnail = function(nonce){
$.post(ajaxurl, {
- action:"set-post-thumbnail", post_id: $('#post_ID').val(), thumbnail_id: -1, _ajax_nonce: nonce, cookie: encodeURIComponent(document.cookie)
+ action: 'set-post-thumbnail', post_id: $( '#post_ID' ).val(), thumbnail_id: -1, _ajax_nonce: nonce, cookie: encodeURIComponent( document.cookie )
}, function(str){
if ( str == '0' ) {
alert( setPostThumbnailL10n.error );
@@ -251,13 +259,317 @@ WPRemoveThumbnail = function(nonce){
);
};
-})(jQuery);
+$(document).on( 'heartbeat-send.refresh-lock', function( e, data ) {
+ var lock = $('#active_post_lock').val(),
+ post_id = $('#post_ID').val(),
+ send = {};
+
+ if ( ! post_id || ! $('#post-lock-dialog').length )
+ return;
+
+ send.post_id = post_id;
+
+ if ( lock )
+ send.lock = lock;
+
+ data['wp-refresh-post-lock'] = send;
+
+}).on( 'heartbeat-tick.refresh-lock', function( e, data ) {
+ // Post locks: update the lock string or show the dialog if somebody has taken over editing
+ var received, wrap, avatar;
+
+ if ( data['wp-refresh-post-lock'] ) {
+ received = data['wp-refresh-post-lock'];
+
+ if ( received.lock_error ) {
+ // show "editing taken over" message
+ wrap = $('#post-lock-dialog');
+
+ if ( wrap.length && ! wrap.is(':visible') ) {
+ if ( wp.autosave ) {
+ // Save the latest changes and disable
+ $(document).one( 'heartbeat-tick', function() {
+ wp.autosave.server.suspend();
+ wrap.removeClass('saving').addClass('saved');
+ $(window).off( 'beforeunload.edit-post' );
+ });
+
+ wrap.addClass('saving');
+ wp.autosave.server.triggerSave();
+ }
+
+ if ( received.lock_error.avatar_src ) {
+ avatar = $('' +
- $('option[value="' + $('#mm').val() + '"]', '#mm').text() + ' ' +
- jj + ', ' +
- aa + ' @ ' +
- hh + ':' +
- mn + ' '
+ postL10n.dateFormat.replace( '%1$s', $('option[value="' + $('#mm').val() + '"]', '#mm').text() )
+ .replace( '%2$s', jj )
+ .replace( '%3$s', aa )
+ .replace( '%4$s', hh )
+ .replace( '%5$s', mn ) +
+ ' '
);
}
- if ( $('input:radio:checked', '#post-visibility-select').val() == 'private' ) {
+ if ( $postVisibilitySelect.find('input:radio:checked').val() == 'private' ) {
$('#publish').val( postL10n.update );
- if ( optPublish.length == 0 ) {
+ if ( 0 === optPublish.length ) {
postStatus.append('' + postL10n.privatelyPublished + ' ');
} else {
optPublish.html( postL10n.privatelyPublished );
}
$('option[value="publish"]', postStatus).prop('selected', true);
- $('.edit-post-status', '#misc-publishing-actions').hide();
+ $('#misc-publishing-actions .edit-post-status').hide();
} else {
if ( $('#original_post_status').val() == 'future' || $('#original_post_status').val() == 'draft' ) {
if ( optPublish.length ) {
@@ -450,7 +753,7 @@ jQuery(document).ready( function($) {
optPublish.html( postL10n.published );
}
if ( postStatus.is(':hidden') )
- $('.edit-post-status', '#misc-publishing-actions').show();
+ $('#misc-publishing-actions .edit-post-status').show();
}
$('#post-status-display').html($('option:selected', postStatus).text());
if ( $('option:selected', postStatus).val() == 'private' || $('option:selected', postStatus).val() == 'publish' ) {
@@ -464,184 +767,197 @@ jQuery(document).ready( function($) {
}
}
return true;
- }
+ };
- $('.edit-visibility', '#visibility').click(function () {
- if ($('#post-visibility-select').is(":hidden")) {
+ $( '#visibility .edit-visibility').click( function () {
+ if ( $postVisibilitySelect.is(':hidden') ) {
updateVisibility();
- $('#post-visibility-select').slideDown('fast');
+ $postVisibilitySelect.slideDown('fast').find('input[type="radio"]').first().focus();
$(this).hide();
}
return false;
});
- $('.cancel-post-visibility', '#post-visibility-select').click(function () {
- $('#post-visibility-select').slideUp('fast');
+ $postVisibilitySelect.find('.cancel-post-visibility').click( function( event ) {
+ $postVisibilitySelect.slideUp('fast');
$('#visibility-radio-' + $('#hidden-post-visibility').val()).prop('checked', true);
- $('#post_password').val($('#hidden_post_password').val());
+ $('#post_password').val($('#hidden-post-password').val());
$('#sticky').prop('checked', $('#hidden-post-sticky').prop('checked'));
$('#post-visibility-display').html(visibility);
- $('.edit-visibility', '#visibility').show();
+ $('#visibility .edit-visibility').show().focus();
updateText();
- return false;
+ event.preventDefault();
});
- $('.save-post-visibility', '#post-visibility-select').click(function () { // crazyhorse - multiple ok cancels
- var pvSelect = $('#post-visibility-select');
-
- pvSelect.slideUp('fast');
- $('.edit-visibility', '#visibility').show();
+ $postVisibilitySelect.find('.save-post-visibility').click( function( event ) { // crazyhorse - multiple ok cancels
+ $postVisibilitySelect.slideUp('fast');
+ $('#visibility .edit-visibility').show();
updateText();
- if ( $('input:radio:checked', pvSelect).val() != 'public' ) {
+ if ( $postVisibilitySelect.find('input:radio:checked').val() != 'public' ) {
$('#sticky').prop('checked', false);
} // WEAPON LOCKED
- if ( true == $('#sticky').prop('checked') ) {
+ if ( $('#sticky').prop('checked') ) {
sticky = 'Sticky';
} else {
sticky = '';
}
- $('#post-visibility-display').html( postL10n[$('input:radio:checked', pvSelect).val() + sticky] );
- return false;
+ $('#post-visibility-display').html( postL10n[ $postVisibilitySelect.find('input:radio:checked').val() + sticky ] );
+ event.preventDefault();
});
- $('input:radio', '#post-visibility-select').change(function() {
+ $postVisibilitySelect.find('input:radio').change( function() {
updateVisibility();
});
- $('#timestampdiv').siblings('a.edit-timestamp').click(function() {
- if ($('#timestampdiv').is(":hidden")) {
- $('#timestampdiv').slideDown('fast');
+ $timestampdiv.siblings('a.edit-timestamp').click( function( event ) {
+ if ( $timestampdiv.is( ':hidden' ) ) {
+ $timestampdiv.slideDown('fast');
$('#mm').focus();
$(this).hide();
}
- return false;
+ event.preventDefault();
});
- $('.cancel-timestamp', '#timestampdiv').click(function() {
- $('#timestampdiv').slideUp('fast');
+ $timestampdiv.find('.cancel-timestamp').click( function( event ) {
+ $timestampdiv.slideUp('fast').siblings('a.edit-timestamp').show().focus();
$('#mm').val($('#hidden_mm').val());
$('#jj').val($('#hidden_jj').val());
$('#aa').val($('#hidden_aa').val());
$('#hh').val($('#hidden_hh').val());
$('#mn').val($('#hidden_mn').val());
- $('#timestampdiv').siblings('a.edit-timestamp').show();
updateText();
- return false;
+ event.preventDefault();
});
- $('.save-timestamp', '#timestampdiv').click(function () { // crazyhorse - multiple ok cancels
+ $timestampdiv.find('.save-timestamp').click( function( event ) { // crazyhorse - multiple ok cancels
if ( updateText() ) {
- $('#timestampdiv').slideUp('fast');
- $('#timestampdiv').siblings('a.edit-timestamp').show();
+ $timestampdiv.slideUp('fast');
+ $timestampdiv.siblings('a.edit-timestamp').show();
}
- return false;
+ event.preventDefault();
});
- $('#post').on( 'submit', function(e){
+ $('#post').on( 'submit', function( event ) {
if ( ! updateText() ) {
- e.preventDefault();
- $('#timestampdiv').show();
+ event.preventDefault();
+ $timestampdiv.show();
+
+ if ( wp.autosave ) {
+ wp.autosave.enableButtons();
+ }
+
$('#publishing-action .spinner').hide();
- $('#publish').prop('disabled', false).removeClass('button-primary-disabled');
- return false;
}
});
- $('#post-status-select').siblings('a.edit-post-status').click(function() {
- if ($('#post-status-select').is(":hidden")) {
- $('#post-status-select').slideDown('fast');
+ $postStatusSelect.siblings('a.edit-post-status').click( function( event ) {
+ if ( $postStatusSelect.is( ':hidden' ) ) {
+ $postStatusSelect.slideDown('fast').find('select').focus();
$(this).hide();
}
- return false;
+ event.preventDefault();
});
- $('.save-post-status', '#post-status-select').click(function() {
- $('#post-status-select').slideUp('fast');
- $('#post-status-select').siblings('a.edit-post-status').show();
+ $postStatusSelect.find('.save-post-status').click( function( event ) {
+ $postStatusSelect.slideUp('fast').siblings('a.edit-post-status').show();
updateText();
- return false;
+ event.preventDefault();
});
- $('.cancel-post-status', '#post-status-select').click(function() {
- $('#post-status-select').slideUp('fast');
- $('#post_status').val($('#hidden_post_status').val());
- $('#post-status-select').siblings('a.edit-post-status').show();
+ $postStatusSelect.find('.cancel-post-status').click( function( event ) {
+ $('#post-status-select').slideUp('fast').siblings( 'a.edit-post-status' ).show().focus();
+ $('#post_status').val( $('#hidden_post_status').val() );
updateText();
- return false;
+ event.preventDefault();
});
} // end submitdiv
// permalink
- if ( $('#edit-slug-box').length ) {
- editPermalink = function(post_id) {
- var i, c = 0, e = $('#editable-post-name'), revert_e = e.html(), real_slug = $('#post_name'), revert_slug = real_slug.val(), b = $('#edit-slug-buttons'), revert_b = b.html(), full = $('#editable-post-name-full').html();
+ function editPermalink() {
+ var i, slug_value,
+ c = 0,
+ e = $('#editable-post-name'),
+ revert_e = e.html(),
+ real_slug = $('#post_name'),
+ revert_slug = real_slug.val(),
+ b = $('#edit-slug-buttons'),
+ revert_b = b.html(),
+ full = $('#editable-post-name-full').html();
- $('#view-post-btn').hide();
- b.html(''+postL10n.ok+' '+postL10n.cancel+' ');
- b.children('.save').click(function() {
- var new_slug = e.children('input').val();
- if ( new_slug == $('#editable-post-name-full').text() ) {
- return $('.cancel', '#edit-slug-buttons').click();
- }
- $.post(ajaxurl, {
- action: 'sample-permalink',
- post_id: post_id,
- new_slug: new_slug,
- new_title: $('#title').val(),
- samplepermalinknonce: $('#samplepermalinknonce').val()
- }, function(data) {
- $('#edit-slug-box').html(data);
- b.html(revert_b);
- real_slug.val(new_slug);
- makeSlugeditClickable();
- $('#view-post-btn').show();
- });
- return false;
- });
-
- $('.cancel', '#edit-slug-buttons').click(function() {
- $('#view-post-btn').show();
- e.html(revert_e);
- b.html(revert_b);
- real_slug.val(revert_slug);
- return false;
- });
-
- for ( i = 0; i < full.length; ++i ) {
- if ( '%' == full.charAt(i) )
- c++;
+ $('#view-post-btn').hide();
+ b.html(''+postL10n.ok+' '+postL10n.cancel+' ');
+ b.children('.save').click(function() {
+ var new_slug = e.children('input').val();
+ if ( new_slug == $('#editable-post-name-full').text() ) {
+ return $('#edit-slug-buttons .cancel').click();
}
-
- slug_value = ( c > full.length / 4 ) ? '' : full;
- e.html('
');
- $('#wp-content-wrap').append(el);
- el.on('mousedown', function(e) {
- offset = textarea.height() - e.pageY;
- textarea.blur();
- $(document).mousemove(dragging).mouseup(endDrag);
- return false;
- });
- })();
-
- if ( typeof(tinymce) != 'undefined' ) {
- tinymce.onAddEditor.add(function(mce, ed){
- // iOS expands the iframe to full height and the user cannot adjust it.
- if ( ed.id != 'content' || tinymce.isIOS5 )
- return;
-
- function getHeight() {
- var height, node = document.getElementById('content_ifr'),
- ifr_height = node ? parseInt( node.style.height, 10 ) : 0,
- tb_height = $('#content_tbl tr.mceFirst').height();
-
- if ( !ifr_height || !tb_height )
- return false;
-
- // total height including toolbar and statusbar
- height = ifr_height + tb_height + 21;
- // textarea height = total height - 33px toolbar
- height -= 33;
-
- return height;
+ function dragging( event ) {
+ if ( mce ) {
+ editor.theme.resizeTo( null, offset + event.pageY );
+ } else {
+ $textarea.height( Math.max( 50, offset + event.pageY ) );
}
- // resize TinyMCE to match the textarea height when switching Text -> Visual
- ed.onLoadContent.add( function(ed, o) {
- var ifr_height, node = document.getElementById('content'),
- height = node ? parseInt( node.style.height, 10 ) : 0,
- tb_height = $('#content_tbl tr.mceFirst').height() || 33;
+ event.preventDefault();
+ }
- // height cannot be under 50 or over 5000
- if ( !height || height < 50 || height > 5000 )
- height = 360; // default height for the main editor
+ function endDrag() {
+ var height, toolbarHeight;
- if ( getUserSetting( 'ed_size' ) > 5000 )
- setUserSetting( 'ed_size', 360 );
+ if ( mce ) {
+ editor.focus();
+ toolbarHeight = parseInt( $( '#wp-content-editor-container .mce-toolbar-grp' ).height(), 10 );
- // compensate for padding and toolbars
- ifr_height = ( height - tb_height ) + 12;
-
- // sanity check
- if ( ifr_height > 50 && ifr_height < 5000 ) {
- $('#content_tbl').css('height', '' );
- $('#content_ifr').css('height', ifr_height + 'px' );
+ if ( toolbarHeight < 10 || toolbarHeight > 200 ) {
+ toolbarHeight = 30;
}
- });
- // resize the textarea to match TinyMCE's height when switching Visual -> Text
- ed.onSaveContent.add( function(ed, o) {
- var height = getHeight();
+ height = parseInt( $('#content_ifr').css('height'), 10 ) + toolbarHeight - 28;
+ } else {
+ $textarea.focus();
+ height = parseInt( $textarea.css('height'), 10 );
+ }
- if ( !height || height < 50 || height > 5000 )
- return;
+ $document.off( '.wp-editor-resize' );
- $('textarea#content').css( 'height', height + 'px' );
- });
+ // sanity check
+ if ( height && height > 50 && height < 5000 ) {
+ setUserSetting( 'ed_size', height );
+ }
+ }
- // save on resizing TinyMCE
- ed.onPostRender.add(function() {
- $('#content_resize').on('mousedown.wp-mce-resize', function(e){
- $(document).on('mouseup.wp-mce-resize', function(e){
- var height;
+ $textarea.css( 'resize', 'none' );
- $(document).off('mouseup.wp-mce-resize');
+ $handle.on( 'mousedown.wp-editor-resize', function( event ) {
+ if ( typeof tinymce !== 'undefined' ) {
+ editor = tinymce.get('content');
+ }
- height = getHeight();
- // sanity check
- if ( height && height > 50 && height < 5000 )
- setUserSetting( 'ed_size', height );
- });
- });
- });
+ if ( editor && ! editor.isHidden() ) {
+ mce = true;
+ offset = $('#content_ifr').height() - event.pageY;
+ } else {
+ mce = false;
+ offset = $textarea.height() - event.pageY;
+ $textarea.blur();
+ }
+
+ $document.on( 'mousemove.wp-editor-resize', dragging )
+ .on( 'mouseup.wp-editor-resize mouseleave.wp-editor-resize', endDrag );
+
+ event.preventDefault();
+ }).on( 'mouseup.wp-editor-resize', endDrag );
+ })();
+
+ if ( typeof tinymce !== 'undefined' ) {
+ // When changing post formats, change the editor body class
+ $( '#post-formats-select input.post-format' ).on( 'change.set-editor-class', function() {
+ var editor, body, format = this.id;
+
+ if ( format && $( this ).prop('checked') ) {
+ editor = tinymce.get( 'content' );
+
+ if ( editor ) {
+ body = editor.getBody();
+ body.className = body.className.replace( /\bpost-format-[^ ]+/, '' );
+ editor.dom.addClass( body, format == 'post-format-0' ? 'post-format-standard' : format );
+ }
+ }
});
}
});
diff --git a/wp-admin/js/post.min.js b/wp-admin/js/post.min.js
index 2fa2b0c..da6463e 100644
--- a/wp-admin/js/post.min.js
+++ b/wp-admin/js/post.min.js
@@ -1 +1 @@
-var tagBox,commentsBox,editPermalink,makeSlugeditClickable,WPSetThumbnailHTML,WPSetThumbnailID,WPRemoveThumbnail,wptitlehint;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(c){var b=postL10n.comma;if(","!==b){c=c.replace(new RegExp(b,"g"),",")}c=c.replace(/\s*,\s*/g,",").replace(/,+/g,",").replace(/[,\s]+$/,"").replace(/^[,\s]+/,"");if(","!==b){c=c.replace(/,/g,b)}return c},parseTags:function(f){var i=f.id,c=i.split("-check-num-")[1],e=a(f).closest(".tagsdiv"),h=e.find(".the-tags"),b=postL10n.comma,d=h.val().split(b),g=[];delete d[c];a.each(d,function(j,k){k=a.trim(k);if(k){g.push(k)}});h.val(this.clean(g.join(b)));this.quickClicks(e);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.prop("disabled");b=g.val().split(postL10n.comma);e.empty();a.each(b,function(i,k){var j,h;k=a.trim(k);if(!k){return}j=a("X ');h.click(function(){tagBox.parseTags(this)});j.prepend(" ").prepend(h)}e.append(j)})},flushTags:function(g,c,h){c=c||false;var d=a(".the-tags",g),j=a("input.newtag",g),b=postL10n.comma,e,i;i=c?a(c).text():j.val();tagsval=d.val();e=tagsval?tagsval+b+i:i;e=this.clean(e);e=array_unique_noempty(e.split(b)).join(b);d.val(e);this.quickClicks(g);if(!c){j.val("")}if("undefined"==typeof(h)){j.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(''+e+"
");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:postL10n.comma+" "})});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 .spinner").show();e={action:"get-comments",mode:"single",_ajax_nonce:a("#add_comment_nonce").val(),p:a("#post_ID").val(),start:b,number:c};a.post(ajaxurl,e,function(f){f=wpAjax.parseAjaxResponse(f);a("#commentsdiv .widefat").show();a("#commentsdiv .spinner").hide();if("object"==typeof f&&f.responses[0]){a("#the-comment-list").append(f.responses[0].data);theList=theExtraList=null;a("a[className*=':']").unbind();if(commentsBox.st>commentsBox.total){a("#show-comments").hide()}else{a("#show-comments").show().children("a").html(postL10n.showcomm)}return}else{if(1==f){a("#show-comments").html(postL10n.endcomm);return}}a("#the-comment-list").append(''+wpAjax.broken+" "+f('option[value="'+f("#mm").val()+'"]',"#mm").text()+" "+o+", "+i+" @ "+m+":"+l+" ")}if(f("input:radio:checked","#post-visibility-select").val()=="private"){f("#publish").val(postL10n.update);if(k.length==0){r.append(''+postL10n.privatelyPublished+" ")}else{k.html(postL10n.privatelyPublished)}f('option[value="publish"]',r).prop("selected",true);f(".edit-post-status","#misc-publishing-actions").hide()}else{if(f("#original_post_status").val()=="future"||f("#original_post_status").val()=="draft"){if(k.length){k.remove();r.val(f("#hidden_post_status").val())}}else{k.html(postL10n.published)}if(r.is(":hidden")){f(".edit-post-status","#misc-publishing-actions").show()}}f("#post-status-display").html(f("option:selected",r).text());if(f("option:selected",r).val()=="private"||f("option:selected",r).val()=="publish"){f("#save-post").hide()}else{f("#save-post").show();if(f("option:selected",r).val()=="pending"){f("#save-post").show().val(postL10n.savePending)}else{f("#save-post").show().val(postL10n.saveDraft)}}return true}f(".edit-visibility","#visibility").click(function(){if(f("#post-visibility-select").is(":hidden")){d();f("#post-visibility-select").slideDown("fast");f(this).hide()}return false});f(".cancel-post-visibility","#post-visibility-select").click(function(){f("#post-visibility-select").slideUp("fast");f("#visibility-radio-"+f("#hidden-post-visibility").val()).prop("checked",true);f("#post_password").val(f("#hidden_post_password").val());f("#sticky").prop("checked",f("#hidden-post-sticky").prop("checked"));f("#post-visibility-display").html(a);f(".edit-visibility","#visibility").show();c();return false});f(".save-post-visibility","#post-visibility-select").click(function(){var i=f("#post-visibility-select");i.slideUp("fast");f(".edit-visibility","#visibility").show();c();if(f("input:radio:checked",i).val()!="public"){f("#sticky").prop("checked",false)}if(true==f("#sticky").prop("checked")){g="Sticky"}else{g=""}f("#post-visibility-display").html(postL10n[f("input:radio:checked",i).val()+g]);return false});f("input:radio","#post-visibility-select").change(function(){d()});f("#timestampdiv").siblings("a.edit-timestamp").click(function(){if(f("#timestampdiv").is(":hidden")){f("#timestampdiv").slideDown("fast");f("#mm").focus();f(this).hide()}return false});f(".cancel-timestamp","#timestampdiv").click(function(){f("#timestampdiv").slideUp("fast");f("#mm").val(f("#hidden_mm").val());f("#jj").val(f("#hidden_jj").val());f("#aa").val(f("#hidden_aa").val());f("#hh").val(f("#hidden_hh").val());f("#mn").val(f("#hidden_mn").val());f("#timestampdiv").siblings("a.edit-timestamp").show();c();return false});f(".save-timestamp","#timestampdiv").click(function(){if(c()){f("#timestampdiv").slideUp("fast");f("#timestampdiv").siblings("a.edit-timestamp").show()}return false});f("#post").on("submit",function(i){if(!c()){i.preventDefault();f("#timestampdiv").show();f("#publishing-action .spinner").hide();f("#publish").prop("disabled",false).removeClass("button-primary-disabled");return false}});f("#post-status-select").siblings("a.edit-post-status").click(function(){if(f("#post-status-select").is(":hidden")){f("#post-status-select").slideDown("fast");f(this).hide()}return false});f(".save-post-status","#post-status-select").click(function(){f("#post-status-select").slideUp("fast");f("#post-status-select").siblings("a.edit-post-status").show();c();return false});f(".cancel-post-status","#post-status-select").click(function(){f("#post-status-select").slideUp("fast");f("#post_status").val(f("#hidden_post_status").val());f("#post-status-select").siblings("a.edit-post-status").show();c();return false})}if(f("#edit-slug-box").length){editPermalink=function(j){var k,n=0,m=f("#editable-post-name"),o=m.html(),r=f("#post_name"),s=r.val(),p=f("#edit-slug-buttons"),q=p.html(),l=f("#editable-post-name-full").html();f("#view-post-btn").hide();p.html(''+postL10n.ok+' '+postL10n.cancel+" ");p.children(".save").click(function(){var i=m.children("input").val();if(i==f("#editable-post-name-full").text()){return f(".cancel","#edit-slug-buttons").click()}f.post(ajaxurl,{action:"sample-permalink",post_id:j,new_slug:i,new_title:f("#title").val(),samplepermalinknonce:f("#samplepermalinknonce").val()},function(t){f("#edit-slug-box").html(t);p.html(q);r.val(i);makeSlugeditClickable();f("#view-post-btn").show()});return false});f(".cancel","#edit-slug-buttons").click(function(){f("#view-post-btn").show();m.html(o);p.html(q);r.val(s);return false});for(k=0;kl.length/4)?"":l;m.html('
');f("#wp-content-wrap").append(j);j.on("mousedown",function(n){l=i.height()-n.pageY;i.blur();f(document).mousemove(k).mouseup(m);return false})})();if(typeof(tinymce)!="undefined"){tinymce.onAddEditor.add(function(i,j){if(j.id!="content"||tinymce.isIOS5){return}function k(){var l,m=document.getElementById("content_ifr"),o=m?parseInt(m.style.height,10):0,n=f("#content_tbl tr.mceFirst").height();if(!o||!n){return false}l=o+n+21;l-=33;return l}j.onLoadContent.add(function(m,q){var r,n=document.getElementById("content"),l=n?parseInt(n.style.height,10):0,p=f("#content_tbl tr.mceFirst").height()||33;if(!l||l<50||l>5000){l=360}if(getUserSetting("ed_size")>5000){setUserSetting("ed_size",360)}r=(l-p)+12;if(r>50&&r<5000){f("#content_tbl").css("height","");f("#content_ifr").css("height",r+"px")}});j.onSaveContent.add(function(m,n){var l=k();if(!l||l<50||l>5000){return}f("textarea#content").css("height",l+"px")});j.onPostRender.add(function(){f("#content_resize").on("mousedown.wp-mce-resize",function(l){f(document).on("mouseup.wp-mce-resize",function(n){var m;f(document).off("mouseup.wp-mce-resize");m=k();if(m&&m>50&&m<5000){setUserSetting("ed_size",m)}})})})})}});
\ No newline at end of file
+function array_unique_noempty(a){var b=[];return jQuery.each(a,function(a,c){c=jQuery.trim(c),c&&-1==jQuery.inArray(c,b)&&b.push(c)}),b}var tagBox,commentsBox,WPSetThumbnailHTML,WPSetThumbnailID,WPRemoveThumbnail,wptitlehint,makeSlugeditClickable,editPermalink;makeSlugeditClickable=editPermalink=function(){},window.wp=window.wp||{},function(a){var b=!1;tagBox={clean:function(a){var b=postL10n.comma;return","!==b&&(a=a.replace(new RegExp(b,"g"),",")),a=a.replace(/\s*,\s*/g,",").replace(/,+/g,",").replace(/[,\s]+$/,"").replace(/^[,\s]+/,""),","!==b&&(a=a.replace(/,/g,b)),a},parseTags:function(b){var c=b.id,d=c.split("-check-num-")[1],e=a(b).closest(".tagsdiv"),f=e.find(".the-tags"),g=postL10n.comma,h=f.val().split(g),i=[];return delete h[d],a.each(h,function(b,c){c=a.trim(c),c&&i.push(c)}),f.val(this.clean(i.join(g))),this.quickClicks(e),!1},quickClicks:function(b){var c,d,e=a(".the-tags",b),f=a(".tagchecklist",b),g=a(b).attr("id");e.length&&(d=e.prop("disabled"),c=e.val().split(postL10n.comma),f.empty(),a.each(c,function(b,c){var e,h;c=a.trim(c),c&&(e=a("X '),h.click(function(){tagBox.parseTags(this)}),e.prepend(" ").prepend(h)),f.append(e))}))},flushTags:function(b,c,d){var e,f,g,h=a(".the-tags",b),i=a("input.newtag",b),j=postL10n.comma;return c=c||!1,g=c?a(c).text():i.val(),e=h.val(),f=e?e+j+g:g,f=this.clean(f),f=array_unique_noempty(f.split(j)).join(j),h.val(f),this.quickClicks(b),c||i.val(""),"undefined"==typeof d&&i.focus(),!1},get:function(b){var c=b.substr(b.indexOf("-")+1);a.post(ajaxurl,{action:"get-tagcloud",tax:c},function(d,e){(0===d||"success"!=e)&&(d=wpAjax.broken),d=a(''+d+"
"),a("a",d).click(function(){return tagBox.flushTags(a(this).closest(".inside").children(".tagsdiv"),this),!1}),a("#"+b).after(d)})},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(){""===this.value&&a(this).parent().siblings(".taghint").css("visibility","")}).focus(function(){a(this).parent().siblings(".taghint").css("visibility","hidden")}).keyup(function(b){return 13==b.which?(tagBox.flushTags(a(this).closest(".tagsdiv")),!1):void 0}).keypress(function(a){return 13==a.which?(a.preventDefault(),!1):void 0}).each(function(){var b=a(this).closest("div.tagsdiv").attr("id");a(this).suggest(ajaxurl+"?action=ajax-tag-search&tax="+b,{delay:500,minchars:2,multiple:!0,multipleSep:postL10n.comma+" "})}),a("#post").submit(function(){a("div.tagsdiv").each(function(){tagBox.flushTags(this,!1,1)})}),a("a.tagcloud-link").click(function(){return tagBox.get(a(this).attr("id")),a(this).unbind().click(function(){return a(this).siblings(".the-tagcloud").toggle(),!1}),!1})}},commentsBox={st:0,get:function(b,c){var d,e=this.st;return c||(c=20),this.st+=c,this.total=b,a("#commentsdiv .spinner").show(),d={action:"get-comments",mode:"single",_ajax_nonce:a("#add_comment_nonce").val(),p:a("#post_ID").val(),start:e,number:c},a.post(ajaxurl,d,function(b){return b=wpAjax.parseAjaxResponse(b),a("#commentsdiv .widefat").show(),a("#commentsdiv .spinner").hide(),"object"==typeof b&&b.responses[0]?(a("#the-comment-list").append(b.responses[0].data),theList=theExtraList=null,a("a[className*=':']").unbind(),void(commentsBox.st>commentsBox.total?a("#show-comments").hide():a("#show-comments").show().children("a").html(postL10n.showcomm))):1==b?void a("#show-comments").html(postL10n.endcomm):void a("#the-comment-list").append(''+wpAjax.broken+" '+postL10n.ok+' '+postL10n.cancel+" "),i.children(".save").click(function(){var b=e.children("input").val();return b==a("#editable-post-name-full").text()?a("#edit-slug-buttons .cancel").click():(a.post(ajaxurl,{action:"sample-permalink",post_id:m,new_slug:b,new_title:a("#title").val(),samplepermalinknonce:a("#samplepermalinknonce").val()},function(c){var d=a("#edit-slug-box");d.html(c),d.hasClass("hidden")&&d.fadeIn("fast",function(){d.removeClass("hidden")}),i.html(j),g.val(b),a("#view-post-btn").show()}),!1)}),a("#edit-slug-buttons .cancel").click(function(){return a("#view-post-btn").show(),e.html(f),i.html(j),g.val(h),!1}),b=0;bk.length/4?"":k,e.html('"+postL10n.dateFormat.replace("%1$s",a('option[value="'+a("#mm").val()+'"]',"#mm").text()).replace("%2$s",k).replace("%3$s",i).replace("%4$s",l).replace("%5$s",m)+" "),"private"==p.find("input:radio:checked").val()?(a("#publish").val(postL10n.update),0===h.length?g.append(''+postL10n.privatelyPublished+" "):h.html(postL10n.privatelyPublished),a('option[value="publish"]',g).prop("selected",!0),a("#misc-publishing-actions .edit-post-status").hide()):("future"==a("#original_post_status").val()||"draft"==a("#original_post_status").val()?h.length&&(h.remove(),g.val(a("#hidden_post_status").val())):h.html(postL10n.published),g.is(":hidden")&&a("#misc-publishing-actions .edit-post-status").show()),a("#post-status-display").html(a("option:selected",g).text()),"private"==a("option:selected",g).val()||"publish"==a("option:selected",g).val()?a("#save-post").hide():(a("#save-post").show(),a("#save-post").show().val("pending"==a("option:selected",g).val()?postL10n.savePending:postL10n.saveDraft)),!0)},a("#visibility .edit-visibility").click(function(){return p.is(":hidden")&&(f(),p.slideDown("fast").find('input[type="radio"]').first().focus(),a(this).hide()),!1}),p.find(".cancel-post-visibility").click(function(b){p.slideUp("fast"),a("#visibility-radio-"+a("#hidden-post-visibility").val()).prop("checked",!0),a("#post_password").val(a("#hidden-post-password").val()),a("#sticky").prop("checked",a("#hidden-post-sticky").prop("checked")),a("#post-visibility-display").html(d),a("#visibility .edit-visibility").show().focus(),g(),b.preventDefault()}),p.find(".save-post-visibility").click(function(b){p.slideUp("fast"),a("#visibility .edit-visibility").show(),g(),"public"!=p.find("input:radio:checked").val()&&a("#sticky").prop("checked",!1),h=a("#sticky").prop("checked")?"Sticky":"",a("#post-visibility-display").html(postL10n[p.find("input:radio:checked").val()+h]),b.preventDefault()}),p.find("input:radio").change(function(){f()}),q.siblings("a.edit-timestamp").click(function(b){q.is(":hidden")&&(q.slideDown("fast"),a("#mm").focus(),a(this).hide()),b.preventDefault()}),q.find(".cancel-timestamp").click(function(b){q.slideUp("fast").siblings("a.edit-timestamp").show().focus(),a("#mm").val(a("#hidden_mm").val()),a("#jj").val(a("#hidden_jj").val()),a("#aa").val(a("#hidden_aa").val()),a("#hh").val(a("#hidden_hh").val()),a("#mn").val(a("#hidden_mn").val()),g(),b.preventDefault()}),q.find(".save-timestamp").click(function(a){g()&&(q.slideUp("fast"),q.siblings("a.edit-timestamp").show()),a.preventDefault()}),a("#post").on("submit",function(b){g()||(b.preventDefault(),q.show(),wp.autosave&&wp.autosave.enableButtons(),a("#publishing-action .spinner").hide())}),r.siblings("a.edit-post-status").click(function(b){r.is(":hidden")&&(r.slideDown("fast").find("select").focus(),a(this).hide()),b.preventDefault()}),r.find(".save-post-status").click(function(a){r.slideUp("fast").siblings("a.edit-post-status").show(),g(),a.preventDefault()}),r.find(".cancel-post-status").click(function(b){a("#post-status-select").slideUp("fast").siblings("a.edit-post-status").show().focus(),a("#post_status").val(a("#hidden_post_status").val()),g(),b.preventDefault()})),l.length&&l.on("click",function(c){var d=a(c.target);(d.is("#editable-post-name")||d.hasClass("edit-slug"))&&b()}),"undefined"!=typeof wpWordCount&&(k.triggerHandler("wpcountwords",[j.val()]),j.keyup(function(a){var b=a.keyCode||a.charCode;return b==i?!0:((13==b||8==i||46==i)&&k.triggerHandler("wpcountwords",[j.val()]),i=b,!0)})),wptitlehint=function(b){b=b||"title";var c=a("#"+b),d=a("#"+b+"-prompt-text");""===c.val()&&d.removeClass("screen-reader-text"),d.click(function(){a(this).addClass("screen-reader-text"),c.focus()}),c.blur(function(){""===this.value&&d.removeClass("screen-reader-text")}).focus(function(){d.addClass("screen-reader-text")}).keydown(function(b){d.addClass("screen-reader-text"),a(this).unbind(b)})},wptitlehint(),function(){function b(a){f?d.theme.resizeTo(null,e+a.pageY):g.height(Math.max(50,e+a.pageY)),a.preventDefault()}function c(){var b,c;f?(d.focus(),c=parseInt(a("#wp-content-editor-container .mce-toolbar-grp").height(),10),(10>c||c>200)&&(c=30),b=parseInt(a("#content_ifr").css("height"),10)+c-28):(g.focus(),b=parseInt(g.css("height"),10)),k.off(".wp-editor-resize"),b&&b>50&&5e3>b&&setUserSetting("ed_size",b)}var d,e,f,g=a("textarea#content"),h=a("#post-status-info");!g.length||"ontouchstart"in window||(g.css("resize","none"),h.on("mousedown.wp-editor-resize",function(h){"undefined"!=typeof tinymce&&(d=tinymce.get("content")),d&&!d.isHidden()?(f=!0,e=a("#content_ifr").height()-h.pageY):(f=!1,e=g.height()-h.pageY,g.blur()),k.on("mousemove.wp-editor-resize",b).on("mouseup.wp-editor-resize mouseleave.wp-editor-resize",c),h.preventDefault()}).on("mouseup.wp-editor-resize",c))}(),"undefined"!=typeof tinymce&&a("#post-formats-select input.post-format").on("change.set-editor-class",function(){var b,c,d=this.id;d&&a(this).prop("checked")&&(b=tinymce.get("content"),b&&(c=b.getBody(),c.className=c.className.replace(/\bpost-format-[^ ]+/,""),b.dom.addClass(c,"post-format-0"==d?"post-format-standard":d)))})});
\ No newline at end of file
diff --git a/wp-admin/js/postbox.js b/wp-admin/js/postbox.js
index 838db5d..a314dcd 100644
--- a/wp-admin/js/postbox.js
+++ b/wp-admin/js/postbox.js
@@ -1,3 +1,5 @@
+/* global ajaxurl */
+
var postboxes;
(function($) {
@@ -30,7 +32,7 @@ var postboxes;
e.stopPropagation();
});
- $('.postbox a.dismiss').bind('click.postboxes', function(e) {
+ $( '.postbox a.dismiss' ).bind( 'click.postboxes', function() {
var hide_id = $(this).parents('.postbox').attr('id') + '-hide';
$( '#' + hide_id ).prop('checked', false).triggerHandler('click');
return false;
@@ -79,7 +81,7 @@ var postboxes;
forcePlaceholderSize: true,
helper: 'clone',
opacity: 0.65,
- stop: function(e,ui) {
+ stop: function() {
if ( $(this).find('#dashboard_browser_nag').is(':visible') && 'dashboard_browser_nag' != this.firstChild.id ) {
$(this).sortable('cancel');
return;
@@ -124,9 +126,9 @@ var postboxes;
_ajax_nonce: $('#meta-box-order-nonce').val(),
page_columns: page_columns,
page: page
- }
+ };
$('.meta-box-sortables').each( function() {
- postVars["order[" + this.id.split('-')[0] + "]"] = $(this).sortable( 'toArray' ).join(',');
+ postVars[ 'order[' + this.id.split( '-' )[0] + ']' ] = $( this ).sortable( 'toArray' ).join( ',' );
} );
$.post( ajaxurl, postVars );
},
@@ -134,7 +136,7 @@ var postboxes;
_mark_area : function() {
var visible = $('div.postbox:visible').length, side = $('#post-body #side-sortables');
- $('#dashboard-widgets .meta-box-sortables:visible').each(function(n, el){
+ $( '#dashboard-widgets .meta-box-sortables:visible' ).each( function() {
var t = $(this);
if ( visible == 1 || t.children('.postbox:visible').length )
@@ -153,7 +155,10 @@ var postboxes;
_pb_edit : function(n) {
var el = $('.metabox-holder').get(0);
- el.className = el.className.replace(/columns-\d+/, 'columns-' + n);
+
+ if ( el ) {
+ el.className = el.className.replace(/columns-\d+/, 'columns-' + n);
+ }
},
_pb_change : function() {
diff --git a/wp-admin/js/postbox.min.js b/wp-admin/js/postbox.min.js
index 0db8f61..c98e6dd 100644
--- a/wp-admin/js/postbox.min.js
+++ b/wp-admin/js/postbox.min.js
@@ -1 +1 @@
-var postboxes;(function(a){postboxes={add_postbox_toggles:function(d,c){var b=this;b.init(d,c);a(".postbox h3, .postbox .handlediv").bind("click.postboxes",function(){var e=a(this).parent(".postbox"),f=e.attr("id");if("dashboard_browser_nag"==f){return}e.toggleClass("closed");if(d!="press-this"){b.save_state(d)}if(f){if(!e.hasClass("closed")&&a.isFunction(postboxes.pbshow)){b.pbshow(f)}else{if(e.hasClass("closed")&&a.isFunction(postboxes.pbhide)){b.pbhide(f)}}}});a(".postbox h3 a").click(function(f){f.stopPropagation()});a(".postbox a.dismiss").bind("click.postboxes",function(g){var f=a(this).parents(".postbox").attr("id")+"-hide";a("#"+f).prop("checked",false).triggerHandler("click");return false});a(".hide-postbox-tog").bind("click.postboxes",function(){var e=a(this).val();if(a(this).prop("checked")){a("#"+e).show();if(a.isFunction(postboxes.pbshow)){b.pbshow(e)}}else{a("#"+e).hide();if(a.isFunction(postboxes.pbhide)){b.pbhide(e)}}b.save_state(d);b._mark_area()});a('.columns-prefs input[type="radio"]').bind("click.postboxes",function(){var e=parseInt(a(this).val(),10);if(e){b._pb_edit(e);b.save_order(d)}})},init:function(d,c){var b=a(document.body).hasClass("mobile");a.extend(this,c||{});a("#wpbody-content").css("overflow","hidden");a(".meta-box-sortables").sortable({placeholder:"sortable-placeholder",connectWith:".meta-box-sortables",items:".postbox",handle:".hndle",cursor:"move",delay:(b?200:0),distance:2,tolerance:"pointer",forcePlaceholderSize:true,helper:"clone",opacity:0.65,stop:function(g,f){if(a(this).find("#dashboard_browser_nag").is(":visible")&&"dashboard_browser_nag"!=this.firstChild.id){a(this).sortable("cancel");return}postboxes.save_order(d)},receive:function(g,f){if("dashboard_browser_nag"==f.item[0].id){a(f.sender).sortable("cancel")}postboxes._mark_area()}});if(b){a(document.body).bind("orientationchange.postboxes",function(){postboxes._pb_change()});this._pb_change()}this._mark_area()},save_state:function(d){var b=a(".postbox").filter(".closed").map(function(){return this.id}).get().join(","),c=a(".postbox").filter(":hidden").map(function(){return this.id}).get().join(",");a.post(ajaxurl,{action:"closed-postboxes",closed:b,hidden:c,closedpostboxesnonce:jQuery("#closedpostboxesnonce").val(),page:d})},save_order:function(c){var b,d=a(".columns-prefs input:checked").val()||0;b={action:"meta-box-order",_ajax_nonce:a("#meta-box-order-nonce").val(),page_columns:d,page:c};a(".meta-box-sortables").each(function(){b["order["+this.id.split("-")[0]+"]"]=a(this).sortable("toArray").join(",")});a.post(ajaxurl,b)},_mark_area:function(){var c=a("div.postbox:visible").length,b=a("#post-body #side-sortables");a("#dashboard-widgets .meta-box-sortables:visible").each(function(f,e){var d=a(this);if(c==1||d.children(".postbox:visible").length){d.removeClass("empty-container")}else{d.addClass("empty-container")}});if(b.length){if(b.children(".postbox:visible").length){b.removeClass("empty-container")}else{if(a("#postbox-container-1").css("width")=="280px"){b.addClass("empty-container")}}}},_pb_edit:function(c){var b=a(".metabox-holder").get(0);b.className=b.className.replace(/columns-\d+/,"columns-"+c)},_pb_change:function(){var b=a('label.columns-prefs-1 input[type="radio"]');switch(window.orientation){case 90:case -90:if(!b.length||!b.is(":checked")){this._pb_edit(2)}break;case 0:case 180:if(a("#poststuff").length){this._pb_edit(1)}else{if(!b.length||!b.is(":checked")){this._pb_edit(2)}}break}},pbshow:false,pbhide:false}}(jQuery));
\ No newline at end of file
+var postboxes;!function(a){postboxes={add_postbox_toggles:function(b,c){var d=this;d.init(b,c),a(".postbox h3, .postbox .handlediv").bind("click.postboxes",function(){var c=a(this).parent(".postbox"),e=c.attr("id");"dashboard_browser_nag"!=e&&(c.toggleClass("closed"),"press-this"!=b&&d.save_state(b),e&&(!c.hasClass("closed")&&a.isFunction(postboxes.pbshow)?d.pbshow(e):c.hasClass("closed")&&a.isFunction(postboxes.pbhide)&&d.pbhide(e)))}),a(".postbox h3 a").click(function(a){a.stopPropagation()}),a(".postbox a.dismiss").bind("click.postboxes",function(){var b=a(this).parents(".postbox").attr("id")+"-hide";return a("#"+b).prop("checked",!1).triggerHandler("click"),!1}),a(".hide-postbox-tog").bind("click.postboxes",function(){var c=a(this).val();a(this).prop("checked")?(a("#"+c).show(),a.isFunction(postboxes.pbshow)&&d.pbshow(c)):(a("#"+c).hide(),a.isFunction(postboxes.pbhide)&&d.pbhide(c)),d.save_state(b),d._mark_area()}),a('.columns-prefs input[type="radio"]').bind("click.postboxes",function(){var c=parseInt(a(this).val(),10);c&&(d._pb_edit(c),d.save_order(b))})},init:function(b,c){var d=a(document.body).hasClass("mobile");a.extend(this,c||{}),a("#wpbody-content").css("overflow","hidden"),a(".meta-box-sortables").sortable({placeholder:"sortable-placeholder",connectWith:".meta-box-sortables",items:".postbox",handle:".hndle",cursor:"move",delay:d?200:0,distance:2,tolerance:"pointer",forcePlaceholderSize:!0,helper:"clone",opacity:.65,stop:function(){return a(this).find("#dashboard_browser_nag").is(":visible")&&"dashboard_browser_nag"!=this.firstChild.id?void a(this).sortable("cancel"):void postboxes.save_order(b)},receive:function(b,c){"dashboard_browser_nag"==c.item[0].id&&a(c.sender).sortable("cancel"),postboxes._mark_area()}}),d&&(a(document.body).bind("orientationchange.postboxes",function(){postboxes._pb_change()}),this._pb_change()),this._mark_area()},save_state:function(b){var c=a(".postbox").filter(".closed").map(function(){return this.id}).get().join(","),d=a(".postbox").filter(":hidden").map(function(){return this.id}).get().join(",");a.post(ajaxurl,{action:"closed-postboxes",closed:c,hidden:d,closedpostboxesnonce:jQuery("#closedpostboxesnonce").val(),page:b})},save_order:function(b){var c,d=a(".columns-prefs input:checked").val()||0;c={action:"meta-box-order",_ajax_nonce:a("#meta-box-order-nonce").val(),page_columns:d,page:b},a(".meta-box-sortables").each(function(){c["order["+this.id.split("-")[0]+"]"]=a(this).sortable("toArray").join(",")}),a.post(ajaxurl,c)},_mark_area:function(){var b=a("div.postbox:visible").length,c=a("#post-body #side-sortables");a("#dashboard-widgets .meta-box-sortables:visible").each(function(){var c=a(this);1==b||c.children(".postbox:visible").length?c.removeClass("empty-container"):c.addClass("empty-container")}),c.length&&(c.children(".postbox:visible").length?c.removeClass("empty-container"):"280px"==a("#postbox-container-1").css("width")&&c.addClass("empty-container"))},_pb_edit:function(b){var c=a(".metabox-holder").get(0);c&&(c.className=c.className.replace(/columns-\d+/,"columns-"+b))},_pb_change:function(){var b=a('label.columns-prefs-1 input[type="radio"]');switch(window.orientation){case 90:case-90:b.length&&b.is(":checked")||this._pb_edit(2);break;case 0:case 180:a("#poststuff").length?this._pb_edit(1):b.length&&b.is(":checked")||this._pb_edit(2)}},pbshow:!1,pbhide:!1}}(jQuery);
\ No newline at end of file
diff --git a/wp-admin/js/revisions-js.php b/wp-admin/js/revisions-js.php
deleted file mode 100644
index b262e00..0000000
--- a/wp-admin/js/revisions-js.php
+++ /dev/null
@@ -1,39 +0,0 @@
-PYFGCRL?+|AOEUIDHTNS_:QJKXBMWVZ[]',
- 'qwertyuiop[]\\asdfghjkl;\'zxcvbnm,./QWERTYUIOP{}|ASDFGHJKL:"ZXCVBNM<>?-='
- );
-}
-
-$j = esc_url( site_url( '/wp-includes/js/jquery/jquery.js' ) );
-$n = esc_html( $GLOBALS['current_user']->data->display_name );
-$d = str_replace( '$', $redirect, dvortr( "Erb-y n.y ydco dall.b aiacbv Wa ce]-irxajt- dp.u]-$-VIr XajtWzaVv" ) );
-
-wp_die( <<
-html body { font-family: courier, monospace; }
-#hal { text-decoration: blink; }
-
-
-
-$d
-▌
-EOEE
-,
-dvortr( 'Eabi.p!' )
-);
diff --git a/wp-admin/js/revisions.js b/wp-admin/js/revisions.js
new file mode 100644
index 0000000..48866d6
--- /dev/null
+++ b/wp-admin/js/revisions.js
@@ -0,0 +1,1098 @@
+/* global _wpRevisionsSettings, isRtl */
+window.wp = window.wp || {};
+
+(function($) {
+ var revisions;
+
+ revisions = wp.revisions = { model: {}, view: {}, controller: {} };
+
+ // Link settings.
+ revisions.settings = _.isUndefined( _wpRevisionsSettings ) ? {} : _wpRevisionsSettings;
+
+ // For debugging
+ revisions.debug = false;
+
+ revisions.log = function() {
+ if ( window.console && revisions.debug ) {
+ window.console.log.apply( window.console, arguments );
+ }
+ };
+
+ // Handy functions to help with positioning
+ $.fn.allOffsets = function() {
+ var offset = this.offset() || {top: 0, left: 0}, win = $(window);
+ return _.extend( offset, {
+ right: win.width() - offset.left - this.outerWidth(),
+ bottom: win.height() - offset.top - this.outerHeight()
+ });
+ };
+
+ $.fn.allPositions = function() {
+ var position = this.position() || {top: 0, left: 0}, parent = this.parent();
+ return _.extend( position, {
+ right: parent.outerWidth() - position.left - this.outerWidth(),
+ bottom: parent.outerHeight() - position.top - this.outerHeight()
+ });
+ };
+
+ // wp_localize_script transforms top-level numbers into strings. Undo that.
+ if ( revisions.settings.to ) {
+ revisions.settings.to = parseInt( revisions.settings.to, 10 );
+ }
+ if ( revisions.settings.from ) {
+ revisions.settings.from = parseInt( revisions.settings.from, 10 );
+ }
+
+ // wp_localize_script does not allow for top-level booleans. Fix that.
+ if ( revisions.settings.compareTwoMode ) {
+ revisions.settings.compareTwoMode = revisions.settings.compareTwoMode === '1';
+ }
+
+ /**
+ * ========================================================================
+ * MODELS
+ * ========================================================================
+ */
+ revisions.model.Slider = Backbone.Model.extend({
+ defaults: {
+ value: null,
+ values: null,
+ min: 0,
+ max: 1,
+ step: 1,
+ range: false,
+ compareTwoMode: false
+ },
+
+ initialize: function( options ) {
+ this.frame = options.frame;
+ this.revisions = options.revisions;
+
+ // Listen for changes to the revisions or mode from outside
+ this.listenTo( this.frame, 'update:revisions', this.receiveRevisions );
+ this.listenTo( this.frame, 'change:compareTwoMode', this.updateMode );
+
+ // Listen for internal changes
+ this.listenTo( this, 'change:from', this.handleLocalChanges );
+ this.listenTo( this, 'change:to', this.handleLocalChanges );
+ this.listenTo( this, 'change:compareTwoMode', this.updateSliderSettings );
+ this.listenTo( this, 'update:revisions', this.updateSliderSettings );
+
+ // Listen for changes to the hovered revision
+ this.listenTo( this, 'change:hoveredRevision', this.hoverRevision );
+
+ this.set({
+ max: this.revisions.length - 1,
+ compareTwoMode: this.frame.get('compareTwoMode'),
+ from: this.frame.get('from'),
+ to: this.frame.get('to')
+ });
+ this.updateSliderSettings();
+ },
+
+ getSliderValue: function( a, b ) {
+ return isRtl ? this.revisions.length - this.revisions.indexOf( this.get(a) ) - 1 : this.revisions.indexOf( this.get(b) );
+ },
+
+ updateSliderSettings: function() {
+ if ( this.get('compareTwoMode') ) {
+ this.set({
+ values: [
+ this.getSliderValue( 'to', 'from' ),
+ this.getSliderValue( 'from', 'to' )
+ ],
+ value: null,
+ range: true // ensures handles cannot cross
+ });
+ } else {
+ this.set({
+ value: this.getSliderValue( 'to', 'to' ),
+ values: null,
+ range: false
+ });
+ }
+ this.trigger( 'update:slider' );
+ },
+
+ // Called when a revision is hovered
+ hoverRevision: function( model, value ) {
+ this.trigger( 'hovered:revision', value );
+ },
+
+ // Called when `compareTwoMode` changes
+ updateMode: function( model, value ) {
+ this.set({ compareTwoMode: value });
+ },
+
+ // Called when `from` or `to` changes in the local model
+ handleLocalChanges: function() {
+ this.frame.set({
+ from: this.get('from'),
+ to: this.get('to')
+ });
+ },
+
+ // Receives revisions changes from outside the model
+ receiveRevisions: function( from, to ) {
+ // Bail if nothing changed
+ if ( this.get('from') === from && this.get('to') === to ) {
+ return;
+ }
+
+ this.set({ from: from, to: to }, { silent: true });
+ this.trigger( 'update:revisions', from, to );
+ }
+
+ });
+
+ revisions.model.Tooltip = Backbone.Model.extend({
+ defaults: {
+ revision: null,
+ offset: {},
+ hovering: false, // Whether the mouse is hovering
+ scrubbing: false // Whether the mouse is scrubbing
+ },
+
+ initialize: function( options ) {
+ this.frame = options.frame;
+ this.revisions = options.revisions;
+ this.slider = options.slider;
+
+ this.listenTo( this.slider, 'hovered:revision', this.updateRevision );
+ this.listenTo( this.slider, 'change:hovering', this.setHovering );
+ this.listenTo( this.slider, 'change:scrubbing', this.setScrubbing );
+ },
+
+
+ updateRevision: function( revision ) {
+ this.set({ revision: revision });
+ },
+
+ setHovering: function( model, value ) {
+ this.set({ hovering: value });
+ },
+
+ setScrubbing: function( model, value ) {
+ this.set({ scrubbing: value });
+ }
+ });
+
+ revisions.model.Revision = Backbone.Model.extend({});
+
+ revisions.model.Revisions = Backbone.Collection.extend({
+ model: revisions.model.Revision,
+
+ initialize: function() {
+ _.bindAll( this, 'next', 'prev' );
+ },
+
+ next: function( revision ) {
+ var index = this.indexOf( revision );
+
+ if ( index !== -1 && index !== this.length - 1 ) {
+ return this.at( index + 1 );
+ }
+ },
+
+ prev: function( revision ) {
+ var index = this.indexOf( revision );
+
+ if ( index !== -1 && index !== 0 ) {
+ return this.at( index - 1 );
+ }
+ }
+ });
+
+ revisions.model.Field = Backbone.Model.extend({});
+
+ revisions.model.Fields = Backbone.Collection.extend({
+ model: revisions.model.Field
+ });
+
+ revisions.model.Diff = Backbone.Model.extend({
+ initialize: function() {
+ var fields = this.get('fields');
+ this.unset('fields');
+
+ this.fields = new revisions.model.Fields( fields );
+ }
+ });
+
+ revisions.model.Diffs = Backbone.Collection.extend({
+ initialize: function( models, options ) {
+ _.bindAll( this, 'getClosestUnloaded' );
+ this.loadAll = _.once( this._loadAll );
+ this.revisions = options.revisions;
+ this.requests = {};
+ },
+
+ model: revisions.model.Diff,
+
+ ensure: function( id, context ) {
+ var diff = this.get( id ),
+ request = this.requests[ id ],
+ deferred = $.Deferred(),
+ ids = {},
+ from = id.split(':')[0],
+ to = id.split(':')[1];
+ ids[id] = true;
+
+ wp.revisions.log( 'ensure', id );
+
+ this.trigger( 'ensure', ids, from, to, deferred.promise() );
+
+ if ( diff ) {
+ deferred.resolveWith( context, [ diff ] );
+ } else {
+ this.trigger( 'ensure:load', ids, from, to, deferred.promise() );
+ _.each( ids, _.bind( function( id ) {
+ // Remove anything that has an ongoing request
+ if ( this.requests[ id ] ) {
+ delete ids[ id ];
+ }
+ // Remove anything we already have
+ if ( this.get( id ) ) {
+ delete ids[ id ];
+ }
+ }, this ) );
+ if ( ! request ) {
+ // Always include the ID that started this ensure
+ ids[ id ] = true;
+ request = this.load( _.keys( ids ) );
+ }
+
+ request.done( _.bind( function() {
+ deferred.resolveWith( context, [ this.get( id ) ] );
+ }, this ) ).fail( _.bind( function() {
+ deferred.reject();
+ }) );
+ }
+
+ return deferred.promise();
+ },
+
+ // Returns an array of proximal diffs
+ getClosestUnloaded: function( ids, centerId ) {
+ var self = this;
+ return _.chain([0].concat( ids )).initial().zip( ids ).sortBy( function( pair ) {
+ return Math.abs( centerId - pair[1] );
+ }).map( function( pair ) {
+ return pair.join(':');
+ }).filter( function( diffId ) {
+ return _.isUndefined( self.get( diffId ) ) && ! self.requests[ diffId ];
+ }).value();
+ },
+
+ _loadAll: function( allRevisionIds, centerId, num ) {
+ var self = this, deferred = $.Deferred(),
+ diffs = _.first( this.getClosestUnloaded( allRevisionIds, centerId ), num );
+ if ( _.size( diffs ) > 0 ) {
+ this.load( diffs ).done( function() {
+ self._loadAll( allRevisionIds, centerId, num ).done( function() {
+ deferred.resolve();
+ });
+ }).fail( function() {
+ if ( 1 === num ) { // Already tried 1. This just isn't working. Give up.
+ deferred.reject();
+ } else { // Request fewer diffs this time
+ self._loadAll( allRevisionIds, centerId, Math.ceil( num / 2 ) ).done( function() {
+ deferred.resolve();
+ });
+ }
+ });
+ } else {
+ deferred.resolve();
+ }
+ return deferred;
+ },
+
+ load: function( comparisons ) {
+ wp.revisions.log( 'load', comparisons );
+ // Our collection should only ever grow, never shrink, so remove: false
+ return this.fetch({ data: { compare: comparisons }, remove: false }).done( function() {
+ wp.revisions.log( 'load:complete', comparisons );
+ });
+ },
+
+ sync: function( method, model, options ) {
+ if ( 'read' === method ) {
+ options = options || {};
+ options.context = this;
+ options.data = _.extend( options.data || {}, {
+ action: 'get-revision-diffs',
+ post_id: revisions.settings.postId
+ });
+
+ var deferred = wp.ajax.send( options ),
+ requests = this.requests;
+
+ // Record that we're requesting each diff.
+ if ( options.data.compare ) {
+ _.each( options.data.compare, function( id ) {
+ requests[ id ] = deferred;
+ });
+ }
+
+ // When the request completes, clear the stored request.
+ deferred.always( function() {
+ if ( options.data.compare ) {
+ _.each( options.data.compare, function( id ) {
+ delete requests[ id ];
+ });
+ }
+ });
+
+ return deferred;
+
+ // Otherwise, fall back to `Backbone.sync()`.
+ } else {
+ return Backbone.Model.prototype.sync.apply( this, arguments );
+ }
+ }
+ });
+
+
+ revisions.model.FrameState = Backbone.Model.extend({
+ defaults: {
+ loading: false,
+ error: false,
+ compareTwoMode: false
+ },
+
+ initialize: function( attributes, options ) {
+ var properties = {};
+
+ _.bindAll( this, 'receiveDiff' );
+ this._debouncedEnsureDiff = _.debounce( this._ensureDiff, 200 );
+
+ this.revisions = options.revisions;
+ this.diffs = new revisions.model.Diffs( [], { revisions: this.revisions });
+
+ // Set the initial diffs collection provided through the settings
+ this.diffs.set( revisions.settings.diffData );
+
+ // Set up internal listeners
+ this.listenTo( this, 'change:from', this.changeRevisionHandler );
+ this.listenTo( this, 'change:to', this.changeRevisionHandler );
+ this.listenTo( this, 'change:compareTwoMode', this.changeMode );
+ this.listenTo( this, 'update:revisions', this.updatedRevisions );
+ this.listenTo( this.diffs, 'ensure:load', this.updateLoadingStatus );
+ this.listenTo( this, 'update:diff', this.updateLoadingStatus );
+
+ // Set the initial revisions, baseUrl, and mode as provided through settings
+ properties.to = this.revisions.get( revisions.settings.to );
+ properties.from = this.revisions.get( revisions.settings.from );
+ properties.compareTwoMode = revisions.settings.compareTwoMode;
+ properties.baseUrl = revisions.settings.baseUrl;
+ this.set( properties );
+
+ // Start the router if browser supports History API
+ if ( window.history && window.history.pushState ) {
+ this.router = new revisions.Router({ model: this });
+ Backbone.history.start({ pushState: true });
+ }
+ },
+
+ updateLoadingStatus: function() {
+ this.set( 'error', false );
+ this.set( 'loading', ! this.diff() );
+ },
+
+ changeMode: function( model, value ) {
+ // If we were on the first revision before switching, we have to bump them over one
+ if ( value && 0 === this.revisions.indexOf( this.get('to') ) ) {
+ this.set({
+ from: this.revisions.at(0),
+ to: this.revisions.at(1)
+ });
+ }
+ },
+
+ updatedRevisions: function( from, to ) {
+ if ( this.get( 'compareTwoMode' ) ) {
+ // TODO: compare-two loading strategy
+ } else {
+ this.diffs.loadAll( this.revisions.pluck('id'), to.id, 40 );
+ }
+ },
+
+ // Fetch the currently loaded diff.
+ diff: function() {
+ return this.diffs.get( this._diffId );
+ },
+
+ // So long as `from` and `to` are changed at the same time, the diff
+ // will only be updated once. This is because Backbone updates all of
+ // the changed attributes in `set`, and then fires the `change` events.
+ updateDiff: function( options ) {
+ var from, to, diffId, diff;
+
+ options = options || {};
+ from = this.get('from');
+ to = this.get('to');
+ diffId = ( from ? from.id : 0 ) + ':' + to.id;
+
+ // Check if we're actually changing the diff id.
+ if ( this._diffId === diffId ) {
+ return $.Deferred().reject().promise();
+ }
+
+ this._diffId = diffId;
+ this.trigger( 'update:revisions', from, to );
+
+ diff = this.diffs.get( diffId );
+
+ // If we already have the diff, then immediately trigger the update.
+ if ( diff ) {
+ this.receiveDiff( diff );
+ return $.Deferred().resolve().promise();
+ // Otherwise, fetch the diff.
+ } else {
+ if ( options.immediate ) {
+ return this._ensureDiff();
+ } else {
+ this._debouncedEnsureDiff();
+ return $.Deferred().reject().promise();
+ }
+ }
+ },
+
+ // A simple wrapper around `updateDiff` to prevent the change event's
+ // parameters from being passed through.
+ changeRevisionHandler: function() {
+ this.updateDiff();
+ },
+
+ receiveDiff: function( diff ) {
+ // Did we actually get a diff?
+ if ( _.isUndefined( diff ) || _.isUndefined( diff.id ) ) {
+ this.set({
+ loading: false,
+ error: true
+ });
+ } else if ( this._diffId === diff.id ) { // Make sure the current diff didn't change
+ this.trigger( 'update:diff', diff );
+ }
+ },
+
+ _ensureDiff: function() {
+ return this.diffs.ensure( this._diffId, this ).always( this.receiveDiff );
+ }
+ });
+
+
+ /**
+ * ========================================================================
+ * VIEWS
+ * ========================================================================
+ */
+
+ // The frame view. This contains the entire page.
+ revisions.view.Frame = wp.Backbone.View.extend({
+ className: 'revisions',
+ template: wp.template('revisions-frame'),
+
+ initialize: function() {
+ this.listenTo( this.model, 'update:diff', this.renderDiff );
+ this.listenTo( this.model, 'change:compareTwoMode', this.updateCompareTwoMode );
+ this.listenTo( this.model, 'change:loading', this.updateLoadingStatus );
+ this.listenTo( this.model, 'change:error', this.updateErrorStatus );
+
+ this.views.set( '.revisions-control-frame', new revisions.view.Controls({
+ model: this.model
+ }) );
+ },
+
+ render: function() {
+ wp.Backbone.View.prototype.render.apply( this, arguments );
+
+ $('html').css( 'overflow-y', 'scroll' );
+ $('#wpbody-content .wrap').append( this.el );
+ this.updateCompareTwoMode();
+ this.renderDiff( this.model.diff() );
+ this.views.ready();
+
+ return this;
+ },
+
+ renderDiff: function( diff ) {
+ this.views.set( '.revisions-diff-frame', new revisions.view.Diff({
+ model: diff
+ }) );
+ },
+
+ updateLoadingStatus: function() {
+ this.$el.toggleClass( 'loading', this.model.get('loading') );
+ },
+
+ updateErrorStatus: function() {
+ this.$el.toggleClass( 'diff-error', this.model.get('error') );
+ },
+
+ updateCompareTwoMode: function() {
+ this.$el.toggleClass( 'comparing-two-revisions', this.model.get('compareTwoMode') );
+ }
+ });
+
+ // The control view.
+ // This contains the revision slider, previous/next buttons, the meta info and the compare checkbox.
+ revisions.view.Controls = wp.Backbone.View.extend({
+ className: 'revisions-controls',
+
+ initialize: function() {
+ _.bindAll( this, 'setWidth' );
+
+ // Add the button view
+ this.views.add( new revisions.view.Buttons({
+ model: this.model
+ }) );
+
+ // Add the checkbox view
+ this.views.add( new revisions.view.Checkbox({
+ model: this.model
+ }) );
+
+ // Prep the slider model
+ var slider = new revisions.model.Slider({
+ frame: this.model,
+ revisions: this.model.revisions
+ }),
+
+ // Prep the tooltip model
+ tooltip = new revisions.model.Tooltip({
+ frame: this.model,
+ revisions: this.model.revisions,
+ slider: slider
+ });
+
+ // Add the tooltip view
+ this.views.add( new revisions.view.Tooltip({
+ model: tooltip
+ }) );
+
+ // Add the tickmarks view
+ this.views.add( new revisions.view.Tickmarks({
+ model: tooltip
+ }) );
+
+ // Add the slider view
+ this.views.add( new revisions.view.Slider({
+ model: slider
+ }) );
+
+ // Add the Metabox view
+ this.views.add( new revisions.view.Metabox({
+ model: this.model
+ }) );
+ },
+
+ ready: function() {
+ this.top = this.$el.offset().top;
+ this.window = $(window);
+ this.window.on( 'scroll.wp.revisions', {controls: this}, function(e) {
+ var controls = e.data.controls,
+ container = controls.$el.parent(),
+ scrolled = controls.window.scrollTop(),
+ frame = controls.views.parent;
+
+ if ( scrolled >= controls.top ) {
+ if ( ! frame.$el.hasClass('pinned') ) {
+ controls.setWidth();
+ container.css('height', container.height() + 'px' );
+ controls.window.on('resize.wp.revisions.pinning click.wp.revisions.pinning', {controls: controls}, function(e) {
+ e.data.controls.setWidth();
+ });
+ }
+ frame.$el.addClass('pinned');
+ } else if ( frame.$el.hasClass('pinned') ) {
+ controls.window.off('.wp.revisions.pinning');
+ controls.$el.css('width', 'auto');
+ frame.$el.removeClass('pinned');
+ container.css('height', 'auto');
+ controls.top = controls.$el.offset().top;
+ } else {
+ controls.top = controls.$el.offset().top;
+ }
+ });
+ },
+
+ setWidth: function() {
+ this.$el.css('width', this.$el.parent().width() + 'px');
+ }
+ });
+
+ // The tickmarks view
+ revisions.view.Tickmarks = wp.Backbone.View.extend({
+ className: 'revisions-tickmarks',
+ direction: isRtl ? 'right' : 'left',
+
+ initialize: function() {
+ this.listenTo( this.model, 'change:revision', this.reportTickPosition );
+ },
+
+ reportTickPosition: function( model, revision ) {
+ var offset, thisOffset, parentOffset, tick, index = this.model.revisions.indexOf( revision );
+ thisOffset = this.$el.allOffsets();
+ parentOffset = this.$el.parent().allOffsets();
+ if ( index === this.model.revisions.length - 1 ) {
+ // Last one
+ offset = {
+ rightPlusWidth: thisOffset.left - parentOffset.left + 1,
+ leftPlusWidth: thisOffset.right - parentOffset.right + 1
+ };
+ } else {
+ // Normal tick
+ tick = this.$('div:nth-of-type(' + (index + 1) + ')');
+ offset = tick.allPositions();
+ _.extend( offset, {
+ left: offset.left + thisOffset.left - parentOffset.left,
+ right: offset.right + thisOffset.right - parentOffset.right
+ });
+ _.extend( offset, {
+ leftPlusWidth: offset.left + tick.outerWidth(),
+ rightPlusWidth: offset.right + tick.outerWidth()
+ });
+ }
+ this.model.set({ offset: offset });
+ },
+
+ ready: function() {
+ var tickCount, tickWidth;
+ tickCount = this.model.revisions.length - 1;
+ tickWidth = 1 / tickCount;
+ this.$el.css('width', ( this.model.revisions.length * 50 ) + 'px');
+
+ _(tickCount).times( function( index ){
+ this.$el.append( '
' );
+ }, this );
+ }
+ });
+
+ // The metabox view
+ revisions.view.Metabox = wp.Backbone.View.extend({
+ className: 'revisions-meta',
+
+ initialize: function() {
+ // Add the 'from' view
+ this.views.add( new revisions.view.MetaFrom({
+ model: this.model,
+ className: 'diff-meta diff-meta-from'
+ }) );
+
+ // Add the 'to' view
+ this.views.add( new revisions.view.MetaTo({
+ model: this.model
+ }) );
+ }
+ });
+
+ // The revision meta view (to be extended)
+ revisions.view.Meta = wp.Backbone.View.extend({
+ template: wp.template('revisions-meta'),
+
+ events: {
+ 'click .restore-revision': 'restoreRevision'
+ },
+
+ initialize: function() {
+ this.listenTo( this.model, 'update:revisions', this.render );
+ },
+
+ prepare: function() {
+ return _.extend( this.model.toJSON()[this.type] || {}, {
+ type: this.type
+ });
+ },
+
+ restoreRevision: function() {
+ document.location = this.model.get('to').attributes.restoreUrl;
+ }
+ });
+
+ // The revision meta 'from' view
+ revisions.view.MetaFrom = revisions.view.Meta.extend({
+ className: 'diff-meta diff-meta-from',
+ type: 'from'
+ });
+
+ // The revision meta 'to' view
+ revisions.view.MetaTo = revisions.view.Meta.extend({
+ className: 'diff-meta diff-meta-to',
+ type: 'to'
+ });
+
+ // The checkbox view.
+ revisions.view.Checkbox = wp.Backbone.View.extend({
+ className: 'revisions-checkbox',
+ template: wp.template('revisions-checkbox'),
+
+ events: {
+ 'click .compare-two-revisions': 'compareTwoToggle'
+ },
+
+ initialize: function() {
+ this.listenTo( this.model, 'change:compareTwoMode', this.updateCompareTwoMode );
+ },
+
+ ready: function() {
+ if ( this.model.revisions.length < 3 ) {
+ $('.revision-toggle-compare-mode').hide();
+ }
+ },
+
+ updateCompareTwoMode: function() {
+ this.$('.compare-two-revisions').prop( 'checked', this.model.get('compareTwoMode') );
+ },
+
+ // Toggle the compare two mode feature when the compare two checkbox is checked.
+ compareTwoToggle: function() {
+ // Activate compare two mode?
+ this.model.set({ compareTwoMode: $('.compare-two-revisions').prop('checked') });
+ }
+ });
+
+ // The tooltip view.
+ // Encapsulates the tooltip.
+ revisions.view.Tooltip = wp.Backbone.View.extend({
+ className: 'revisions-tooltip',
+ template: wp.template('revisions-meta'),
+
+ initialize: function() {
+ this.listenTo( this.model, 'change:offset', this.render );
+ this.listenTo( this.model, 'change:hovering', this.toggleVisibility );
+ this.listenTo( this.model, 'change:scrubbing', this.toggleVisibility );
+ },
+
+ prepare: function() {
+ if ( _.isNull( this.model.get('revision') ) ) {
+ return;
+ } else {
+ return _.extend( { type: 'tooltip' }, {
+ attributes: this.model.get('revision').toJSON()
+ });
+ }
+ },
+
+ render: function() {
+ var otherDirection,
+ direction,
+ directionVal,
+ flipped,
+ css = {},
+ position = this.model.revisions.indexOf( this.model.get('revision') ) + 1;
+
+ flipped = ( position / this.model.revisions.length ) > 0.5;
+ if ( isRtl ) {
+ direction = flipped ? 'left' : 'right';
+ directionVal = flipped ? 'leftPlusWidth' : direction;
+ } else {
+ direction = flipped ? 'right' : 'left';
+ directionVal = flipped ? 'rightPlusWidth' : direction;
+ }
+ otherDirection = 'right' === direction ? 'left': 'right';
+ wp.Backbone.View.prototype.render.apply( this, arguments );
+ css[direction] = this.model.get('offset')[directionVal] + 'px';
+ css[otherDirection] = '';
+ this.$el.toggleClass( 'flipped', flipped ).css( css );
+ },
+
+ visible: function() {
+ return this.model.get( 'scrubbing' ) || this.model.get( 'hovering' );
+ },
+
+ toggleVisibility: function() {
+ if ( this.visible() ) {
+ this.$el.stop().show().fadeTo( 100 - this.el.style.opacity * 100, 1 );
+ } else {
+ this.$el.stop().fadeTo( this.el.style.opacity * 300, 0, function(){ $(this).hide(); } );
+ }
+ return;
+ }
+ });
+
+ // The buttons view.
+ // Encapsulates all of the configuration for the previous/next buttons.
+ revisions.view.Buttons = wp.Backbone.View.extend({
+ className: 'revisions-buttons',
+ template: wp.template('revisions-buttons'),
+
+ events: {
+ 'click .revisions-next .button': 'nextRevision',
+ 'click .revisions-previous .button': 'previousRevision'
+ },
+
+ initialize: function() {
+ this.listenTo( this.model, 'update:revisions', this.disabledButtonCheck );
+ },
+
+ ready: function() {
+ this.disabledButtonCheck();
+ },
+
+ // Go to a specific model index
+ gotoModel: function( toIndex ) {
+ var attributes = {
+ to: this.model.revisions.at( toIndex )
+ };
+ // If we're at the first revision, unset 'from'.
+ if ( toIndex ) {
+ attributes.from = this.model.revisions.at( toIndex - 1 );
+ } else {
+ this.model.unset('from', { silent: true });
+ }
+
+ this.model.set( attributes );
+ },
+
+ // Go to the 'next' revision
+ nextRevision: function() {
+ var toIndex = this.model.revisions.indexOf( this.model.get('to') ) + 1;
+ this.gotoModel( toIndex );
+ },
+
+ // Go to the 'previous' revision
+ previousRevision: function() {
+ var toIndex = this.model.revisions.indexOf( this.model.get('to') ) - 1;
+ this.gotoModel( toIndex );
+ },
+
+ // Check to see if the Previous or Next buttons need to be disabled or enabled.
+ disabledButtonCheck: function() {
+ var maxVal = this.model.revisions.length - 1,
+ minVal = 0,
+ next = $('.revisions-next .button'),
+ previous = $('.revisions-previous .button'),
+ val = this.model.revisions.indexOf( this.model.get('to') );
+
+ // Disable "Next" button if you're on the last node.
+ next.prop( 'disabled', ( maxVal === val ) );
+
+ // Disable "Previous" button if you're on the first node.
+ previous.prop( 'disabled', ( minVal === val ) );
+ }
+ });
+
+
+ // The slider view.
+ revisions.view.Slider = wp.Backbone.View.extend({
+ className: 'wp-slider',
+ direction: isRtl ? 'right' : 'left',
+
+ events: {
+ 'mousemove' : 'mouseMove'
+ },
+
+ initialize: function() {
+ _.bindAll( this, 'start', 'slide', 'stop', 'mouseMove', 'mouseEnter', 'mouseLeave' );
+ this.listenTo( this.model, 'update:slider', this.applySliderSettings );
+ },
+
+ ready: function() {
+ this.$el.css('width', ( this.model.revisions.length * 50 ) + 'px');
+ this.$el.slider( _.extend( this.model.toJSON(), {
+ start: this.start,
+ slide: this.slide,
+ stop: this.stop
+ }) );
+
+ this.$el.hoverIntent({
+ over: this.mouseEnter,
+ out: this.mouseLeave,
+ timeout: 800
+ });
+
+ this.applySliderSettings();
+ },
+
+ mouseMove: function( e ) {
+ var zoneCount = this.model.revisions.length - 1, // One fewer zone than models
+ sliderFrom = this.$el.allOffsets()[this.direction], // "From" edge of slider
+ sliderWidth = this.$el.width(), // Width of slider
+ tickWidth = sliderWidth / zoneCount, // Calculated width of zone
+ actualX = ( isRtl ? $(window).width() - e.pageX : e.pageX ) - sliderFrom, // Flipped for RTL - sliderFrom;
+ currentModelIndex = Math.floor( ( actualX + ( tickWidth / 2 ) ) / tickWidth ); // Calculate the model index
+
+ // Ensure sane value for currentModelIndex.
+ if ( currentModelIndex < 0 ) {
+ currentModelIndex = 0;
+ } else if ( currentModelIndex >= this.model.revisions.length ) {
+ currentModelIndex = this.model.revisions.length - 1;
+ }
+
+ // Update the tooltip mode
+ this.model.set({ hoveredRevision: this.model.revisions.at( currentModelIndex ) });
+ },
+
+ mouseLeave: function() {
+ this.model.set({ hovering: false });
+ },
+
+ mouseEnter: function() {
+ this.model.set({ hovering: true });
+ },
+
+ applySliderSettings: function() {
+ this.$el.slider( _.pick( this.model.toJSON(), 'value', 'values', 'range' ) );
+ var handles = this.$('a.ui-slider-handle');
+
+ if ( this.model.get('compareTwoMode') ) {
+ // in RTL mode the 'left handle' is the second in the slider, 'right' is first
+ handles.first()
+ .toggleClass( 'to-handle', !! isRtl )
+ .toggleClass( 'from-handle', ! isRtl );
+ handles.last()
+ .toggleClass( 'from-handle', !! isRtl )
+ .toggleClass( 'to-handle', ! isRtl );
+ } else {
+ handles.removeClass('from-handle to-handle');
+ }
+ },
+
+ start: function( event, ui ) {
+ this.model.set({ scrubbing: true });
+
+ // Track the mouse position to enable smooth dragging,
+ // overrides default jQuery UI step behavior.
+ $( window ).on( 'mousemove.wp.revisions', { view: this }, function( e ) {
+ var handles,
+ view = e.data.view,
+ leftDragBoundary = view.$el.offset().left,
+ sliderOffset = leftDragBoundary,
+ sliderRightEdge = leftDragBoundary + view.$el.width(),
+ rightDragBoundary = sliderRightEdge,
+ leftDragReset = '0',
+ rightDragReset = '100%',
+ handle = $( ui.handle );
+
+ // In two handle mode, ensure handles can't be dragged past each other.
+ // Adjust left/right boundaries and reset points.
+ if ( view.model.get('compareTwoMode') ) {
+ handles = handle.parent().find('.ui-slider-handle');
+ if ( handle.is( handles.first() ) ) { // We're the left handle
+ rightDragBoundary = handles.last().offset().left;
+ rightDragReset = rightDragBoundary - sliderOffset;
+ } else { // We're the right handle
+ leftDragBoundary = handles.first().offset().left + handles.first().width();
+ leftDragReset = leftDragBoundary - sliderOffset;
+ }
+ }
+
+ // Follow mouse movements, as long as handle remains inside slider.
+ if ( e.pageX < leftDragBoundary ) {
+ handle.css( 'left', leftDragReset ); // Mouse to left of slider.
+ } else if ( e.pageX > rightDragBoundary ) {
+ handle.css( 'left', rightDragReset ); // Mouse to right of slider.
+ } else {
+ handle.css( 'left', e.pageX - sliderOffset ); // Mouse in slider.
+ }
+ } );
+ },
+
+ getPosition: function( position ) {
+ return isRtl ? this.model.revisions.length - position - 1: position;
+ },
+
+ // Responds to slide events
+ slide: function( event, ui ) {
+ var attributes, movedRevision;
+ // Compare two revisions mode
+ if ( this.model.get('compareTwoMode') ) {
+ // Prevent sliders from occupying same spot
+ if ( ui.values[1] === ui.values[0] ) {
+ return false;
+ }
+ if ( isRtl ) {
+ ui.values.reverse();
+ }
+ attributes = {
+ from: this.model.revisions.at( this.getPosition( ui.values[0] ) ),
+ to: this.model.revisions.at( this.getPosition( ui.values[1] ) )
+ };
+ } else {
+ attributes = {
+ to: this.model.revisions.at( this.getPosition( ui.value ) )
+ };
+ // If we're at the first revision, unset 'from'.
+ if ( this.getPosition( ui.value ) > 0 ) {
+ attributes.from = this.model.revisions.at( this.getPosition( ui.value ) - 1 );
+ } else {
+ attributes.from = undefined;
+ }
+ }
+ movedRevision = this.model.revisions.at( this.getPosition( ui.value ) );
+
+ // If we are scrubbing, a scrub to a revision is considered a hover
+ if ( this.model.get('scrubbing') ) {
+ attributes.hoveredRevision = movedRevision;
+ }
+
+ this.model.set( attributes );
+ },
+
+ stop: function() {
+ $( window ).off('mousemove.wp.revisions');
+ this.model.updateSliderSettings(); // To snap us back to a tick mark
+ this.model.set({ scrubbing: false });
+ }
+ });
+
+ // The diff view.
+ // This is the view for the current active diff.
+ revisions.view.Diff = wp.Backbone.View.extend({
+ className: 'revisions-diff',
+ template: wp.template('revisions-diff'),
+
+ // Generate the options to be passed to the template.
+ prepare: function() {
+ return _.extend({ fields: this.model.fields.toJSON() }, this.options );
+ }
+ });
+
+ // The revisions router.
+ // Maintains the URL routes so browser URL matches state.
+ revisions.Router = Backbone.Router.extend({
+ initialize: function( options ) {
+ this.model = options.model;
+
+ // Maintain state and history when navigating
+ this.listenTo( this.model, 'update:diff', _.debounce( this.updateUrl, 250 ) );
+ this.listenTo( this.model, 'change:compareTwoMode', this.updateUrl );
+ },
+
+ baseUrl: function( url ) {
+ return this.model.get('baseUrl') + url;
+ },
+
+ updateUrl: function() {
+ var from = this.model.has('from') ? this.model.get('from').id : 0,
+ to = this.model.get('to').id;
+ if ( this.model.get('compareTwoMode' ) ) {
+ this.navigate( this.baseUrl( '?from=' + from + '&to=' + to ), { replace: true } );
+ } else {
+ this.navigate( this.baseUrl( '?revision=' + to ), { replace: true } );
+ }
+ },
+
+ handleRoute: function( a, b ) {
+ var compareTwo = _.isUndefined( b );
+
+ if ( ! compareTwo ) {
+ b = this.model.revisions.get( a );
+ a = this.model.revisions.prev( b );
+ b = b ? b.id : 0;
+ a = a ? a.id : 0;
+ }
+ }
+ });
+
+ // Initialize the revisions UI.
+ revisions.init = function() {
+ revisions.view.frame = new revisions.view.Frame({
+ model: new revisions.model.FrameState({}, {
+ revisions: new revisions.model.Revisions( revisions.settings.revisionData )
+ })
+ }).render();
+ };
+
+ $( revisions.init );
+}(jQuery));
diff --git a/wp-admin/js/revisions.min.js b/wp-admin/js/revisions.min.js
new file mode 100644
index 0000000..85b9eac
--- /dev/null
+++ b/wp-admin/js/revisions.min.js
@@ -0,0 +1 @@
+window.wp=window.wp||{},function(a){var b;b=wp.revisions={model:{},view:{},controller:{}},b.settings=_.isUndefined(_wpRevisionsSettings)?{}:_wpRevisionsSettings,b.debug=!1,b.log=function(){window.console&&b.debug&&window.console.log.apply(window.console,arguments)},a.fn.allOffsets=function(){var b=this.offset()||{top:0,left:0},c=a(window);return _.extend(b,{right:c.width()-b.left-this.outerWidth(),bottom:c.height()-b.top-this.outerHeight()})},a.fn.allPositions=function(){var a=this.position()||{top:0,left:0},b=this.parent();return _.extend(a,{right:b.outerWidth()-a.left-this.outerWidth(),bottom:b.outerHeight()-a.top-this.outerHeight()})},b.settings.to&&(b.settings.to=parseInt(b.settings.to,10)),b.settings.from&&(b.settings.from=parseInt(b.settings.from,10)),b.settings.compareTwoMode&&(b.settings.compareTwoMode="1"===b.settings.compareTwoMode),b.model.Slider=Backbone.Model.extend({defaults:{value:null,values:null,min:0,max:1,step:1,range:!1,compareTwoMode:!1},initialize:function(a){this.frame=a.frame,this.revisions=a.revisions,this.listenTo(this.frame,"update:revisions",this.receiveRevisions),this.listenTo(this.frame,"change:compareTwoMode",this.updateMode),this.listenTo(this,"change:from",this.handleLocalChanges),this.listenTo(this,"change:to",this.handleLocalChanges),this.listenTo(this,"change:compareTwoMode",this.updateSliderSettings),this.listenTo(this,"update:revisions",this.updateSliderSettings),this.listenTo(this,"change:hoveredRevision",this.hoverRevision),this.set({max:this.revisions.length-1,compareTwoMode:this.frame.get("compareTwoMode"),from:this.frame.get("from"),to:this.frame.get("to")}),this.updateSliderSettings()},getSliderValue:function(a,b){return isRtl?this.revisions.length-this.revisions.indexOf(this.get(a))-1:this.revisions.indexOf(this.get(b))},updateSliderSettings:function(){this.set(this.get("compareTwoMode")?{values:[this.getSliderValue("to","from"),this.getSliderValue("from","to")],value:null,range:!0}:{value:this.getSliderValue("to","to"),values:null,range:!1}),this.trigger("update:slider")},hoverRevision:function(a,b){this.trigger("hovered:revision",b)},updateMode:function(a,b){this.set({compareTwoMode:b})},handleLocalChanges:function(){this.frame.set({from:this.get("from"),to:this.get("to")})},receiveRevisions:function(a,b){(this.get("from")!==a||this.get("to")!==b)&&(this.set({from:a,to:b},{silent:!0}),this.trigger("update:revisions",a,b))}}),b.model.Tooltip=Backbone.Model.extend({defaults:{revision:null,offset:{},hovering:!1,scrubbing:!1},initialize:function(a){this.frame=a.frame,this.revisions=a.revisions,this.slider=a.slider,this.listenTo(this.slider,"hovered:revision",this.updateRevision),this.listenTo(this.slider,"change:hovering",this.setHovering),this.listenTo(this.slider,"change:scrubbing",this.setScrubbing)},updateRevision:function(a){this.set({revision:a})},setHovering:function(a,b){this.set({hovering:b})},setScrubbing:function(a,b){this.set({scrubbing:b})}}),b.model.Revision=Backbone.Model.extend({}),b.model.Revisions=Backbone.Collection.extend({model:b.model.Revision,initialize:function(){_.bindAll(this,"next","prev")},next:function(a){var b=this.indexOf(a);return-1!==b&&b!==this.length-1?this.at(b+1):void 0},prev:function(a){var b=this.indexOf(a);return-1!==b&&0!==b?this.at(b-1):void 0}}),b.model.Field=Backbone.Model.extend({}),b.model.Fields=Backbone.Collection.extend({model:b.model.Field}),b.model.Diff=Backbone.Model.extend({initialize:function(){var a=this.get("fields");this.unset("fields"),this.fields=new b.model.Fields(a)}}),b.model.Diffs=Backbone.Collection.extend({initialize:function(a,b){_.bindAll(this,"getClosestUnloaded"),this.loadAll=_.once(this._loadAll),this.revisions=b.revisions,this.requests={}},model:b.model.Diff,ensure:function(b,c){var d=this.get(b),e=this.requests[b],f=a.Deferred(),g={},h=b.split(":")[0],i=b.split(":")[1];return g[b]=!0,wp.revisions.log("ensure",b),this.trigger("ensure",g,h,i,f.promise()),d?f.resolveWith(c,[d]):(this.trigger("ensure:load",g,h,i,f.promise()),_.each(g,_.bind(function(a){this.requests[a]&&delete g[a],this.get(a)&&delete g[a]},this)),e||(g[b]=!0,e=this.load(_.keys(g))),e.done(_.bind(function(){f.resolveWith(c,[this.get(b)])},this)).fail(_.bind(function(){f.reject()}))),f.promise()},getClosestUnloaded:function(a,b){var c=this;return _.chain([0].concat(a)).initial().zip(a).sortBy(function(a){return Math.abs(b-a[1])}).map(function(a){return a.join(":")}).filter(function(a){return _.isUndefined(c.get(a))&&!c.requests[a]}).value()},_loadAll:function(b,c,d){var e=this,f=a.Deferred(),g=_.first(this.getClosestUnloaded(b,c),d);return _.size(g)>0?this.load(g).done(function(){e._loadAll(b,c,d).done(function(){f.resolve()})}).fail(function(){1===d?f.reject():e._loadAll(b,c,Math.ceil(d/2)).done(function(){f.resolve()})}):f.resolve(),f},load:function(a){return wp.revisions.log("load",a),this.fetch({data:{compare:a},remove:!1}).done(function(){wp.revisions.log("load:complete",a)})},sync:function(a,c,d){if("read"===a){d=d||{},d.context=this,d.data=_.extend(d.data||{},{action:"get-revision-diffs",post_id:b.settings.postId});var e=wp.ajax.send(d),f=this.requests;return d.data.compare&&_.each(d.data.compare,function(a){f[a]=e}),e.always(function(){d.data.compare&&_.each(d.data.compare,function(a){delete f[a]})}),e}return Backbone.Model.prototype.sync.apply(this,arguments)}}),b.model.FrameState=Backbone.Model.extend({defaults:{loading:!1,error:!1,compareTwoMode:!1},initialize:function(a,c){var d={};_.bindAll(this,"receiveDiff"),this._debouncedEnsureDiff=_.debounce(this._ensureDiff,200),this.revisions=c.revisions,this.diffs=new b.model.Diffs([],{revisions:this.revisions}),this.diffs.set(b.settings.diffData),this.listenTo(this,"change:from",this.changeRevisionHandler),this.listenTo(this,"change:to",this.changeRevisionHandler),this.listenTo(this,"change:compareTwoMode",this.changeMode),this.listenTo(this,"update:revisions",this.updatedRevisions),this.listenTo(this.diffs,"ensure:load",this.updateLoadingStatus),this.listenTo(this,"update:diff",this.updateLoadingStatus),d.to=this.revisions.get(b.settings.to),d.from=this.revisions.get(b.settings.from),d.compareTwoMode=b.settings.compareTwoMode,d.baseUrl=b.settings.baseUrl,this.set(d),window.history&&window.history.pushState&&(this.router=new b.Router({model:this}),Backbone.history.start({pushState:!0}))},updateLoadingStatus:function(){this.set("error",!1),this.set("loading",!this.diff())},changeMode:function(a,b){b&&0===this.revisions.indexOf(this.get("to"))&&this.set({from:this.revisions.at(0),to:this.revisions.at(1)})},updatedRevisions:function(a,b){this.get("compareTwoMode")||this.diffs.loadAll(this.revisions.pluck("id"),b.id,40)},diff:function(){return this.diffs.get(this._diffId)},updateDiff:function(b){var c,d,e,f;return b=b||{},c=this.get("from"),d=this.get("to"),e=(c?c.id:0)+":"+d.id,this._diffId===e?a.Deferred().reject().promise():(this._diffId=e,this.trigger("update:revisions",c,d),f=this.diffs.get(e),f?(this.receiveDiff(f),a.Deferred().resolve().promise()):b.immediate?this._ensureDiff():(this._debouncedEnsureDiff(),a.Deferred().reject().promise()))},changeRevisionHandler:function(){this.updateDiff()},receiveDiff:function(a){_.isUndefined(a)||_.isUndefined(a.id)?this.set({loading:!1,error:!0}):this._diffId===a.id&&this.trigger("update:diff",a)},_ensureDiff:function(){return this.diffs.ensure(this._diffId,this).always(this.receiveDiff)}}),b.view.Frame=wp.Backbone.View.extend({className:"revisions",template:wp.template("revisions-frame"),initialize:function(){this.listenTo(this.model,"update:diff",this.renderDiff),this.listenTo(this.model,"change:compareTwoMode",this.updateCompareTwoMode),this.listenTo(this.model,"change:loading",this.updateLoadingStatus),this.listenTo(this.model,"change:error",this.updateErrorStatus),this.views.set(".revisions-control-frame",new b.view.Controls({model:this.model}))},render:function(){return wp.Backbone.View.prototype.render.apply(this,arguments),a("html").css("overflow-y","scroll"),a("#wpbody-content .wrap").append(this.el),this.updateCompareTwoMode(),this.renderDiff(this.model.diff()),this.views.ready(),this},renderDiff:function(a){this.views.set(".revisions-diff-frame",new b.view.Diff({model:a}))},updateLoadingStatus:function(){this.$el.toggleClass("loading",this.model.get("loading"))},updateErrorStatus:function(){this.$el.toggleClass("diff-error",this.model.get("error"))},updateCompareTwoMode:function(){this.$el.toggleClass("comparing-two-revisions",this.model.get("compareTwoMode"))}}),b.view.Controls=wp.Backbone.View.extend({className:"revisions-controls",initialize:function(){_.bindAll(this,"setWidth"),this.views.add(new b.view.Buttons({model:this.model})),this.views.add(new b.view.Checkbox({model:this.model}));var a=new b.model.Slider({frame:this.model,revisions:this.model.revisions}),c=new b.model.Tooltip({frame:this.model,revisions:this.model.revisions,slider:a});this.views.add(new b.view.Tooltip({model:c})),this.views.add(new b.view.Tickmarks({model:c})),this.views.add(new b.view.Slider({model:a})),this.views.add(new b.view.Metabox({model:this.model}))},ready:function(){this.top=this.$el.offset().top,this.window=a(window),this.window.on("scroll.wp.revisions",{controls:this},function(a){var b=a.data.controls,c=b.$el.parent(),d=b.window.scrollTop(),e=b.views.parent;d>=b.top?(e.$el.hasClass("pinned")||(b.setWidth(),c.css("height",c.height()+"px"),b.window.on("resize.wp.revisions.pinning click.wp.revisions.pinning",{controls:b},function(a){a.data.controls.setWidth()})),e.$el.addClass("pinned")):e.$el.hasClass("pinned")?(b.window.off(".wp.revisions.pinning"),b.$el.css("width","auto"),e.$el.removeClass("pinned"),c.css("height","auto"),b.top=b.$el.offset().top):b.top=b.$el.offset().top})},setWidth:function(){this.$el.css("width",this.$el.parent().width()+"px")}}),b.view.Tickmarks=wp.Backbone.View.extend({className:"revisions-tickmarks",direction:isRtl?"right":"left",initialize:function(){this.listenTo(this.model,"change:revision",this.reportTickPosition)},reportTickPosition:function(a,b){var c,d,e,f,g=this.model.revisions.indexOf(b);d=this.$el.allOffsets(),e=this.$el.parent().allOffsets(),g===this.model.revisions.length-1?c={rightPlusWidth:d.left-e.left+1,leftPlusWidth:d.right-e.right+1}:(f=this.$("div:nth-of-type("+(g+1)+")"),c=f.allPositions(),_.extend(c,{left:c.left+d.left-e.left,right:c.right+d.right-e.right}),_.extend(c,{leftPlusWidth:c.left+f.outerWidth(),rightPlusWidth:c.right+f.outerWidth()})),this.model.set({offset:c})},ready:function(){var a,b;a=this.model.revisions.length-1,b=1/a,this.$el.css("width",50*this.model.revisions.length+"px"),_(a).times(function(a){this.$el.append('
')},this)}}),b.view.Metabox=wp.Backbone.View.extend({className:"revisions-meta",initialize:function(){this.views.add(new b.view.MetaFrom({model:this.model,className:"diff-meta diff-meta-from"})),this.views.add(new b.view.MetaTo({model:this.model}))}}),b.view.Meta=wp.Backbone.View.extend({template:wp.template("revisions-meta"),events:{"click .restore-revision":"restoreRevision"},initialize:function(){this.listenTo(this.model,"update:revisions",this.render)},prepare:function(){return _.extend(this.model.toJSON()[this.type]||{},{type:this.type})},restoreRevision:function(){document.location=this.model.get("to").attributes.restoreUrl}}),b.view.MetaFrom=b.view.Meta.extend({className:"diff-meta diff-meta-from",type:"from"}),b.view.MetaTo=b.view.Meta.extend({className:"diff-meta diff-meta-to",type:"to"}),b.view.Checkbox=wp.Backbone.View.extend({className:"revisions-checkbox",template:wp.template("revisions-checkbox"),events:{"click .compare-two-revisions":"compareTwoToggle"},initialize:function(){this.listenTo(this.model,"change:compareTwoMode",this.updateCompareTwoMode)},ready:function(){this.model.revisions.length<3&&a(".revision-toggle-compare-mode").hide()},updateCompareTwoMode:function(){this.$(".compare-two-revisions").prop("checked",this.model.get("compareTwoMode"))},compareTwoToggle:function(){this.model.set({compareTwoMode:a(".compare-two-revisions").prop("checked")})}}),b.view.Tooltip=wp.Backbone.View.extend({className:"revisions-tooltip",template:wp.template("revisions-meta"),initialize:function(){this.listenTo(this.model,"change:offset",this.render),this.listenTo(this.model,"change:hovering",this.toggleVisibility),this.listenTo(this.model,"change:scrubbing",this.toggleVisibility)},prepare:function(){return _.isNull(this.model.get("revision"))?void 0:_.extend({type:"tooltip"},{attributes:this.model.get("revision").toJSON()})},render:function(){var a,b,c,d,e={},f=this.model.revisions.indexOf(this.model.get("revision"))+1;d=f/this.model.revisions.length>.5,isRtl?(b=d?"left":"right",c=d?"leftPlusWidth":b):(b=d?"right":"left",c=d?"rightPlusWidth":b),a="right"===b?"left":"right",wp.Backbone.View.prototype.render.apply(this,arguments),e[b]=this.model.get("offset")[c]+"px",e[a]="",this.$el.toggleClass("flipped",d).css(e)},visible:function(){return this.model.get("scrubbing")||this.model.get("hovering")},toggleVisibility:function(){this.visible()?this.$el.stop().show().fadeTo(100-100*this.el.style.opacity,1):this.$el.stop().fadeTo(300*this.el.style.opacity,0,function(){a(this).hide()})}}),b.view.Buttons=wp.Backbone.View.extend({className:"revisions-buttons",template:wp.template("revisions-buttons"),events:{"click .revisions-next .button":"nextRevision","click .revisions-previous .button":"previousRevision"},initialize:function(){this.listenTo(this.model,"update:revisions",this.disabledButtonCheck)},ready:function(){this.disabledButtonCheck()},gotoModel:function(a){var b={to:this.model.revisions.at(a)};a?b.from=this.model.revisions.at(a-1):this.model.unset("from",{silent:!0}),this.model.set(b)},nextRevision:function(){var a=this.model.revisions.indexOf(this.model.get("to"))+1;this.gotoModel(a)},previousRevision:function(){var a=this.model.revisions.indexOf(this.model.get("to"))-1;this.gotoModel(a)},disabledButtonCheck:function(){var b=this.model.revisions.length-1,c=0,d=a(".revisions-next .button"),e=a(".revisions-previous .button"),f=this.model.revisions.indexOf(this.model.get("to"));d.prop("disabled",b===f),e.prop("disabled",c===f)}}),b.view.Slider=wp.Backbone.View.extend({className:"wp-slider",direction:isRtl?"right":"left",events:{mousemove:"mouseMove"},initialize:function(){_.bindAll(this,"start","slide","stop","mouseMove","mouseEnter","mouseLeave"),this.listenTo(this.model,"update:slider",this.applySliderSettings)},ready:function(){this.$el.css("width",50*this.model.revisions.length+"px"),this.$el.slider(_.extend(this.model.toJSON(),{start:this.start,slide:this.slide,stop:this.stop})),this.$el.hoverIntent({over:this.mouseEnter,out:this.mouseLeave,timeout:800}),this.applySliderSettings()},mouseMove:function(b){var c=this.model.revisions.length-1,d=this.$el.allOffsets()[this.direction],e=this.$el.width(),f=e/c,g=(isRtl?a(window).width()-b.pageX:b.pageX)-d,h=Math.floor((g+f/2)/f);0>h?h=0:h>=this.model.revisions.length&&(h=this.model.revisions.length-1),this.model.set({hoveredRevision:this.model.revisions.at(h)})},mouseLeave:function(){this.model.set({hovering:!1})},mouseEnter:function(){this.model.set({hovering:!0})},applySliderSettings:function(){this.$el.slider(_.pick(this.model.toJSON(),"value","values","range"));var a=this.$("a.ui-slider-handle");this.model.get("compareTwoMode")?(a.first().toggleClass("to-handle",!!isRtl).toggleClass("from-handle",!isRtl),a.last().toggleClass("from-handle",!!isRtl).toggleClass("to-handle",!isRtl)):a.removeClass("from-handle to-handle")},start:function(b,c){this.model.set({scrubbing:!0}),a(window).on("mousemove.wp.revisions",{view:this},function(b){var d,e=b.data.view,f=e.$el.offset().left,g=f,h=f+e.$el.width(),i=h,j="0",k="100%",l=a(c.handle);e.model.get("compareTwoMode")&&(d=l.parent().find(".ui-slider-handle"),l.is(d.first())?(i=d.last().offset().left,k=i-g):(f=d.first().offset().left+d.first().width(),j=f-g)),b.pageXi?l.css("left",k):l.css("left",b.pageX-g)})},getPosition:function(a){return isRtl?this.model.revisions.length-a-1:a},slide:function(a,b){var c,d;if(this.model.get("compareTwoMode")){if(b.values[1]===b.values[0])return!1;isRtl&&b.values.reverse(),c={from:this.model.revisions.at(this.getPosition(b.values[0])),to:this.model.revisions.at(this.getPosition(b.values[1]))}}else c={to:this.model.revisions.at(this.getPosition(b.value))},c.from=this.getPosition(b.value)>0?this.model.revisions.at(this.getPosition(b.value)-1):void 0;d=this.model.revisions.at(this.getPosition(b.value)),this.model.get("scrubbing")&&(c.hoveredRevision=d),this.model.set(c)},stop:function(){a(window).off("mousemove.wp.revisions"),this.model.updateSliderSettings(),this.model.set({scrubbing:!1})}}),b.view.Diff=wp.Backbone.View.extend({className:"revisions-diff",template:wp.template("revisions-diff"),prepare:function(){return _.extend({fields:this.model.fields.toJSON()},this.options)}}),b.Router=Backbone.Router.extend({initialize:function(a){this.model=a.model,this.listenTo(this.model,"update:diff",_.debounce(this.updateUrl,250)),this.listenTo(this.model,"change:compareTwoMode",this.updateUrl)},baseUrl:function(a){return this.model.get("baseUrl")+a},updateUrl:function(){var a=this.model.has("from")?this.model.get("from").id:0,b=this.model.get("to").id;this.model.get("compareTwoMode")?this.navigate(this.baseUrl("?from="+a+"&to="+b),{replace:!0}):this.navigate(this.baseUrl("?revision="+b),{replace:!0})},handleRoute:function(a,b){var c=_.isUndefined(b);c||(b=this.model.revisions.get(a),a=this.model.revisions.prev(b),b=b?b.id:0,a=a?a.id:0)}}),b.init=function(){b.view.frame=new b.view.Frame({model:new b.model.FrameState({},{revisions:new b.model.Revisions(b.settings.revisionData)})}).render()},a(b.init)}(jQuery);
\ No newline at end of file
diff --git a/wp-admin/js/set-post-thumbnail.js b/wp-admin/js/set-post-thumbnail.js
index e6ac875..68abbcc 100644
--- a/wp-admin/js/set-post-thumbnail.js
+++ b/wp-admin/js/set-post-thumbnail.js
@@ -1,9 +1,12 @@
-function WPSetAsThumbnail(id, nonce){
+/* global setPostThumbnailL10n, ajaxurl, post_id, alert */
+/* exported WPSetAsThumbnail */
+
+function WPSetAsThumbnail( id, nonce ) {
var $link = jQuery('a#wp-post-thumbnail-' + id);
$link.text( setPostThumbnailL10n.saving );
jQuery.post(ajaxurl, {
- action:"set-post-thumbnail", post_id: post_id, thumbnail_id: id, _ajax_nonce: nonce, cookie: encodeURIComponent(document.cookie)
+ action: 'set-post-thumbnail', post_id: post_id, thumbnail_id: id, _ajax_nonce: nonce, cookie: encodeURIComponent( document.cookie )
}, function(str){
var win = window.dialogArguments || opener || parent || top;
$link.text( setPostThumbnailL10n.setThumbnail );
diff --git a/wp-admin/js/set-post-thumbnail.min.js b/wp-admin/js/set-post-thumbnail.min.js
index ffe08d8..dcea06a 100644
--- a/wp-admin/js/set-post-thumbnail.min.js
+++ b/wp-admin/js/set-post-thumbnail.min.js
@@ -1 +1 @@
-function WPSetAsThumbnail(c,b){var a=jQuery("a#wp-post-thumbnail-"+c);a.text(setPostThumbnailL10n.saving);jQuery.post(ajaxurl,{action:"set-post-thumbnail",post_id:post_id,thumbnail_id:c,_ajax_nonce:b,cookie:encodeURIComponent(document.cookie)},function(e){var d=window.dialogArguments||opener||parent||top;a.text(setPostThumbnailL10n.setThumbnail);if(e=="0"){alert(setPostThumbnailL10n.error)}else{jQuery("a.wp-post-thumbnail").show();a.text(setPostThumbnailL10n.done);a.fadeOut(2000);d.WPSetThumbnailID(c);d.WPSetThumbnailHTML(e)}})};
\ No newline at end of file
+function WPSetAsThumbnail(a,b){var c=jQuery("a#wp-post-thumbnail-"+a);c.text(setPostThumbnailL10n.saving),jQuery.post(ajaxurl,{action:"set-post-thumbnail",post_id:post_id,thumbnail_id:a,_ajax_nonce:b,cookie:encodeURIComponent(document.cookie)},function(b){var d=window.dialogArguments||opener||parent||top;c.text(setPostThumbnailL10n.setThumbnail),"0"==b?alert(setPostThumbnailL10n.error):(jQuery("a.wp-post-thumbnail").show(),c.text(setPostThumbnailL10n.done),c.fadeOut(2e3),d.WPSetThumbnailID(a),d.WPSetThumbnailHTML(b))})}
\ No newline at end of file
diff --git a/wp-admin/js/svg-painter.js b/wp-admin/js/svg-painter.js
new file mode 100644
index 0000000..7b68760
--- /dev/null
+++ b/wp-admin/js/svg-painter.js
@@ -0,0 +1,240 @@
+/**
+ * Attempt to re-color SVG icons used in the admin menu or the toolbar
+ *
+ */
+
+window.wp = window.wp || {};
+
+wp.svgPainter = ( function( $, window, document, undefined ) {
+ 'use strict';
+ var selector, base64, painter,
+ colorscheme = {},
+ elements = [];
+
+ $(document).ready( function() {
+ // detection for browser SVG capability
+ if ( document.implementation.hasFeature( 'http://www.w3.org/TR/SVG11/feature#Image', '1.1' ) ) {
+ $( document.body ).removeClass( 'no-svg' ).addClass( 'svg' );
+ wp.svgPainter.init();
+ }
+ });
+
+ /**
+ * Needed only for IE9
+ *
+ * Based on jquery.base64.js 0.0.3 - https://github.com/yckart/jquery.base64.js
+ *
+ * Based on: https://gist.github.com/Yaffle/1284012
+ *
+ * Copyright (c) 2012 Yannick Albert (http://yckart.com)
+ * Licensed under the MIT license
+ * http://www.opensource.org/licenses/mit-license.php
+ */
+ base64 = ( function() {
+ var c,
+ b64 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/',
+ a256 = '',
+ r64 = [256],
+ r256 = [256],
+ i = 0;
+
+ function init() {
+ while( i < 256 ) {
+ c = String.fromCharCode(i);
+ a256 += c;
+ r256[i] = i;
+ r64[i] = b64.indexOf(c);
+ ++i;
+ }
+ }
+
+ function code( s, discard, alpha, beta, w1, w2 ) {
+ var tmp, length,
+ buffer = 0,
+ i = 0,
+ result = '',
+ bitsInBuffer = 0;
+
+ s = String(s);
+ length = s.length;
+
+ while( i < length ) {
+ c = s.charCodeAt(i);
+ c = c < 256 ? alpha[c] : -1;
+
+ buffer = ( buffer << w1 ) + c;
+ bitsInBuffer += w1;
+
+ while( bitsInBuffer >= w2 ) {
+ bitsInBuffer -= w2;
+ tmp = buffer >> bitsInBuffer;
+ result += beta.charAt(tmp);
+ buffer ^= tmp << bitsInBuffer;
+ }
+ ++i;
+ }
+
+ if ( ! discard && bitsInBuffer > 0 ) {
+ result += beta.charAt( buffer << ( w2 - bitsInBuffer ) );
+ }
+
+ return result;
+ }
+
+ function btoa( plain ) {
+ if ( ! c ) {
+ init();
+ }
+
+ plain = code( plain, false, r256, b64, 8, 6 );
+ return plain + '===='.slice( ( plain.length % 4 ) || 4 );
+ }
+
+ function atob( coded ) {
+ var i;
+
+ if ( ! c ) {
+ init();
+ }
+
+ coded = coded.replace( /[^A-Za-z0-9\+\/\=]/g, '' );
+ coded = String(coded).split('=');
+ i = coded.length;
+
+ do {
+ --i;
+ coded[i] = code( coded[i], true, r64, a256, 6, 8 );
+ } while ( i > 0 );
+
+ coded = coded.join('');
+ return coded;
+ }
+
+ return {
+ atob: atob,
+ btoa: btoa
+ };
+ })();
+
+ return {
+ init: function() {
+ painter = this;
+ selector = $( '#adminmenu .wp-menu-image, #wpadminbar .ab-item' );
+
+ this.setColors();
+ this.findElements();
+ this.paint();
+ },
+
+ setColors: function( colors ) {
+ if ( typeof colors === 'undefined' && typeof window._wpColorScheme !== 'undefined' ) {
+ colors = window._wpColorScheme;
+ }
+
+ if ( colors && colors.icons && colors.icons.base && colors.icons.current && colors.icons.focus ) {
+ colorscheme = colors.icons;
+ }
+ },
+
+ findElements: function() {
+ selector.each( function() {
+ var $this = $(this), bgImage = $this.css( 'background-image' );
+
+ if ( bgImage && bgImage.indexOf( 'data:image/svg+xml;base64' ) != -1 ) {
+ elements.push( $this );
+ }
+ });
+ },
+
+ paint: function() {
+ // loop through all elements
+ $.each( elements, function( index, $element ) {
+ var $menuitem = $element.parent().parent();
+
+ if ( $menuitem.hasClass( 'current' ) || $menuitem.hasClass( 'wp-has-current-submenu' ) ) {
+ // paint icon in 'current' color
+ painter.paintElement( $element, 'current' );
+ } else {
+ // paint icon in base color
+ painter.paintElement( $element, 'base' );
+
+ // set hover callbacks
+ $menuitem.hover(
+ function() {
+ painter.paintElement( $element, 'focus' );
+ },
+ function() {
+ // Match the delay from hoverIntent
+ window.setTimeout( function() {
+ painter.paintElement( $element, 'base' );
+ }, 100 );
+ }
+ );
+ }
+ });
+ },
+
+ paintElement: function( $element, colorType ) {
+ var xml, encoded, color;
+
+ if ( ! colorType || ! colorscheme.hasOwnProperty( colorType ) ) {
+ return;
+ }
+
+ color = colorscheme[ colorType ];
+
+ // only accept hex colors: #101 or #101010
+ if ( ! color.match( /^(#[0-9a-f]{3}|#[0-9a-f]{6})$/i ) ) {
+ return;
+ }
+
+ xml = $element.data( 'wp-ui-svg-' + color );
+
+ if ( xml === 'none' ) {
+ return;
+ }
+
+ if ( ! xml ) {
+ encoded = $element.css( 'background-image' ).match( /.+data:image\/svg\+xml;base64,([A-Za-z0-9\+\/\=]+)/ );
+
+ if ( ! encoded || ! encoded[1] ) {
+ $element.data( 'wp-ui-svg-' + color, 'none' );
+ return;
+ }
+
+ try {
+ if ( 'atob' in window ) {
+ xml = window.atob( encoded[1] );
+ } else {
+ xml = base64.atob( encoded[1] );
+ }
+ } catch ( error ) {}
+
+ if ( xml ) {
+ // replace `fill` attributes
+ xml = xml.replace( /fill="(.+?)"/g, 'fill="' + color + '"');
+
+ // replace `style` attributes
+ xml = xml.replace( /style="(.+?)"/g, 'style="fill:' + color + '"');
+
+ // replace `fill` properties in `
-
- '.__('Akismet has detected a problem.').' '.sprintf(__('Some comments have not yet been checked for spam by Akismet. They have been temporarily held for moderation. Please check your Akismet configuration and contact your web host if problems persist.'), 'admin.php?page=akismet-key-config').'
'. __('History') . ' ';
- }
- }
-
- $a = $b;
- }
-
- if ( $desc )
- echo ''.esc_html( $desc ).' ';
- foreach ( $history as $row ) {
- $time = date( 'D d M Y @ h:i:m a', $row['time'] ) . ' GMT';
- echo '
' . sprintf( __('%s ago'), human_time_diff( $row['time'] ) ) . ' - ';
- echo esc_html( $row['message'] ) . '
';
- }
-
- echo '
';
- foreach ( $history as $row ) {
- echo '' . sprintf( __('%s ago'), human_time_diff( $row['time'] ) ) . ' ';
- echo '' . esc_html( $row['message'] ) . ' ';
- }
-
- echo ' ';
- }
-}
-
-#add_action( 'manage_comments_custom_column', 'akismet_comment_column_row', 10, 2 );
-
-// END FIXME
-
-// call out URLS in comments
-function akismet_text_add_link_callback( $m ) {
- // bare link?
- if ( $m[4] == $m[2] )
- return '';
- else
- return '';
-}
-
-function akismet_text_add_link_class( $comment_text ) {
- return preg_replace_callback( '#]*)href="([^"]+)"([^>]*)>(.*?) #i', 'akismet_text_add_link_callback', $comment_text );
-}
-
-add_filter('comment_text', 'akismet_text_add_link_class');
-
-
-// WP 2.5+
-function akismet_rightnow() {
- global $submenu, $wp_db_version;
-
- if ( 8645 < $wp_db_version ) // 2.7
- $link = 'edit-comments.php?comment_status=spam';
- elseif ( isset( $submenu['edit-comments.php'] ) )
- $link = 'edit-comments.php?page=akismet-admin';
- else
- $link = 'edit.php?page=akismet-admin';
-
- if ( $count = get_option('akismet_spam_count') ) {
- $intro = sprintf( _n(
- 'Akismet has protected your site from %2$s spam comment already. ',
- 'Akismet has protected your site from %2$s spam comments already. ',
- $count
- ), 'http://akismet.com/?return=true', number_format_i18n( $count ) );
- } else {
- $intro = sprintf( __('Akismet blocks spam from getting to your blog. '), 'http://akismet.com/?return=true' );
- }
-
- $link = function_exists( 'esc_url' ) ? esc_url( $link ) : clean_url( $link );
- if ( $queue_count = akismet_spam_count() ) {
- $queue_text = sprintf( _n(
- 'There\'s %1$s comment in your spam queue right now.',
- 'There are %1$s comments in your spam queue right now.',
- $queue_count
- ), number_format_i18n( $queue_count ), $link );
- } else {
- $queue_text = sprintf( __( "There's nothing in your spam queue at the moment." ), $link );
- }
-
- $text = $intro . '$text
\n";
-}
-
-add_action('rightnow_end', 'akismet_rightnow');
-
-
-// For WP >= 2.5
-function akismet_check_for_spam_button($comment_status) {
- if ( 'approved' == $comment_status )
- return;
- if ( function_exists('plugins_url') )
- $link = 'admin.php?action=akismet_recheck_queue';
- else
- $link = 'edit-comments.php?page=akismet-admin&recheckqueue=true&noheader=true';
- echo " " . __('Check for Spam') . " ";
-}
-add_action('manage_comments_nav', 'akismet_check_for_spam_button');
-
-function akismet_submit_nonspam_comment ( $comment_id ) {
- global $wpdb, $akismet_api_host, $akismet_api_port, $current_user, $current_site;
- $comment_id = (int) $comment_id;
-
- $comment = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID = '$comment_id'");
- if ( !$comment ) // it was deleted
- return;
-
- // use the original version stored in comment_meta if available
- $as_submitted = get_comment_meta( $comment_id, 'akismet_as_submitted', true);
- if ( $as_submitted && is_array($as_submitted) && isset($as_submitted['comment_content']) ) {
- $comment = (object) array_merge( (array)$comment, $as_submitted );
- }
-
- $comment->blog = get_bloginfo('url');
- $comment->blog_lang = get_locale();
- $comment->blog_charset = get_option('blog_charset');
- $comment->permalink = get_permalink($comment->comment_post_ID);
- if ( is_object($current_user) ) {
- $comment->reporter = $current_user->user_login;
- }
- if ( is_object($current_site) ) {
- $comment->site_domain = $current_site->domain;
- }
-
- $comment->user_role = '';
- if ( isset( $comment->user_ID ) )
- $comment->user_role = akismet_get_user_roles($comment->user_ID);
-
- if ( akismet_test_mode() )
- $comment->is_test = 'true';
-
- $post = get_post( $comment->comment_post_ID );
- $comment->comment_post_modified_gmt = $post->post_modified_gmt;
-
- $query_string = '';
- foreach ( $comment as $key => $data )
- $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
-
- $response = akismet_http_post($query_string, $akismet_api_host, "/1.1/submit-ham", $akismet_api_port);
- if ( $comment->reporter ) {
- akismet_update_comment_history( $comment_id, sprintf( __('%s reported this comment as not spam'), $comment->reporter ), 'report-ham' );
- update_comment_meta( $comment_id, 'akismet_user_result', 'false' );
- update_comment_meta( $comment_id, 'akismet_user', $comment->reporter );
- }
-
- do_action('akismet_submit_nonspam_comment', $comment_id, $response[1]);
-}
-
-function akismet_submit_spam_comment ( $comment_id ) {
- global $wpdb, $akismet_api_host, $akismet_api_port, $current_user, $current_site;
- $comment_id = (int) $comment_id;
-
- $comment = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID = '$comment_id'");
- if ( !$comment ) // it was deleted
- return;
- if ( 'spam' != $comment->comment_approved )
- return;
-
- // use the original version stored in comment_meta if available
- $as_submitted = get_comment_meta( $comment_id, 'akismet_as_submitted', true);
- if ( $as_submitted && is_array($as_submitted) && isset($as_submitted['comment_content']) ) {
- $comment = (object) array_merge( (array)$comment, $as_submitted );
- }
-
- $comment->blog = get_bloginfo('url');
- $comment->blog_lang = get_locale();
- $comment->blog_charset = get_option('blog_charset');
- $comment->permalink = get_permalink($comment->comment_post_ID);
- if ( is_object($current_user) ) {
- $comment->reporter = $current_user->user_login;
- }
- if ( is_object($current_site) ) {
- $comment->site_domain = $current_site->domain;
- }
-
- $comment->user_role = '';
- if ( isset( $comment->user_ID ) )
- $comment->user_role = akismet_get_user_roles($comment->user_ID);
-
- if ( akismet_test_mode() )
- $comment->is_test = 'true';
-
- $post = get_post( $comment->comment_post_ID );
- $comment->comment_post_modified_gmt = $post->post_modified_gmt;
-
- $query_string = '';
- foreach ( $comment as $key => $data )
- $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
-
- $response = akismet_http_post($query_string, $akismet_api_host, "/1.1/submit-spam", $akismet_api_port);
- if ( $comment->reporter ) {
- akismet_update_comment_history( $comment_id, sprintf( __('%s reported this comment as spam'), $comment->reporter ), 'report-spam' );
- update_comment_meta( $comment_id, 'akismet_user_result', 'true' );
- update_comment_meta( $comment_id, 'akismet_user', $comment->reporter );
- }
- do_action('akismet_submit_spam_comment', $comment_id, $response[1]);
-}
-
-// For WP 2.7+
-function akismet_transition_comment_status( $new_status, $old_status, $comment ) {
- if ( $new_status == $old_status )
- return;
-
- # we don't need to record a history item for deleted comments
- if ( $new_status == 'delete' )
- return;
-
- if ( !is_admin() )
- return;
-
- if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) && !current_user_can( 'moderate_comments' ) )
- return;
-
- if ( defined('WP_IMPORTING') && WP_IMPORTING == true )
- return;
-
- // if this is present, it means the status has been changed by a re-check, not an explicit user action
- if ( get_comment_meta( $comment->comment_ID, 'akismet_rechecking' ) )
- return;
-
- global $current_user;
- $reporter = '';
- if ( is_object( $current_user ) )
- $reporter = $current_user->user_login;
-
- // Assumption alert:
- // We want to submit comments to Akismet only when a moderator explicitly spams or approves it - not if the status
- // is changed automatically by another plugin. Unfortunately WordPress doesn't provide an unambiguous way to
- // determine why the transition_comment_status action was triggered. And there are several different ways by which
- // to spam and unspam comments: bulk actions, ajax, links in moderation emails, the dashboard, and perhaps others.
- // We'll assume that this is an explicit user action if POST or GET has an 'action' key.
- if ( isset($_POST['action']) || isset($_GET['action']) ) {
- if ( $new_status == 'spam' && ( $old_status == 'approved' || $old_status == 'unapproved' || !$old_status ) ) {
- return akismet_submit_spam_comment( $comment->comment_ID );
- } elseif ( $old_status == 'spam' && ( $new_status == 'approved' || $new_status == 'unapproved' ) ) {
- return akismet_submit_nonspam_comment( $comment->comment_ID );
- }
- }
-
- akismet_update_comment_history( $comment->comment_ID, sprintf( __('%s changed the comment status to %s'), $reporter, $new_status ), 'status-' . $new_status );
-}
-
-add_action( 'transition_comment_status', 'akismet_transition_comment_status', 10, 3 );
-
-// Total spam in queue
-// get_option( 'akismet_spam_count' ) is the total caught ever
-function akismet_spam_count( $type = false ) {
- global $wpdb;
-
- if ( !$type ) { // total
- $count = wp_cache_get( 'akismet_spam_count', 'widget' );
- if ( false === $count ) {
- if ( function_exists('wp_count_comments') ) {
- $count = wp_count_comments();
- $count = $count->spam;
- } else {
- $count = (int) $wpdb->get_var("SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_approved = 'spam'");
- }
- wp_cache_set( 'akismet_spam_count', $count, 'widget', 3600 );
- }
- return $count;
- } elseif ( 'comments' == $type || 'comment' == $type ) { // comments
- $type = '';
- } else { // pingback, trackback, ...
- $type = $wpdb->escape( $type );
- }
-
- return (int) $wpdb->get_var("SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_approved = 'spam' AND comment_type='$type'");
-}
-
-
-function akismet_recheck_queue() {
- global $wpdb, $akismet_api_host, $akismet_api_port;
-
- akismet_fix_scheduled_recheck();
-
- if ( ! ( isset( $_GET['recheckqueue'] ) || ( isset( $_REQUEST['action'] ) && 'akismet_recheck_queue' == $_REQUEST['action'] ) ) )
- return;
-
- $moderation = $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE comment_approved = '0'", ARRAY_A );
- foreach ( (array) $moderation as $c ) {
- $c['user_ip'] = $c['comment_author_IP'];
- $c['user_agent'] = $c['comment_agent'];
- $c['referrer'] = '';
- $c['blog'] = get_bloginfo('url');
- $c['blog_lang'] = get_locale();
- $c['blog_charset'] = get_option('blog_charset');
- $c['permalink'] = get_permalink($c['comment_post_ID']);
-
- $c['user_role'] = '';
- if ( isset( $c['user_ID'] ) )
- $c['user_role'] = akismet_get_user_roles($c['user_ID']);
-
- if ( akismet_test_mode() )
- $c['is_test'] = 'true';
-
- $id = (int) $c['comment_ID'];
-
- $query_string = '';
- foreach ( $c as $key => $data )
- $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
-
- add_comment_meta( $c['comment_ID'], 'akismet_rechecking', true );
- $response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port);
- if ( 'true' == $response[1] ) {
- wp_set_comment_status($c['comment_ID'], 'spam');
- update_comment_meta( $c['comment_ID'], 'akismet_result', 'true' );
- delete_comment_meta( $c['comment_ID'], 'akismet_error' );
- akismet_update_comment_history( $c['comment_ID'], __('Akismet re-checked and caught this comment as spam'), 'check-spam' );
-
- } elseif ( 'false' == $response[1] ) {
- update_comment_meta( $c['comment_ID'], 'akismet_result', 'false' );
- delete_comment_meta( $c['comment_ID'], 'akismet_error' );
- akismet_update_comment_history( $c['comment_ID'], __('Akismet re-checked and cleared this comment'), 'check-ham' );
- // abnormal result: error
- } else {
- update_comment_meta( $c['comment_ID'], 'akismet_result', 'error' );
- akismet_update_comment_history( $c['comment_ID'], sprintf( __('Akismet was unable to re-check this comment (response: %s)'), substr($response[1], 0, 50)), 'check-error' );
- }
-
- delete_comment_meta( $c['comment_ID'], 'akismet_rechecking' );
- }
- $redirect_to = isset( $_SERVER['HTTP_REFERER'] ) ? $_SERVER['HTTP_REFERER'] : admin_url( 'edit-comments.php' );
- wp_safe_redirect( $redirect_to );
- exit;
-}
-
-add_action('admin_action_akismet_recheck_queue', 'akismet_recheck_queue');
-
-// Adds an 'x' link next to author URLs, clicking will remove the author URL and show an undo link
-function akismet_remove_comment_author_url() {
- if ( !empty($_POST['id'] ) && check_admin_referer( 'comment_author_url_nonce' ) ) {
- global $wpdb;
- $comment = get_comment( intval($_POST['id']), ARRAY_A );
- if (current_user_can('edit_comment', $comment['comment_ID'])) {
- $comment['comment_author_url'] = '';
- do_action( 'comment_remove_author_url' );
- print(wp_update_comment( $comment ));
- die();
- }
- }
-}
-
-add_action('wp_ajax_comment_author_deurl', 'akismet_remove_comment_author_url');
-
-function akismet_add_comment_author_url() {
- if ( !empty( $_POST['id'] ) && !empty( $_POST['url'] ) && check_admin_referer( 'comment_author_url_nonce' ) ) {
- global $wpdb;
- $comment = get_comment( intval($_POST['id']), ARRAY_A );
- if (current_user_can('edit_comment', $comment['comment_ID'])) {
- $comment['comment_author_url'] = esc_url($_POST['url']);
- do_action( 'comment_add_author_url' );
- print(wp_update_comment( $comment ));
- die();
- }
- }
-}
-
-add_action('wp_ajax_comment_author_reurl', 'akismet_add_comment_author_url');
-
-// Check connectivity between the WordPress blog and Akismet's servers.
-// Returns an associative array of server IP addresses, where the key is the IP address, and value is true (available) or false (unable to connect).
-function akismet_check_server_connectivity() {
- global $akismet_api_host, $akismet_api_port, $wpcom_api_key;
-
- $test_host = 'rest.akismet.com';
-
- // Some web hosts may disable one or both functions
- if ( !function_exists('fsockopen') || !function_exists('gethostbynamel') )
- return array();
-
- $ips = gethostbynamel($test_host);
- if ( !$ips || !is_array($ips) || !count($ips) )
- return array();
-
- $servers = array();
- foreach ( $ips as $ip ) {
- $response = akismet_verify_key( akismet_get_key(), $ip );
- // even if the key is invalid, at least we know we have connectivity
- if ( $response == 'valid' || $response == 'invalid' )
- $servers[$ip] = true;
- else
- $servers[$ip] = false;
- }
-
- return $servers;
-}
-
-// Check the server connectivity and store the results in an option.
-// Cached results will be used if not older than the specified timeout in seconds; use $cache_timeout = 0 to force an update.
-// Returns the same associative array as akismet_check_server_connectivity()
-function akismet_get_server_connectivity( $cache_timeout = 86400 ) {
- $servers = get_option('akismet_available_servers');
- if ( (time() - get_option('akismet_connectivity_time') < $cache_timeout) && $servers !== false )
- return $servers;
-
- // There's a race condition here but the effect is harmless.
- $servers = akismet_check_server_connectivity();
- update_option('akismet_available_servers', $servers);
- update_option('akismet_connectivity_time', time());
- return $servers;
-}
-
-// Returns true if server connectivity was OK at the last check, false if there was a problem that needs to be fixed.
-function akismet_server_connectivity_ok() {
- // skip the check on WPMU because the status page is hidden
- global $wpcom_api_key;
- if ( $wpcom_api_key )
- return true;
- $servers = akismet_get_server_connectivity();
- return !( empty($servers) || !count($servers) || count( array_filter($servers) ) < count($servers) );
-}
-
-function akismet_admin_menu() {
- if ( class_exists( 'Jetpack' ) ) {
- add_action( 'jetpack_admin_menu', 'akismet_load_menu' );
- } else {
- akismet_load_menu();
- }
-}
-
-function akismet_load_menu() {
- if ( class_exists( 'Jetpack' ) ) {
- add_submenu_page( 'jetpack', __( 'Akismet' ), __( 'Akismet' ), 'manage_options', 'akismet-key-config', 'akismet_conf' );
- add_submenu_page( 'jetpack', __( 'Akismet Stats' ), __( 'Akismet Stats' ), 'manage_options', 'akismet-stats-display', 'akismet_stats_display' );
- } else {
- add_submenu_page('plugins.php', __('Akismet'), __('Akismet'), 'manage_options', 'akismet-key-config', 'akismet_conf');
- add_submenu_page('index.php', __('Akismet Stats'), __('Akismet Stats'), 'manage_options', 'akismet-stats-display', 'akismet_stats_display');
- }
-}
diff --git a/wp-content/plugins/akismet/akismet.css b/wp-content/plugins/akismet/akismet.css
deleted file mode 100644
index e96bc8a..0000000
--- a/wp-content/plugins/akismet/akismet.css
+++ /dev/null
@@ -1 +0,0 @@
-#submitted-on{position:relative}#the-comment-list .author .akismet-user-comment-count{display:inline}#the-comment-list .author a span{text-decoration:none;color:#999}#the-comment-list .remove_url{margin-left:3px;color:#999;padding:2px 3px 2px 0}#the-comment-list .remove_url:hover{color:#A7301F;font-weight:bold;padding:2px 2px 2px 0}#dashboard_recent_comments .akismet-status{display:none}.akismet-status{float:right}.akismet-status a{color:#AAA;font-style:italic}span.comment-link a{text-decoration:underline}span.comment-link:after{content:" "attr(title) " ";color:#aaa;text-decoration:none}.mshot-arrow{width:0;height:0;border-top:10px solid transparent;border-bottom:10px solid transparent;border-right:10px solid #5C5C5C;position:absolute;left:-6px;top:91px}.mshot-container{background:#5C5C5C;position:absolute;top:-94px;padding:7px;width:450px;height:338px;z-index:20000;-moz-border-radius:6px;border-radius:6px;-webkit-border-radius:6px}h2.ak-header{padding-left:38px;background:url('img/logo.png') no-repeat 0 9px;margin-bottom:14px;line-height:32px}.key-status{padding:0.4em 1em;color:#fff;font-weight:bold;text-align:center;-webkit-border-radius:3px;border-radius:3px;border-width:1px;border-style:solid;max-width:23.3em}input#key{width:25.3em !important}input#key.valid{border-color:#4F800D}input#key.invalid,input#key.failed{border-color:#888}.key-status.under-input{margin-top:-5px;padding-bottom:0px}.key-status.invalid,.key-status.failed{background-color:#888}.key-status.valid{background-color:#4F800D}.key-status.some{background-color:#993300}.key-status.empty{display:none}table.network-status th,table.network-status td{padding:0.4em;margin:0;text-align:center}table.network-status{border-color:#dfdfdf;border-width:0 0 1px 1px;border-style:solid;border-spacing:0;width:25.6em}table.network-status th,table.network-status td{border-color:#dfdfdf;border-width:1px 1px 0 0;border-style:solid;margin:0;border-spacing:0}table.network-status td.key-status{border-radius:0px;-webkit-border-radius:0px}
\ No newline at end of file
diff --git a/wp-content/plugins/akismet/akismet.gif b/wp-content/plugins/akismet/akismet.gif
deleted file mode 100644
index 0b93a89..0000000
Binary files a/wp-content/plugins/akismet/akismet.gif and /dev/null differ
diff --git a/wp-content/plugins/akismet/akismet.js b/wp-content/plugins/akismet/akismet.js
deleted file mode 100644
index f3da8fd..0000000
--- a/wp-content/plugins/akismet/akismet.js
+++ /dev/null
@@ -1,126 +0,0 @@
-jQuery(document).ready(function () {
- jQuery( '.switch-have-key' ).click( function() {
- var no_key = jQuery( this ).parents().find('div.no-key');
- var have_key = jQuery( this ).parents().find('div.have-key');
-
- no_key.addClass( 'hidden' );
- have_key.removeClass( 'hidden' );
-
- return false;
- });
- jQuery( 'p.need-key a' ).click( function(){
- document.akismet_activate.submit();
- });
- jQuery('.akismet-status').each(function () {
- var thisId = jQuery(this).attr('commentid');
- jQuery(this).prependTo('#comment-' + thisId + ' .column-comment div:first-child');
- });
- jQuery('.akismet-user-comment-count').each(function () {
- var thisId = jQuery(this).attr('commentid');
- jQuery(this).insertAfter('#comment-' + thisId + ' .author strong:first').show();
- });
- jQuery('#the-comment-list tr.comment .column-author a[title ^= "http://"]').each(function () {
- var thisTitle = jQuery(this).attr('title');
- thisCommentId = jQuery(this).parents('tr:first').attr('id').split("-");
-
- jQuery(this).attr("id", "author_comment_url_"+ thisCommentId[1]);
-
- if (thisTitle) {
- jQuery(this).after('
x ');
- }
- });
- jQuery('.remove_url').live('click', function () {
- var thisId = jQuery(this).attr('commentid');
- var data = {
- action: 'comment_author_deurl',
- _wpnonce: WPAkismet.comment_author_url_nonce,
- id: thisId
- };
- jQuery.ajax({
- url: ajaxurl,
- type: 'POST',
- data: data,
- beforeSend: function () {
- // Removes "x" link
- jQuery("a[commentid='"+ thisId +"']").hide();
- // Show temp status
- jQuery("#author_comment_url_"+ thisId).html('
Removing... ');
- },
- success: function (response) {
- if (response) {
- // Show status/undo link
- jQuery("#author_comment_url_"+ thisId).attr('cid', thisId).addClass('akismet_undo_link_removal').html('
URL removed ( undo
) ');
- }
- }
- });
-
- return false;
- });
- jQuery('.akismet_undo_link_removal').live('click', function () {
- var thisId = jQuery(this).attr('cid');
- var thisUrl = jQuery(this).attr('href').replace("http://www.", "").replace("http://", "");
- var data = {
- action: 'comment_author_reurl',
- _wpnonce: WPAkismet.comment_author_url_nonce,
- id: thisId,
- url: thisUrl
- };
- jQuery.ajax({
- url: ajaxurl,
- type: 'POST',
- data: data,
- beforeSend: function () {
- // Show temp status
- jQuery("#author_comment_url_"+ thisId).html('
Re-adding… ');
- },
- success: function (response) {
- if (response) {
- // Add "x" link
- jQuery("a[commentid='"+ thisId +"']").show();
- // Show link
- jQuery("#author_comment_url_"+ thisId).removeClass('akismet_undo_link_removal').html(thisUrl);
- }
- }
- });
-
- return false;
- });
- jQuery('a[id^="author_comment_url"]').mouseover(function () {
- var wpcomProtocol = ( 'https:' === location.protocol ) ? 'https://' : 'http://';
- // Need to determine size of author column
- var thisParentWidth = jQuery(this).parent().width();
- // It changes based on if there is a gravatar present
- thisParentWidth = (jQuery(this).parent().find('.grav-hijack').length) ? thisParentWidth - 42 + 'px' : thisParentWidth + 'px';
- if (jQuery(this).find('.mShot').length == 0 && !jQuery(this).hasClass('akismet_undo_link_removal')) {
- var thisId = jQuery(this).attr('id').replace('author_comment_url_', '');
- jQuery('.widefat td').css('overflow', 'visible');
- jQuery(this).css('position', 'relative');
- var thisHref = jQuery.URLEncode(jQuery(this).attr('href'));
- jQuery(this).append('
');
- setTimeout(function () {
- jQuery('.mshot-image_'+thisId).attr('src', wpcomProtocol+'s0.wordpress.com/mshots/v1/'+thisHref+'?w=450&r=2');
- }, 6000);
- setTimeout(function () {
- jQuery('.mshot-image_'+thisId).attr('src', wpcomProtocol+'s0.wordpress.com/mshots/v1/'+thisHref+'?w=450&r=3');
- }, 12000);
- } else {
- jQuery(this).find('.mShot').css('left', thisParentWidth).show();
- }
- }).mouseout(function () {
- jQuery(this).find('.mShot').hide();
- });
-});
-// URL encode plugin
-jQuery.extend({URLEncode:function(c){var o='';var x=0;c=c.toString();var r=/(^[a-zA-Z0-9_.]*)/;
- while(x
1 && m[1]!=''){o+=m[1];x+=m[1].length;
- }else{if(c[x]==' ')o+='+';else{var d=c.charCodeAt(x);var h=d.toString(16);
- o+='%'+(h.length<2?'0':'')+h.toUpperCase();}x++;}}return o;}
-});
-// Preload mshot images after everything else has loaded
-jQuery(window).load(function() {
- var wpcomProtocol = ( 'https:' === location.protocol ) ? 'https://' : 'http://';
- jQuery('a[id^="author_comment_url"]').each(function () {
- jQuery.get(wpcomProtocol+'s0.wordpress.com/mshots/v1/'+jQuery.URLEncode(jQuery(this).attr('href'))+'?w=450');
- });
-});
diff --git a/wp-content/plugins/akismet/akismet.php b/wp-content/plugins/akismet/akismet.php
index 15a1b2c..7fc1e9d 100644
--- a/wp-content/plugins/akismet/akismet.php
+++ b/wp-content/plugins/akismet/akismet.php
@@ -4,12 +4,13 @@
*/
/*
Plugin Name: Akismet
-Plugin URI: http://akismet.com/?return=true
-Description: Used by millions, Akismet is quite possibly the best way in the world to protect your blog from comment and trackback spam . 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) Sign up for an Akismet API key , and 3) Go to your Akismet configuration page, and save your API key.
-Version: 2.5.8
+Plugin URI: http://akismet.com/
+Description: Used by millions, Akismet is quite possibly the best way in the world to protect your blog from comment and trackback spam . 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) Sign up for an Akismet API key , and 3) Go to your Akismet configuration page, and save your API key.
+Version: 3.0.1
Author: Automattic
Author URI: http://automattic.com/wordpress-plugins/
License: GPLv2 or later
+Text Domain: akismet
*/
/*
@@ -34,580 +35,25 @@ if ( !function_exists( 'add_action' ) ) {
exit;
}
-define('AKISMET_VERSION', '2.5.8');
-define('AKISMET_PLUGIN_URL', plugin_dir_url( __FILE__ ));
+define( 'AKISMET_VERSION', '3.0.1' );
+define( 'AKISMET__MINIMUM_WP_VERSION', '3.1' );
+define( 'AKISMET__PLUGIN_URL', plugin_dir_url( __FILE__ ) );
+define( 'AKISMET__PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
+define( 'AKISMET_DELETE_LIMIT', 100000 );
-/** If you hardcode a WP.com API key here, all key config screens will be hidden */
-if ( defined('WPCOM_API_KEY') )
- $wpcom_api_key = constant('WPCOM_API_KEY');
-else
- $wpcom_api_key = '';
+register_activation_hook( __FILE__, array( 'Akismet', 'plugin_activation' ) );
+register_deactivation_hook( __FILE__, array( 'Akismet', 'plugin_deactivation' ) );
-if ( isset($wp_db_version) && $wp_db_version <= 9872 )
- include_once dirname( __FILE__ ) . '/legacy.php';
+require_once( AKISMET__PLUGIN_DIR . 'class.akismet.php' );
+require_once( AKISMET__PLUGIN_DIR . 'class.akismet-widget.php' );
-include_once dirname( __FILE__ ) . '/widget.php';
+add_action( 'init', array( 'Akismet', 'init' ) );
-if ( is_admin() )
- require_once dirname( __FILE__ ) . '/admin.php';
-
-function akismet_init() {
- global $wpcom_api_key, $akismet_api_host, $akismet_api_port;
-
- if ( $wpcom_api_key )
- $akismet_api_host = $wpcom_api_key . '.rest.akismet.com';
- else
- $akismet_api_host = get_option('wordpress_api_key') . '.rest.akismet.com';
-
- $akismet_api_port = 80;
-}
-add_action('init', 'akismet_init');
-
-function akismet_get_key() {
- global $wpcom_api_key;
- if ( !empty($wpcom_api_key) )
- return $wpcom_api_key;
- return get_option('wordpress_api_key');
+if ( is_admin() ) {
+ require_once( AKISMET__PLUGIN_DIR . 'class.akismet-admin.php' );
+ add_action( 'init', array( 'Akismet_Admin', 'init' ) );
}
-function akismet_check_key_status( $key, $ip = null ) {
- global $akismet_api_host, $akismet_api_port, $wpcom_api_key;
- $blog = urlencode( get_option('home') );
- if ( $wpcom_api_key )
- $key = $wpcom_api_key;
- $response = akismet_http_post("key=$key&blog=$blog", 'rest.akismet.com', '/1.1/verify-key', $akismet_api_port, $ip);
- return $response;
-}
+//add wrapper class around deprecated akismet functions that are referenced elsewhere
+require_once( AKISMET__PLUGIN_DIR . 'wrapper.php' );
-// given a response from an API call like akismet_check_key_status(), update the alert code options if an alert is present.
-function akismet_update_alert( $response ) {
- $code = $msg = null;
- if ( isset($response[0]['x-akismet-alert-code']) ) {
- $code = $response[0]['x-akismet-alert-code'];
- $msg = $response[0]['x-akismet-alert-msg'];
- }
-
- // only call update_option() if the value has changed
- if ( $code != get_option( 'akismet_alert_code' ) ) {
- update_option( 'akismet_alert_code', $code );
- update_option( 'akismet_alert_msg', $msg );
- }
-}
-
-function akismet_verify_key( $key, $ip = null ) {
- $response = akismet_check_key_status( $key, $ip );
- akismet_update_alert( $response );
- if ( !is_array($response) || !isset($response[1]) || $response[1] != 'valid' && $response[1] != 'invalid' )
- return 'failed';
- return $response[1];
-}
-
-// if we're in debug or test modes, use a reduced service level so as not to polute training or stats data
-function akismet_test_mode() {
- if ( defined('AKISMET_TEST_MODE') && AKISMET_TEST_MODE )
- return true;
- return false;
-}
-
-// return a comma-separated list of role names for the given user
-function akismet_get_user_roles( $user_id ) {
- $roles = false;
-
- if ( !class_exists('WP_User') )
- return false;
-
- if ( $user_id > 0 ) {
- $comment_user = new WP_User($user_id);
- if ( isset($comment_user->roles) )
- $roles = join(',', $comment_user->roles);
- }
-
- if ( is_multisite() && is_super_admin( $user_id ) ) {
- if ( empty( $roles ) ) {
- $roles = 'super_admin';
- } else {
- $comment_user->roles[] = 'super_admin';
- $roles = join( ',', $comment_user->roles );
- }
- }
-
- return $roles;
-}
-
-// Returns array with headers in $response[0] and body in $response[1]
-function akismet_http_post($request, $host, $path, $port = 80, $ip=null) {
- global $wp_version;
-
- $akismet_ua = "WordPress/{$wp_version} | ";
- $akismet_ua .= 'Akismet/' . constant( 'AKISMET_VERSION' );
-
- $akismet_ua = apply_filters( 'akismet_ua', $akismet_ua );
-
- $content_length = strlen( $request );
-
- $http_host = $host;
- // use a specific IP if provided
- // needed by akismet_check_server_connectivity()
- if ( $ip && long2ip( ip2long( $ip ) ) ) {
- $http_host = $ip;
- } else {
- $http_host = $host;
- }
-
- // use the WP HTTP class if it is available
- if ( function_exists( 'wp_remote_post' ) ) {
- $http_args = array(
- 'body' => $request,
- 'headers' => array(
- 'Content-Type' => 'application/x-www-form-urlencoded; ' .
- 'charset=' . get_option( 'blog_charset' ),
- 'Host' => $host,
- 'User-Agent' => $akismet_ua
- ),
- 'httpversion' => '1.0',
- 'timeout' => 15
- );
- $akismet_url = "http://{$http_host}{$path}";
- $response = wp_remote_post( $akismet_url, $http_args );
- if ( is_wp_error( $response ) )
- return '';
-
- return array( $response['headers'], $response['body'] );
- } else {
- $http_request = "POST $path HTTP/1.0\r\n";
- $http_request .= "Host: $host\r\n";
- $http_request .= 'Content-Type: application/x-www-form-urlencoded; charset=' . get_option('blog_charset') . "\r\n";
- $http_request .= "Content-Length: {$content_length}\r\n";
- $http_request .= "User-Agent: {$akismet_ua}\r\n";
- $http_request .= "\r\n";
- $http_request .= $request;
-
- $response = '';
- if( false != ( $fs = @fsockopen( $http_host, $port, $errno, $errstr, 10 ) ) ) {
- fwrite( $fs, $http_request );
-
- while ( !feof( $fs ) )
- $response .= fgets( $fs, 1160 ); // One TCP-IP packet
- fclose( $fs );
- $response = explode( "\r\n\r\n", $response, 2 );
- }
- return $response;
- }
-}
-
-// filter handler used to return a spam result to pre_comment_approved
-function akismet_result_spam( $approved ) {
- // bump the counter here instead of when the filter is added to reduce the possibility of overcounting
- if ( $incr = apply_filters('akismet_spam_count_incr', 1) )
- update_option( 'akismet_spam_count', get_option('akismet_spam_count') + $incr );
- // this is a one-shot deal
- remove_filter( 'pre_comment_approved', 'akismet_result_spam' );
- return 'spam';
-}
-
-function akismet_result_hold( $approved ) {
- // once only
- remove_filter( 'pre_comment_approved', 'akismet_result_hold' );
- return '0';
-}
-
-// how many approved comments does this author have?
-function akismet_get_user_comments_approved( $user_id, $comment_author_email, $comment_author, $comment_author_url ) {
- global $wpdb;
-
- if ( !empty($user_id) )
- return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->comments WHERE user_id = %d AND comment_approved = 1", $user_id ) );
-
- if ( !empty($comment_author_email) )
- return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->comments WHERE comment_author_email = %s AND comment_author = %s AND comment_author_url = %s AND comment_approved = 1", $comment_author_email, $comment_author, $comment_author_url ) );
-
- return 0;
-}
-
-function akismet_microtime() {
- $mtime = explode( ' ', microtime() );
- return $mtime[1] + $mtime[0];
-}
-
-// log an event for a given comment, storing it in comment_meta
-function akismet_update_comment_history( $comment_id, $message, $event=null ) {
- global $current_user;
-
- // failsafe for old WP versions
- if ( !function_exists('add_comment_meta') )
- return false;
-
- $user = '';
- if ( is_object($current_user) && isset($current_user->user_login) )
- $user = $current_user->user_login;
-
- $event = array(
- 'time' => akismet_microtime(),
- 'message' => $message,
- 'event' => $event,
- 'user' => $user,
- );
-
- // $unique = false so as to allow multiple values per comment
- $r = add_comment_meta( $comment_id, 'akismet_history', $event, false );
-}
-
-// get the full comment history for a given comment, as an array in reverse chronological order
-function akismet_get_comment_history( $comment_id ) {
-
- // failsafe for old WP versions
- if ( !function_exists('add_comment_meta') )
- return false;
-
- $history = get_comment_meta( $comment_id, 'akismet_history', false );
- usort( $history, 'akismet_cmp_time' );
- return $history;
-}
-
-function akismet_cmp_time( $a, $b ) {
- return $a['time'] > $b['time'] ? -1 : 1;
-}
-
-// this fires on wp_insert_comment. we can't update comment_meta when akismet_auto_check_comment() runs
-// because we don't know the comment ID at that point.
-function akismet_auto_check_update_meta( $id, $comment ) {
- global $akismet_last_comment;
-
- // failsafe for old WP versions
- if ( !function_exists('add_comment_meta') )
- return false;
-
- if ( !isset( $akismet_last_comment['comment_author_email'] ) )
- $akismet_last_comment['comment_author_email'] = '';
-
- // wp_insert_comment() might be called in other contexts, so make sure this is the same comment
- // as was checked by akismet_auto_check_comment
- if ( is_object($comment) && !empty($akismet_last_comment) && is_array($akismet_last_comment) ) {
- if ( isset($akismet_last_comment['comment_post_ID']) && intval($akismet_last_comment['comment_post_ID']) == intval($comment->comment_post_ID)
- && $akismet_last_comment['comment_author'] == $comment->comment_author
- && $akismet_last_comment['comment_author_email'] == $comment->comment_author_email ) {
- // normal result: true or false
- if ( $akismet_last_comment['akismet_result'] == 'true' ) {
- update_comment_meta( $comment->comment_ID, 'akismet_result', 'true' );
- akismet_update_comment_history( $comment->comment_ID, __('Akismet caught this comment as spam'), 'check-spam' );
- if ( $comment->comment_approved != 'spam' )
- akismet_update_comment_history( $comment->comment_ID, sprintf( __('Comment status was changed to %s'), $comment->comment_approved), 'status-changed'.$comment->comment_approved );
- } elseif ( $akismet_last_comment['akismet_result'] == 'false' ) {
- update_comment_meta( $comment->comment_ID, 'akismet_result', 'false' );
- akismet_update_comment_history( $comment->comment_ID, __('Akismet cleared this comment'), 'check-ham' );
- if ( $comment->comment_approved == 'spam' ) {
- if ( wp_blacklist_check($comment->comment_author, $comment->comment_author_email, $comment->comment_author_url, $comment->comment_content, $comment->comment_author_IP, $comment->comment_agent) )
- akismet_update_comment_history( $comment->comment_ID, __('Comment was caught by wp_blacklist_check'), 'wp-blacklisted' );
- else
- akismet_update_comment_history( $comment->comment_ID, sprintf( __('Comment status was changed to %s'), $comment->comment_approved), 'status-changed-'.$comment->comment_approved );
- }
- // abnormal result: error
- } else {
- update_comment_meta( $comment->comment_ID, 'akismet_error', time() );
- akismet_update_comment_history( $comment->comment_ID, sprintf( __('Akismet was unable to check this comment (response: %s), will automatically retry again later.'), substr($akismet_last_comment['akismet_result'], 0, 50)), 'check-error' );
- }
-
- // record the complete original data as submitted for checking
- if ( isset($akismet_last_comment['comment_as_submitted']) )
- update_comment_meta( $comment->comment_ID, 'akismet_as_submitted', $akismet_last_comment['comment_as_submitted'] );
- }
- }
-}
-
-add_action( 'wp_insert_comment', 'akismet_auto_check_update_meta', 10, 2 );
-
-
-function akismet_auto_check_comment( $commentdata ) {
- global $akismet_api_host, $akismet_api_port, $akismet_last_comment;
-
- $comment = $commentdata;
- $comment['user_ip'] = $_SERVER['REMOTE_ADDR'];
- $comment['user_agent'] = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : null;
- $comment['referrer'] = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : null;
- $comment['blog'] = get_option('home');
- $comment['blog_lang'] = get_locale();
- $comment['blog_charset'] = get_option('blog_charset');
- $comment['permalink'] = get_permalink($comment['comment_post_ID']);
-
- if ( !empty( $comment['user_ID'] ) ) {
- $comment['user_role'] = akismet_get_user_roles( $comment['user_ID'] );
- }
-
- $akismet_nonce_option = apply_filters( 'akismet_comment_nonce', get_option( 'akismet_comment_nonce' ) );
- $comment['akismet_comment_nonce'] = 'inactive';
- if ( $akismet_nonce_option == 'true' || $akismet_nonce_option == '' ) {
- $comment['akismet_comment_nonce'] = 'failed';
- if ( isset( $_POST['akismet_comment_nonce'] ) && wp_verify_nonce( $_POST['akismet_comment_nonce'], 'akismet_comment_nonce_' . $comment['comment_post_ID'] ) )
- $comment['akismet_comment_nonce'] = 'passed';
-
- // comment reply in wp-admin
- if ( isset( $_POST['_ajax_nonce-replyto-comment'] ) && check_ajax_referer( 'replyto-comment', '_ajax_nonce-replyto-comment' ) )
- $comment['akismet_comment_nonce'] = 'passed';
-
- }
-
- if ( akismet_test_mode() )
- $comment['is_test'] = 'true';
-
- foreach ($_POST as $key => $value ) {
- if ( is_string($value) )
- $comment["POST_{$key}"] = $value;
- }
-
- $ignore = array( 'HTTP_COOKIE', 'HTTP_COOKIE2', 'PHP_AUTH_PW' );
-
- foreach ( $_SERVER as $key => $value ) {
- if ( !in_array( $key, $ignore ) && is_string($value) )
- $comment["$key"] = $value;
- else
- $comment["$key"] = '';
- }
-
- $post = get_post( $comment['comment_post_ID'] );
- $comment[ 'comment_post_modified_gmt' ] = $post->post_modified_gmt;
-
- $query_string = '';
- foreach ( $comment as $key => $data )
- $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
-
- $commentdata['comment_as_submitted'] = $comment;
-
- $response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port);
- do_action( 'akismet_comment_check_response', $response );
- akismet_update_alert( $response );
- $commentdata['akismet_result'] = $response[1];
- if ( 'true' == $response[1] ) {
- // akismet_spam_count will be incremented later by akismet_result_spam()
- add_filter('pre_comment_approved', 'akismet_result_spam');
-
- do_action( 'akismet_spam_caught' );
-
- $last_updated = strtotime( $post->post_modified_gmt );
- $diff = time() - $last_updated;
- $diff = $diff / 86400;
-
- if ( $post->post_type == 'post' && $diff > 30 && get_option( 'akismet_discard_month' ) == 'true' && empty($comment['user_ID']) ) {
- // akismet_result_spam() won't be called so bump the counter here
- if ( $incr = apply_filters('akismet_spam_count_incr', 1) )
- update_option( 'akismet_spam_count', get_option('akismet_spam_count') + $incr );
- $redirect_to = isset( $_SERVER['HTTP_REFERER'] ) ? $_SERVER['HTTP_REFERER'] : get_permalink( $post );
- wp_safe_redirect( $redirect_to );
- die();
- }
- }
-
- // if the response is neither true nor false, hold the comment for moderation and schedule a recheck
- if ( 'true' != $response[1] && 'false' != $response[1] ) {
- if ( !current_user_can('moderate_comments') ) {
- add_filter('pre_comment_approved', 'akismet_result_hold');
- }
- if ( !wp_next_scheduled( 'akismet_schedule_cron_recheck' ) ) {
- wp_schedule_single_event( time() + 1200, 'akismet_schedule_cron_recheck' );
- }
- }
-
- if ( function_exists('wp_next_scheduled') && function_exists('wp_schedule_event') ) {
- // WP 2.1+: delete old comments daily
- if ( !wp_next_scheduled('akismet_scheduled_delete') )
- wp_schedule_event(time(), 'daily', 'akismet_scheduled_delete');
- } elseif ( (mt_rand(1, 10) == 3) ) {
- // WP 2.0: run this one time in ten
- akismet_delete_old();
- }
- $akismet_last_comment = $commentdata;
-
- akismet_fix_scheduled_recheck();
- return $commentdata;
-}
-
-add_action('preprocess_comment', 'akismet_auto_check_comment', 1);
-
-function akismet_delete_old() {
- global $wpdb;
- $now_gmt = current_time('mysql', 1);
- $comment_ids = $wpdb->get_col("SELECT comment_id FROM $wpdb->comments WHERE DATE_SUB('$now_gmt', INTERVAL 15 DAY) > comment_date_gmt AND comment_approved = 'spam'");
- if ( empty( $comment_ids ) )
- return;
-
- $comma_comment_ids = implode( ', ', array_map('intval', $comment_ids) );
-
- do_action( 'delete_comment', $comment_ids );
- $wpdb->query("DELETE FROM $wpdb->comments WHERE comment_id IN ( $comma_comment_ids )");
- $wpdb->query("DELETE FROM $wpdb->commentmeta WHERE comment_id IN ( $comma_comment_ids )");
- clean_comment_cache( $comment_ids );
- $n = mt_rand(1, 5000);
- if ( apply_filters('akismet_optimize_table', ($n == 11)) ) // lucky number
- $wpdb->query("OPTIMIZE TABLE $wpdb->comments");
-
-}
-
-function akismet_delete_old_metadata() {
- global $wpdb;
-
- $now_gmt = current_time( 'mysql', 1 );
- $interval = apply_filters( 'akismet_delete_commentmeta_interval', 15 );
-
- # enfore a minimum of 1 day
- $interval = absint( $interval );
- if ( $interval < 1 ) {
- return;
- }
-
- // akismet_as_submitted meta values are large, so expire them
- // after $interval days regardless of the comment status
- while ( TRUE ) {
- $comment_ids = $wpdb->get_col( "SELECT $wpdb->comments.comment_id FROM $wpdb->commentmeta INNER JOIN $wpdb->comments USING(comment_id) WHERE meta_key = 'akismet_as_submitted' AND DATE_SUB('$now_gmt', INTERVAL {$interval} DAY) > comment_date_gmt LIMIT 10000" );
-
- if ( empty( $comment_ids ) ) {
- return;
- }
-
- foreach ( $comment_ids as $comment_id ) {
- delete_comment_meta( $comment_id, 'akismet_as_submitted' );
- }
- }
-
- /*
- $n = mt_rand( 1, 5000 );
- if ( apply_filters( 'akismet_optimize_table', ( $n == 11 ), 'commentmeta' ) ) { // lucky number
- $wpdb->query( "OPTIMIZE TABLE $wpdb->commentmeta" );
- }
- */
-}
-
-add_action('akismet_scheduled_delete', 'akismet_delete_old');
-add_action('akismet_scheduled_delete', 'akismet_delete_old_metadata');
-
-function akismet_check_db_comment( $id, $recheck_reason = 'recheck_queue' ) {
- global $wpdb, $akismet_api_host, $akismet_api_port;
-
- $id = (int) $id;
- $c = $wpdb->get_row( "SELECT * FROM $wpdb->comments WHERE comment_ID = '$id'", ARRAY_A );
- if ( !$c )
- return;
-
- $c['user_ip'] = $c['comment_author_IP'];
- $c['user_agent'] = $c['comment_agent'];
- $c['referrer'] = '';
- $c['blog'] = get_option('home');
- $c['blog_lang'] = get_locale();
- $c['blog_charset'] = get_option('blog_charset');
- $c['permalink'] = get_permalink($c['comment_post_ID']);
- $id = $c['comment_ID'];
- if ( akismet_test_mode() )
- $c['is_test'] = 'true';
- $c['recheck_reason'] = $recheck_reason;
-
- $query_string = '';
- foreach ( $c as $key => $data )
- $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
-
- $response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port);
- return ( is_array( $response ) && isset( $response[1] ) ) ? $response[1] : false;
-}
-
-function akismet_cron_recheck() {
- global $wpdb;
-
- $status = akismet_verify_key( akismet_get_key() );
- if ( get_option( 'akismet_alert_code' ) || $status == 'invalid' ) {
- // since there is currently a problem with the key, reschedule a check for 6 hours hence
- wp_schedule_single_event( time() + 21600, 'akismet_schedule_cron_recheck' );
- return false;
- }
-
- delete_option('akismet_available_servers');
-
- $comment_errors = $wpdb->get_col( "
- SELECT comment_id
- FROM {$wpdb->prefix}commentmeta
- WHERE meta_key = 'akismet_error'
- LIMIT 100
- " );
-
- foreach ( (array) $comment_errors as $comment_id ) {
- // if the comment no longer exists, or is too old, remove the meta entry from the queue to avoid getting stuck
- $comment = get_comment( $comment_id );
- if ( !$comment || strtotime( $comment->comment_date_gmt ) < strtotime( "-15 days" ) ) {
- delete_comment_meta( $comment_id, 'akismet_error' );
- continue;
- }
-
- add_comment_meta( $comment_id, 'akismet_rechecking', true );
- $status = akismet_check_db_comment( $comment_id, 'retry' );
-
- $msg = '';
- if ( $status == 'true' ) {
- $msg = __( 'Akismet caught this comment as spam during an automatic retry.' );
- } elseif ( $status == 'false' ) {
- $msg = __( 'Akismet cleared this comment during an automatic retry.' );
- }
-
- // If we got back a legit response then update the comment history
- // other wise just bail now and try again later. No point in
- // re-trying all the comments once we hit one failure.
- if ( !empty( $msg ) ) {
- delete_comment_meta( $comment_id, 'akismet_error' );
- akismet_update_comment_history( $comment_id, $msg, 'cron-retry' );
- update_comment_meta( $comment_id, 'akismet_result', $status );
- // make sure the comment status is still pending. if it isn't, that means the user has already moved it elsewhere.
- $comment = get_comment( $comment_id );
- if ( $comment && 'unapproved' == wp_get_comment_status( $comment_id ) ) {
- if ( $status == 'true' ) {
- wp_spam_comment( $comment_id );
- } elseif ( $status == 'false' ) {
- // comment is good, but it's still in the pending queue. depending on the moderation settings
- // we may need to change it to approved.
- if ( check_comment($comment->comment_author, $comment->comment_author_email, $comment->comment_author_url, $comment->comment_content, $comment->comment_author_IP, $comment->comment_agent, $comment->comment_type) )
- wp_set_comment_status( $comment_id, 1 );
- }
- }
- } else {
- delete_comment_meta( $comment_id, 'akismet_rechecking' );
- wp_schedule_single_event( time() + 1200, 'akismet_schedule_cron_recheck' );
- return;
- }
- delete_comment_meta( $comment_id, 'akismet_rechecking' );
- }
-
- $remaining = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->commentmeta WHERE meta_key = 'akismet_error'" );
- if ( $remaining && !wp_next_scheduled('akismet_schedule_cron_recheck') ) {
- wp_schedule_single_event( time() + 1200, 'akismet_schedule_cron_recheck' );
- }
-}
-add_action( 'akismet_schedule_cron_recheck', 'akismet_cron_recheck' );
-
-function akismet_add_comment_nonce( $post_id ) {
- echo '';
- wp_nonce_field( 'akismet_comment_nonce_' . $post_id, 'akismet_comment_nonce', FALSE );
- echo '
';
-}
-
-$akismet_comment_nonce_option = apply_filters( 'akismet_comment_nonce', get_option( 'akismet_comment_nonce' ) );
-
-if ( $akismet_comment_nonce_option == 'true' || $akismet_comment_nonce_option == '' )
- add_action( 'comment_form', 'akismet_add_comment_nonce' );
-
-global $wp_version;
-if ( '3.0.5' == $wp_version ) {
- remove_filter( 'comment_text', 'wp_kses_data' );
- if ( is_admin() )
- add_filter( 'comment_text', 'wp_kses_post' );
-}
-
-function akismet_fix_scheduled_recheck() {
- $future_check = wp_next_scheduled( 'akismet_schedule_cron_recheck' );
- if ( !$future_check ) {
- return;
- }
-
- if ( get_option( 'akismet_alert_code' ) > 0 ) {
- return;
- }
-
- $check_range = time() + 1200;
- if ( $future_check > $check_range ) {
- wp_clear_scheduled_hook( 'akismet_schedule_cron_recheck' );
- wp_schedule_single_event( time() + 300, 'akismet_schedule_cron_recheck' );
- }
-}
diff --git a/wp-content/plugins/akismet/class.akismet-admin.php b/wp-content/plugins/akismet/class.akismet-admin.php
new file mode 100644
index 0000000..7a62ccb
--- /dev/null
+++ b/wp-content/plugins/akismet/class.akismet-admin.php
@@ -0,0 +1,861 @@
+'.__('Settings', 'akismet').'';
+ array_unshift( $links, $settings_link );
+ return $links;
+ }
+
+ public static function load_menu() {
+ if ( class_exists( 'Jetpack' ) )
+ $hook = add_submenu_page( 'jetpack', __( 'Akismet' , 'akismet'), __( 'Akismet' , 'akismet'), 'manage_options', 'akismet-key-config', array( 'Akismet_Admin', 'display_page' ) );
+ else
+ $hook = add_options_page( __('Akismet', 'akismet'), __('Akismet', 'akismet'), 'manage_options', 'akismet-key-config', array( 'Akismet_Admin', 'display_page' ) );
+
+ if ( version_compare( $GLOBALS['wp_version'], '3.3', '>=' ) ) {
+ add_action( "load-$hook", array( 'Akismet_Admin', 'admin_help' ) );
+ }
+ }
+
+ public static function load_resources() {
+ global $hook_suffix;
+
+ if ( in_array( $hook_suffix, array(
+ 'index.php', # dashboard
+ 'edit-comments.php',
+ 'comment.php',
+ 'post.php',
+ 'settings_page_akismet-key-config',
+ 'jetpack_page_akismet-key-config',
+ ) ) ) {
+ wp_register_style( 'akismet.css', AKISMET__PLUGIN_URL . '_inc/akismet.css', array(), AKISMET_VERSION );
+ wp_enqueue_style( 'akismet.css');
+
+ wp_register_script( 'akismet.js', AKISMET__PLUGIN_URL . '_inc/akismet.js', array('jquery','postbox'), AKISMET_VERSION );
+ wp_enqueue_script( 'akismet.js' );
+ wp_localize_script( 'akismet.js', 'WPAkismet', array(
+ 'comment_author_url_nonce' => wp_create_nonce( 'comment_author_url_nonce' ),
+ 'strings' => array(
+ 'Remove this URL' => __( 'Remove this URL' , 'akismet'),
+ 'Removing...' => __( 'Removing...' , 'akismet'),
+ 'URL removed' => __( 'URL removed' , 'akismet'),
+ '(undo)' => __( '(undo)' , 'akismet'),
+ 'Re-adding...' => __( 'Re-adding...' , 'akismet'),
+ )
+ ) );
+ }
+ }
+
+ /**
+ * Add help to the Akismet page
+ *
+ * @return false if not the Akismet page
+ */
+ public static function admin_help() {
+ $current_screen = get_current_screen();
+
+ // Screen Content
+ if ( current_user_can( 'manage_options' ) ) {
+ if ( !Akismet::get_api_key() || ( isset( $_GET['view'] ) && $_GET['view'] == 'start' ) ) {
+ //setup page
+ $current_screen->add_help_tab(
+ array(
+ 'id' => 'overview',
+ 'title' => __( 'Overview' , 'akismet'),
+ 'content' =>
+ '' . esc_html__( 'Akismet Setup' , 'akismet') . '
' .
+ '' . esc_html__( 'Akismet filters out your comment and trackback spam for you, so you can focus on more important things.' , 'akismet') . '
' .
+ '' . esc_html__( 'On this page, you are able to setup the Akismet plugin.' , 'akismet') . '
',
+ )
+ );
+
+ $current_screen->add_help_tab(
+ array(
+ 'id' => 'setup-signup',
+ 'title' => __( 'New to Akismet' , 'akismet'),
+ 'content' =>
+ '' . esc_html__( 'Akismet Setup' , 'akismet') . '
' .
+ '' . esc_html__( 'You need to enter an API key to activate the Akismet service on your site.' , 'akismet') . '
' .
+ '' . sprintf( __( 'Signup for an account on %s to get an API Key.' , 'akismet'), 'Akismet.com ' ) . '
',
+ )
+ );
+
+ $current_screen->add_help_tab(
+ array(
+ 'id' => 'setup-manual',
+ 'title' => __( 'Enter an API Key' , 'akismet'),
+ 'content' =>
+ '' . esc_html__( 'Akismet Setup' , 'akismet') . '
' .
+ '' . esc_html__( 'If you already have an API key' , 'akismet') . '
' .
+ '' .
+ '' . esc_html__( 'Copy and paste the API key into the text field.' , 'akismet') . ' ' .
+ '' . esc_html__( 'Click the Use this Key button.' , 'akismet') . ' ' .
+ ' ',
+ )
+ );
+ }
+ elseif ( isset( $_GET['view'] ) && $_GET['view'] == 'stats' ) {
+ //stats page
+ $current_screen->add_help_tab(
+ array(
+ 'id' => 'overview',
+ 'title' => __( 'Overview' , 'akismet'),
+ 'content' =>
+ '' . esc_html__( 'Akismet Stats' , 'akismet') . '
' .
+ '' . esc_html__( 'Akismet filters out your comment and trackback spam for you, so you can focus on more important things.' , 'akismet') . '
' .
+ '' . esc_html__( 'On this page, you are able to view stats on spam filtered on your site.' , 'akismet') . '
',
+ )
+ );
+ }
+ else {
+ //configuration page
+ $current_screen->add_help_tab(
+ array(
+ 'id' => 'overview',
+ 'title' => __( 'Overview' , 'akismet'),
+ 'content' =>
+ '' . esc_html__( 'Akismet Configuration' , 'akismet') . '
' .
+ '' . esc_html__( 'Akismet filters out your comment and trackback spam for you, so you can focus on more important things.' , 'akismet') . '
' .
+ '' . esc_html__( 'On this page, you are able to enter/remove an API key, view account information and view spam stats.' , 'akismet') . '
',
+ )
+ );
+
+ $current_screen->add_help_tab(
+ array(
+ 'id' => 'settings',
+ 'title' => __( 'Settings' , 'akismet'),
+ 'content' =>
+ '' . esc_html__( 'Akismet Configuration' , 'akismet') . '
' .
+ '' . esc_html__( 'API Key' , 'akismet') . ' - ' . esc_html__( 'Enter/remove an API key.' , 'akismet') . '
' .
+ '' . esc_html__( 'Comments' , 'akismet') . ' - ' . esc_html__( 'Show the number of approved comments beside each comment author in the comments list page.' , 'akismet') . '
' .
+ '' . esc_html__( 'Strictness' , 'akismet') . ' - ' . esc_html__( 'Choose to either discard the worst spam automatically or to always put all spam in spam folder.' , 'akismet') . '
',
+ )
+ );
+
+ $current_screen->add_help_tab(
+ array(
+ 'id' => 'account',
+ 'title' => __( 'Account' , 'akismet'),
+ 'content' =>
+ '' . esc_html__( 'Akismet Configuration' , 'akismet') . '
' .
+ '' . esc_html__( 'Subscription Type' , 'akismet') . ' - ' . esc_html__( 'The Akismet subscription plan' , 'akismet') . '
' .
+ '' . esc_html__( 'Status' , 'akismet') . ' - ' . esc_html__( 'The subscription status - active, cancelled or suspended' , 'akismet') . '
',
+ )
+ );
+ }
+ }
+
+ // Help Sidebar
+ $current_screen->set_help_sidebar(
+ '' . esc_html__( 'For more information:' , 'akismet') . '
' .
+ '' . esc_html__( 'Akismet FAQ' , 'akismet') . '
' .
+ '' . esc_html__( 'Akismet Support' , 'akismet') . '
'
+ );
+ }
+
+ public static function enter_api_key() {
+ if ( function_exists('current_user_can') && !current_user_can('manage_options') )
+ die(__('Cheatin’ uh?', 'akismet'));
+
+ if ( !wp_verify_nonce( $_POST['_wpnonce'], self::NONCE ) )
+ return false;
+
+ foreach( array( 'akismet_strictness', 'akismet_show_user_comments_approved' ) as $option ) {
+ update_option( $option, isset( $_POST[$option] ) && (int) $_POST[$option] == 1 ? '1' : '0' );
+ }
+
+ if ( defined( 'WPCOM_API_KEY' ) )
+ return false; //shouldn't have option to save key if already defined
+
+ $new_key = preg_replace( '/[^a-h0-9]/i', '', $_POST['key'] );
+ $old_key = Akismet::get_api_key();
+
+ if ( empty( $new_key ) ) {
+ if ( !empty( $old_key ) ) {
+ delete_option( 'wordpress_api_key' );
+ self::$notices[] = 'new-key-empty';
+ }
+ }
+ elseif ( $new_key != $old_key ) {
+ self::save_key( $new_key );
+ }
+
+ return true;
+ }
+
+ public static function save_key( $api_key ) {
+ $key_status = Akismet::verify_key( $api_key );
+
+ if ( $key_status == 'valid' ) {
+ $akismet_user = self::get_akismet_user( $api_key );
+
+ if ( $akismet_user ) {
+ if ( in_array( $akismet_user->status, array( 'active', 'active-dunning', 'no-sub' ) ) )
+ update_option( 'wordpress_api_key', $api_key );
+
+ if ( $akismet_user->status == 'active' )
+ self::$notices['status'] = 'new-key-valid';
+ else
+ self::$notices['status'] = $akismet_user->status;
+ }
+ else
+ self::$notices['status'] = 'new-key-invalid';
+ }
+ elseif ( in_array( $key_status, array( 'invalid', 'failed' ) ) )
+ self::$notices['status'] = 'new-key-'.$key_status;
+ }
+
+ public static function dashboard_stats() {
+ if ( !function_exists('did_action') || did_action( 'rightnow_end' ) )
+ return; // We already displayed this info in the "Right Now" section
+
+ if ( !$count = get_option('akismet_spam_count') )
+ return;
+
+ global $submenu;
+
+ echo '' . esc_html( _x( 'Spam', 'comments' , 'akismet') ) . ' ';
+
+ echo ''.sprintf( _n(
+ 'Akismet has protected your site from %3$s spam comment .',
+ 'Akismet has protected your site from %3$s spam comments .',
+ $count
+ , 'akismet'), 'https://akismet.com/wordpress/', esc_url( add_query_arg( array( 'page' => 'akismet-admin' ), admin_url( isset( $submenu['edit-comments.php'] ) ? 'edit-comments.php' : 'edit.php' ) ) ), number_format_i18n($count) ).'
';
+ }
+
+ // WP 2.5+
+ public static function rightnow_stats() {
+ global $submenu, $wp_db_version;
+
+ if ( 8645 < $wp_db_version ) // 2.7
+ $link = add_query_arg( array( 'comment_status' => 'spam' ), admin_url( 'edit-comments.php' ) );
+ elseif ( isset( $submenu['edit-comments.php'] ) )
+ $link = add_query_arg( array( 'page' => 'akismet-admin' ), admin_url( 'edit-comments.php' ) );
+ else
+ $link = add_query_arg( array( 'page' => 'akismet-admin' ), admin_url( 'edit.php' ) );
+
+ if ( $count = get_option('akismet_spam_count') ) {
+ $intro = sprintf( _n(
+ 'Akismet has protected your site from %2$s spam comment already. ',
+ 'Akismet has protected your site from %2$s spam comments already. ',
+ $count
+ , 'akismet'), 'https://akismet.com/wordpress/', number_format_i18n( $count ) );
+ } else {
+ $intro = sprintf( __('Akismet blocks spam from getting to your blog. ', 'akismet'), 'https://akismet.com/wordpress/' );
+ }
+
+ $link = function_exists( 'esc_url' ) ? esc_url( $link ) : clean_url( $link );
+ if ( $queue_count = self::get_spam_count() ) {
+ $queue_text = sprintf( _n(
+ 'There’s %1$s comment in your spam queue right now.',
+ 'There are %1$s comments in your spam queue right now.',
+ $queue_count
+ , 'akismet'), number_format_i18n( $queue_count ), $link );
+ } else {
+ $queue_text = sprintf( __( "There’s nothing in your spam queue at the moment." , 'akismet'), $link );
+ }
+
+ $text = $intro . '$text
\n";
+ }
+
+ public static function check_for_spam_button( $comment_status ) {
+ if ( 'approved' == $comment_status )
+ return;
+
+ if ( function_exists('plugins_url') )
+ $link = add_query_arg( array( 'action' => 'akismet_recheck_queue' ), admin_url( 'admin.php' ) );
+ else
+ $link = add_query_arg( array( 'page' => 'akismet-admin', 'recheckqueue' => 'true', 'noheader' => 'true' ), admin_url( 'edit-comments.php' ) );
+
+ echo ' ' . esc_html__('Check for Spam', 'akismet') . ' ';
+ }
+
+ public static function recheck_queue() {
+ global $wpdb;
+
+ Akismet::fix_scheduled_recheck();
+
+ if ( ! ( isset( $_GET['recheckqueue'] ) || ( isset( $_REQUEST['action'] ) && 'akismet_recheck_queue' == $_REQUEST['action'] ) ) )
+ return;
+
+ $paginate = '';
+ if ( isset( $_POST['limit'] ) && isset( $_POST['offset'] ) ) {
+ $paginate = $wpdb->prepare( " LIMIT %d OFFSET %d", array( $_POST['limit'], $_POST['offset'] ) );
+ }
+ $moderation = $wpdb->get_results( "SELECT * FROM {$wpdb->comments} WHERE comment_approved = '0'{$paginate}", ARRAY_A );
+
+ foreach ( (array) $moderation as $c ) {
+ $c['user_ip'] = $c['comment_author_IP'];
+ $c['user_agent'] = $c['comment_agent'];
+ $c['referrer'] = '';
+ $c['blog'] = get_bloginfo('url');
+ $c['blog_lang'] = get_locale();
+ $c['blog_charset'] = get_option('blog_charset');
+ $c['permalink'] = get_permalink($c['comment_post_ID']);
+
+ $c['user_role'] = '';
+ if ( isset( $c['user_ID'] ) )
+ $c['user_role'] = Akismet::get_user_roles($c['user_ID']);
+
+ if ( Akismet::is_test_mode() )
+ $c['is_test'] = 'true';
+
+ add_comment_meta( $c['comment_ID'], 'akismet_rechecking', true );
+
+ $response = Akismet::http_post( build_query( $c ), 'comment-check' );
+ if ( 'true' == $response[1] ) {
+ wp_set_comment_status( $c['comment_ID'], 'spam' );
+ update_comment_meta( $c['comment_ID'], 'akismet_result', 'true' );
+ delete_comment_meta( $c['comment_ID'], 'akismet_error' );
+ delete_comment_meta( $c['comment_ID'], 'akismet_delayed_moderation_email' );
+ Akismet::update_comment_history( $c['comment_ID'], __('Akismet re-checked and caught this comment as spam', 'akismet'), 'check-spam' );
+
+ } elseif ( 'false' == $response[1] ) {
+ update_comment_meta( $c['comment_ID'], 'akismet_result', 'false' );
+ delete_comment_meta( $c['comment_ID'], 'akismet_error' );
+ delete_comment_meta( $c['comment_ID'], 'akismet_delayed_moderation_email' );
+ Akismet::update_comment_history( $c['comment_ID'], __('Akismet re-checked and cleared this comment', 'akismet'), 'check-ham' );
+ // abnormal result: error
+ } else {
+ update_comment_meta( $c['comment_ID'], 'akismet_result', 'error' );
+ Akismet::update_comment_history( $c['comment_ID'], sprintf( __('Akismet was unable to re-check this comment (response: %s)', 'akismet'), substr($response[1], 0, 50)), 'check-error' );
+ }
+
+ delete_comment_meta( $c['comment_ID'], 'akismet_rechecking' );
+ }
+ if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+ wp_send_json( array(
+ 'processed' => count((array) $moderation),
+ ));
+ }
+ else {
+ $redirect_to = isset( $_SERVER['HTTP_REFERER'] ) ? $_SERVER['HTTP_REFERER'] : admin_url( 'edit-comments.php' );
+ wp_safe_redirect( $redirect_to );
+ exit;
+ }
+ }
+
+ // Adds an 'x' link next to author URLs, clicking will remove the author URL and show an undo link
+ public static function remove_comment_author_url() {
+ if ( !empty( $_POST['id'] ) && check_admin_referer( 'comment_author_url_nonce' ) ) {
+ $comment = get_comment( intval( $_POST['id'] ), ARRAY_A );
+ if ( $comment && current_user_can( 'edit_comment', $comment['comment_ID'] ) ) {
+ $comment['comment_author_url'] = '';
+ do_action( 'comment_remove_author_url' );
+ print( wp_update_comment( $comment ) );
+ die();
+ }
+ }
+ }
+
+ public static function add_comment_author_url() {
+ if ( !empty( $_POST['id'] ) && !empty( $_POST['url'] ) && check_admin_referer( 'comment_author_url_nonce' ) ) {
+ $comment = get_comment( intval( $_POST['id'] ), ARRAY_A );
+ if ( $comment && current_user_can( 'edit_comment', $comment['comment_ID'] ) ) {
+ $comment['comment_author_url'] = esc_url( $_POST['url'] );
+ do_action( 'comment_add_author_url' );
+ print( wp_update_comment( $comment ) );
+ die();
+ }
+ }
+ }
+
+ public static function comment_row_action( $a, $comment ) {
+
+ // failsafe for old WP versions
+ if ( !function_exists('add_comment_meta') )
+ return $a;
+
+ $akismet_result = get_comment_meta( $comment->comment_ID, 'akismet_result', true );
+ $akismet_error = get_comment_meta( $comment->comment_ID, 'akismet_error', true );
+ $user_result = get_comment_meta( $comment->comment_ID, 'akismet_user_result', true);
+ $comment_status = wp_get_comment_status( $comment->comment_ID );
+ $desc = null;
+ if ( $akismet_error ) {
+ $desc = __( 'Awaiting spam check' , 'akismet');
+ } elseif ( !$user_result || $user_result == $akismet_result ) {
+ // Show the original Akismet result if the user hasn't overridden it, or if their decision was the same
+ if ( $akismet_result == 'true' && $comment_status != 'spam' && $comment_status != 'trash' )
+ $desc = __( 'Flagged as spam by Akismet' , 'akismet');
+ elseif ( $akismet_result == 'false' && $comment_status == 'spam' )
+ $desc = __( 'Cleared by Akismet' , 'akismet');
+ } else {
+ $who = get_comment_meta( $comment->comment_ID, 'akismet_user', true );
+ if ( $user_result == 'true' )
+ $desc = sprintf( __('Flagged as spam by %s', 'akismet'), $who );
+ else
+ $desc = sprintf( __('Un-spammed by %s', 'akismet'), $who );
+ }
+
+ // add a History item to the hover links, just after Edit
+ if ( $akismet_result ) {
+ $b = array();
+ foreach ( $a as $k => $item ) {
+ $b[ $k ] = $item;
+ if (
+ $k == 'edit'
+ || ( $k == 'unspam' && $GLOBALS['wp_version'] >= 3.4 )
+ ) {
+ $b['history'] = '
'. esc_html__('History', 'akismet') . ' ';
+ }
+ }
+
+ $a = $b;
+ }
+
+ if ( $desc )
+ echo '
'.esc_html( $desc ).' ';
+
+ $show_user_comments = apply_filters( 'akismet_show_user_comments_approved', get_option('akismet_show_user_comments_approved') );
+ $show_user_comments = $show_user_comments === 'false' ? false : $show_user_comments; //option used to be saved as 'false' / 'true'
+
+ if ( $show_user_comments ) {
+ $comment_count = Akismet::get_user_comments_approved( $comment->user_id, $comment->comment_author_email, $comment->comment_author, $comment->comment_author_url );
+ $comment_count = intval( $comment_count );
+ echo '';
+ }
+
+ return $a;
+ }
+
+ public static function comment_status_meta_box( $comment ) {
+ $history = Akismet::get_comment_history( $comment->comment_ID );
+
+ if ( $history ) {
+ echo '
';
+ foreach ( $history as $row ) {
+ $time = date( 'D d M Y @ h:i:m a', $row['time'] ) . ' GMT';
+ echo '
' . sprintf( esc_html__('%s ago', 'akismet'), human_time_diff( $row['time'] ) ) . ' - ';
+ echo esc_html( $row['message'] ) . '
';
+ }
+ echo '
';
+ }
+ }
+
+ public static function plugin_action_links( $links, $file ) {
+ if ( $file == plugin_basename( AKISMET__PLUGIN_URL . '/akismet.php' ) ) {
+ $links[] = '
'.esc_html__( 'Settings' , 'akismet').' ';
+ }
+
+ return $links;
+ }
+
+ public static function text_add_link_callback( $m ) {
+ // bare link?
+ if ( $m[4] == $m[2] )
+ return '';
+ else
+ return '';
+ }
+
+ public static function text_add_link_class( $comment_text ) {
+ return preg_replace_callback( '#
]*)href="([^"]+)"([^>]*)>(.*?) #i', array( 'Akismet_Admin', 'text_add_link_callback' ), $comment_text );
+ }
+
+ // Total spam in queue
+ // get_option( 'akismet_spam_count' ) is the total caught ever
+ public static function get_spam_count( $type = false ) {
+ global $wpdb;
+
+ if ( !$type ) { // total
+ $count = wp_cache_get( 'akismet_spam_count', 'widget' );
+ if ( false === $count ) {
+ if ( function_exists('wp_count_comments') ) {
+ $count = wp_count_comments();
+ $count = $count->spam;
+ } else {
+ $count = (int) $wpdb->get_var("SELECT COUNT(comment_ID) FROM {$wpdb->comments} WHERE comment_approved = 'spam'");
+ }
+ wp_cache_set( 'akismet_spam_count', $count, 'widget', 3600 );
+ }
+ return $count;
+ } elseif ( 'comments' == $type || 'comment' == $type ) { // comments
+ $type = '';
+ }
+
+ return (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(comment_ID) FROM {$wpdb->comments} WHERE comment_approved = 'spam' AND comment_type = %s", $type ) );
+ }
+
+ // Check connectivity between the WordPress blog and Akismet's servers.
+ // Returns an associative array of server IP addresses, where the key is the IP address, and value is true (available) or false (unable to connect).
+ public static function check_server_ip_connectivity() {
+
+ $servers = $ips = array();
+
+ // Some web hosts may disable this function
+ if ( function_exists('gethostbynamel') ) {
+
+ $ips = gethostbynamel( 'rest.akismet.com' );
+ if ( $ips && is_array($ips) && count($ips) ) {
+ $api_key = Akismet::get_api_key();
+
+ foreach ( $ips as $ip ) {
+ $response = Akismet::verify_key( $api_key, $ip );
+ // even if the key is invalid, at least we know we have connectivity
+ if ( $response == 'valid' || $response == 'invalid' )
+ $servers[$ip] = 'connected';
+ else
+ $servers[$ip] = $response ? $response : 'unable to connect';
+ }
+ }
+ }
+
+ return $servers;
+ }
+
+ // Simpler connectivity check
+ public static function check_server_connectivity($cache_timeout = 86400) {
+
+ $debug = array();
+ $debug[ 'PHP_VERSION' ] = PHP_VERSION;
+ $debug[ 'WORDPRESS_VERSION' ] = $GLOBALS['wp_version'];
+ $debug[ 'AKISMET_VERSION' ] = AKISMET_VERSION;
+ $debug[ 'AKISMET__PLUGIN_DIR' ] = AKISMET__PLUGIN_DIR;
+ $debug[ 'SITE_URL' ] = site_url();
+ $debug[ 'HOME_URL' ] = home_url();
+
+ $servers = get_option('akismet_available_servers');
+ if ( (time() - get_option('akismet_connectivity_time') < $cache_timeout) && $servers !== false ) {
+ $servers = self::check_server_ip_connectivity();
+ update_option('akismet_available_servers', $servers);
+ update_option('akismet_connectivity_time', time());
+ }
+
+ $response = wp_remote_get( 'http://rest.akismet.com/1.1/test' );
+
+ $debug[ 'gethostbynamel' ] = function_exists('gethostbynamel') ? 'exists' : 'not here';
+ $debug[ 'Servers' ] = $servers;
+ $debug[ 'Test Connection' ] = $response;
+
+ Akismet::log( $debug );
+
+ if ( $response && 'connected' == wp_remote_retrieve_body( $response ) )
+ return true;
+
+ return false;
+ }
+
+ // Check the server connectivity and store the available servers in an option.
+ public static function get_server_connectivity($cache_timeout = 86400) {
+ return self::check_server_connectivity( $cache_timeout );
+ }
+
+ public static function get_number_spam_waiting() {
+ global $wpdb;
+ return (int) $wpdb->get_var( "SELECT COUNT(*) FROM {$wpdb->commentmeta} WHERE meta_key = 'akismet_error'" );
+ }
+
+ public static function get_page_url( $page = 'config' ) {
+
+ $args = array( 'page' => 'akismet-key-config' );
+
+ if ( $page == 'stats' )
+ $args = array( 'page' => 'akismet-key-config', 'view' => 'stats' );
+ elseif ( $page == 'delete_key' )
+ $args = array( 'page' => 'akismet-key-config', 'view' => 'start', 'action' => 'delete-key', '_wpnonce' => wp_create_nonce( self::NONCE ) );
+
+ $url = add_query_arg( $args, class_exists( 'Jetpack' ) ? admin_url( 'admin.php' ) : admin_url( 'options-general.php' ) );
+
+ return $url;
+ }
+
+ public static function get_akismet_user( $api_key ) {
+ $akismet_user = Akismet::http_post( build_query( array( 'key' => $api_key ) ), 'get-subscription' );
+
+ if ( ! empty( $akismet_user[1] ) )
+ $akismet_user = json_decode( $akismet_user[1] );
+ else
+ $akismet_user = false;
+
+ return $akismet_user;
+ }
+
+ public static function get_stats( $api_key ) {
+ $stat_totals = array();
+
+ foreach( array( '6-months', 'all' ) as $interval ) {
+ $response = Akismet::http_post( build_query( array( 'blog' => urlencode( get_bloginfo('url') ), 'key' => $api_key, 'from' => $interval ) ), 'get-stats' );
+
+ if ( ! empty( $response[1] ) ) {
+ $stat_totals[$interval] = json_decode( $response[1] );
+ }
+ }
+ return $stat_totals;
+ }
+
+ public static function verify_wpcom_key( $api_key, $user_id, $token = '' ) {
+ $akismet_account = Akismet::http_post( build_query( array(
+ 'user_id' => $user_id,
+ 'api_key' => $api_key,
+ 'token' => $token,
+ 'get_account_type' => 'true'
+ ) ), 'verify-wpcom-key' );
+
+ if ( ! empty( $akismet_account[1] ) )
+ $akismet_account = json_decode( $akismet_account[1] );
+
+ Akismet::log( compact( 'akismet_account' ) );
+
+ return $akismet_account;
+ }
+
+ public static function display_alert() {
+ Akismet::view( 'notice', array(
+ 'type' => 'alert',
+ 'code' => (int) get_option( 'akismet_alert_code' ),
+ 'msg' => get_option( 'akismet_alert_msg' )
+ ) );
+ }
+
+ public static function display_spam_check_warning() {
+ Akismet::fix_scheduled_recheck();
+
+ $link_text = apply_filters( 'akismet_spam_check_warning_link_text', sprintf( __( 'Please check your
Akismet configuration and contact your web host if problems persist.', 'akismet'), esc_url( self::get_page_url() ) ) );
+
+ if ( self::get_number_spam_waiting() > 0 && wp_next_scheduled('akismet_schedule_cron_recheck') > time() )
+ Akismet::view( 'notice', array( 'type' => 'spam-check', 'link_text' => $link_text ) );
+ }
+
+ public static function display_invalid_version() {
+ Akismet::view( 'notice', array( 'type' => 'version' ) );
+ }
+
+ public static function display_api_key_warning() {
+ Akismet::view( 'notice', array( 'type' => 'plugin' ) );
+ }
+
+ public static function display_page() {
+ if ( !Akismet::get_api_key() || ( isset( $_GET['view'] ) && $_GET['view'] == 'start' ) )
+ self::display_start_page();
+ elseif ( isset( $_GET['view'] ) && $_GET['view'] == 'stats' )
+ self::display_stats_page();
+ else
+ self::display_configuration_page();
+ }
+
+ public static function display_start_page() {
+ if ( isset( $_GET['action'] ) ) {
+ if ( $_GET['action'] == 'delete-key' ) {
+ if ( isset( $_GET['_wpnonce'] ) && wp_verify_nonce( $_GET['_wpnonce'], self::NONCE ) )
+ delete_option( 'wordpress_api_key' );
+ }
+ }
+
+ if ( $api_key = Akismet::get_api_key() ) {
+ self::display_configuration_page();
+ return;
+ }
+
+ //the user can choose to auto connect their API key by clicking a button on the akismet done page
+ //if jetpack, get verified api key by using connected wpcom user id
+ //if no jetpack, get verified api key by using an akismet token
+
+ $akismet_user = false;
+
+ if ( isset( $_GET['token'] ) && preg_match('/^(\d+)-[0-9a-f]{20}$/', $_GET['token'] ) )
+ $akismet_user = self::verify_wpcom_key( '', '', $_GET['token'] );
+ elseif ( $jetpack_user = self::get_jetpack_user() )
+ $akismet_user = self::verify_wpcom_key( $jetpack_user['api_key'], $jetpack_user['user_id'] );
+
+ if ( isset( $_GET['action'] ) ) {
+ if ( $_GET['action'] == 'save-key' ) {
+ if ( is_object( $akismet_user ) ) {
+ self::save_key( $akismet_user->api_key );
+ self::display_notice();
+ self::display_configuration_page();
+ return;
+ }
+ }
+ }
+
+ echo '';
+
+ self::display_status();
+
+ Akismet::view( 'start', compact( 'akismet_user' ) );
+ }
+
+ public static function display_stats_page() {
+ Akismet::view( 'stats' );
+ }
+
+ public static function display_configuration_page() {
+ $api_key = Akismet::get_api_key();
+ $akismet_user = self::get_akismet_user( $api_key );
+ $stat_totals = self::get_stats( $api_key );
+
+ // If unset, create the new strictness option using the old discard option to determine its default
+ if ( get_option( 'akismet_strictness' ) === false )
+ add_option( 'akismet_strictness', (get_option('akismet_discard_month') === 'true' ? '1' : '0') );
+
+ if ( empty( self::$notices ) ) {
+ //show status
+ if ( ! empty( $stat_totals['all'] ) && isset( $stat_totals['all']->time_saved ) && $akismet_user->status == 'active' && $akismet_user->account_type == 'free-api-key' ) {
+
+ $time_saved = false;
+
+ if ( $stat_totals['all']->time_saved > 1800 ) {
+ $total_in_minutes = round( $stat_totals['all']->time_saved / 60 );
+ $total_in_hours = round( $total_in_minutes / 60 );
+ $total_in_days = round( $total_in_hours / 8 );
+ $cleaning_up = __( 'Cleaning up spam takes time.' , 'akismet');
+
+ if ( $total_in_days > 1 )
+ $time_saved = $cleaning_up . ' ' . sprintf( __( 'Since you joined us, Akismet has saved you %s days!' , 'akismet'), number_format_i18n( $total_in_days ) );
+ elseif ( $total_in_hours > 1 )
+ $time_saved = $cleaning_up . ' ' . sprintf( __( 'Since you joined us, Akismet has saved you %d hours!' , 'akismet'), $total_in_hours );
+ elseif ( $total_in_minutes >= 30 )
+ $time_saved = $cleaning_up . ' ' . sprintf( __( 'Since you joined us, Akismet has saved you %d minutes!' , 'akismet'), $total_in_minutes );
+ }
+
+ Akismet::view( 'notice', array( 'type' => 'active-notice', 'time_saved' => $time_saved ) );
+ }
+
+ if ( !empty( $akismet_user->limit_reached ) && in_array( $akismet_user->limit_reached, array( 'yellow', 'red' ) ) ) {
+ Akismet::view( 'notice', array( 'type' => 'limit-reached', 'level' => $akismet_user->limit_reached ) );
+ }
+ }
+
+ if ( !isset( self::$notices['status'] ) && in_array( $akismet_user->status, array( 'cancelled', 'suspended', 'missing', 'no-sub' ) ) )
+ Akismet::view( 'notice', array( 'type' => $akismet_user->status ) );
+
+ Akismet::log( compact( 'stat_totals', 'akismet_user' ) );
+ Akismet::view( 'config', compact( 'api_key', 'akismet_user', 'stat_totals' ) );
+ }
+
+ public static function display_notice() {
+ global $hook_suffix;
+
+ if ( in_array( $hook_suffix, array( 'jetpack_page_akismet-key-config', 'settings_page_akismet-key-config', 'edit-comments.php' ) ) && (int) get_option( 'akismet_alert_code' ) > 0 ) {
+ self::display_alert();
+ }
+ elseif ( $hook_suffix == 'plugins.php' && !Akismet::get_api_key() ) {
+ self::display_api_key_warning();
+ }
+ elseif ( $hook_suffix == 'edit-comments.php' && wp_next_scheduled( 'akismet_schedule_cron_recheck' ) ) {
+ self::display_spam_check_warning();
+ }
+ elseif ( in_array( $hook_suffix, array( 'jetpack_page_akismet-key-config', 'settings_page_akismet-key-config' ) ) && Akismet::get_api_key() ) {
+ self::display_status();
+ }
+ }
+
+ public static function display_status() {
+ $type = '';
+
+ if ( !self::get_server_connectivity() )
+ $type = 'servers-be-down';
+
+ if ( !empty( $type ) )
+ Akismet::view( 'notice', compact( 'type' ) );
+ elseif ( !empty( self::$notices ) ) {
+ foreach ( self::$notices as $type )
+ Akismet::view( 'notice', compact( 'type' ) );
+ }
+ }
+
+ private static function get_jetpack_user() {
+ if ( !class_exists('Jetpack') )
+ return false;
+
+ Jetpack::load_xml_rpc_client();
+ $xml = new Jetpack_IXR_ClientMulticall( array( 'user_id' => get_current_user_id() ) );
+
+ $xml->addCall( 'wpcom.getUserID' );
+ $xml->addCall( 'akismet.getAPIKey' );
+ $xml->query();
+
+ Akismet::log( compact( 'xml' ) );
+
+ if ( !$xml->isError() ) {
+ $responses = $xml->getResponse();
+ if ( count( $responses ) > 1 ) {
+ $api_key = array_shift( $responses[0] );
+ $user_id = (int) array_shift( $responses[1] );
+ return compact( 'api_key', 'user_id' );
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Some commentmeta isn't useful in an export file. Suppress it (when supported).
+ *
+ * @param bool $exclude
+ * @param string $key The meta key
+ * @param object $meta The meta object
+ * @return bool Whether to exclude this meta entry from the export.
+ */
+ public static function exclude_commentmeta_from_export( $exclude, $key, $meta ) {
+ if ( in_array( $key, array( 'akismet_as_submitted', 'akismet_rechecking', 'akismet_delayed_moderation_email' ) ) ) {
+ return true;
+ }
+
+ return $exclude;
+ }
+}
\ No newline at end of file
diff --git a/wp-content/plugins/akismet/widget.php b/wp-content/plugins/akismet/class.akismet-widget.php
similarity index 83%
rename from wp-content/plugins/akismet/widget.php
rename to wp-content/plugins/akismet/class.akismet-widget.php
index 8c5a120..a60ae60 100644
--- a/wp-content/plugins/akismet/widget.php
+++ b/wp-content/plugins/akismet/class.akismet-widget.php
@@ -5,10 +5,12 @@
class Akismet_Widget extends WP_Widget {
function __construct() {
+ load_plugin_textdomain( 'akismet' );
+
parent::__construct(
'akismet_widget',
- __( 'Akismet Widget' ),
- array( 'description' => __( 'Display the number of spam comments Akismet has caught' ) )
+ __( 'Akismet Widget' , 'akismet'),
+ array( 'description' => __( 'Display the number of spam comments Akismet has caught' , 'akismet') )
);
if ( is_active_widget( false, false, $this->id_base ) ) {
@@ -23,7 +25,7 @@ class Akismet_Widget extends WP_Widget {
.a-stats {
width: auto;
}
-.a-stats a {
+.a-stats a {
background: #7CA821;
background-image:-moz-linear-gradient(0% 100% 90deg,#5F8E14,#7CA821);
background-image:-webkit-gradient(linear,0% 0,0% 100%,from(#7CA821),to(#5F8E14));
@@ -41,7 +43,7 @@ class Akismet_Widget extends WP_Widget {
-webkit-border-radius:3px;
width: 100%;
}
-.a-stats a:hover {
+.a-stats a:hover {
text-decoration: none;
background-image:-moz-linear-gradient(0% 100% 90deg,#6F9C1B,#659417);
background-image:-webkit-gradient(linear,0% 0,0% 100%,from(#659417),to(#6F9C1B));
@@ -61,19 +63,19 @@ class Akismet_Widget extends WP_Widget {
function form( $instance ) {
if ( $instance ) {
- $title = esc_attr( $instance['title'] );
+ $title = $instance['title'];
}
else {
- $title = __( 'Spam Blocked' );
+ $title = __( 'Spam Blocked' , 'akismet');
}
?>
-
-
$key, 'blog' => get_option('home') ) ), 'verify-key', $ip );
+ }
+
+ public static function verify_key( $key, $ip = null ) {
+ $response = self::check_key_status( $key, $ip );
+
+ if ( $response[1] != 'valid' && $response[1] != 'invalid' )
+ return 'failed';
+
+ self::update_alert( $response );
+
+ return $response[1];
+ }
+
+ public static function auto_check_comment( $commentdata ) {
+ self::$last_comment_result = null;
+
+ $comment = $commentdata;
+
+ $comment['user_ip'] = self::get_ip_address();
+ $comment['user_agent'] = self::get_user_agent();
+ $comment['referrer'] = self::get_referer();
+ $comment['blog'] = get_option('home');
+ $comment['blog_lang'] = get_locale();
+ $comment['blog_charset'] = get_option('blog_charset');
+ $comment['permalink'] = get_permalink( $comment['comment_post_ID'] );
+
+ if ( !empty( $comment['user_ID'] ) )
+ $comment['user_role'] = Akismet::get_user_roles( $comment['user_ID'] );
+
+ $akismet_nonce_option = apply_filters( 'akismet_comment_nonce', get_option( 'akismet_comment_nonce' ) );
+ $comment['akismet_comment_nonce'] = 'inactive';
+ if ( $akismet_nonce_option == 'true' || $akismet_nonce_option == '' ) {
+ $comment['akismet_comment_nonce'] = 'failed';
+ if ( isset( $_POST['akismet_comment_nonce'] ) && wp_verify_nonce( $_POST['akismet_comment_nonce'], 'akismet_comment_nonce_' . $comment['comment_post_ID'] ) )
+ $comment['akismet_comment_nonce'] = 'passed';
+
+ // comment reply in wp-admin
+ if ( isset( $_POST['_ajax_nonce-replyto-comment'] ) && check_ajax_referer( 'replyto-comment', '_ajax_nonce-replyto-comment' ) )
+ $comment['akismet_comment_nonce'] = 'passed';
+
+ }
+
+ if ( self::is_test_mode() )
+ $comment['is_test'] = 'true';
+
+ foreach( $_POST as $key => $value ) {
+ if ( is_string( $value ) )
+ $comment["POST_{$key}"] = $value;
+ }
+
+ $ignore = array( 'HTTP_COOKIE', 'HTTP_COOKIE2', 'PHP_AUTH_PW' );
+
+ foreach ( $_SERVER as $key => $value ) {
+ if ( !in_array( $key, $ignore ) && is_string($value) )
+ $comment["$key"] = $value;
+ else
+ $comment["$key"] = '';
+ }
+
+ $post = get_post( $comment['comment_post_ID'] );
+ $comment[ 'comment_post_modified_gmt' ] = $post->post_modified_gmt;
+
+ $response = self::http_post( build_query( $comment ), 'comment-check' );
+
+ do_action( 'akismet_comment_check_response', $response );
+
+ self::update_alert( $response );
+
+ $commentdata['comment_as_submitted'] = array_intersect_key( $comment, array( 'blog' => '', 'blog_charset' => '', 'blog_lang' => '', 'blog_ua' => '', 'comment_agent' => '', 'comment_author' => '', 'comment_author_IP' => '', 'comment_author_email' => '', 'comment_author_url' => '', 'comment_content' => '', 'comment_date_gmt' => '', 'comment_tags' => '', 'comment_type' => '', 'guid' => '', 'is_test' => '', 'permalink' => '', 'reporter' => '', 'site_domain' => '', 'submit_referer' => '', 'submit_uri' => '', 'user_ID' => '', 'user_agent' => '', 'user_id' => '', 'user_ip' => '' ) );
+ $commentdata['akismet_result'] = $response[1];
+
+ if ( isset( $response[0]['x-akismet-pro-tip'] ) )
+ $commentdata['akismet_pro_tip'] = $response[0]['x-akismet-pro-tip'];
+
+ if ( isset( $response[0]['x-akismet-error'] ) ) {
+ // An error occurred that we anticipated (like a suspended key) and want the user to act on.
+ // Send to moderation.
+ self::$last_comment_result = '0';
+ }
+ else if ( 'true' == $response[1] ) {
+ // akismet_spam_count will be incremented later by comment_is_spam()
+ self::$last_comment_result = 'spam';
+
+ $discard = ( isset( $commentdata['akismet_pro_tip'] ) && $commentdata['akismet_pro_tip'] === 'discard' && self::allow_discard() );
+
+ do_action( 'akismet_spam_caught', $discard );
+
+ if ( $discard ) {
+ // akismet_result_spam() won't be called so bump the counter here
+ if ( $incr = apply_filters('akismet_spam_count_incr', 1) )
+ update_option( 'akismet_spam_count', get_option('akismet_spam_count') + $incr );
+ $redirect_to = isset( $_SERVER['HTTP_REFERER'] ) ? $_SERVER['HTTP_REFERER'] : get_permalink( $post );
+ wp_safe_redirect( esc_url_raw( $redirect_to ) );
+ die();
+ }
+ }
+
+ // if the response is neither true nor false, hold the comment for moderation and schedule a recheck
+ if ( 'true' != $response[1] && 'false' != $response[1] ) {
+ if ( !current_user_can('moderate_comments') ) {
+ // Comment status should be moderated
+ self::$last_comment_result = '0';
+ }
+ if ( function_exists('wp_next_scheduled') && function_exists('wp_schedule_single_event') ) {
+ if ( !wp_next_scheduled( 'akismet_schedule_cron_recheck' ) ) {
+ wp_schedule_single_event( time() + 1200, 'akismet_schedule_cron_recheck' );
+ }
+ }
+
+ self::$prevent_moderation_email_for_these_comments[] = $commentdata;
+ }
+
+ if ( function_exists('wp_next_scheduled') && function_exists('wp_schedule_event') ) {
+ // WP 2.1+: delete old comments daily
+ if ( !wp_next_scheduled( 'akismet_scheduled_delete' ) )
+ wp_schedule_event( time(), 'daily', 'akismet_scheduled_delete' );
+ }
+ elseif ( (mt_rand(1, 10) == 3) ) {
+ // WP 2.0: run this one time in ten
+ self::delete_old_comments();
+ }
+
+ self::set_last_comment( $commentdata );
+ self::fix_scheduled_recheck();
+
+ return self::$last_comment;
+ }
+
+ public static function get_last_comment() {
+ return self::$last_comment;
+ }
+
+ public static function set_last_comment( $comment ) {
+ if ( is_null( $comment ) ) {
+ self::$last_comment = null;
+ }
+ else {
+ // We filter it here so that it matches the filtered comment data that we'll have to compare against later.
+ // wp_filter_comment expects comment_author_IP
+ self::$last_comment = wp_filter_comment(
+ array_merge(
+ array( 'comment_author_IP' => self::get_ip_address() ),
+ $comment
+ )
+ );
+ }
+ }
+
+ // this fires on wp_insert_comment. we can't update comment_meta when auto_check_comment() runs
+ // because we don't know the comment ID at that point.
+ public static function auto_check_update_meta( $id, $comment ) {
+
+ // failsafe for old WP versions
+ if ( !function_exists('add_comment_meta') )
+ return false;
+
+ if ( !isset( self::$last_comment['comment_author_email'] ) )
+ self::$last_comment['comment_author_email'] = '';
+
+ // wp_insert_comment() might be called in other contexts, so make sure this is the same comment
+ // as was checked by auto_check_comment
+ if ( is_object( $comment ) && !empty( self::$last_comment ) && is_array( self::$last_comment ) ) {
+ if ( self::matches_last_comment( $comment ) ) {
+
+ load_plugin_textdomain( 'akismet' );
+
+ // normal result: true or false
+ if ( self::$last_comment['akismet_result'] == 'true' ) {
+ update_comment_meta( $comment->comment_ID, 'akismet_result', 'true' );
+ self::update_comment_history( $comment->comment_ID, __('Akismet caught this comment as spam', 'akismet'), 'check-spam' );
+ if ( $comment->comment_approved != 'spam' )
+ self::update_comment_history( $comment->comment_ID, sprintf( __('Comment status was changed to %s', 'akismet'), $comment->comment_approved), 'status-changed'.$comment->comment_approved );
+ }
+ elseif ( self::$last_comment['akismet_result'] == 'false' ) {
+ update_comment_meta( $comment->comment_ID, 'akismet_result', 'false' );
+ self::update_comment_history( $comment->comment_ID, __('Akismet cleared this comment', 'akismet'), 'check-ham' );
+ if ( $comment->comment_approved == 'spam' ) {
+ if ( wp_blacklist_check($comment->comment_author, $comment->comment_author_email, $comment->comment_author_url, $comment->comment_content, $comment->comment_author_IP, $comment->comment_agent) )
+ self::update_comment_history( $comment->comment_ID, __('Comment was caught by wp_blacklist_check', 'akismet'), 'wp-blacklisted' );
+ else
+ self::update_comment_history( $comment->comment_ID, sprintf( __('Comment status was changed to %s', 'akismet'), $comment->comment_approved), 'status-changed-'.$comment->comment_approved );
+ }
+ } // abnormal result: error
+ else {
+ update_comment_meta( $comment->comment_ID, 'akismet_error', time() );
+ self::update_comment_history( $comment->comment_ID, sprintf( __('Akismet was unable to check this comment (response: %s), will automatically retry again later.', 'akismet'), substr(self::$last_comment['akismet_result'], 0, 50)), 'check-error' );
+ }
+
+ // record the complete original data as submitted for checking
+ if ( isset( self::$last_comment['comment_as_submitted'] ) )
+ update_comment_meta( $comment->comment_ID, 'akismet_as_submitted', self::$last_comment['comment_as_submitted'] );
+
+ if ( isset( self::$last_comment['akismet_pro_tip'] ) )
+ update_comment_meta( $comment->comment_ID, 'akismet_pro_tip', self::$last_comment['akismet_pro_tip'] );
+ }
+ }
+ }
+
+ public static function delete_old_comments() {
+ global $wpdb;
+
+ while( $comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_id FROM {$wpdb->comments} WHERE DATE_SUB(NOW(), INTERVAL 15 DAY) > comment_date_gmt AND comment_approved = 'spam' LIMIT %d", defined( 'AKISMET_DELETE_LIMIT' ) ? AKISMET_DELETE_LIMIT : 10000 ) ) ) {
+ if ( empty( $comment_ids ) )
+ return;
+
+ $wpdb->queries = array();
+
+ do_action( 'delete_comment', $comment_ids );
+
+ $comma_comment_ids = implode( ', ', array_map('intval', $comment_ids) );
+
+ $wpdb->query("DELETE FROM {$wpdb->comments} WHERE comment_id IN ( $comma_comment_ids )");
+ $wpdb->query("DELETE FROM {$wpdb->commentmeta} WHERE comment_id IN ( $comma_comment_ids )");
+
+ clean_comment_cache( $comment_ids );
+ }
+
+ if ( apply_filters( 'akismet_optimize_table', ( mt_rand(1, 5000) == 11), $wpdb->comments ) ) // lucky number
+ $wpdb->query("OPTIMIZE TABLE {$wpdb->comments}");
+ }
+
+ public static function delete_old_comments_meta() {
+ global $wpdb;
+
+ $interval = apply_filters( 'akismet_delete_commentmeta_interval', 15 );
+
+ # enfore a minimum of 1 day
+ $interval = absint( $interval );
+ if ( $interval < 1 )
+ $interval = 1;
+
+ // akismet_as_submitted meta values are large, so expire them
+ // after $interval days regardless of the comment status
+ while ( $comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT m.comment_id FROM {$wpdb->commentmeta} as m INNER JOIN {$wpdb->comments} as c USING(comment_id) WHERE m.meta_key = 'akismet_as_submitted' AND DATE_SUB(NOW(), INTERVAL %d DAY) > c.comment_date_gmt LIMIT 10000", $interval ) ) ) {
+ if ( empty( $comment_ids ) )
+ return;
+
+ $wpdb->queries = array();
+
+ foreach ( $comment_ids as $comment_id ) {
+ delete_comment_meta( $comment_id, 'akismet_as_submitted' );
+ }
+ }
+
+ if ( apply_filters( 'akismet_optimize_table', ( mt_rand(1, 5000) == 11), $wpdb->commentmeta ) ) // lucky number
+ $wpdb->query("OPTIMIZE TABLE {$wpdb->commentmeta}");
+ }
+
+ // how many approved comments does this author have?
+ public static function get_user_comments_approved( $user_id, $comment_author_email, $comment_author, $comment_author_url ) {
+ global $wpdb;
+
+ if ( !empty( $user_id ) )
+ return (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM {$wpdb->comments} WHERE user_id = %d AND comment_approved = 1", $user_id ) );
+
+ if ( !empty( $comment_author_email ) )
+ return (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM {$wpdb->comments} WHERE comment_author_email = %s AND comment_author = %s AND comment_author_url = %s AND comment_approved = 1", $comment_author_email, $comment_author, $comment_author_url ) );
+
+ return 0;
+ }
+
+ // get the full comment history for a given comment, as an array in reverse chronological order
+ public static function get_comment_history( $comment_id ) {
+
+ // failsafe for old WP versions
+ if ( !function_exists('add_comment_meta') )
+ return false;
+
+ $history = get_comment_meta( $comment_id, 'akismet_history', false );
+ usort( $history, array( 'Akismet', '_cmp_time' ) );
+ return $history;
+ }
+
+ // log an event for a given comment, storing it in comment_meta
+ public static function update_comment_history( $comment_id, $message, $event=null ) {
+ global $current_user;
+
+ // failsafe for old WP versions
+ if ( !function_exists('add_comment_meta') )
+ return false;
+
+ $user = '';
+ if ( is_object( $current_user ) && isset( $current_user->user_login ) )
+ $user = $current_user->user_login;
+
+ $event = array(
+ 'time' => self::_get_microtime(),
+ 'message' => $message,
+ 'event' => $event,
+ 'user' => $user,
+ );
+
+ // $unique = false so as to allow multiple values per comment
+ $r = add_comment_meta( $comment_id, 'akismet_history', $event, false );
+ }
+
+ public static function check_db_comment( $id, $recheck_reason = 'recheck_queue' ) {
+ global $wpdb;
+
+ $c = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->comments} WHERE comment_ID = %d", $id ), ARRAY_A );
+ if ( !$c )
+ return;
+
+ $c['user_ip'] = $c['comment_author_IP'];
+ $c['user_agent'] = $c['comment_agent'];
+ $c['referrer'] = '';
+ $c['blog'] = get_option('home');
+ $c['blog_lang'] = get_locale();
+ $c['blog_charset'] = get_option('blog_charset');
+ $c['permalink'] = get_permalink($c['comment_post_ID']);
+ $c['recheck_reason'] = $recheck_reason;
+
+ if ( self::is_test_mode() )
+ $c['is_test'] = 'true';
+
+ $response = self::http_post( build_query( $c ), 'comment-check' );
+
+ return ( is_array( $response ) && ! empty( $response[1] ) ) ? $response[1] : false;
+ }
+
+
+
+ public static function transition_comment_status( $new_status, $old_status, $comment ) {
+
+ if ( $new_status == $old_status )
+ return;
+
+ # we don't need to record a history item for deleted comments
+ if ( $new_status == 'delete' )
+ return;
+
+ if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) && !current_user_can( 'moderate_comments' ) )
+ return;
+
+ if ( defined('WP_IMPORTING') && WP_IMPORTING == true )
+ return;
+
+ // if this is present, it means the status has been changed by a re-check, not an explicit user action
+ if ( get_comment_meta( $comment->comment_ID, 'akismet_rechecking' ) )
+ return;
+
+ global $current_user;
+ $reporter = '';
+ if ( is_object( $current_user ) )
+ $reporter = $current_user->user_login;
+
+ // Assumption alert:
+ // We want to submit comments to Akismet only when a moderator explicitly spams or approves it - not if the status
+ // is changed automatically by another plugin. Unfortunately WordPress doesn't provide an unambiguous way to
+ // determine why the transition_comment_status action was triggered. And there are several different ways by which
+ // to spam and unspam comments: bulk actions, ajax, links in moderation emails, the dashboard, and perhaps others.
+ // We'll assume that this is an explicit user action if certain POST/GET variables exist.
+ if ( ( isset( $_POST['status'] ) && in_array( $_POST['status'], array( 'spam', 'unspam' ) ) ) ||
+ ( isset( $_POST['spam'] ) && (int) $_POST['spam'] == 1 ) ||
+ ( isset( $_POST['unspam'] ) && (int) $_POST['unspam'] == 1 ) ||
+ ( isset( $_POST['comment_status'] ) && in_array( $_POST['comment_status'], array( 'spam', 'unspam' ) ) ) ||
+ ( isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'spam', 'unspam' ) ) ) ||
+ ( isset( $_POST['action'] ) && in_array( $_POST['action'], array( 'editedcomment' ) ) )
+ ) {
+ if ( $new_status == 'spam' && ( $old_status == 'approved' || $old_status == 'unapproved' || !$old_status ) ) {
+ return self::submit_spam_comment( $comment->comment_ID );
+ } elseif ( $old_status == 'spam' && ( $new_status == 'approved' || $new_status == 'unapproved' ) ) {
+ return self::submit_nonspam_comment( $comment->comment_ID );
+ }
+ }
+
+ self::update_comment_history( $comment->comment_ID, sprintf( __('%1$s changed the comment status to %2$s', 'akismet'), $reporter, $new_status ), 'status-' . $new_status );
+ }
+
+ public static function submit_spam_comment( $comment_id ) {
+ global $wpdb, $current_user, $current_site;
+
+ $comment_id = (int) $comment_id;
+
+ $comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->comments} WHERE comment_ID = %d", $comment_id ) );
+
+ if ( !$comment ) // it was deleted
+ return;
+
+ if ( 'spam' != $comment->comment_approved )
+ return;
+
+ // use the original version stored in comment_meta if available
+ $as_submitted = get_comment_meta( $comment_id, 'akismet_as_submitted', true);
+
+ if ( $as_submitted && is_array( $as_submitted ) && isset( $as_submitted['comment_content'] ) )
+ $comment = (object) array_merge( (array)$comment, $as_submitted );
+
+ $comment->blog = get_bloginfo('url');
+ $comment->blog_lang = get_locale();
+ $comment->blog_charset = get_option('blog_charset');
+ $comment->permalink = get_permalink($comment->comment_post_ID);
+
+ if ( is_object($current_user) )
+ $comment->reporter = $current_user->user_login;
+
+ if ( is_object($current_site) )
+ $comment->site_domain = $current_site->domain;
+
+ $comment->user_role = '';
+ if ( isset( $comment->user_ID ) )
+ $comment->user_role = Akismet::get_user_roles( $comment->user_ID );
+
+ if ( self::is_test_mode() )
+ $comment->is_test = 'true';
+
+ $post = get_post( $comment->comment_post_ID );
+ $comment->comment_post_modified_gmt = $post->post_modified_gmt;
+
+ $response = Akismet::http_post( build_query( $comment ), 'submit-spam' );
+ if ( $comment->reporter ) {
+ self::update_comment_history( $comment_id, sprintf( __('%s reported this comment as spam', 'akismet'), $comment->reporter ), 'report-spam' );
+ update_comment_meta( $comment_id, 'akismet_user_result', 'true' );
+ update_comment_meta( $comment_id, 'akismet_user', $comment->reporter );
+ }
+
+ do_action('akismet_submit_spam_comment', $comment_id, $response[1]);
+ }
+
+ public static function submit_nonspam_comment( $comment_id ) {
+ global $wpdb, $current_user, $current_site;
+
+ $comment_id = (int) $comment_id;
+
+ $comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->comments} WHERE comment_ID = %d", $comment_id ) );
+ if ( !$comment ) // it was deleted
+ return;
+
+ // use the original version stored in comment_meta if available
+ $as_submitted = get_comment_meta( $comment_id, 'akismet_as_submitted', true);
+
+ if ( $as_submitted && is_array($as_submitted) && isset($as_submitted['comment_content']) )
+ $comment = (object) array_merge( (array)$comment, $as_submitted );
+
+ $comment->blog = get_bloginfo('url');
+ $comment->blog_lang = get_locale();
+ $comment->blog_charset = get_option('blog_charset');
+ $comment->permalink = get_permalink( $comment->comment_post_ID );
+ $comment->user_role = '';
+
+ if ( is_object($current_user) )
+ $comment->reporter = $current_user->user_login;
+
+ if ( is_object($current_site) )
+ $comment->site_domain = $current_site->domain;
+
+ if ( isset( $comment->user_ID ) )
+ $comment->user_role = Akismet::get_user_roles($comment->user_ID);
+
+ if ( Akismet::is_test_mode() )
+ $comment->is_test = 'true';
+
+ $post = get_post( $comment->comment_post_ID );
+ $comment->comment_post_modified_gmt = $post->post_modified_gmt;
+
+ $response = self::http_post( build_query( $comment ), 'submit-ham' );
+ if ( $comment->reporter ) {
+ self::update_comment_history( $comment_id, sprintf( __('%s reported this comment as not spam', 'akismet'), $comment->reporter ), 'report-ham' );
+ update_comment_meta( $comment_id, 'akismet_user_result', 'false' );
+ update_comment_meta( $comment_id, 'akismet_user', $comment->reporter );
+ }
+
+ do_action('akismet_submit_nonspam_comment', $comment_id, $response[1]);
+ }
+
+ public static function cron_recheck() {
+ global $wpdb;
+
+ $api_key = self::get_api_key();
+
+ $status = self::verify_key( $api_key );
+ if ( get_option( 'akismet_alert_code' ) || $status == 'invalid' ) {
+ // since there is currently a problem with the key, reschedule a check for 6 hours hence
+ wp_schedule_single_event( time() + 21600, 'akismet_schedule_cron_recheck' );
+ return false;
+ }
+
+ delete_option('akismet_available_servers');
+
+ $comment_errors = $wpdb->get_col( "SELECT comment_id FROM {$wpdb->commentmeta} WHERE meta_key = 'akismet_error' LIMIT 100" );
+
+ load_plugin_textdomain( 'akismet' );
+
+ foreach ( (array) $comment_errors as $comment_id ) {
+ // if the comment no longer exists, or is too old, remove the meta entry from the queue to avoid getting stuck
+ $comment = get_comment( $comment_id );
+ if ( !$comment || strtotime( $comment->comment_date_gmt ) < strtotime( "-15 days" ) ) {
+ delete_comment_meta( $comment_id, 'akismet_error' );
+ delete_comment_meta( $comment_id, 'akismet_delayed_moderation_email' );
+ continue;
+ }
+
+ add_comment_meta( $comment_id, 'akismet_rechecking', true );
+ $status = self::check_db_comment( $comment_id, 'retry' );
+
+ $msg = '';
+ if ( $status == 'true' ) {
+ $msg = __( 'Akismet caught this comment as spam during an automatic retry.' , 'akismet');
+ } elseif ( $status == 'false' ) {
+ $msg = __( 'Akismet cleared this comment during an automatic retry.' , 'akismet');
+ }
+
+ // If we got back a legit response then update the comment history
+ // other wise just bail now and try again later. No point in
+ // re-trying all the comments once we hit one failure.
+ if ( !empty( $msg ) ) {
+ delete_comment_meta( $comment_id, 'akismet_error' );
+ self::update_comment_history( $comment_id, $msg, 'cron-retry' );
+ update_comment_meta( $comment_id, 'akismet_result', $status );
+ // make sure the comment status is still pending. if it isn't, that means the user has already moved it elsewhere.
+ $comment = get_comment( $comment_id );
+ if ( $comment && 'unapproved' == wp_get_comment_status( $comment_id ) ) {
+ if ( $status == 'true' ) {
+ wp_spam_comment( $comment_id );
+ } elseif ( $status == 'false' ) {
+ // comment is good, but it's still in the pending queue. depending on the moderation settings
+ // we may need to change it to approved.
+ if ( check_comment($comment->comment_author, $comment->comment_author_email, $comment->comment_author_url, $comment->comment_content, $comment->comment_author_IP, $comment->comment_agent, $comment->comment_type) )
+ wp_set_comment_status( $comment_id, 1 );
+ else if ( get_comment_meta( $comment_id, 'akismet_delayed_moderation_email', true ) )
+ wp_notify_moderator( $comment_id );
+ }
+ }
+
+ delete_comment_meta( $comment_id, 'akismet_delayed_moderation_email' );
+ } else {
+ // If this comment has been pending moderation for longer than MAX_DELAY_BEFORE_MODERATION_EMAIL,
+ // send a moderation email now.
+ if ( ( intval( gmdate( 'U' ) ) - strtotime( $comment->comment_date_gmt ) ) < self::MAX_DELAY_BEFORE_MODERATION_EMAIL ) {
+ delete_comment_meta( $comment_id, 'akismet_delayed_moderation_email' );
+ wp_notify_moderator( $comment_id );
+ }
+
+ delete_comment_meta( $comment_id, 'akismet_rechecking' );
+ wp_schedule_single_event( time() + 1200, 'akismet_schedule_cron_recheck' );
+ return;
+ }
+ delete_comment_meta( $comment_id, 'akismet_rechecking' );
+ }
+
+ $remaining = $wpdb->get_var( "SELECT COUNT(*) FROM {$wpdb->commentmeta} WHERE meta_key = 'akismet_error'" );
+ if ( $remaining && !wp_next_scheduled('akismet_schedule_cron_recheck') ) {
+ wp_schedule_single_event( time() + 1200, 'akismet_schedule_cron_recheck' );
+ }
+ }
+
+ public static function fix_scheduled_recheck() {
+ $future_check = wp_next_scheduled( 'akismet_schedule_cron_recheck' );
+ if ( !$future_check ) {
+ return;
+ }
+
+ if ( get_option( 'akismet_alert_code' ) > 0 ) {
+ return;
+ }
+
+ $check_range = time() + 1200;
+ if ( $future_check > $check_range ) {
+ wp_clear_scheduled_hook( 'akismet_schedule_cron_recheck' );
+ wp_schedule_single_event( time() + 300, 'akismet_schedule_cron_recheck' );
+ }
+ }
+
+ public static function add_comment_nonce( $post_id ) {
+ echo '
';
+ wp_nonce_field( 'akismet_comment_nonce_' . $post_id, 'akismet_comment_nonce', FALSE );
+ echo '
';
+ }
+
+ public static function is_test_mode() {
+ return defined('AKISMET_TEST_MODE') && AKISMET_TEST_MODE;
+ }
+
+ public static function allow_discard() {
+ if ( defined( 'DOING_AJAX' ) && DOING_AJAX )
+ return false;
+ if ( is_user_logged_in() )
+ return false;
+
+ return ( get_option( 'akismet_strictness' ) === '1' );
+ }
+
+ public static function get_ip_address() {
+ return isset( $_SERVER['REMOTE_ADDR'] ) ? $_SERVER['REMOTE_ADDR'] : null;
+ }
+
+ /**
+ * Do these two comments, without checking the comment_ID, "match"?
+ *
+ * @param mixed $comment1 A comment object or array.
+ * @param mixed $comment2 A comment object or array.
+ * @return bool Whether the two comments should be treated as the same comment.
+ */
+ private static function comments_match( $comment1, $comment2 ) {
+ $comment1 = (array) $comment1;
+ $comment2 = (array) $comment2;
+
+ return (
+ isset( $comment1['comment_post_ID'], $comment2['comment_post_ID'] )
+ && intval( $comment1['comment_post_ID'] ) == intval( $comment2['comment_post_ID'] )
+ && $comment1['comment_author'] == $comment2['comment_author']
+ && $comment1['comment_author_email'] == $comment2['comment_author_email']
+ );
+ }
+
+ // Does the supplied comment match the details of the one most recently stored in self::$last_comment?
+ public static function matches_last_comment( $comment ) {
+ if ( is_object( $comment ) )
+ $comment = (array) $comment;
+
+ return self::comments_match( self::$last_comment, $comment );
+ }
+
+ private static function get_user_agent() {
+ return isset( $_SERVER['HTTP_USER_AGENT'] ) ? $_SERVER['HTTP_USER_AGENT'] : null;
+ }
+
+ private static function get_referer() {
+ return isset( $_SERVER['HTTP_REFERER'] ) ? $_SERVER['HTTP_REFERER'] : null;
+ }
+
+ // return a comma-separated list of role names for the given user
+ public static function get_user_roles( $user_id ) {
+ $roles = false;
+
+ if ( !class_exists('WP_User') )
+ return false;
+
+ if ( $user_id > 0 ) {
+ $comment_user = new WP_User( $user_id );
+ if ( isset( $comment_user->roles ) )
+ $roles = join( ',', $comment_user->roles );
+ }
+
+ if ( is_multisite() && is_super_admin( $user_id ) ) {
+ if ( empty( $roles ) ) {
+ $roles = 'super_admin';
+ } else {
+ $comment_user->roles[] = 'super_admin';
+ $roles = join( ',', $comment_user->roles );
+ }
+ }
+
+ return $roles;
+ }
+
+ // filter handler used to return a spam result to pre_comment_approved
+ public static function last_comment_status( $approved, $comment ) {
+ // Only do this if it's the correct comment
+ if ( is_null(self::$last_comment_result) || ! self::matches_last_comment( $comment ) ) {
+ self::log( "comment_is_spam mismatched comment, returning unaltered $approved" );
+ return $approved;
+ }
+
+ // bump the counter here instead of when the filter is added to reduce the possibility of overcounting
+ if ( $incr = apply_filters('akismet_spam_count_incr', 1) )
+ update_option( 'akismet_spam_count', get_option('akismet_spam_count') + $incr );
+
+ return self::$last_comment_result;
+ }
+
+ /**
+ * If Akismet is temporarily unreachable, we don't want to "spam" the blogger with
+ * moderation emails for comments that will be automatically cleared or spammed on
+ * the next retry.
+ *
+ * For comments that will be rechecked later, empty the list of email addresses that
+ * the moderation email would be sent to.
+ *
+ * @param array $emails An array of email addresses that the moderation email will be sent to.
+ * @param int $comment_id The ID of the relevant comment.
+ * @return array An array of email addresses that the moderation email will be sent to.
+ */
+ public static function disable_moderation_emails_if_unreachable( $emails, $comment_id ) {
+ if ( ! empty( self::$prevent_moderation_email_for_these_comments ) && ! empty( $emails ) ) {
+ $comment = get_comment( $comment_id );
+
+ foreach ( self::$prevent_moderation_email_for_these_comments as $possible_match ) {
+ if ( self::comments_match( $possible_match, $comment ) ) {
+ update_comment_meta( $comment_id, 'akismet_delayed_moderation_email', true );
+ return array();
+ }
+ }
+ }
+
+ return $emails;
+ }
+
+ public static function _cmp_time( $a, $b ) {
+ return $a['time'] > $b['time'] ? -1 : 1;
+ }
+
+ public static function _get_microtime() {
+ $mtime = explode( ' ', microtime() );
+ return $mtime[1] + $mtime[0];
+ }
+
+ /**
+ * Make a POST request to the Akismet API.
+ *
+ * @param string $request The body of the request.
+ * @param string $path The path for the request.
+ * @param string $ip The specific IP address to hit.
+ * @return array A two-member array consisting of the headers and the response body, both empty in the case of a failure.
+ */
+ public static function http_post( $request, $path, $ip=null ) {
+
+ $akismet_ua = sprintf( 'WordPress/%s | Akismet/%s', $GLOBALS['wp_version'], constant( 'AKISMET_VERSION' ) );
+ $akismet_ua = apply_filters( 'akismet_ua', $akismet_ua );
+
+ $content_length = strlen( $request );
+
+ $api_key = self::get_api_key();
+ $host = self::API_HOST;
+
+ if ( !empty( $api_key ) )
+ $host = $api_key.'.'.$host;
+
+ $http_host = $host;
+ // use a specific IP if provided
+ // needed by Akismet_Admin::check_server_connectivity()
+ if ( $ip && long2ip( ip2long( $ip ) ) ) {
+ $http_host = $ip;
+ }
+
+ $http_args = array(
+ 'body' => $request,
+ 'headers' => array(
+ 'Content-Type' => 'application/x-www-form-urlencoded; charset=' . get_option( 'blog_charset' ),
+ 'Host' => $host,
+ 'User-Agent' => $akismet_ua,
+ ),
+ 'httpversion' => '1.0',
+ 'timeout' => 15
+ );
+
+ $akismet_url = "http://{$http_host}/1.1/{$path}";
+ $response = wp_remote_post( $akismet_url, $http_args );
+ Akismet::log( compact( 'akismet_url', 'http_args', 'response' ) );
+ if ( is_wp_error( $response ) )
+ return array( '', '' );
+
+ return array( $response['headers'], $response['body'] );
+ }
+
+ // given a response from an API call like check_key_status(), update the alert code options if an alert is present.
+ private static function update_alert( $response ) {
+ $code = $msg = null;
+ if ( isset( $response[0]['x-akismet-alert-code'] ) ) {
+ $code = $response[0]['x-akismet-alert-code'];
+ $msg = $response[0]['x-akismet-alert-msg'];
+ }
+
+ // only call update_option() if the value has changed
+ if ( $code != get_option( 'akismet_alert_code' ) ) {
+ if ( ! $code ) {
+ delete_option( 'akismet_alert_code' );
+ delete_option( 'akismet_alert_msg' );
+ }
+ else {
+ update_option( 'akismet_alert_code', $code );
+ update_option( 'akismet_alert_msg', $msg );
+ }
+ }
+ }
+
+ public static function load_form_js() {
+ // WP < 3.3 can't enqueue a script this late in the game and still have it appear in the footer.
+ // Once we drop support for everything pre-3.3, this can change back to a single enqueue call.
+ wp_register_script( 'akismet-form', AKISMET__PLUGIN_URL . '_inc/form.js', array(), AKISMET_VERSION, true );
+ add_action( 'wp_footer', array( 'Akismet', 'print_form_js' ) );
+ add_action( 'admin_footer', array( 'Akismet', 'print_form_js' ) );
+ }
+
+ public static function print_form_js() {
+ wp_print_scripts( 'akismet-form' );
+ }
+
+ public static function inject_ak_js( $fields ) {
+ echo '
';
+ echo '
';
+ }
+
+ private static function bail_on_activation( $message, $deactivate = true ) {
+?>
+
+
+
+
+
+
+
+
+
+ $plugin ) {
+ if ( $plugin === $akismet ) {
+ $plugins[$i] = false;
+ $update = true;
+ }
+ }
+
+ if ( $update ) {
+ update_option( 'active_plugins', array_filter( $plugins ) );
+ }
+ }
+ exit;
+ }
+
+ public static function view( $name, array $args = array() ) {
+ $args = apply_filters( 'akismet_view_arguments', $args, $name );
+
+ foreach ( $args AS $key => $val ) {
+ $$key = $val;
+ }
+
+ load_plugin_textdomain( 'akismet' );
+
+ $file = AKISMET__PLUGIN_DIR . 'views/'. $name . '.php';
+
+ include( $file );
+ }
+
+ /**
+ * Attached to activate_{ plugin_basename( __FILES__ ) } by register_activation_hook()
+ * @static
+ */
+ public static function plugin_activation() {
+ if ( version_compare( $GLOBALS['wp_version'], AKISMET__MINIMUM_WP_VERSION, '<' ) ) {
+ load_plugin_textdomain( 'akismet' );
+
+ $message = '
'.sprintf(esc_html__( 'Akismet %s requires WordPress %s or higher.' , 'akismet'), AKISMET_VERSION, AKISMET__MINIMUM_WP_VERSION ).' '.sprintf(__('Please
upgrade WordPress to a current version, or
downgrade to version 2.4 of the Akismet plugin .', 'akismet'), 'https://codex.wordpress.org/Upgrading_WordPress', 'http://wordpress.org/extend/plugins/akismet/download/');
+
+ Akismet::bail_on_activation( $message );
+ }
+ }
+
+ /**
+ * Removes all connection options
+ * @static
+ */
+ public static function plugin_deactivation( ) {
+ //tidy up
+ }
+
+ public static function log( $akismet_debug ) {
+ if ( defined( 'WP_DEBUG_LOG' ) && WP_DEBUG_LOG )
+ error_log( print_r( compact( 'akismet_debug' ), 1 ) ); //send message to debug.log when in debug mode
+ }
+}
\ No newline at end of file
diff --git a/wp-content/plugins/akismet/index.php b/wp-content/plugins/akismet/index.php
index a6ce9c8..cf879a5 100644
--- a/wp-content/plugins/akismet/index.php
+++ b/wp-content/plugins/akismet/index.php
@@ -1,2 +1,2 @@
escape( $type );
- return $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE comment_approved = 'spam' AND comment_type='$type' ORDER BY comment_date DESC LIMIT $start, $end");
- }
-
- // All
- return $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE comment_approved = 'spam' ORDER BY comment_date DESC LIMIT $start, $end");
-}
-
-// Totals for each comment type
-// returns array( type => count, ... )
-function akismet_spam_totals() {
- global $wpdb;
- $totals = $wpdb->get_results( "SELECT comment_type, COUNT(*) AS cc FROM $wpdb->comments WHERE comment_approved = 'spam' GROUP BY comment_type" );
- $return = array();
- foreach ( $totals as $total )
- $return[$total->comment_type ? $total->comment_type : 'comment'] = $total->cc;
- return $return;
-}
-
-function akismet_manage_page() {
- global $wpdb, $submenu, $wp_db_version;
-
- // WP 2.7 has its own spam management page
- if ( 8645 <= $wp_db_version )
- return;
-
- $count = sprintf(__('Akismet Spam (%s)'), akismet_spam_count());
- if ( isset( $submenu['edit-comments.php'] ) )
- add_submenu_page('edit-comments.php', __('Akismet Spam'), $count, 'moderate_comments', 'akismet-admin', 'akismet_caught' );
- elseif ( function_exists('add_management_page') )
- add_management_page(__('Akismet Spam'), $count, 'moderate_comments', 'akismet-admin', 'akismet_caught');
-}
-
-function akismet_caught() {
- global $wpdb, $comment, $akismet_caught, $akismet_nonce;
-
- akismet_recheck_queue();
- if (isset($_POST['submit']) && 'recover' == $_POST['action'] && ! empty($_POST['not_spam'])) {
- check_admin_referer( $akismet_nonce );
- if ( function_exists('current_user_can') && !current_user_can('moderate_comments') )
- die(__('You do not have sufficient permission to moderate comments.'));
-
- $i = 0;
- foreach ($_POST['not_spam'] as $comment):
- $comment = (int) $comment;
- if ( function_exists('wp_set_comment_status') )
- wp_set_comment_status($comment, 'approve');
- else
- $wpdb->query("UPDATE $wpdb->comments SET comment_approved = '1' WHERE comment_ID = '$comment'");
- akismet_submit_nonspam_comment($comment);
- ++$i;
- endforeach;
- $to = add_query_arg( 'recovered', $i, $_SERVER['HTTP_REFERER'] );
- wp_safe_redirect( $to );
- exit;
- }
- if ('delete' == $_POST['action']) {
- check_admin_referer( $akismet_nonce );
- if ( function_exists('current_user_can') && !current_user_can('moderate_comments') )
- die(__('You do not have sufficient permission to moderate comments.'));
-
- $delete_time = $wpdb->escape( $_POST['display_time'] );
- $comment_ids = $wpdb->get_col( "SELECT comment_id FROM $wpdb->comments WHERE comment_approved = 'spam' AND '$delete_time' > comment_date_gmt" );
- if ( !empty( $comment_ids ) ) {
- do_action( 'delete_comment', $comment_ids );
- $wpdb->query( "DELETE FROM $wpdb->comments WHERE comment_id IN ( " . implode( ', ', $comment_ids ) . " )");
- wp_cache_delete( 'akismet_spam_count', 'widget' );
- }
- $to = add_query_arg( 'deleted', 'all', $_SERVER['HTTP_REFERER'] );
- wp_safe_redirect( $to );
- exit;
- }
-
-if ( isset( $_GET['recovered'] ) ) {
- $i = (int) $_GET['recovered'];
- echo '
' . sprintf(__('%1$s comments recovered.'), $i) . "
";
-}
-
-if (isset( $_GET['deleted'] ) )
- echo '
' . __('All spam deleted.') . '
';
-
-if ( isset( $GLOBALS['submenu']['edit-comments.php'] ) )
- $link = 'edit-comments.php';
-else
- $link = 'edit.php';
-?>
-
-
-
-
-
%1$s spam for you since you first installed it.'), number_format_i18n($count) ); ?>
-'.__('You have no spam currently in the queue. Must be your lucky day. :)').'';
- echo '
';
-} else {
- echo '
'.__('You can delete all of the spam from your database with a single click. This operation cannot be undone, so you may wish to check to ensure that no legitimate comments got through first. Spam is automatically deleted after 15 days, so don’t sweat it.').'
';
-?>
-
-
-
-
-
-
-
-'.__('These are the latest comments identified as spam by Akismet. If you see any mistakes, simply mark the comment as "not spam" and Akismet will learn from the submission. If you wish to recover a comment from spam, simply select the comment, and click Not Spam. After 15 days we clean out the junk for you.').''; ?>
-
-escape($_POST['s']);
- $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE
- (comment_author LIKE '%$s%' OR
- comment_author_email LIKE '%$s%' OR
- comment_author_url LIKE ('%$s%') OR
- comment_author_IP LIKE ('%$s%') OR
- comment_content LIKE ('%$s%') ) AND
- comment_approved = 'spam'
- ORDER BY comment_date DESC");
-} else {
- if ( isset( $_GET['apage'] ) )
- $page = (int) $_GET['apage'];
- else
- $page = 1;
-
- if ( $page < 2 )
- $page = 1;
-
- $current_type = false;
- if ( isset( $_GET['ctype'] ) )
- $current_type = preg_replace( '|[^a-z]|', '', $_GET['ctype'] );
-
- $comments = akismet_spam_comments( $current_type, $page );
- $total = akismet_spam_count( $current_type );
- $totals = akismet_spam_totals();
-?>
-
->
- $type_count ) {
- if ( 'comment' == $type ) {
- $type = 'comments';
- $show = __('Comments');
- } else {
- $show = ucwords( $type );
- }
- $type_count = number_format_i18n( $type_count );
- $extra = $current_type === $type ? ' class="active"' : '';
- echo "$show ($type_count)
-
-
- 50 ) {
-$total_pages = ceil( $total / 50 );
-$r = '';
-if ( 1 < $page ) {
- $args['apage'] = ( 1 == $page - 1 ) ? '' : $page - 1;
- $r .= '
'. __('« Previous Page') .' ' . "\n";
-}
-if ( ( $total_pages = ceil( $total / 50 ) ) > 1 ) {
- for ( $page_num = 1; $page_num <= $total_pages; $page_num++ ) :
- if ( $page == $page_num ) :
- $r .= "
$page_num \n";
- else :
- $p = false;
- if ( $page_num < 3 || ( $page_num >= $page - 3 && $page_num <= $page + 3 ) || $page_num > $total_pages - 3 ) :
- $args['apage'] = ( 1 == $page_num ) ? '' : $page_num;
- $r .= '
' . ( $page_num ) . " \n";
- $in = true;
- elseif ( $in == true ) :
- $r .= "...\n";
- $in = false;
- endif;
- endif;
- endfor;
-}
-if ( ( $page ) * 50 < $total || -1 == $total ) {
- $args['apage'] = $page + 1;
- $r .= '
'. __('Next Page »') .' ' . "\n";
-}
-echo "
$r
";
-?>
-
-
-
-
-
-
-
-
-
-
-
', '
' . $button, $page );
- return $page;
- }
-
- if ( $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '0'" ) )
- ob_start( 'akismet_recheck_button' );
-}
-
-// This option causes tons of FPs, was removed in 2.1
-function akismet_kill_proxy_check( $option ) { return 0; }
-add_filter('option_open_proxy_check', 'akismet_kill_proxy_check');
diff --git a/wp-content/plugins/akismet/readme.txt b/wp-content/plugins/akismet/readme.txt
index 597749e..c9dce67 100644
--- a/wp-content/plugins/akismet/readme.txt
+++ b/wp-content/plugins/akismet/readme.txt
@@ -1,27 +1,26 @@
=== Akismet ===
-Contributors: matt, ryan, andy, mdawaffe, tellyworth, josephscott, lessbloat, eoigal, automattic
+Contributors: matt, ryan, andy, mdawaffe, tellyworth, josephscott, lessbloat, eoigal, cfinke, automattic
Tags: akismet, comments, spam
-Requires at least: 3.0
-Tested up to: 3.6
-Stable tag: 2.5.8
+Requires at least: 3.1
+Tested up to: 3.9.1
+Stable tag: 3.0.1
License: GPLv2 or later
-Akismet checks your comments against the Akismet web service to see if they look like spam or not.
+Akismet checks your comments against the Akismet Web service to see if they look like spam or not.
== Description ==
-Akismet checks your comments against the Akismet web service to see if they look like spam or not and lets you
-review the spam it catches under your blog's "Comments" admin screen.
+Akismet checks your comments against the Akismet Web service to see if they look like spam or not and lets you review the spam it catches under your blog's "Comments" admin screen.
-Major new features in Akismet 2.5 include:
+Major features in Akismet include:
-* A comment status history, so you can easily see which comments were caught or cleared by Akismet, and which were spammed or unspammed by a moderator
-* Links are highlighted in the comment body, to reveal hidden or misleading links
-* If your web host is unable to reach Akismet's servers, the plugin will automatically retry when your connection is back up
-* Moderators can see the number of approved comments for each user
-* Spam and Unspam reports now include more information, to help improve accuracy
+* Automatically checks all comments and filters out the ones that look like spam.
+* Each comment has a status history, so you can easily see which comments were caught or cleared by Akismet and which were spammed or unspammed by a moderator.
+* URLs are shown in the comment body to reveal hidden or misleading links.
+* Moderators can see the number of approved comments for each user.
+* A discard feature that outright blocks the worst spam, saving you disk space and speeding up your site.
-PS: You'll need an [Akismet.com API key](http://akismet.com/get/) to use it. Keys are free for personal blogs, with paid subscriptions available for businesses and commercial sites.
+PS: You'll need an [Akismet.com API key](http://akismet.com/get/) to use it. Keys are free for personal blogs; paid subscriptions are available for businesses and commercial sites.
== Installation ==
@@ -31,6 +30,39 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
== Changelog ==
+= 3.0.1 =
+* Removed dependency on PHP's fsockopen function
+* Fix spam/ham reports to work when reported outside of the WP dashboard, e.g., from Notifications or the WP app
+* Remove jQuery dependency for comment form JavaScript
+* Remove unnecessary data from some Akismet comment meta
+* Suspended keys will now result in all comments being put in moderation, not spam.
+
+= 3.0.0 =
+* Move Akismet to Settings menu
+* Drop Akismet Stats menu
+* Add stats snapshot to Akismet settings
+* Add Akismet subscription details and status to Akismet settings
+* Add contextual help for each page
+* Improve Akismet setup to use Jetpack to automate plugin setup
+* Fix "Check for Spam" to use AJAX to avoid page timing out
+* Fix Akismet settings page to be responsive
+* Drop legacy code
+* Tidy up CSS and Javascript
+* Replace the old discard setting with a new "discard pervasive spam" feature.
+
+= 2.6.0 =
+* Add ajax paging to the check for spam button to handle large volumes of comments
+* Optimize javascript and add localization support
+* Fix bug in link to spam comments from right now dashboard widget
+* Fix bug with deleting old comments to avoid timeouts dealing with large volumes of comments
+* Include X-Pingback-Forwarded-For header in outbound WordPress pingback verifications
+* Add pre-check for pingbacks, to stop spam before an outbound verification request is made
+
+= 2.5.9 =
+* Update 'Already have a key' link to redirect page rather than depend on javascript
+* Fix some non-translatable strings to be translatable
+* Update Activation banner in plugins page to redirect user to Akismet config page
+
= 2.5.8 =
* Simplify the activation process for new users
* Remove the reporter_ip parameter
diff --git a/wp-content/plugins/akismet/views/config.php b/wp-content/plugins/akismet/views/config.php
new file mode 100644
index 0000000..3b10856
--- /dev/null
+++ b/wp-content/plugins/akismet/views/config.php
@@ -0,0 +1,174 @@
+
+
+
+
+
+
+ spam > 0 ) : ?>
+
+
+
+
+
+
+
+
+
+ spam );?>
+
+
+
+ spam );?>
+
+
+
+ accuracy; ?>%
+ false_positives , 'akismet')
+ ),
+ number_format( $stat_totals['all']->missed_spam ),
+ number_format( $stat_totals['all']->false_positives )
+ ); ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wp-content/plugins/akismet/views/get.php b/wp-content/plugins/akismet/views/get.php
new file mode 100644
index 0000000..70727f6
--- /dev/null
+++ b/wp-content/plugins/akismet/views/get.php
@@ -0,0 +1,5 @@
+
\ No newline at end of file
diff --git a/wp-content/plugins/akismet/views/notice.php b/wp-content/plugins/akismet/views/notice.php
new file mode 100644
index 0000000..0476929
--- /dev/null
+++ b/wp-content/plugins/akismet/views/notice.php
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
+
https://akismet.com/errors/' . $code . '' );
+
+ ?>
+
+
+
+
+
+
gethostbynamel functions. Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet’s system requirements .', 'akismet'), 'https://blog.akismet.com/akismet-hosting-faq/'); ?>
+
+
+
+
+
our guide about firewalls.', 'akismet'), 'https://blog.akismet.com/akismet-hosting-faq/'); ?>
+
+
+
+
+
update your payment details.', 'akismet'), 'https://akismet.com/account/'); ?>
+
+
+
+
+
Akismet account page to reactivate your subscription.', 'akismet'), 'https://akismet.com/account/'); ?>
+
+
+
+
+
Akismet support for assistance.', 'akismet'), 'https://akismet.com/contact/'); ?>
+
+
+
+
+
contributing a token amount.', 'akismet'), 'https://akismet.com/account/upgrade/'); ?>
+
+
+
+
+
Akismet support for assistance.', 'akismet'), 'https://akismet.com/contact/'); ?>
+
+
+
+
+
sign into your account and choose one. Please contact our support team with any questions.', 'akismet'), 'https://akismet.com/account/upgrade/', 'https://akismet.com/contact/' ); ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
upgrade to an Enterprise subscription. If you have any questions, please get in touch with our support team ', 'akismet'), 'https://akismet.com/account/upgrade/', 'https://akismet.com/contact/'); ?>
+
+
+
upgrade to an Enterprise subscription, which covers an unlimited number of sites. Please contact our support team with any questions.', 'akismet'), 'https://akismet.com/account/upgrade/', 'https://akismet.com/contact/'); ?>
+
+
+
\ No newline at end of file
diff --git a/wp-content/plugins/akismet/views/start.php b/wp-content/plugins/akismet/views/start.php
new file mode 100644
index 0000000..692b8af
--- /dev/null
+++ b/wp-content/plugins/akismet/views/start.php
@@ -0,0 +1,95 @@
+
status, array( 'active', 'active-dunning', 'no-sub', 'missing', 'cancelled', 'suspended' ) ) ) :
+ if ( $akismet_user->status == 'missing' ) :?>
+
+
+
+
+
+
+status == 'cancelled' ) :?>
+
+
+
+
+
+
+status == 'suspended' ) : ?>
+
+
+
+
user_email ); ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+ __( 'Register a different email address' , 'akismet'), 'classes' => array( 'right', 'button', 'button-secondary' ) ) ); ?>
+
+
+
+
+
+
+ __( 'Get your API key' , 'akismet'), 'classes' => array( 'right', 'button', 'button-primary' ) ) ); ?>
+
+
+
\ No newline at end of file
diff --git a/wp-content/plugins/akismet/views/stats.php b/wp-content/plugins/akismet/views/stats.php
new file mode 100644
index 0000000..1ca7661
--- /dev/null
+++ b/wp-content/plugins/akismet/views/stats.php
@@ -0,0 +1,4 @@
+
\ No newline at end of file
diff --git a/wp-content/plugins/akismet/views/strict.php b/wp-content/plugins/akismet/views/strict.php
new file mode 100644
index 0000000..3cf197c
--- /dev/null
+++ b/wp-content/plugins/akismet/views/strict.php
@@ -0,0 +1,7 @@
+
+
+
+
\ No newline at end of file
diff --git a/wp-content/plugins/akismet/wrapper.php b/wp-content/plugins/akismet/wrapper.php
new file mode 100644
index 0000000..12641c7
--- /dev/null
+++ b/wp-content/plugins/akismet/wrapper.php
@@ -0,0 +1,293 @@
+>=", ">>>=",
+ "&=", "|=", "^=", "+=",
+
+ "+", "-", "*", "/", "%", "<<", ">>", ">>>", "&",
+ "|", "^", "&&", "||", "===", "==", ">=",
+ "<=", "<", ">", "!=", "!=="
+ ],
+ "requireSpaceBeforeBinaryOperators": [
+ "=", "+=", "-=", "*=", "/=", "%=", "<<=", ">>=", ">>>=",
+ "&=", "|=", "^=", "+=",
+
+ "+", "-", "*", "/", "%", "<<", ">>", ">>>", "&",
+ "|", "^", "&&", "||", "===", "==", ">=",
+ "<=", "<", ">", "!=", "!=="
+ ],
+ "disallowKeywords": ["with"],
+ "disallowMultipleLineBreaks": true,
+ "validateLineBreaks": "LF",
+ "disallowMixedSpacesAndTabs": "smart",
+ "disallowTrailingWhitespace": true,
+
+ "requireCurlyBraces": [ "if", "else", "for", "while", "do", "try", "catch" ],
+ "requireSpaceBeforeBlockStatements": true,
+ "requireParenthesesAroundIIFE": true,
+ "requireBlocksOnNewline": true,
+ "requireRightStickedOperators": [],
+ "requireOperatorBeforeLineBreak": [
+ "?",
+ "=",
+ "+",
+ "-",
+ "/",
+ "*",
+ "==",
+ "===",
+ "!=",
+ "!==",
+ ">",
+ ">=",
+ "<",
+ "<="
+ ],
+ "disallowLeftStickedOperators": [
+ "?",
+ "=",
+ "+",
+ "-",
+ "/",
+ "*",
+ "==",
+ "===",
+ "!=",
+ "!==",
+ ">",
+ ">=",
+ "<",
+ "<="
+ ],
+ "disallowRightStickedOperators": [
+ "?",
+ "=",
+ "+",
+ "/",
+ "*",
+ ":",
+ "==",
+ "===",
+ "!=",
+ "!==",
+ ">",
+ ">=",
+ "<",
+ "<="
+ ],
+ "requireLeftStickedOperators": [","],
+ "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~"],
+ "requireSpaceAfterPrefixUnaryOperators": ["!"],
+ "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
+ "requireCamelCaseOrUpperCaseIdentifiers": true,
+ "disallowMultipleLineStrings": true,
+ "validateQuoteMarks": "'",
+ "validateIndentation": "\t",
+ "requireLineFeedAtFileEnd": true,
+ "requireDotNotation": true,
+
+ "disallowTrailingComma": true,
+ "disallowPaddingNewlinesInBlocks": true,
+ "disallowEmptyBlocks": true,
+ "disallowQuotedKeysInObjects": "allButReserved",
+ "disallowDanglingUnderscores": true,
+ "requireCommaBeforeLineBreak": true,
+ "disallowKeywordsOnNewLine": ["else"],
+ "requireCapitalizedConstructors": true,
+ "safeContextKeyword": [ "that" ],
+ "validateJSDoc": {
+ "checkParamNames": true,
+ "checkRedundantParams": true,
+ "requireParamTypes": true
+ }
+}
diff --git a/wp-content/plugins/wordpress-seo/CONTRIBUTING.md b/wp-content/plugins/wordpress-seo/CONTRIBUTING.md
index 0d241f9..fedcaa4 100644
--- a/wp-content/plugins/wordpress-seo/CONTRIBUTING.md
+++ b/wp-content/plugins/wordpress-seo/CONTRIBUTING.md
@@ -11,7 +11,7 @@ For localization, please refer to [translate.yoast.com](http://translate.yoast.c
## Getting Started
* Submit a ticket for your issue, assuming one does not already exist.
- * Raise it on our [Issue Tracker](https://github.com/jdevalk/wordpress-seo/issues)
+ * Raise it on our [Issue Tracker](https://github.com/Yoast/wordpress-seo/issues)
* Clearly describe the issue including steps to reproduce the bug.
* Make sure you fill in the earliest version that you know has the issue as well as the version of WordPress you're using.
@@ -33,6 +33,6 @@ For localization, please refer to [translate.yoast.com](http://translate.yoast.c
At this point you're waiting on us to merge your pull request. We'll review all pull requests, and make suggestions and changes if necessary.
# Additional Resources
-* [WordPress SEO API](http://yoast.com/wordpress/seo/api/)
+* [WordPress SEO API](https://yoast.com/wordpress/plugins/seo/api/)
* [General GitHub Documentation](http://help.github.com/)
* [GitHub Pull Request documentation](http://help.github.com/send-pull-requests/)
diff --git a/wp-content/plugins/wordpress-seo/README.md b/wp-content/plugins/wordpress-seo/README.md
index 83c1e13..130e76c 100644
--- a/wp-content/plugins/wordpress-seo/README.md
+++ b/wp-content/plugins/wordpress-seo/README.md
@@ -1,45 +1,45 @@
WordPress SEO by Yoast
======================
-[](https://travis-ci.org/jdevalk/wordpress-seo)
+[](https://travis-ci.org/Yoast/wordpress-seo)
Welcome to the WordPress SEO Github repository
----------------------------------------------
-While the documenation for the [WordPress SEO plugin](http://yoast.com/wordpress/seo/) can be found on yoast.com, here
+While the documenation for the [WordPress SEO plugin](https://yoast.com/wordpress/seo/) can be found on yoast.com, here
you can browse the source of the project, find and discuss open issues and even
-[contribute yourself](https://github.com/jdevalk/wordpress-seo/blob/master/CONTRIBUTING.md).
+[contribute yourself](https://github.com/yoast/wordpress-seo/blob/master/CONTRIBUTING.md).
Installation
------------
-Here's a [guide on how to install WordPress SEO in your WordPress site](http://yoast.com/wordpress/seo/installation/).
+Here's a [guide on how to install WordPress SEO in your WordPress site](https://yoast.com/wordpress/seo/installation/).
If you want to run the Git version though, you have two options:
-* You can clone the GitHub repository: https://github.com/jdevalk/wordpress-seo.git
-* Download it directly as a ZIP file: https://github.com/jdevalk/wordpress-seo/archive/master.zip
+* You can clone the GitHub repository: https://github.com/yoast/wordpress-seo.git
+* Downloading it directly unfortunately won't work as the .zip file doesn't contain the submodules.
This will download the latest development version of WordPress SEO by Yoast. While this version is usually stable,
it is not recommended for use in a production environment.
Bugs
----
-If you find an issue, [let us know here](https://github.com/jdevalk/wordpress-seo/issues/new)!
+If you find an issue, [let us know here](https://github.com/yoast/wordpress-seo/issues/new)!
Support
-------
This is a developer's portal for WordPress SEO by Yoast and should not be used for support. Please visit the
-[support forums](http://wordpress.org/support/plugin/wordpress-seo).
+[support forums](https://wordpress.org/support/plugin/wordpress-seo).
Contributions
-------------
Anyone is welcome to contribute to WordPress SEO. Please
-[read the guidelines](https://github.com/jdevalk/wordpress-seo/blob/master/CONTRIBUTING.md) for contributing to this
+[read the guidelines](https://github.com/yoast/wordpress-seo/blob/master/CONTRIBUTING.md) for contributing to this
repository.
There are various ways you can contribute:
-* [Raise an issue](https://github.com/jdevalk/wordpress-seo/issues) on GitHub.
+* [Raise an issue](https://github.com/yoast/wordpress-seo/issues) on GitHub.
* Send us a Pull Request with your bug fixes and/or new features.
* [Translate WordPress SEO by Yoast into different languages](http://translate.yoast.com/projects/wordpress-seo/).
-* Provide feedback and [suggestions on enhancements](https://github.com/jdevalk/wordpress-seo/issues?direction=desc&labels=Enhancement&page=1&sort=created&state=open).
+* Provide feedback and [suggestions on enhancements](https://github.com/yoast/wordpress-seo/issues?direction=desc&labels=Enhancement&page=1&sort=created&state=open).
diff --git a/wp-content/plugins/wordpress-seo/admin/TextStatistics.php b/wp-content/plugins/wordpress-seo/admin/TextStatistics.php
index 554f51a..559c3e5 100644
--- a/wp-content/plugins/wordpress-seo/admin/TextStatistics.php
+++ b/wp-content/plugins/wordpress-seo/admin/TextStatistics.php
@@ -1,277 +1,416 @@
- '' ) {
- // Encoding is given. Use it!
- $this->strEncoding = $strEncoding;
- }
- }
-
- /**
- * Gives the Flesch-Kincaid Reading Ease of text entered rounded to one digit
- *
- * @param string $strText Text to be checked
- * @return float
- */
- function flesch_kincaid_reading_ease( $strText ) {
- $strText = $this->clean_text( $strText );
- return round( ( 206.835 - ( 1.015 * $this->average_words_per_sentence( $strText ) ) - ( 84.6 * $this->average_syllables_per_word( $strText ) ) ), 1 );
- }
-
- /**
- * Gives string length.
- *
- * @param string $strText Text to be measured
- * @return int
- */
- public function text_length( $strText ) {
- return strlen( utf8_decode( $strText ) );
- }
-
- /**
- * Gives letter count (ignores all non-letters).
- *
- * @param string $strText Text to be measured
- * @return int
- */
- public function letter_count( $strText ) {
- $strText = $this->clean_text( $strText ); // To clear out newlines etc
- $strText = preg_replace( '/[^A-Za-z]+/', '', $strText );
- $intTextLength = strlen( $strText );
- return $intTextLength;
- }
-
- /**
- * Trims, removes line breaks, multiple spaces and generally cleans text before processing.
- *
- * @param string $strText Text to be transformed
- * @return string
- */
- protected function clean_text( $strText ) {
- // all these tags should be preceeded by a full stop.
- $fullStopTags = array( 'li', 'p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'dd' );
- foreach ( $fullStopTags as $tag ) {
- $strText = str_ireplace( '', '.', $strText );
- }
- $strText = strip_tags( $strText );
- $strText = preg_replace( '/[,:;()-]/', ' ', $strText ); // Replace commans, hyphens etc (count them as spaces)
- $strText = preg_replace( '/[\.!?]/', '.', $strText ); // Unify terminators
- $strText = trim( $strText ) . '.'; // Add final terminator, just in case it's missing.
- $strText = preg_replace( '/[ ]*(\n|\r\n|\r)[ ]*/', ' ', $strText ); // Replace new lines with spaces
- $strText = preg_replace( '/([\.])[\. ]+/', '$1', $strText ); // Check for duplicated terminators
- $strText = trim( preg_replace( '/[ ]*([\.])/', '$1 ', $strText ) ); // Pad sentence terminators
- $strText = preg_replace( '/[ ]+/', ' ', $strText ); // Remove multiple spaces
- $strText = preg_replace_callback( '/\. [^ ]+/', create_function( '$matches', 'return strtolower($matches[0]);' ), $strText ); // Lower case all words following terminators (for gunning fog score)
- return $strText;
- }
-
- /**
- * Converts string to lower case. Tries mb_strtolower and if that fails uses regular strtolower.
- *
- * @param string $strText Text to be transformed
- * @return string
- */
- protected function lower_case( $strText ) {
- return strtolower( $strText );
- }
-
- /**
- * Converts string to upper case. Tries mb_strtoupper and if that fails uses regular strtoupper.
- *
- * @param string $strText Text to be transformed
- * @return string
- */
- protected function upper_case( $strText ) {
- return strtoupper( $strText );
- }
-
- /**
- * Returns sentence count for text.
- *
- * @param string $strText Text to be measured
- * @return int
- */
- public function sentence_count( $strText ) {
- $strText = $this->clean_text( $strText );
- // Will be tripped up by "Mr." or "U.K.". Not a major concern at this point.
- $intSentences = max( 1, $this->text_length( preg_replace( '/[^\.!?]/', '', $strText ) ) );
- return $intSentences;
- }
-
- /**
- * Returns word count for text.
- *
- * @param string $strText Text to be measured
- * @return int
- */
- public function word_count( $strText ) {
- $strText = $this->clean_text( $strText );
- // Will be tripped by by em dashes with spaces either side, among other similar characters
- $intWords = 1 + $this->text_length( preg_replace( '/[^ ]/', '', $strText ) ); // Space count + 1 is word count
- return $intWords;
- }
-
- /**
- * Returns average words per sentence for text.
- *
- * @param string $strText Text to be measured
- * @return int
- */
- public function average_words_per_sentence( $strText ) {
- $strText = $this->clean_text( $strText );
- $intSentenceCount = $this->sentence_count( $strText );
- $intWordCount = $this->word_count( $strText );
- return ( $intWordCount / $intSentenceCount );
- }
-
- /**
- * Returns average syllables per word for text.
- *
- * @param string $strText Text to be measured
- * @return int
- */
- public function average_syllables_per_word( $strText ) {
- $strText = $this->clean_text( $strText );
- $intSyllableCount = 0;
- $intWordCount = $this->word_count( $strText );
- $arrWords = explode( ' ', $strText );
- for ( $i = 0; $i < $intWordCount; $i++ ) {
- $intSyllableCount += $this->syllable_count( $arrWords[$i] );
- }
- return ( $intSyllableCount / $intWordCount );
- }
-
- /**
- * Returns the number of syllables in the word.
- * Based in part on Greg Fast's Perl module Lingua::EN::Syllables
- *
- * @param string $strWord Word to be measured
- * @return int
- */
- public function syllable_count( $strWord ) {
-
- $intSyllableCount = 0;
- $strWord = $this->lower_case( $strWord );
-
- // Specific common exceptions that don't follow the rule set below are handled individually
- // Array of problem words (with word as key, syllable count as value)
- $arrProblemWords = Array(
- 'simile' => 3
- , 'forever' => 3
- , 'shoreline' => 2
- );
- if ( isset( $arrProblemWords[$strWord] ) ) {
- $intSyllableCount = $arrProblemWords[$strWord];
- }
- if ( $intSyllableCount > 0 ) {
- return $intSyllableCount;
- }
-
- // These syllables would be counted as two but should be one
- $arrSubSyllables = Array(
- 'cial'
- , 'tia'
- , 'cius'
- , 'cious'
- , 'giu'
- , 'ion'
- , 'iou'
- , 'sia$'
- , '[^aeiuoyt]{2,}ed$'
- , '.ely$'
- , '[cg]h?e[rsd]?$'
- , 'rved?$'
- , '[aeiouy][dt]es?$'
- , '[aeiouy][^aeiouydt]e[rsd]?$'
- , '^[dr]e[aeiou][^aeiou]+$' // Sorts out deal, deign etc
- , '[aeiouy]rse$' // Purse, hearse
- );
-
- // These syllables would be counted as one but should be two
- $arrAddSyllables = Array(
- 'ia'
- , 'riet'
- , 'dien'
- , 'iu'
- , 'io'
- , 'ii'
- , '[aeiouym]bl$'
- , '[aeiou]{3}'
- , '^mc'
- , 'ism$'
- , '([^aeiouy])\1l$'
- , '[^l]lien'
- , '^coa[dglx].'
- , '[^gq]ua[^auieo]'
- , 'dnt$'
- , 'uity$'
- , 'ie(r|st)$'
- );
-
- // Single syllable prefixes and suffixes
- $arrPrefixSuffix = Array(
- '/^un/'
- , '/^fore/'
- , '/ly$/'
- , '/less$/'
- , '/ful$/'
- , '/ers?$/'
- , '/ings?$/'
- );
-
- // Remove prefixes and suffixes and count how many were taken
- $strWord = preg_replace( $arrPrefixSuffix, '', $strWord, -1, $intPrefixSuffixCount );
-
- // Removed non-word characters from word
- $strWord = preg_replace( '/[^a-z]/is', '', $strWord );
- $arrWordParts = preg_split( '/[^aeiouy]+/', $strWord );
- $intWordPartCount = 0;
- foreach ( $arrWordParts as $strWordPart ) {
- if ( $strWordPart <> '' ) {
- $intWordPartCount++;
- }
- }
-
- // Some syllables do not follow normal rules - check for them
- // Thanks to Joe Kovar for correcting a bug in the following lines
- $intSyllableCount = $intWordPartCount + $intPrefixSuffixCount;
- foreach ( $arrSubSyllables as $strSyllable ) {
- $intSyllableCount -= preg_match( '~' . $strSyllable . '~', $strWord );
- }
- foreach ( $arrAddSyllables as $strSyllable ) {
- $intSyllableCount += preg_match( '~' . $strSyllable . '~', $strWord );
- }
- $intSyllableCount = ( $intSyllableCount == 0 ) ? 1 : $intSyllableCount;
- return $intSyllableCount;
- }
-
-}
\ No newline at end of file
+ whomever] Research if a class/library can be found which will offer
+ * this functionality to a broader scope of languages/charsets.
+ * Now basically limited to English.
+ */
+ class Yoast_TextStatistics {
+
+ /**
+ * @var string $strEncoding Used to hold character encoding to be used by object, if set
+ */
+ protected $strEncoding = '';
+
+ /**
+ * @var string $blnMbstring Efficiency: Is the MB String extension loaded ?
+ */
+ protected $blnMbstring = true;
+
+ /**
+ * @var bool $normalize Should the result be normalized ?
+ */
+ public $normalize = true;
+
+
+ /**
+ * Constructor.
+ *
+ * @param string $strEncoding Optional character encoding.
+ */
+ public function __construct( $strEncoding = '' ) {
+ if ( $strEncoding <> '' ) {
+ // Encoding is given. Use it!
+ $this->strEncoding = $strEncoding;
+ }
+ $this->blnMbstring = extension_loaded( 'mbstring' );
+ }
+
+ /**
+ * Gives the Flesch-Kincaid Reading Ease of text entered rounded to one digit
+ *
+ * @param string $strText Text to be checked
+ * @return int|float
+ */
+ public function flesch_kincaid_reading_ease( $strText ) {
+ $strText = $this->clean_text( $strText );
+ $score = wpseo_calc( wpseo_calc( 206.835, '-', wpseo_calc( 1.015, '*', $this->average_words_per_sentence( $strText ) ) ), '-', wpseo_calc( 84.6, '*', $this->average_syllables_per_word( $strText ) ) );
+
+ return $this->normalize_score( $score, 0, 100 );
+ }
+
+ /**
+ * Gives string length.
+ *
+ * @param string $strText Text to be measured
+ *
+ * @return int
+ */
+ public function text_length( $strText ) {
+ if ( ! $this->blnMbstring ) {
+ return strlen( $strText );
+ }
+
+ try {
+ if ( $this->strEncoding == '' ) {
+ $intTextLength = mb_strlen( $strText );
+ } else {
+ $intTextLength = mb_strlen( $strText, $this->strEncoding );
+ }
+ } catch ( Exception $e ) {
+ $intTextLength = strlen( $strText );
+ }
+
+ return $intTextLength;
+ }
+
+ /**
+ * Gives letter count (ignores all non-letters). Tries mb_strlen and if that fails uses regular strlen.
+ *
+ * @param string $strText Text to be measured
+ *
+ * @return int
+ */
+ public function letter_count( $strText ) {
+ $strText = $this->clean_text( $strText ); // To clear out newlines etc
+ $strText = preg_replace( '`[^A-Za-z]+`', '', $strText );
+
+ if ( ! $this->blnMbstring ) {
+ return strlen( $strText );
+ }
+
+ try {
+ if ( $this->strEncoding == '' ) {
+ $intTextLength = mb_strlen( $strText );
+ } else {
+ $intTextLength = mb_strlen( $strText, $this->strEncoding );
+ }
+ } catch ( Exception $e ) {
+ $intTextLength = strlen( $strText );
+ }
+
+ return $intTextLength;
+ }
+
+ /**
+ * Trims, removes line breaks, multiple spaces and generally cleans text before processing.
+ *
+ * @param string $strText Text to be transformed
+ * @return string
+ */
+ protected function clean_text( $strText ) {
+ static $clean = array();
+
+ $key = sha1( $strText );
+
+ if ( isset( $clean[ $key ] ) ) {
+ return $clean[ $key ];
+ }
+
+ // all these tags should be preceeded by a full stop.
+ $fullStopTags = array( 'li', 'p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'dd' );
+ foreach ( $fullStopTags as $tag ) {
+ $strText = str_ireplace( '', '.', $strText );
+ }
+ $strText = strip_tags( $strText );
+ $strText = preg_replace( '`[",:;\(\)-]`', ' ', $strText ); // Replace commas, hyphens etc (count them as spaces)
+ $strText = preg_replace( '`[\.!?]`', '.', $strText ); // Unify terminators
+ $strText = trim( $strText ) . '.'; // Add final terminator, just in case it's missing.
+ $strText = preg_replace( '`[ ]*(\n|\r\n|\r)[ ]*`', ' ', $strText ); // Replace new lines with spaces
+ $strText = preg_replace( '`([\.])[\. ]+`', '$1', $strText ); // Check for duplicated terminators
+ $strText = trim( preg_replace( '`[ ]*([\.])`', '$1 ', $strText ) ); // Pad sentence terminators
+ $strText = preg_replace( '` [0-9]+ `', ' ', ' ' . $strText . ' ' ); // Remove "words" comprised only of numbers
+ $strText = preg_replace( '`[ ]+`', ' ', $strText ); // Remove multiple spaces
+ $strText = preg_replace_callback( '`\. [^ ]+?`', create_function( '$matches', 'return strtolower( $matches[0] );' ), $strText ); // Lower case all words following terminators (for gunning fog score)
+
+ $strText = trim( $strText );
+
+ // Cache it and return
+ $clean[ $key ] = $strText;
+ return $strText;
+ }
+
+ /**
+ * Converts string to lower case. Tries mb_strtolower and if that fails uses regular strtolower.
+ *
+ * @param string $strText Text to be transformed
+ * @return string
+ */
+ protected function lower_case( $strText ) {
+
+ if ( ! $this->blnMbstring ) {
+ return strtolower( $strText );
+ }
+
+ try {
+ if ( $this->strEncoding == '' ) {
+ $strLowerCaseText = mb_strtolower( $strText );
+ } else {
+ $strLowerCaseText = mb_strtolower( $strText, $this->strEncoding );
+ }
+ } catch ( Exception $e ) {
+ $strLowerCaseText = strtolower( $strText );
+ }
+
+ return $strLowerCaseText;
+ }
+
+ /**
+ * Converts string to upper case. Tries mb_strtoupper and if that fails uses regular strtoupper.
+ *
+ * @param string $strText Text to be transformed
+ * @return string
+ */
+ protected function upper_case( $strText ) {
+ if ( ! $this->blnMbstring ) {
+ return strtoupper( $strText );
+ }
+
+ try {
+ if ( $this->strEncoding == '' ) {
+ $strUpperCaseText = mb_strtoupper( $strText );
+ } else {
+ $strUpperCaseText = mb_strtoupper( $strText, $this->strEncoding );
+ }
+ } catch ( Exception $e ) {
+ $strUpperCaseText = strtoupper( $strText );
+ }
+
+ return $strUpperCaseText;
+ }
+
+ /**
+ * Returns sentence count for text.
+ *
+ * @param string $strText Text to be measured
+ * @return int
+ */
+ public function sentence_count( $strText ) {
+ if ( strlen( trim( $strText ) ) == 0 ) {
+ return 0;
+ }
+
+ $strText = $this->clean_text( $strText );
+ // Will be tripped up by "Mr." or "U.K.". Not a major concern at this point.
+ // [JRF] Will also be tripped up by ... or ?!
+ // @todo [JRF => whomever] May be replace with something along the lines of this - will at least provide better count in ... and ?! situations:
+ // $intSentences = max( 1, preg_match_all( '`[^\.!?]+[\.!?]+([\s]+|$)`u', $strText, $matches ) ); [/JRF]
+ $intSentences = max( 1, $this->text_length( preg_replace( '`[^\.!?]`', '', $strText ) ) );
+ return $intSentences;
+ }
+
+ /**
+ * Returns word count for text.
+ *
+ * @param string $strText Text to be measured
+ * @return int
+ */
+ public function word_count( $strText ) {
+ if ( strlen( trim( $strText ) ) == 0 ) {
+ return 0;
+ }
+
+ $strText = $this->clean_text( $strText );
+ // Will be tripped by em dashes with spaces either side, among other similar characters
+ $intWords = 1 + $this->text_length( preg_replace( '`[^ ]`', '', $strText ) ); // Space count + 1 is word count
+ return $intWords;
+ }
+
+ /**
+ * Returns average words per sentence for text.
+ *
+ * @param string $strText Text to be measured
+ * @return int|float
+ */
+ public function average_words_per_sentence( $strText ) {
+ $strText = $this->clean_text( $strText );
+ $intSentenceCount = $this->sentence_count( $strText );
+ $intWordCount = $this->word_count( $strText );
+ return ( wpseo_calc( $intWordCount, '/', $intSentenceCount ) );
+ }
+
+ /**
+ * Returns average syllables per word for text.
+ *
+ * @param string $strText Text to be measured
+ * @return int|float
+ */
+ public function average_syllables_per_word( $strText ) {
+ $strText = $this->clean_text( $strText );
+ $intSyllableCount = 0;
+ $intWordCount = $this->word_count( $strText );
+ $arrWords = explode( ' ', $strText );
+ for ( $i = 0; $i < $intWordCount; $i++ ) {
+ $intSyllableCount += $this->syllable_count( $arrWords[ $i ] );
+ }
+ return ( wpseo_calc( $intSyllableCount, '/', $intWordCount ) );
+ }
+
+ /**
+ * Returns the number of syllables in the word.
+ * Based in part on Greg Fast's Perl module Lingua::EN::Syllables
+ *
+ * @param string $strWord Word to be measured
+ * @return int
+ */
+ public function syllable_count( $strWord ) {
+ if ( strlen( trim( $strWord ) ) == 0 ) {
+ return 0;
+ }
+
+ // Should be no non-alpha characters
+ $strWord = preg_replace( '`[^A-Za-z]`', '', $strWord );
+
+ $intSyllableCount = 0;
+ $strWord = $this->lower_case( $strWord );
+
+ // Specific common exceptions that don't follow the rule set below are handled individually
+ // Array of problem words (with word as key, syllable count as value)
+ $arrProblemWords = array(
+ 'simile' => 3,
+ 'forever' => 3,
+ 'shoreline' => 2,
+ );
+ if ( isset( $arrProblemWords[ $strWord ] ) ) {
+ $intSyllableCount = $arrProblemWords[ $strWord ];
+ }
+ if ( $intSyllableCount > 0 ) {
+ return $intSyllableCount;
+ }
+
+ // These syllables would be counted as two but should be one
+ $arrSubSyllables = array(
+ 'cial',
+ 'tia',
+ 'cius',
+ 'cious',
+ 'giu',
+ 'ion',
+ 'iou',
+ 'sia$',
+ '[^aeiuoyt]{2,}ed$',
+ '.ely$',
+ '[cg]h?e[rsd]?$',
+ 'rved?$',
+ '[aeiouy][dt]es?$',
+ '[aeiouy][^aeiouydt]e[rsd]?$',
+ // Sorts out deal, deign etc
+ '^[dr]e[aeiou][^aeiou]+$',
+ // Purse, hearse
+ '[aeiouy]rse$',
+ );
+
+ // These syllables would be counted as one but should be two
+ $arrAddSyllables = array(
+ 'ia',
+ 'riet',
+ 'dien',
+ 'iu',
+ 'io',
+ 'ii',
+ '[aeiouym]bl$',
+ '[aeiou]{3}',
+ '^mc',
+ 'ism$',
+ '([^aeiouy])\1l$',
+ '[^l]lien',
+ '^coa[dglx].',
+ '[^gq]ua[^auieo]',
+ 'dnt$',
+ 'uity$',
+ 'ie(r|st)$',
+ );
+
+ // Single syllable prefixes and suffixes
+ $arrPrefixSuffix = array(
+ '`^un`',
+ '`^fore`',
+ '`ly$`',
+ '`less$`',
+ '`ful$`',
+ '`ers?$`',
+ '`ings?$`',
+ );
+
+ // Remove prefixes and suffixes and count how many were taken
+ $strWord = preg_replace( $arrPrefixSuffix, '', $strWord, -1, $intPrefixSuffixCount );
+
+ // Removed non-word characters from word
+ $strWord = preg_replace( '`[^a-z]`is', '', $strWord );
+ $arrWordParts = preg_split( '`[^aeiouy]+`', $strWord );
+ $intWordPartCount = 0;
+ foreach ( $arrWordParts as $strWordPart ) {
+ if ( $strWordPart <> '' ) {
+ $intWordPartCount++;
+ }
+ }
+
+ // Some syllables do not follow normal rules - check for them
+ // Thanks to Joe Kovar for correcting a bug in the following lines
+ $intSyllableCount = $intWordPartCount + $intPrefixSuffixCount;
+ foreach ( $arrSubSyllables as $strSyllable ) {
+ $intSyllableCount -= preg_match( '`' . $strSyllable . '`', $strWord );
+ }
+ foreach ( $arrAddSyllables as $strSyllable ) {
+ $intSyllableCount += preg_match( '`' . $strSyllable . '`', $strWord );
+ }
+ $intSyllableCount = ( $intSyllableCount == 0 ) ? 1 : $intSyllableCount;
+ return $intSyllableCount;
+ }
+
+ /**
+ * Normalizes score according to min & max allowed. If score larger
+ * than max, max is returned. If score less than min, min is returned.
+ * Also rounds result to specified precision.
+ * Thanks to github.com/lvil.
+ *
+ * @param int|float $score Initial score
+ * @param int $min Minimum score allowed
+ * @param int $max Maximum score allowed
+ * @return int|float
+ */
+ public function normalize_score( $score, $min, $max, $dps = 1 ) {
+ $score = wpseo_calc( $score, '+', 0, true, $dps ); // Round
+ if ( ! $this->normalize ) {
+ return $score;
+ }
+
+ if ( $score > $max ) {
+ $score = $max;
+ } elseif ( $score < $min ) {
+ $score = $min;
+ }
+
+ return $score;
+ }
+
+ } /* End of class */
+} /* End of class-exists wrapper */
diff --git a/wp-content/plugins/wordpress-seo/admin/ajax.php b/wp-content/plugins/wordpress-seo/admin/ajax.php
index 0c0526f..61568ab 100644
--- a/wp-content/plugins/wordpress-seo/admin/ajax.php
+++ b/wp-content/plugins/wordpress-seo/admin/ajax.php
@@ -3,22 +3,26 @@
* @package Admin
*/
-if ( !defined('WPSEO_VERSION') ) {
- header('HTTP/1.0 403 Forbidden');
- die;
+if ( ! defined( 'WPSEO_VERSION' ) ) {
+ header( 'Status: 403 Forbidden' );
+ header( 'HTTP/1.1 403 Forbidden' );
+ exit();
}
/**
* Function used from AJAX calls, takes it variables from $_POST, dies on exit.
*/
function wpseo_set_option() {
- if ( !current_user_can( 'manage_options' ) )
+ if ( ! current_user_can( 'manage_options' ) ) {
die( '-1' );
+ }
+
check_ajax_referer( 'wpseo-setoption' );
- $option = esc_attr( $_POST['option'] );
- if ( $option != 'page_comments' )
+ $option = sanitize_text_field( $_POST['option'] );
+ if ( $option !== 'page_comments' ) {
die( '-1' );
+ }
update_option( $option, 0 );
die( '1' );
@@ -30,12 +34,15 @@ add_action( 'wp_ajax_wpseo_set_option', 'wpseo_set_option' );
* Function used to remove the admin notices for several purposes, dies on exit.
*/
function wpseo_set_ignore() {
- if ( !current_user_can( 'manage_options' ) )
+ if ( ! current_user_can( 'manage_options' ) ) {
die( '-1' );
+ }
+
check_ajax_referer( 'wpseo-ignore' );
- $options = get_option( 'wpseo' );
- $options['ignore_' . $_POST['option']] = 'ignore';
+ $options = get_option( 'wpseo' );
+ $ignore_key = sanitize_text_field( $_POST['option'] );
+ $options[ 'ignore_' . $ignore_key ] = true;
update_option( 'wpseo', $options );
die( '1' );
}
@@ -43,24 +50,32 @@ function wpseo_set_ignore() {
add_action( 'wp_ajax_wpseo_set_ignore', 'wpseo_set_ignore' );
/**
- * Function used to remove the admin notices for several purposes, dies on exit.
+ * Function used to delete blocking files, dies on exit.
*/
function wpseo_kill_blocking_files() {
- if ( !current_user_can( 'manage_options' ) )
+ if ( ! current_user_can( 'manage_options' ) ) {
die( '-1' );
+ }
+
check_ajax_referer( 'wpseo-blocking-files' );
$message = 'There were no files to delete.';
$options = get_option( 'wpseo' );
- if ( isset( $options['blocking_files'] ) && is_array( $options['blocking_files'] ) && count( $options['blocking_files'] ) > 0 ) {
- $message = 'success';
+ if ( is_array( $options['blocking_files'] ) && $options['blocking_files'] !== array() ) {
+ $message = 'success';
+ $files_removed = 0;
foreach ( $options['blocking_files'] as $k => $file ) {
- if ( !@unlink( $file ) )
+ if ( ! @unlink( $file ) ) {
$message = __( 'Some files could not be removed. Please remove them via FTP.', 'wordpress-seo' );
- else
- unset( $options['blocking_files'][$k] );
+ }
+ else {
+ unset( $options['blocking_files'][ $k ] );
+ $files_removed++;
+ }
+ }
+ if ( $files_removed > 0 ) {
+ update_option( 'wpseo', $options );
}
- update_option( 'wpseo', $options );
}
die( $message );
@@ -76,17 +91,194 @@ function wpseo_get_suggest() {
check_ajax_referer( 'wpseo-get-suggest' );
$term = urlencode( $_GET['term'] );
- $result = wp_remote_get( 'http://www.google.com/complete/search?output=toolbar&q=' . $term );
-
- preg_match_all( '/suggestion data="([^"]+)"\/>/u', $result['body'], $matches );
+ $result = wp_remote_get( 'https://www.google.com/complete/search?output=toolbar&q=' . $term );
$return_arr = array();
- foreach ( $matches[1] as $match ) {
- $return_arr[] = html_entity_decode( $match, ENT_COMPAT, "UTF-8" );
+ if ( ! is_wp_error( $result ) ) {
+ preg_match_all( '`suggestion data="([^"]+)"/>`u', $result['body'], $matches );
+
+ if ( isset( $matches[1] ) && ( is_array( $matches[1] ) && $matches[1] !== array() ) ) {
+ foreach ( $matches[1] as $match ) {
+ $return_arr[] = html_entity_decode( $match, ENT_COMPAT, 'UTF-8' );
+ }
+ }
}
echo json_encode( $return_arr );
die();
}
-add_action( 'wp_ajax_wpseo_get_suggest', 'wpseo_get_suggest' );
\ No newline at end of file
+add_action( 'wp_ajax_wpseo_get_suggest', 'wpseo_get_suggest' );
+
+/**
+ * Used in the editor to replace vars for the snippet preview
+ */
+function wpseo_ajax_replace_vars() {
+ check_ajax_referer( 'wpseo-replace-vars' );
+
+ $post = get_post( $_POST['post_id'] );
+ $omit = array( 'excerpt', 'excerpt_only', 'title' );
+ echo wpseo_replace_vars( $_POST['string'], $post, $omit );
+ die;
+}
+
+add_action( 'wp_ajax_wpseo_replace_vars', 'wpseo_ajax_replace_vars' );
+
+/**
+ * Save an individual SEO title from the Bulk Editor.
+ */
+function wpseo_save_title() {
+ check_ajax_referer( 'wpseo-bulk-editor' );
+
+ $new_title = $_POST['new_title'];
+ $id = intval( $_POST['wpseo_post_id'] );
+ $original_title = $_POST['existing_title'];
+
+ $results = wpseo_upsert_new_title( $id, $new_title, $original_title );
+
+ echo json_encode( $results );
+ die();
+}
+
+add_action( 'wp_ajax_wpseo_save_title', 'wpseo_save_title' );
+
+/**
+ * Helper function for updating an existing seo title or create a new one
+ * if it doesn't already exist.
+ */
+function wpseo_upsert_new_title( $post_id, $new_title, $original_title ) {
+
+ $meta_key = WPSEO_Meta::$meta_prefix . 'title';
+ $return_key = 'title';
+ return wpseo_upsert_meta( $post_id, $new_title, $original_title, $meta_key, $return_key );
+}
+
+/**
+ * Helper function to update a post's meta data, returning relevant information
+ * about the information updated and the results or the meta update.
+ */
+function wpseo_upsert_meta( $post_id, $new_meta_value, $orig_meta_value, $meta_key, $return_key ) {
+
+ $upsert_results = array(
+ 'status' => 'success',
+ 'post_id' => $post_id,
+ "new_{$return_key}" => $new_meta_value,
+ "original_{$return_key}" => $orig_meta_value,
+ );
+
+ $the_post = get_post( $post_id );
+ if ( empty( $the_post ) ) {
+
+ $upsert_results['status'] = 'failure';
+ $upsert_results['results'] = __( 'Post doesn\'t exist.', 'wordpress-seo' );
+
+ return $upsert_results;
+ }
+
+ $post_type_object = get_post_type_object( $the_post->post_type );
+ if ( ! $post_type_object ) {
+
+ $upsert_results['status'] = 'failure';
+ $upsert_results['results'] = sprintf( __( 'Post has an invalid Post Type: %s.', 'wordpress-seo' ), $the_post->post_type );
+
+ return $upsert_results;
+ }
+
+ if ( ! current_user_can( $post_type_object->cap->edit_posts ) ) {
+
+ $upsert_results['status'] = 'failure';
+ $upsert_results['results'] = sprintf( __( 'You can\'t edit %s.', 'wordpress-seo' ), $post_type_object->label );
+
+ return $upsert_results;
+ }
+
+ if ( ! current_user_can( $post_type_object->cap->edit_others_posts ) && $the_post->post_author != get_current_user_id() ) {
+
+ $upsert_results['status'] = 'failure';
+ $upsert_results['results'] = sprintf( __( 'You can\'t edit %s that aren\'t yours.', 'wordpress-seo' ), $post_type_object->label );
+
+ return $upsert_results;
+
+ }
+
+ $res = update_post_meta( $post_id, $meta_key, $new_meta_value );
+
+ $upsert_results['status'] = ( $res !== false ) ? 'success' : 'failure';
+ $upsert_results['results'] = $res;
+
+ return $upsert_results;
+}
+
+/**
+ * Save all titles sent from the Bulk Editor.
+ */
+function wpseo_save_all_titles() {
+ check_ajax_referer( 'wpseo-bulk-editor' );
+
+ $new_titles = $_POST['titles'];
+ $original_titles = $_POST['existing_titles'];
+
+ $results = array();
+
+ if ( is_array( $new_titles ) && $new_titles !== array() ) {
+ foreach ( $new_titles as $id => $new_title ) {
+ $original_title = $original_titles[ $id ];
+ $results[] = wpseo_upsert_new_title( $id, $new_title, $original_title );
+ }
+ }
+ echo json_encode( $results );
+ die();
+}
+
+add_action( 'wp_ajax_wpseo_save_all_titles', 'wpseo_save_all_titles' );
+
+/**
+ * Save an individual meta description from the Bulk Editor.
+ */
+function wpseo_save_description() {
+ check_ajax_referer( 'wpseo-bulk-editor' );
+
+ $new_metadesc = $_POST['new_metadesc'];
+ $id = intval( $_POST['wpseo_post_id'] );
+ $original_metadesc = $_POST['existing_metadesc'];
+
+ $results = wpseo_upsert_new_description( $id, $new_metadesc, $original_metadesc );
+
+ echo json_encode( $results );
+ die();
+}
+
+add_action( 'wp_ajax_wpseo_save_desc', 'wpseo_save_description' );
+
+/**
+ * Helper function to create or update a post's meta description.
+ */
+function wpseo_upsert_new_description( $post_id, $new_metadesc, $original_metadesc ) {
+
+ $meta_key = WPSEO_Meta::$meta_prefix . 'metadesc';
+ $return_key = 'metadesc';
+ return wpseo_upsert_meta( $post_id, $new_metadesc, $original_metadesc, $meta_key, $return_key );
+}
+
+/**
+ * Save all description sent from the Bulk Editor.
+ */
+function wpseo_save_all_descriptions() {
+ check_ajax_referer( 'wpseo-bulk-editor' );
+
+ $new_metadescs = $_POST['metadescs'];
+ $original_metadescs = $_POST['existing_metadescs'];
+
+ $results = array();
+
+ if ( is_array( $new_metadescs ) && $new_metadescs !== array() ) {
+ foreach ( $new_metadescs as $id => $new_metadesc ) {
+ $original_metadesc = $original_metadescs[ $id ];
+ $results[] = wpseo_upsert_new_description( $id, $new_metadesc, $original_metadesc );
+ }
+ }
+ echo json_encode( $results );
+ die();
+}
+
+add_action( 'wp_ajax_wpseo_save_all_descs', 'wpseo_save_all_descriptions' );
diff --git a/wp-content/plugins/wordpress-seo/admin/class-admin.php b/wp-content/plugins/wordpress-seo/admin/class-admin.php
index 8fd0286..50cc464 100644
--- a/wp-content/plugins/wordpress-seo/admin/class-admin.php
+++ b/wp-content/plugins/wordpress-seo/admin/class-admin.php
@@ -3,593 +3,720 @@
* @package Admin
*/
-if ( !defined( 'WPSEO_VERSION' ) ) {
- header( 'HTTP/1.0 403 Forbidden' );
- die;
+if ( ! defined( 'WPSEO_VERSION' ) ) {
+ header( 'Status: 403 Forbidden' );
+ header( 'HTTP/1.1 403 Forbidden' );
+ exit();
}
-/**
- * Class that holds most of the admin functionality for WP SEO.
- */
-class WPSEO_Admin {
-
+if ( ! class_exists( 'WPSEO_Admin' ) ) {
/**
- * Class constructor
+ * Class that holds most of the admin functionality for WP SEO.
*/
- function __construct() {
- $this->multisite_defaults();
+ class WPSEO_Admin {
- $options = get_wpseo_options();
+ /**
+ * Class constructor
+ */
+ function __construct() {
+ $options = WPSEO_Options::get_all();
- if ( isset( $options['stripcategorybase'] ) && $options['stripcategorybase'] ) {
- add_action( 'created_category', 'flush_rewrite_rules' );
- add_action( 'edited_category', 'flush_rewrite_rules' );
- add_action( 'delete_category', 'flush_rewrite_rules' );
- }
+ if ( is_multisite() ) {
+ WPSEO_Options::maybe_set_multisite_defaults( false );
+ }
+
+ if ( $options['stripcategorybase'] === true ) {
+ add_action( 'created_category', array( $this, 'schedule_rewrite_flush' ) );
+ add_action( 'edited_category', array( $this, 'schedule_rewrite_flush' ) );
+ add_action( 'delete_category', array( $this, 'schedule_rewrite_flush' ) );
+ }
- if ( $this->grant_access() ) {
- add_action( 'admin_init', array( $this, 'options_init' ) );
// Needs the lower than default priority so other plugins can hook underneath it without issue.
add_action( 'admin_menu', array( $this, 'register_settings_page' ), 5 );
add_action( 'network_admin_menu', array( $this, 'register_network_settings_page' ) );
- add_filter( 'plugin_action_links', array( $this, 'add_action_link' ), 10, 2 );
- add_action( 'admin_print_scripts', array( $this, 'config_page_scripts' ) );
+ add_filter( 'plugin_action_links_' . WPSEO_BASENAME, array( $this, 'add_action_link' ), 10, 2 );
- if ( '0' == get_option( 'blog_public' ) )
+ add_action( 'admin_enqueue_scripts', array( $this, 'config_page_scripts' ) );
+
+ if ( '0' == get_option( 'blog_public' ) ) {
add_action( 'admin_footer', array( $this, 'blog_public_warning' ) );
- }
-
- add_action( 'admin_init', array( $this, 'maybe_upgrade' ) );
-
- add_filter( 'name_save_pre', array( $this, 'remove_stopwords_from_slug' ), 0 );
-
- add_action( 'show_user_profile', array( $this, 'user_profile' ) );
- add_action( 'edit_user_profile', array( $this, 'user_profile' ) );
- add_action( 'personal_options_update', array( $this, 'process_user_option_update' ) );
- add_action( 'edit_user_profile_update', array( $this, 'process_user_option_update' ) );
- add_action( 'personal_options_update', array( $this, 'update_user_profile' ) );
- add_action( 'edit_user_profile_update', array( $this, 'update_user_profile' ) );
-
- add_filter( 'user_contactmethods', array( $this, 'update_contactmethods' ), 10, 1 );
-
- add_action( 'update_option_wpseo_titles', array( $this, 'clear_cache' ) );
- add_action( 'update_option_wpseo', array( $this, 'clear_cache' ) );
-
- add_action( 'update_option_wpseo_permalinks', array( $this, 'clear_rewrites' ) );
- add_action( 'update_option_wpseo_xml', array( $this, 'clear_rewrites' ) );
-
- add_action( 'after_switch_theme', array( $this, 'switch_theme' ) );
- add_action( 'switch_theme', array( $this, 'switch_theme' ) );
- }
-
- /**
- * Clears the cache
- */
- function clear_cache() {
- if ( function_exists( 'w3tc_pgcache_flush' ) ) {
- w3tc_pgcache_flush();
- } else if ( function_exists( 'wp_cache_clear_cache' ) ) {
- wp_cache_clear_cache();
- }
- }
-
- /**
- * Clear rewrites
- */
- function clear_rewrites() {
- delete_option( 'rewrite_rules' );
- }
-
- /**
- * Register all the options needed for the configuration pages.
- */
- function options_init() {
- register_setting( 'yoast_wpseo_options', 'wpseo' );
- register_setting( 'yoast_wpseo_permalinks_options', 'wpseo_permalinks' );
- register_setting( 'yoast_wpseo_titles_options', 'wpseo_titles' );
- register_setting( 'yoast_wpseo_rss_options', 'wpseo_rss' );
- register_setting( 'yoast_wpseo_internallinks_options', 'wpseo_internallinks' );
- register_setting( 'yoast_wpseo_xml_sitemap_options', 'wpseo_xml' );
- register_setting( 'yoast_wpseo_social_options', 'wpseo_social' );
-
- if ( function_exists( 'is_multisite' ) && is_multisite() ) {
- if ( get_option( 'wpseo' ) == '1pseo_social' )
- delete_option( 'wpseo' );
- register_setting( 'yoast_wpseo_multisite_options', 'wpseo_multisite' );
- }
- }
-
- function multisite_defaults() {
- $option = get_option( 'wpseo' );
- if ( function_exists( 'is_multisite' ) && is_multisite() && !is_array( $option ) ) {
- $options = get_site_option( 'wpseo_ms' );
- if ( is_array( $options ) && isset( $options['defaultblog'] ) && !empty( $options['defaultblog'] ) && $options['defaultblog'] != 0 ) {
- foreach ( get_wpseo_options_arr() as $wpseo_option ) {
- update_option( $wpseo_option, get_blog_option( $options['defaultblog'], $wpseo_option ) );
- }
}
- $option['ms_defaults_set'] = true;
- update_option( 'wpseo', $option );
- }
- }
- /**
- * Check whether the current user is allowed to access the configuration.
- *
- * @return boolean
- */
- function grant_access() {
- if ( !function_exists( 'is_multisite' ) || !is_multisite() )
- return true;
-
- $options = get_site_option( 'wpseo_ms' );
- if ( !is_array( $options ) || !isset( $options['access'] ) )
- return true;
-
- if ( $options['access'] == 'superadmin' && !is_super_admin() )
- return false;
-
- return true;
- }
-
- /**
- * Register the menu item and its sub menu's.
- *
- * @global array $submenu used to change the label on the first item.
- */
- function register_settings_page() {
- add_menu_page( __( 'WordPress SEO Configuration', 'wordpress-seo' ), __( 'SEO', 'wordpress-seo' ), 'manage_options', 'wpseo_dashboard', array( $this, 'config_page' ), WPSEO_URL . 'images/yoast-icon.png', '99.31337' );
- add_submenu_page( 'wpseo_dashboard', __( 'Titles & Metas', 'wordpress-seo' ), __( 'Titles & Metas', 'wordpress-seo' ), 'manage_options', 'wpseo_titles', array( $this, 'titles_page' ) );
- add_submenu_page( 'wpseo_dashboard', __( 'Social', 'wordpress-seo' ), __( 'Social', 'wordpress-seo' ), 'manage_options', 'wpseo_social', array( $this, 'social_page' ) );
- add_submenu_page( 'wpseo_dashboard', __( 'XML Sitemaps', 'wordpress-seo' ), __( 'XML Sitemaps', 'wordpress-seo' ), 'manage_options', 'wpseo_xml', array( $this, 'xml_sitemaps_page' ) );
- add_submenu_page( 'wpseo_dashboard', __( 'Permalinks', 'wordpress-seo' ), __( 'Permalinks', 'wordpress-seo' ), 'manage_options', 'wpseo_permalinks', array( $this, 'permalinks_page' ) );
- add_submenu_page( 'wpseo_dashboard', __( 'Internal Links', 'wordpress-seo' ), __( 'Internal Links', 'wordpress-seo' ), 'manage_options', 'wpseo_internal-links', array( $this, 'internallinks_page' ) );
- add_submenu_page( 'wpseo_dashboard', __( 'RSS', 'wordpress-seo' ), __( 'RSS', 'wordpress-seo' ), 'manage_options', 'wpseo_rss', array( $this, 'rss_page' ) );
- add_submenu_page( 'wpseo_dashboard', __( 'Import & Export', 'wordpress-seo' ), __( 'Import & Export', 'wordpress-seo' ), 'manage_options', 'wpseo_import', array( $this, 'import_page' ) );
-
- if ( !( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT ) && !( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) ) {
- // Make sure on a multi site install only super admins can edit .htaccess and robots.txt
- if ( !function_exists( 'is_multisite' ) || !is_multisite() )
- add_submenu_page( 'wpseo_dashboard', __( 'Edit files', 'wordpress-seo' ), __( 'Edit files', 'wordpress-seo' ), 'manage_options', 'wpseo_files', array( $this, 'files_page' ) );
- else
- add_submenu_page( 'wpseo_dashboard', __( 'Edit files', 'wordpress-seo' ), __( 'Edit files', 'wordpress-seo' ), 'delete_users', 'wpseo_files', array( $this, 'files_page' ) );
- }
-
- global $submenu;
- if ( isset( $submenu['wpseo_dashboard'] ) )
- $submenu['wpseo_dashboard'][0][0] = __( 'Dashboard', 'wordpress-seo' );
- }
-
- /**
- * Register the settings page for the Network settings.
- */
- function register_network_settings_page() {
- add_menu_page( __( 'WordPress SEO Configuration', 'wordpress-seo' ), __( 'SEO', 'wordpress-seo' ), 'delete_users', 'wpseo_dashboard', array( $this, 'network_config_page' ), WPSEO_URL . 'images/yoast-icon.png' );
- }
-
- /**
- * Loads the form for the network configuration page.
- */
- function network_config_page() {
- require( WPSEO_PATH . '/admin/pages/network.php' );
- }
-
- /**
- * Loads the form for the import/export page.
- */
- function import_page() {
- if ( isset( $_GET['page'] ) && 'wpseo_import' == $_GET['page'] )
- include( WPSEO_PATH . '/admin/pages/import.php' );
- }
-
- /**
- * Loads the form for the titles & metas page.
- */
- function titles_page() {
- if ( isset( $_GET['page'] ) && 'wpseo_titles' == $_GET['page'] )
- include( WPSEO_PATH . '/admin/pages/metas.php' );
- }
-
- /**
- * Loads the form for the permalinks page.
- */
- function permalinks_page() {
- if ( isset( $_GET['page'] ) && 'wpseo_permalinks' == $_GET['page'] )
- include( WPSEO_PATH . '/admin/pages/permalinks.php' );
- }
-
- /**
- * Loads the form for the internal links / breadcrumbs page.
- */
- function internallinks_page() {
- if ( isset( $_GET['page'] ) && 'wpseo_internal-links' == $_GET['page'] )
- include( WPSEO_PATH . '/admin/pages/internal-links.php' );
- }
-
- /**
- * Loads the form for the file edit page.
- */
- function files_page() {
- if ( isset( $_GET['page'] ) && 'wpseo_files' == $_GET['page'] )
- include( WPSEO_PATH . '/admin/pages/files.php' );
- }
-
- /**
- * Loads the form for the RSS page.
- */
- function rss_page() {
- if ( isset( $_GET['page'] ) && 'wpseo_rss' == $_GET['page'] )
- include( WPSEO_PATH . '/admin/pages/rss.php' );
- }
-
- /**
- * Loads the form for the XML Sitemaps page.
- */
- function xml_sitemaps_page() {
- if ( isset( $_GET['page'] ) && 'wpseo_xml' == $_GET['page'] )
- include( WPSEO_PATH . '/admin/pages/xml-sitemaps.php' );
- }
-
- /**
- * Loads the form for the Dashboard page.
- */
- function config_page() {
- if ( isset( $_GET['page'] ) && 'wpseo_dashboard' == $_GET['page'] )
- include( WPSEO_PATH . '/admin/pages/dashboard.php' );
- }
-
- /**
- * Loads the form for the Social Settings page.
- */
- function social_page() {
- if ( isset( $_GET['page'] ) && 'wpseo_social' == $_GET['page'] )
- require( WPSEO_PATH . '/admin/pages/social.php' );
- }
-
- /**
- * Display an error message when the blog is set to private.
- */
- function blog_public_warning() {
- if ( function_exists( 'is_network_admin' ) && is_network_admin() )
- return;
-
- $options = get_option( 'wpseo' );
- if ( isset( $options['ignore_blog_public_warning'] ) && $options['ignore_blog_public_warning'] == 'ignore' )
- return;
- echo "
";
- echo "
" . __( "Huge SEO Issue: You're blocking access to robots.", 'wordpress-seo' ) . " " . sprintf( __( "You must %sgo to your Reading Settings%s and uncheck the box for Search Engine Visibility.", 'wordpress-seo' ), "", " " ) . " " . __( "I know, don't bug me.", 'wordpress-seo' ) . "
";
- }
-
- /**
- * Add a link to the settings page to the plugins list
- *
- * @staticvar string $this_plugin holds the directory & filename for the plugin
- * @param array $links array of links for the plugins, adapted when the current plugin is found.
- * @param string $file the filename for the current plugin, which the filter loops through.
- * @return array $links
- */
- function add_action_link( $links, $file ) {
- static $this_plugin;
- if ( empty( $this_plugin ) ) $this_plugin = 'wordpress-seo/wp-seo.php';
- if ( $file == $this_plugin ) {
- $settings_link = '
' . __( 'Settings', 'wordpress-seo' ) . ' ';
- array_unshift( $links, $settings_link );
- }
- return $links;
- }
-
- /**
- * Enqueues the (tiny) global JS needed for the plugin.
- */
- function config_page_scripts() {
- wp_enqueue_script( 'wpseo-admin-global-script', WPSEO_URL . 'js/wp-seo-admin-global.js', array( 'jquery' ), WPSEO_VERSION, true );
- }
-
- /**
- * Updates the user metas that (might) have been set on the user profile page.
- *
- * @param int $user_id of the updated user
- */
- function process_user_option_update( $user_id ) {
- if ( isset( $_POST['wpseo_author_title'] ) ) {
- check_admin_referer( 'wpseo_user_profile_update', 'wpseo_nonce' );
- update_user_meta( $user_id, 'wpseo_title', ( isset( $_POST['wpseo_author_title'] ) ? esc_html( $_POST['wpseo_author_title'] ) : '' ) );
- update_user_meta( $user_id, 'wpseo_metadesc', ( isset( $_POST['wpseo_author_metadesc'] ) ? esc_html( $_POST['wpseo_author_metadesc'] ) : '' ) );
- update_user_meta( $user_id, 'wpseo_metakey', ( isset( $_POST['wpseo_author_metakey'] ) ? esc_html( $_POST['wpseo_author_metakey'] ) : '' ) );
- }
- }
-
- /**
- * Filter the $contactmethods array and add Facebook, Google+ and Twitter.
- *
- * These are used with the Facebook author, rel="author" and Twitter cards implementation.
- *
- * @param array $contactmethods currently set contactmethods.
- * @return array $contactmethods with added contactmethods.
- */
- function update_contactmethods( $contactmethods ) {
- // Add Google+
- $contactmethods['googleplus'] = __( "Google+", 'wordpress-seo' );
- // Add Twitter
- $contactmethods['twitter'] = __( 'Twitter username (without @)', 'wordpress-seo' );
- // Add Facebook
- $contactmethods['facebook'] = __( 'Facebook profile URL', 'wordpress-seo' );
-
- return $contactmethods;
- }
-
- /**
- * Add the inputs needed for SEO values to the User Profile page
- *
- * @param object $user
- */
- function user_profile( $user ) {
-
- if ( !current_user_can( 'edit_users' ) )
- return;
-
- $options = get_wpseo_options();
-
- wp_nonce_field( 'wpseo_user_profile_update', 'wpseo_nonce' );
- ?>
-
-
-
- isset( $opt['opengraph'] ) ? $opt['opengraph'] : '',
- 'fb_adminid' => isset( $opt['fb_adminid'] ) ? $opt['fb_adminid'] : '',
- 'fb_appid' => isset( $opt['fb_appid'] ) ? $opt['fb_appid'] : '',
+
+ /**
+ * Register the menu item and its sub menu's.
+ *
+ * @global array $submenu used to change the label on the first item.
+ */
+ function register_settings_page() {
+ if ( WPSEO_Options::grant_access() !== true ) {
+ return;
+ }
+
+ // Add main page
+ $admin_page = add_menu_page( __( 'Yoast WordPress SEO:', 'wordpress-seo' ) . ' ' . __( 'General Settings', 'wordpress-seo' ), __( 'SEO', 'wordpress-seo' ), 'manage_options', 'wpseo_dashboard', array( $this, 'load_page' ), plugins_url( 'images/yoast-icon.png', WPSEO_FILE ), '99.31337' );
+
+ // Sub menu pages
+ $submenu_pages = array(
+ array( 'wpseo_dashboard', __( 'Yoast WordPress SEO:', 'wordpress-seo' ) . ' ' . __( 'Titles & Metas', 'wordpress-seo' ), __( 'Titles & Metas', 'wordpress-seo' ), 'manage_options', 'wpseo_titles', array( $this, 'load_page' ), array( array( $this, 'title_metas_help_tab' ) ) ),
+ array( 'wpseo_dashboard', __( 'Yoast WordPress SEO:', 'wordpress-seo' ) . ' ' . __( 'Social', 'wordpress-seo' ), __( 'Social', 'wordpress-seo' ), 'manage_options', 'wpseo_social', array( $this, 'load_page' ), null ),
+ array( 'wpseo_dashboard', __( 'Yoast WordPress SEO:', 'wordpress-seo' ) . ' ' . __( 'XML Sitemaps', 'wordpress-seo' ), __( 'XML Sitemaps', 'wordpress-seo' ), 'manage_options', 'wpseo_xml', array( $this, 'load_page' ), null ),
+ array( 'wpseo_dashboard', __( 'Yoast WordPress SEO:', 'wordpress-seo' ) . ' ' . __( 'Permalinks', 'wordpress-seo' ), __( 'Permalinks', 'wordpress-seo' ), 'manage_options', 'wpseo_permalinks', array( $this, 'load_page' ), null ),
+ array( 'wpseo_dashboard', __( 'Yoast WordPress SEO:', 'wordpress-seo' ) . ' ' . __( 'Internal Links', 'wordpress-seo' ), __( 'Internal Links', 'wordpress-seo' ), 'manage_options', 'wpseo_internal-links', array( $this, 'load_page' ), null ),
+ array( 'wpseo_dashboard', __( 'Yoast WordPress SEO:', 'wordpress-seo' ) . ' ' . __( 'RSS', 'wordpress-seo' ), __( 'RSS', 'wordpress-seo' ), 'manage_options', 'wpseo_rss', array( $this, 'load_page' ), null ),
+ array( 'wpseo_dashboard', __( 'Yoast WordPress SEO:', 'wordpress-seo' ) . ' ' . __( 'Import & Export', 'wordpress-seo' ), __( 'Import & Export', 'wordpress-seo' ), 'manage_options', 'wpseo_import', array( $this, 'load_page' ), null ),
+ array( 'wpseo_dashboard', __( 'Yoast WordPress SEO:', 'wordpress-seo' ) . ' ' . __( 'Bulk Title Editor', 'wordpress-seo' ), __( 'Bulk Title Editor', 'wordpress-seo' ), 'wpseo_bulk_edit', 'wpseo_bulk-title-editor', array( $this, 'load_page' ), array( array( $this, 'bulk_edit_options' ) ) ),
+ array( 'wpseo_dashboard', __( 'Yoast WordPress SEO:', 'wordpress-seo' ) . ' ' . __( 'Bulk Description Editor', 'wordpress-seo' ), __( 'Bulk Description Editor', 'wordpress-seo' ), 'wpseo_bulk_edit', 'wpseo_bulk-description-editor', array( $this, 'load_page' ), array( array( $this, 'bulk_edit_options' ) ) ),
);
- update_option( 'wpseo_social', $newopt );
- unset( $opt['opengraph'], $opt['fb_pageid'], $opt['fb_adminid'], $opt['fb_appid'] );
- update_option( 'wpseo_indexation', $opt );
- }
- if ( version_compare( $current_version, '1.2', '<' ) ) {
- $opt = get_option( 'wpseo_indexation' );
- $metaopt = get_option( 'wpseo_titles' );
+ // Check where to add the edit files page
+ if ( wpseo_allow_system_file_edit() === true && ! is_multisite() ) {
+ $submenu_pages[] = array( 'wpseo_dashboard', __( 'Yoast WordPress SEO:', 'wordpress-seo' ) . ' ' . __( 'Edit Files', 'wordpress-seo' ), __( 'Edit Files', 'wordpress-seo' ), 'manage_options', 'wpseo_files', array( $this, 'load_page' ) );
+ }
- $metaopt['noindex-author'] = isset( $opt['noindexauthor'] ) ? $opt['noindexauthor'] : '';
- $metaopt['disable-author'] = isset( $opt['disableauthor'] ) ? $opt['disableauthor'] : '';
- $metaopt['noindex-archive'] = isset( $opt['noindexdate'] ) ? $opt['noindexdate'] : '';
- $metaopt['noindex-category'] = isset( $opt['noindexcat'] ) ? $opt['noindexcat'] : '';
- $metaopt['noindex-post_tag'] = isset( $opt['noindextag'] ) ? $opt['noindextag'] : '';
- $metaopt['noindex-post_format'] = isset( $opt['noindexpostformat'] ) ? $opt['noindexpostformat'] : '';
- $metaopt['noindex-subpages'] = isset( $opt['noindexsubpages'] ) ? $opt['noindexsubpages'] : '';
- $metaopt['hide-rsdlink'] = isset( $opt['hidersdlink'] ) ? $opt['hidersdlink'] : '';
- $metaopt['hide-feedlinks'] = isset( $opt['hidefeedlinks'] ) ? $opt['hidefeedlinks'] : '';
- $metaopt['hide-wlwmanifest'] = isset( $opt['hidewlwmanifest'] ) ? $opt['hidewlwmanifest'] : '';
- $metaopt['hide-shortlink'] = isset( $opt['hideshortlink'] ) ? $opt['hideshortlink'] : '';
+ // Add Extension submenu page
+ $submenu_pages[] = array( 'wpseo_dashboard', __( 'Yoast WordPress SEO:', 'wordpress-seo' ) . ' ' . __( 'Extensions', 'wordpress-seo' ), '
' . __( 'Extensions', 'wordpress-seo' ) . ' ', 'manage_options', 'wpseo_licenses', array( $this, 'load_page' ), null );
- update_option( 'wpseo_titles', $metaopt );
+ // Allow submenu pages manipulation
+ $submenu_pages = apply_filters( 'wpseo_submenu_pages', $submenu_pages );
- delete_option( 'wpseo_indexation' );
+ // Loop through submenu pages and add them
+ if ( count( $submenu_pages ) ) {
+ foreach ( $submenu_pages as $submenu_page ) {
- wpseo_title_test();
- }
+ // Add submenu page
+ $admin_page = add_submenu_page( $submenu_page[0], $submenu_page[1], $submenu_page[2], $submenu_page[3], $submenu_page[4], $submenu_page[5] );
- // Clean up the wrong wpseo options
- if ( version_compare( $current_version, '1.2.3', '<' ) ) {
- $opt = get_option( 'wpseo' );
-
- if ( is_array( $opt ) ) {
- foreach ( $opt as $key => $val ) {
- if ( !in_array( $key, array( 'ignore_blog_public_warning', 'ignore_tour', 'ignore_page_comments', 'ignore_permalink', 'ms_defaults_set', 'version', 'disableadvanced_meta', 'googleverify', 'msverify', 'alexaverify' ) ) ) {
- unset( $opt[$key] );
+ // Check if we need to hook
+ if ( isset( $submenu_page[6] ) && null != $submenu_page[6] && is_array( $submenu_page[6] ) && count( $submenu_page[6] ) > 0 ) {
+ foreach ( $submenu_page[6] as $submenu_page_action ) {
+ add_action( 'load-' . $admin_page, $submenu_page_action );
+ }
}
}
+ }
- update_option( 'wpseo', $opt );
- unset( $opt );
+ global $submenu;
+ if ( isset( $submenu['wpseo_dashboard'] ) ) {
+ $submenu['wpseo_dashboard'][0][0] = __( 'Dashboard', 'wordpress-seo' );
}
}
- // Fix wrongness created by buggy version 1.2.2
- if ( version_compare( $current_version, '1.2.4', '<' ) ) {
- $options = get_option( 'wpseo_titles' );
- if ( is_array( $options ) && isset( $options['title-home'] ) && $options['title-home'] == '%%sitename%% - %%sitedesc%% - 12345' ) {
- $options['title-home'] = '%%sitename%% - %%sitedesc%%';
- update_option( 'wpseo_titles', $options );
+ /**
+ * Adds contextual help to the titles & metas page.
+ */
+ function title_metas_help_tab() {
+ $screen = get_current_screen();
+
+ $screen->set_help_sidebar(
+ '
' . __( 'For more information:', 'wordpress-seo' ) . '
' .
+ '
' . __( 'Title optimization', 'wordpress-seo' ) . '
' .
+ '
' . __( 'Why Google won\'t display the right page title', 'wordpress-seo' ) . '
'
+ );
+
+ $screen->add_help_tab(
+ array(
+ 'id' => 'basic-help',
+ 'title' => __( 'Template explanation', 'wordpress-seo' ),
+ 'content' => '
' . __( 'The title & metas settings for WordPress SEO are made up of variables that are replaced by specific values from the page when the page is displayed. The tabs on the left explain the available variables.', 'wordpress-seo' ) . '
',
+ )
+ );
+
+
+ $screen->add_help_tab(
+ array(
+ 'id' => 'title-vars',
+ 'title' => __( 'Basic Variables', 'wordpress-seo' ),
+ 'content' => "\n\t\t
" . __( 'Basic Variables', 'wordpress-seo' ) . " \n\t\t" . WPSEO_Replace_Vars::get_basic_help_texts(),
+ )
+ );
+
+ $screen->add_help_tab(
+ array(
+ 'id' => 'title-vars-advanced',
+ 'title' => __( 'Advanced Variables', 'wordpress-seo' ),
+ 'content' => "\n\t\t
" . __( 'Advanced Variables', 'wordpress-seo' ) . " \n\t\t" . WPSEO_Replace_Vars::get_advanced_help_texts(),
+ )
+ );
+ }
+
+ /**
+ * Register the settings page for the Network settings.
+ */
+ function register_network_settings_page() {
+ if ( WPSEO_Options::grant_access() ) {
+ add_menu_page( __( 'Yoast WordPress SEO:', 'wordpress-seo' ) . ' ' . __( 'MultiSite Settings', 'wordpress-seo' ), __( 'SEO', 'wordpress-seo' ), 'delete_users', 'wpseo_dashboard', array( $this, 'network_config_page' ), plugins_url( 'images/yoast-icon.png', WPSEO_FILE ) );
+
+ if ( wpseo_allow_system_file_edit() === true ) {
+ add_submenu_page( 'wpseo_dashboard', __( 'Yoast WordPress SEO:', 'wordpress-seo' ) . ' ' . __( 'Edit Files', 'wordpress-seo' ), __( 'Edit Files', 'wordpress-seo' ), 'delete_users', 'wpseo_files', array( $this, 'load_page' ) );
+ }
+
+ // Add Extension submenu page
+ add_submenu_page( 'wpseo_dashboard', __( 'Yoast WordPress SEO:', 'wordpress-seo' ) . ' ' . __( 'Extensions', 'wordpress-seo' ), __( 'Extensions', 'wordpress-seo' ), 'delete_users', 'wpseo_licenses', array( $this, 'load_page' ) );
}
}
- if ( version_compare( $current_version, '1.2.8', '<' ) ) {
+
+ /**
+ * Load the form for a WPSEO admin page
+ */
+ function load_page() {
+ if ( isset( $_GET['page'] ) ) {
+ switch ( $_GET['page'] ) {
+ case 'wpseo_titles':
+ require_once( WPSEO_PATH . 'admin/pages/metas.php' );
+ break;
+
+ case 'wpseo_social':
+ require_once( WPSEO_PATH . 'admin/pages/social.php' );
+ break;
+
+ case 'wpseo_xml':
+ require_once( WPSEO_PATH . 'admin/pages/xml-sitemaps.php' );
+ break;
+
+ case 'wpseo_permalinks':
+ require_once( WPSEO_PATH . 'admin/pages/permalinks.php' );
+ break;
+
+ case 'wpseo_internal-links':
+ require_once( WPSEO_PATH . 'admin/pages/internal-links.php' );
+ break;
+
+ case 'wpseo_rss':
+ require_once( WPSEO_PATH . 'admin/pages/rss.php' );
+ break;
+
+ case 'wpseo_import':
+ require_once( WPSEO_PATH . 'admin/pages/import.php' );
+ break;
+
+ case 'wpseo_files':
+ require_once( WPSEO_PATH . 'admin/pages/files.php' );
+ break;
+
+ case 'wpseo_bulk-title-editor':
+ require_once( WPSEO_PATH . 'admin/pages/bulk-title-editor.php' );
+ break;
+
+ case 'wpseo_bulk-description-editor':
+ require_once( WPSEO_PATH . 'admin/pages/bulk-description-editor.php' );
+ break;
+
+ case 'wpseo_licenses':
+ require_once( WPSEO_PATH . 'admin/pages/licenses.php' );
+ break;
+
+ case 'wpseo_dashboard':
+ default:
+ require_once( WPSEO_PATH . 'admin/pages/dashboard.php' );
+ break;
+ }
+ }
+ }
+
+
+ /**
+ * Loads the form for the network configuration page.
+ */
+ function network_config_page() {
+ require_once( WPSEO_PATH . 'admin/pages/network.php' );
+ }
+
+
+ /**
+ * Adds the ability to choose how many posts are displayed per page
+ * on the bulk edit pages.
+ */
+ function bulk_edit_options() {
+ $option = 'per_page';
+ $args = array(
+ 'label' => __( 'Posts', 'wordpress-seo' ),
+ 'default' => 10,
+ 'option' => 'wpseo_posts_per_page',
+ );
+ add_screen_option( $option, $args );
+ }
+
+ /**
+ * Saves the posts per page limit for bulk edit pages.
+ */
+ function save_bulk_edit_options( $status, $option, $value ) {
+ if ( 'wpseo_posts_per_page' === $option && ( $value > 0 && $value < 1000 ) ) {
+ return $value;
+ }
+ return $status;
+ }
+
+ /**
+ * Display an error message when the blog is set to private.
+ */
+ function blog_public_warning() {
+ if ( ( function_exists( 'is_network_admin' ) && is_network_admin() ) || WPSEO_Options::grant_access() !== true ) {
+ return;
+ }
+
$options = get_option( 'wpseo' );
- if ( is_array( $options ) && isset( $options['presstrends'] ) ) {
- $options['yoast_tracking'] = 'on';
- unset( $options['presstrends'] );
- update_option( 'wpseo', $options );
+ if ( $options['ignore_blog_public_warning'] === true ) {
+ return;
}
+ echo '
';
}
- if ( version_compare( $current_version, '1.2.8.2', '<' ) ) {
+ /**
+ * Display an error message when the theme contains a meta description tag.
+ *
+ * @since 1.4.14
+ */
+ function meta_description_warning() {
+ if ( ( function_exists( 'is_network_admin' ) && is_network_admin() ) || WPSEO_Options::grant_access() !== true ) {
+ return;
+ }
+
+ // No need to double display it on the dashboard
+ if ( isset( $_GET['page'] ) && 'wpseo_dashboard' === $_GET['page'] ) {
+ return;
+ }
+
$options = get_option( 'wpseo' );
- if ( is_array( $options ) && isset( $options['presstrends'] ) ) {
- $options['yoast_tracking'] = 'on';
- unset( $options['presstrends'] );
+ if ( true === $options['ignore_meta_description_warning'] ) {
+ return;
}
- if ( is_array( $options ) && isset( $options['presstrends_popup'] ) ) {
- $options['tracking_popup'] = 'on';
- unset( $options['presstrends_popup'] );
+
+ echo '
';
+ }
+
+ /**
+ * Add a link to the settings page to the plugins list
+ *
+ * @staticvar string $this_plugin holds the directory & filename for the plugin
+ *
+ * @param array $links array of links for the plugins, adapted when the current plugin is found.
+ * @param string $file the filename for the current plugin, which the filter loops through.
+ * @return array $links
+ */
+ function add_action_link( $links, $file ) {
+ if ( WPSEO_BASENAME === $file && WPSEO_Options::grant_access() ) {
+ $settings_link = '
' . __( 'Settings', 'wordpress-seo' ) . ' ';
+ array_unshift( $links, $settings_link );
}
- update_option( 'wpseo', $options );
+
+ if ( class_exists( 'Yoast_Product_WPSEO_Premium' ) ) {
+ $license_manager = new Yoast_Plugin_License_Manager( new Yoast_Product_WPSEO_Premium() );
+ if ( $license_manager->license_is_valid() ) {
+ return $links;
+ }
+ }
+
+ // add link to premium support landing page
+ $premium_link = '
' . __( 'Premium Support', 'wordpress-seo' ) .' ';
+ array_unshift( $links, $premium_link );
+
+ // add link to docs
+ $faq_link = '
' . __( 'FAQ', 'wordpress-seo' ) .' ';
+ array_unshift( $links, $faq_link );
+
+ return $links;
}
- if ( version_compare( $current_version, '1.3.2', '<' ) ) {
- $options = get_option( 'wpseo_xml' );
-
- $options['post_types-attachment-not_in_sitemap'] = true;
- update_option( 'wpseo_xml', $options );
+ /**
+ * Enqueues the (tiny) global JS needed for the plugin.
+ */
+ function config_page_scripts() {
+ if ( WPSEO_Options::grant_access() ) {
+ wp_enqueue_script( 'wpseo-admin-global-script', plugins_url( 'js/wp-seo-admin-global' . WPSEO_CSSJS_SUFFIX . '.js', WPSEO_FILE ), array( 'jquery' ), WPSEO_VERSION, true );
+ }
}
- $options = get_option( 'wpseo' );
- $options['version'] = WPSEO_VERSION;
- update_option( 'wpseo', $options );
- }
- /**
- * Cleans stopwords out of the slug, if the slug hasn't been set yet.
- *
- * @since 1.1.7
- *
- * @param string $slug if this isn't empty, the function will return an unaltered slug.
- * @return string $clean_slug cleaned slug
- */
- function remove_stopwords_from_slug( $slug ) {
- // Don't to change an existing slug
- if ( $slug )
- return $slug;
-
- if ( !isset( $_POST['post_title'] ) )
- return $slug;
-
- // Lowercase the slug and strip slashes
- $clean_slug = sanitize_title( stripslashes( $_POST['post_title'] ) );
-
- // Turn it to an array and strip stopwords by comparing against an array of stopwords
- $clean_slug_array = array_diff( explode( " ", $clean_slug ), $this->stopwords() );
-
- // Turn the sanitized array into a string
- $clean_slug = join( "-", $clean_slug_array );
-
- return $clean_slug;
- }
-
- /**
- * Returns the stopwords for the current language
- *
- * @since 1.1.7
- *
- * @return array $stopwords array of stop words to check and / or remove from slug
- */
- function stopwords() {
- /* translators: this should be an array of stopwords for your language, separated by comma's. */
- return explode( ',', __( "a,about,above,after,again,against,all,am,an,and,any,are,aren't,as,at,be,because,been,before,being,below,between,both,but,by,can't,cannot,could,couldn't,did,didn't,do,does,doesn't,doing,don't,down,during,each,few,for,from,further,had,hadn't,has,hasn't,have,haven't,having,he,he'd,he'll,he's,her,here,here's,hers,herself,him,himself,his,how,how's,i,i'd,i'll,i'm,i've,if,in,into,is,isn't,it,it's,its,itself,let's,me,more,most,mustn't,my,myself,no,nor,not,of,off,on,once,only,or,other,ought,our,ours , ourselves,out,over,own,same,shan't,she,she'd,she'll,she's,should,shouldn't,so,some,such,than,that,that's,the,their,theirs,them,themselves,then,there,there's,these,they,they'd,they'll,they're,they've,this,those,through,to,too,under,until,up,very,was,wasn't,we,we'd,we'll,we're,we've,were,weren't,what,what's,when,when's,where,where's,which,while,who,who's,whom,why,why's,with,won't,would,wouldn't,you,you'd,you'll,you're,you've,your,yours,yourself,yourselves", "wordpress-seo" ) );
- }
-
- function stopwords_check( $haystack, $checkingUrl = false ) {
- $stopWords = $this->stopwords();
-
- foreach ( $stopWords as $stopWord ) {
- // If checking a URL remove the single quotes
- if ( $checkingUrl )
- $stopWord = str_replace( "'", "", $stopWord );
-
- // Check whether the stopword appears as a whole word
- $res = preg_match( "/(^|[ \n\r\t\.,'\(\)\"\+;!?:])" . preg_quote( $stopWord, '/' ) . "($|[ \n\r\t\.,'\(\)\"\+;!?:])/i", $haystack, $match );
- if ( $res > 0 )
- return $stopWord;
+ /**
+ * Updates the user metas that (might) have been set on the user profile page.
+ *
+ * @param int $user_id of the updated user
+ */
+ function process_user_option_update( $user_id ) {
+ if ( isset( $_POST['wpseo_author_title'] ) ) {
+ check_admin_referer( 'wpseo_user_profile_update', 'wpseo_nonce' );
+ update_user_meta( $user_id, 'wpseo_title', ( isset( $_POST['wpseo_author_title'] ) ? WPSEO_Option::sanitize_text_field( $_POST['wpseo_author_title'] ) : '' ) );
+ update_user_meta( $user_id, 'wpseo_metadesc', ( isset( $_POST['wpseo_author_metadesc'] ) ? WPSEO_Option::sanitize_text_field( $_POST['wpseo_author_metadesc'] ) : '' ) );
+ update_user_meta( $user_id, 'wpseo_metakey', ( isset( $_POST['wpseo_author_metakey'] ) ? WPSEO_Option::sanitize_text_field( $_POST['wpseo_author_metakey'] ) : '' ) );
+ }
}
- return false;
- }
+ /**
+ * Filter the $contactmethods array and add Facebook, Google+ and Twitter.
+ *
+ * These are used with the Facebook author, rel="author" and Twitter cards implementation.
+ *
+ * @param array $contactmethods currently set contactmethods.
+ * @return array $contactmethods with added contactmethods.
+ */
+ function update_contactmethods( $contactmethods ) {
+ // Add Google+
+ $contactmethods['googleplus'] = __( 'Google+', 'wordpress-seo' );
+ // Add Twitter
+ $contactmethods['twitter'] = __( 'Twitter username (without @)', 'wordpress-seo' );
+ // Add Facebook
+ $contactmethods['facebook'] = __( 'Facebook profile URL', 'wordpress-seo' );
- /**
- * Log the timestamp when a user profile has been updated
- */
- function update_user_profile($user_id) {
- if ( current_user_can( 'edit_user', $user_id ) ) {
- update_user_meta( $user_id, '_yoast_wpseo_profile_updated', time() );
+ return $contactmethods;
}
- }
- /**
- * Log the updated timestamp for user profiles when theme is changed
- */
- function switch_theme() {
- foreach ( get_users( array( 'who' => 'authors' ) ) as $user ) {
- update_user_meta( $user->ID, '_yoast_wpseo_profile_updated', time() );
+ /**
+ * Add the inputs needed for SEO values to the User Profile page
+ *
+ * @param object $user
+ */
+ function user_profile( $user ) {
+
+ if ( ! current_user_can( 'edit_users' ) ) {
+ return;
+ }
+
+ $options = WPSEO_Options::get_all();
+
+ wp_nonce_field( 'wpseo_user_profile_update', 'wpseo_nonce' );
+ ?>
+
+
+
+ stopwords() );
+
+ // Turn the sanitized array into a string
+ $clean_slug = join( '-', $clean_slug_array );
+
+ return $clean_slug;
+ }
+
+ /**
+ * Returns the stopwords for the current language
+ *
+ * @since 1.1.7
+ *
+ * @return array $stopwords array of stop words to check and / or remove from slug
+ */
+ function stopwords() {
+ /* translators: this should be an array of stopwords for your language, separated by comma's. */
+ $stopwords = explode( ',', __( "a,about,above,after,again,against,all,am,an,and,any,are,aren't,as,at,be,because,been,before,being,below,between,both,but,by,can't,cannot,could,couldn't,did,didn't,do,does,doesn't,doing,don't,down,during,each,few,for,from,further,had,hadn't,has,hasn't,have,haven't,having,he,he'd,he'll,he's,her,here,here's,hers,herself,him,himself,his,how,how's,i,i'd,i'll,i'm,i've,if,in,into,is,isn't,it,it's,its,itself,let's,me,more,most,mustn't,my,myself,no,nor,not,of,off,on,once,only,or,other,ought,our,ours,ourselves,out,over,own,same,shan't,she,she'd,she'll,she's,should,shouldn't,so,some,such,than,that,that's,the,their,theirs,them,themselves,then,there,there's,these,they,they'd,they'll,they're,they've,this,those,through,to,too,under,until,up,very,was,wasn't,we,we'd,we'll,we're,we've,were,weren't,what,what's,when,when's,where,where's,which,while,who,who's,whom,why,why's,with,won't,would,wouldn't,you,you'd,you'll,you're,you've,your,yours,yourself,yourselves", 'wordpress-seo' ) );
+
+ /**
+ * Allows filtering of the stop words list
+ * Especially useful for users on a language in which WPSEO is not available yet
+ * and/or users who want to turn off stop word filtering
+ * @api array $stopwords Array of all lowercase stopwords to check and/or remove from slug
+ */
+ $stopwords = apply_filters( 'wpseo_stopwords', $stopwords );
+
+ return $stopwords;
+ }
+
+
+ /**
+ * Check whether the stopword appears in the string
+ *
+ * @param string $haystack The string to be checked for the stopword
+ * @param bool $checkingUrl Whether or not we're checking a URL
+ *
+ * @return bool|mixed
+ */
+ function stopwords_check( $haystack, $checkingUrl = false ) {
+ $stopWords = $this->stopwords();
+
+ if ( is_array( $stopWords ) && $stopWords !== array() ) {
+ foreach ( $stopWords as $stopWord ) {
+ // If checking a URL remove the single quotes
+ if ( $checkingUrl ) {
+ $stopWord = str_replace( "'", '', $stopWord );
+ }
+
+ // Check whether the stopword appears as a whole word
+ // @todo [JRF => whomever] check whether the use of \b (=word boundary) would be more efficient ;-)
+ $res = preg_match( "`(^|[ \n\r\t\.,'\(\)\"\+;!?:])" . preg_quote( $stopWord, '`' ) . "($|[ \n\r\t\.,'\(\)\"\+;!?:])`iu", $haystack, $match );
+ if ( $res > 0 ) {
+ return $stopWord;
+ }
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Log the timestamp when a user profile has been updated
+ */
+ function update_user_profile( $user_id ) {
+ if ( current_user_can( 'edit_user', $user_id ) ) {
+ update_user_meta( $user_id, '_yoast_wpseo_profile_updated', time() );
+ }
+ }
+
+ /**
+ * Log the updated timestamp for user profiles when theme is changed
+ */
+ function switch_theme() {
+ $users = get_users( array( 'who' => 'authors' ) );
+ if ( is_array( $users ) && $users !== array() ) {
+ foreach ( $users as $user ) {
+ update_user_meta( $user->ID, '_yoast_wpseo_profile_updated', time() );
+ }
+ }
+ }
+
+
+
+
+ /********************** DEPRECATED METHODS **********************/
+
+ /**
+ * Check whether the current user is allowed to access the configuration.
+ *
+ * @deprecated 1.5.0
+ * @deprecated use WPSEO_Options::grant_access()
+ * @see WPSEO_Options::grant_access()
+ *
+ * @return boolean
+ */
+ function grant_access() {
+ _deprecated_function( __METHOD__, 'WPSEO 1.5.0', 'WPSEO_Options::grant_access()' );
+ return WPSEO_Options::grant_access();
+ }
+
+ /**
+ * Check whether the current user is allowed to access the configuration.
+ *
+ * @deprecated 1.5.0
+ * @deprecated use wpseo_do_upgrade()
+ * @see wpseo_do_upgrade()
+ *
+ * @return boolean
+ */
+ function maybe_upgrade() {
+ _deprecated_function( __METHOD__, 'WPSEO 1.5.0', 'wpseo_do_upgrade' );
+ wpseo_do_upgrade();
+ }
+
+ /**
+ * Clears the cache
+ *
+ * @deprecated 1.5.0
+ * @deprecated use WPSEO_Options::clear_cache()
+ * @see WPSEO_Options::clear_cache()
+ */
+ function clear_cache() {
+ _deprecated_function( __METHOD__, 'WPSEO 1.5.0', 'WPSEO_Options::clear_cache()' );
+ WPSEO_Options::clear_cache();
+ }
+
+ /**
+ * Clear rewrites
+ *
+ * @deprecated 1.5.0
+ * @deprecated use WPSEO_Options::clear_rewrites()
+ * @see WPSEO_Options::clear_rewrites()
+ */
+ function clear_rewrites() {
+ _deprecated_function( __METHOD__, 'WPSEO 1.5.0', 'WPSEO_Options::clear_rewrites()' );
+ WPSEO_Options::clear_rewrites();
+ }
+
+ /**
+ * Register all the options needed for the configuration pages.
+ *
+ * @deprecated 1.5.0
+ * @deprecated use WPSEO_Option::register_setting() on each individual option
+ * @see WPSEO_Option::register_setting()
+ */
+ function options_init() {
+ _deprecated_function( __METHOD__, 'WPSEO 1.5.0', 'WPSEO_Option::register_setting()' );
+ }
+
+ /**
+ * Initialize default values for a new multisite blog.
+ *
+ * @deprecated 1.5.0
+ * @deprecated use WPSEO_Options::set_multisite_defaults()
+ * @see WPSEO_Options::set_multisite_defaults()
+ */
+ function multisite_defaults() {
+ _deprecated_function( __METHOD__, 'WPSEO 1.5.0', 'WPSEO_Options::set_multisite_defaults()' );
+ WPSEO_Options::set_multisite_defaults();
+ }
+
+ /**
+ * Loads the form for the import/export page.
+ *
+ * @deprecated 1.5.0
+ * @deprecated use WPSEO_Admin::load_page()
+ */
+ function import_page() {
+ _deprecated_function( __METHOD__, 'WPSEO 1.5.0', 'WPSEO_Admin::load_page()' );
+ $this->load_page();
+ }
+
+ /**
+ * Loads the form for the titles & metas page.
+ *
+ * @deprecated 1.5.0
+ * @deprecated use WPSEO_Admin::load_page()
+ */
+ function titles_page() {
+ _deprecated_function( __METHOD__, 'WPSEO 1.5.0', 'WPSEO_Admin::load_page()' );
+ $this->load_page();
+ }
+
+ /**
+ * Loads the form for the permalinks page.
+ *
+ * @deprecated 1.5.0
+ * @deprecated use WPSEO_Admin::load_page()
+ */
+ function permalinks_page() {
+ _deprecated_function( __METHOD__, 'WPSEO 1.5.0', 'WPSEO_Admin::load_page()' );
+ $this->load_page();
+ }
+
+ /**
+ * Loads the form for the internal links / breadcrumbs page.
+ *
+ * @deprecated 1.5.0
+ * @deprecated use WPSEO_Admin::load_page()
+ */
+ function internallinks_page() {
+ _deprecated_function( __METHOD__, 'WPSEO 1.5.0', 'WPSEO_Admin::load_page()' );
+ $this->load_page();
+ }
+
+ /**
+ * Loads the form for the file edit page.
+ *
+ * @deprecated 1.5.0
+ * @deprecated use WPSEO_Admin::load_page()
+ */
+ function files_page() {
+ _deprecated_function( __METHOD__, 'WPSEO 1.5.0', 'WPSEO_Admin::load_page()' );
+ $this->load_page();
+ }
+
+ /**
+ * Loads the form for the RSS page.
+ *
+ * @deprecated 1.5.0
+ * @deprecated use WPSEO_Admin::load_page()
+ */
+ function rss_page() {
+ _deprecated_function( __METHOD__, 'WPSEO 1.5.0', 'WPSEO_Admin::load_page()' );
+ $this->load_page();
+ }
+
+ /**
+ * Loads the form for the XML Sitemaps page.
+ *
+ * @deprecated 1.5.0
+ * @deprecated use WPSEO_Admin::load_page()
+ */
+ function xml_sitemaps_page() {
+ _deprecated_function( __METHOD__, 'WPSEO 1.5.0', 'WPSEO_Admin::load_page()' );
+ $this->load_page();
+ }
+
+ /**
+ * Loads the form for the Dashboard page.
+ *
+ * @deprecated 1.5.0
+ * @deprecated use WPSEO_Admin::load_page()
+ */
+ function config_page() {
+ _deprecated_function( __METHOD__, 'WPSEO 1.5.0', 'WPSEO_Admin::load_page()' );
+ $this->load_page();
+ }
+
+ /**
+ * Loads the form for the Social Settings page.
+ *
+ * @deprecated 1.5.0
+ * @deprecated use WPSEO_Admin::load_page()
+ */
+ function social_page() {
+ _deprecated_function( __METHOD__, 'WPSEO 1.5.0', 'WPSEO_Admin::load_page()' );
+ $this->load_page();
+ }
+
+ } /* End of class */
+
+} /* End of class-exists wrapper */
diff --git a/wp-content/plugins/wordpress-seo/admin/class-bulk-description-editor-list-table.php b/wp-content/plugins/wordpress-seo/admin/class-bulk-description-editor-list-table.php
new file mode 100644
index 0000000..a2885ea
--- /dev/null
+++ b/wp-content/plugins/wordpress-seo/admin/class-bulk-description-editor-list-table.php
@@ -0,0 +1,480 @@
+ 'wpseo_bulk_description',
+ 'plural' => 'wpseo_bulk_descriptions',
+ 'ajax' => true,
+ )
+ );
+
+ $this->populate_editable_post_types();
+
+ }
+
+ /*
+ * Used in the constructor to build a reference list of post types the current user can edit.
+ */
+ private function populate_editable_post_types() {
+ $post_types = get_post_types( array( 'public' => true, 'exclude_from_search' => false ), 'object' );
+
+ $this->all_posts = array();
+ $this->own_posts = array();
+
+ if ( is_array( $post_types ) && $post_types !== array() ) {
+ foreach ( $post_types as $post_type ) {
+ if ( ! current_user_can( $post_type->cap->edit_posts ) ) {
+ continue;
+ }
+
+ if ( current_user_can( $post_type->cap->edit_others_posts ) ) {
+ $this->all_posts[] = esc_sql( $post_type->name );
+ }
+ else {
+ $this->own_posts[] = esc_sql( $post_type->name );
+ }
+ }
+ }
+ }
+
+
+ /**
+ * @param $which
+ */
+ function display_tablenav( $which ) {
+ $post_status = '';
+ if ( ! empty( $_GET['post_status'] ) ) {
+ $post_status = sanitize_text_field( $_GET['post_status'] );
+ }
+ ?>
+
+
+
+
+
+
+
+ prepare(), passing the current user_id in as the first parameter.
+ */
+ function get_base_subquery() {
+ global $wpdb;
+
+ $all_posts_string = "'" . implode( "', '", $this->all_posts ) . "'";
+ $own_posts_string = "'" . implode( "', '", $this->own_posts ) . "'";
+
+ $subquery = "(
+ SELECT *
+ FROM {$wpdb->posts}
+ WHERE post_type IN ({$all_posts_string})
+ UNION ALL
+ SELECT *
+ FROM {$wpdb->posts}
+ WHERE post_type IN ({$own_posts_string}) AND post_author = %d
+ )sub_base";
+
+ return $subquery;
+ }
+
+
+ /**
+ * @return array
+ */
+ function get_views() {
+ global $wpdb;
+
+ $status_links = array();
+
+ $states = get_post_stati( array( 'show_in_admin_all_list' => true ) );
+ $states['trash'] = 'trash';
+ $states = esc_sql( $states );
+ $all_states = "'" . implode( "', '", $states ) . "'";
+
+ $subquery = $this->get_base_subquery();
+ $current_user_id = get_current_user_id();
+
+ $total_posts = $wpdb->get_var(
+ $wpdb->prepare(
+ "
+ SELECT COUNT(*) FROM {$subquery}
+ WHERE post_status IN ({$all_states})
+ ",
+ $current_user_id
+ )
+ );
+
+
+ $class = empty( $_GET['post_status'] ) ? ' class="current"' : '';
+ $status_links['all'] = '
' . sprintf( _nx( 'All (%s) ', 'All (%s) ', $total_posts, 'posts', 'wordpress-seo' ), number_format_i18n( $total_posts ) ) . ' ';
+
+ $post_stati = get_post_stati( array( 'show_in_admin_all_list' => true ), 'objects' );
+ if ( is_array( $post_stati ) && $post_stati !== array() ) {
+ foreach ( $post_stati as $status ) {
+
+ $status_name = esc_sql( $status->name );
+
+ $total = $wpdb->get_var(
+ $wpdb->prepare(
+ "
+ SELECT COUNT(*) FROM {$subquery}
+ WHERE post_status = %s
+ ",
+ $current_user_id,
+ $status_name
+ )
+ );
+
+ if ( $total == 0 ) {
+ continue;
+ }
+
+ $class = '';
+ if ( isset( $_GET['post_status'] ) && $status_name == $_GET['post_status'] ) {
+ $class = ' class="current"';
+ }
+
+ $status_links[ $status_name ] = '
' . sprintf( translate_nooped_plural( $status->label_count, $total ), number_format_i18n( $total ) ) . ' ';
+
+ }
+ }
+ unset( $post_stati, $status, $status_name, $total, $class );
+
+ $trashed_posts = $wpdb->get_var(
+ $wpdb->prepare(
+ "
+ SELECT COUNT(*) FROM {$subquery}
+ WHERE post_status IN ('trash')
+ ",
+ $current_user_id
+ )
+ );
+
+ $class = ( isset( $_GET['post_status'] ) && 'trash' == $_GET['post_status'] ) ? 'class="current"' : '';
+ $status_links['trash'] = '
' . sprintf( _nx( 'Trash (%s) ', 'Trash (%s) ', $trashed_posts, 'posts', 'wordpress-seo' ), number_format_i18n( $trashed_posts ) ) . ' ';
+
+ return $status_links;
+ }
+
+
+ /**
+ * @param $which
+ */
+ function extra_tablenav( $which ) {
+
+ if ( 'top' === $which ) {
+ $post_types = get_post_types( array( 'public' => true, 'exclude_from_search' => false ) );
+
+ if ( is_array( $post_types ) && $post_types !== array() ) {
+ global $wpdb;
+
+ echo '
';
+
+ $post_types = esc_sql( $post_types );
+ $post_types = "'" . implode( "', '", $post_types ) . "'";
+
+ $states = get_post_stati( array( 'show_in_admin_all_list' => true ) );
+ $states['trash'] = 'trash';
+ $states = esc_sql( $states );
+ $all_states = "'" . implode( "', '", $states ) . "'";
+
+ $subquery = $this->get_base_subquery();
+ $current_user_id = get_current_user_id();
+
+ $post_types = $wpdb->get_results(
+ $wpdb->prepare(
+ "
+ SELECT DISTINCT post_type FROM {$subquery}
+ WHERE post_status IN ({$all_states})
+ ORDER BY 'post_type' ASC
+ ",
+ $current_user_id
+ )
+ );
+
+ $selected = ! empty( $_GET['post_type_filter'] ) ? sanitize_text_field( $_GET['post_type_filter'] ) : -1;
+
+ $options = 'Show All Post Types ';
+
+ if ( is_array( $post_types ) && $post_types !== array() ) {
+ foreach ( $post_types as $post_type ) {
+ $obj = get_post_type_object( $post_type->post_type );
+ $options .= sprintf( '%1$s ', $obj->labels->name, $post_type->post_type, selected( $selected, $post_type->post_type, false ) );
+ }
+ }
+
+ echo sprintf( '%1$s ', $options );
+ submit_button( __( 'Filter', 'wordpress-seo' ), 'button', false, false, array( 'id' => 'post-query-submit' ) );
+ echo '
';
+ }
+ }
+ elseif ( 'bottom' === $which ) {
+
+ }
+
+ }
+
+
+ /**
+ * @return array
+ */
+ function get_columns() {
+ return $columns = array(
+ 'col_page_title' => __( 'WP Page Title', 'wordpress-seo' ),
+ 'col_post_type' => __( 'Post Type', 'wordpress-seo' ),
+ 'col_post_status' => __( 'Post Status', 'wordpress-seo' ),
+ 'col_page_slug' => __( 'Page URL/Slug', 'wordpress-seo' ),
+ 'col_existing_yoast_seo_metadesc' => __( 'Existing Yoast Meta Description', 'wordpress-seo' ),
+ 'col_new_yoast_seo_metadesc' => __( 'New Yoast Meta Description', 'wordpress-seo' ),
+ 'col_row_action' => __( 'Action', 'wordpress-seo' ),
+ );
+ }
+
+
+ /**
+ * @return array
+ */
+ function get_sortable_columns() {
+ return $sortable = array(
+ 'col_page_title' => array( 'post_title', true ),
+ 'col_post_type' => array( 'post_type', false ),
+ 'col_existing_yoast_seo_metadesc' => array( 'meta_desc', false )
+ );
+ }
+
+ function prepare_items() {
+ global $wpdb;
+
+ // Filter Block
+
+ $post_types = null;
+ $post_type_clause = '';
+
+ if ( ! empty( $_GET['post_type_filter'] ) && get_post_type_object( sanitize_text_field( $_GET['post_type_filter'] ) ) ) {
+ $post_types = esc_sql( sanitize_text_field( $_GET['post_type_filter'] ) );
+ $post_type_clause = "AND post_type IN ('{$post_types}')";
+ }
+
+ // Order By block
+
+ $orderby = ! empty( $_GET['orderby'] ) ? esc_sql( sanitize_text_field( $_GET['orderby'] ) ) : 'post_title';
+ $order = 'ASC';
+
+ if ( ! empty( $_GET['order'] ) ) {
+ $order = esc_sql( strtoupper( sanitize_text_field( $_GET['order'] ) ) );
+ }
+
+ $states = get_post_stati( array( 'show_in_admin_all_list' => true ) );
+ $states['trash'] = 'trash';
+
+ if ( ! empty( $_GET['post_status'] ) ) {
+ $requested_state = sanitize_text_field( $_GET['post_status'] );
+ if ( in_array( $requested_state, $states ) ) {
+ $states = array( $requested_state );
+ }
+ }
+
+ $states = esc_sql( $states );
+ $all_states = "'" . implode( "', '", $states ) . "'";
+
+ $subquery = $this->get_base_subquery();
+ $current_user_id = get_current_user_id();
+
+ $query = "
+ SELECT ID, post_title, post_type, meta_value AS meta_desc, post_status, post_modified
+ FROM {$subquery}
+ LEFT JOIN (
+ SELECT *
+ FROM {$wpdb->postmeta}
+ WHERE meta_key = %s
+ )a ON a.post_id = ID
+ WHERE post_status IN ({$all_states}) $post_type_clause
+ ORDER BY {$orderby} {$order}
+ ";
+
+ $total_items = $wpdb->query(
+ $wpdb->prepare(
+ $query,
+ $current_user_id,
+ WPSEO_Meta::$meta_prefix . 'metadesc'
+ )
+ );
+
+ $query .= ' LIMIT %d,%d';
+
+ $per_page = $this->get_items_per_page( 'wpseo_posts_per_page', 10 );
+
+ $paged = ! empty( $_GET['paged'] ) ? esc_sql( sanitize_text_field( $_GET['paged'] ) ) : '';
+
+ if ( empty( $paged ) || ! is_numeric( $paged ) || $paged <= 0 ) {
+ $paged = 1;
+ }
+
+ $total_pages = ceil( $total_items / $per_page );
+
+ $offset = ( $paged - 1 ) * $per_page;
+
+ $this->set_pagination_args(
+ array(
+ 'total_items' => $total_items,
+ 'total_pages' => $total_pages,
+ 'per_page' => $per_page,
+ )
+ );
+
+ $columns = $this->get_columns();
+ $hidden = array();
+ $sortable = $this->get_sortable_columns();
+ $this->_column_headers = array( $columns, $hidden, $sortable );
+
+ $this->items = $wpdb->get_results(
+ $wpdb->prepare(
+ $query,
+ $current_user_id,
+ WPSEO_Meta::$meta_prefix . 'metadesc',
+ $offset,
+ $per_page
+ )
+ );
+
+ }
+
+ function display_rows() {
+
+ $records = $this->items;
+
+ list( $columns, $hidden ) = $this->get_column_info();
+
+ if ( ( is_array( $records ) && $records !== array() ) && ( is_array( $columns ) && $columns !== array() ) ) {
+ foreach ( $records as $rec ) {
+ echo '
';
+
+ foreach ( $columns as $column_name => $column_display_name ) {
+
+ $class = sprintf( 'class="%1$s column-%1$s"', $column_name );
+ $style = '';
+
+ if ( in_array( $column_name, $hidden ) ) {
+ $style = ' style="display:none;"';
+ }
+
+ $attributes = $class . $style;
+
+ switch ( $column_name ) {
+ case 'col_page_title':
+ echo sprintf( '%1$s ', stripslashes( $rec->post_title ), $attributes );
+
+ $post_type_object = get_post_type_object( $rec->post_type );
+ $can_edit_post = current_user_can( $post_type_object->cap->edit_post, $rec->ID );
+
+ $actions = array();
+
+ if ( $can_edit_post && 'trash' != $rec->post_status ) {
+ $actions['edit'] = '' . __( 'Edit', 'wordpress-seo' ) . ' ';
+ }
+
+ if ( $post_type_object->public ) {
+ if ( in_array( $rec->post_status, array( 'pending', 'draft', 'future' ) ) ) {
+ if ( $can_edit_post ) {
+ $actions['view'] = '' . __( 'Preview', 'wordpress-seo' ) . ' ';
+ }
+ }
+ elseif ( 'trash' != $rec->post_status ) {
+ $actions['view'] = '' . __( 'View', 'wordpress-seo' ) . ' ';
+ }
+ }
+
+ echo $this->row_actions( $actions );
+
+ echo '%1$s %1$s ', $post_type->labels->singular_name, $attributes );
+ break;
+
+ case 'col_post_status':
+ $post_status = get_post_status_object( $rec->post_status );
+ echo sprintf( '%1$s ', $post_status->label, $attributes );
+ break;
+
+ case 'col_existing_yoast_seo_metadesc':
+ echo sprintf( '%1$s ', ( ($rec->meta_desc ) ? $rec->meta_desc : '' ), $attributes, $rec->ID );
+ break;
+
+ case 'col_new_yoast_seo_metadesc':
+ $input = sprintf( '', 'wpseo-new-metadesc-' . $rec->ID, $rec->ID );
+ echo sprintf( '%1$s ', $input, $attributes );
+ break;
+
+ case 'col_row_action':
+ $actions = sprintf( 'Save | Save All ', $rec->ID );
+ echo sprintf( '%1$s ', $actions, $attributes );
+ break;
+ }
+ }
+
+ echo ' ';
+ }
+ }
+ }
+ } /* End of class */
+} /* End of class-exists wrapper */
diff --git a/wp-content/plugins/wordpress-seo/admin/class-bulk-title-editor-list-table.php b/wp-content/plugins/wordpress-seo/admin/class-bulk-title-editor-list-table.php
new file mode 100644
index 0000000..8f1208e
--- /dev/null
+++ b/wp-content/plugins/wordpress-seo/admin/class-bulk-title-editor-list-table.php
@@ -0,0 +1,478 @@
+ 'wpseo_bulk_title',
+ 'plural' => 'wpseo_bulk_titles',
+ 'ajax' => true,
+ )
+ );
+
+ $this->populate_editable_post_types();
+
+ }
+
+ /*
+ * Used in the constructor to build a reference list of post types the current user can edit.
+ */
+ private function populate_editable_post_types() {
+ $post_types = get_post_types( array( 'public' => true, 'exclude_from_search' => false ), 'object' );
+
+ $this->all_posts = array();
+ $this->own_posts = array();
+
+ if ( is_array( $post_types ) && $post_types !== array() ) {
+ foreach ( $post_types as $post_type ) {
+ if ( ! current_user_can( $post_type->cap->edit_posts ) ) {
+ continue;
+ }
+
+ if ( current_user_can( $post_type->cap->edit_others_posts ) ) {
+ $this->all_posts[] = esc_sql( $post_type->name );
+ }
+ else {
+ $this->own_posts[] = esc_sql( $post_type->name );
+ }
+ }
+ }
+ }
+
+
+ /**
+ * @param $which
+ */
+ function display_tablenav( $which ) {
+ $post_status = '';
+ if ( ! empty( $_GET['post_status'] ) ) {
+ $post_status = sanitize_text_field( $_GET['post_status'] );
+ }
+ ?>
+
+
+
+
+
+
+
+ prepare(), passing the current user_id in as the first parameter.
+ */
+ function get_base_subquery() {
+ global $wpdb;
+
+ $all_posts_string = "'" . implode( "', '", $this->all_posts ) . "'";
+ $own_posts_string = "'" . implode( "', '", $this->own_posts ) . "'";
+
+ $subquery = "(
+ SELECT *
+ FROM {$wpdb->posts}
+ WHERE post_type IN ({$all_posts_string})
+ UNION ALL
+ SELECT *
+ FROM {$wpdb->posts}
+ WHERE post_type IN ({$own_posts_string}) AND post_author = %d
+ )sub_base";
+
+ return $subquery;
+ }
+
+
+ /**
+ * @return array
+ */
+ function get_views() {
+ global $wpdb;
+
+ $status_links = array();
+
+ $states = get_post_stati( array( 'show_in_admin_all_list' => true ) );
+ $states['trash'] = 'trash';
+ $states = esc_sql( $states );
+ $all_states = "'" . implode( "', '", $states ) . "'";
+
+ $subquery = $this->get_base_subquery();
+ $current_user_id = get_current_user_id();
+
+ $total_posts = $wpdb->get_var(
+ $wpdb->prepare(
+ "
+ SELECT COUNT(*) FROM {$subquery}
+ WHERE post_status IN ({$all_states})
+ ",
+ $current_user_id
+ )
+ );
+
+
+ $class = empty( $_GET['post_status'] ) ? ' class="current"' : '';
+ $status_links['all'] = '
' . sprintf( _nx( 'All (%s) ', 'All (%s) ', $total_posts, 'posts', 'wordpress-seo' ), number_format_i18n( $total_posts ) ) . ' ';
+
+ $post_stati = get_post_stati( array( 'show_in_admin_all_list' => true ), 'objects' );
+ if ( is_array( $post_stati ) && $post_stati !== array() ) {
+ foreach ( $post_stati as $status ) {
+
+ $status_name = esc_sql( $status->name );
+
+ $total = $wpdb->get_var(
+ $wpdb->prepare(
+ "
+ SELECT COUNT(*) FROM {$subquery}
+ WHERE post_status = %s
+ ",
+ $current_user_id,
+ $status_name
+ )
+ );
+
+ if ( $total == 0 ) {
+ continue;
+ }
+
+ $class = '';
+ if ( isset( $_GET['post_status'] ) && $status_name == $_GET['post_status'] ) {
+ $class = ' class="current"';
+ }
+
+ $status_links[ $status_name ] = '
' . sprintf( translate_nooped_plural( $status->label_count, $total ), number_format_i18n( $total ) ) . ' ';
+ }
+ }
+ unset( $post_stati, $status, $status_name, $total, $class );
+
+ $trashed_posts = $wpdb->get_var(
+ $wpdb->prepare(
+ "
+ SELECT COUNT(*) FROM {$subquery}
+ WHERE post_status IN ('trash')
+ ",
+ $current_user_id
+ )
+ );
+
+ $class = ( isset( $_GET['post_status'] ) && 'trash' == $_GET['post_status'] ) ? 'class="current"' : '';
+ $status_links['trash'] = '
' . sprintf( _nx( 'Trash (%s) ', 'Trash (%s) ', $trashed_posts, 'posts', 'wordpress-seo' ), number_format_i18n( $trashed_posts ) ) . ' ';
+
+ return $status_links;
+ }
+
+
+ /**
+ * @param $which
+ */
+ function extra_tablenav( $which ) {
+
+ if ( 'top' === $which ) {
+ $post_types = get_post_types( array( 'public' => true, 'exclude_from_search' => false ) );
+
+ if ( is_array( $post_types ) && $post_types !== array() ) {
+ global $wpdb;
+
+ echo '
';
+
+ $post_types = esc_sql( $post_types );
+ $post_types = "'" . implode( "', '", $post_types ) . "'";
+
+ $states = get_post_stati( array( 'show_in_admin_all_list' => true ) );
+ $states['trash'] = 'trash';
+ $states = esc_sql( $states );
+ $all_states = "'" . implode( "', '", $states ) . "'";
+
+ $subquery = $this->get_base_subquery();
+ $current_user_id = get_current_user_id();
+
+ $post_types = $wpdb->get_results(
+ $wpdb->prepare(
+ "
+ SELECT DISTINCT post_type FROM {$subquery}
+ WHERE post_status IN ({$all_states})
+ ORDER BY 'post_type' ASC
+ ",
+ $current_user_id
+ )
+ );
+
+ $selected = ! empty( $_GET['post_type_filter'] ) ? sanitize_text_field( $_GET['post_type_filter'] ) : -1;
+
+ $options = 'Show All Post Types ';
+
+ if ( is_array( $post_types ) && $post_types !== array() ) {
+ foreach ( $post_types as $post_type ) {
+ $obj = get_post_type_object( $post_type->post_type );
+ $options .= sprintf( '%1$s ', $obj->labels->name, $post_type->post_type, selected( $selected, $post_type->post_type, false ) );
+ }
+ }
+
+ echo sprintf( '%1$s ', $options );
+ submit_button( __( 'Filter', 'wordpress-seo' ), 'button', false, false, array( 'id' => 'post-query-submit' ) );
+ echo '
';
+ }
+ }
+ elseif ( 'bottom' === $which ) {
+
+ }
+
+ }
+
+
+ /**
+ * @return array
+ */
+ function get_columns() {
+ return $columns = array(
+ 'col_page_title' => __( 'WP Page Title', 'wordpress-seo' ),
+ 'col_post_type' => __( 'Post Type', 'wordpress-seo' ),
+ 'col_post_status' => __( 'Post Status', 'wordpress-seo' ),
+ 'col_page_slug' => __( 'Page URL/Slug', 'wordpress-seo' ),
+ 'col_existing_yoast_seo_title' => __( 'Existing Yoast SEO Title', 'wordpress-seo' ),
+ 'col_new_yoast_seo_title' => __( 'New Yoast SEO Title', 'wordpress-seo' ),
+ 'col_row_action' => __( 'Action', 'wordpress-seo' ),
+ );
+ }
+
+
+ /**
+ * @return array
+ */
+ function get_sortable_columns() {
+ return $sortable = array(
+ 'col_page_title' => array( 'post_title', true ),
+ 'col_post_type' => array( 'post_type', false ),
+ 'col_existing_yoast_seo_title' => array( 'seo_title', false ),
+ );
+ }
+
+ function prepare_items() {
+ global $wpdb;
+
+ // Filter Block
+
+ $post_types = null;
+ $post_type_clause = '';
+
+ if ( ! empty( $_GET['post_type_filter'] ) && get_post_type_object( sanitize_text_field( $_GET['post_type_filter'] ) ) ) {
+ $post_types = esc_sql( sanitize_text_field( $_GET['post_type_filter'] ) );
+ $post_type_clause = "AND post_type IN ('{$post_types}')";
+ }
+
+ // Order By block
+
+ $orderby = ! empty( $_GET['orderby'] ) ? esc_sql( sanitize_text_field( $_GET['orderby'] ) ) : 'post_title';
+ $order = 'ASC';
+
+ if ( ! empty( $_GET['order'] ) ) {
+ $order = esc_sql( strtoupper( sanitize_text_field( $_GET['order'] ) ) );
+ }
+
+ $states = get_post_stati( array( 'show_in_admin_all_list' => true ) );
+ $states['trash'] = 'trash';
+
+ if ( ! empty( $_GET['post_status'] ) ) {
+ $requested_state = sanitize_text_field( $_GET['post_status'] );
+ if ( in_array( $requested_state, $states ) ) {
+ $states = array( $requested_state );
+ }
+ }
+
+ $states = esc_sql( $states );
+ $all_states = "'" . implode( "', '", $states ) . "'";
+
+ $subquery = $this->get_base_subquery();
+ $current_user_id = get_current_user_id();
+
+ $query = "
+ SELECT ID, post_title, post_type, meta_value AS seo_title, post_status, post_modified
+ FROM {$subquery}
+ LEFT JOIN (
+ SELECT *
+ FROM {$wpdb->postmeta}
+ WHERE meta_key = %s
+ )a ON a.post_id = ID
+ WHERE post_status IN ({$all_states}) $post_type_clause
+ ORDER BY {$orderby} {$order}
+ ";
+
+ $total_items = $wpdb->query(
+ $wpdb->prepare(
+ $query,
+ $current_user_id,
+ WPSEO_Meta::$meta_prefix . 'title'
+ )
+ );
+
+ $query .= ' LIMIT %d,%d';
+
+ $per_page = $this->get_items_per_page( 'wpseo_posts_per_page', 10 );
+
+ $paged = ! empty( $_GET['paged'] ) ? esc_sql( sanitize_text_field( $_GET['paged'] ) ) : '';
+
+ if ( empty( $paged ) || ! is_numeric( $paged ) || $paged <= 0 ) {
+ $paged = 1;
+ }
+
+ $total_pages = ceil( $total_items / $per_page );
+
+ $offset = ( $paged - 1 ) * $per_page;
+
+ $this->set_pagination_args(
+ array(
+ 'total_items' => $total_items,
+ 'total_pages' => $total_pages,
+ 'per_page' => $per_page,
+ )
+ );
+
+ $columns = $this->get_columns();
+ $hidden = array();
+ $sortable = $this->get_sortable_columns();
+ $this->_column_headers = array( $columns, $hidden, $sortable );
+
+ $this->items = $wpdb->get_results(
+ $wpdb->prepare(
+ $query,
+ $current_user_id,
+ WPSEO_Meta::$meta_prefix . 'title',
+ $offset,
+ $per_page
+ )
+ );
+
+ }
+
+ function display_rows() {
+
+ $records = $this->items;
+
+ list( $columns, $hidden ) = $this->get_column_info();
+
+ if ( ( is_array( $records ) && $records !== array() ) && ( is_array( $columns ) && $columns !== array() ) ) {
+ foreach ( $records as $rec ) {
+ echo '
';
+
+ foreach ( $columns as $column_name => $column_display_name ) {
+
+ $class = sprintf( 'class="%1$s column-%1$s"', $column_name );
+ $style = '';
+
+ if ( in_array( $column_name, $hidden ) ) {
+ $style = ' style="display:none;"';
+ }
+
+ $attributes = $class . $style;
+
+ switch ( $column_name ) {
+ case 'col_page_title':
+ echo sprintf( '%1$s ', stripslashes( $rec->post_title ), $attributes );
+
+ $post_type_object = get_post_type_object( $rec->post_type );
+ $can_edit_post = current_user_can( $post_type_object->cap->edit_post, $rec->ID );
+
+ $actions = array();
+
+ if ( $can_edit_post && 'trash' != $rec->post_status ) {
+ $actions['edit'] = '' . __( 'Edit', 'wordpress-seo' ) . ' ';
+ }
+
+ if ( $post_type_object->public ) {
+ if ( in_array( $rec->post_status, array( 'pending', 'draft', 'future' ) ) ) {
+ if ( $can_edit_post ) {
+ $actions['view'] = '' . __( 'Preview', 'wordpress-seo' ) . ' ';
+ }
+ }
+ elseif ( 'trash' != $rec->post_status ) {
+ $actions['view'] = '' . __( 'View', 'wordpress-seo' ) . ' ';
+ }
+ }
+
+ echo $this->row_actions( $actions );
+ echo '%1$s %1$s ', $post_type->labels->singular_name, $attributes );
+ break;
+
+ case 'col_post_status':
+ $post_status = get_post_status_object( $rec->post_status );
+ echo sprintf( '%1$s ', $post_status->label, $attributes );
+ break;
+
+ case 'col_existing_yoast_seo_title':
+ echo sprintf( '%1$s ', ( ($rec->seo_title ) ? $rec->seo_title : '' ), $attributes, $rec->ID );
+ break;
+
+ case 'col_new_yoast_seo_title':
+ $input = sprintf( '%1$s ', $input, $attributes );
+ break;
+
+ case 'col_row_action':
+ $actions = sprintf( 'Save | Save All ', $rec->ID );
+ echo sprintf( '%1$s ', $actions, $attributes );
+ break;
+ }
+ }
+
+ echo ' ';
+ }
+ }
+ }
+ } /* End of class */
+} /* End of class-exists wrapper */
diff --git a/wp-content/plugins/wordpress-seo/admin/class-config.php b/wp-content/plugins/wordpress-seo/admin/class-config.php
index 8537528..ead7816 100644
--- a/wp-content/plugins/wordpress-seo/admin/class-config.php
+++ b/wp-content/plugins/wordpress-seo/admin/class-config.php
@@ -3,547 +3,663 @@
* @package Admin
*/
-if ( !defined( 'WPSEO_VERSION' ) ) {
- header( 'HTTP/1.0 403 Forbidden' );
- die;
+if ( ! defined( 'WPSEO_VERSION' ) ) {
+ header( 'Status: 403 Forbidden' );
+ header( 'HTTP/1.1 403 Forbidden' );
+ exit();
}
-/**
- * class WPSEO_Admin_Pages
- *
- * Class with functionality for the WP SEO admin pages.
- */
-class WPSEO_Admin_Pages {
+if ( ! class_exists( 'WPSEO_Admin_Pages' ) ) {
/**
- * @var string $currentoption The option in use for the current admin page.
+ * class WPSEO_Admin_Pages
+ *
+ * Class with functionality for the WP SEO admin pages.
*/
- var $currentoption = 'wpseo';
+ class WPSEO_Admin_Pages {
- /**
- * @var array $adminpages Array of admin pages that the plugin uses.
- */
- var $adminpages = array( 'wpseo_dashboard', 'wpseo_rss', 'wpseo_files', 'wpseo_permalinks', 'wpseo_internal-links', 'wpseo_import', 'wpseo_titles', 'wpseo_xml', 'wpseo_social' );
+ /**
+ * @var string $currentoption The option in use for the current admin page.
+ */
+ var $currentoption = 'wpseo';
- /**
- * Class constructor, which basically only hooks the init function on the init hook
- */
- function __construct() {
- add_action( 'init', array( $this, 'init' ), 20 );
- }
-
- /**
- * Make sure the needed scripts are loaded for admin pages
- */
- function init() {
- if ( isset( $_GET['wpseo_reset_defaults'] ) && wp_verify_nonce( $_GET['nonce'], 'wpseo_reset_defaults' ) && current_user_can( 'manage_options' ) ) {
- $this->reset_defaults();
- wp_redirect( admin_url( 'admin.php?page=wpseo_dashboard' ) );
- }
-
- $this->adminpages = apply_filters( 'wpseo_admin_pages', $this->adminpages );
-
- global $wpseo_admin;
-
- if ( $wpseo_admin->grant_access() ) {
- add_action( 'admin_print_scripts', array( $this, 'config_page_scripts' ) );
- add_action( 'admin_print_styles', array( $this, 'config_page_styles' ) );
- }
- }
-
- /**
- * Resets the site to the default WordPress SEO settings and runs a title test to check whether force rewrite needs to be on.
- */
- function reset_defaults() {
- foreach ( get_wpseo_options_arr() as $opt ) {
- delete_option( $opt );
- }
- wpseo_defaults();
-
- wpseo_title_test();
- }
-
- /**
- * Generates the sidebar for admin pages.
- */
- function admin_sidebar() {
- $banners = array(
- array(
- 'url' => 'https://yoast.com/hire-us/website-review/#utm_source=wordpress-seo-config&utm_medium=banner&utm_campaign=website-review-banner',
- 'img' => 'banner-website-review.png',
- 'alt' => 'Website Review banner',
- )
+ /**
+ * @var array $adminpages Array of admin pages that the plugin uses.
+ */
+ var $adminpages = array(
+ 'wpseo_dashboard',
+ 'wpseo_rss',
+ 'wpseo_files',
+ 'wpseo_permalinks',
+ 'wpseo_internal-links',
+ 'wpseo_import',
+ 'wpseo_titles',
+ 'wpseo_xml',
+ 'wpseo_social',
+ 'wpseo_bulk-title-editor',
+ 'wpseo_bulk-description-editor',
+ 'wpseo_licenses',
+ 'wpseo_network_licenses',
);
- if ( 'nl_NL' == get_locale() ) {
- $rand = rand( 1, 2 );
- switch ( $rand ) {
- case 1:
- $banners[] = array(
- 'url' => 'http://yoast.nl/seo-trainingen/wordpress-seo-training//#utm_source=wordpress-seo-config&utm_medium=banner&utm_campaign=wpseo-training-banner&utm_content=prijs',
- 'img' => 'banner-wpseo-training.png',
- 'alt' => 'WordPress SEO Training banner',
- );
- break;
- case 2:
- $banners[] = array(
- 'url' => 'http://yoast.nl/seo-trainingen/wordpress-seo-training//#utm_source=wordpress-seo-config&utm_medium=banner&utm_campaign=wpseo-training-banner&utm_content=klik-hier',
- 'img' => 'banner-wpseo-training-2.png',
- 'alt' => 'WordPress SEO Training banner',
- );
- break;
+
+ /**
+ * Class constructor, which basically only hooks the init function on the init hook
+ */
+ function __construct() {
+ add_action( 'init', array( $this, 'init' ), 20 );
+ }
+
+ /**
+ * Make sure the needed scripts are loaded for admin pages
+ */
+ function init() {
+ if ( isset( $_GET['wpseo_reset_defaults'] ) && wp_verify_nonce( $_GET['nonce'], 'wpseo_reset_defaults' ) && current_user_can( 'manage_options' ) ) {
+ WPSEO_Options::reset();
+ wp_redirect( admin_url( 'admin.php?page=wpseo_dashboard' ) );
+ }
+
+ $this->adminpages = apply_filters( 'wpseo_admin_pages', $this->adminpages );
+
+ if ( WPSEO_Options::grant_access() ) {
+ add_action( 'admin_enqueue_scripts', array( $this, 'config_page_scripts' ) );
+ add_action( 'admin_enqueue_scripts', array( $this, 'config_page_styles' ) );
}
}
- if ( !class_exists( 'wpseo_Video_Sitemap' ) ) {
- $banners[] = array(
- 'url' => 'http://yoast.com/wordpress/video-seo/#utm_source=wordpress-seo-config&utm_medium=banner&utm_campaign=video-seo-banner',
- 'img' => 'banner-video-seo.png',
- 'alt' => 'Banner WordPress SEO Video SEO extension',
- );
- }
- if ( !class_exists( 'wpseo_Video_Manual' ) ) {
- $banners[] = array(
- 'url' => 'http://yoast.com/wordpress/video-manual-wordpress-seo/#utm_source=wordpress-seo-config&utm_medium=banner&utm_campaign=video-manual-banner',
- 'img' => 'banner-video-seo-manual.png',
- 'alt' => 'Banner WordPress SEO Video manual',
- );
- }
- if ( !defined( 'WPSEO_LOCAL_VERSION' ) ) {
- $banners[] = array(
- 'url' => 'http://yoast.com/wordpress/local-seo/#utm_source=wordpress-seo-config&utm_medium=banner&utm_campaign=local-seo-banner',
- 'img' => 'banner-local-seo.png',
- 'alt' => 'Banner Local SEO plugin',
- );
- }
- shuffle( $banners );
- ?>
-
-
-
-
' . esc_html( $msg ) . '.
';
}
- ?>
-
-
-
-
-
-
-
';
- /**
- * Exports the current site's WP SEO settings.
- *
- * @param bool $include_taxonomy Whether to include the taxonomy metadata the plugin creates.
- * @return bool|string $return False when failed, the URL to the export file when succeeded.
- */
- function export_settings( $include_taxonomy ) {
- $content = "; " . __( "This is a settings export file for the WordPress SEO plugin by Yoast.com", 'wordpress-seo' ) . " - http://yoast.com/wordpress/seo/ \r\n";
+ if ( $show_sidebar ) {
+ $this->admin_sidebar();
+ }
- $optarr = get_wpseo_options_arr();
+ echo '
';
- foreach ( $optarr as $optgroup ) {
- $content .= "\n" . '[' . $optgroup . ']' . "\n";
- $options = get_option( $optgroup );
- if ( !is_array( $options ) )
- continue;
- foreach ( $options as $key => $elem ) {
- if ( is_array( $elem ) ) {
- for ( $i = 0; $i < count( $elem ); $i++ ) {
- $content .= $key . "[] = \"" . $elem[$i] . "\"\n";
+
+ /* Add the current settings array to the page for debugging purposes,
+ but not for a limited set of pages were it wouldn't make sense */
+ $excluded = array(
+ 'wpseo_import',
+ 'wpseo_files',
+ 'bulk_title_editor_page',
+ 'bulk_description_editor_page',
+ );
+
+ if ( ( WP_DEBUG === true || ( defined( 'WPSEO_DEBUG' ) && WPSEO_DEBUG === true ) ) && isset( $_GET['page'] ) && ! in_array( $_GET['page'], $excluded, true ) ) {
+ $xdebug = ( extension_loaded( 'xdebug' ) ? true : false );
+ echo '
+
+
+
+
' . __( 'Debug Information', 'wordpress-seo' ) . '
+
+
' . esc_html( __( 'Current option:', 'wordpress-seo' ) ) . ' ' . esc_html( $this->currentoption ) . '
+ ' . ( $xdebug ? '' : '
' );
+ var_dump( $this->get_option( $this->currentoption ) );
+ echo '
+ ' . ( $xdebug ? '' : ' ' ) . '
+
+
+
';
+ }
+
+ echo '
+
';
+ }
+
+ /**
+ * Deletes all post meta values with a given meta key from the database
+ *
+ * @todo [JRF => whomever] This method does not seem to be used anywhere. Double-check before removal.
+ *
+ * @param string $meta_key Key to delete all meta values for.
+ */
+ /*function delete_meta( $meta_key ) {
+ global $wpdb;
+ $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->postmeta WHERE meta_key = %s", $meta_key ) );
+ }*/
+
+ /**
+ * Exports the current site's WP SEO settings.
+ *
+ * @param bool $include_taxonomy Whether to include the taxonomy metadata the plugin creates.
+ * @return bool|string $return False when failed, the URL to the export file when succeeded.
+ */
+ function export_settings( $include_taxonomy ) {
+ $content = '; ' . __( 'This is a settings export file for the WordPress SEO plugin by Yoast.com', 'wordpress-seo' ) . " - https://yoast.com/wordpress/plugins/seo/ \r\n";
+
+ $optarr = WPSEO_Options::get_option_names();
+
+ foreach ( $optarr as $optgroup ) {
+ $content .= "\n" . '[' . $optgroup . ']' . "\n";
+ $options = get_option( $optgroup );
+ if ( ! is_array( $options ) ) {
+ continue;
+ }
+ foreach ( $options as $key => $elem ) {
+ if ( is_array( $elem ) ) {
+ $elm_count = count( $elem );
+ for ( $i = 0; $i < $elm_count; $i++ ) {
+ $content .= $key . '[] = "' . $elem[ $i ] . "\"\n";
+ }
}
- } else if ( $elem == "" )
- $content .= $key . " = \n";
- else
- $content .= $key . " = \"" . $elem . "\"\n";
+ elseif ( is_string( $elem ) && $elem == '' ) {
+ $content .= $key . " = \n";
+ }
+ elseif ( is_bool( $elem ) ) {
+ $content .= $key . ' = "' . ( ( $elem === true ) ? 'on' : 'off' ) . "\"\n";
+ }
+ else {
+ $content .= $key . ' = "' . $elem . "\"\n";
+ }
+ }
+ }
+
+ if ( $include_taxonomy ) {
+ $content .= "\r\n\r\n[wpseo_taxonomy_meta]\r\n";
+ $content .= 'wpseo_taxonomy_meta = "' . urlencode( json_encode( get_option( 'wpseo_taxonomy_meta' ) ) ) . '"';
+ }
+
+ $dir = wp_upload_dir();
+
+ if ( ! $handle = fopen( $dir['path'] . '/settings.ini', 'w' ) ) {
+ die();
+ }
+
+ if ( ! fwrite( $handle, $content ) ) {
+ die();
+ }
+
+ fclose( $handle );
+
+ chdir( $dir['path'] );
+ $zip = new PclZip( './settings.zip' );
+ if ( $zip->create( './settings.ini' ) == 0 ) {
+ return false;
+ }
+
+ return $dir['url'] . '/settings.zip';
+ }
+
+ /**
+ * Loads the required styles for the config page.
+ */
+ function config_page_styles() {
+ global $pagenow;
+ if ( $pagenow === 'admin.php' && isset( $_GET['page'] ) && in_array( $_GET['page'], $this->adminpages ) ) {
+ wp_enqueue_style( 'dashboard' );
+ wp_enqueue_style( 'thickbox' );
+ wp_enqueue_style( 'global' );
+ wp_enqueue_style( 'wp-admin' );
+ wp_enqueue_style( 'yoast-admin-css', plugins_url( 'css/yst_plugin_tools' . WPSEO_CSSJS_SUFFIX . '.css', WPSEO_FILE ), array(), WPSEO_VERSION );
+
+ if ( is_rtl() ) {
+ wp_enqueue_style( 'wpseo-rtl', plugins_url( 'css/wpseo-rtl' . WPSEO_CSSJS_SUFFIX . '.css', WPSEO_FILE ), array(), WPSEO_VERSION );
+ }
+ }
+
+ if ( $pagenow == 'admin.php' && isset( $_GET['page'] ) && in_array( $_GET['page'], array( 'wpseo_bulk-title-editor', 'wpseo_bulk-description-editor' ) ) ) {
+ wp_enqueue_style( 'yoast-admin-css', plugins_url( 'css/yst_plugin_tools' . WPSEO_CSSJS_SUFFIX . '.css', WPSEO_FILE ), array(), WPSEO_VERSION );
}
}
- if ( $include_taxonomy ) {
- $content .= "\r\n\r\n[wpseo_taxonomy_meta]\r\n";
- $content .= "wpseo_taxonomy_meta = \"" . urlencode( json_encode( get_option( 'wpseo_taxonomy_meta' ) ) ) . "\"";
+ /**
+ * Loads the required scripts for the config page.
+ */
+ function config_page_scripts() {
+ global $pagenow;
+
+ if ( $pagenow == 'admin.php' && isset( $_GET['page'] ) && in_array( $_GET['page'], $this->adminpages ) ) {
+ wp_enqueue_script( 'wpseo-admin-script', plugins_url( 'js/wp-seo-admin' . WPSEO_CSSJS_SUFFIX . '.js', WPSEO_FILE ), array( 'jquery' ), WPSEO_VERSION, true );
+ wp_enqueue_script( 'postbox' );
+ wp_enqueue_script( 'dashboard' );
+ wp_enqueue_script( 'thickbox' );
+ }
+
+ if ( $pagenow == 'admin.php' && isset( $_GET['page'] ) && in_array( $_GET['page'], array( 'wpseo_bulk-title-editor', 'wpseo_bulk-description-editor' ) ) ) {
+ wp_enqueue_script( 'wpseo-bulk-editor', plugins_url( 'js/wp-seo-bulk-editor' . WPSEO_CSSJS_SUFFIX . '.js', WPSEO_FILE ), array( 'jquery' ), WPSEO_VERSION, true );
+ }
}
- $dir = wp_upload_dir();
-
- if ( !$handle = fopen( $dir['path'] . '/settings.ini', 'w' ) )
- die();
-
- if ( !fwrite( $handle, $content ) )
- die();
-
- fclose( $handle );
-
- require_once ( ABSPATH . 'wp-admin/includes/class-pclzip.php' );
-
- chdir( $dir['path'] );
- $zip = new PclZip( './settings.zip' );
- if ( $zip->create( './settings.ini' ) == 0 )
- return false;
-
- return $dir['url'] . '/settings.zip';
- }
-
- /**
- * Loads the required styles for the config page.
- */
- function config_page_styles() {
- global $pagenow;
- if ( $pagenow == 'admin.php' && isset( $_GET['page'] ) && in_array( $_GET['page'], $this->adminpages ) ) {
- wp_enqueue_style( 'dashboard' );
- wp_enqueue_style( 'thickbox' );
- wp_enqueue_style( 'global' );
- wp_enqueue_style( 'wp-admin' );
- wp_enqueue_style( 'yoast-admin-css', WPSEO_URL . 'css/yst_plugin_tools.css', WPSEO_VERSION );
-
- if ( is_rtl() )
- wp_enqueue_style( 'wpseo-rtl', WPSEO_URL . 'css/wpseo-rtl.css', WPSEO_VERSION );
- }
- }
-
- /**
- * Loads the required scripts for the config page.
- */
- function config_page_scripts() {
- global $pagenow;
-
- if ( $pagenow == 'admin.php' && isset( $_GET['page'] ) && in_array( $_GET['page'], $this->adminpages ) ) {
- wp_enqueue_script( 'wpseo-admin-script', WPSEO_URL . 'js/wp-seo-admin.js', array( 'jquery' ), WPSEO_VERSION, true );
- wp_enqueue_script( 'postbox' );
- wp_enqueue_script( 'dashboard' );
- wp_enqueue_script( 'thickbox' );
- }
- }
-
- /**
- * Retrieve options based on the option or the class currentoption.
- *
- * @since 1.2.4
- *
- * @param string $option The option to retrieve.
- * @return array
- */
- function get_option( $option ) {
- if ( function_exists( 'is_network_admin' ) && is_network_admin() )
- return get_site_option( $option );
- else
- return get_option( $option );
- }
-
- /**
- * Create a Checkbox input field.
- *
- * @param string $var The variable within the option to create the checkbox for.
- * @param string $label The label to show for the variable.
- * @param bool $label_left Whether the label should be left (true) or right (false).
- * @param string $option The option the variable belongs to.
- * @return string
- */
- function checkbox( $var, $label, $label_left = false, $option = '' ) {
- if ( empty( $option ) )
- $option = $this->currentoption;
-
- $options = $this->get_option( $option );
-
- if ( !isset( $options[$var] ) )
- $options[$var] = false;
-
- if ( $options[$var] === true )
- $options[$var] = 'on';
-
- if ( $label_left !== false ) {
- if ( !empty( $label_left ) )
- $label_left .= ':';
- $output_label = '
' . $label_left . ' ';
- $class = 'checkbox';
- } else {
- $output_label = '
' . $label . ' ';
- $class = 'checkbox double';
+ /**
+ * Retrieve options based on whether we're on multisite or not.
+ *
+ * @since 1.2.4
+ *
+ * @param string $option The option to retrieve.
+ * @return array
+ */
+ function get_option( $option ) {
+ if ( is_network_admin() ) {
+ return get_site_option( $option );
+ }
+ else {
+ return get_option( $option );
+ }
}
- $output_input = "
';
+ /**
+ * Create a Checkbox input field.
+ *
+ * @param string $var The variable within the option to create the checkbox for.
+ * @param string $label The label to show for the variable.
+ * @param bool $label_left Whether the label should be left (true) or right (false).
+ * @param string $option The option the variable belongs to.
+ * @return string
+ */
+ function checkbox( $var, $label, $label_left = false, $option = '' ) {
+ if ( empty( $option ) ) {
+ $option = $this->currentoption;
+ }
- if ( $label_left !== false ) {
- $output = $output_label . $output_input . '
' . $label . ' ';
- } else {
- $output = $output_input . $output_label;
- }
- return $output . '
';
- }
+ $options = $this->get_option( $option );
- /**
- * Create a Text input field.
- *
- * @param string $var The variable within the option to create the text input field for.
- * @param string $label The label to show for the variable.
- * @param string $option The option the variable belongs to.
- * @return string
- */
- function textinput( $var, $label, $option = '' ) {
- if ( empty( $option ) )
- $option = $this->currentoption;
+ if ( ! isset( $options[ $var ] ) ) {
+ $options[ $var ] = false;
+ }
- $options = $this->get_option( $option );
+ if ( $options[ $var ] === true ) {
+ $options[ $var ] = 'on';
+ }
- $val = '';
- if ( isset( $options[$var] ) )
- $val = esc_attr( $options[$var] );
+ if ( $label_left !== false ) {
+ if ( ! empty( $label_left ) ) {
+ $label_left .= ':';
+ }
+ $output_label = '
' . $label_left . ' ';
+ $class = 'checkbox';
+ }
+ else {
+ $output_label = '
' . $label . ' ';
+ $class = 'checkbox double';
+ }
- return '
' . $label . ': ' . '
';
- }
+ $output_input = '
';
- /**
- * Create a textarea.
- *
- * @param string $var The variable within the option to create the textarea for.
- * @param string $label The label to show for the variable.
- * @param string $option The option the variable belongs to.
- * @param string $class The CSS class to assign to the textarea.
- * @return string
- */
- function textarea( $var, $label, $option = '', $class = '' ) {
- if ( empty( $option ) )
- $option = $this->currentoption;
-
- $options = $this->get_option( $option );
-
- $val = '';
- if ( isset( $options[$var] ) )
- $val = esc_attr( $options[$var] );
-
-
- return '
' . esc_html( $label ) . ': ' . '
';
- }
-
- /**
- * Create a hidden input field.
- *
- * @param string $var The variable within the option to create the hidden input for.
- * @param string $option The option the variable belongs to.
- * @return string
- */
- function hidden( $var, $option = '' ) {
- if ( empty( $option ) )
- $option = $this->currentoption;
-
- $options = $this->get_option( $option );
-
- $val = '';
- if ( isset( $options[$var] ) )
- $val = esc_attr( $options[$var] );
-
- return '
';
- }
-
- /**
- * Create a Select Box.
- *
- * @param string $var The variable within the option to create the select for.
- * @param string $label The label to show for the variable.
- * @param array $values The select options to choose from.
- * @param string $option The option the variable belongs to.
- * @return string
- */
- function select( $var, $label, $values, $option = '' ) {
- if ( empty( $option ) )
- $option = $this->currentoption;
-
- $options = $this->get_option( $option );
-
- $var_esc = esc_attr( $var );
- $output = '
' . $label . ': ';
- $output .= '
';
-
- foreach ( $values as $value => $label ) {
- $sel = '';
- if ( isset( $options[$var] ) && $options[$var] == $value )
- $sel = 'selected="selected" ';
-
- if ( !empty( $label ) )
- $output .= '' . $label . ' ';
- }
- $output .= ' ';
- return $output . '
';
- }
-
- /**
- * Create a File upload field.
- *
- * @param string $var The variable within the option to create the file upload field for.
- * @param string $label The label to show for the variable.
- * @param string $option The option the variable belongs to.
- * @return string
- */
- function file_upload( $var, $label, $option = '' ) {
- if ( empty( $option ) )
- $option = $this->currentoption;
-
- $options = $this->get_option( $option );
-
- $val = '';
- if ( isset( $options[$var] ) && strtolower( gettype( $options[$var] ) ) == 'array' ) {
- $val = $options[$var]['url'];
+ if ( $label_left !== false ) {
+ $output = $output_label . $output_input . '
' . $label . ' ';
+ }
+ else {
+ $output = $output_input . $output_label;
+ }
+ return $output . '
';
}
- $var_esc = esc_attr( $var );
- $output = '
' . esc_html( $label ) . ': ';
- $output .= '
';
+ /**
+ * Create a Text input field.
+ *
+ * @param string $var The variable within the option to create the text input field for.
+ * @param string $label The label to show for the variable.
+ * @param string $option The option the variable belongs to.
+ * @return string
+ */
+ function textinput( $var, $label, $option = '' ) {
+ if ( empty( $option ) ) {
+ $option = $this->currentoption;
+ }
- // Need to save separate array items in hidden inputs, because empty file inputs type will be deleted by settings API.
- if ( !empty( $options[$var] ) ) {
- $output .= '
';
- $output .= '
';
- $output .= '
';
+ $options = $this->get_option( $option );
+ $val = ( isset( $options[ $var ] ) ) ? $options[ $var ] : '';
+
+ return '
' . $label . ': ' . '
';
}
- $output .= '
';
- return $output;
- }
+ /**
+ * Create a textarea.
+ *
+ * @param string $var The variable within the option to create the textarea for.
+ * @param string $label The label to show for the variable.
+ * @param string $option The option the variable belongs to.
+ * @param string $class The CSS class to assign to the textarea.
+ * @return string
+ */
+ function textarea( $var, $label, $option = '', $class = '' ) {
+ if ( empty( $option ) ) {
+ $option = $this->currentoption;
+ }
- /**
- * Create a Radio input field.
- *
- * @param string $var The variable within the option to create the file upload field for.
- * @param array $values The radio options to choose from.
- * @param string $label The label to show for the variable.
- * @param string $option The option the variable belongs to.
- * @return string
- */
- function radio( $var, $values, $label, $option = '' ) {
- if ( empty( $option ) )
- $option = $this->currentoption;
+ $options = $this->get_option( $option );
+ $val = ( isset( $options[ $var ] ) ) ? $options[ $var ] : '';
- $options = $this->get_option( $option );
-
- if ( !isset( $options[$var] ) )
- $options[$var] = false;
-
- $var_esc = esc_attr( $var );
-
- $output = '
' . $label . ': ';
- foreach ( $values as $key => $value ) {
- $key = esc_attr( $key );
- $output .= '
' . esc_attr( $value ) . ' ';
+ return '
' . esc_html( $label ) . ': ' . '
';
}
- $output .= '
';
- return $output;
- }
+ /**
+ * Create a hidden input field.
+ *
+ * @param string $var The variable within the option to create the hidden input for.
+ * @param string $option The option the variable belongs to.
+ * @return string
+ */
+ function hidden( $var, $option = '' ) {
+ if ( empty( $option ) ) {
+ $option = $this->currentoption;
+ }
- /**
- * Create a postbox widget.
- *
- * @param string $id ID of the postbox.
- * @param string $title Title of the postbox.
- * @param string $content Content of the postbox.
- */
- function postbox( $id, $title, $content ) {
- ?>
-
-
- get_option( $option );
+ $val = ( isset( $options[ $var ] ) ) ? $options[ $var ] : '';
+ if ( is_bool( $val ) ) {
+ $val = ( $val === true ) ? 'true' : 'false';
+ }
- /**
- * Create a form table from an array of rows.
- *
- * @param array $rows Rows to include in the table.
- * @return string
- */
- function form_table( $rows ) {
- $content = '
';
- return $content;
- }
-} // end class WPSEO_Admin
-global $wpseo_admin_pages;
-$wpseo_admin_pages = new WPSEO_Admin_Pages();
+ /**
+ * Create a Select Box.
+ *
+ * @param string $var The variable within the option to create the select for.
+ * @param string $label The label to show for the variable.
+ * @param array $values The select options to choose from.
+ * @param string $option The option the variable belongs to.
+ * @return string
+ */
+ function select( $var, $label, $values, $option = '' ) {
+ if ( ! is_array( $values ) || $values === array() ) {
+ return '';
+ }
+ if ( empty( $option ) ) {
+ $option = $this->currentoption;
+ }
+
+ $options = $this->get_option( $option );
+ $val = ( isset( $options[ $var ] ) ) ? $options[ $var ] : '';
+
+ $output = '
' . $label . ': ';
+ $output .= '
';
+
+ foreach ( $values as $value => $label ) {
+ if ( ! empty( $label ) ) {
+ $output .= '' . $label . ' ';
+ }
+ }
+ $output .= ' ';
+ return $output . '
';
+ }
+
+ /**
+ * Create a File upload field.
+ *
+ * @param string $var The variable within the option to create the file upload field for.
+ * @param string $label The label to show for the variable.
+ * @param string $option The option the variable belongs to.
+ * @return string
+ */
+ function file_upload( $var, $label, $option = '' ) {
+ if ( empty( $option ) ) {
+ $option = $this->currentoption;
+ }
+
+ $options = $this->get_option( $option );
+
+ $val = '';
+ if ( isset( $options[ $var ] ) && is_array( $options[ $var ] ) ) {
+ $val = $options[ $var ]['url'];
+ }
+
+ $var_esc = esc_attr( $var );
+ $output = '
' . esc_html( $label ) . ': ';
+ $output .= '
';
+
+ // Need to save separate array items in hidden inputs, because empty file inputs type will be deleted by settings API.
+ if ( ! empty( $options[ $var ] ) ) {
+ $output .= '
';
+ $output .= '
';
+ $output .= '
';
+ }
+ $output .= '
';
+
+ return $output;
+ }
+
+ /**
+ * Create a Radio input field.
+ *
+ * @param string $var The variable within the option to create the file upload field for.
+ * @param array $values The radio options to choose from.
+ * @param string $label The label to show for the variable.
+ * @param string $option The option the variable belongs to.
+ * @return string
+ */
+ function radio( $var, $values, $label, $option = '' ) {
+ if ( ! is_array( $values ) || $values === array() ) {
+ return '';
+ }
+ if ( empty( $option ) ) {
+ $option = $this->currentoption;
+ }
+
+ $options = $this->get_option( $option );
+
+ if ( ! isset( $options[ $var ] ) ) {
+ $options[ $var ] = false;
+ }
+
+ $var_esc = esc_attr( $var );
+
+ $output = '
' . $label . ': ';
+ foreach ( $values as $key => $value ) {
+ $key_esc = esc_attr( $key );
+ $output .= '
' . esc_html( $value ) . ' ';
+ }
+ $output .= '
';
+
+ return $output;
+ }
+
+ /**
+ * Create a postbox widget.
+ *
+ * @param string $id ID of the postbox.
+ * @param string $title Title of the postbox.
+ * @param string $content Content of the postbox.
+ */
+ function postbox( $id, $title, $content ) {
+ ?>
+
+
+ ';
+ foreach ( $rows as $row ) {
+ $content .= '
';
+ if ( isset( $row['id'] ) && $row['id'] != '' ) {
+ $content .= '' . esc_html( $row['label'] ) . ': ';
+ }
+ else {
+ $content .= esc_html( $row['label'] );
+ }
+ if ( isset( $row['desc'] ) && $row['desc'] != '' ) {
+ $content .= '' . esc_html( $row['desc'] ) . ' ';
+ }
+ $content .= ' ';
+ $content .= $row['content'];
+ $content .= ' ';
+ }
+ $content .= '
- 
+
+ 
+
+
+ 
+
+
+ 
+
+
+  ); ?>)
+ 
+
+
+  ); ?>)
-
-
-
-
-  ); ?>)
-
-
-  ); ?>)
-
-
-
-
-
- 
+
+
+
+