← All changes | feedwordpress.php +483 -647 trunk → 2020.0818 View file →

		@@ -1,18 +1,18 @@
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: 2020.0818
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 2020.0818
15	15	*/
16	16
17	17	# This plugin uses code derived from:
18	18	# - wp-rss-aggregate.php by Kellan Elliot-McCrea <kellan@protest.net>
		@@ -22,9 +22,9 @@
22	22	# - WordPress Blog Tool and Publishing Platform <http://wordpress.org/>
23	23	# - Github contributors @Flynsarmy, @BandonRandon, @david-robinson-practiceweb,
24	24	# @daidais, @thegreatmichael, @stedaniels, @alexiskulash, @quassy, @zoul0813,
25	25	# @timmmmyboy, @vobornik, @inanimatt, @tristanleboss, @martinburchell,
26		-# @bigalownz, @oppiansteve, @GwynethLlewelyn, and @glg222
	26	+# @bigalownz, and @oppiansteve
27	27	# according to the terms of the GNU General Public License.
28	28
29	29	####################################################################################
30	30	## CONSTANTS & DEFAULTS ############################################################
		@@ -29,55 +29,50 @@
29	29	####################################################################################
30	30	## CONSTANTS & DEFAULTS ############################################################
31	31	####################################################################################
32	32
33		-define ('FEEDWORDPRESS_VERSION', '2026.0517');
34		-define ('FEEDWORDPRESS_AUTHOR_CONTACT', 'https://fwpplugin.com/contact' );
	33	+define ('FEEDWORDPRESS_VERSION', '2020.0818');
	34	+define ('FEEDWORDPRESS_AUTHOR_CONTACT', 'http://feedwordpress.radgeek.com/contact');
35	35
36		-if ( ! defined( 'FEEDWORDPRESS_BLEG' ) ) :
37		- define ( 'FEEDWORDPRESS_BLEG', true );
	36	+if (!defined('FEEDWORDPRESS_BLEG')) :
	37	+ define ('FEEDWORDPRESS_BLEG', true);
38	38	endif;
39	39
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' );
	40	+define('FEEDWORDPRESS_BLEG_BTC_pre_2020', '15EsQ9QMZtLytsaVYZUaUCmrkSMaxZBTso');
	41	+define('FEEDWORDPRESS_BLEG_BTC', '1NB1ebYVb68Har4WijmE8gKnZ47NptCqtB'); // 2020.0201
44	42
	43	+define('FEEDWORDPRESS_BLEG_PAYPAL', '22PAJZZCK5Z3W');
	44	+
45	45	// 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 );
	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);
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('FEEDWORDPRESS_BOILERPLATE_DEFAULT_HOOK_ORDER', 11000); // at the tail end of the filtering process
75	70
76		-if ( FEEDWORDPRESS_DEBUG ) :
	71	+if (FEEDWORDPRESS_DEBUG) :
77	72	// Help us to pick out errors, if any.
78		- ini_set( 'error_reporting', E_ALL & ~E_NOTICE );
79		- ini_set( 'display_errors', true );
	73	+ ini_set('error_reporting', E_ALL & ~E_NOTICE);
	74	+ ini_set('display_errors', true);
80	75
81	76	// When testing we don't want cache issues to interfere. But this is
82	77	// a VERY BAD SETTING for a production server. Webmasters will eat your
83	78	// face for breakfast if you use it, and the baby Jesus will cry. So
		@@ -82,17 +77,17 @@
82	77	// a VERY BAD SETTING for a production server. Webmasters will eat your
83	78	// face for breakfast if you use it, and the baby Jesus will cry. So
84	79	// make sure FEEDWORDPRESS_DEBUG is FALSE for any site that will be
85	80	// 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 );
	81	+ define('FEEDWORDPRESS_CACHE_AGE', 1);
	82	+ define('FEEDWORDPRESS_CACHE_LIFETIME', 1);
	83	+ define('FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT', 60);
89	84	else :
90	85	// Hold onto data all day for conditional GET purposes,
91	86	// 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 );
	87	+ define('FEEDWORDPRESS_CACHE_LIFETIME', 24*60*60);
	88	+ define('FEEDWORDPRESS_CACHE_AGE', 1*60);
	89	+ define('FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT', 20);
95	90	endif;
96	91
97	92	####################################################################################
98	93	## CORE DEPENDENCIES & PLUGIN MODULES ##############################################
		@@ -97,27 +92,29 @@
97	92	####################################################################################
98	93	## CORE DEPENDENCIES & PLUGIN MODULES ##############################################
99	94	####################################################################################
100	95
101		-/** @var array<string> Dependencies: modules packaged with WordPress core */
	96	+// Dependencies: modules packaged with WordPress core
102	97	$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",
	98	+"class:SimplePie" => "class-simplepie",
	99	+"class:WP_Feed_Cache" => "class-wp-feed-cache",
	100	+"class:WP_Feed_Cache_Transient" => "class-wp-feed-cache-transient",
	101	+"class:WP_SimplePie_File" => "class-wp-simplepie-file",
	102	+"class:WP_SimplePie_Sanitize_KSES" => "class-wp-simplepie-sanitize-kses",
	103	+"function:wp_insert_user" => "registration",
107	104	);
108	105
109	106	// Ensure that we have SimplePie loaded up and ready to go
110	107	// along with the WordPress auxiliary classes.
111	108	$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;
	109	+foreach ($wpCoreDependencies as $unit => $fileSlug) :
	110	+ list($unitType, $unitName) = explode(":", $unit, 2);
	111	+
	112	+ $dependencyMet = (('class'==$unitType) ? class_exists($unitName) : function_exists($unitName));
	113	+ if (!$dependencyMet) :
	114	+ $phpFileName = ABSPATH . WPINC . "/${fileSlug}.php";
	115	+ if (file_exists($phpFileName)) :
	116	+ require_once($phpFileName);
120	117	else :
121	118	$unmetCoreDependencies[] = $unitName;
122	119	endif;
123	120	endif;
		@@ -123,48 +120,61 @@
123	120	endif;
124	121	endforeach;
125	122
126	123	// 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";
	124	+if (count($unmetCoreDependencies) > 0) :
	125	+ require_once(ABSPATH . WPINC . "/class-feed.php");
129	126	endif;
130	127
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";
	128	+// Dependences: modules packaged with FeedWordPress plugin
	129	+$dir = dirname(__FILE__);
	130	+require_once("${dir}/externals/myphp/myphp.class.php");
	131	+require_once("${dir}/feedwordpressadminpage.class.php");
	132	+require_once("${dir}/feedwordpresssettingsui.class.php");
	133	+require_once("${dir}/feedwordpressdiagnostic.class.php");
	134	+require_once("${dir}/admin-ui.php");
	135	+require_once("${dir}/template-functions.php");
	136	+require_once("${dir}/feedwordpresssyndicationpage.class.php");
	137	+require_once("${dir}/compatability.php"); // Legacy API
	138	+require_once("${dir}/syndicatedpost.class.php");
	139	+require_once("${dir}/syndicatedlink.class.php");
	140	+require_once("${dir}/feedwordpresshtml.class.php");
	141	+require_once("${dir}/inspectpostmeta.class.php");
	142	+require_once("${dir}/syndicationdataqueries.class.php");
	143	+require_once("${dir}/extend/SimplePie/feedwordpie.class.php");
	144	+require_once("${dir}/extend/SimplePie/feedwordpie_item.class.php");
	145	+require_once("${dir}/extend/SimplePie/feedwordpie_file.class.php");
	146	+require_once("${dir}/extend/SimplePie/feedwordpie_parser.class.php");
	147	+require_once("${dir}/extend/SimplePie/feedwordpie_content_type_sniffer.class.php");
	148	+require_once("${dir}/feedwordpressrpc.class.php");
	149	+require_once("${dir}/feedwordpresshttpauthenticator.class.php");
	150	+require_once("${dir}/feedwordpresslocalpost.class.php");
154	151
155	152	####################################################################################
156	153	## GLOBAL PARAMETERS ###############################################################
157	154	####################################################################################
158	155
	156	+// $fwp_post used to be a global variable used to make it easier to cope
	157	+// with the frustrating sometime presence of "Magic Quotes" in earlier
	158	+// versions of PHP (<http://php.net/manual/en/security.magicquotes.php>).
	159	+// Magic quotes were DEPRECATED as of PHP 5.3.0, and REMOVED as of PHP
	160	+// 5.4.0, so for the time being $fwp_post just gets a copy of $_POST.
	161	+global $fwp_post;
	162	+
	163	+if (is_array($_POST)) :
	164	+ $fwp_post = $_POST;
	165	+else:
	166	+ $fwp_post = null;
	167	+endif;
	168	+
159	169	// Get the path relative to the plugins directory in which FWP is stored
160	170	preg_match (
161		- '|'.preg_quote( WP_PLUGIN_DIR ) . '/(.+)$|',
162		- dirname( __FILE__ ),
	171	+ '|'.preg_quote(WP_PLUGIN_DIR).'/(.+)$|',
	172	+ dirname(__FILE__),
163	173	$ref
164	174	);
165	175
166		-if ( isset( $ref[1] ) ) :
	176	+if (isset($ref[1])) :
167	177	$fwp_path = $ref[1];
168	178	else : // Something went wrong. Let's just guess.
169	179	$fwp_path = 'feedwordpress';
170	180	endif;
		@@ -173,9 +183,9 @@
173	183	## FEEDWORDPRESS: INITIALIZE OBJECT AND FILTERS ####################################
174	184	####################################################################################
175	185
176	186	$feedwordpress = new FeedWordPress;
177		-if ( ! $feedwordpress->needs_upgrade() ) : // only work if the conditions are safe!
	187	+if (!$feedwordpress->needs_upgrade()) : // only work if the conditions are safe!
178	188	$feedwordpress->add_filters();
179	189
180	190	# Inbound XML-RPC update methods
181	191	$feedwordpressRPC = new FeedWordPressRPC;
		@@ -180,31 +190,25 @@
180	190	# Inbound XML-RPC update methods
181	191	$feedwordpressRPC = new FeedWordPressRPC;
182	192
183	193	# 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
	194	+ remove_action('publish_post', 'generic_ping'); // WP 1.5.x
	195	+ remove_action('do_pings', 'do_all_pings', 10, 1); // WP 2.1, 2.2
	196	+ remove_action('publish_post', '_publish_post_hook', 5, 1); // WP 2.3
187	197
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' );
	198	+ add_action('publish_post', 'fwp_publish_post_hook', 5, 1);
	199	+ add_action('do_pings', 'fwp_do_pings', 10, 1);
	200	+ add_action('feedwordpress_update', 'fwp_hold_pings');
	201	+ add_action('feedwordpress_update_complete', 'fwp_release_pings');
192	202
193	203	else :
194	204	# 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())
	205	+ add_action('admin_menu', array($feedwordpress, 'add_pages'));
	206	+endif; // if (!FeedWordPress::needs_upgrade())
