← All changes | feedwordpress.php +1209 -894 trunk → 2017.1020 View file →

		@@ -1,83 +1,80 @@
1	1	<?php
2	2	/*
3	3	Plugin Name: FeedWordPress
4		-Plugin URI: https://fwpplugin.com/
	4	+Plugin URI: http://feedwordpress.radgeek.com/
5	5	Description: simple and flexible Atom/RSS syndication for WordPress
6		-Version: 2026.0517
	6	+Version: 2017.1020
7	7	Author: C. Johnson
8		-Author URI: https://fwpplugin.com/contact/
	8	+Author URI: https://feedwordpress.radgeek.com/contact/
9	9	License: GPL
10	10	*/
11	11
12	12	/**
13	13	* @package FeedWordPress
14		- * @version 2026.0517
	14	+ * @version 2017.1020
15	15	*/
16	16
17		-# This plugin uses code derived from:
	17	+# This uses code derived from:
18	18	# - wp-rss-aggregate.php by Kellan Elliot-McCrea <kellan@protest.net>
19	19	# - SimplePie feed parser by Ryan Parman, Geoffrey Sneddon, Ryan McCue, et al.
20	20	# - MagpieRSS feed parser by Kellan Elliot-McCrea <kellan@protest.net>
21	21	# - Ultra-Liberal Feed Finder by Mark Pilgrim <mark@diveintomark.org>
22	22	# - WordPress Blog Tool and Publishing Platform <http://wordpress.org/>
23		-# - Github contributors @Flynsarmy, @BandonRandon, @david-robinson-practiceweb,
24		-# @daidais, @thegreatmichael, @stedaniels, @alexiskulash, @quassy, @zoul0813,
25		-# @timmmmyboy, @vobornik, @inanimatt, @tristanleboss, @martinburchell,
26		-# @bigalownz, @oppiansteve, @GwynethLlewelyn, and @glg222
27	23	# according to the terms of the GNU General Public License.
	24	+#
	25	+# INSTALLATION: see readme.txt or <http://feedwordpress.radgeek.com/install>
	26	+#
	27	+# USAGE: once FeedWordPress is installed, you manage just about everything from
	28	+# the WordPress Dashboard, under the Syndication menu. To keep fresh content
	29	+# coming in as it becomes available, you'll have to either check for updates
	30	+# manually, or set up one of the automatically-scheduled update methods. See
	31	+# <http://feedwordpress.radgeek.com/wiki/quick-start/> for some details.
28	32
29		-####################################################################################
30		-## CONSTANTS & DEFAULTS ############################################################
31		-####################################################################################
	33	+# -- Don't change these unless you know what you're doing...
32	34
33		-define ('FEEDWORDPRESS_VERSION', '2026.0517');
34		-define ('FEEDWORDPRESS_AUTHOR_CONTACT', 'https://fwpplugin.com/contact' );
	35	+define ('FEEDWORDPRESS_VERSION', '2017.1020');
	36	+define ('FEEDWORDPRESS_AUTHOR_CONTACT', 'http://feedwordpress.radgeek.com/contact');
35	37
36		-if ( ! defined( 'FEEDWORDPRESS_BLEG' ) ) :
37		- define ( 'FEEDWORDPRESS_BLEG', true );
	38	+if (!defined('FEEDWORDPRESS_BLEG')) :
	39	+ define ('FEEDWORDPRESS_BLEG', true);
38	40	endif;
	41	+define('FEEDWORDPRESS_BLEG_BTC', '15EsQ9QMZtLytsaVYZUaUCmrkSMaxZBTso');
	42	+define('FEEDWORDPRESS_BLEG_PAYPAL', '22PAJZZCK5Z3W');
39	43
40		-define( 'FEEDWORDPRESS_BLEG_BTC_pre_2020', '15EsQ9QMZtLytsaVYZUaUCmrkSMaxZBTso' );
41		-define( 'FEEDWORDPRESS_BLEG_BTC_2020', '1NB1ebYVb68Har4WijmE8gKnZ47NptCqtB' ); // 2020.0201
42		-define( 'FEEDWORDPRESS_BLEG_BTC', '1HCDdeGcR66EPxkPT2rbdTd1ezh27pmjPR' ); // 2021.0713
43		-define( 'FEEDWORDPRESS_BLEG_PAYPAL', '22PAJZZCK5Z3W' );
	44	+define('FEEDWORDPRESS_BOILERPLATE_DEFAULT_HOOK_ORDER', 11000); // at the tail end of the filtering process
44	45
45	46	// Defaults
46		-define( 'DEFAULT_SYNDICATION_CATEGORY', 'Contributors' );
47		-define( 'DEFAULT_UPDATE_PERIOD', 60 ); // value in minutes
48		-define( 'FEEDWORDPRESS_DEFAULT_CHECKIN_INTERVAL', DEFAULT_UPDATE_PERIOD / 10 );
	47	+define ('DEFAULT_SYNDICATION_CATEGORY', 'Contributors');
	48	+define ('DEFAULT_UPDATE_PERIOD', 60); // value in minutes
49	49
50		-// Dependencies: modules packaged with FeedWordPress plugin.
51		-/** @var string Path to parent directory */
52		-$dir = dirname( __FILE__ );
53		-require_once "{$dir}/externals/myphp/myphp.class.php";
54		-
55		-/** @var bool|string Set to either true or 'yes' if debugging is set. */
56		-$feedwordpress_debug = FeedWordPress::param( 'feedwordpress_debug', get_option( 'feedwordpress_debug' ) );
57		-
58		-if ( is_string( $feedwordpress_debug ) ) :
59		- $feedwordpress_debug = ( $feedwordpress_debug == 'yes' );
	50	+if (isset($_REQUEST['feedwordpress_debug'])) :
	51	+ $feedwordpress_debug = $_REQUEST['feedwordpress_debug'];
	52	+else :
	53	+ $feedwordpress_debug = get_option('feedwordpress_debug');
	54	+ if (is_string($feedwordpress_debug)) :
	55	+ $feedwordpress_debug = ($feedwordpress_debug == 'yes');
	56	+ endif;
60	57	endif;
61		-
62		-define ( 'FEEDWORDPRESS_DEBUG', $feedwordpress_debug );
	58	+define ('FEEDWORDPRESS_DEBUG', $feedwordpress_debug);
63	59	$feedwordpress_compatibility = true;
64		-define ( 'FEEDWORDPRESS_COMPATIBILITY', $feedwordpress_compatibility );
	60	+define ('FEEDWORDPRESS_COMPATIBILITY', $feedwordpress_compatibility);
65	61
66		-define ( 'FEEDWORDPRESS_CAT_SEPARATOR_PATTERN', '/[:\n]/' );
67		-define ( 'FEEDWORDPRESS_CAT_SEPARATOR', "\n" );
	62	+define ('FEEDWORDPRESS_CAT_SEPARATOR_PATTERN', '/[:\n]/');
	63	+define ('FEEDWORDPRESS_CAT_SEPARATOR', "\n");
68	64
69		-// define ('FEEDVALIDATOR_URI', 'http://feedvalidator.org/check.cgi'); // Link dead (gwyneth 20210617)
70		-define ( 'FEEDVALIDATOR_URI', 'https://validator.w3.org/feed/check.cgi' ); // Falling back to the W3C validator link
	65	+define ('FEEDVALIDATOR_URI', 'http://feedvalidator.org/check.cgi');
71	66
72		-define ( 'FEEDWORDPRESS_FRESHNESS_INTERVAL', 10 * 60 ); // Every ten minutes
	67	+define ('FEEDWORDPRESS_FRESHNESS_INTERVAL', 10*60); // Every ten minutes
73	68
74		-define( 'FEEDWORDPRESS_BOILERPLATE_DEFAULT_HOOK_ORDER', 11000 ); // at the tail end of the filtering process
	69	+define ('FWP_SCHEMA_HAS_USERMETA', 2966);
	70	+define ('FWP_SCHEMA_USES_ARGS_TAXONOMY', 12694); // Revision # for using $args['taxonomy'] to get link categories
	71	+define ('FWP_SCHEMA_30', 12694); // Database schema # for WP 3.0
75	72
76		-if ( FEEDWORDPRESS_DEBUG ) :
	73	+if (FEEDWORDPRESS_DEBUG) :
77	74	// Help us to pick out errors, if any.
78		- ini_set( 'error_reporting', E_ALL & ~E_NOTICE );
79		- ini_set( 'display_errors', true );
	75	+ ini_set('error_reporting', E_ALL & ~E_NOTICE);
	76	+ ini_set('display_errors', true);
80	77
81	78	// When testing we don't want cache issues to interfere. But this is
82	79	// a VERY BAD SETTING for a production server. Webmasters will eat your
83	80	// face for breakfast if you use it, and the baby Jesus will cry. So
		@@ -82,42 +79,43 @@
82	79	// a VERY BAD SETTING for a production server. Webmasters will eat your
83	80	// face for breakfast if you use it, and the baby Jesus will cry. So
84	81	// make sure FEEDWORDPRESS_DEBUG is FALSE for any site that will be
85	82	// used for more than testing purposes!
86		- define( 'FEEDWORDPRESS_CACHE_AGE', 1 );
87		- define( 'FEEDWORDPRESS_CACHE_LIFETIME', 1 );
88		- define( 'FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT', 60 );
	83	+ define('FEEDWORDPRESS_CACHE_AGE', 1);
	84	+ define('FEEDWORDPRESS_CACHE_LIFETIME', 1);
	85	+ define('FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT', 60);
89	86	else :
90	87	// Hold onto data all day for conditional GET purposes,
91	88	// but consider it stale after 1 min (requiring a conditional GET)
92		- define( 'FEEDWORDPRESS_CACHE_LIFETIME', 24 * 60 * 60 ); // aka one day.
93		- define( 'FEEDWORDPRESS_CACHE_AGE', 1 * 60 );
94		- define( 'FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT', 20 );
	89	+ define('FEEDWORDPRESS_CACHE_LIFETIME', 24*60*60);
	90	+ define('FEEDWORDPRESS_CACHE_AGE', 1*60);
	91	+ define('FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT', 20);
95	92	endif;
96	93
97		-####################################################################################
98		-## CORE DEPENDENCIES & PLUGIN MODULES ##############################################
99		-####################################################################################
	94	+// Use our the cache settings that we want.
	95	+add_filter('wp_feed_cache_transient_lifetime', array('FeedWordPress', 'cache_lifetime'));
100	96
101		-/** @var array<string> Dependencies: modules packaged with WordPress core */
	97	+// Dependencies: modules packaged with WordPress core
102	98	$wpCoreDependencies = array(
103		- "class:SimplePie" => "class-simplepie",
104		- "class:WP_SimplePie_File" => "class-wp-simplepie-file",
105		- "class:WP_SimplePie_Sanitize_KSES" => "class-wp-simplepie-sanitize-kses",
106		- "function:wp_insert_user" => "registration",
	99	+"class:SimplePie" => "class-simplepie",
	100	+"class:WP_Feed_Cache" => "class-wp-feed-cache",
	101	+"class:WP_Feed_Cache_Transient" => "class-wp-feed-cache-transient",
	102	+"class:WP_SimplePie_File" => "class-wp-simplepie-file",
	103	+"class:WP_SimplePie_Sanitize_KSES" => "class-wp-simplepie-sanitize-kses",
	104	+"function:wp_insert_user" => "registration",
107	105	);
108	106
109	107	// Ensure that we have SimplePie loaded up and ready to go
110	108	// along with the WordPress auxiliary classes.
111	109	$unmetCoreDependencies = array();
112		-foreach ( $wpCoreDependencies as $unit => $fileSlug ) :
113		- list( $unitType, $unitName ) = explode( ":", $unit, 2 );
114		-
115		- $dependencyMet = ( ('class' == $unitType ) ? class_exists( $unitName ) : function_exists( $unitName ) );
116		- if ( ! $dependencyMet ) :
117		- $phpFileName = ABSPATH . WPINC . "/{$fileSlug}.php";
118		- if ( file_exists( $phpFileName ) ) :
119		- require_once $phpFileName;
	110	+foreach ($wpCoreDependencies as $unit => $fileSlug) :
	111	+ list($unitType, $unitName) = explode(":", $unit, 2);
	112	+
	113	+ $dependencyMet = (('class'==$unitType) ? class_exists($unitName) : function_exists($unitName));
	114	+ if (!$dependencyMet) :
	115	+ $phpFileName = ABSPATH . WPINC . "/${fileSlug}.php";
	116	+ if (file_exists($phpFileName)) :
	117	+ require_once($phpFileName);
120	118	else :
121	119	$unmetCoreDependencies[] = $unitName;
122	120	endif;
123	121	endif;
		@@ -123,144 +121,417 @@
123	121	endif;
124	122	endforeach;
125	123
126	124	// Fallback garbage-pail module used in WP < 4.7 which may meet our dependencies
127		-if ( count( $unmetCoreDependencies ) > 0 ) :
128		- require_once ABSPATH . WPINC . "/class-feed.php";
	125	+if (count($unmetCoreDependencies) > 0) :
	126	+ require_once(ABSPATH . WPINC . "/class-feed.php");
129	127	endif;
130	128
131		-// Dependencies: modules packaged with FeedWordPress plugin
132		-$dir = dirname( __FILE__ );
133		-require_once "{$dir}/feedwordpressadminpage.class.php";
134		-require_once "{$dir}/feedwordpresssettingsui.class.php";
135		-require_once "{$dir}/feedwordpressdiagnostic.class.php";
136		-require_once "{$dir}/admin-ui.php";
137		-require_once "{$dir}/template-functions.php";
138		-require_once "{$dir}/feedwordpresssyndicationpage.class.php";
139		-require_once "{$dir}/compatability.php"; // Legacy API
140		-require_once "{$dir}/syndicatedpost.class.php";
141		-require_once "{$dir}/syndicatedlink.class.php";
142		-require_once "{$dir}/feedwordpresshtml.class.php";
143		-require_once "{$dir}/inspectpostmeta.class.php";
144		-require_once "{$dir}/syndicationdataqueries.class.php";
145		-require_once "{$dir}/extend/SimplePie/feedwordpie.class.php";
146		-require_once "{$dir}/extend/SimplePie/feedwordpie_cache.class.php";
147		-require_once "{$dir}/extend/SimplePie/feedwordpie_item.class.php";
148		-require_once "{$dir}/extend/SimplePie/feedwordpie_file.class.php";
149		-require_once "{$dir}/extend/SimplePie/feedwordpie_parser.class.php";
150		-require_once "{$dir}/extend/SimplePie/feedwordpie_content_type_sniffer.class.php";
151		-require_once "{$dir}/feedwordpressrpc.class.php";
152		-require_once "{$dir}/feedwordpresshttpauthenticator.class.php";
153		-require_once "{$dir}/feedwordpresslocalpost.class.php";
	129	+// Dependences: modules packaged with FeedWordPress plugin
	130	+$dir = dirname(__FILE__);
	131	+require_once("${dir}/externals/myphp/myphp.class.php");
	132	+require_once("${dir}/admin-ui.php");
	133	+require_once("${dir}/feedwordpresssyndicationpage.class.php");
	134	+require_once("${dir}/compatability.php"); // Legacy API
	135	+require_once("${dir}/syndicatedpost.class.php");
	136	+require_once("${dir}/syndicatedlink.class.php");
	137	+require_once("${dir}/feedwordpresshtml.class.php");
	138	+require_once("${dir}/feedwordpress-content-type-sniffer.class.php");
	139	+require_once("${dir}/inspectpostmeta.class.php");
	140	+require_once("${dir}/syndicationdataqueries.class.php");
	141	+require_once("${dir}/feedwordpie.class.php");
	142	+require_once("${dir}/feedwordpie_item.class.php");
	143	+require_once("${dir}/feedwordpress_file.class.php");
	144	+require_once("${dir}/feedwordpress_parser.class.php");
	145	+require_once("${dir}/feedwordpressrpc.class.php");
	146	+require_once("${dir}/feedwordpresshttpauthenticator.class.php");
	147	+require_once("${dir}/feedwordpresslocalpost.class.php");
154	148
155		-####################################################################################
156		-## GLOBAL PARAMETERS ###############################################################
157		-####################################################################################
	149	+// Magic quotes are just about the stupidest thing ever.
	150	+if (is_array($_POST)) :
	151	+ $fwp_post = $_POST;
	152	+ if (get_magic_quotes_gpc()) :
	153	+ $fwp_post = stripslashes_deep($fwp_post);
	154	+ endif;
	155	+endif;
158	156
159	157	// Get the path relative to the plugins directory in which FWP is stored
160	158	preg_match (
161		- '|'.preg_quote( WP_PLUGIN_DIR ) . '/(.+)$|',
162		- dirname( __FILE__ ),
	159	+ '|'.preg_quote(WP_PLUGIN_DIR).'/(.+)$|',
	160	+ dirname(__FILE__),
163	161	$ref
164	162	);
165	163
166		-if ( isset( $ref[1] ) ) :
	164	+if (isset($ref[1])) :
167	165	$fwp_path = $ref[1];
168	166	else : // Something went wrong. Let's just guess.
169	167	$fwp_path = 'feedwordpress';
170	168	endif;
171	169
172		-####################################################################################
173		-## FEEDWORDPRESS: INITIALIZE OBJECT AND FILTERS ####################################
174		-####################################################################################
	170	+$feedwordpress = new FeedWordPress;
	171	+if (!$feedwordpress->needs_upgrade()) : // only work if the conditions are safe!
175	172
176		-$feedwordpress = new FeedWordPress;
177		-if ( ! $feedwordpress->needs_upgrade() ) : // only work if the conditions are safe!
178		- $feedwordpress->add_filters();
	173	+ # Syndicated items are generally received in output-ready (X)HTML and
	174	+ # should not be folded, crumpled, mutilated, or spindled by WordPress
	175	+ # formatting filters. But we don't want to interfere with filters for
	176	+ # any locally-authored posts, either.
	177	+ #
	178	+ # What WordPress should really have is a way for upstream filters to
	179	+ # stop downstream filters from running at all. Since it doesn't, and
	180	+ # since a downstream filter can't access the original copy of the text
	181	+ # that is being filtered, what we will do here is (1) save a copy of the
	182	+ # original text upstream, before any other filters run, and then (2)
	183	+ # retrieve that copy downstream, after all the other filters run, *if*
	184	+ # this is a syndicated post
179	185
	186	+ add_filter('the_content', 'feedwordpress_preserve_syndicated_content', -10000);
	187	+ add_filter('the_content', 'feedwordpress_restore_syndicated_content', 10000);
	188	+
	189	+ add_action('atom_entry', 'feedwordpress_item_feed_data');
	190	+
	191	+ # Filter in original permalinks if the user wants that
	192	+ add_filter('post_link', 'syndication_permalink', /*priority=*/ 1, /*arguments=*/ 3);
	193	+ add_filter('post_type_link', 'syndication_permalink', /*priority=*/ 1, /*arguments=*/ 4);
	194	+
	195	+ # When foreign URLs are used for permalinks in feeds or display
	196	+ # contexts, they need to be escaped properly.
	197	+ add_filter('the_permalink', 'syndication_permalink_escaped');
	198	+ add_filter('the_permalink_rss', 'syndication_permalink_escaped');
	199	+
	200	+ add_filter('post_comments_feed_link', 'syndication_comments_feed_link');
	201	+
	202	+ # WTF? By default, wp_insert_link runs incoming link_url and link_rss
	203	+ # URIs through default filters that include `wp_kses()`. But `wp_kses()`
	204	+ # just happens to escape any occurrence of & to &amp; -- which just
	205	+ # happens to fuck up any URI with a & to separate GET parameters.
	206	+ remove_filter('pre_link_rss', 'wp_filter_kses');
	207	+ remove_filter('pre_link_url', 'wp_filter_kses');
	208	+
	209	+ # Boilerplate functionality: hook in to title, excerpt, and content to add boilerplate text
	210	+ $hookOrder = get_option('feedwordpress_boilerplate_hook_order', FEEDWORDPRESS_BOILERPLATE_DEFAULT_HOOK_ORDER);
	211	+ add_filter(
	212	+ /*hook=*/ 'the_title',
	213	+ /*function=*/ 'add_boilerplate_title',
	214	+ /*priority=*/ $hookOrder,
	215	+ /*arguments=*/ 2
	216	+ );
	217	+ add_filter(
	218	+ /*hook=*/ 'get_the_excerpt',
	219	+ /*function=*/ 'add_boilerplate_excerpt',
	220	+ /*priority=*/ $hookOrder,
	221	+ /*arguments=*/ 1
	222	+ );
	223	+ add_filter(
	224	+ /*hook=*/ 'the_content',
	225	+ /*function=*/ 'add_boilerplate_content',
	226	+ /*priority=*/ $hookOrder,
	227	+ /*arguments=*/ 1
	228	+ );
	229	+ add_filter(
	230	+ /*hook=*/ 'the_content_rss',
	231	+ /*function=*/ 'add_boilerplate_content',
	232	+ /*priority=*/ $hookOrder,
	233	+ /*arguments=*/ 1
	234	+ );
	235	+
	236	+ # Admin menu
	237	+ add_action('admin_init', array($feedwordpress, 'admin_init'));
	238	+ add_action('admin_menu', 'fwp_add_pages');
	239	+ add_action('admin_notices', 'fwp_check_debug');
	240	+
	241	+ add_action('admin_menu', 'feedwordpress_add_post_edit_controls');
	242	+ add_action('save_post', 'feedwordpress_save_post_edit_controls');
	243	+
	244	+ add_action('admin_footer', array($feedwordpress, 'admin_footer'));
	245	+