197	207
198		-register_deactivation_hook( __FILE__, 'feedwordpress_deactivate' );
199		-
200		-/**
201		- * Hook to deactivate FeedWordPress.
202		- *
203		- * @return int|false @see wp_clear_scheduled_hook()
204		- */
205		-function feedwordpress_deactivate() {
206		- wp_clear_scheduled_hook( 'fwp_scheduled_update_checkin' );
	208	+register_deactivation_hook(__FILE__, 'feedwordpress_deactivate');
	209	+function feedwordpress_deactivate () {
	210	+ wp_clear_scheduled_hook('fwp_scheduled_update_checkin');
207	211	} /* feedwordpress_deactivate () */
208	212
209	213	################################################################################
210	214	## LOGGING FUNCTIONS: log status updates to error_log if you want it ###########
		@@ -209,39 +213,26 @@
209	213	################################################################################
210	214	## LOGGING FUNCTIONS: log status updates to error_log if you want it ###########
211	215	################################################################################
212	216
213		-/**
214		- * Divides bytes into units of higher magnitude (e.g KB, MB, etc).
215		- *
216		- * @param int|string $quantity Quantity in bytes to be displayed. Can be a string that only includes numeric digits.
217		- *
218		- * @return string Formatted string with quantity and unit.
219		- *
220		- * @deprecated use the WordPress built-in `size_format()` function instead! (gwyneth 20230918)
221		- */
222		-function debug_out_human_readable_bytes( $quantity ) {
223		- if ( ! is_numeric( $quantity ) ) :
224		- return __( "(wrong quantity)" );
225		- endif;
226		- $quantity = intval( $quantity );
	217	+function debug_out_human_readable_bytes ($quantity) {
	218	+ $quantity = (int) $quantity;
227	219	$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 );
	220	+ $orders = array('KB', 'MB', 'GB', 'TB');
	221	+ while (($quantity > (1024*100)) and (count($orders) > 0)) :
	222	+ $quantity = floor($quantity / 1024);
	223	+ $magnitude = array_shift($orders);
233	224	endwhile;
234		- return "{$quantity} {$magnitude}";
	225	+ return "${quantity} ${magnitude}";
235	226	}
236	227
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() ) );
	228	+function debug_out_feedwordpress_footer () {
	229	+ if (FeedWordPressDiagnostic::is_on('memory_usage')) :
	230	+ if (function_exists('memory_get_usage')) :
	231	+ FeedWordPress::diagnostic ('memory_usage', "Memory: Current usage: ".debug_out_human_readable_bytes(memory_get_usage()));
241	232	endif;
242		- if ( function_exists('memory_get_peak_usage') ) :
243		- FeedWordPress::diagnostic('memory_usage', "Memory: Peak usage: " . size_format( memory_get_peak_usage() ) );
	233	+ if (function_exists('memory_get_peak_usage')) :
	234	+ FeedWordPress::diagnostic ('memory_usage', "Memory: Peak usage: ".debug_out_human_readable_bytes(memory_get_peak_usage()));
244	235	endif;
245	236	endif;
246	237	} /* debug_out_feedwordpress_footer() */
247	238
		@@ -248,19 +239,19 @@
248	239	################################################################################
249	240	## FILTERS: syndication-aware handling of post data for templates and feeds ####
250	241	################################################################################
251	242
252		-$feedwordpress_the_syndicated_content = null;
253		-$feedwordpress_the_original_permalink = null;
	243	+$feedwordpress_the_syndicated_content = NULL;
	244	+$feedwordpress_the_original_permalink = NULL;
254	245
255	246	function feedwordpress_preserve_syndicated_content ($text) {
256	247	global $feedwordpress_the_syndicated_content;
257	248
258	249	$p = new FeedWordPressLocalPost;
259		- if ( ! $p->is_exposed_to_formatting_filters()) :
	250	+ if (!$p->is_exposed_to_formatting_filters()) :
260	251	$feedwordpress_the_syndicated_content = $text;
261	252	else :
262		- $feedwordpress_the_syndicated_content = null;
	253	+ $feedwordpress_the_syndicated_content = NULL;
263	254	endif;
264	255	return $text;
265	256	}
266	257
		@@ -278,21 +269,21 @@
278	269	// In a post context....
279	270	if (is_syndicated()) :
280	271	?>
281	272	<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() ); ?>" />
	273	+ <title><?php print htmlspecialchars(get_syndication_source()); ?></title>
	274	+ <link rel="alternate" type="text/html" href="<?php print htmlspecialchars(get_syndication_source_link()); ?>" />
	275	+ <link rel="self" href="<?php print htmlspecialchars(get_syndication_feed()); ?>" />
285	276	<?php
286	277	$id = get_syndication_feed_guid();
287		- if ( strlen( $id ) > 0 ) :
	278	+ if (strlen($id) > 0) :
288	279	?>
289		- <id><?php print esc_xml( $id ); ?></id>
	280	+ <id><?php print htmlspecialchars($id); ?></id>
290	281	<?php
291	282	endif;
292	283	$updated = get_feed_meta('feed/updated');
293		- if ( strlen( $updated ) > 0 ) : ?>
294		- <updated><?php print esc_xml( $updated ); ?></updated>
	284	+ if (strlen($updated) > 0) : ?>
	285	+ <updated><?php print $updated; ?></updated>
295	286	<?php
296	287	endif;
297	288	?>
298	289	</source>
		@@ -306,11 +297,8 @@
306	297	* Syndication => Posts & Links. Saves the old internal permalink in a global
307	298	* variable for later use.
308	299	*
309	300	* @param string $permalink The internal permalink
310		- * @param mixed|null $post Post object
311		- * @param bool $leavename Unused
312		- * @param bool $sample Unused
313	301	* @return string The new permalink. Same as the old if the post is not
314	302	* syndicated, or if FWP is set to use internal permalinks, or if the post
315	303	* was syndicated, but didn't have a proper permalink recorded.
316	304	*
		@@ -320,9 +308,9 @@
320	308	* @uses url_to_postid()
321	309	* @global $id
322	310	* @global $feedwordpress_the_original_permalink
323	311	*/
324		-function syndication_permalink($permalink = '', $post = null, $leavename = false, $sample = false ) {
	312	+function syndication_permalink ($permalink = '', $post = null, $leavename = false, $sample = false) {
325	313	global $id;
326	314	global $feedwordpress_the_original_permalink;
327	315
328	316	// Save the local permalink in case we need to retrieve it later.
		@@ -386,9 +374,9 @@
386	374	* @uses is_syndicated()
387	375	* @uses FeedWordPress::munge_permalinks()
388	376	*/
389	377	function syndication_comments_feed_link ($link) {
390		- global $feedwordpress_the_original_permalink;
	378	+ global $feedwordpress_the_original_permalink, $id;
391	379
392	380	if (is_syndicated() and FeedWordPress::munge_permalinks()) :
393	381	// If the source post provided a comment feed URL using
394	382	// wfw:commentRss or atom:link/@rel="replies" we can make use of
		@@ -393,9 +381,9 @@
393	381	// If the source post provided a comment feed URL using
394	382	// wfw:commentRss or atom:link/@rel="replies" we can make use of
395	383	// that value here.
396	384	$source = get_syndication_feed_object();
397		- $replacement = null;
	385	+ $replacement = NULL;
398	386
399	387	if (is_object($source) && $source->setting('munge comments feed links', 'munge_comments_feed_links', 'yes') != 'no') :
400	388	$commentFeeds = get_post_custom_values('wfw:commentRSS');
401	389	if (
		@@ -435,23 +423,23 @@
435	423	// comments feed link is never munged by FWP.
436	424	endif;
437	425	endif;
438	426
439		- if ( !is_null($replacement)) : $link = $replacement; endif;
	427	+ if (!is_null($replacement)) : $link = $replacement; endif;
440	428	endif;
441	429	return $link;
442	430	} /* function syndication_comments_feed_link() */
443	431
444		- require_once("{$dir}/feedwordpress.pings.functions.php");
	432	+ require_once("${dir}/feedwordpress.pings.functions.php");
445	433
446		- require_once("{$dir}/feedwordpress.wp-admin.post-edit.functions.php");
	434	+ require_once("${dir}/feedwordpress.wp-admin.post-edit.functions.php");
447	435
448	436	################################################################################
449	437	## class FeedWordPressBoilerplateReformatter ###################################
450	438	################################################################################
451	439
452		-require_once("{$dir}/feedwordpressboilerplatereformatter.class.php");
453		-require_once("{$dir}/feedwordpressboilerplatereformatter.shortcode.functions.php");
	440	+require_once("${dir}/feedwordpressboilerplatereformatter.class.php");
	441	+require_once("${dir}/feedwordpressboilerplatereformatter.shortcode.functions.php");
454	442
455	443	################################################################################
456	444	## class FeedWordPress #########################################################
457	445	################################################################################
		@@ -489,17 +477,15 @@
489	477	array('q', 'cite'),
490	478	array('script', 'src')
491	479	);
492	480
493		- var $feeds = null;
494		- var $feedurls = null;
495		- var $httpauth = null;
	481	+ var $feeds = NULL;
	482	+ var $feedurls = NULL;
	483	+ var $httpauth = NULL;
496	484
497	485	/**
498	486	* FeedWordPress::__construct (): Construct FeedWordPress singleton object
499	487	* and retrieves a list of feeds for later reference.
500		- *
501		- * @uses FeedWordPressHTTPAuthenticator
502	488	*/
503	489	public function __construct () {
504	490	$this->feeds = array ();
505	491	$this->feedurls = array();
		@@ -520,9 +506,9 @@
520	506	add_filter('cron_schedules', array($this, 'cron_schedules'), 10, 1);
521	507
522	508	// FeedWordPress-related event hooks
523	509	add_filter('feedwordpress_update_complete', array($this, 'process_retirements'), 1000, 1);
524		-
	510	+
525	511	$this->httpauth = new FeedWordPressHTTPAuthenticator;
526	512	} /* FeedWordPress::__construct () */
527	513
528	514	/**
		@@ -606,9 +592,9 @@
606	592	add_action('admin_menu', 'feedwordpress_add_post_edit_controls');
607	593	add_action('save_post', 'feedwordpress_save_post_edit_controls');
608	594
609	595	add_action('admin_footer', array($this, 'admin_footer'));
610		-
	596	+
611	597	add_action('syndicated_feed_error', array('FeedWordPressDiagnostic', 'feed_error'), 100, 3);
612	598
613	599	add_action('wp_footer', 'debug_out_feedwordpress_footer', -100);
614	600	add_action('admin_footer', 'debug_out_feedwordpress_footer', -100);
		@@ -614,9 +600,9 @@
614	600	add_action('admin_footer', 'debug_out_feedwordpress_footer', -100);
615	601
616	602	# Cron-less auto-update. Hooray!
617	603	$autoUpdateHook = $this->automatic_update_hook();
618		- if ( !is_null($autoUpdateHook)) :
	604	+ if (!is_null($autoUpdateHook)) :
619	605	add_action($autoUpdateHook, array($this, 'auto_update'));
620	606	endif;
621	607
622	608	add_action('init', array($this, 'init'));
		@@ -652,32 +638,26 @@
652	638	* @uses add_submenu_page()
653	639	* @uses do_action()
654	640	* @uses add_filter()
655	641	*/
656		- public function add_pages()
657		- {
	642	+ public function add_pages () {
	643	+
658	644	$menu_cap = FeedWordPress::menu_cap();
659		- $settings_cap = FeedWordPress::menu_cap( /*sub=*/ true );
660		- $syndicationMenu = FeedWordPress::path( 'syndication.php' );
	645	+ $settings_cap = FeedWordPress::menu_cap(/*sub=*/ true);
	646	+ $syndicationMenu = FeedWordPress::path('syndication.php');
661	647
662	648	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 */
	649	+ 'Syndicated Sites', 'Syndication',
	650	+ $menu_cap,
	651	+ $syndicationMenu,
	652	+ NULL,
	653	+ plugins_url( '/'.FeedWordPress::path('feedwordpress-tiny.png') )
670	654	);
671	655
672		- do_action( 'feedwordpress_admin_menu_pre_feeds', $menu_cap, $settings_cap );
	656	+ do_action('feedwordpress_admin_menu_pre_feeds', $menu_cap, $settings_cap);
673	657	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 */
	658	+ $syndicationMenu, 'Syndicated Sites', 'Syndicated Sites',
	659	+ $settings_cap, $syndicationMenu
680	660	);
681	661
682	662	do_action('feedwordpress_admin_menu_pre_feeds', $menu_cap, $settings_cap);
683	663	add_submenu_page(
		@@ -718,15 +698,28 @@
718	698	add_filter('page_row_actions', array($this, 'row_actions'), 10, 2);
719	699	add_filter('post_row_actions', array($this, 'row_actions'), 10, 2);
720	700	} /* function FeedWordPress::add_pages () */
721	701
722		- public function check_debug() {
	702	+ public function check_debug () {
723	703	// This is a horrible fucking kludge that I have to do because the
724	704	// admin notice code is triggered before the code that updates the
725	705	// setting.
726		- $feedwordpress_debug = FeedWordPress::param( 'feedwordpress_debug', get_option( 'feedwordpress_debug' ) );
727		-
728		- FeedWordPressSettingsUI::get_template_part( 'notice-debug-mode', $feedwordpress_debug, 'html' );
	706	+ if (isset($_POST['feedwordpress_debug'])) :
	707	+ $feedwordpress_debug = $_POST['feedwordpress_debug'];
	708	+ else :
	709	+ $feedwordpress_debug = get_option('feedwordpress_debug');
	710	+ endif;
	711	+ if ($feedwordpress_debug==='yes') :
	712	+?>
	713	+<div class="error">
	714	+<p><strong>FeedWordPress warning.</strong> Debugging mode is <strong>ON</strong>.
	715	+While it remains on, FeedWordPress displays many diagnostic error messages,
	716	+warnings, and notices that are ordinarily suppressed, and also turns off all
	717	+caching of feeds. Use with caution: this setting is absolutely inappropriate
	718	+for a production server.</p>
	719	+</div>
	720	+<?php
	721	+ endif;
729	722	} /* function FeedWordPress::check_debug () */
730	723
731	724	/**
732	725	* FeedWordPress::subscribed (): Check whether a feed is currently in the
		@@ -744,12 +737,12 @@
744	737	* given URL or numeric ID, if we have either an active subscription to
745	738	* it; or a de-activated subscription.
746	739	*
747	740	* @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
	741	+ * @return mixed SyndicatedLink object if subscription is found; NULL if not
749	742	*/
750	743	public function subscription ($which) {
751		- $sub = null;
	744	+ $sub = NULL;
752	745
753	746	if (is_string($which) and isset($this->feedurls[$which])) :
754	747	$which = $this->feedurls[$which];
755	748	endif;
		@@ -765,9 +758,9 @@
765	758	$sub = get_bookmark($which);
766	759	endif;
767	760
768	761	// Load 'er up if you haven't already.
769		- if ( !is_null($sub) and !($sub InstanceOf SyndicatedLink)) :
	762	+ if (!is_null($sub) and !($sub InstanceOf SyndicatedLink)) :
770	763	$link = new SyndicatedLink($sub);
771	764	$this->feeds[$which] = $link;
772	765	$sub = $link;
773	766	endif;
		@@ -774,132 +767,121 @@
774	767
775	768	return $sub;
776	769	} /* FeedWordPress::subscription () */
777	770
778		- /** function update (): polls for updates on one or more Contributor feeds
779		-
780		- @desc
	771	+ # function update (): polls for updates on one or more Contributor feeds
	772	+ #
781	773	# 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		-
	774	+ # ----------
	775	+ # * $uri (string): either the URI of the feed to poll, the URI of the
	776	+ # (human-readable) website whose feed you want to poll, or NULL.
	777	+ #
	778	+ # If $uri is NULL, then FeedWordPress will poll any feeds that are
	779	+ # ready for polling. It will not poll feeds that are marked as
	780	+ # "Invisible" Links (signifying that the subscription has been
	781	+ # de-activated), or feeds that are not yet stale according to their
	782	+ # TTL setting (which is either set in the feed, or else set
	783	+ # randomly within a window of 30 minutes - 2 hours).
	784	+ #
793	785	# 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		-
	786	+ # --------
	787	+ # * Normally returns an associative array, with 'new' => the number
	788	+ # of new posts added during the update, and 'updated' => the number
	789	+ # of old posts that were updated during the update. If both numbers
	790	+ # are zero, there was no change since the last poll on that URI.
	791	+ #
	792	+ # * Returns NULL if URI it was passed was not a URI that this
	793	+ # installation of FeedWordPress syndicates.
	794	+ #
803	795	# Effects:
	796	+ # --------
	797	+ # * One or more feeds are polled for updates
	798	+ #
	799	+ # * If the feed Link does not have a hardcoded name set, its Link
	800	+ # Name is synchronized with the feed's title element
	801	+ #
	802	+ # * If the feed Link does not have a hardcoded URI set, its Link URI
	803	+ # is synchronized with the feed's human-readable link element
	804	+ #
	805	+ # * If the feed Link does not have a hardcoded description set, its
	806	+ # Link Description is synchronized with the feed's description,
	807	+ # tagline, or subtitle element.
	808	+ #
	809	+ # * The time of polling is recorded in the feed's settings, and the
	810	+ # TTL (time until the feed is next available for polling) is set
	811	+ # either from the feed (if it is supplied in the ttl or syndication
	812	+ # module elements) or else from a randomly-generated time window
	813	+ # (between 30 minutes and 2 hours).
	814	+ #
	815	+ # * New posts from the polled feed are added to the WordPress store.
	816	+ #
	817	+ # * Updates to existing posts since the last poll are mirrored in the
	818	+ # WordPress store.
	819	+ #
	820	+ public function update ($uri = null, $crash_ts = null) {
	821	+ global $wpdb;
804	822
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;
	823	+ if (FeedWordPress::needs_upgrade()) : // Will make duplicate posts if we don't hold off
	824	+ return NULL;
835	825	endif;
836	826
837		- if ( ! is_null( $uri ) and $uri != '*' ) :
838		- $uri = trim( $uri );
	827	+ if (!is_null($uri) and $uri != '*') :
	828	+ $uri = trim($uri);
839	829	else : // Update all
840		- if ( $this->update_hooked ) :
	830	+ if ($this->update_hooked) :
841	831	$diag = $this->update_hooked;
842	832	else :
843		- $diag = 'Initiating a MANUAL check-in on the update schedule at ' . date( 'r', time() );
	833	+ $diag = 'Initiating a MANUAL check-in on the update schedule at '.date('r', time());
844	834	endif;
845		- $this->diagnostic( 'update_schedule:check', $diag );
	835	+ $this->diagnostic('update_schedule:check', $diag);
846	836
847		- update_option( 'feedwordpress_last_update_all', time() );
	837	+ update_option('feedwordpress_last_update_all', time());
848	838	endif;
849	839
850		- do_action( 'feedwordpress_update', $uri );
	840	+ do_action('feedwordpress_update', $uri);
851	841
852		- if ( is_null( $crash_ts ) ) :
	842	+ if (is_null($crash_ts)) :
853	843	$crash_ts = $this->crash_ts();
854	844	endif;
855	845
856	846	// Randomize order for load balancing purposes
857		- $feed_set = array_keys( $this->feeds );
858		- shuffle( $feed_set );
	847	+ $feed_set = array_keys($this->feeds);
	848	+ shuffle($feed_set);
859	849
860		- $updateWindow = (int) get_option( 'feedwordpress_update_window', DEFAULT_UPDATE_PERIOD ) * 60 /* sec/min */;
861		- $interval = (int) get_option( 'feedwordpress_freshness', FEEDWORDPRESS_FRESHNESS_INTERVAL );
	850	+ $updateWindow = (int) get_option('feedwordpress_update_window', DEFAULT_UPDATE_PERIOD) * 60 /* sec/min */;
	851	+ $interval = (int) get_option('feedwordpress_freshness', FEEDWORDPRESS_FRESHNESS_INTERVAL);
862	852	$portion = max(
863		- (int) ceil( count( $feed_set ) / ( $updateWindow / $interval ) ),
	853	+ (int) ceil(count($feed_set) / ($updateWindow / $interval)),
864	854	10
865	855	);
866	856
867		- $max_polls = apply_filters(
868		- 'feedwordpress_polls_per_update',
869		- get_option(
870		- 'feedwordpress_polls_per_update', $portion
871		- ),
872		- $uri
873		- );
	857	+ $max_polls = apply_filters('feedwordpress_polls_per_update', get_option(
	858	+ 'feedwordpress_polls_per_update', $portion
	859	+ ), $uri);
874	860
875		- $feed_set = apply_filters( 'feedwordpress_update_feeds', $feed_set, $uri );
	861	+ $feed_set = apply_filters('feedwordpress_update_feeds', $feed_set, $uri);
876	862
	863	+
877	864	// Loop through and check for new posts
878		- $delta = null;
879		- $remaining = $max_polls;
880		- foreach ( $feed_set as $feed_id) :
	865	+ $delta = NULL; $remaining = $max_polls;
	866	+ foreach ($feed_set as $feed_id) :
881	867
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;
	868	+ $feed = $this->subscription($feed_id);
887	869
888	870	// Has this process overstayed its welcome?
889	871	if (
890	872	// Over time limit?
891		- ( ! is_null( $crash_ts ) and ( time() > $crash_ts ) )
	873	+ (!is_null($crash_ts) and (time() > $crash_ts))
892	874
893	875	// Over feed count?
894		- or ( 0 == $remaining )
	876	+ or ($remaining == 0)
895	877	) :
896	878	break;
897	879	endif;
898	880
899		- $pinged_that = ( is_null( $uri ) or ( $uri == '*' ) or in_array( $uri, array( $feed->uri(), $feed->homepage() ) ) );
	881	+ $pinged_that = (is_null($uri) or ($uri=='*') or in_array($uri, array($feed->uri(), $feed->homepage())));
900	882
901		- if ( ! is_null( $uri ) ) : // A site-specific ping always updates
	883	+ if (!is_null($uri)) : // A site-specific ping always updates
902	884	$timely = true;
903	885	else :
904	886	$timely = $feed->stale();
905	887	endif;
		@@ -904,45 +886,36 @@
904	886	$timely = $feed->stale();
905	887	endif;
906	888
907	889	// If at least one feed was hit for updating...
908		- if ( $pinged_that and is_null( $delta ) ) :
	890	+ if ($pinged_that and is_null($delta)) :
909	891	// ... don't return error condition
910		- $delta = array( 'new' => 0, 'updated' => 0, 'stored' => 0 );
	892	+ $delta = array('new' => 0, 'updated' => 0, 'stored' => 0);
911	893	endif;
912	894
913		- if ( $pinged_that and $timely ) :
	895	+ if ($pinged_that and $timely) :
914	896	$remaining = $remaining - 1;
915	897
916		- do_action( 'feedwordpress_check_feed', $feed->settings );
	898	+ do_action('feedwordpress_check_feed', $feed->settings);
917	899	$start_ts = time();
918		- $added = $feed->poll( $crash_ts );
919		- do_action( 'feedwordpress_check_feed_complete', $feed->settings, $added, time() - $start_ts );
	900	+ $added = $feed->poll($crash_ts);
	901	+ do_action('feedwordpress_check_feed_complete', $feed->settings, $added, time() - $start_ts);
920	902
921		- if ( is_array( $added ) ) : // Success
922		- foreach ( $added as $key => $count ) :
923		- $delta[ $key ] += $added[ $key ];
	903	+ if (is_array($added)) : // Success
	904	+ foreach ($added as $key => $count) :
	905	+ $delta[$key] += $added[$key];
924	906	endforeach;
925	907	endif;
926	908	endif;
927	909	endforeach;
928	910
929		- do_action( 'feedwordpress_update_complete', $delta );
	911	+ do_action('feedwordpress_update_complete', $delta);
930	912	return $delta;
931	913	} /* FeedWordPress::update () */
932	914
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 ) :
	915	+ public function crash_ts ($default = NULL) {
	916	+ $crash_dt = (int) get_option('feedwordpress_update_time_limit', 0);
	917	+ if ($crash_dt > 0) :
945	918	$crash_ts = time() + $crash_dt;
946	919	else :
947	920	$crash_ts = $default;
948	921	endif;
		@@ -948,71 +921,44 @@
948	921	endif;
949	922	return $crash_ts;
950	923	} /* FeedWordPress::crash_ts () */
951	924
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 );
	925	+ public function secret_key () {
	926	+ $secret = get_option('feedwordpress_secret_key', false);
	927	+ if (!$secret) : // Generate random key.
	928	+ $secret = substr(md5(uniqid(microtime())), 0, 6);
	929	+ update_option('feedwordpress_secret_key', $secret);
966	930	endif;
967	931	return $secret;
968	932	} /* FeedWordPress::secret_key () */
969	933
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() );
	934	+ public function has_secret () {
	935	+ return (MyPHP::request('feedwordpress_key')==$this->secret_key());
979	936	} /* FeedWordPress::has_secret () */
980	937
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
	938	+ var $update_hooked = NULL;
	939	+ public function automatic_update_hook ($params = array()) {
	940	+ $params = wp_parse_args($params, array( // Defaults
995	941	'setting only' => false,
996	942	));
997		- $hook = get_option( 'feedwordpress_automatic_updates', null );
	943	+ $hook = get_option('feedwordpress_automatic_updates', NULL);
998	944	$method = 'FeedWordPress option';
999	945
1000	946	// Allow for forced behavior in testing.
1001	947	if (
1002		- ! $params['setting only']
	948	+ !$params['setting only']
1003	949	and $this->has_secret()
1004		- and MyPHP::request( 'automatic_update' )
	950	+ and MyPHP::request('automatic_update')
1005	951	) :
1006		- $hook = MyPHP::request( 'automatic_update') ;
	952	+ $hook = MyPHP::request('automatic_update');
1007	953	$method = 'URL parameter';
1008	954	endif;
1009	955
1010	956	$exact = $hook; // Before munging
1011	957
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' );
	958	+ if (!!$hook) :
	959	+ if ($hook == 'init' or $hook == 'wp_loaded') : // Re-map init to wp_loaded
	960	+ $hook = ($params['setting only'] ? 'init' : 'wp_loaded');
1015	961
1016	962	// Constrain possible values. If it's not an init or wp_loaded, it's a shutdown
1017	963	else :
1018	964	$hook = 'shutdown';
		@@ -1018,10 +964,10 @@
1018	964	$hook = 'shutdown';
1019	965	endif;
1020	966	endif;
1021	967
1022		- if ( $hook ) :
1023		- $this->update_hooked = "Initiating an AUTOMATIC CHECK FOR UPDATES ON PAGE LOAD " . $hook . " due to " . $method . " = " . trim( $this->val( $exact ) );
	968	+ if ($hook) :
	969	+ $this->update_hooked = "Initiating an AUTOMATIC CHECK FOR UPDATES ON PAGE LOAD ".$hook." due to ".$method." = ".trim($this->val($exact));
1024	970	endif;
1025	971
1026	972	return $hook;
1027	973	} /* FeedWordPress::automatic_update_hook () */
		@@ -1027,22 +973,22 @@