180	246	# Inbound XML-RPC update methods
181	247	$feedwordpressRPC = new FeedWordPressRPC;
182	248
183	249	# Outbound XML-RPC ping reform
184		- remove_action( 'publish_post', 'generic_ping' ); // WP 1.5.x
185		- remove_action( 'do_pings', 'do_all_pings', 10, 1 ); // WP 2.1, 2.2
186		- remove_action( 'publish_post', '_publish_post_hook', 5, 1 ); // WP 2.3
	250	+ remove_action('publish_post', 'generic_ping'); // WP 1.5.x
	251	+ remove_action('do_pings', 'do_all_pings', 10, 1); // WP 2.1, 2.2
	252	+ remove_action('publish_post', '_publish_post_hook', 5, 1); // WP 2.3
187	253
188		- add_action( 'publish_post', 'fwp_publish_post_hook', 5, 1 );
189		- add_action( 'do_pings', 'fwp_do_pings', 10, 1 );
190		- add_action( 'feedwordpress_update', 'fwp_hold_pings' );
191		- add_action( 'feedwordpress_update_complete', 'fwp_release_pings' );
	254	+ add_action('publish_post', 'fwp_publish_post_hook', 5, 1);
	255	+ add_action('do_pings', 'fwp_do_pings', 10, 1);
	256	+ add_action('feedwordpress_update', 'fwp_hold_pings');
	257	+ add_action('feedwordpress_update_complete', 'fwp_release_pings');
192	258
	259	+ add_action('syndicated_feed_error', array('FeedWordPressDiagnostic', 'feed_error'), 100, 3);
	260	+
	261	+ add_action('wp_footer', 'debug_out_feedwordpress_footer', -100);
	262	+ add_action('admin_footer', 'debug_out_feedwordpress_footer', -100);
	263	+
	264	+ # Cron-less auto-update. Hooray!
	265	+ $autoUpdateHook = $feedwordpress->automatic_update_hook();
	266	+ if (!is_null($autoUpdateHook)) :
	267	+ add_action($autoUpdateHook, array($feedwordpress, 'auto_update'));
	268	+ endif;
	269	+
	270	+ add_action('init', array($feedwordpress, 'init'));
	271	+ add_action('wp_loaded', array($feedwordpress, 'wp_loaded'));
	272	+
	273	+ add_action('shutdown', array($feedwordpress, 'email_diagnostic_log'));
	274	+ add_action('shutdown', array($feedwordpress, 'feedwordpress_cleanup'));
	275	+ add_action('wp_dashboard_setup', array($feedwordpress, 'dashboard_setup'));
	276	+
	277	+ # Default sanitizers
	278	+ add_filter('syndicated_item_content', array('SyndicatedPost', 'resolve_relative_uris'), 0, 2);
	279	+ add_filter('syndicated_item_content', array('SyndicatedPost', 'sanitize_content'), 0, 2);
	280	+
	281	+ add_action('plugins_loaded', array($feedwordpress, 'admin_api'));
	282	+ add_action('all_admin_notices', array($feedwordpress, 'all_admin_notices'));
	283	+
193	284	else :
194	285	# Hook in the menus, which will just point to the upgrade interface
195		- add_action( 'admin_menu', array( $feedwordpress, 'add_pages' ) );
196		-endif; // if ( !FeedWordPress::needs_upgrade())
	286	+ add_action('admin_menu', 'fwp_add_pages');
	287	+endif; // if (!FeedWordPress::needs_upgrade())
197	288
198		-register_deactivation_hook( __FILE__, 'feedwordpress_deactivate' );
	289	+################################################################################
	290	+## LOGGING FUNCTIONS: log status updates to error_log if you want it ###########
	291	+################################################################################
199	292
	293	+class FeedWordPressDiagnostic {
	294	+ public static function feed_error ($error, $old, $link) {
	295	+ $wpError = $error['object'];
	296	+ $url = $link->uri();
	297	+
	298	+ // check for effects of an effective-url filter
	299	+ $effectiveUrl = $link->uri(array('fetch' => true));
	300	+ if ($url != $effectiveUrl) : $url .= ' | ' . $effectiveUrl; endif;
	301	+
	302	+ $mesgs = $wpError->get_error_messages();
	303	+ foreach ($mesgs as $mesg) :
	304	+ $mesg = esc_html($mesg);
	305	+ FeedWordPress::diagnostic(
	306	+ 'updated_feeds:errors',
	307	+ "Feed Error: [${url}] update returned error: $mesg"
	308	+ );
	309	+
	310	+ $hours = get_option('feedwordpress_diagnostics_persistent_errors_hours', 2);
	311	+ $span = ($error['ts'] - $error['since']);
	312	+
	313	+ if ($span >= ($hours * 60 * 60)) :
	314	+ $since = date('r', $error['since']);
	315	+ $mostRecent = date('r', $error['ts']);
	316	+ FeedWordPress::diagnostic(
	317	+ 'updated_feeds:errors:persistent',
	318	+ "Feed Update Error: [${url}] returning errors"
	319	+ ." since ${since}:<br/><code>$mesg</code>",
	320	+ $url, $error['since'], $error['ts']
	321	+ );
	322	+ endif;
	323	+ endforeach;
	324	+ }
	325	+
	326	+ function admin_emails ($id = '') {
	327	+ $users = get_users_of_blog($id);
	328	+ $recipients = array();
	329	+ foreach ($users as $user) :
	330	+ $user_id = (isset($user->user_id) ? $user->user_id : $user->ID);
	331	+ $dude = new WP_User($user_id);
	332	+ if ($dude->has_cap('administrator')) :
	333	+ if ($dude->user_email) :
	334	+ $recipients[] = $dude->user_email;
	335	+ endif;
	336	+ endif;
	337	+ endforeach;
	338	+ return $recipients;
	339	+ }
	340	+} /* class FeedWordPressDiagnostic */
	341	+
	342	+function debug_out_human_readable_bytes ($quantity) {
	343	+ $quantity = (int) $quantity;
	344	+ $magnitude = 'B';
	345	+ $orders = array('KB', 'MB', 'GB', 'TB');
	346	+ while (($quantity > (1024*100)) and (count($orders) > 0)) :
	347	+ $quantity = floor($quantity / 1024);
	348	+ $magnitude = array_shift($orders);
	349	+ endwhile;
	350	+ return "${quantity} ${magnitude}";
	351	+}
	352	+
	353	+function debug_out_feedwordpress_footer () {
	354	+ if (FeedWordPress::diagnostic_on('memory_usage')) :
	355	+ if (function_exists('memory_get_usage')) :
	356	+ FeedWordPress::diagnostic ('memory_usage', "Memory: Current usage: ".debug_out_human_readable_bytes(memory_get_usage()));
	357	+ endif;
	358	+ if (function_exists('memory_get_peak_usage')) :
	359	+ FeedWordPress::diagnostic ('memory_usage', "Memory: Peak usage: ".debug_out_human_readable_bytes(memory_get_peak_usage()));
	360	+ endif;
	361	+ endif;
	362	+} /* debug_out_feedwordpress_footer() */
	363	+
	364	+################################################################################
	365	+## TEMPLATE API: functions to make your templates syndication-aware ############
	366	+################################################################################
	367	+
200	368	/**
201		- * Hook to deactivate FeedWordPress.
	369	+ * is_syndicated: Tests whether the current post in a Loop context, or a post
	370	+ * given by ID number, was syndicated by FeedWordPress. Useful for templates
	371	+ * to determine whether or not to retrieve syndication-related meta-data in
	372	+ * displaying a post.
202	373	*
203		- * @return int|false @see wp_clear_scheduled_hook()
	374	+ * @param int $id The post to check for syndicated status. Defaults to the current post in a Loop context.
	375	+ * @return bool TRUE if the post's meta-data indicates it was syndicated; FALSE otherwise
204	376	*/
205		-function feedwordpress_deactivate() {
206		- wp_clear_scheduled_hook( 'fwp_scheduled_update_checkin' );
207		-} /* feedwordpress_deactivate () */
	377	+function is_syndicated ($id = NULL) {
	378	+ $p = new FeedWordPressLocalPost($id);
	379	+ return $p->is_syndicated();
	380	+} /* function is_syndicated() */
208	381
209		-################################################################################
210		-## LOGGING FUNCTIONS: log status updates to error_log if you want it ###########
211		-################################################################################
	382	+function feedwordpress_display_url ($url, $before = 60, $after = 0) {
	383	+ $bits = parse_url($url);
212	384
	385	+ // Strip out crufty subdomains
	386	+ if (isset($bits['host'])) :
	387	+ $bits['host'] = preg_replace('/^www[0-9]*\./i', '', $bits['host']);
	388	+ endif;
	389	+
	390	+ // Reassemble bit-by-bit with minimum of crufty elements
	391	+ $url = (isset($bits['user'])?$bits['user'].'@':'')
	392	+ .(isset($bits['host'])?$bits['host']:'')
	393	+ .(isset($bits['path'])?$bits['path']:'')
	394	+ .(isset($uri_bits['port'])?':'.$uri_bits['port']:'')
	395	+ .(isset($bits['query'])?'?'.$bits['query']:'');
	396	+
	397	+ if (strlen($url) > ($before+$after)) :
	398	+ $url = substr($url, 0, $before).'.'.substr($url, 0 - $after, $after);
	399	+ endif;
	400	+
	401	+ return $url;
	402	+} /* feedwordpress_display_url () */
	403	+
	404	+function get_syndication_source_property ($original, $id, $local, $remote = NULL) {
	405	+ $p = new FeedWordPressLocalPost($id);
	406	+ return $p->meta($local, array("unproxy" => $original, "unproxied setting" => $remote));
	407	+} /* function get_syndication_source_property () */
	408	+
	409	+function get_syndication_source_link ($original = NULL, $id = NULL) {
	410	+ $p = new FeedWordPressLocalPost($id);
	411	+ return $p->syndication_source_link($original);
	412	+} /* function get_syndication_source_link() */
	413	+
	414	+function the_syndication_source_link ($original = NULL, $id = NULL) {
	415	+ echo get_syndication_source_link($original, $id);
	416	+} /* function the_syndication_source_link() */
	417	+
	418	+function get_syndication_source ($original = NULL, $id = NULL) {
	419	+ $p = new FeedWordPressLocalPost($id);
	420	+ return $p->syndication_source($original);
	421	+} /* function get_syndication_source() */
	422	+
	423	+function the_syndication_source ($original = NULL, $id = NULL) {
	424	+ echo get_syndication_source($original, $id);
	425	+} /* function the_syndication_source () */
	426	+
	427	+function get_syndication_feed ($original = NULL, $id = NULL) {
	428	+ $p = new FeedWordPressLocalPost($id);
	429	+ return $p->syndication_feed($original);
	430	+} /* function get_syndication_feed() */
	431	+
	432	+function the_syndication_feed ($original = NULL, $id = NULL) {
	433	+ echo get_syndication_feed($original, $id);
	434	+} /* function the_syndication_feed() */
	435	+
	436	+function get_syndication_feed_guid ($original = NULL, $id = NULL) {
	437	+ $p = new FeedWordPressLocalPost($id);
	438	+ return $p->syndication_feed_guid($original);
	439	+} /* function get_syndication_feed_guid () */
	440	+
	441	+function the_syndication_feed_guid ($original = NULL, $id = NULL) {
	442	+ echo get_syndication_feed_guid($original, $id);
	443	+} /* function the_syndication_feed_guid () */
	444	+
	445	+function get_syndication_feed_id ($id = NULL) {
	446	+ $p = new FeedWordPressLocalPost($id);
	447	+ return $p->feed_id();
	448	+} /* function get_syndication_feed_id () */
	449	+
	450	+function the_syndication_feed_id ($id = NULL) {
	451	+ echo get_syndication_feed_id($id);
	452	+} /* function the_syndication_feed_id () */
	453	+
	454	+function get_syndication_feed_object ($id = NULL) {
	455	+ $p = new FeedWordPressLocalPost($id);
	456	+ return $p->feed();
	457	+} /* function get_syndication_feed_object() */
	458	+
	459	+function get_feed_meta ($key, $id = NULL) {
	460	+ $ret = NULL;
	461	+
	462	+ $link = get_syndication_feed_object($id);
	463	+ if (is_object($link) and isset($link->settings[$key])) :
	464	+ $ret = $link->settings[$key];
	465	+ endif;
	466	+ return $ret;
	467	+} /* function get_feed_meta() */
	468	+
	469	+function get_syndication_permalink ($id = NULL) {
	470	+ $p = new FeedWordPressLocalPost($id);
	471	+ return $p->syndication_permalink();
	472	+} /* function get_syndication_permalink () */
	473	+
	474	+function the_syndication_permalink ($id = NULL) {
	475	+ echo get_syndication_permalink($id);
	476	+} /* function the_syndication_permalink () */
	477	+
213	478	/**
214		- * Divides bytes into units of higher magnitude (e.g KB, MB, etc).
	479	+ * get_local_permalink: returns a string containing the internal permalink
	480	+ * for a post (whether syndicated or not) on your local WordPress installation.
	481	+ * This may be useful if you want permalinks to point to the original source of
	482	+ * an article for most purposes, but want to retrieve a URL for the local
	483	+ * representation of the post for one or two limited purposes (for example,
	484	+ * linking to a comments page on your local aggregator site).
215	485	*
216		- * @param int|string $quantity Quantity in bytes to be displayed. Can be a string that only includes numeric digits.
	486	+ * @param $id The numerical ID of the post to get the permalink for. If empty,
	487	+ * defaults to the current post in a Loop context.
	488	+ * @return string The URL of the local permalink for this post.
217	489	*
218		- * @return string Formatted string with quantity and unit.
	490	+ * @uses get_permalink()
	491	+ * @global $feedwordpress_the_original_permalink
219	492	*
220		- * @deprecated use the WordPress built-in `size_format()` function instead! (gwyneth 20230918)
	493	+ * @since 2010.0217
221	494	*/
222		-function debug_out_human_readable_bytes( $quantity ) {
223		- if ( ! is_numeric( $quantity ) ) :
224		- return __( "(wrong quantity)" );
225		- endif;
226		- $quantity = intval( $quantity );
227		- $magnitude = 'B';
228		- /** @var array Two-letter abbreviations of the units in increasing magnitude. */
229		- $orders = array( 'KB', 'MB', 'GB', 'TB' );
230		- while ( ( $quantity > ( 1024 * 100 ) ) and ( count( $orders ) > 0 ) ) :
231		- $quantity = floor( $quantity / 1024 );
232		- $magnitude = array_shift( $orders );
233		- endwhile;
234		- return "{$quantity} {$magnitude}";
235		-}
	495	+function get_local_permalink ($id = NULL) {
	496	+ global $feedwordpress_the_original_permalink;
236	497
237		-function debug_out_feedwordpress_footer() {
238		- if ( FeedWordPressDiagnostic::is_on('memory_usage') ) :
239		- if ( function_exists('memory_get_usage') ) :
240		- FeedWordPress::diagnostic( 'memory_usage', "Memory: Current usage: " . size_format( memory_get_usage() ) );
241		- endif;
242		- if ( function_exists('memory_get_peak_usage') ) :
243		- FeedWordPress::diagnostic('memory_usage', "Memory: Peak usage: " . size_format( memory_get_peak_usage() ) );
244		- endif;
245		- endif;
246		-} /* debug_out_feedwordpress_footer() */
	498	+ // get permalink, and thus activate filter and force global to be filled
	499	+ // with original URL.
	500	+ $url = get_permalink($id);
	501	+ return $feedwordpress_the_original_permalink;
	502	+} /* get_local_permalink() */
247	503
	504	+/**
	505	+ * the_original_permalink: displays the contents of get_original_permalink()
	506	+ *
	507	+ * @param $id The numerical ID of the post to get the permalink for. If empty,
	508	+ * defaults to the current post in a Loop context.
	509	+ *
	510	+ * @uses get_local_permalinks()
	511	+ * @uses apply_filters
	512	+ *
	513	+ * @since 2010.0217
	514	+ */
	515	+function the_local_permalink ($id = NULL) {
	516	+ print apply_filters('the_permalink', get_local_permalink($id));
	517	+} /* function the_local_permalink() */
	518	+
248	519	################################################################################
249	520	## FILTERS: syndication-aware handling of post data for templates and feeds ####
250	521	################################################################################
251	522
252		-$feedwordpress_the_syndicated_content = null;
253		-$feedwordpress_the_original_permalink = null;
	523	+$feedwordpress_the_syndicated_content = NULL;
	524	+$feedwordpress_the_original_permalink = NULL;
254	525
255	526	function feedwordpress_preserve_syndicated_content ($text) {
256	527	global $feedwordpress_the_syndicated_content;
257	528
258	529	$p = new FeedWordPressLocalPost;
259		- if ( ! $p->is_exposed_to_formatting_filters()) :
	530	+ if (!$p->is_exposed_to_formatting_filters()) :
260	531	$feedwordpress_the_syndicated_content = $text;
261	532	else :
262		- $feedwordpress_the_syndicated_content = null;
	533	+ $feedwordpress_the_syndicated_content = NULL;
263	534	endif;
264	535	return $text;
265	536	}
266	537
		@@ -278,21 +549,21 @@
278	549	// In a post context....
279	550	if (is_syndicated()) :
280	551	?>
281	552	<source>
282		- <title><?php print esc_html( get_syndication_source() ); ?></title>
283		- <link rel="alternate" type="text/html" href="<?php print esc_url( get_syndication_source_link() ); ?>" />
284		- <link rel="self" href="<?php print esc_url( get_syndication_feed() ); ?>" />
	553	+ <title><?php print htmlspecialchars(get_syndication_source()); ?></title>
	554	+ <link rel="alternate" type="text/html" href="<?php print htmlspecialchars(get_syndication_source_link()); ?>" />
	555	+ <link rel="self" href="<?php print htmlspecialchars(get_syndication_feed()); ?>" />
285	556	<?php
286	557	$id = get_syndication_feed_guid();
287		- if ( strlen( $id ) > 0 ) :
	558	+ if (strlen($id) > 0) :
288	559	?>
289		- <id><?php print esc_xml( $id ); ?></id>
	560	+ <id><?php print htmlspecialchars($id); ?></id>
290	561	<?php
291	562	endif;
292	563	$updated = get_feed_meta('feed/updated');
293		- if ( strlen( $updated ) > 0 ) : ?>
294		- <updated><?php print esc_xml( $updated ); ?></updated>
	564	+ if (strlen($updated) > 0) : ?>
	565	+ <updated><?php print $updated; ?></updated>