1027	973	} /* FeedWordPress::automatic_update_hook () */
1028	974
1029	975	public function last_update_all () {
1030	976	$last = get_option('feedwordpress_last_update_all');
1031		- if ( $this->has_secret() and FeedWordPress::param('automatic_update') ) :
	977	+ if ($this->has_secret() and MyPHP::request('automatic_update')) :
1032	978	$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' );
	979	+ elseif ($this->has_secret() and MyPHP::request('last_update_all')) :
	980	+ $last = MyPHP::request('last_update_all');
1035	981	endif;
1036	982	return $last;
1037	983	} /* FeedWordPress::last_update_all () */
1038	984
1039	985	public function force_update_all () {
1040		- return ($this->has_secret() and FeedWordPress::param( 'force_update_feeds' ));
	986	+ return ($this->has_secret() and MyPHP::request('force_update_feeds'));
1041	987	} /* FeedWordPress::force_update_all () */
1042	988
1043	989	public function stale () {
1044		- if ( !is_null($this->automatic_update_hook())) :
	990	+ if (!is_null($this->automatic_update_hook())) :
1045	991	// Do our best to avoid possible simultaneous
1046	992	// updates by getting up-to-the-minute settings.
1047	993
1048	994	$last = $this->last_update_all();
		@@ -1074,14 +1020,12 @@
1074	1020	static function admin_init () {
1075	1021	// 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	1022	// 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	1023	// 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))) :
	1024	+ if (!intval(get_option('link_manager_enabled', false))) :
1081	1025	update_option('link_manager_enabled', true);
1082	1026	endif;
1083		-
	1027	+
1084	1028	if (defined('FEEDWORDPRESS_PREPARE_TO_ZAP') and FEEDWORDPRESS_PREPARE_TO_ZAP) :
1085	1029	$post_id = FEEDWORDPRESS_PREPARE_TO_ZAP;
1086	1030	$sendback = wp_get_referer();
1087	1031	if (
		@@ -1088,9 +1032,9 @@
1088	1032	! $sendback
1089	1033	or strpos( $sendback, 'post.php' ) !== false
1090	1034	or strpos( $sendback, 'post-new.php' ) !== false
1091	1035	) :
1092		- if ( 'attachment' == $post_type ) : // where does this come from?? I put it as a global...(gwyneth 20230916)
	1036	+ if ( 'attachment' == $post_type ) :
1093	1037	$sendback = admin_url( 'upload.php' );
1094	1038	else :
1095	1039	$sendback = admin_url( 'edit.php' );
1096	1040	$sendback .= ( ! empty( $post_type ) ) ? '?post_type=' . $post_type : '';
		@@ -1099,9 +1043,9 @@
1099	1043	$sendback = esc_url( remove_query_arg( array('trashed', 'untrashed', 'deleted', 'zapped', 'unzapped', 'ids'), $sendback ) );
1100	1044	endif;
1101	1045
1102	1046	// 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)
	1047	+ $post = $post_type = $post_type_object = null;
1104	1048	if ( $post_id ) :
1105	1049	$post = get_post( $post_id );
1106	1050	endif;
1107	1051
		@@ -1107,32 +1051,28 @@
1107	1051
1108	1052	if ( $post ) :
1109	1053	$post_type = $post->post_type;
1110	1054	endif;
1111		- $p = get_post( $post_id );
	1055	+ $p = get_post($post_id);
1112	1056
1113	1057	if ( ! $post ) :
1114		- wp_die( esc_html__( 'The item you are trying to zap no longer exists.' ) );
	1058	+ wp_die( __( 'The item you are trying to zap no longer exists.' ) );
1115	1059	endif;
1116		-
	1060	+
1117	1061	if ( ! current_user_can( 'delete_post', $post_id ) ) :
1118		- wp_die( esc_html__( 'You are not allowed to zap this item.' ) );
	1062	+ wp_die( __( 'You are not allowed to zap this item.' ) );
1119	1063	endif;
1120		-
	1064	+
1121	1065	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;
	1066	+ $user = get_userdata( $user_id );
	1067	+ wp_die( sprintf( __( 'You cannot retire this item. %s is currently editing.' ), $user->display_name ) );
1128	1068	endif;
1129		-
1130		- if (FeedWordPress::param( 'fwp_post_delete' ) == 'zap') :
	1069	+
	1070	+ if (MyPHP::request('fwp_post_delete')=='zap') :
1131	1071	FeedWordPress::diagnostic('syndicated_posts', 'Zapping existing post # '.$p->ID.' "'.$p->post_title.'" due to user request.');
1132		-
	1072	+
1133	1073	$old_status = $post->post_status;
1134		-
	1074	+
1135	1075	set_post_field('post_status', 'fwpzapped', $post_id);
1136	1076	wp_transition_post_status('fwpzapped', $old_status, $post);
1137	1077
1138	1078	# Set up the post to have its content blanked on
		@@ -1138,17 +1078,17 @@
1138	1078	# Set up the post to have its content blanked on
1139	1079	# next update if you do not undo the zapping.
1140	1080	add_post_meta($post_id, '_feedwordpress_zapped_blank_me', 1, /*unique=*/ true);
1141	1081	add_post_meta($post_id, '_feedwordpress_zapped_blank_old_status', $old_status, /*unique=*/ true);
1142		-
	1082	+
1143	1083	wp_redirect( esc_url_raw( add_query_arg( array('zapped' => 1, 'ids' => $post_id), $sendback ) ) );
1144	1084
1145	1085	else :
1146	1086	$old_status = get_post_meta($post_id, '_feedwordpress_zapped_blank_old_status', /*single=*/ true);
1147		-
	1087	+
1148	1088	set_post_field('post_status', $old_status, $post_id);
1149	1089	wp_transition_post_status($old_status, 'fwpzapped', $post);
1150		-
	1090	+
1151	1091	# O.K., make sure this post does not get blanked
1152	1092	delete_post_meta($post_id, '_feedwordpress_zapped_blank_me');
1153	1093	delete_post_meta($post_id, '_feedwordpress_zapped_blank_old_status');
1154	1094
		@@ -1154,9 +1094,9 @@
1154	1094
1155	1095	wp_redirect( esc_url_raw( add_query_arg( array('unzapped' => 1, 'ids' => $post_id), $sendback ) ) );
1156	1096
1157	1097	endif;
1158		-
	1098	+
1159	1099	// Intercept, don't pass on.
1160	1100	exit;
1161	1101	endif;
1162	1102	} /* FeedWordPress::admin_init() */
		@@ -1167,13 +1107,13 @@
1167	1107	// actions link. So we create a magic parameter, and when this
1168	1108	// magic parameter is activated, the WordPress trashcan is
1169	1109	// temporarily de-activated.
1170	1110
1171		- if (FeedWordPress::param( 'fwp_post_delete' ) == 'nuke') :
	1111	+ if (MyPHP::request('fwp_post_delete')=='nuke') :
1172	1112	// Get post ID #
1173		- $post_id = FeedWordPress::param( 'post' );
1174		- if ( ! $post_id) :
1175		- $post_id = FeedWordPress::param( 'post_ID' );
	1113	+ $post_id = MyPHP::request('post');
	1114	+ if (!$post_id) :
	1115	+ $post_id = MyPHP::request('post_ID');
1176	1116	endif;
1177	1117
1178	1118	// Make sure we've got the right nonce and all that.
1179	1119	check_admin_referer('delete-post_' . $post_id);
		@@ -1179,47 +1119,50 @@
1179	1119	check_admin_referer('delete-post_' . $post_id);
1180	1120
1181	1121	// If so, disable the trashcan.
1182	1122	define('EMPTY_TRASH_DAYS', 0);
1183		- elseif ( FeedWordPress::param( 'fwp_post_delete' ) == 'zap' || FeedWordPress::param( 'fwp_post_delete' ) == 'unzap' ) :
	1123	+
	1124	+ elseif (MyPHP::request('fwp_post_delete')=='zap' OR MyPHP::request('fwp_post_delete') == 'unzap') :
1184	1125	// Get post ID #
1185		- $post_id = FeedWordPress::param( 'post' );
1186		- if ( ! $post_id) :
1187		- $post_id = FeedWordPress::param( 'post_ID' );
	1126	+ $post_id = MyPHP::request('post');
	1127	+ if (!$post_id) :
	1128	+ $post_id = MyPHP::request('post_ID');
1188	1129	endif;
1189		-
	1130	+
1190	1131	// Make sure we've got the right nonce and all that
1191	1132	check_admin_referer('delete-post_' . $post_id);
1192	1133
1193	1134	// If so, get ready to intercept the call a little
1194	1135	// further down the line.
	1136	+
1195	1137	define('FEEDWORDPRESS_PREPARE_TO_ZAP', $post_id);
1196		-
	1138	+
1197	1139	endif;
1198	1140
1199	1141	} /* FeedWordPress::admin_api () */
1200	1142
1201	1143	public function all_admin_notices () {
1202		- if (FeedWordPress::param( 'zapped' )) :
1203		- $n = intval( FeedWordPress::param( 'zapped' ) );
	1144	+ if (MyPHP::request('zapped')) :
	1145	+ $n = intval(MyPHP::request('zapped'));
1204	1146	?>
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>
	1147	+<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	1148	<?php
1207	1149	endif;
1208		- if ( FeedWordPress::param( 'unzapped' ) ) :
1209		- $n = intval( FeedWordPress::param( 'unzapped' ) );
	1150	+
	1151	+ if (MyPHP::request('unzapped')) :
	1152	+ $n = intval(MyPHP::request('unzapped'));
1210	1153	?>
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>
	1154	+<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	1155	<?php
1213	1156	endif;
1214	1157	} /* FeedWordPress::all_admin_notices () */
1215		-
	1158	+
1216	1159	public function process_retirements ($delta) {
1217	1160	update_option('feedwordpress_process_zaps', 1);
1218	1161
1219	1162	return $delta;
1220	1163	}
1221		-
	1164	+
1222	1165	public function feedwordpress_cleanup () {
1223	1166	if (get_option('feedwordpress_process_zaps', null)) :
1224	1167	$q = new WP_Query(array(
1225	1168	'fields' => '_synfrom',
		@@ -1227,34 +1170,34 @@
1227	1170	'ignore_sticky_posts' => true,
1228	1171	'meta_key' => '_feedwordpress_zapped_blank_me',
1229	1172	'meta_value' => 1,
1230	1173	));
1231		-
	1174	+
1232	1175	if ($q->have_posts()) :
1233	1176	foreach ($q->posts as $p) :
1234	1177
1235	1178	$post_id = $p->ID;
1236	1179	$revisions = wp_get_post_revisions($post_id, array("check_enabled" => false));
1237		-
	1180	+
1238	1181	# Now nuke the content of the post & its revisions
1239	1182	set_post_field('post_content', '', $post_id);
1240	1183	set_post_field('post_excerpt', '', $post_id);
1241		-
	1184	+
1242	1185	foreach ($revisions as $rev) :
1243	1186	set_post_field('post_content', '', $rev->ID);
1244	1187	set_post_field('post_excerpt', '', $rev->ID);
1245	1188	endforeach;
1246		-
	1189	+
1247	1190	# Un-tag it for blanking.
1248	1191	delete_post_meta($p->ID, '_feedwordpress_zapped_blank_me');
1249		-
	1192	+
1250	1193	# Don't remove old_status indicator. A later
1251	1194	# update from the feed may cause us to once
1252	1195	# again have some content so we can un-zap.
1253		-
	1196	+
1254	1197	endforeach;
1255	1198	endif;
1256		-
	1199	+
1257	1200	$q = new WP_Query(array(
1258	1201	'fields' => '_synfrom',
1259	1202	'post_status' => 'fwpzapped',
1260	1203	'ignore_sticky_posts' => true,
		@@ -1260,25 +1203,26 @@
1260	1203	'ignore_sticky_posts' => true,
1261	1204	'meta_key' => '_feedwordpress_zapped_blank_me',
1262	1205	'meta_value' => 2,
1263	1206	));
1264		-
	1207	+
1265	1208	if ($q->have_posts()) :
1266	1209	foreach ($q->posts as $p) :
1267	1210	update_post_meta($p->ID, '_feedwordpress_zapped_blank_me', 1);
1268	1211	endforeach;
1269	1212	endif;
1270		-
	1213	+
1271	1214	update_option('feedwordpress_process_zaps', 0);
1272	1215	endif;
1273	1216	} /* FeedWordPress::feedwordpress_cleanup () */
1274		-
	1217	+
1275	1218	public function init () {
	1219	+ global $fwp_path;
1276	1220
1277	1221	// If this is a FeedWordPress admin page, queue up scripts for AJAX
1278	1222	// functions that FWP uses. If it is a display page or a non-FWP admin
1279	1223	// page, don't.
1280		- wp_register_style('feedwordpress-elements', $this->plugin_dir_url( 'assets/css/feedwordpress-elements.css') );
	1224	+ wp_register_style('feedwordpress-elements', plugins_url( '/'.$fwp_path.'/feedwordpress-elements.css') );
1281	1225	if (FeedWordPressSettingsUI::is_admin()) :
1282	1226	// For JavaScript that needs to be generated dynamically
1283	1227	add_action('admin_print_scripts', array('FeedWordPressSettingsUI', 'admin_scripts'));
1284	1228
		@@ -1319,10 +1263,8 @@
1319	1263	add_action('wp_ajax_fwp_feeds', array($this, 'fwp_feeds'));
1320	1264	add_action('wp_ajax_fwp_feedcontents', array($this, 'fwp_feedcontents'));
1321	1265	add_action('wp_ajax_fwp_xpathtest', array($this, 'fwp_xpathtest'));
1322	1266
1323		- // Prepare for future translations... (gwyneth 20210714)
1324		- // add_action('init', array($this, 'load_textdomain');
1325	1267	} /* FeedWordPress::init() */
1326	1268
1327	1269	/**
1328	1270	* FeedWordPress::wp_loaded (): Once all plugin and theme modules have been
		@@ -1335,9 +1277,9 @@
1335	1277	public function wp_loaded () {
1336	1278	$this->clear_cache_magic_url();
1337	1279	$this->update_magic_url();
1338	1280	} /* FeedWordPress::wp_loaded () */
1339		-
	1281	+
1340	1282	/**
1341	1283	* FeedWordPress::cron_schedules(): Filter hook to add WP-Cron schedules
1342	1284	* that plugins like FeedWordPress can use to carry out scheduled events.
1343	1285	*
		@@ -1376,9 +1318,9 @@
1376	1318	exit;
1377	1319	} /* FeedWordPress::fwp_feeds () */
1378	1320
1379	1321	public function fwp_feedcontents () {
1380		- $feed_id = FeedWordPress::param( 'feed_id' );
	1322	+ $feed_id = MyPHP::request('feed_id');
1381	1323
1382	1324	// Let's load up some data from the feed . . .
1383	1325	$feed = $this->subscription($feed_id);
1384	1326	$posts = $feed->live_posts();
		@@ -1409,11 +1351,11 @@
1409	1351	die;
1410	1352	} /* FeedWordPress::fwp_feedcontents () */
1411	1353
1412	1354	public function fwp_xpathtest () {
1413		- $xpath = FeedWordPress::param( 'xpath' );
1414		- $feed_id = FeedWordPress::param( 'feed_id' );
1415		- $post_id = FeedWordPress::param( 'post_id' );
	1355	+ $xpath = MyPHP::request('xpath');
	1356	+ $feed_id = MyPHP::request('feed_id');
	1357	+ $post_id = MyPHP::request('post_id');
1416	1358
1417	1359	$expr = new FeedWordPressParsedPostMeta($xpath);
1418	1360
1419	1361	// Let's load up some data from the feed . . .
		@@ -1419,9 +1361,9 @@
1419	1361	// Let's load up some data from the feed . . .
1420	1362	$feed = $this->subscription($feed_id);
1421	1363	$posts = $feed->live_posts();
1422	1364
1423		- if ( !is_wp_error($posts)) :
	1365	+ if (!is_wp_error($posts)) :
1424	1366	if (strlen($post_id) == 0) :
1425	1367	$post = $posts[0];
1426	1368	else :
1427	1369	$post = null;
		@@ -1470,9 +1412,9 @@
1470	1412	or 'fwpzapped'==$wp_query->post->post_status
1471	1413	) :
1472	1414	do_action('feedwordpress_redirect_retired', $wp_query->post);
1473	1415
1474		- if ( !($template = get_404_template())) :
	1416	+ if (!($template = get_404_template())) :
1475	1417	$template = get_index_template();
1476	1418	endif;
1477	1419	if ($template = apply_filters('template_include', $template)) :
1478	1420	header("HTTP/1.1 410 Gone");
		@@ -1489,10 +1431,10 @@
1489	1431	$eraseLink = MyPHP::url($link, array("fwp_post_delete" => "nuke"));
1490	1432
1491	1433	$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	1434	$linktext = apply_filters('feedwordpress_ui_erase_link_text', __('Erase/Resyndicate'));
1493		-
1494		- $retireClass = null;
	1435	+
	1436	+ $retireClass = NULL;
1495	1437	if ($post->post_status == 'fwpzapped') :
1496	1438	if (count(get_post_meta($post->ID, '_feedwordpress_zapped_blank_me')) > 0) :
1497	1439	$retireCap = 'Un-Zap this syndicated post (so it will appear on the site again)';
1498	1440	$retireText = 'Un-Zap &amp; Restore';
		@@ -1500,17 +1442,17 @@
1500	1442	else :
1501	1443	// No Un-Zap link for posts that have
1502	1444	// been blanked. You'll just have to
1503	1445	// Erase and hope you can resyndicate...
1504		- $retireLink = null;
	1446	+ $retireLink = NULL;
1505	1447	endif;
1506	1448	else :
1507	1449	$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'));
	1450	+ $retireText = apply_filters('feedwordpress_ui_zap_link_text', __('Zap/Don&#8217;t Resyndicate'));
1509	1451	$retireLink = MyPHP::url($link, array("fwp_post_delete" => "zap"));
1510	1452	$retireClass = 'submitdelete';
1511	1453	endif;
1512		-
	1454	+
1513	1455	$keys = array_keys($actions);
1514	1456	$links = array();
1515	1457	foreach ($keys as $key) :
1516	1458	$links[$key] = $actions[$key];
		@@ -1518,9 +1460,9 @@
1518	1460	if ('trash'==$key) :
1519	1461	#$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	1462
1521	1463	// Placeholder.
1522		- if ( !is_null($retireLink)) :
	1464	+ if (!is_null($retireLink)) :
1523	1465	$links['zap trash'] = '';
1524	1466	endif;
1525	1467	$links['delete'] = '';
1526	1468	endif;
		@@ -1525,9 +1467,9 @@
1525	1467	$links['delete'] = '';
1526	1468	endif;
1527	1469	endforeach;
1528	1470
1529		- if ( !is_null($retireLink)) :
	1471	+ if (!is_null($retireLink)) :