295	566	<?php
296	567	endif;
297	568	?>
298	569	</source>
		@@ -306,11 +577,8 @@
306	577	* Syndication => Posts & Links. Saves the old internal permalink in a global
307	578	* variable for later use.
308	579	*
309	580	* @param string $permalink The internal permalink
310		- * @param mixed|null $post Post object
311		- * @param bool $leavename Unused
312		- * @param bool $sample Unused
313	581	* @return string The new permalink. Same as the old if the post is not
314	582	* syndicated, or if FWP is set to use internal permalinks, or if the post
315	583	* was syndicated, but didn't have a proper permalink recorded.
316	584	*
		@@ -320,9 +588,9 @@
320	588	* @uses url_to_postid()
321	589	* @global $id
322	590	* @global $feedwordpress_the_original_permalink
323	591	*/
324		-function syndication_permalink($permalink = '', $post = null, $leavename = false, $sample = false ) {
	592	+function syndication_permalink ($permalink = '', $post = null, $leavename = false, $sample = false) {
325	593	global $id;
326	594	global $feedwordpress_the_original_permalink;
327	595
328	596	// Save the local permalink in case we need to retrieve it later.
		@@ -386,9 +654,9 @@
386	654	* @uses is_syndicated()
387	655	* @uses FeedWordPress::munge_permalinks()
388	656	*/
389	657	function syndication_comments_feed_link ($link) {
390		- global $feedwordpress_the_original_permalink;
	658	+ global $feedwordpress_the_original_permalink, $id;
391	659
392	660	if (is_syndicated() and FeedWordPress::munge_permalinks()) :
393	661	// If the source post provided a comment feed URL using
394	662	// wfw:commentRss or atom:link/@rel="replies" we can make use of
		@@ -393,9 +661,9 @@
393	661	// If the source post provided a comment feed URL using
394	662	// wfw:commentRss or atom:link/@rel="replies" we can make use of
395	663	// that value here.
396	664	$source = get_syndication_feed_object();
397		- $replacement = null;
	665	+ $replacement = NULL;
398	666
399	667	if (is_object($source) && $source->setting('munge comments feed links', 'munge_comments_feed_links', 'yes') != 'no') :
400	668	$commentFeeds = get_post_custom_values('wfw:commentRSS');
401	669	if (
		@@ -435,24 +703,441 @@
435	703	// comments feed link is never munged by FWP.
436	704	endif;
437	705	endif;
438	706
439		- if ( !is_null($replacement)) : $link = $replacement; endif;
	707	+ if (!is_null($replacement)) : $link = $replacement; endif;
440	708	endif;
441	709	return $link;
442	710	} /* function syndication_comments_feed_link() */
443	711
444		- require_once("{$dir}/feedwordpress.pings.functions.php");
	712	+################################################################################
	713	+## ADMIN MENU ADD-ONS: register Dashboard management pages #####################
	714	+################################################################################
445	715
446		- require_once("{$dir}/feedwordpress.wp-admin.post-edit.functions.php");
	716	+function fwp_add_pages () {
	717	+ global $feedwordpress;
447	718
	719	+ $menu_cap = FeedWordPress::menu_cap();
	720	+ $settings_cap = FeedWordPress::menu_cap(/*sub=*/ true);
	721	+ $syndicationMenu = FeedWordPress::path('syndication.php');
	722	+
	723	+ add_menu_page(
	724	+ 'Syndicated Sites', 'Syndication',
	725	+ $menu_cap,
	726	+ $syndicationMenu,
	727	+ NULL,
	728	+ plugins_url( '/'.FeedWordPress::path('feedwordpress-tiny.png') )
	729	+ );
	730	+
	731	+ do_action('feedwordpress_admin_menu_pre_feeds', $menu_cap, $settings_cap);
	732	+ add_submenu_page(
	733	+ $syndicationMenu, 'Syndicated Sites', 'Syndicated Sites',
	734	+ $settings_cap, $syndicationMenu
	735	+ );
	736	+
	737	+ do_action('feedwordpress_admin_menu_pre_feeds', $menu_cap, $settings_cap);
	738	+ add_submenu_page(
	739	+ $syndicationMenu, 'Syndicated Feeds & Updates', 'Feeds & Updates',
	740	+ $settings_cap, FeedWordPress::path('feeds-page.php')
	741	+ );
	742	+
	743	+ do_action('feedwordpress_admin_menu_pre_posts', $menu_cap, $settings_cap);
	744	+ add_submenu_page(
	745	+ $syndicationMenu, 'Syndicated Posts & Links', 'Posts & Links',
	746	+ $settings_cap, FeedWordPress::path('posts-page.php')
	747	+ );
	748	+
	749	+ do_action('feedwordpress_admin_menu_pre_authors', $menu_cap, $settings_cap);
	750	+ add_submenu_page(
	751	+ $syndicationMenu, 'Syndicated Authors', 'Authors',
	752	+ $settings_cap, FeedWordPress::path('authors-page.php')
	753	+ );
	754	+
	755	+ do_action('feedwordpress_admin_menu_pre_categories', $menu_cap, $settings_cap);
	756	+ add_submenu_page(
	757	+ $syndicationMenu, 'Categories & Tags', 'Categories & Tags',
	758	+ $settings_cap, FeedWordPress::path('categories-page.php')
	759	+ );
	760	+
	761	+ do_action('feedwordpress_admin_menu_pre_performance', $menu_cap, $settings_cap);
	762	+ add_submenu_page(
	763	+ $syndicationMenu, 'FeedWordPress Performance', 'Performance',
	764	+ $settings_cap, FeedWordPress::path('performance-page.php')
	765	+ );
	766	+
	767	+ do_action('feedwordpress_admin_menu_pre_diagnostics', $menu_cap, $settings_cap);
	768	+ add_submenu_page(
	769	+ $syndicationMenu, 'FeedWordPress Diagnostics', 'Diagnostics',
	770	+ $settings_cap, FeedWordPress::path('diagnostics-page.php')
	771	+ );
	772	+
	773	+ add_filter('page_row_actions', array($feedwordpress, 'row_actions'), 10, 2);
	774	+ add_filter('post_row_actions', array($feedwordpress, 'row_actions'), 10, 2);
	775	+} /* function fwp_add_pages () */
	776	+
	777	+function fwp_check_debug () {
	778	+ // This is a horrible fucking kludge that I have to do because the
	779	+ // admin notice code is triggered before the code that updates the
	780	+ // setting.
	781	+ if (isset($_POST['feedwordpress_debug'])) :
	782	+ $feedwordpress_debug = $_POST['feedwordpress_debug'];
	783	+ else :
	784	+ $feedwordpress_debug = get_option('feedwordpress_debug');
	785	+ endif;
	786	+ if ($feedwordpress_debug==='yes') :
	787	+?>
	788	+ <div class="error">
	789	+<p><strong>FeedWordPress warning.</strong> Debugging mode is <strong>ON</strong>.
	790	+While it remains on, FeedWordPress displays many diagnostic error messages,
	791	+warnings, and notices that are ordinarily suppressed, and also turns off all
	792	+caching of feeds. Use with caution: this setting is absolutely inappropriate
	793	+for a production server.</p>
	794	+ </div>
	795	+<?php
	796	+ endif;
	797	+} /* function fwp_check_debug () */
	798	+
448	799	################################################################################
	800	+## fwp_hold_pings() and fwp_release_pings(): Outbound XML-RPC ping reform ####
	801	+## ... 'coz it's rude to send 500 pings the first time your aggregator runs ####
	802	+################################################################################
	803	+
	804	+$fwp_held_ping = NULL; // NULL: not holding pings yet
	805	+
	806	+function fwp_hold_pings () {
	807	+ global $fwp_held_ping;
	808	+ if (is_null($fwp_held_ping)):
	809	+ $fwp_held_ping = 0; // 0: ready to hold pings; none yet received
	810	+ endif;
	811	+}
	812	+
	813	+function fwp_release_pings () {
	814	+ global $fwp_held_ping;
	815	+ if ($fwp_held_ping):
	816	+ if (function_exists('wp_schedule_single_event')) :
	817	+ wp_schedule_single_event(time(), 'do_pings');
	818	+ else :
	819	+ generic_ping($fwp_held_ping);
	820	+ endif;
	821	+ endif;
	822	+ $fwp_held_ping = NULL; // NULL: not holding pings anymore
	823	+}
	824	+
	825	+function fwp_do_pings () {
	826	+ if (!is_null($fwp_held_ping) and $post_id) : // Defer until we're done updating
	827	+ $fwp_held_ping = $post_id;
	828	+ elseif (function_exists('do_all_pings')) :
	829	+ do_all_pings();
	830	+ else :
	831	+ generic_ping($fwp_held_ping);
	832	+ endif;
	833	+}
	834	+
	835	+function fwp_publish_post_hook ($post_id) {
	836	+ global $fwp_held_ping;
	837	+
	838	+ if (!is_null($fwp_held_ping)) : // Syndicated post. Don't mark with _pingme
	839	+ if ( defined('XMLRPC_REQUEST') )
	840	+ do_action('xmlrpc_publish_post', $post_id);
	841	+ if ( defined('APP_REQUEST') )
	842	+ do_action('app_publish_post', $post_id);
	843	+
	844	+ if ( defined('WP_IMPORTING') )
	845	+ return;
	846	+
	847	+ // Defer sending out pings until we finish updating
	848	+ $fwp_held_ping = $post_id;
	849	+ else :
	850	+ if (function_exists('_publish_post_hook')) : // WordPress 2.3
	851	+ _publish_post_hook($post_id);
	852	+ endif;
	853	+ endif;
	854	+}
	855	+
	856	+ function feedwordpress_add_post_edit_controls () {
	857	+ global $feedwordpress;
	858	+ global $inspectPostMeta;
	859	+
	860	+ // Put in Manual Editing checkbox
	861	+ add_action('add_meta_boxes', 'feedwordpress_post_add_meta_boxes', 10, 2);
	862	+
	863	+ add_filter('user_can_richedit', array($feedwordpress, 'user_can_richedit'), 1000, 1);
	864	+
	865	+ if (FeedWordPress::diagnostic_on('syndicated_posts:static_meta_data')) :
	866	+ $inspectPostMeta = new InspectPostMeta;
	867	+ endif;
	868	+ } // function feedwordpress_add_post_edit_controls ()
	869	+
	870	+ function feedwordpress_post_add_meta_boxes ($post_type, $post) {
	871	+ add_meta_box(
	872	+ 'feedwordpress-post-controls',
	873	+ __('Syndication'),
	874	+ 'feedwordpress_post_edit_controls',
	875	+ $post_type,
	876	+ 'side',
	877	+ 'high'
	878	+ );
	879	+ }
	880	+
	881	+ function feedwordpress_post_edit_controls () {
	882	+ global $post;
	883	+
	884	+ $frozen_values = get_post_custom_values('_syndication_freeze_updates', $post->ID);
	885	+ $frozen_post = (count($frozen_values) > 0 and 'yes' == $frozen_values[0]);
	886	+
	887	+ if (is_syndicated($post->ID)) :
	888	+ ?>
	889	+ <p>This is a syndicated post, which originally appeared at
	890	+ <cite><?php print esc_html(get_syndication_source(NULL, $post->ID)); ?></cite>.
	891	+ <a href="<?php print esc_html(get_syndication_permalink($post->ID)); ?>">View original post</a>.</p>
	892	+
	893	+ <?php do_action('feedwordpress_post_edit_controls_pre', $post); ?>
	894	+
	895	+ <p><input type="hidden" name="feedwordpress_noncename" id="feedwordpress_noncename" value="<?php print wp_create_nonce(plugin_basename(__FILE__)); ?>" />
	896	+ <label><input type="checkbox" name="freeze_updates" value="yes" <?php if ($frozen_post) : ?>checked="checked"<?php endif; ?> /> <strong>Manual editing.</strong>
	897	+ If set, FeedWordPress will not overwrite the changes you make manually
	898	+ to this post, if the syndicated content is updated on the
	899	+ feed.</label></p>
	900	+
	901	+ <?php do_action('feedwordpress_post_edit_controls', $post); ?>
	902	+
	903	+ <?php
	904	+ else :
	905	+ ?>
	906	+ <p>This post was created locally at this website.</p>
	907	+ <?php
	908	+ endif;
	909	+ } /* function feedwordpress_post_edit_controls () */
	910	+
	911	+ function feedwordpress_save_post_edit_controls ( $post_id ) {
	912	+ global $post;
	913	+ if (!isset($_POST['feedwordpress_noncename']) or !wp_verify_nonce($_POST['feedwordpress_noncename'], plugin_basename(__FILE__))) :
	914	+ return $post_id;
	915	+ endif;
	916	+
	917	+ // Verify if this is an auto save routine. If it is our form has
	918	+ // not been submitted, so we don't want to do anything.
	919	+ if ( defined('DOING_AUTOSAVE') and DOING_AUTOSAVE ) :
	920	+ return $post_id;
	921	+ endif;
	922	+
	923	+ // The data in $_POST is for applying only to the post actually
	924	+ // in the edit window, i.e. $post
	925	+ if ($post_id != $post->ID) :
	926	+ return $post_id;
	927	+ endif;
	928	+
	929	+ // Check permissions
	930	+ $cap[0] = 'edit_post';
	931	+ $cap[1] = 'edit_' . $_POST['post_type'];
	932	+ if (
	933	+ !current_user_can( $cap[0], $post_id )
	934	+ and !current_user_can( $cap[1], $post_id )
	935	+ ) :
	936	+ return $post_id;
	937	+ endif;
	938	+
	939	+ // OK, we're golden. Now let's save some data.
	940	+ if (isset($_POST['freeze_updates'])) :
	941	+
	942	+ update_post_meta($post_id, '_syndication_freeze_updates', $_POST['freeze_updates']);
	943	+ $ret = $_POST['freeze_updates'];
	944	+
	945	+ // If you make manual edits through the WordPress editing
	946	+ // UI then they should be run through normal WP formatting
	947	+ // filters.
	948	+ update_post_meta($post_id, '_feedwordpress_formatting_filters', 'yes');
	949	+
	950	+ else :
	951	+ delete_post_meta($post_id, '_syndication_freeze_updates');
	952	+ $ret = NULL;
	953	+ endif;
	954	+
	955	+ do_action('feedwordpress_save_edit_controls', $post_id);
	956	+
	957	+ return $ret;
	958	+ } // function feedwordpress_save_edit_controls
	959	+
	960	+################################################################################
449	961	## class FeedWordPressBoilerplateReformatter ###################################
450	962	################################################################################
451	963
452		-require_once("{$dir}/feedwordpressboilerplatereformatter.class.php");
453		-require_once("{$dir}/feedwordpressboilerplatereformatter.shortcode.functions.php");
	964	+class FeedWordPressBoilerplateReformatter {
	965	+ var $id, $element;
454	966
	967	+ public function __construct ($id = NULL, $element = 'post') {
	968	+ $this->id = $id;
	969	+ $this->element = $element;
	970	+ }
	971	+
	972	+ function shortcode_methods () {
	973	+ return array(
	974	+ 'source' => 'source_link',
	975	+ 'source-name' => 'source_name',
	976	+ 'source-url' => 'source_url',
	977	+ 'original-link' => 'original_link',
	978	+ 'original-url' => 'original_url',
	979	+ 'author' => 'source_author_link',
	980	+ 'author-name' => 'source_author',
	981	+ 'feed-setting' => 'source_setting',
	982	+ );
	983	+ }
	984	+ function do_shortcode ($template) {
	985	+ $codes = $this->shortcode_methods();
	986	+
	987	+ // Register shortcodes relative to this object/post ID/element.
	988	+ foreach ($codes as $code => $method) :
	989	+ add_shortcode($code, array($this, $method));
	990	+ endforeach;
	991	+
	992	+ $template = do_shortcode($template);
	993	+
	994	+ // Unregister shortcodes.
	995	+ foreach ($codes as $code => $method) :
	996	+ remove_shortcode($code);
	997	+ endforeach;
	998	+
	999	+ return $template;
	1000	+ }
	1001	+
	1002	+ function source_name ($atts) {
	1003	+ $param = shortcode_atts(array(
	1004	+ 'original' => NULL,
	1005	+ ), $atts);
	1006	+ return get_syndication_source($param['original'], $this->id);
	1007	+ }
	1008	+ function source_url ($atts) {
	1009	+ $param = shortcode_atts(array(
	1010	+ 'original' => NULL,
	1011	+ ), $atts);
	1012	+ return get_syndication_source_link($param['original'], $this->id);
	1013	+ }
	1014	+ function source_link ($atts) {
	1015	+ switch (strtolower($atts[0])) :
	1016	+ case '-name' :
	1017	+ $ret = $this->source_name($atts);
	1018	+ break;
	1019	+ case '-url' :
	1020	+ $ret = $this->source_url($atts);
	1021	+ break;
	1022	+ default :
	1023	+ $param = shortcode_atts(array(
	1024	+ 'original' => NULL,
	1025	+ ), $atts);
	1026	+ if ('title' == $this->element) :
	1027	+ $ret = $this->source_name($atts);
	1028	+ else :
	1029	+ $ret = '<a href="'.htmlspecialchars($this->source_url($atts)).'">'.htmlspecialchars($this->source_name($atts)).'</a>';
	1030	+ endif;
	1031	+ endswitch;
	1032	+ return $ret;
	1033	+ }
	1034	+ function source_setting ($atts) {
	1035	+ $param = shortcode_atts(array(
	1036	+ 'key' => NULL,
	1037	+ ), $atts);
	1038	+ return get_feed_meta($param['key'], $this->id);
	1039	+ }
	1040	+ function original_link ($atts, $text) {
	1041	+ $url = $this->original_url($atts);
	1042	+ return '<a href="'.esc_url($url).'">'.do_shortcode($text).'</a>';
	1043	+ }
	1044	+ function original_url ($atts) {
	1045	+ return get_syndication_permalink($this->id);
	1046	+ }
	1047	+ function source_author ($atts) {
	1048	+ return get_the_author();
	1049	+ }
	1050	+ function source_author_link ($atts) {
	1051	+ switch (strtolower($atts[0])) :
	1052	+ case '-name' :
	1053	+ $ret = $this->source_author($atts);
	1054	+ break;
	1055	+ default :
	1056	+ global $authordata; // Janky.
	1057	+ if ('title' == $this->element) :
	1058	+ $ret = $this->source_author($atts);
	1059	+ else :
	1060	+ $ret = get_the_author();
	1061	+ $url = get_author_posts_url((int) $authordata->ID, (int) $authordata->user_nicename);
	1062	+ if ($url) :
	1063	+ $ret = '<a href="'.$url.'" '
	1064	+ .'title="Read other posts by '.esc_html($authordata->display_name).'">'
	1065	+ .$ret
	1066	+ .'</a>';
	1067	+ endif;
	1068	+ endif;
	1069	+ endswitch;
	1070	+ return $ret;
	1071	+ }
	1072	+}
	1073	+
	1074	+function add_boilerplate_reformat ($template, $element, $id = NULL) {
	1075	+ if ('post' == $element and !preg_match('/< (p|div) ( \s [^>]+ )? >/xi', $template)) :
	1076	+ $template = '<p class="syndicated-attribution">'.$template.'</p>';
	1077	+ endif;
	1078	+
	1079	+ $ref = new FeedWordPressBoilerplateReformatter($id, $element);
	1080	+ return $ref->do_shortcode($template);
	1081	+}
	1082	+
	1083	+function add_boilerplate_simple ($element, $title, $id = NULL) {
	1084	+ if (is_syndicated($id)) :
	1085	+ $meta = get_feed_meta('boilerplate rules', $id);
	1086	+ if ($meta and !is_array($meta)) : $meta = unserialize($meta); endif;
	1087	+
	1088	+ if (!is_array($meta) or empty($meta)) :
	1089	+ $meta = get_option('feedwordpress_boilerplate');
	1090	+ endif;
	1091	+
	1092	+ if (is_array($meta) and !empty($meta)) :
	1093	+ foreach ($meta as $rule) :
	1094	+ if ($element==$rule['element']) :
	1095	+ $rule['template'] = add_boilerplate_reformat($rule['template'], $element, $id);
	1096	+
	1097	+ if ('before'==$rule['placement']) :
	1098	+ $title = $rule['template'] . ' ' . $title;
	1099	+ else :
	1100	+ $title = $title . ' ' . $rule['template'];
	1101	+ endif;
	1102	+ endif;
	1103	+ endforeach;
	1104	+ endif;
	1105	+ endif;
	1106	+ return $title;
	1107	+}
	1108	+function add_boilerplate_title ($title, $id = NULL) {
	1109	+ return add_boilerplate_simple('title', $title, $id);
	1110	+}
	1111	+function add_boilerplate_excerpt ($title, $id = NULL) {
	1112	+ return add_boilerplate_simple('excerpt', $title, $id);
	1113	+}
	1114	+function add_boilerplate_content ($content) {
	1115	+ if (is_syndicated()) :
	1116	+ $meta = get_feed_meta('boilerplate rules');
	1117	+ if ($meta and !is_array($meta)) : $meta = unserialize($meta); endif;
	1118	+
	1119	+ if (!is_array($meta) or empty($meta)) :
	1120	+ $meta = get_option('feedwordpress_boilerplate');
	1121	+ endif;
	1122	+
	1123	+ if (is_array($meta) and !empty($meta)) :
	1124	+ foreach ($meta as $rule) :
	1125	+ if ('post'==$rule['element']) :
	1126	+ $rule['template'] = add_boilerplate_reformat($rule['template'], 'post');
	1127	+
	1128	+ if ('before'==$rule['placement']) :
	1129	+ $content = $rule['template'] . "\n" . $content;
	1130	+ else :
	1131	+ $content = $content . "\n" . $rule['template'];
	1132	+ endif;
	1133	+ endif;
	1134	+ endforeach;
	1135	+ endif;
	1136	+ endif;
	1137	+ return $content;
	1138	+}
	1139	+
455	1140	################################################################################
456	1141	## class FeedWordPress #########################################################
457	1142	################################################################################
458	1143
		@@ -489,23 +1174,20 @@
489	1174	array('q', 'cite'),
490	1175	array('script', 'src')
491	1176	);
492	1177
493		- var $feeds = null;
494		- var $feedurls = null;
495		- var $httpauth = null;
	1178	+ var $feeds = NULL;
	1179	+ var $feedurls = NULL;
	1180	+ var $httpauth = NULL;
496	1181
497	1182	/**
498	1183	* FeedWordPress::__construct (): Construct FeedWordPress singleton object
499	1184	* and retrieves a list of feeds for later reference.
500		- *
501		- * @uses FeedWordPressHTTPAuthenticator
502	1185	*/
503	1186	public function __construct () {
504	1187	$this->feeds = array ();
505	1188	$this->feedurls = array();
506	1189	$links = FeedWordPress::syndicated_links();
507		-
508	1190	if ($links): foreach ($links as $link):
509	1191	$id = intval($link->link_id);
510	1192	$url = $link->link_rss;
511	1193
		@@ -515,12 +1197,8 @@
515	1197	$this->feedurls[$url] = $id;
516	1198	endif;
517	1199	endforeach; endif;
518	1200
519		- // System-related event hooks
520		- add_filter('cron_schedules', array($this, 'cron_schedules'), 10, 1);
521		-
522		- // FeedWordPress-related event hooks
523	1201	add_filter('feedwordpress_update_complete', array($this, 'process_retirements'), 1000, 1);
524	1202
525	1203	$this->httpauth = new FeedWordPressHTTPAuthenticator;
526	1204	} /* FeedWordPress::__construct () */
		@@ -525,211 +1203,8 @@
525	1203	$this->httpauth = new FeedWordPressHTTPAuthenticator;
526	1204	} /* FeedWordPress::__construct () */
527	1205
528	1206	/**
529		- * FeedWordPress::add_filters() connects FeedWordPress to WordPress lifecycle
530		- * events by setting up action and filter hooks.
531		- *
532		- * @uses get_option()
533		- * @uses add_filter()
534		- * @uses add_action()
535		- * @uses remove_filter()
536		- */
537		- public function add_filters () {
538		- # Syndicated items are generally received in output-ready (X)HTML and
539		- # should not be folded, crumpled, mutilated, or spindled by WordPress
540		- # formatting filters. But we don't want to interfere with filters for
541		- # any locally-authored posts, either.
542		- #
543		- # What WordPress should really have is a way for upstream filters to
544		- # stop downstream filters from running at all. Since it doesn't, and
545		- # since a downstream filter can't access the original copy of the text
546		- # that is being filtered, what we will do here is (1) save a copy of the
547		- # original text upstream, before any other filters run, and then (2)
548		- # retrieve that copy downstream, after all the other filters run, *if*
549		- # this is a syndicated post
550		-
551		- add_filter('the_content', 'feedwordpress_preserve_syndicated_content', -10000);
552		- add_filter('the_content', 'feedwordpress_restore_syndicated_content', 10000);
553		-
554		- add_action('atom_entry', 'feedwordpress_item_feed_data');
555		-
556		- # Filter in original permalinks if the user wants that
557		- add_filter('post_link', 'syndication_permalink', /*priority=*/ 1, /*arguments=*/ 3);
558		- add_filter('post_type_link', 'syndication_permalink', /*priority=*/ 1, /*arguments=*/ 4);
559		-
560		- # When foreign URLs are used for permalinks in feeds or display
561		- # contexts, they need to be escaped properly.
562		- add_filter('the_permalink', 'syndication_permalink_escaped');
563		- add_filter('the_permalink_rss', 'syndication_permalink_escaped');
564		-
565		- add_filter('post_comments_feed_link', 'syndication_comments_feed_link');
566		-
567		- # WTF? By default, wp_insert_link runs incoming link_url and link_rss
568		- # URIs through default filters that include `wp_kses()`. But `wp_kses()`
569		- # just happens to escape any occurrence of & to &amp; -- which just
570		- # happens to fuck up any URI with a & to separate GET parameters.
571		- remove_filter('pre_link_rss', 'wp_filter_kses');
572		- remove_filter('pre_link_url', 'wp_filter_kses');
573		-
574		- # Boilerplate functionality: hook in to title, excerpt, and content to add boilerplate text
575		- $hookOrder = get_option('feedwordpress_boilerplate_hook_order', FEEDWORDPRESS_BOILERPLATE_DEFAULT_HOOK_ORDER);
576		- add_filter(
577		- /*hook=*/ 'the_title',
578		- /*function=*/ 'add_boilerplate_title',
579		- /*priority=*/ $hookOrder,
580		- /*arguments=*/ 2
581		- );
582		- add_filter(
583		- /*hook=*/ 'get_the_excerpt',
584		- /*function=*/ 'add_boilerplate_excerpt',
585		- /*priority=*/ $hookOrder,
586		- /*arguments=*/ 1
587		- );
588		- add_filter(
589		- /*hook=*/ 'the_content',
590		- /*function=*/ 'add_boilerplate_content',
591		- /*priority=*/ $hookOrder,
592		- /*arguments=*/ 1
593		- );
594		- add_filter(
595		- /*hook=*/ 'the_content_rss',
596		- /*function=*/ 'add_boilerplate_content',
597		- /*priority=*/ $hookOrder,
598		- /*arguments=*/ 1
599		- );
600		-
601		- # Admin menu
602		- add_action('admin_init', array($this, 'admin_init'));
603		- add_action('admin_menu', array($this, 'add_pages'));
604		- add_action('admin_notices', array($this, 'check_debug'));
605		-
606		- add_action('admin_menu', 'feedwordpress_add_post_edit_controls');
607		- add_action('save_post', 'feedwordpress_save_post_edit_controls');
608		-
609		- add_action('admin_footer', array($this, 'admin_footer'));
610		-
611		- add_action('syndicated_feed_error', array('FeedWordPressDiagnostic', 'feed_error'), 100, 3);
612		-
613		- add_action('wp_footer', 'debug_out_feedwordpress_footer', -100);
614		- add_action('admin_footer', 'debug_out_feedwordpress_footer', -100);
615		-
616		- # Cron-less auto-update. Hooray!
617		- $autoUpdateHook = $this->automatic_update_hook();
618		- if ( !is_null($autoUpdateHook)) :
619		- add_action($autoUpdateHook, array($this, 'auto_update'));
620		- endif;
621		-
622		- add_action('init', array($this, 'init'));
623		- add_action('wp_loaded', array($this, 'wp_loaded'));
624		-
625		- add_action('shutdown', array($this, 'email_diagnostic_log'));
626		- add_action('shutdown', array($this, 'feedwordpress_cleanup'));
627		- add_action('wp_dashboard_setup', array($this, 'dashboard_setup'));
628		-
629		- # Default sanitizers
630		- add_filter('syndicated_item_content', array('SyndicatedPost', 'resolve_relative_uris'), 0, 2);
631		- add_filter('syndicated_item_content', array('SyndicatedPost', 'sanitize_content'), 0, 2);
632		-
633		- add_action('plugins_loaded', array($this, 'admin_api'));
634		- add_action('all_admin_notices', array($this, 'all_admin_notices'));
635		-
636		- // Use the cache settings that we want, from a static method
637		- add_filter('wp_feed_cache_transient_lifetime', array(get_class($this), 'cache_lifetime'));
638		-
639		- } /* FeedWordPress::add_filters () */
640		-
641		- ################################################################################
642		- ## ADMIN MENU ADD-ONS: register Dashboard management pages #####################
643		- ################################################################################
644		-
645		- /**
646		- * FeedWordPress::add_pages(): set up WordPress admin interface pages thru
647		- * hooking in Syndication menu and submenus
648		- *
649		- * @uses FeedWordPress::menu_cap()
650		- * @uses FeedWordPress::path()
651		- * @uses add_menu_page()
652		- * @uses add_submenu_page()
653		- * @uses do_action()
654		- * @uses add_filter()
655		- */
656		- public function add_pages()
657		- {
658		- $menu_cap = FeedWordPress::menu_cap();
659		- $settings_cap = FeedWordPress::menu_cap( /*sub=*/ true );
660		- $syndicationMenu = FeedWordPress::path( 'syndication.php' );
661		-
662		- add_menu_page(
663		- /* page_title */ 'Syndicated Sites',
664		- /* menu_title */ 'Syndication',
665		- /* capability */ $menu_cap,
666		- /* menu_slug */ $syndicationMenu,
667		- /* function */ NULL,
668		- /* icon_url */ $this->plugin_dir_url( /* 'assets/images/feedwordpress-tiny.png' */ 'assets/images/icon.svg' )
669		- /* position */
670		- );
671		-
672		- do_action( 'feedwordpress_admin_menu_pre_feeds', $menu_cap, $settings_cap );
673		- add_submenu_page(
674		- /* parent_slug */ $syndicationMenu,
675		- /* page_title */ 'Syndicated Sites',
676		- /* menu_title */ 'Syndicated Sites',
677		- /* capability */ $settings_cap,
678		- /* menu_slug */ $syndicationMenu,
679		- /* function */
680		- );
681		-
682		- do_action('feedwordpress_admin_menu_pre_feeds', $menu_cap, $settings_cap);
683		- add_submenu_page(
684		- $syndicationMenu, 'Syndicated Feeds & Updates', 'Feeds & Updates',
685		- $settings_cap, FeedWordPress::path('feeds-page.php')
686		- );
687		-
688		- do_action('feedwordpress_admin_menu_pre_posts', $menu_cap, $settings_cap);
689		- add_submenu_page(
690		- $syndicationMenu, 'Syndicated Posts & Links', 'Posts & Links',
691		- $settings_cap, FeedWordPress::path('posts-page.php')
692		- );
693		-
694		- do_action('feedwordpress_admin_menu_pre_authors', $menu_cap, $settings_cap);
695		- add_submenu_page(
696		- $syndicationMenu, 'Syndicated Authors', 'Authors',
697		- $settings_cap, FeedWordPress::path('authors-page.php')
698		- );
699		-
700		- do_action('feedwordpress_admin_menu_pre_categories', $menu_cap, $settings_cap);
701		- add_submenu_page(
702		- $syndicationMenu, 'Categories & Tags', 'Categories & Tags',
703		- $settings_cap, FeedWordPress::path('categories-page.php')
704		- );
705		-
706		- do_action('feedwordpress_admin_menu_pre_performance', $menu_cap, $settings_cap);
707		- add_submenu_page(
708		- $syndicationMenu, 'FeedWordPress Performance', 'Performance',
709		- $settings_cap, FeedWordPress::path('performance-page.php')
710		- );
711		-
712		- do_action('feedwordpress_admin_menu_pre_diagnostics', $menu_cap, $settings_cap);
713		- add_submenu_page(
714		- $syndicationMenu, 'FeedWordPress Diagnostics', 'Diagnostics',
715		- $settings_cap, FeedWordPress::path('diagnostics-page.php')
716		- );
717		-
718		- add_filter('page_row_actions', array($this, 'row_actions'), 10, 2);
719		- add_filter('post_row_actions', array($this, 'row_actions'), 10, 2);
720		- } /* function FeedWordPress::add_pages () */
721		-
722		- public function check_debug() {
723		- // This is a horrible fucking kludge that I have to do because the
724		- // admin notice code is triggered before the code that updates the
725		- // setting.
726		- $feedwordpress_debug = FeedWordPress::param( 'feedwordpress_debug', get_option( 'feedwordpress_debug' ) );
727		-
728		- FeedWordPressSettingsUI::get_template_part( 'notice-debug-mode', $feedwordpress_debug, 'html' );
729		- } /* function FeedWordPress::check_debug () */
730		-
731		- /**
732	1207	* FeedWordPress::subscribed (): Check whether a feed is currently in the
733	1208	* subscription list for FeedWordPress.
734	1209	*
735	1210	* @param mixed $id Numeric ID of a WordPress link object or URL of a feed
		@@ -744,12 +1219,12 @@
744	1219	* given URL or numeric ID, if we have either an active subscription to
745	1220	* it; or a de-activated subscription.
746	1221	*
747	1222	* @param mixed $which Numeric ID for a WordPress link object or string URL for a feed
748		- * @return mixed SyndicatedLink object if subscription is found; null if not
	1223	+ * @return mixed SyndicatedLink object if subscription is found; NULL if not
749	1224	*/
750	1225	public function subscription ($which) {
751		- $sub = null;
	1226	+ $sub = NULL;
752	1227
753	1228	if (is_string($which) and isset($this->feedurls[$which])) :
754	1229	$which = $this->feedurls[$which];
755	1230	endif;
		@@ -765,9 +1240,9 @@
765	1240	$sub = get_bookmark($which);
766	1241	endif;
767	1242
768	1243	// Load 'er up if you haven't already.
769		- if ( !is_null($sub) and !($sub InstanceOf SyndicatedLink)) :
	1244	+ if (!is_null($sub) and !($sub InstanceOf SyndicatedLink)) :
770	1245	$link = new SyndicatedLink($sub);
771	1246	$this->feeds[$which] = $link;
772	1247	$sub = $link;
773	1248	endif;
		@@ -774,132 +1249,121 @@
774	1249
775	1250	return $sub;
776	1251	} /* FeedWordPress::subscription () */
777	1252
778		- /** function update (): polls for updates on one or more Contributor feeds
779		-
780		- @desc
	1253	+ # function update (): polls for updates on one or more Contributor feeds
	1254	+ #
781	1255	# Arguments:
782		-
783		- - $uri (string): Either the URI of the feed to poll, the URI of the
784		- (human-readable) website whose feed you want to poll, or null.
785		-
786		- If $uri is null, then FeedWordPress will poll any feeds that are
787		- ready for polling. It will not poll feeds that are marked as
788		- "Invisible" Links (signifying that the subscription has been
789		- de-activated), or feeds that are not yet stale according to their
790		- TTL setting (which is either set in the feed, or else set
791		- randomly within a window of 30 minutes - 2 hours).
792		-
	1256	+ # ----------
	1257	+ # * $uri (string): either the URI of the feed to poll, the URI of the
	1258	+ # (human-readable) website whose feed you want to poll, or NULL.
	1259	+ #
	1260	+ # If $uri is NULL, then FeedWordPress will poll any feeds that are
	1261	+ # ready for polling. It will not poll feeds that are marked as
	1262	+ # "Invisible" Links (signifying that the subscription has been
	1263	+ # de-activated), or feeds that are not yet stale according to their
	1264	+ # TTL setting (which is either set in the feed, or else set
	1265	+ # randomly within a window of 30 minutes - 2 hours).
	1266	+ #
793	1267	# Returns:
794		-
795		- - Normally returns an associative array, with 'new' => the number
796		- of new posts added during the update, and 'updated' => the number
797		- of old posts that were updated during the update. If both numbers
798		- are zero, there was no change since the last poll on that URI.
799		-
800		- - Returns null if URI it was passed was not a URI that this
801		- installation of FeedWordPress syndicates.
802		-
	1268	+ # --------
	1269	+ # * Normally returns an associative array, with 'new' => the number
	1270	+ # of new posts added during the update, and 'updated' => the number
	1271	+ # of old posts that were updated during the update. If both numbers
	1272	+ # are zero, there was no change since the last poll on that URI.
	1273	+ #
	1274	+ # * Returns NULL if URI it was passed was not a URI that this
	1275	+ # installation of FeedWordPress syndicates.
	1276	+ #
803	1277	# Effects:
	1278	+ # --------
	1279	+ # * One or more feeds are polled for updates
	1280	+ #
	1281	+ # * If the feed Link does not have a hardcoded name set, its Link
	1282	+ # Name is synchronized with the feed's title element
	1283	+ #
	1284	+ # * If the feed Link does not have a hardcoded URI set, its Link URI
	1285	+ # is synchronized with the feed's human-readable link element
	1286	+ #
	1287	+ # * If the feed Link does not have a hardcoded description set, its
	1288	+ # Link Description is synchronized with the feed's description,
	1289	+ # tagline, or subtitle element.
	1290	+ #
	1291	+ # * The time of polling is recorded in the feed's settings, and the
	1292	+ # TTL (time until the feed is next available for polling) is set
	1293	+ # either from the feed (if it is supplied in the ttl or syndication
	1294	+ # module elements) or else from a randomly-generated time window
	1295	+ # (between 30 minutes and 2 hours).
	1296	+ #
	1297	+ # * New posts from the polled feed are added to the WordPress store.
	1298	+ #
	1299	+ # * Updates to existing posts since the last poll are mirrored in the
	1300	+ # WordPress store.
	1301	+ #
	1302	+ public function update ($uri = null, $crash_ts = null) {
	1303	+ global $wpdb;
804	1304
805		- - One or more feeds are polled for updates
806		-
807		- - If the feed Link does not have a hardcoded name set, its Link
808		- Name is synchronized with the feed's title element
809		-
810		- - If the feed Link does not have a hardcoded URI set, its Link URI
811		- is synchronized with the feed's human-readable link element
812		-
813		- - If the feed Link does not have a hardcoded description set, its
814		- Link Description is synchronized with the feed's description,
815		- tagline, or subtitle element.
816		-
817		- - The time of polling is recorded in the feed's settings, and the
818		- TTL (time until the feed is next available for polling) is set
819		- either from the feed (if it is supplied in the ttl or syndication
820		- module elements) or else from a randomly-generated time window
821		- (between 30 minutes and 2 hours).
822		-
823		- - New posts from the polled feed are added to the WordPress store.
824		-
825		- - Updates to existing posts since the last poll are mirrored in the
826		- WordPress store.
827		-
828		- @param string|null $uri Either the URI of the feed to poll, the URI of the (human-readable) website whose feed you want to poll, or null.
829		- @param mixed|null $crash_ts Unknown purpose.
830		- @return array|null Associative array, with 'new' => # of new posts added during update, and 'updated' => # of old posts that were updated. If both are zero, there was no change since çast update.
831		- */
832		- public function update( $uri = null, $crash_ts = null ) {
833		- if ( FeedWordPress::needs_upgrade() ) : // Will make duplicate posts if we don't hold off
834		- return null;
	1305	+ if (FeedWordPress::needs_upgrade()) : // Will make duplicate posts if we don't hold off
	1306	+ return NULL;
835	1307	endif;
836	1308
837		- if ( ! is_null( $uri ) and $uri != '*' ) :
838		- $uri = trim( $uri );
	1309	+ if (!is_null($uri) and $uri != '*') :
	1310	+ $uri = trim($uri);
839	1311	else : // Update all
840		- if ( $this->update_hooked ) :
	1312	+ if ($this->update_hooked) :
841	1313	$diag = $this->update_hooked;
842	1314	else :
843		- $diag = 'Initiating a MANUAL check-in on the update schedule at ' . date( 'r', time() );
	1315	+ $diag = 'Initiating a MANUAL check-in on the update schedule at '.date('r', time());
844	1316	endif;
845		- $this->diagnostic( 'update_schedule:check', $diag );
	1317	+ $this->diagnostic('update_schedule:check', $diag);
846	1318
847		- update_option( 'feedwordpress_last_update_all', time() );
	1319	+ update_option('feedwordpress_last_update_all', time());
848	1320	endif;
849	1321
850		- do_action( 'feedwordpress_update', $uri );
	1322	+ do_action('feedwordpress_update', $uri);
851	1323
852		- if ( is_null( $crash_ts ) ) :
	1324	+ if (is_null($crash_ts)) :
853	1325	$crash_ts = $this->crash_ts();
854	1326	endif;
855	1327
856	1328	// Randomize order for load balancing purposes
857		- $feed_set = array_keys( $this->feeds );
858		- shuffle( $feed_set );
	1329	+ $feed_set = array_keys($this->feeds);
	1330	+ shuffle($feed_set);
859	1331
860		- $updateWindow = (int) get_option( 'feedwordpress_update_window', DEFAULT_UPDATE_PERIOD ) * 60 /* sec/min */;
861		- $interval = (int) get_option( 'feedwordpress_freshness', FEEDWORDPRESS_FRESHNESS_INTERVAL );
	1332	+ $updateWindow = (int) get_option('feedwordpress_update_window', DEFAULT_UPDATE_PERIOD) * 60 /* sec/min */;
	1333	+ $interval = (int) get_option('feedwordpress_freshness', FEEDWORDPRESS_FRESHNESS_INTERVAL);
862	1334	$portion = max(
863		- (int) ceil( count( $feed_set ) / ( $updateWindow / $interval ) ),
	1335	+ (int) ceil(count($feed_set) / ($updateWindow / $interval)),
864	1336	10
865	1337	);
866	1338
867		- $max_polls = apply_filters(
868		- 'feedwordpress_polls_per_update',
869		- get_option(
870		- 'feedwordpress_polls_per_update', $portion
871		- ),
872		- $uri
873		- );
	1339	+ $max_polls = apply_filters('feedwordpress_polls_per_update', get_option(
	1340	+ 'feedwordpress_polls_per_update', $portion
	1341	+ ), $uri);
874	1342
875		- $feed_set = apply_filters( 'feedwordpress_update_feeds', $feed_set, $uri );
	1343	+ $feed_set = apply_filters('feedwordpress_update_feeds', $feed_set, $uri);
876	1344
	1345	+
877	1346	// Loop through and check for new posts
878		- $delta = null;
879		- $remaining = $max_polls;
880		- foreach ( $feed_set as $feed_id) :
	1347	+ $delta = NULL; $remaining = $max_polls;
	1348	+ foreach ($feed_set as $feed_id) :
881	1349
882		- $feed = $this->subscription( $feed_id );
883		- // Try to catch a very unusual condition where the $feed comes as NULL (gwyneth 20230919)
884		- if ( ! empty( $feed ) ) :
885		- $this->diagnostic( 'update_schedule', "Feed " . $feed_id . " returned an empty feed" );
886		- endif;
	1350	+ $feed = $this->subscription($feed_id);
887	1351
888	1352	// Has this process overstayed its welcome?
889	1353	if (
890	1354	// Over time limit?
891		- ( ! is_null( $crash_ts ) and ( time() > $crash_ts ) )
	1355	+ (!is_null($crash_ts) and (time() > $crash_ts))
892	1356
893	1357	// Over feed count?
894		- or ( 0 == $remaining )
	1358	+ or ($remaining == 0)
895	1359	) :
896	1360	break;
897	1361	endif;
898	1362
899		- $pinged_that = ( is_null( $uri ) or ( $uri == '*' ) or in_array( $uri, array( $feed->uri(), $feed->homepage() ) ) );
	1363	+ $pinged_that = (is_null($uri) or ($uri=='*') or in_array($uri, array($feed->uri(), $feed->homepage())));
900	1364
901		- if ( ! is_null( $uri ) ) : // A site-specific ping always updates
	1365	+ if (!is_null($uri)) : // A site-specific ping always updates
902	1366	$timely = true;
903	1367	else :
904	1368	$timely = $feed->stale();
905	1369	endif;
		@@ -904,45 +1368,36 @@
904	1368	$timely = $feed->stale();
905	1369	endif;
906	1370
907	1371	// If at least one feed was hit for updating...
908		- if ( $pinged_that and is_null( $delta ) ) :
	1372	+ if ($pinged_that and is_null($delta)) :
909	1373	// ... don't return error condition
910		- $delta = array( 'new' => 0, 'updated' => 0, 'stored' => 0 );
	1374	+ $delta = array('new' => 0, 'updated' => 0, 'stored' => 0);
911	1375	endif;
912	1376
913		- if ( $pinged_that and $timely ) :
	1377	+ if ($pinged_that and $timely) :
914	1378	$remaining = $remaining - 1;
915	1379
916		- do_action( 'feedwordpress_check_feed', $feed->settings );
	1380	+ do_action('feedwordpress_check_feed', $feed->settings);
917	1381	$start_ts = time();
918		- $added = $feed->poll( $crash_ts );
919		- do_action( 'feedwordpress_check_feed_complete', $feed->settings, $added, time() - $start_ts );
	1382	+ $added = $feed->poll($crash_ts);
	1383	+ do_action('feedwordpress_check_feed_complete', $feed->settings, $added, time() - $start_ts);
920	1384
921		- if ( is_array( $added ) ) : // Success
922		- foreach ( $added as $key => $count ) :
923		- $delta[ $key ] += $added[ $key ];
	1385	+ if (is_array($added)) : // Success
	1386	+ foreach ($added as $key => $count) :
	1387	+ $delta[$key] += $added[$key];
924	1388	endforeach;
925	1389	endif;
926	1390	endif;
927	1391	endforeach;
928	1392
929		- do_action( 'feedwordpress_update_complete', $delta );
	1393	+ do_action('feedwordpress_update_complete', $delta);
930	1394	return $delta;
931	1395	} /* FeedWordPress::update () */
932	1396
933		- /**
934		- * Checks if we're over the update time limit.
935		- *
936		- * @todo is returning null advisable? (gwyneth 20230916)
937		- *
938		- * @param int|null $default Default value, called when the corresponding FWP option is not set.
939		- *
940		- * @return int|null
941		- */
942		- public function crash_ts( $default = null ) {
943		- $crash_dt = (int) get_option( 'feedwordpress_update_time_limit', 0 );
944		- if ( $crash_dt > 0 ) :
	1397	+ public function crash_ts ($default = NULL) {
	1398	+ $crash_dt = (int) get_option('feedwordpress_update_time_limit', 0);
	1399	+ if ($crash_dt > 0) :
945	1400	$crash_ts = time() + $crash_dt;
946	1401	else :
947	1402	$crash_ts = $default;
948	1403	endif;
		@@ -948,71 +1403,44 @@
948	1403	endif;
949	1404	return $crash_ts;
950	1405	} /* FeedWordPress::crash_ts () */
951	1406
952		-
953		- /**
954		- * Checks if we have a secret key set in the options; if not, generate one.
955		- *
956		- * @return string Secret key, either from options or auto-generated.
957		- *
958		- * @todo Only 6 characters? That is rather easy to guess... Also, uniqid() can return 13 or 23
959		- * characters, what's the point of using MD5 in this case? (gwyneth 20230916)
960		- */
961		- public function secret_key() {
962		- $secret = get_option( 'feedwordpress_secret_key', false );
963		- if ( ! $secret) : // Generate random key.
964		- $secret = substr( md5( uniqid( microtime() ) ), 0, 6 );
965		- update_option( 'feedwordpress_secret_key', $secret );
	1407	+ public function secret_key () {
	1408	+ $secret = get_option('feedwordpress_secret_key', false);
	1409	+ if (!$secret) : // Generate random key.
	1410	+ $secret = substr(md5(uniqid(microtime())), 0, 6);
	1411	+ update_option('feedwordpress_secret_key', $secret);
966	1412	endif;
967	1413	return $secret;
968	1414	} /* FeedWordPress::secret_key () */
969	1415
970		- /**
971		- * Returns true if we have set a secret FWP key.
972		- *
973		- * @return bool True if we have a secret key, false otherwise
974		- *
975		- * @uses MyPHP::request()
976		- */
977		- public function has_secret() {
978		- return ( MyPHP::request( 'feedwordpress_key' ) == $this->secret_key() );
	1416	+ public function has_secret () {
	1417	+ return (MyPHP::request('feedwordpress_key')==$this->secret_key());
979	1418	} /* FeedWordPress::has_secret () */
980	1419
981		- var $update_hooked = null;
982		-
983		- /**
984		- * Activates the hook for automatic plugin updates, if requested.
985		- *
986		- * @param Array $params Parameters to send to the hook.
987		- *
988		- * @return string Represents the hook's name. There is a slight chance that this is null, though. (gwyneth 20230916)
989		- *
990		- * @uses wp_parse_args()
991		- * @uses MyPHP::request()
992		- */
993		- public function automatic_update_hook( $params = array() ) {
994		- $params = wp_parse_args( $params, array( // Defaults
	1420	+ var $update_hooked = NULL;
	1421	+ public function automatic_update_hook ($params = array()) {
	1422	+ $params = wp_parse_args($params, array( // Defaults
995	1423	'setting only' => false,
996	1424	));
997		- $hook = get_option( 'feedwordpress_automatic_updates', null );
	1425	+ $hook = get_option('feedwordpress_automatic_updates', NULL);
998	1426	$method = 'FeedWordPress option';
999	1427
1000	1428	// Allow for forced behavior in testing.
1001	1429	if (
1002		- ! $params['setting only']
	1430	+ !$params['setting only']
1003	1431	and $this->has_secret()
1004		- and MyPHP::request( 'automatic_update' )
	1432	+ and MyPHP::request('automatic_update')
1005	1433	) :
1006		- $hook = MyPHP::request( 'automatic_update') ;
	1434	+ $hook = MyPHP::request('automatic_update');
1007	1435	$method = 'URL parameter';
1008	1436	endif;
1009	1437
1010	1438	$exact = $hook; // Before munging
1011	1439
1012		- if ( !! $hook) :
1013		- if ( $hook == 'init' or $hook == 'wp_loaded' ) : // Re-map init to wp_loaded
1014		- $hook = ( $params['setting only'] ? 'init' : 'wp_loaded' );
	1440	+ if (!!$hook) :
	1441	+ if ($hook == 'init' or $hook == 'wp_loaded') : // Re-map init to wp_loaded
	1442	+ $hook = ($params['setting only'] ? 'init' : 'wp_loaded');
1015	1443
1016	1444	// Constrain possible values. If it's not an init or wp_loaded, it's a shutdown
1017	1445	else :
1018	1446	$hook = 'shutdown';
		@@ -1018,10 +1446,10 @@
1018	1446	$hook = 'shutdown';
1019	1447	endif;
1020	1448	endif;
1021	1449
1022		- if ( $hook ) :
1023		- $this->update_hooked = "Initiating an AUTOMATIC CHECK FOR UPDATES ON PAGE LOAD " . $hook . " due to " . $method . " = " . trim( $this->val( $exact ) );
	1450	+ if ($hook) :
	1451	+ $this->update_hooked = "Initiating an AUTOMATIC CHECK FOR UPDATES ON PAGE LOAD ".$hook." due to ".$method." = ".trim($this->val($exact));
1024	1452	endif;
1025	1453
1026	1454	return $hook;
1027	1455	} /* FeedWordPress::automatic_update_hook () */
		@@ -1027,22 +1455,22 @@
1027	1455	} /* FeedWordPress::automatic_update_hook () */
1028	1456
1029	1457	public function last_update_all () {
1030	1458	$last = get_option('feedwordpress_last_update_all');
1031		- if ( $this->has_secret() and FeedWordPress::param('automatic_update') ) :
	1459	+ if ($this->has_secret() and MyPHP::request('automatic_update')) :
1032	1460	$last = 1; // A long, long time ago.
1033		- elseif ( $this->has_secret() and FeedWordPress::param('last_update_all') ) :
1034		- $last = FeedWordPress::param( 'last_update_all' );
	1461	+ elseif ($this->has_secret() and MyPHP::request('last_update_all')) :
	1462	+ $last = MyPHP::request('last_update_all');
1035	1463	endif;
1036	1464	return $last;
1037	1465	} /* FeedWordPress::last_update_all () */
1038	1466
1039	1467	public function force_update_all () {
1040		- return ($this->has_secret() and FeedWordPress::param( 'force_update_feeds' ));
	1468	+ return ($this->has_secret() and MyPHP::request('force_update_feeds'));
1041	1469	} /* FeedWordPress::force_update_all () */
1042	1470
1043	1471	public function stale () {
1044		- if ( !is_null($this->automatic_update_hook())) :
	1472	+ if (!is_null($this->automatic_update_hook())) :
1045	1473	// Do our best to avoid possible simultaneous
1046	1474	// updates by getting up-to-the-minute settings.
1047	1475
1048	1476	$last = $this->last_update_all();
		@@ -1061,9 +1489,9 @@
1061	1489	$ret = ( (time() - $last) > $freshness );
1062	1490
1063	1491	// This should never happen.
1064	1492	else :
1065		- FeedWordPressDiagnostic::critical_bug('FeedWordPress::stale::last', $last, __LINE__, __FILE__);
	1493	+ FeedWordPress::critical_bug('FeedWordPress::stale::last', $last, __LINE__, __FILE__);
1066	1494	endif;
1067	1495
1068	1496	else :
1069	1497	$ret = false;
		@@ -1074,14 +1502,12 @@
1074	1502	static function admin_init () {
1075	1503	// WordPress 3.5+ compat: the WP devs are in the midst of removing Links from the WordPress core. Eventually we'll have to deal
1076	1504	// with the possible disappearance of the wp_links table as a whole; but in the meantime, we just need to turn on the interface
1077	1505	// element to avoid problems with user capabilities that presume the presence of the Links Manager in the admin UI.
1078		- global $post_type;
1079		-
1080		- if ( !intval(get_option('link_manager_enabled', false))) :
	1506	+ if (!intval(get_option('link_manager_enabled', false))) :
1081	1507	update_option('link_manager_enabled', true);
1082	1508	endif;
1083		-
	1509	+
1084	1510	if (defined('FEEDWORDPRESS_PREPARE_TO_ZAP') and FEEDWORDPRESS_PREPARE_TO_ZAP) :
1085	1511	$post_id = FEEDWORDPRESS_PREPARE_TO_ZAP;
1086	1512	$sendback = wp_get_referer();
1087	1513	if (
		@@ -1088,9 +1514,9 @@
1088	1514	! $sendback
1089	1515	or strpos( $sendback, 'post.php' ) !== false
1090	1516	or strpos( $sendback, 'post-new.php' ) !== false
1091	1517	) :
1092		- if ( 'attachment' == $post_type ) : // where does this come from?? I put it as a global...(gwyneth 20230916)
	1518	+ if ( 'attachment' == $post_type ) :
1093	1519	$sendback = admin_url( 'upload.php' );
1094	1520	else :
1095	1521	$sendback = admin_url( 'edit.php' );
1096	1522	$sendback .= ( ! empty( $post_type ) ) ? '?post_type=' . $post_type : '';
		@@ -1099,9 +1525,9 @@
1099	1525	$sendback = esc_url( remove_query_arg( array('trashed', 'untrashed', 'deleted', 'zapped', 'unzapped', 'ids'), $sendback ) );
1100	1526	endif;
1101	1527
1102	1528	// Make sure we have a post corresponding to this ID.
1103		- $post = $post_type = $post_type_object = null; // whatever $post_type_object might be, it's not being used! (gwyneth 20230920)
	1529	+ $post = $post_type = $post_type_object = null;
1104	1530	if ( $post_id ) :
1105	1531	$post = get_post( $post_id );
1106	1532	endif;
1107	1533
		@@ -1107,32 +1533,28 @@
1107	1533
1108	1534	if ( $post ) :
1109	1535	$post_type = $post->post_type;
1110	1536	endif;
1111		- $p = get_post( $post_id );
	1537	+ $p = get_post($post_id);
1112	1538
1113	1539	if ( ! $post ) :
1114		- wp_die( esc_html__( 'The item you are trying to zap no longer exists.' ) );
	1540	+ wp_die( __( 'The item you are trying to zap no longer exists.' ) );
1115	1541	endif;
1116		-
	1542	+
1117	1543	if ( ! current_user_can( 'delete_post', $post_id ) ) :
1118		- wp_die( esc_html__( 'You are not allowed to zap this item.' ) );
	1544	+ wp_die( __( 'You are not allowed to zap this item.' ) );
1119	1545	endif;
1120		-
	1546	+
1121	1547	if ( $user_id = wp_check_post_lock( $post_id ) ) :
1122		- if ( is_numeric( $user_id ) and function_exists( 'get_userdata' ) ) :
1123		- $user = get_userdata( (int) $user_id );
1124		- wp_die( esc_html( sprintf( __( 'You cannot retire this item. %s is currently editing.' ), $user->display_name ) ) );
1125		- else :
1126		- wp_die( esc_html__( 'You cannot retire this item. Someone is currently editing.' ) );
1127		- endif;
	1548	+ $user = get_userdata( $user_id );
	1549	+ wp_die( sprintf( __( 'You cannot retire this item. %s is currently editing.' ), $user->display_name ) );
1128	1550	endif;
1129		-
1130		- if (FeedWordPress::param( 'fwp_post_delete' ) == 'zap') :
	1551	+
	1552	+ if (MyPHP::request('fwp_post_delete')=='zap') :
1131	1553	FeedWordPress::diagnostic('syndicated_posts', 'Zapping existing post # '.$p->ID.' "'.$p->post_title.'" due to user request.');
1132		-
	1554	+
1133	1555	$old_status = $post->post_status;
1134		-
	1556	+
1135	1557	set_post_field('post_status', 'fwpzapped', $post_id);
1136	1558	wp_transition_post_status('fwpzapped', $old_status, $post);
1137	1559
1138	1560	# Set up the post to have its content blanked on
		@@ -1138,17 +1560,17 @@
1138	1560	# Set up the post to have its content blanked on
1139	1561	# next update if you do not undo the zapping.
1140	1562	add_post_meta($post_id, '_feedwordpress_zapped_blank_me', 1, /*unique=*/ true);
1141	1563	add_post_meta($post_id, '_feedwordpress_zapped_blank_old_status', $old_status, /*unique=*/ true);
1142		-
	1564	+
1143	1565	wp_redirect( esc_url_raw( add_query_arg( array('zapped' => 1, 'ids' => $post_id), $sendback ) ) );
1144	1566
1145	1567	else :
1146	1568	$old_status = get_post_meta($post_id, '_feedwordpress_zapped_blank_old_status', /*single=*/ true);
1147		-
	1569	+
1148	1570	set_post_field('post_status', $old_status, $post_id);
1149	1571	wp_transition_post_status($old_status, 'fwpzapped', $post);
1150		-
	1572	+
1151	1573	# O.K., make sure this post does not get blanked
1152	1574	delete_post_meta($post_id, '_feedwordpress_zapped_blank_me');
1153	1575	delete_post_meta($post_id, '_feedwordpress_zapped_blank_old_status');
1154	1576
		@@ -1154,9 +1576,9 @@
1154	1576
1155	1577	wp_redirect( esc_url_raw( add_query_arg( array('unzapped' => 1, 'ids' => $post_id), $sendback ) ) );
1156	1578
1157	1579	endif;
1158		-
	1580	+
1159	1581	// Intercept, don't pass on.
1160	1582	exit;
1161	1583	endif;
1162	1584	} /* FeedWordPress::admin_init() */
		@@ -1167,13 +1589,13 @@
1167	1589	// actions link. So we create a magic parameter, and when this
1168	1590	// magic parameter is activated, the WordPress trashcan is
1169	1591	// temporarily de-activated.
1170	1592
1171		- if (FeedWordPress::param( 'fwp_post_delete' ) == 'nuke') :
	1593	+ if (MyPHP::request('fwp_post_delete')=='nuke') :
1172	1594	// Get post ID #
1173		- $post_id = FeedWordPress::param( 'post' );
1174		- if ( ! $post_id) :
1175		- $post_id = FeedWordPress::param( 'post_ID' );
	1595	+ $post_id = MyPHP::request('post');
	1596	+ if (!$post_id) :
	1597	+ $post_id = MyPHP::request('post_ID');
1176	1598	endif;
1177	1599
1178	1600	// Make sure we've got the right nonce and all that.
1179	1601	check_admin_referer('delete-post_' . $post_id);
		@@ -1179,47 +1601,50 @@
1179	1601	check_admin_referer('delete-post_' . $post_id);
1180	1602
1181	1603	// If so, disable the trashcan.
1182	1604	define('EMPTY_TRASH_DAYS', 0);
1183		- elseif ( FeedWordPress::param( 'fwp_post_delete' ) == 'zap' || FeedWordPress::param( 'fwp_post_delete' ) == 'unzap' ) :
	1605	+
	1606	+ elseif (MyPHP::request('fwp_post_delete')=='zap' OR MyPHP::request('fwp_post_delete') == 'unzap') :
1184	1607	// Get post ID #
1185		- $post_id = FeedWordPress::param( 'post' );
1186		- if ( ! $post_id) :
1187		- $post_id = FeedWordPress::param( 'post_ID' );
	1608	+ $post_id = MyPHP::request('post');
	1609	+ if (!$post_id) :
	1610	+ $post_id = MyPHP::request('post_ID');
1188	1611	endif;
1189		-
	1612	+
1190	1613	// Make sure we've got the right nonce and all that
1191	1614	check_admin_referer('delete-post_' . $post_id);
1192	1615
1193	1616	// If so, get ready to intercept the call a little
1194	1617	// further down the line.
	1618	+
1195	1619	define('FEEDWORDPRESS_PREPARE_TO_ZAP', $post_id);
1196		-
	1620	+
1197	1621	endif;
1198	1622
1199	1623	} /* FeedWordPress::admin_api () */
1200	1624
1201	1625	public function all_admin_notices () {
1202		- if (FeedWordPress::param( 'zapped' )) :
1203		- $n = intval( FeedWordPress::param( 'zapped' ) );
	1626	+ if (MyPHP::request('zapped')) :
	1627	+ $n = intval(MyPHP::request('zapped'));
1204	1628	?>
1205		-<div id="message" class="updated"><p><?php print esc_html( $n ); ?> syndicated item<?php print esc_html( $n != 1 ? 's' : '' ); ?> zapped. <strong>These items will not be re-syndicated.</strong> If this was a mistake, you must <strong>immediately</strong> Un-Zap them in the Zapped items section to avoid losing the data.</p></div>
	1629	+<div id="message" class="updated"><p><?php print $n; ?> syndicated item<?php print ($n!=1?'s':''); ?> zapped. <strong>These items will not be re-syndicated.</strong> If this was a mistake, you must <strong>immediately</strong> Un-Zap them in the Zapped items section to avoid losing the data.</p></div>
1206	1630	<?php
1207	1631	endif;
1208		- if ( FeedWordPress::param( 'unzapped' ) ) :
1209		- $n = intval( FeedWordPress::param( 'unzapped' ) );
	1632	+
	1633	+ if (MyPHP::request('unzapped')) :
	1634	+ $n = intval(MyPHP::request('unzapped'));
1210	1635	?>
1211		-<div id="message" class="updated"><p><?php print esc_html( $n ); ?> syndicated item<?php print esc_html( $n != 1 ? 's' : '' ) ?> un-zapped and restored to normal.</p></div>
	1636	+<div id="message" class="updated"><p><?php print $n; ?> syndicated item<?php print ($n!=1?'s':'') ?> un-zapped and restored to normal.</p></div>
1212	1637	<?php
1213	1638	endif;
1214	1639	} /* FeedWordPress::all_admin_notices () */
1215		-
	1640	+
1216	1641	public function process_retirements ($delta) {
1217	1642	update_option('feedwordpress_process_zaps', 1);
1218	1643
1219	1644	return $delta;
1220	1645	}
1221		-
	1646	+
1222	1647	public function feedwordpress_cleanup () {
1223	1648	if (get_option('feedwordpress_process_zaps', null)) :
1224	1649	$q = new WP_Query(array(
1225	1650	'fields' => '_synfrom',
		@@ -1227,34 +1652,34 @@
1227	1652	'ignore_sticky_posts' => true,
1228	1653	'meta_key' => '_feedwordpress_zapped_blank_me',
1229	1654	'meta_value' => 1,
1230	1655	));
1231		-
	1656	+
1232	1657	if ($q->have_posts()) :
1233	1658	foreach ($q->posts as $p) :
1234	1659
1235	1660	$post_id = $p->ID;
1236	1661	$revisions = wp_get_post_revisions($post_id, array("check_enabled" => false));
1237		-
	1662	+
1238	1663	# Now nuke the content of the post & its revisions
1239	1664	set_post_field('post_content', '', $post_id);
1240	1665	set_post_field('post_excerpt', '', $post_id);
1241		-
	1666	+
1242	1667	foreach ($revisions as $rev) :
1243	1668	set_post_field('post_content', '', $rev->ID);
1244	1669	set_post_field('post_excerpt', '', $rev->ID);
1245	1670	endforeach;
1246		-
	1671	+
1247	1672	# Un-tag it for blanking.
1248	1673	delete_post_meta($p->ID, '_feedwordpress_zapped_blank_me');
1249		-
	1674	+
1250	1675	# Don't remove old_status indicator. A later
1251	1676	# update from the feed may cause us to once
1252	1677	# again have some content so we can un-zap.
1253		-
	1678	+
1254	1679	endforeach;
1255	1680	endif;
1256		-
	1681	+
1257	1682	$q = new WP_Query(array(
1258	1683	'fields' => '_synfrom',
1259	1684	'post_status' => 'fwpzapped',
1260	1685	'ignore_sticky_posts' => true,
		@@ -1260,25 +1685,26 @@
1260	1685	'ignore_sticky_posts' => true,
1261	1686	'meta_key' => '_feedwordpress_zapped_blank_me',
1262	1687	'meta_value' => 2,
1263	1688	));
1264		-
	1689	+
1265	1690	if ($q->have_posts()) :
1266	1691	foreach ($q->posts as $p) :
1267	1692	update_post_meta($p->ID, '_feedwordpress_zapped_blank_me', 1);
1268	1693	endforeach;
1269	1694	endif;
1270		-
	1695	+
1271	1696	update_option('feedwordpress_process_zaps', 0);
1272	1697	endif;
1273	1698	} /* FeedWordPress::feedwordpress_cleanup () */
1274		-
	1699	+
1275	1700	public function init () {
	1701	+ global $fwp_path;
1276	1702
1277	1703	// If this is a FeedWordPress admin page, queue up scripts for AJAX
1278	1704	// functions that FWP uses. If it is a display page or a non-FWP admin
1279	1705	// page, don't.
1280		- wp_register_style('feedwordpress-elements', $this->plugin_dir_url( 'assets/css/feedwordpress-elements.css') );
	1706	+ wp_register_style('feedwordpress-elements', plugins_url( '/'.$fwp_path.'/feedwordpress-elements.css') );
1281	1707	if (FeedWordPressSettingsUI::is_admin()) :
1282	1708	// For JavaScript that needs to be generated dynamically
1283	1709	add_action('admin_print_scripts', array('FeedWordPressSettingsUI', 'admin_scripts'));
1284	1710
		@@ -1286,8 +1712,12 @@
1286	1712	add_action('admin_print_styles', array('FeedWordPressSettingsUI', 'admin_styles'));
1287	1713
1288	1714	wp_enqueue_style('dashboard');
1289	1715	wp_enqueue_style('feedwordpress-elements');
	1716	+
	1717	+ /*if (function_exists('wp_admin_css')) :
	1718	+ wp_admin_css('css/dashboard');
	1719	+ endif;*/
1290	1720	endif;
1291	1721
1292	1722	// These are a special post statuses for hiding posts that have
1293	1723	// expired from the feed or been marked for permanent zapping by
		@@ -1319,10 +1749,8 @@
1319	1749	add_action('wp_ajax_fwp_feeds', array($this, 'fwp_feeds'));
1320	1750	add_action('wp_ajax_fwp_feedcontents', array($this, 'fwp_feedcontents'));
1321	1751	add_action('wp_ajax_fwp_xpathtest', array($this, 'fwp_xpathtest'));
1322	1752
1323		- // Prepare for future translations... (gwyneth 20210714)
1324		- // add_action('init', array($this, 'load_textdomain');
1325	1753	} /* FeedWordPress::init() */
1326	1754
1327	1755	/**
1328	1756	* FeedWordPress::wp_loaded (): Once all plugin and theme modules have been
		@@ -1335,30 +1763,9 @@
1335	1763	public function wp_loaded () {
1336	1764	$this->clear_cache_magic_url();
1337	1765	$this->update_magic_url();
1338	1766	} /* FeedWordPress::wp_loaded () */
1339		-
1340		- /**
1341		- * FeedWordPress::cron_schedules(): Filter hook to add WP-Cron schedules
1342		- * that plugins like FeedWordPress can use to carry out scheduled events.
1343		- *
1344		- * @param array $schedules An associative array containing the current set of cron schedules (hourly, daily, etc.)
1345		- * @return array The same array, with a new entry ('fwp_checkin_interval') added to the list.
1346		- *
1347		- * @since 2017.1021
1348		- */
1349		- public function cron_schedules ($schedules) {
1350		- $interval = FEEDWORDPRESS_DEFAULT_CHECKIN_INTERVAL*60 /*sec/min*/;
1351		-
1352		- // add 'fwp_checkin_interval' to the existing set
1353		- $schedules['fwp_checkin_interval'] = array(
1354		- 'interval' => $interval,
1355		- 'display' => 'FeedWordPress update schedule check-in',
1356		- );
1357		-
1358		- return $schedules;
1359		- } /* FeedWordPress::cron_schedules () */
1360		-
	1767	+
1361	1768	public function fwp_feeds () {
1362	1769	$feeds = array();
1363	1770	$feed_ids = $this->feeds;
1364	1771
		@@ -1376,9 +1783,9 @@
1376	1783	exit;
1377	1784	} /* FeedWordPress::fwp_feeds () */
1378	1785
1379	1786	public function fwp_feedcontents () {
1380		- $feed_id = FeedWordPress::param( 'feed_id' );
	1787	+ $feed_id = MyPHP::request('feed_id');
1381	1788
1382	1789	// Let's load up some data from the feed . . .
1383	1790	$feed = $this->subscription($feed_id);
1384	1791	$posts = $feed->live_posts();
		@@ -1409,11 +1816,11 @@
1409	1816	die;
1410	1817	} /* FeedWordPress::fwp_feedcontents () */
1411	1818
1412	1819	public function fwp_xpathtest () {
1413		- $xpath = FeedWordPress::param( 'xpath' );
1414		- $feed_id = FeedWordPress::param( 'feed_id' );
1415		- $post_id = FeedWordPress::param( 'post_id' );
	1820	+ $xpath = MyPHP::request('xpath');
	1821	+ $feed_id = MyPHP::request('feed_id');
	1822	+ $post_id = MyPHP::request('post_id');
1416	1823
1417	1824	$expr = new FeedWordPressParsedPostMeta($xpath);
1418	1825
1419	1826	// Let's load up some data from the feed . . .
		@@ -1419,9 +1826,9 @@
1419	1826	// Let's load up some data from the feed . . .
1420	1827	$feed = $this->subscription($feed_id);
1421	1828	$posts = $feed->live_posts();
1422	1829
1423		- if ( !is_wp_error($posts)) :
	1830	+ if (!is_wp_error($posts)) :
1424	1831	if (strlen($post_id) == 0) :
1425	1832	$post = $posts[0];
1426	1833	else :
1427	1834	$post = null;
		@@ -1470,9 +1877,9 @@
1470	1877	or 'fwpzapped'==$wp_query->post->post_status
1471	1878	) :
1472	1879	do_action('feedwordpress_redirect_retired', $wp_query->post);
1473	1880
1474		- if ( !($template = get_404_template())) :
	1881	+ if (!($template = get_404_template())) :
1475	1882	$template = get_index_template();
1476	1883	endif;
1477	1884	if ($template = apply_filters('template_include', $template)) :
1478	1885	header("HTTP/1.1 410 Gone");
		@@ -1489,10 +1896,10 @@
1489	1896	$eraseLink = MyPHP::url($link, array("fwp_post_delete" => "nuke"));
1490	1897
1491	1898	$caption = apply_filters('feedwordpress_ui_erase_link_caption', __('Erase the record of this post (will be re-syndicated if it still appears on the feed).'));
1492	1899	$linktext = apply_filters('feedwordpress_ui_erase_link_text', __('Erase/Resyndicate'));
1493		-
1494		- $retireClass = null;
	1900	+
	1901	+ $retireClass = NULL;
1495	1902	if ($post->post_status == 'fwpzapped') :
1496	1903	if (count(get_post_meta($post->ID, '_feedwordpress_zapped_blank_me')) > 0) :
1497	1904	$retireCap = 'Un-Zap this syndicated post (so it will appear on the site again)';
1498	1905	$retireText = 'Un-Zap &amp; Restore';
		@@ -1500,17 +1907,17 @@
1500	1907	else :
1501	1908	// No Un-Zap link for posts that have
1502	1909	// been blanked. You'll just have to
1503	1910	// Erase and hope you can resyndicate...
1504		- $retireLink = null;
	1911	+ $retireLink = NULL;
1505	1912	endif;
1506	1913	else :
1507	1914	$retireCap = apply_filters('feedwordpress_ui_zap_link_caption', __('Zap this syndicated post (so it will not be re-syndicated if it still appears on the feed).'));
1508		- $retireText = apply_filters('feedwordpress_ui_zap_link_text', __('Zap/Don&rsquo;t Resyndicate'));
	1915	+ $retireText = apply_filters('feedwordpress_ui_zap_link_text', __('Zap/Don&#8217;t Resyndicate'));
1509	1916	$retireLink = MyPHP::url($link, array("fwp_post_delete" => "zap"));
1510	1917	$retireClass = 'submitdelete';
1511	1918	endif;
1512		-
	1919	+
1513	1920	$keys = array_keys($actions);
1514	1921	$links = array();
1515	1922	foreach ($keys as $key) :
1516	1923	$links[$key] = $actions[$key];
		@@ -1518,9 +1925,9 @@
1518	1925	if ('trash'==$key) :
1519	1926	#$links[$key] = "<a class='submitdelete' title='" . esc_attr( __( 'Move this item to the Trash (will NOT be re-syndicated)' ) ) . "' href='" . get_delete_post_link( $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
1520	1927
1521	1928	// Placeholder.
1522		- if ( !is_null($retireLink)) :
	1929	+ if (!is_null($retireLink)) :
1523	1930	$links['zap trash'] = '';
1524	1931	endif;
1525	1932	$links['delete'] = '';
1526	1933	endif;
		@@ -1525,9 +1932,9 @@
1525	1932	$links['delete'] = '';
1526	1933	endif;
1527	1934	endforeach;
1528	1935
1529		- if ( !is_null($retireLink)) :
	1936	+ if (!is_null($retireLink)) :
1530	1937	$links['zap trash'] = '<a class="'.esc_attr($retireClass).'" title="'.esc_attr(__($retireCap)).'" href="' . $retireLink . '">' . __($retireText) . '</a>';
1531	1938	endif;
1532	1939	$links['delete'] = '<a class="submitdelete" title="'.esc_attr(__($caption)).'" href="' . $eraseLink . '">' . __($linktext) . '</a>';
1533	1940
		@@ -1535,26 +1942,19 @@
1535	1942	endif;
1536	1943	return $actions;
1537	1944	} /* FeedWordPress::row_actions () */
1538	1945
1539		- /**
1540		- * Sets up the FWP dashboard.
1541		- *
1542		- * @global $wp_meta_boxes
1543		- * @uses FeedWordPress::menu_cap
1544		- */
1545		- public function dashboard_setup() {
1546		- /** @var mixed User capability */
	1946	+ public function dashboard_setup () {
1547	1947	$see_it = FeedWordPress::menu_cap();
1548	1948
1549		- if ( current_user_can( $see_it ) ) :
	1949	+ if (current_user_can($see_it)) :
1550	1950	// Get the stylesheet
1551		- wp_enqueue_style( 'feedwordpress-elements' );
	1951	+ wp_enqueue_style('feedwordpress-elements');
1552	1952
1553		- $widget_id = 'feedwordpress_dashboard';
1554		- $widget_name = __( 'Syndicated Sources' );
1555		- $column = 'side';
1556		- $priority = 'core';
	1953	+ $widget_id = 'feedwordpress_dashboard';
	1954	+ $widget_name = __('Syndicated Sources');
	1955	+ $column = 'side';
	1956	+ $priority = 'core';
1557	1957
1558	1958	// I would love to use wp_add_dashboard_widget() here and save
1559	1959	// myself some trouble. But WP 3 does not yet have any way to
1560	1960	// push a dashboard widget onto the side, or to give it a default
		@@ -1561,40 +1961,41 @@
1561	1961	// location.
1562	1962	add_meta_box(
1563	1963	/*id=*/ $widget_id,
1564	1964	/*title=*/ $widget_name,
1565		- /*callback=*/ array( $this, 'dashboard' ),
1566		- /*screen=*/ 'dashboard',
	1965	+ /*callback=*/ array($this, 'dashboard'),
	1966	+ /*page=*/ 'dashboard',
1567	1967	/*context=*/ $column,
1568	1968	/*priority=*/ $priority
1569	1969	);
1570	1970	/*control_callback= array($this, 'dashboard_control') */
1571	1971
1572		- /* This is kind of rude, I know, but the dashboard widget isn't
1573		- * worth much if users don't know that it exists, and I don't
1574		- * know of any better way to reorder the boxen.
1575		- *
1576		- * Gleefully ripped off of codex.wordpress.org/Dashboard_Widgets_API
1577		- */
	1972	+ // This is kind of rude, I know, but the dashboard widget isn't
	1973	+ // worth much if users don't know that it exists, and I don't
	1974	+ // know of any better way to reorder the boxen.
	1975	+ //
	1976	+ // Gleefully ripped off of codex.wordpress.org/Dashboard_Widgets_API
1578	1977
1579		- /** @var mixed Globalizes the metaboxes array, this holds all the widgets for wp-admin. */
	1978	+ // Globalize the metaboxes array, this holds all the widgets for wp-admin
1580	1979	global $wp_meta_boxes;
1581	1980
1582		- /** @var mixed Get the regular dashboard widgets array
1583		- * (which has our new widget already but at the end). */
	1981	+ // Get the regular dashboard widgets array
	1982	+ // (which has our new widget already but at the end)
	1983	+
1584	1984	$normal_dashboard = $wp_meta_boxes['dashboard'][$column][$priority];
1585	1985
1586	1986	// Backup and delete our new dashbaord widget from the end of the array
1587		- if ( isset( $normal_dashboard[ $widget_id ] ) ) :
	1987	+ if (isset($normal_dashboard[$widget_id])) :
1588	1988	$backup = array();
1589		- $backup[ $widget_id ] = $normal_dashboard[ $widget_id ];
1590		- unset( $normal_dashboard[ $widget_id ] );
	1989	+ $backup[$widget_id] = $normal_dashboard[$widget_id];
	1990	+ unset($normal_dashboard[$widget_id]);
1591	1991
1592		- /** @var array Merge the two arrays together so our widget is at the beginning. */
1593		- $sorted_dashboard = array_merge( $backup, $normal_dashboard );
	1992	+ // Merge the two arrays together so our widget is at the
	1993	+ // beginning
	1994	+ $sorted_dashboard = array_merge($backup, $normal_dashboard);
1594	1995
1595		- // Save the sorted array back into the original €es
1596		- $wp_meta_boxes['dashboard'][ $column ][ $priority ] = $sorted_dashboard;
	1996	+ // Save the sorted array back into the original metaboxes
	1997	+ $wp_meta_boxes['dashboard'][$column][$priority] = $sorted_dashboard;
1597	1998	endif;
1598	1999	endif;
1599	2000	} /* FeedWordPress::dashboard_setup () */
1600	2001
		@@ -1606,9 +2007,9 @@
1606	2007	public function user_can_richedit ($rich_edit) {
1607	2008
1608	2009	$post = new FeedWordPressLocalPost;
1609	2010
1610		- if ( ! $post->is_exposed_to_formatting_filters()) :
	2011	+ if (!$post->is_exposed_to_formatting_filters()) :
1611	2012	// Disable visual editor and only allow operations
1612	2013	// directly on HTML if post is bypassing fmt filters
1613	2014	# $rich_edit = false;
1614	2015	endif;
		@@ -1623,9 +2024,9 @@
1623	2024	endif;
1624	2025	} /* FeedWordPress::clear_cache_magic_url() */
1625	2026
1626	2027	public function clear_cache_requested () {
1627		- return FeedWordPress::param( 'clear_cache' );
	2028	+ return MyPHP::request('clear_cache');
1628	2029	} /* FeedWordPress::clear_cache_requested() */
1629	2030
1630	2031	public function update_magic_url () {
1631	2032	global $wpdb;
		@@ -1632,19 +2033,20 @@
1632	2033
1633	2034	// Explicit update request in the HTTP request (e.g. from a cron job)
1634	2035	if (self::update_requested()) :
1635	2036	/*DBG*/ header("Content-Type: text/plain");
1636		- $this->update_hooked = "Initiating a CRON JOB CHECK-IN ON UPDATE SCHEDULE due to URL parameter = " . trim( $this->val( FeedWordPress::param('update_feedwordpress' ) ) );
	2037	+
	2038	+ $this->update_hooked = "Initiating a CRON JOB CHECK-IN ON UPDATE SCHEDULE due to URL parameter = ".trim($this->val($_REQUEST['update_feedwordpress']));
1637	2039
1638	2040	$this->update($this->update_requested_url());
1639	2041
1640		- if (FEEDWORDPRESS_DEBUG and is_array($wpdb->queries) and count($wpdb->queries) > 0) :
	2042	+ if (FEEDWORDPRESS_DEBUG and count($wpdb->queries) > 0) :
1641	2043	$mysqlTime = 0.0;
1642	2044	$byTime = array();
1643	2045	foreach ($wpdb->queries as $query) :
1644	2046	$time = $query[1] * 1000000.0;
1645	2047	$mysqlTime += $query[1];
1646		- if ( !isset($byTime[$time])) : $byTime[$time] = array(); endif;
	2048	+ if (!isset($byTime[$time])) : $byTime[$time] = array(); endif;
1647	2049	$byTime[$time][] = $query[0]. ' // STACK: ' . $query[2];
1648	2050	endforeach;
1649	2051	krsort($byTime);
1650	2052
		@@ -1649,12 +2051,12 @@
1649	2051	krsort($byTime);
1650	2052
1651	2053	foreach ($byTime as $time => $querySet) :
1652	2054	foreach ($querySet as $query) :
1653		- printf( '[%s ms] %s', esc_html( sprintf( '%4.4f', $time/1000.0 ) ), esc_html( $query ) ) . "\n";
	2055	+ print "[".(sprintf('%4.4f', $time/1000.0)) . "ms] $query\n";
1654	2056	endforeach;
1655	2057	endforeach;
1656		- echo esc_html( self::log_prefix()."$wpdb->num_queries queries. $mysqlTime seconds in MySQL. Total of " ); timer_stop(1); print " seconds.";
	2058	+ echo self::log_prefix()."$wpdb->num_queries queries. $mysqlTime seconds in MySQL. Total of "; timer_stop(1); print " seconds.";
1657	2059	endif;
1658	2060
1659	2061	debug_out_feedwordpress_footer();
1660	2062
		@@ -1664,20 +2066,17 @@
1664	2066	endif;
1665	2067	} /* FeedWordPress::update_magic_url () */
1666	2068
1667	2069	public static function update_requested () {
1668		- return FeedWordPress::param( 'update_feedwordpress' );
	2070	+ return MyPHP::request('update_feedwordpress');
1669	2071	} /* FeedWordPress::update_requested() */
1670		-
	2072	+
1671	2073	public function update_requested_url () {
1672	2074	$ret = null;
1673	2075
1674		- $uf = FeedWordPress::update_requested();
1675		- if (
1676		- ( '*' == $uf )
1677		- || ( preg_match( '|^[a-z]+://.*|i', $uf ) )
1678		- ) :
1679		- $ret = $uf;
	2076	+ if (($_REQUEST['update_feedwordpress']=='*')
	2077	+ or (preg_match('|^[a-z]+://.*|i', $_REQUEST['update_feedwordpress']))) :
	2078	+ $ret = $_REQUEST['update_feedwordpress'];
1680	2079	endif;
1681	2080
1682	2081	return $ret;
1683	2082	} /* FeedWordPress::update_requested_url() */
		@@ -1732,9 +2131,9 @@
1732	2131	*/
1733	2132	public static function syndicate_link ($name, $uri, $rss) {
1734	2133	// Get the category ID#
1735	2134	$cat_id = FeedWordPress::link_category_id();
1736		- if ( !is_wp_error($cat_id)) :
	2135	+ if (!is_wp_error($cat_id)) :
1737	2136	$link_category = array($cat_id);
1738	2137	else :
1739	2138	$link_category = array();
1740	2139	endif;
		@@ -1739,9 +2138,9 @@
1739	2138	$link_category = array();
1740	2139	endif;
1741	2140
1742	2141	// WordPress gets cranky if there's no homepage URI
1743		- if ( !is_string($uri) or strlen($uri)<1) : $uri = $rss; endif;
	2142	+ if (!is_string($uri) or strlen($uri)<1) : $uri = $rss; endif;
1744	2143
1745	2144	// Check if this feed URL is already being syndicated.
1746	2145	$link_id = wp_insert_link(/*linkdata=*/ array(
1747	2146	"link_id" => FeedWordPress::find_link($rss), // insert if nothing was found; else update
		@@ -1756,9 +2155,9 @@
1756	2155	} /* function FeedWordPress::syndicate_link() */
1757	2156
1758	2157	static function syndicated_status ($what, $default) {
1759	2158	$ret = get_option("feedwordpress_syndicated_{$what}_status");
1760		- if ( ! $ret) :
	2159	+ if (!$ret) :
1761	2160	$ret = $default;
1762	2161	endif;
1763	2162	return $ret;
1764	2163	} /* FeedWordPress::syndicated_status() */
		@@ -1786,11 +2185,11 @@
1786	2185	return $ret;
1787	2186
1788	2187	} /* FeedWordPress::null_email_set () */
1789	2188
1790		- public static function is_null_email( $email ) {
1791		- $ret = in_array( strtolower( trim( $email ) ), FeedWordPress::null_email_set() );
1792		- $ret = apply_filters( 'syndicated_item_author_is_null_email', $ret, $email );
	2189	+ public static function is_null_email ($email) {
	2190	+ $ret = in_array(strtolower(trim($email)), FeedWordPress::null_email_set());
	2191	+ $ret = apply_filters('syndicated_item_author_is_null_email', $ret, $email);
1793	2192	return $ret;
1794	2193	} /* FeedWordPress::is_null_email () */
1795	2194
1796	2195	public static function use_aggregator_source_data () {
		@@ -1810,9 +2209,9 @@
1810	2209	} /* FeedWordPress::munge_permalinks() */
1811	2210
1812	2211	public static function syndicated_links ($args = array()) {
1813	2212	$contributors = FeedWordPress::link_category_id();
1814		- if ( !is_wp_error($contributors)) :
	2213	+ if (!is_wp_error($contributors)) :
1815	2214	$links = get_bookmarks(array_merge(
1816	2215	array("category" => $contributors),
1817	2216	$args
1818	2217	));
		@@ -1823,12 +2222,14 @@
1823	2222	return $links;
1824	2223	} /* FeedWordPress::syndicated_links() */
1825	2224
1826	2225	public static function link_category_id () {
	2226	+ global $wpdb, $wp_db_version;
	2227	+
1827	2228	$cat_id = get_option('feedwordpress_cat_id');
1828	2229
1829	2230	// If we don't yet have the category ID stored, search by name
1830		- if ( ! $cat_id) :
	2231	+ if (!$cat_id) :
1831	2232	$cat_id = FeedWordPressCompatibility::link_category_id(DEFAULT_SYNDICATION_CATEGORY);
1832	2233
1833	2234	if ($cat_id) :
1834	2235	// We found it; let's stamp it.
		@@ -1841,11 +2242,11 @@
1841	2242	endif;
1842	2243
1843	2244	// If we could not find an appropriate link category,
1844	2245	// make a new one for ourselves.
1845		- if ( ! $cat_id) :
	2246	+ if (!$cat_id) :
1846	2247	$cat_id = FeedWordPressCompatibility::insert_link_category(DEFAULT_SYNDICATION_CATEGORY);
1847		- if ( !is_wp_error($cat_id)) :
	2248	+ if (!is_wp_error($cat_id)) :
1848	2249	// Stamp it
1849	2250	update_option('feedwordpress_cat_id', $cat_id);
1850	2251	endif;
1851	2252	endif;
		@@ -1854,9 +2255,11 @@
1854	2255	} /* FeedWordPress::link_category_id() */
1855	2256
1856	2257	# Upgrades and maintenance...
1857	2258	static function needs_upgrade () {
1858		- $fwp_db_version = get_option('feedwordpress_version', null);
	2259	+
	2260	+ global $wpdb;
	2261	+ $fwp_db_version = get_option('feedwordpress_version', NULL);
1859	2262	$ret = false; // innocent until proven guilty
1860	2263	if (is_null($fwp_db_version) or ($fwp_db_version < FEEDWORDPRESS_VERSION)) :
1861	2264
1862	2265	// This is an older version or a fresh install. Does it require a database
		@@ -1914,10 +2317,11 @@
1914	2317	endif;
1915	2318	return $ret;
1916	2319	} /* FeedWordPress::needs_upgrade () */
1917	2320
1918		- static function upgrade_database ($from = null)
1919		- {
	2321	+ static function upgrade_database ($from = NULL) {
	2322	+ global $wpdb;
	2323	+
1920	2324	if (is_null($from) or $from <= 0.96) : $from = 0.96; endif;
1921	2325
1922	2326	switch ($from) :
1923	2327	case 0.96:
		@@ -1985,9 +2389,9 @@
1985	2389	// Allow user to change default feed-fetch timeout with a global setting.
1986	2390	// Props Erigami Scholey-Fuller <http://www.piepalace.ca/blog/2010/11/feedwordpress-broke-my-heart.html>
1987	2391	$timeout = FeedWordPress::fetch_timeout();
1988	2392
1989		- if ( !is_array($params)) :
	2393	+ if (!is_array($params)) :
1990	2394	$force_feed = $params;
1991	2395	else : // Parameter array
1992	2396	$args = wp_parse_args(array(
1993	2397	'force_feed' => $force_feed,
		@@ -1998,17 +2402,17 @@
1998	2402	endif;
1999	2403	$timeout = intval($timeout);
2000	2404
2001	2405	$pie_class = apply_filters('feedwordpress_simplepie_class', 'FeedWordPie');
2002		- $cache_class = apply_filters('feedwordpress_cache_class', 'FeedWordPie_Cache');
2003		- $file_class = apply_filters('feedwordpress_file_class', 'FeedWordPie_File');
2004		- $parser_class = apply_filters('feedwordpress_parser_class', 'FeedWordPie_Parser');
	2406	+ $cache_class = apply_filters('feedwordpress_cache_class', 'WP_Feed_Cache');
	2407	+ $file_class = apply_filters('feedwordpress_file_class', 'FeedWordPress_File');
	2408	+ $parser_class = apply_filters('feedwordpress_parser_class', 'FeedWordPress_Parser');
2005	2409	$item_class = apply_filters('feedwordpress_item_class', 'FeedWordPie_Item');
2006		- $sniffer_class = apply_filters('feedwordpress_sniffer_class', 'FeedWordPie_Content_Type_Sniffer');
	2410	+ $sniffer_class = apply_filters('feedwordpress_sniffer_class', 'FeedWordPress_Content_Type_Sniffer');
2007	2411
2008	2412	$feed = new $pie_class;
2009	2413	$feed->set_feed_url($url);
2010		- $feed->registry->register('Cache', $cache_class);
	2414	+ $feed->set_cache_class($cache_class);
2011	2415	$feed->set_timeout($timeout);
2012	2416
2013	2417	$feed->set_content_type_sniffer_class($sniffer_class);
2014	2418	$feed->set_file_class($file_class);
		@@ -2056,10 +2460,10 @@
2056	2460	$params = wp_parse_args($params, array(
2057	2461	"cache" => true,
2058	2462	));
2059	2463
2060		- $duration = null;
2061		- if ( ! $params['cache']) :
	2464	+ $duration = NULL;
	2465	+ if (!$params['cache']) :
2062	2466	$duration = 0;
2063	2467	elseif (defined('FEEDWORDPRESS_CACHE_AGE')) :
2064	2468	$duration = FEEDWORDPRESS_CACHE_AGE;
2065	2469	endif;
		@@ -2080,70 +2484,73 @@
2080	2484	return $duration;
2081	2485	} /* FeedWordPress::cache_lifetime () */
2082	2486
2083	2487	# Utility functions for handling text settings
2084		- static function get_field( $f, $setting = null ) {
	2488	+ static function negative ($f, $setting) {
	2489	+ $nego = array ('n', 'no', 'f', 'false');
	2490	+ return (isset($f[$setting]) and in_array(strtolower($f[$setting]), $nego));
	2491	+ } /* FeedWordPress::negative () */
2085	2492
2086		- $ret = $f;
2087		- if ( ! is_null( $setting ) ) :
2088		- $ret = null;
2089		- if ( array_key_exists( $setting, $f ) ) :
2090		- $ret = $f[ $setting ];
2091		- endif;
	2493	+ static function affirmative ($f, $setting) {
	2494	+ $affirmo = array ('y', 'yes', 't', 'true', 1);
	2495	+ return (isset($f[$setting]) and in_array(strtolower($f[$setting]), $affirmo));
	2496	+ } /* FeedWordPress::affirmative () */
	2497	+
	2498	+ # Internal debugging functions
	2499	+ static function critical_bug ($varname, $var, $line, $file = NULL) {
	2500	+ global $wp_version;
	2501	+
	2502	+ if (!is_null($file)) :
	2503	+ $location = "line # ${line} of ".basename($file);
	2504	+ else :
	2505	+ $location = "line # ${line}";
2092	2506	endif;
2093		- return $ret;
2094	2507
2095		- } /* FeedWordPress::get_field () */
	2508	+ print '<p><strong>Critical error:</strong> There may be a bug in FeedWordPress. Please <a href="'.FEEDWORDPRESS_AUTHOR_CONTACT.'">contact the author</a> and paste the following information into your e-mail:</p>';
	2509	+ print "\n<plaintext>";
	2510	+ print "Triggered at ${location}\n";
	2511	+ print "FeedWordPress: ".FEEDWORDPRESS_VERSION."\n";
	2512	+ print "WordPress: {$wp_version}\n";
	2513	+ print "PHP: ".phpversion()."\n";
	2514	+ print "Error data: ";
	2515	+ print $varname.": "; var_dump($var); echo "\n";
	2516	+ die;
	2517	+ } /* FeedWordPress::critical_bug () */
2096	2518
2097		- static function negative ($f, $setting = null) {
2098		- $nego = array ('n', 'no', 'f', 'false');
2099		- $q = self::get_field( $f, $setting );
2100		- return in_array( strtolower( trim( $q ) ), $nego );
2101		- } /* FeedWordPress::negative () */
	2519	+ static function noncritical_bug ($varname, $var, $line, $file = NULL) {
	2520	+ if (FEEDWORDPRESS_DEBUG) : // halt only when we are doing debugging
	2521	+ FeedWordPress::critical_bug($varname, $var, $line, $file);
	2522	+ endif;
	2523	+ } /* FeedWordPress::noncritical_bug () */
2102	2524
2103		- static function affirmative ($f, $setting = null) {
2104		- // Defining possible affirmative values
2105		- $affirmo = [ 'y', 'yes', 't', 'true', 1 ];
2106		-
2107		- // Get the field value (presumably from some form or other input)
2108		- $q = self::get_field( $f, $setting );
2109		-
2110		- // Ensure $q is treated properly even if it's null or not set
2111		- if ( null === $q ) {
2112		- return false; // Or you can return false or other fallback as needed
2113		- }
	2525	+ static function val ($v, $no_newlines = false) {
	2526	+ return MyPHP::val($v, $no_newlines);
	2527	+ } /* FeedWordPress::val () */
2114	2528
2115		- // Check if the value, after trimming and converting to lowercase, is in the affirmative array
2116		- return in_array( strtolower( trim( $q ) ), $affirmo, true ); // The third argument `true` ensures strict type checking
2117		- } /* FeedWordPress::affirmative () */
	2529	+ static function diagnostic_on ($level) {
	2530	+ $show = get_option('feedwordpress_diagnostics_show', array());
	2531	+ return (in_array($level, $show));
	2532	+ } /* FeedWordPress::diagnostic_on () */
2118	2533
2119		- /**
2120		- * Internal debugging functions.
2121		- *
2122		- * @todo radgeek needs to document this better. What levels exist, and
2123		- * how/where are they defined? (gwyneth 20230919)
2124		- *
2125		- * @global $feedwordpress_admin_footer
2126		- */
2127		- static function diagnostic( $level, $out, $persist = null, $since = null, $mostRecent = null ) {
	2534	+ static function diagnostic ($level, $out, $persist = NULL, $since = NULL, $mostRecent = NULL) {
2128	2535	global $feedwordpress_admin_footer;
2129	2536
2130		- $output = (array) get_option( 'feedwordpress_diagnostics_output', array() );
2131		- $dlog = get_option( 'feedwordpress_diagnostics_log', array() );
	2537	+ $output = get_option('feedwordpress_diagnostics_output', array());
	2538	+ $dlog = get_option('feedwordpress_diagnostics_log', array());
2132	2539
2133		- $diagnostic_nesting = count( explode( ":", $level ) );
	2540	+ $diagnostic_nesting = count(explode(":", $level));
2134	2541
2135		- if (FeedWordPressDiagnostic::is_on($level)) :
	2542	+ if (self::diagnostic_on($level)) :
2136	2543	foreach ($output as $method) :
2137	2544	switch ($method) :
2138	2545	case 'echo' :
2139		- if ( !( self::update_requested() || wp_doing_ajax() ) ) :
2140		- echo "<div><pre><strong>Diag".esc_html( str_repeat('====', $diagnostic_nesting-1) ).'|</strong> '. esc_html( $out )."</pre></div>\n";
	2546	+ if (!self::update_requested()) :
	2547	+ echo "<div><pre><strong>Diag".str_repeat('====', $diagnostic_nesting-1).'|</strong> '.$out."</pre></div>\n";
2141	2548	endif;
2142	2549	break;
2143	2550	case 'echo_in_cronjob' :
2144	2551	if (self::update_requested()) :
2145		- echo esc_html( self::log_prefix() ) . ' ' . esc_html( $out ) . "\n";
	2552	+ echo self::log_prefix()." ".$out."\n";
2146	2553	endif;
2147	2554	break;
2148	2555	case 'admin_footer' :
2149	2556	$feedwordpress_admin_footer[] = $out;
		@@ -2148,9 +2555,9 @@
2148	2555	case 'admin_footer' :
2149	2556	$feedwordpress_admin_footer[] = $out;
2150	2557	break;
2151	2558	case 'error_log' :
2152		- error_log(self::log_prefix() . ' ' . $out);
	2559	+ error_log(self::log_prefix().' '.$out);
2153	2560	break;
2154	2561	case 'email' :
2155	2562
2156	2563	if (is_null($persist)) :
		@@ -2162,10 +2569,10 @@
2162	2569	$hook = md5($level."\n".$persist);
2163	2570	$line = array("Since" => $since, "Message" => $out, "Most Recent" => $mostRecent);
2164	2571	endif;
2165	2572
2166		- if ( !isset($dlog['mesg'])) : $dlog['mesg'] = array(); endif;
2167		- if ( !isset($dlog['mesg'][$sect])) : $dlog['mesg'][$sect] = array(); endif;
	2573	+ if (!isset($dlog['mesg'])) : $dlog['mesg'] = array(); endif;
	2574	+ if (!isset($dlog['mesg'][$sect])) : $dlog['mesg'][$sect] = array(); endif;
2168	2575
2169	2576	$dlog['mesg'][$sect][$hook] = $line;
2170	2577	endswitch;
2171	2578	endforeach;
		@@ -2170,14 +2577,14 @@
2170	2577	endswitch;
2171	2578	endforeach;
2172	2579	endif;
2173	2580
2174		- update_option( 'feedwordpress_diagnostics_log', $dlog );
2175		- } /* FeedWordPress::diagnostic() */
	2581	+ update_option('feedwordpress_diagnostics_log', $dlog);
	2582	+ } /* FeedWordPress::diagnostic () */
2176	2583
2177	2584	public function email_diagnostics_override () {
2178		- return ( $this->has_secret() and ! ! FeedWordPress::param( 'feedwordpress_email_diagnostics' ) );
2179		- } /* FeedWordPress::email_diagnostics_override() */
	2585	+ return ($this->has_secret() and isset($_REQUEST['feedwordpress_email_diagnostics']) and !!$_REQUEST['feedwordpress_email_diagnostics']);
	2586	+ } /* FeedWordPress::email_diagnostics_override () */
2180	2587
2181	2588	public function has_emailed_diagnostics ($dlog) {
2182	2589	$ret = false;
2183	2590	if ($this->email_diagnostics_override()
		@@ -2184,9 +2591,9 @@
2184	2591	or (isset($dlog['schedule']) and isset($dlog['schedule']['last']))) :
2185	2592	$ret = true;
2186	2593	endif;
2187	2594	return $ret;
2188		- } /* FeedWordPress::has_emailed_diagnostics() */
	2595	+ } /* FeedWordPress::has_emailed_diagnostics () */
2189	2596
2190	2597	public function ready_to_email_diagnostics ($dlog) {
2191	2598	$ret = false;
2192	2599	if ($this->email_diagnostics_override()
		@@ -2193,19 +2600,14 @@
2193	2600	or (time() > ($dlog['schedule']['last'] + $dlog['schedule']['freq']))) :
2194	2601	$ret = true;
2195	2602	endif;
2196	2603	return $ret;
2197		- } /* FeedWordPress::ready_to_email_diagnostics() */
	2604	+ } /* FeedWordPress::ready_to_email_diagnostics () */
2198	2605
2199		- /**
2200		- * Emails a diagnostic log to the WP administrator.
2201		- *
2202		- * @param Array $params See @wp_parse_args()
2203		- */
2204		- public function email_diagnostic_log( $params = array() ) {
2205		- $params = wp_parse_args( $params, array(
2206		- "force" => false,
2207		- ) );
	2606	+ public function email_diagnostic_log ($params = array()) {
	2607	+ $params = wp_parse_args($params, array(
	2608	+ "force" => false,
	2609	+ ));
2208	2610
2209	2611	$dlog = get_option('feedwordpress_diagnostics_log', array());
2210	2612
2211	2613	if ($this->has_emailed_diagnostics($dlog)) :
		@@ -2211,10 +2613,10 @@
2211	2613	if ($this->has_emailed_diagnostics($dlog)) :
2212	2614	if ($this->ready_to_email_diagnostics($dlog)) :
2213	2615	// No news is good news; only send if
2214	2616	// there are some messages to send.
2215		- $body = null;
2216		- if ( !isset($dlog['mesg'])) : $dlog['mesg'] = array(); endif;
	2617	+ $body = NULL;
	2618	+ if (!isset($dlog['mesg'])) : $dlog['mesg'] = array(); endif;
2217	2619
2218	2620	foreach ($dlog['mesg'] as $sect => $mesgs) :
2219	2621	if (count($mesgs) > 0) :
2220	2622	if (is_null($body)) : $body = ''; endif;
		@@ -2222,9 +2624,9 @@
2222	2624	$paradigm = reset($mesgs);
2223	2625	$body .= "<h2>".ucfirst($sect)." issues</h2>\n"
2224	2626	."<table>\n"
2225	2627	."<thead><tr>\n";
2226		- foreach ( $paradigm as $col => $value ) :
	2628	+ foreach ($paradigm as $col => $value) :
2227	2629	$body .= '<th scope="col">'.$col."</th>\n";
2228	2630	endforeach;
2229	2631	$body .= "</tr></thead>\n"
2230	2632	."<tbody>\n";
		@@ -2235,9 +2637,9 @@
2235	2637	if (is_numeric($cell)) :
2236	2638	$cell = date('j-M-y, h:i a', $cell);
2237	2639	endif;
2238	2640	$class = strtolower(preg_replace('/\s+/', '-', $col));
2239		- $body .= "<td class=\"$class\">{$cell}</td>";
	2641	+ $body .= "<td class=\"$class\">${cell}</td>";
2240	2642	endforeach;
2241	2643	$body .= "</tr>\n";
2242	2644	endforeach;
2243	2645
		@@ -2245,9 +2647,9 @@
2245	2647	endif;
2246	2648	endforeach;
2247	2649
2248	2650	$body = apply_filters('feedwordpress_diagnostic_email_body', $body, $dlog);
2249		- if ( !is_null($body)) :
	2651	+ if (!is_null($body)) :
2250	2652	$home = feedwordpress_display_url(get_bloginfo('url'));
2251	2653	$subj = apply_filters('feedwordpress_diagnostic_email_subject', $home . " syndication issues", $dlog);
2252	2654	$agent = 'FeedWordPress '.FEEDWORDPRESS_VERSION;
2253	2655	$body = <<<EOMAIL
		@@ -2281,16 +2683,10 @@
2281	2683	$recipients = array($ref[1]);
2282	2684
2283	2685	// userid
2284	2686	elseif (preg_match('/^user:(.*)$/', $ded, $ref)) :
2285		- if ( is_numeric( $ref[1] ) and function_exists( 'get_userdata' ) ) :
2286		- $userdata = get_userdata( (int) $ref[1]) ;
2287		- $recipients = array( $userdata->user_email );
2288		- else :
2289		- // get_userdata() might not have been loaded yet, so send
2290		- // to admins instead. (gwyneth 20230901)
2291		- $recipients = FeedWordPressDiagnostic::admin_emails();
2292		- endif;
	2687	+ $userdata = get_userdata((int) $ref[1]);
	2688	+ $recipients = array($userdata->user_email);
2293	2689
2294	2690	// admins
2295	2691	else :
2296	2692	$recipients = FeedWordPressDiagnostic::admin_emails();
		@@ -2296,12 +2692,12 @@
2296	2692	$recipients = FeedWordPressDiagnostic::admin_emails();
2297	2693	endif;
2298	2694
2299	2695	$mesgId = 'feedwordpress+'.time().'@'.$home;
2300		- $parentId = get_option('feedwordpress_diagnostics_email_root_message_id', null);
	2696	+ $parentId = get_option('feedwordpress_diagnostics_email_root_message_id', NULL);
2301	2697
2302	2698	$head = array("Message-ID: <$mesgId>");
2303		- if ( !is_null($parentId)) :
	2699	+ if (!is_null($parentId)) :
2304	2700	// We've already sent off a diagnostic message in the past. Let's do some
2305	2701	// magic to help with threading, in the hopes that all diagnostic messages
2306	2702	// get threaded together.
2307	2703	$head[] = "References: <$parentId>";
		@@ -2333,13 +2729,12 @@
2333	2729	'last' => time(),
2334	2730	);
2335	2731	endif;
2336	2732
2337		- update_option( 'feedwordpress_diagnostics_log', $dlog );
	2733	+ update_option('feedwordpress_diagnostics_log', $dlog);
2338	2734	} /* FeedWordPress::email_diagnostic_log () */
2339	2735
2340		-
2341		- static function allow_html_mail() {
	2736	+ static function allow_html_mail () {
2342	2737	return 'text/html';
2343	2738	} /* FeedWordPress::allow_html_mail () */
2344	2739
2345	2740	static function admin_footer () {
		@@ -2344,18 +2739,12 @@
2344	2739
2345	2740	static function admin_footer () {
2346	2741	global $feedwordpress_admin_footer;
2347	2742	foreach ($feedwordpress_admin_footer as $line) :
2348		- echo '<div><pre>' . esc_html( $line ) . '</pre></div>';
	2743	+ echo '<div><pre>'.$line.'</pre></div>';
2349	2744	endforeach;
2350	2745	} /* FeedWordPress::admin_footer () */
2351	2746
2352		- /**
2353		- * Returns the log prefix, optionally with a date.
2354		- *
2355		- * @param boolean $date If true, a date timestamp is added to the prefix.
2356		- * @return string Generated log prefix.
2357		- */
2358	2747	static function log_prefix ($date = false) {
2359	2748	$home = get_bloginfo('url');
2360	2749	$prefix = '['.feedwordpress_display_url($home).'] [feedwordpress] ';
2361	2750	if ($date) :
		@@ -2363,14 +2752,8 @@
2363	2752	endif;
2364	2753	return $prefix;
2365	2754	} /* FeedWordPress::log_prefix () */
2366	2755
2367		- /**
2368		- * Returns the menu capacity value.
2369		- *
2370		- * @param boolean $sub If true, we're on a menu sublevel.
2371		- * @return mixed Returns the capacity.
2372		- */
2373	2756	static function menu_cap ($sub = false) {
2374	2757	if ($sub) :
2375	2758	$cap = apply_filters('feedwordpress_menu_settings_capacity', 'manage_options');
2376	2759	else :
		@@ -2378,19 +2761,8 @@
2378	2761	endif;
2379	2762	return $cap;
2380	2763	} /* FeedWordPress::menu_cap () */
2381	2764
2382		- public function plugin_dir_path ($path = '') {
2383		- $dir = plugin_dir_path( __FILE__ );
2384		- $file_path = "{$dir}{$path}";
2385		- return apply_filters( "feedwordpress_plugin_dir_path", $file_path );
2386		- } /* FeedWordPress::plugin_dir_path () */
2387		-
2388		- public function plugin_dir_url ($path = '') {
2389		- $url_path = plugins_url( $path, __FILE__ );
2390		- return apply_filters( "feedwordpress_plugin_dir_url", $url_path );
2391		- } /* FeedWordPRess::plugin_dir_url () */
2392		-
2393	2765	static function path ($filename = '') {
2394	2766	global $fwp_path;
2395	2767
2396	2768	$path = $fwp_path;
		@@ -2396,105 +2768,48 @@
2396	2768	$path = $fwp_path;
2397	2769	if (strlen($filename) > 0) :
2398	2770	$path .= '/'.$filename;
2399	2771	endif;
2400		-
2401	2772	return $path;
2402	2773	} /* FeedWordPress::path () */
2403	2774
2404		- // -- DEPRCATED UTILITY FUNCTIONS -------------------------------------
2405		- // These are superceded by later code re-organization, (for example
2406		- // MyPHP::param/post/get/request, or FeedWordPressDiagnostic methods),
2407		- // but for the last several versions have been kept here for backward
2408		- // compatibility with add-ons, older code, etc. Maybe someday they
2409		- // will go away.
2410		- // -------------------------------------------------------------------
2411		- static function param( $key, $type = 'REQUEST', $default = null, $sanitizer = null ) {
2412		- return self::sanitized_parameter( MyPHP::param( $key, $default, $type ), $sanitizer );
	2775	+ // These are superceded by MyPHP::param/post/get/request, but kept
	2776	+ // here for backward compatibility.
	2777	+
	2778	+ static function param ($key, $type = 'REQUEST', $default = NULL) {
	2779	+ return MyPHP::param($key, $default, $type);
2413	2780	} /* FeedWordPress::param () */
2414	2781
2415		- static function post( $key, $default = null, $sanitizer = null ) {
2416		- return self::sanitized_parameter( MyPHP::post( $key, $default ), $sanitizer );
	2782	+ static function post ($key, $default = NULL) {
	2783	+ return MyPHP::post($key, $default);
2417	2784	} /* FeedWordPress::post () */
2418	2785
2419		- static function shallow_sanitize( $item, $sanitizer = null ) {
2420		- if ( $sanitizer == 'raw' ) :
2421		- $value = $item;
2422		- elseif ( $sanitizer == 'textarea' ) :
2423		- $value = sanitize_textarea_field( $item );
2424		- else :
2425		- $value = sanitize_text_field( $item );
2426		- endif;
2427		- return $value;
2428		- }
2429		-
2430		- static function sanitized_parameter( $value, $sanitizer = null ) {
2431		- if ( $sanitizer === 'raw' || is_scalar( $value ) ) :
2432		- $ret = self::shallow_sanitize( $value, $sanitizer );
2433		- elseif ( is_array( $value ) ) :
2434		- $ret = array();
2435		- foreach ( $value as $key => $item ) :
2436		- $ret[ $key ] = self::sanitized_parameter( $item, $sanitizer );
2437		- endforeach;
2438		- else :
2439		- $ret = null; // "Sanitized" objects or resources currently get nothing.
2440		- endif;
2441		- return $ret;
2442		- }
2443		-
2444		- static function val ($v, $no_newlines = false) {
2445		- return MyPHP::val($v, $no_newlines);
2446		- } /* FeedWordPress::val () */
2447		-
2448		- static function critical_bug ($varname, $var, $line, $file = null) {
2449		- FeedWordPressDiagnostic::critical_bug($varname, $var, $line, $file);
2450		- } /* FeedWordPress::critical_bug () */
2451		-
2452		- static function noncritical_bug ($varname, $var, $line, $file = null) {
2453		- FeedWordPressDiagnostic::noncritical_bug($varname, $var, $line, $file);
2454		- } /* FeedWordPress::noncritical_bug () */
2455		-
2456		- static function diagnostic_on ($level) {
2457		- return FeedWordPressDiagnostic::is_on($level);
2458		- } /* FeedWordPress::diagnostic_on () */
2459		-
2460	2786	} /* class FeedWordPress */
2461	2787
2462	2788	$feedwordpress_admin_footer = array();
2463	2789
2464	2790	// take your best guess at the realname and e-mail, given a string
2465		-define( 'FWP_REGEX_EMAIL_ADDY', '([^@"(<\s]+@[^"@(<\s]+\.[^"@(<\s]+)' );
2466		-define( 'FWP_REGEX_EMAIL_NAME', '("([^"]*)"|([^"<(]+\S))' );
2467		-define( 'FWP_REGEX_EMAIL_POSTFIX_NAME', '/^\s*' . FWP_REGEX_EMAIL_ADDY . '\s+\(' . FWP_REGEX_EMAIL_NAME . '\)\s*$/' );
2468		-define( 'FWP_REGEX_EMAIL_PREFIX_NAME', '/^\s*' . FWP_REGEX_EMAIL_NAME . '\s*<' . FWP_REGEX_EMAIL_ADDY . '>\s*$/' );
2469		-define( 'FWP_REGEX_EMAIL_JUST_ADDY', '/^\s*' . FWP_REGEX_EMAIL_ADDY . '\s*$/' );
2470		-define( 'FWP_REGEX_EMAIL_JUST_NAME', '/^\s*' . FWP_REGEX_EMAIL_NAME . '\s*$/' );
	2791	+define('FWP_REGEX_EMAIL_ADDY', '([^@"(<\s]+@[^"@(<\s]+\.[^"@(<\s]+)');
	2792	+define('FWP_REGEX_EMAIL_NAME', '("([^"]*)"|([^"<(]+\S))');
	2793	+define('FWP_REGEX_EMAIL_POSTFIX_NAME', '/^\s*'.FWP_REGEX_EMAIL_ADDY."\s+\(".FWP_REGEX_EMAIL_NAME.'\)\s*$/');
	2794	+define('FWP_REGEX_EMAIL_PREFIX_NAME', '/^\s*'.FWP_REGEX_EMAIL_NAME.'\s*<'.FWP_REGEX_EMAIL_ADDY.'>\s*$/');
	2795	+define('FWP_REGEX_EMAIL_JUST_ADDY', '/^\s*'.FWP_REGEX_EMAIL_ADDY.'\s*$/');
	2796	+define('FWP_REGEX_EMAIL_JUST_NAME', '/^\s*'.FWP_REGEX_EMAIL_NAME.'\s*$/');
2471	2797
2472		-/**
2473		- * Parses an email address that includes the real name as well.
2474		- *
2475		- * @param string $email Email address to parse.
2476		- *
2477		- * @return array Associative array with 'name' and 'email' as fields (each may be null).
2478		- */
2479		-function parse_email_with_realname( $email ) {
2480		- $ret = array(
2481		- 'name' => null,
2482		- 'email' => null
2483		- ); // avoid uninitialized variables for return values, this will generate a notice/warning - and one day, an error! (gwyneth 20210714)
2484		-
2485		- if ( preg_match( FWP_REGEX_EMAIL_POSTFIX_NAME, $email, $matches ) ) :
2486		- ( $ret['name'] = $matches[3] ) || ( $ret['name'] = $matches[2] );
	2798	+function parse_email_with_realname ($email) {
	2799	+ if (preg_match(FWP_REGEX_EMAIL_POSTFIX_NAME, $email, $matches)) :
	2800	+ ($ret['name'] = $matches[3]) or ($ret['name'] = $matches[2]);
2487	2801	$ret['email'] = $matches[1];
2488		- elseif ( preg_match( FWP_REGEX_EMAIL_PREFIX_NAME, $email, $matches ) ) :
2489		- ( $ret['name'] = $matches[2] ) || ( $ret['name'] = $matches[3] );
	2802	+ elseif (preg_match(FWP_REGEX_EMAIL_PREFIX_NAME, $email, $matches)) :
	2803	+ ($ret['name'] = $matches[2]) or ($ret['name'] = $matches[3]);
2490	2804	$ret['email'] = $matches[4];
2491		-
2492		- elseif ( preg_match( FWP_REGEX_EMAIL_JUST_ADDY, $email, $matches ) ) :
2493		- $ret['name'] = null;
2494		- $ret['email'] = $matches[1];
2495		- elseif ( preg_match( FWP_REGEX_EMAIL_JUST_NAME, $email, $matches ) ) :
2496		- $ret['email'] = null;
2497		- ( $ret['name'] = $matches[2] ) || ( $ret['name'] = $matches[3] );
	2805	+ elseif (preg_match(FWP_REGEX_EMAIL_JUST_ADDY, $email, $matches)) :
	2806	+ $ret['name'] = NULL; $ret['email'] = $matches[1];
	2807	+ elseif (preg_match(FWP_REGEX_EMAIL_JUST_NAME, $email, $matches)) :
	2808	+ $ret['email'] = NULL;
	2809	+ ($ret['name'] = $matches[2]) or ($ret['name'] = $matches[3]);
	2810	+ else :
	2811	+ $ret['name'] = NULL; $ret['email'] = NULL;
2498	2812	endif;
2499	2813	return $ret;
2500	2814	}
	2815	+