1530	1472	$links['zap trash'] = '<a class="'.esc_attr($retireClass).'" title="'.esc_attr(__($retireCap)).'" href="' . $retireLink . '">' . __($retireText) . '</a>';
1531	1473	endif;
1532	1474	$links['delete'] = '<a class="submitdelete" title="'.esc_attr(__($caption)).'" href="' . $eraseLink . '">' . __($linktext) . '</a>';
1533	1475
		@@ -1535,26 +1477,19 @@
1535	1477	endif;
1536	1478	return $actions;
1537	1479	} /* FeedWordPress::row_actions () */
1538	1480
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 */
	1481	+ public function dashboard_setup () {
1547	1482	$see_it = FeedWordPress::menu_cap();
1548	1483
1549		- if ( current_user_can( $see_it ) ) :
	1484	+ if (current_user_can($see_it)) :
1550	1485	// Get the stylesheet
1551		- wp_enqueue_style( 'feedwordpress-elements' );
	1486	+ wp_enqueue_style('feedwordpress-elements');
1552	1487
1553		- $widget_id = 'feedwordpress_dashboard';
1554		- $widget_name = __( 'Syndicated Sources' );
1555		- $column = 'side';
1556		- $priority = 'core';
	1488	+ $widget_id = 'feedwordpress_dashboard';
	1489	+ $widget_name = __('Syndicated Sources');
	1490	+ $column = 'side';
	1491	+ $priority = 'core';
1557	1492
1558	1493	// I would love to use wp_add_dashboard_widget() here and save
1559	1494	// myself some trouble. But WP 3 does not yet have any way to
1560	1495	// push a dashboard widget onto the side, or to give it a default
		@@ -1561,40 +1496,41 @@
1561	1496	// location.
1562	1497	add_meta_box(
1563	1498	/*id=*/ $widget_id,
1564	1499	/*title=*/ $widget_name,
1565		- /*callback=*/ array( $this, 'dashboard' ),
1566		- /*screen=*/ 'dashboard',
	1500	+ /*callback=*/ array($this, 'dashboard'),
	1501	+ /*page=*/ 'dashboard',
1567	1502	/*context=*/ $column,
1568	1503	/*priority=*/ $priority
1569	1504	);
1570	1505	/*control_callback= array($this, 'dashboard_control') */
1571	1506
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		- */
	1507	+ // This is kind of rude, I know, but the dashboard widget isn't
	1508	+ // worth much if users don't know that it exists, and I don't
	1509	+ // know of any better way to reorder the boxen.
	1510	+ //
	1511	+ // Gleefully ripped off of codex.wordpress.org/Dashboard_Widgets_API
1578	1512
1579		- /** @var mixed Globalizes the metaboxes array, this holds all the widgets for wp-admin. */
	1513	+ // Globalize the metaboxes array, this holds all the widgets for wp-admin
1580	1514	global $wp_meta_boxes;
1581	1515
1582		- /** @var mixed Get the regular dashboard widgets array
1583		- * (which has our new widget already but at the end). */
	1516	+ // Get the regular dashboard widgets array
	1517	+ // (which has our new widget already but at the end)
	1518	+
1584	1519	$normal_dashboard = $wp_meta_boxes['dashboard'][$column][$priority];
1585	1520
1586	1521	// Backup and delete our new dashbaord widget from the end of the array
1587		- if ( isset( $normal_dashboard[ $widget_id ] ) ) :
	1522	+ if (isset($normal_dashboard[$widget_id])) :
1588	1523	$backup = array();
1589		- $backup[ $widget_id ] = $normal_dashboard[ $widget_id ];
1590		- unset( $normal_dashboard[ $widget_id ] );
	1524	+ $backup[$widget_id] = $normal_dashboard[$widget_id];
	1525	+ unset($normal_dashboard[$widget_id]);
1591	1526
1592		- /** @var array Merge the two arrays together so our widget is at the beginning. */
1593		- $sorted_dashboard = array_merge( $backup, $normal_dashboard );
	1527	+ // Merge the two arrays together so our widget is at the
	1528	+ // beginning
	1529	+ $sorted_dashboard = array_merge($backup, $normal_dashboard);
1594	1530
1595		- // Save the sorted array back into the original €es
1596		- $wp_meta_boxes['dashboard'][ $column ][ $priority ] = $sorted_dashboard;
	1531	+ // Save the sorted array back into the original metaboxes
	1532	+ $wp_meta_boxes['dashboard'][$column][$priority] = $sorted_dashboard;
1597	1533	endif;
1598	1534	endif;
1599	1535	} /* FeedWordPress::dashboard_setup () */
1600	1536
		@@ -1606,9 +1542,9 @@
1606	1542	public function user_can_richedit ($rich_edit) {
1607	1543
1608	1544	$post = new FeedWordPressLocalPost;
1609	1545
1610		- if ( ! $post->is_exposed_to_formatting_filters()) :
	1546	+ if (!$post->is_exposed_to_formatting_filters()) :
1611	1547	// Disable visual editor and only allow operations
1612	1548	// directly on HTML if post is bypassing fmt filters
1613	1549	# $rich_edit = false;
1614	1550	endif;
		@@ -1623,9 +1559,9 @@
1623	1559	endif;
1624	1560	} /* FeedWordPress::clear_cache_magic_url() */
1625	1561
1626	1562	public function clear_cache_requested () {
1627		- return FeedWordPress::param( 'clear_cache' );
	1563	+ return MyPHP::request('clear_cache');
1628	1564	} /* FeedWordPress::clear_cache_requested() */
1629	1565
1630	1566	public function update_magic_url () {
1631	1567	global $wpdb;
		@@ -1632,19 +1568,20 @@
1632	1568
1633	1569	// Explicit update request in the HTTP request (e.g. from a cron job)
1634	1570	if (self::update_requested()) :
1635	1571	/*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' ) ) );
	1572	+
	1573	+ $this->update_hooked = "Initiating a CRON JOB CHECK-IN ON UPDATE SCHEDULE due to URL parameter = ".trim($this->val($_REQUEST['update_feedwordpress']));
1637	1574
1638	1575	$this->update($this->update_requested_url());
1639	1576
1640		- if (FEEDWORDPRESS_DEBUG and is_array($wpdb->queries) and count($wpdb->queries) > 0) :
	1577	+ if (FEEDWORDPRESS_DEBUG and count($wpdb->queries) > 0) :
1641	1578	$mysqlTime = 0.0;
1642	1579	$byTime = array();
1643	1580	foreach ($wpdb->queries as $query) :
1644	1581	$time = $query[1] * 1000000.0;
1645	1582	$mysqlTime += $query[1];
1646		- if ( !isset($byTime[$time])) : $byTime[$time] = array(); endif;
	1583	+ if (!isset($byTime[$time])) : $byTime[$time] = array(); endif;
1647	1584	$byTime[$time][] = $query[0]. ' // STACK: ' . $query[2];
1648	1585	endforeach;
1649	1586	krsort($byTime);
1650	1587
		@@ -1649,12 +1586,12 @@
1649	1586	krsort($byTime);
1650	1587
1651	1588	foreach ($byTime as $time => $querySet) :
1652	1589	foreach ($querySet as $query) :
1653		- printf( '[%s ms] %s', esc_html( sprintf( '%4.4f', $time/1000.0 ) ), esc_html( $query ) ) . "\n";
	1590	+ print "[".(sprintf('%4.4f', $time/1000.0)) . "ms] $query\n";
1654	1591	endforeach;
1655	1592	endforeach;
1656		- echo esc_html( self::log_prefix()."$wpdb->num_queries queries. $mysqlTime seconds in MySQL. Total of " ); timer_stop(1); print " seconds.";
	1593	+ echo self::log_prefix()."$wpdb->num_queries queries. $mysqlTime seconds in MySQL. Total of "; timer_stop(1); print " seconds.";
1657	1594	endif;
1658	1595
1659	1596	debug_out_feedwordpress_footer();
1660	1597
		@@ -1664,20 +1601,17 @@
1664	1601	endif;
1665	1602	} /* FeedWordPress::update_magic_url () */
1666	1603
1667	1604	public static function update_requested () {
1668		- return FeedWordPress::param( 'update_feedwordpress' );
	1605	+ return MyPHP::request('update_feedwordpress');
1669	1606	} /* FeedWordPress::update_requested() */
1670		-
	1607	+
1671	1608	public function update_requested_url () {
1672	1609	$ret = null;
1673	1610
1674		- $uf = FeedWordPress::update_requested();
1675		- if (
1676		- ( '*' == $uf )
1677		- || ( preg_match( '|^[a-z]+://.*|i', $uf ) )
1678		- ) :
1679		- $ret = $uf;
	1611	+ if (($_REQUEST['update_feedwordpress']=='*')
	1612	+ or (preg_match('|^[a-z]+://.*|i', $_REQUEST['update_feedwordpress']))) :
	1613	+ $ret = $_REQUEST['update_feedwordpress'];
1680	1614	endif;
1681	1615
1682	1616	return $ret;
1683	1617	} /* FeedWordPress::update_requested_url() */
		@@ -1732,9 +1666,9 @@
1732	1666	*/
1733	1667	public static function syndicate_link ($name, $uri, $rss) {
1734	1668	// Get the category ID#
1735	1669	$cat_id = FeedWordPress::link_category_id();
1736		- if ( !is_wp_error($cat_id)) :
	1670	+ if (!is_wp_error($cat_id)) :
1737	1671	$link_category = array($cat_id);
1738	1672	else :
1739	1673	$link_category = array();
1740	1674	endif;
		@@ -1739,9 +1673,9 @@
1739	1673	$link_category = array();
1740	1674	endif;
1741	1675
1742	1676	// WordPress gets cranky if there's no homepage URI
1743		- if ( !is_string($uri) or strlen($uri)<1) : $uri = $rss; endif;
	1677	+ if (!is_string($uri) or strlen($uri)<1) : $uri = $rss; endif;
1744	1678
1745	1679	// Check if this feed URL is already being syndicated.
1746	1680	$link_id = wp_insert_link(/*linkdata=*/ array(
1747	1681	"link_id" => FeedWordPress::find_link($rss), // insert if nothing was found; else update
		@@ -1756,9 +1690,9 @@
1756	1690	} /* function FeedWordPress::syndicate_link() */
1757	1691
1758	1692	static function syndicated_status ($what, $default) {
1759	1693	$ret = get_option("feedwordpress_syndicated_{$what}_status");
1760		- if ( ! $ret) :
	1694	+ if (!$ret) :
1761	1695	$ret = $default;
1762	1696	endif;
1763	1697	return $ret;
1764	1698	} /* FeedWordPress::syndicated_status() */
		@@ -1786,11 +1720,11 @@
1786	1720	return $ret;
1787	1721
1788	1722	} /* FeedWordPress::null_email_set () */
1789	1723
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 );
	1724	+ public static function is_null_email ($email) {
	1725	+ $ret = in_array(strtolower(trim($email)), FeedWordPress::null_email_set());
	1726	+ $ret = apply_filters('syndicated_item_author_is_null_email', $ret, $email);
1793	1727	return $ret;
1794	1728	} /* FeedWordPress::is_null_email () */
1795	1729
1796	1730	public static function use_aggregator_source_data () {
		@@ -1810,9 +1744,9 @@
1810	1744	} /* FeedWordPress::munge_permalinks() */
1811	1745
1812	1746	public static function syndicated_links ($args = array()) {
1813	1747	$contributors = FeedWordPress::link_category_id();
1814		- if ( !is_wp_error($contributors)) :
	1748	+ if (!is_wp_error($contributors)) :
1815	1749	$links = get_bookmarks(array_merge(
1816	1750	array("category" => $contributors),
1817	1751	$args
1818	1752	));
		@@ -1823,12 +1757,14 @@
1823	1757	return $links;
1824	1758	} /* FeedWordPress::syndicated_links() */
1825	1759
1826	1760	public static function link_category_id () {
	1761	+ global $wpdb, $wp_db_version;
	1762	+
1827	1763	$cat_id = get_option('feedwordpress_cat_id');
1828	1764
1829	1765	// If we don't yet have the category ID stored, search by name
1830		- if ( ! $cat_id) :
	1766	+ if (!$cat_id) :
1831	1767	$cat_id = FeedWordPressCompatibility::link_category_id(DEFAULT_SYNDICATION_CATEGORY);
1832	1768
1833	1769	if ($cat_id) :
1834	1770	// We found it; let's stamp it.
		@@ -1841,11 +1777,11 @@
1841	1777	endif;
1842	1778
1843	1779	// If we could not find an appropriate link category,
1844	1780	// make a new one for ourselves.
1845		- if ( ! $cat_id) :
	1781	+ if (!$cat_id) :
1846	1782	$cat_id = FeedWordPressCompatibility::insert_link_category(DEFAULT_SYNDICATION_CATEGORY);
1847		- if ( !is_wp_error($cat_id)) :
	1783	+ if (!is_wp_error($cat_id)) :
1848	1784	// Stamp it
1849	1785	update_option('feedwordpress_cat_id', $cat_id);
1850	1786	endif;
1851	1787	endif;
		@@ -1854,9 +1790,11 @@
1854	1790	} /* FeedWordPress::link_category_id() */
1855	1791
1856	1792	# Upgrades and maintenance...
1857	1793	static function needs_upgrade () {
1858		- $fwp_db_version = get_option('feedwordpress_version', null);
	1794	+
	1795	+ global $wpdb;
	1796	+ $fwp_db_version = get_option('feedwordpress_version', NULL);
1859	1797	$ret = false; // innocent until proven guilty
1860	1798	if (is_null($fwp_db_version) or ($fwp_db_version < FEEDWORDPRESS_VERSION)) :
1861	1799
1862	1800	// This is an older version or a fresh install. Does it require a database
		@@ -1914,10 +1852,11 @@
1914	1852	endif;
1915	1853	return $ret;
1916	1854	} /* FeedWordPress::needs_upgrade () */
1917	1855
1918		- static function upgrade_database ($from = null)
1919		- {
	1856	+ static function upgrade_database ($from = NULL) {
	1857	+ global $wpdb;
	1858	+
1920	1859	if (is_null($from) or $from <= 0.96) : $from = 0.96; endif;
1921	1860
1922	1861	switch ($from) :
1923	1862	case 0.96:
		@@ -1985,9 +1924,9 @@
1985	1924	// Allow user to change default feed-fetch timeout with a global setting.
1986	1925	// Props Erigami Scholey-Fuller <http://www.piepalace.ca/blog/2010/11/feedwordpress-broke-my-heart.html>
1987	1926	$timeout = FeedWordPress::fetch_timeout();
1988	1927
1989		- if ( !is_array($params)) :
	1928	+ if (!is_array($params)) :
1990	1929	$force_feed = $params;
1991	1930	else : // Parameter array
1992	1931	$args = wp_parse_args(array(
1993	1932	'force_feed' => $force_feed,
		@@ -1998,9 +1937,9 @@
1998	1937	endif;
1999	1938	$timeout = intval($timeout);
2000	1939
2001	1940	$pie_class = apply_filters('feedwordpress_simplepie_class', 'FeedWordPie');
2002		- $cache_class = apply_filters('feedwordpress_cache_class', 'FeedWordPie_Cache');
	1941	+ $cache_class = apply_filters('feedwordpress_cache_class', 'WP_Feed_Cache');
2003	1942	$file_class = apply_filters('feedwordpress_file_class', 'FeedWordPie_File');
2004	1943	$parser_class = apply_filters('feedwordpress_parser_class', 'FeedWordPie_Parser');
2005	1944	$item_class = apply_filters('feedwordpress_item_class', 'FeedWordPie_Item');
2006	1945	$sniffer_class = apply_filters('feedwordpress_sniffer_class', 'FeedWordPie_Content_Type_Sniffer');
		@@ -2006,9 +1945,9 @@
2006	1945	$sniffer_class = apply_filters('feedwordpress_sniffer_class', 'FeedWordPie_Content_Type_Sniffer');
2007	1946
2008	1947	$feed = new $pie_class;
2009	1948	$feed->set_feed_url($url);
2010		- $feed->registry->register('Cache', $cache_class);
	1949	+ $feed->set_cache_class($cache_class);
2011	1950	$feed->set_timeout($timeout);
2012	1951
2013	1952	$feed->set_content_type_sniffer_class($sniffer_class);
2014	1953	$feed->set_file_class($file_class);
		@@ -2056,10 +1995,10 @@
2056	1995	$params = wp_parse_args($params, array(
2057	1996	"cache" => true,
2058	1997	));
2059	1998
2060		- $duration = null;
2061		- if ( ! $params['cache']) :
	1999	+ $duration = NULL;
	2000	+ if (!$params['cache']) :
2062	2001	$duration = 0;
2063	2002	elseif (defined('FEEDWORDPRESS_CACHE_AGE')) :
2064	2003	$duration = FEEDWORDPRESS_CACHE_AGE;
2065	2004	endif;
		@@ -2080,70 +2019,39 @@
2080	2019	return $duration;
2081	2020	} /* FeedWordPress::cache_lifetime () */
2082	2021
2083	2022	# Utility functions for handling text settings
2084		- static function get_field( $f, $setting = null ) {
2085		-
2086		- $ret = $f;
2087		- if ( ! is_null( $setting ) ) :
2088		- $ret = null;
2089		- if ( array_key_exists( $setting, $f ) ) :
2090		- $ret = $f[ $setting ];
2091		- endif;
2092		- endif;
2093		- return $ret;
2094		-
2095		- } /* FeedWordPress::get_field () */
2096		-
2097		- static function negative ($f, $setting = null) {
	2023	+ static function negative ($f, $setting) {
2098	2024	$nego = array ('n', 'no', 'f', 'false');
2099		- $q = self::get_field( $f, $setting );
2100		- return in_array( strtolower( trim( $q ) ), $nego );
	2025	+ return (isset($f[$setting]) and in_array(strtolower($f[$setting]), $nego));
2101	2026	} /* FeedWordPress::negative () */
2102	2027
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		- }
	2028	+ static function affirmative ($f, $setting) {
	2029	+ $affirmo = array ('y', 'yes', 't', 'true', 1);
	2030	+ return (isset($f[$setting]) and in_array(strtolower($f[$setting]), $affirmo));
	2031	+ } /* FeedWordPress::affirmative () */
2114	2032
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 () */
	2033	+ # Internal debugging functions
2118	2034
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 ) {
	2035	+ static function diagnostic ($level, $out, $persist = NULL, $since = NULL, $mostRecent = NULL) {
2128	2036	global $feedwordpress_admin_footer;
2129	2037
2130		- $output = (array) get_option( 'feedwordpress_diagnostics_output', array() );
2131		- $dlog = get_option( 'feedwordpress_diagnostics_log', array() );
	2038	+ $output = get_option('feedwordpress_diagnostics_output', array());
	2039	+ $dlog = get_option('feedwordpress_diagnostics_log', array());
2132	2040
2133		- $diagnostic_nesting = count( explode( ":", $level ) );
	2041	+ $diagnostic_nesting = count(explode(":", $level));
2134	2042
2135	2043	if (FeedWordPressDiagnostic::is_on($level)) :
2136	2044	foreach ($output as $method) :
2137	2045	switch ($method) :
2138	2046	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";
	2047	+ if (!self::update_requested()) :
	2048	+ echo "<div><pre><strong>Diag".str_repeat('====', $diagnostic_nesting-1).'|</strong> '.$out."</pre></div>\n";
2141	2049	endif;
2142	2050	break;
2143	2051	case 'echo_in_cronjob' :
2144	2052	if (self::update_requested()) :
2145		- echo esc_html( self::log_prefix() ) . ' ' . esc_html( $out ) . "\n";
	2053	+ echo self::log_prefix()." ".$out."\n";
2146	2054	endif;
2147	2055	break;
2148	2056	case 'admin_footer' :
2149	2057	$feedwordpress_admin_footer[] = $out;
		@@ -2148,9 +2056,9 @@
2148	2056	case 'admin_footer' :
2149	2057	$feedwordpress_admin_footer[] = $out;
2150	2058	break;
2151	2059	case 'error_log' :
2152		- error_log(self::log_prefix() . ' ' . $out);
	2060	+ error_log(self::log_prefix().' '.$out);
2153	2061	break;
2154	2062	case 'email' :
2155	2063
2156	2064	if (is_null($persist)) :
		@@ -2162,10 +2070,10 @@
2162	2070	$hook = md5($level."\n".$persist);
2163	2071	$line = array("Since" => $since, "Message" => $out, "Most Recent" => $mostRecent);
2164	2072	endif;
2165	2073
2166		- if ( !isset($dlog['mesg'])) : $dlog['mesg'] = array(); endif;
2167		- if ( !isset($dlog['mesg'][$sect])) : $dlog['mesg'][$sect] = array(); endif;
	2074	+ if (!isset($dlog['mesg'])) : $dlog['mesg'] = array(); endif;
	2075	+ if (!isset($dlog['mesg'][$sect])) : $dlog['mesg'][$sect] = array(); endif;
2168	2076
2169	2077	$dlog['mesg'][$sect][$hook] = $line;
2170	2078	endswitch;
2171	2079	endforeach;
		@@ -2170,14 +2078,14 @@
2170	2078	endswitch;
2171	2079	endforeach;
2172	2080	endif;
2173	2081
2174		- update_option( 'feedwordpress_diagnostics_log', $dlog );
2175		- } /* FeedWordPress::diagnostic() */
	2082	+ update_option('feedwordpress_diagnostics_log', $dlog);
	2083	+ } /* FeedWordPress::diagnostic () */
2176	2084
2177	2085	public function email_diagnostics_override () {
2178		- return ( $this->has_secret() and ! ! FeedWordPress::param( 'feedwordpress_email_diagnostics' ) );
2179		- } /* FeedWordPress::email_diagnostics_override() */
	2086	+ return ($this->has_secret() and isset($_REQUEST['feedwordpress_email_diagnostics']) and !!$_REQUEST['feedwordpress_email_diagnostics']);
	2087	+ } /* FeedWordPress::email_diagnostics_override () */
2180	2088
2181	2089	public function has_emailed_diagnostics ($dlog) {
2182	2090	$ret = false;
2183	2091	if ($this->email_diagnostics_override()
		@@ -2184,9 +2092,9 @@
2184	2092	or (isset($dlog['schedule']) and isset($dlog['schedule']['last']))) :
2185	2093	$ret = true;
2186	2094	endif;
2187	2095	return $ret;
2188		- } /* FeedWordPress::has_emailed_diagnostics() */
	2096	+ } /* FeedWordPress::has_emailed_diagnostics () */
2189	2097
2190	2098	public function ready_to_email_diagnostics ($dlog) {
2191	2099	$ret = false;
2192	2100	if ($this->email_diagnostics_override()
		@@ -2193,19 +2101,14 @@
2193	2101	or (time() > ($dlog['schedule']['last'] + $dlog['schedule']['freq']))) :
2194	2102	$ret = true;
2195	2103	endif;
2196	2104	return $ret;
2197		- } /* FeedWordPress::ready_to_email_diagnostics() */
	2105	+ } /* FeedWordPress::ready_to_email_diagnostics () */
2198	2106
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		- ) );
	2107	+ public function email_diagnostic_log ($params = array()) {
	2108	+ $params = wp_parse_args($params, array(
	2109	+ "force" => false,
	2110	+ ));
2208	2111
2209	2112	$dlog = get_option('feedwordpress_diagnostics_log', array());
2210	2113
2211	2114	if ($this->has_emailed_diagnostics($dlog)) :
		@@ -2211,10 +2114,10 @@
2211	2114	if ($this->has_emailed_diagnostics($dlog)) :
2212	2115	if ($this->ready_to_email_diagnostics($dlog)) :
2213	2116	// No news is good news; only send if
2214	2117	// there are some messages to send.
2215		- $body = null;
2216		- if ( !isset($dlog['mesg'])) : $dlog['mesg'] = array(); endif;
	2118	+ $body = NULL;
	2119	+ if (!isset($dlog['mesg'])) : $dlog['mesg'] = array(); endif;
2217	2120
2218	2121	foreach ($dlog['mesg'] as $sect => $mesgs) :
2219	2122	if (count($mesgs) > 0) :
2220	2123	if (is_null($body)) : $body = ''; endif;
		@@ -2222,9 +2125,9 @@
2222	2125	$paradigm = reset($mesgs);
2223	2126	$body .= "<h2>".ucfirst($sect)." issues</h2>\n"
2224	2127	."<table>\n"
2225	2128	."<thead><tr>\n";
2226		- foreach ( $paradigm as $col => $value ) :
	2129	+ foreach ($paradigm as $col => $value) :
2227	2130	$body .= '<th scope="col">'.$col."</th>\n";
2228	2131	endforeach;
2229	2132	$body .= "</tr></thead>\n"
2230	2133	."<tbody>\n";
		@@ -2235,9 +2138,9 @@
2235	2138	if (is_numeric($cell)) :
2236	2139	$cell = date('j-M-y, h:i a', $cell);
2237	2140	endif;
2238	2141	$class = strtolower(preg_replace('/\s+/', '-', $col));
2239		- $body .= "<td class=\"$class\">{$cell}</td>";
	2142	+ $body .= "<td class=\"$class\">${cell}</td>";
2240	2143	endforeach;
2241	2144	$body .= "</tr>\n";
2242	2145	endforeach;
2243	2146
		@@ -2245,9 +2148,9 @@
2245	2148	endif;
2246	2149	endforeach;
2247	2150
2248	2151	$body = apply_filters('feedwordpress_diagnostic_email_body', $body, $dlog);
2249		- if ( !is_null($body)) :
	2152	+ if (!is_null($body)) :
2250	2153	$home = feedwordpress_display_url(get_bloginfo('url'));
2251	2154	$subj = apply_filters('feedwordpress_diagnostic_email_subject', $home . " syndication issues", $dlog);
2252	2155	$agent = 'FeedWordPress '.FEEDWORDPRESS_VERSION;
2253	2156	$body = <<<EOMAIL
		@@ -2281,16 +2184,10 @@
2281	2184	$recipients = array($ref[1]);
2282	2185
2283	2186	// userid
2284	2187	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;
	2188	+ $userdata = get_userdata((int) $ref[1]);
	2189	+ $recipients = array($userdata->user_email);
2293	2190
2294	2191	// admins
2295	2192	else :
2296	2193	$recipients = FeedWordPressDiagnostic::admin_emails();
		@@ -2296,12 +2193,12 @@
2296	2193	$recipients = FeedWordPressDiagnostic::admin_emails();
2297	2194	endif;
2298	2195
2299	2196	$mesgId = 'feedwordpress+'.time().'@'.$home;
2300		- $parentId = get_option('feedwordpress_diagnostics_email_root_message_id', null);
	2197	+ $parentId = get_option('feedwordpress_diagnostics_email_root_message_id', NULL);
2301	2198
2302	2199	$head = array("Message-ID: <$mesgId>");
2303		- if ( !is_null($parentId)) :
	2200	+ if (!is_null($parentId)) :
2304	2201	// We've already sent off a diagnostic message in the past. Let's do some
2305	2202	// magic to help with threading, in the hopes that all diagnostic messages
2306	2203	// get threaded together.
2307	2204	$head[] = "References: <$parentId>";
		@@ -2333,13 +2230,12 @@
2333	2230	'last' => time(),
2334	2231	);
2335	2232	endif;
2336	2233
2337		- update_option( 'feedwordpress_diagnostics_log', $dlog );
	2234	+ update_option('feedwordpress_diagnostics_log', $dlog);
2338	2235	} /* FeedWordPress::email_diagnostic_log () */
2339	2236
2340		-
2341		- static function allow_html_mail() {
	2237	+ static function allow_html_mail () {
2342	2238	return 'text/html';
2343	2239	} /* FeedWordPress::allow_html_mail () */
2344	2240
2345	2241	static function admin_footer () {
		@@ -2344,18 +2240,12 @@
2344	2240
2345	2241	static function admin_footer () {
2346	2242	global $feedwordpress_admin_footer;
2347	2243	foreach ($feedwordpress_admin_footer as $line) :
2348		- echo '<div><pre>' . esc_html( $line ) . '</pre></div>';
	2244	+ echo '<div><pre>'.$line.'</pre></div>';
2349	2245	endforeach;
2350	2246	} /* FeedWordPress::admin_footer () */
2351	2247
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	2248	static function log_prefix ($date = false) {
2359	2249	$home = get_bloginfo('url');
2360	2250	$prefix = '['.feedwordpress_display_url($home).'] [feedwordpress] ';
2361	2251	if ($date) :
		@@ -2363,14 +2253,8 @@
2363	2253	endif;
2364	2254	return $prefix;
2365	2255	} /* FeedWordPress::log_prefix () */
2366	2256
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	2257	static function menu_cap ($sub = false) {
2374	2258	if ($sub) :
2375	2259	$cap = apply_filters('feedwordpress_menu_settings_capacity', 'manage_options');
2376	2260	else :
		@@ -2378,19 +2262,8 @@
2378	2262	endif;
2379	2263	return $cap;
2380	2264	} /* FeedWordPress::menu_cap () */
2381	2265
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	2266	static function path ($filename = '') {
2394	2267	global $fwp_path;
2395	2268
2396	2269	$path = $fwp_path;
		@@ -2396,9 +2269,8 @@
2396	2269	$path = $fwp_path;
2397	2270	if (strlen($filename) > 0) :
2398	2271	$path .= '/'.$filename;
2399	2272	endif;
2400		-
2401	2273	return $path;
2402	2274	} /* FeedWordPress::path () */
2403	2275
2404	2276	// -- DEPRCATED UTILITY FUNCTIONS -------------------------------------
		@@ -2407,51 +2279,26 @@
2407	2279	// but for the last several versions have been kept here for backward
2408	2280	// compatibility with add-ons, older code, etc. Maybe someday they
2409	2281	// will go away.
2410	2282	// -------------------------------------------------------------------
2411		- static function param( $key, $type = 'REQUEST', $default = null, $sanitizer = null ) {
2412		- return self::sanitized_parameter( MyPHP::param( $key, $default, $type ), $sanitizer );
	2283	+ static function param ($key, $type = 'REQUEST', $default = NULL) {
	2284	+ return MyPHP::param($key, $default, $type);
2413	2285	} /* FeedWordPress::param () */
2414	2286
2415		- static function post( $key, $default = null, $sanitizer = null ) {
2416		- return self::sanitized_parameter( MyPHP::post( $key, $default ), $sanitizer );
	2287	+ static function post ($key, $default = NULL) {
	2288	+ return MyPHP::post($key, $default);
2417	2289	} /* FeedWordPress::post () */
2418	2290
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	2291	static function val ($v, $no_newlines = false) {
2445	2292	return MyPHP::val($v, $no_newlines);
2446	2293	} /* FeedWordPress::val () */
2447	2294
2448		- static function critical_bug ($varname, $var, $line, $file = null) {
	2295	+ static function critical_bug ($varname, $var, $line, $file = NULL) {
2449	2296	FeedWordPressDiagnostic::critical_bug($varname, $var, $line, $file);
2450	2297	} /* FeedWordPress::critical_bug () */
2451	2298
2452		- static function noncritical_bug ($varname, $var, $line, $file = null) {
2453		- FeedWordPressDiagnostic::noncritical_bug($varname, $var, $line, $file);
	2299	+ static function noncritical_bug ($varname, $var, $line, $file = NULL) {
	2300	+ FeedWordPressDiagnostic::noncritical_bug($varname, $var, $line, $file);
2454	2301	} /* FeedWordPress::noncritical_bug () */
2455	2302
2456	2303	static function diagnostic_on ($level) {
2457	2304	return FeedWordPressDiagnostic::is_on($level);
		@@ -2461,40 +2308,29 @@
2461	2308
2462	2309	$feedwordpress_admin_footer = array();
2463	2310
2464	2311	// 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*$/' );
	2312	+define('FWP_REGEX_EMAIL_ADDY', '([^@"(<\s]+@[^"@(<\s]+\.[^"@(<\s]+)');
	2313	+define('FWP_REGEX_EMAIL_NAME', '("([^"]*)"|([^"<(]+\S))');
	2314	+define('FWP_REGEX_EMAIL_POSTFIX_NAME', '/^\s*'.FWP_REGEX_EMAIL_ADDY."\s+\(".FWP_REGEX_EMAIL_NAME.'\)\s*$/');
	2315	+define('FWP_REGEX_EMAIL_PREFIX_NAME', '/^\s*'.FWP_REGEX_EMAIL_NAME.'\s*<'.FWP_REGEX_EMAIL_ADDY.'>\s*$/');
	2316	+define('FWP_REGEX_EMAIL_JUST_ADDY', '/^\s*'.FWP_REGEX_EMAIL_ADDY.'\s*$/');
	2317	+define('FWP_REGEX_EMAIL_JUST_NAME', '/^\s*'.FWP_REGEX_EMAIL_NAME.'\s*$/');
2471	2318
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] );
	2319	+function parse_email_with_realname ($email) {
	2320	+ if (preg_match(FWP_REGEX_EMAIL_POSTFIX_NAME, $email, $matches)) :
	2321	+ ($ret['name'] = $matches[3]) or ($ret['name'] = $matches[2]);
2487	2322	$ret['email'] = $matches[1];
2488		- elseif ( preg_match( FWP_REGEX_EMAIL_PREFIX_NAME, $email, $matches ) ) :
2489		- ( $ret['name'] = $matches[2] ) || ( $ret['name'] = $matches[3] );
	2323	+ elseif (preg_match(FWP_REGEX_EMAIL_PREFIX_NAME, $email, $matches)) :
	2324	+ ($ret['name'] = $matches[2]) or ($ret['name'] = $matches[3]);
2490	2325	$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] );
	2326	+ elseif (preg_match(FWP_REGEX_EMAIL_JUST_ADDY, $email, $matches)) :
	2327	+ $ret['name'] = NULL; $ret['email'] = $matches[1];
	2328	+ elseif (preg_match(FWP_REGEX_EMAIL_JUST_NAME, $email, $matches)) :
	2329	+ $ret['email'] = NULL;
	2330	+ ($ret['name'] = $matches[2]) or ($ret['name'] = $matches[3]);
	2331	+ else :
	2332	+ $ret['name'] = NULL; $ret['email'] = NULL;
2498	2333	endif;
2499	2334	return $ret;
2500	2335	}
	2336	+