← All changes | feedwordpress.php +377 -511 trunk → 2022.0222 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: 2022.0222
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 2022.0222
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,53 @@
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', '2022.0222');
	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_2020', '1NB1ebYVb68Har4WijmE8gKnZ47NptCqtB'); // 2020.0201
	42	+define('FEEDWORDPRESS_BLEG_BTC', '1HCDdeGcR66EPxkPT2rbdTd1ezh27pmjPR'); // 2021.0713
44	43
	44	+define('FEEDWORDPRESS_BLEG_PAYPAL', '22PAJZZCK5Z3W');
	45	+
45	46	// Defaults
46		-define( 'DEFAULT_SYNDICATION_CATEGORY', 'Contributors' );
47		-define( 'DEFAULT_UPDATE_PERIOD', 60 ); // value in minutes
48		-define( 'FEEDWORDPRESS_DEFAULT_CHECKIN_INTERVAL', DEFAULT_UPDATE_PERIOD / 10 );
	47	+define ('DEFAULT_SYNDICATION_CATEGORY', 'Contributors');
	48	+define ('DEFAULT_UPDATE_PERIOD', 60); // value in minutes
	49	+define ('FEEDWORDPRESS_DEFAULT_CHECKIN_INTERVAL', DEFAULT_UPDATE_PERIOD/10);
49	50
50		-// Dependencies: modules packaged with FeedWordPress plugin.
51		-/** @var string Path to parent directory */
	51	+// Dependencies: modules packaged with FeedWordPress plugin
52	52	$dir = dirname( __FILE__ );
53		-require_once "{$dir}/externals/myphp/myphp.class.php";
	53	+require_once("${dir}/externals/myphp/myphp.class.php");
54	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' ) );
	55	+$feedwordpress_debug = FeedWordPress::param( 'feedwordpress_debug', get_option('feedwordpress_debug') );
57	56
58		-if ( is_string( $feedwordpress_debug ) ) :
59		- $feedwordpress_debug = ( $feedwordpress_debug == 'yes' );
	57	+if (is_string($feedwordpress_debug)) :
	58	+ $feedwordpress_debug = ($feedwordpress_debug == 'yes');
60	59	endif;
61	60
62		-define ( 'FEEDWORDPRESS_DEBUG', $feedwordpress_debug );
	61	+define ('FEEDWORDPRESS_DEBUG', $feedwordpress_debug);
63	62	$feedwordpress_compatibility = true;
64		-define ( 'FEEDWORDPRESS_COMPATIBILITY', $feedwordpress_compatibility );
	63	+define ('FEEDWORDPRESS_COMPATIBILITY', $feedwordpress_compatibility);
65	64
66		-define ( 'FEEDWORDPRESS_CAT_SEPARATOR_PATTERN', '/[:\n]/' );
67		-define ( 'FEEDWORDPRESS_CAT_SEPARATOR', "\n" );
	65	+define ('FEEDWORDPRESS_CAT_SEPARATOR_PATTERN', '/[:\n]/');
	66	+define ('FEEDWORDPRESS_CAT_SEPARATOR', "\n");
68	67
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
	68	+define ('FEEDVALIDATOR_URI', 'http://feedvalidator.org/check.cgi');
71	69
72		-define ( 'FEEDWORDPRESS_FRESHNESS_INTERVAL', 10 * 60 ); // Every ten minutes
	70	+define ('FEEDWORDPRESS_FRESHNESS_INTERVAL', 10*60); // Every ten minutes
73	71
74		-define( 'FEEDWORDPRESS_BOILERPLATE_DEFAULT_HOOK_ORDER', 11000 ); // at the tail end of the filtering process
	72	+define('FEEDWORDPRESS_BOILERPLATE_DEFAULT_HOOK_ORDER', 11000); // at the tail end of the filtering process
75	73
76		-if ( FEEDWORDPRESS_DEBUG ) :
	74	+if (FEEDWORDPRESS_DEBUG) :
77	75	// Help us to pick out errors, if any.
78		- ini_set( 'error_reporting', E_ALL & ~E_NOTICE );
79		- ini_set( 'display_errors', true );
	76	+ ini_set('error_reporting', E_ALL & ~E_NOTICE);
	77	+ ini_set('display_errors', true);
80	78
81	79	// When testing we don't want cache issues to interfere. But this is
82	80	// a VERY BAD SETTING for a production server. Webmasters will eat your
83	81	// face for breakfast if you use it, and the baby Jesus will cry. So
		@@ -82,17 +80,17 @@
82	80	// a VERY BAD SETTING for a production server. Webmasters will eat your
83	81	// face for breakfast if you use it, and the baby Jesus will cry. So
84	82	// make sure FEEDWORDPRESS_DEBUG is FALSE for any site that will be
85	83	// 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 );
	84	+ define('FEEDWORDPRESS_CACHE_AGE', 1);
	85	+ define('FEEDWORDPRESS_CACHE_LIFETIME', 1);
	86	+ define('FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT', 60);
89	87	else :
90	88	// Hold onto data all day for conditional GET purposes,
91	89	// 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 );
	90	+ define('FEEDWORDPRESS_CACHE_LIFETIME', 24*60*60);
	91	+ define('FEEDWORDPRESS_CACHE_AGE', 1*60);
	92	+ define('FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT', 20);
95	93	endif;
96	94
97	95	####################################################################################
98	96	## CORE DEPENDENCIES & PLUGIN MODULES ##############################################
		@@ -97,27 +95,27 @@
97	95	####################################################################################
98	96	## CORE DEPENDENCIES & PLUGIN MODULES ##############################################
99	97	####################################################################################
100	98
101		-/** @var array<string> Dependencies: modules packaged with WordPress core */
	99	+// Dependencies: modules packaged with WordPress core
102	100	$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",
	101	+"class:SimplePie" => "class-simplepie",
	102	+"class:WP_SimplePie_File" => "class-wp-simplepie-file",
	103	+"class:WP_SimplePie_Sanitize_KSES" => "class-wp-simplepie-sanitize-kses",
	104	+"function:wp_insert_user" => "registration",
107	105	);
108	106
109	107	// Ensure that we have SimplePie loaded up and ready to go
110	108	// along with the WordPress auxiliary classes.
111	109	$unmetCoreDependencies = array();
112		-foreach ( $wpCoreDependencies as $unit => $fileSlug ) :
113		- list( $unitType, $unitName ) = explode( ":", $unit, 2 );
114		-
115		- $dependencyMet = ( ('class' == $unitType ) ? class_exists( $unitName ) : function_exists( $unitName ) );
116		- if ( ! $dependencyMet ) :
117		- $phpFileName = ABSPATH . WPINC . "/{$fileSlug}.php";
118		- if ( file_exists( $phpFileName ) ) :
119		- require_once $phpFileName;
	110	+foreach ($wpCoreDependencies as $unit => $fileSlug) :
	111	+ list($unitType, $unitName) = explode(":", $unit, 2);
	112	+
	113	+ $dependencyMet = (('class'==$unitType) ? class_exists($unitName) : function_exists($unitName));
	114	+ if (!$dependencyMet) :
	115	+ $phpFileName = ABSPATH . WPINC . "/${fileSlug}.php";
	116	+ if (file_exists($phpFileName)) :
	117	+ require_once($phpFileName);
120	118	else :
121	119	$unmetCoreDependencies[] = $unitName;
122	120	endif;
123	121	endif;
		@@ -123,35 +121,35 @@
123	121	endif;
124	122	endforeach;
125	123
126	124	// Fallback garbage-pail module used in WP < 4.7 which may meet our dependencies
127		-if ( count( $unmetCoreDependencies ) > 0 ) :
128		- require_once ABSPATH . WPINC . "/class-feed.php";
	125	+if (count($unmetCoreDependencies) > 0) :
	126	+ require_once(ABSPATH . WPINC . "/class-feed.php");
129	127	endif;
130	128
131	129	// Dependencies: modules packaged with FeedWordPress plugin
132	130	$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";
	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_cache.class.php");
	145	+require_once("${dir}/extend/SimplePie/feedwordpie_item.class.php");
	146	+require_once("${dir}/extend/SimplePie/feedwordpie_file.class.php");
	147	+require_once("${dir}/extend/SimplePie/feedwordpie_parser.class.php");
	148	+require_once("${dir}/extend/SimplePie/feedwordpie_content_type_sniffer.class.php");
	149	+require_once("${dir}/feedwordpressrpc.class.php");
	150	+require_once("${dir}/feedwordpresshttpauthenticator.class.php");
	151	+require_once("${dir}/feedwordpresslocalpost.class.php");
154	152
155	153	####################################################################################
156	154	## GLOBAL PARAMETERS ###############################################################
157	155	####################################################################################
		@@ -157,14 +155,14 @@
157	155	####################################################################################
158	156
159	157	// Get the path relative to the plugins directory in which FWP is stored
160	158	preg_match (
161		- '|'.preg_quote( WP_PLUGIN_DIR ) . '/(.+)$|',
162		- dirname( __FILE__ ),
	159	+ '|'.preg_quote(WP_PLUGIN_DIR).'/(.+)$|',
	160	+ dirname(__FILE__),
163	161	$ref
164	162	);
165	163
166		-if ( isset( $ref[1] ) ) :
	164	+if (isset($ref[1])) :
167	165	$fwp_path = $ref[1];
168	166	else : // Something went wrong. Let's just guess.
169	167	$fwp_path = 'feedwordpress';
170	168	endif;
		@@ -173,9 +171,9 @@
173	171	## FEEDWORDPRESS: INITIALIZE OBJECT AND FILTERS ####################################
174	172	####################################################################################
175	173
176	174	$feedwordpress = new FeedWordPress;
177		-if ( ! $feedwordpress->needs_upgrade() ) : // only work if the conditions are safe!
	175	+if (!$feedwordpress->needs_upgrade()) : // only work if the conditions are safe!
178	176	$feedwordpress->add_filters();
179	177
180	178	# Inbound XML-RPC update methods
181	179	$feedwordpressRPC = new FeedWordPressRPC;
		@@ -180,31 +178,25 @@
180	178	# Inbound XML-RPC update methods
181	179	$feedwordpressRPC = new FeedWordPressRPC;
182	180
183	181	# 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
	182	+ remove_action('publish_post', 'generic_ping'); // WP 1.5.x
	183	+ remove_action('do_pings', 'do_all_pings', 10, 1); // WP 2.1, 2.2
	184	+ remove_action('publish_post', '_publish_post_hook', 5, 1); // WP 2.3
187	185
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' );
	186	+ add_action('publish_post', 'fwp_publish_post_hook', 5, 1);
	187	+ add_action('do_pings', 'fwp_do_pings', 10, 1);
	188	+ add_action('feedwordpress_update', 'fwp_hold_pings');
	189	+ add_action('feedwordpress_update_complete', 'fwp_release_pings');
192	190
193	191	else :
194	192	# 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())
	193	+ add_action('admin_menu', array($feedwordpress, 'add_pages'));
	194	+endif; // if (!FeedWordPress::needs_upgrade())
197	195
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' );
	196	+register_deactivation_hook(__FILE__, 'feedwordpress_deactivate');
	197	+function feedwordpress_deactivate () {
	198	+ wp_clear_scheduled_hook('fwp_scheduled_update_checkin');
207	199	} /* feedwordpress_deactivate () */
208	200
209	201	################################################################################
210	202	## LOGGING FUNCTIONS: log status updates to error_log if you want it ###########
		@@ -209,39 +201,26 @@
209	201	################################################################################
210	202	## LOGGING FUNCTIONS: log status updates to error_log if you want it ###########
211	203	################################################################################
212	204
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 );
	205	+function debug_out_human_readable_bytes ($quantity) {
	206	+ $quantity = (int) $quantity;
227	207	$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 );
	208	+ $orders = array('KB', 'MB', 'GB', 'TB');
	209	+ while (($quantity > (1024*100)) and (count($orders) > 0)) :
	210	+ $quantity = floor($quantity / 1024);
	211	+ $magnitude = array_shift($orders);
233	212	endwhile;
234		- return "{$quantity} {$magnitude}";
	213	+ return "${quantity} ${magnitude}";
235	214	}
236	215
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() ) );
	216	+function debug_out_feedwordpress_footer () {
	217	+ if (FeedWordPressDiagnostic::is_on('memory_usage')) :
	218	+ if (function_exists('memory_get_usage')) :
	219	+ FeedWordPress::diagnostic ('memory_usage', "Memory: Current usage: ".debug_out_human_readable_bytes(memory_get_usage()));
241	220	endif;
242		- if ( function_exists('memory_get_peak_usage') ) :
243		- FeedWordPress::diagnostic('memory_usage', "Memory: Peak usage: " . size_format( memory_get_peak_usage() ) );
	221	+ if (function_exists('memory_get_peak_usage')) :
	222	+ FeedWordPress::diagnostic ('memory_usage', "Memory: Peak usage: ".debug_out_human_readable_bytes(memory_get_peak_usage()));
244	223	endif;
245	224	endif;
246	225	} /* debug_out_feedwordpress_footer() */
247	226
		@@ -255,9 +234,9 @@
255	234	function feedwordpress_preserve_syndicated_content ($text) {
256	235	global $feedwordpress_the_syndicated_content;
257	236
258	237	$p = new FeedWordPressLocalPost;
259		- if ( ! $p->is_exposed_to_formatting_filters()) :
	238	+ if (!$p->is_exposed_to_formatting_filters()) :
260	239	$feedwordpress_the_syndicated_content = $text;
261	240	else :
262	241	$feedwordpress_the_syndicated_content = null;
263	242	endif;
		@@ -278,21 +257,21 @@
278	257	// In a post context....
279	258	if (is_syndicated()) :
280	259	?>
281	260	<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() ); ?>" />
	261	+ <title><?php print htmlspecialchars(get_syndication_source()); ?></title>
	262	+ <link rel="alternate" type="text/html" href="<?php print htmlspecialchars(get_syndication_source_link()); ?>" />
	263	+ <link rel="self" href="<?php print htmlspecialchars(get_syndication_feed()); ?>" />
285	264	<?php
286	265	$id = get_syndication_feed_guid();
287		- if ( strlen( $id ) > 0 ) :
	266	+ if (strlen($id) > 0) :
288	267	?>
289		- <id><?php print esc_xml( $id ); ?></id>
	268	+ <id><?php print htmlspecialchars($id); ?></id>
290	269	<?php
291	270	endif;
292	271	$updated = get_feed_meta('feed/updated');
293		- if ( strlen( $updated ) > 0 ) : ?>
294		- <updated><?php print esc_xml( $updated ); ?></updated>
	272	+ if (strlen($updated) > 0) : ?>
	273	+ <updated><?php print esc_xml($updated); ?></updated>
295	274	<?php
296	275	endif;
297	276	?>
298	277	</source>
		@@ -306,11 +285,8 @@
306	285	* Syndication => Posts & Links. Saves the old internal permalink in a global
307	286	* variable for later use.
308	287	*
309	288	* @param string $permalink The internal permalink
310		- * @param mixed|null $post Post object
311		- * @param bool $leavename Unused
312		- * @param bool $sample Unused
313	289	* @return string The new permalink. Same as the old if the post is not
314	290	* syndicated, or if FWP is set to use internal permalinks, or if the post
315	291	* was syndicated, but didn't have a proper permalink recorded.
316	292	*
		@@ -320,9 +296,9 @@
320	296	* @uses url_to_postid()
321	297	* @global $id
322	298	* @global $feedwordpress_the_original_permalink
323	299	*/
324		-function syndication_permalink($permalink = '', $post = null, $leavename = false, $sample = false ) {
	300	+function syndication_permalink ($permalink = '', $post = null, $leavename = false, $sample = false) {
325	301	global $id;
326	302	global $feedwordpress_the_original_permalink;
327	303
328	304	// Save the local permalink in case we need to retrieve it later.
		@@ -386,9 +362,9 @@
386	362	* @uses is_syndicated()
387	363	* @uses FeedWordPress::munge_permalinks()
388	364	*/
389	365	function syndication_comments_feed_link ($link) {
390		- global $feedwordpress_the_original_permalink;
	366	+ global $feedwordpress_the_original_permalink, $id;
391	367
392	368	if (is_syndicated() and FeedWordPress::munge_permalinks()) :
393	369	// If the source post provided a comment feed URL using
394	370	// wfw:commentRss or atom:link/@rel="replies" we can make use of
		@@ -435,23 +411,23 @@
435	411	// comments feed link is never munged by FWP.
436	412	endif;
437	413	endif;
438	414
439		- if ( !is_null($replacement)) : $link = $replacement; endif;
	415	+ if (!is_null($replacement)) : $link = $replacement; endif;
440	416	endif;
441	417	return $link;
442	418	} /* function syndication_comments_feed_link() */
443	419
444		- require_once("{$dir}/feedwordpress.pings.functions.php");
	420	+ require_once("${dir}/feedwordpress.pings.functions.php");
445	421
446		- require_once("{$dir}/feedwordpress.wp-admin.post-edit.functions.php");
	422	+ require_once("${dir}/feedwordpress.wp-admin.post-edit.functions.php");
447	423
448	424	################################################################################
449	425	## class FeedWordPressBoilerplateReformatter ###################################
450	426	################################################################################
451	427
452		-require_once("{$dir}/feedwordpressboilerplatereformatter.class.php");
453		-require_once("{$dir}/feedwordpressboilerplatereformatter.shortcode.functions.php");
	428	+require_once("${dir}/feedwordpressboilerplatereformatter.class.php");
	429	+require_once("${dir}/feedwordpressboilerplatereformatter.shortcode.functions.php");
454	430
455	431	################################################################################
456	432	## class FeedWordPress #########################################################
457	433	################################################################################
		@@ -496,10 +472,8 @@
496	472
497	473	/**
498	474	* FeedWordPress::__construct (): Construct FeedWordPress singleton object
499	475	* and retrieves a list of feeds for later reference.
500		- *
501		- * @uses FeedWordPressHTTPAuthenticator
502	476	*/
503	477	public function __construct () {
504	478	$this->feeds = array ();
505	479	$this->feedurls = array();
		@@ -520,9 +494,9 @@
520	494	add_filter('cron_schedules', array($this, 'cron_schedules'), 10, 1);
521	495
522	496	// FeedWordPress-related event hooks
523	497	add_filter('feedwordpress_update_complete', array($this, 'process_retirements'), 1000, 1);
524		-
	498	+
525	499	$this->httpauth = new FeedWordPressHTTPAuthenticator;
526	500	} /* FeedWordPress::__construct () */
527	501
528	502	/**
		@@ -606,9 +580,9 @@
606	580	add_action('admin_menu', 'feedwordpress_add_post_edit_controls');
607	581	add_action('save_post', 'feedwordpress_save_post_edit_controls');
608	582
609	583	add_action('admin_footer', array($this, 'admin_footer'));
610		-
	584	+
611	585	add_action('syndicated_feed_error', array('FeedWordPressDiagnostic', 'feed_error'), 100, 3);
612	586
613	587	add_action('wp_footer', 'debug_out_feedwordpress_footer', -100);
614	588	add_action('admin_footer', 'debug_out_feedwordpress_footer', -100);
		@@ -614,9 +588,9 @@
614	588	add_action('admin_footer', 'debug_out_feedwordpress_footer', -100);
615	589
616	590	# Cron-less auto-update. Hooray!
617	591	$autoUpdateHook = $this->automatic_update_hook();
618		- if ( !is_null($autoUpdateHook)) :
	592	+ if (!is_null($autoUpdateHook)) :
619	593	add_action($autoUpdateHook, array($this, 'auto_update'));
620	594	endif;
621	595
622	596	add_action('init', array($this, 'init'));
		@@ -652,32 +626,26 @@
652	626	* @uses add_submenu_page()
653	627	* @uses do_action()
654	628	* @uses add_filter()
655	629	*/
656		- public function add_pages()
657		- {
	630	+ public function add_pages () {
	631	+
658	632	$menu_cap = FeedWordPress::menu_cap();
659		- $settings_cap = FeedWordPress::menu_cap( /*sub=*/ true );
660		- $syndicationMenu = FeedWordPress::path( 'syndication.php' );
	633	+ $settings_cap = FeedWordPress::menu_cap(/*sub=*/ true);
	634	+ $syndicationMenu = FeedWordPress::path('syndication.php');
661	635
662	636	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 */
	637	+ 'Syndicated Sites', 'Syndication',
	638	+ $menu_cap,
	639	+ $syndicationMenu,
	640	+ null,
	641	+ $this->plugin_dir_url( 'assets/images/feedwordpress-tiny.png' )
670	642	);
671	643
672		- do_action( 'feedwordpress_admin_menu_pre_feeds', $menu_cap, $settings_cap );
	644	+ do_action('feedwordpress_admin_menu_pre_feeds', $menu_cap, $settings_cap);
673	645	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 */
	646	+ $syndicationMenu, 'Syndicated Sites', 'Syndicated Sites',
	647	+ $settings_cap, $syndicationMenu
680	648	);
681	649
682	650	do_action('feedwordpress_admin_menu_pre_feeds', $menu_cap, $settings_cap);
683	651	add_submenu_page(
		@@ -718,15 +686,15 @@
718	686	add_filter('page_row_actions', array($this, 'row_actions'), 10, 2);
719	687	add_filter('post_row_actions', array($this, 'row_actions'), 10, 2);
720	688	} /* function FeedWordPress::add_pages () */
721	689
722		- public function check_debug() {
	690	+ public function check_debug () {
723	691	// This is a horrible fucking kludge that I have to do because the
724	692	// admin notice code is triggered before the code that updates the
725	693	// setting.
726		- $feedwordpress_debug = FeedWordPress::param( 'feedwordpress_debug', get_option( 'feedwordpress_debug' ) );
	694	+ $feedwordpress_debug = FeedWordPress::param( 'feedwordpress_debug', get_option( 'feedwordpress_debug' ) );
727	695
728		- FeedWordPressSettingsUI::get_template_part( 'notice-debug-mode', $feedwordpress_debug, 'html' );
	696	+ FeedWordPressSettingsUI::get_template_part('notice-debug-mode', $feedwordpress_debug, 'html');
729	697	} /* function FeedWordPress::check_debug () */
730	698
731	699	/**
732	700	* FeedWordPress::subscribed (): Check whether a feed is currently in the
		@@ -765,9 +733,9 @@
765	733	$sub = get_bookmark($which);
766	734	endif;
767	735
768	736	// Load 'er up if you haven't already.
769		- if ( !is_null($sub) and !($sub InstanceOf SyndicatedLink)) :
	737	+ if (!is_null($sub) and !($sub InstanceOf SyndicatedLink)) :
770	738	$link = new SyndicatedLink($sub);
771	739	$this->feeds[$which] = $link;
772	740	$sub = $link;
773	741	endif;
		@@ -774,132 +742,121 @@
774	742
775	743	return $sub;
776	744	} /* FeedWordPress::subscription () */
777	745
778		- /** function update (): polls for updates on one or more Contributor feeds
779		-
780		- @desc
	746	+ # function update (): polls for updates on one or more Contributor feeds
	747	+ #
781	748	# 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		-
	749	+ # ----------
	750	+ # * $uri (string): either the URI of the feed to poll, the URI of the
	751	+ # (human-readable) website whose feed you want to poll, or null.
	752	+ #
	753	+ # If $uri is null, then FeedWordPress will poll any feeds that are
	754	+ # ready for polling. It will not poll feeds that are marked as
	755	+ # "Invisible" Links (signifying that the subscription has been
	756	+ # de-activated), or feeds that are not yet stale according to their
	757	+ # TTL setting (which is either set in the feed, or else set
	758	+ # randomly within a window of 30 minutes - 2 hours).
	759	+ #
793	760	# 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		-
	761	+ # --------
	762	+ # * Normally returns an associative array, with 'new' => the number
	763	+ # of new posts added during the update, and 'updated' => the number
	764	+ # of old posts that were updated during the update. If both numbers
	765	+ # are zero, there was no change since the last poll on that URI.
	766	+ #
	767	+ # * Returns null if URI it was passed was not a URI that this
	768	+ # installation of FeedWordPress syndicates.
	769	+ #
803	770	# Effects:
	771	+ # --------
	772	+ # * One or more feeds are polled for updates
	773	+ #
	774	+ # * If the feed Link does not have a hardcoded name set, its Link
	775	+ # Name is synchronized with the feed's title element
	776	+ #
	777	+ # * If the feed Link does not have a hardcoded URI set, its Link URI
	778	+ # is synchronized with the feed's human-readable link element
	779	+ #
	780	+ # * If the feed Link does not have a hardcoded description set, its
	781	+ # Link Description is synchronized with the feed's description,
	782	+ # tagline, or subtitle element.
	783	+ #
	784	+ # * The time of polling is recorded in the feed's settings, and the
	785	+ # TTL (time until the feed is next available for polling) is set
	786	+ # either from the feed (if it is supplied in the ttl or syndication
	787	+ # module elements) or else from a randomly-generated time window
	788	+ # (between 30 minutes and 2 hours).
	789	+ #
	790	+ # * New posts from the polled feed are added to the WordPress store.
	791	+ #
	792	+ # * Updates to existing posts since the last poll are mirrored in the
	793	+ # WordPress store.
	794	+ #
	795	+ public function update ($uri = null, $crash_ts = null) {
	796	+ global $wpdb;
804	797
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
	798	+ if (FeedWordPress::needs_upgrade()) : // Will make duplicate posts if we don't hold off
834	799	return null;
835	800	endif;
836	801
837		- if ( ! is_null( $uri ) and $uri != '*' ) :
838		- $uri = trim( $uri );
	802	+ if (!is_null($uri) and $uri != '*') :
	803	+ $uri = trim($uri);
839	804	else : // Update all
840		- if ( $this->update_hooked ) :
	805	+ if ($this->update_hooked) :
841	806	$diag = $this->update_hooked;
842	807	else :
843		- $diag = 'Initiating a MANUAL check-in on the update schedule at ' . date( 'r', time() );
	808	+ $diag = 'Initiating a MANUAL check-in on the update schedule at '.date('r', time());
844	809	endif;
845		- $this->diagnostic( 'update_schedule:check', $diag );
	810	+ $this->diagnostic('update_schedule:check', $diag);
846	811
847		- update_option( 'feedwordpress_last_update_all', time() );
	812	+ update_option('feedwordpress_last_update_all', time());
848	813	endif;
849	814
850		- do_action( 'feedwordpress_update', $uri );
	815	+ do_action('feedwordpress_update', $uri);
851	816
852		- if ( is_null( $crash_ts ) ) :
	817	+ if (is_null($crash_ts)) :
853	818	$crash_ts = $this->crash_ts();
854	819	endif;
855	820
856	821	// Randomize order for load balancing purposes
857		- $feed_set = array_keys( $this->feeds );
858		- shuffle( $feed_set );
	822	+ $feed_set = array_keys($this->feeds);
	823	+ shuffle($feed_set);
859	824
860		- $updateWindow = (int) get_option( 'feedwordpress_update_window', DEFAULT_UPDATE_PERIOD ) * 60 /* sec/min */;
861		- $interval = (int) get_option( 'feedwordpress_freshness', FEEDWORDPRESS_FRESHNESS_INTERVAL );
	825	+ $updateWindow = (int) get_option('feedwordpress_update_window', DEFAULT_UPDATE_PERIOD) * 60 /* sec/min */;
	826	+ $interval = (int) get_option('feedwordpress_freshness', FEEDWORDPRESS_FRESHNESS_INTERVAL);
862	827	$portion = max(
863		- (int) ceil( count( $feed_set ) / ( $updateWindow / $interval ) ),
	828	+ (int) ceil(count($feed_set) / ($updateWindow / $interval)),
864	829	10
865	830	);
866	831
867		- $max_polls = apply_filters(
868		- 'feedwordpress_polls_per_update',
869		- get_option(
870		- 'feedwordpress_polls_per_update', $portion
871		- ),
872		- $uri
873		- );
	832	+ $max_polls = apply_filters('feedwordpress_polls_per_update', get_option(
	833	+ 'feedwordpress_polls_per_update', $portion
	834	+ ), $uri);
874	835
875		- $feed_set = apply_filters( 'feedwordpress_update_feeds', $feed_set, $uri );
	836	+ $feed_set = apply_filters('feedwordpress_update_feeds', $feed_set, $uri);
876	837
	838	+
877	839	// Loop through and check for new posts
878		- $delta = null;
879		- $remaining = $max_polls;
880		- foreach ( $feed_set as $feed_id) :
	840	+ $delta = null; $remaining = $max_polls;
	841	+ foreach ($feed_set as $feed_id) :
881	842
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;
	843	+ $feed = $this->subscription($feed_id);
887	844
888	845	// Has this process overstayed its welcome?
889	846	if (
890	847	// Over time limit?
891		- ( ! is_null( $crash_ts ) and ( time() > $crash_ts ) )
	848	+ (!is_null($crash_ts) and (time() > $crash_ts))
892	849
893	850	// Over feed count?
894		- or ( 0 == $remaining )
	851	+ or ($remaining == 0)
895	852	) :
896	853	break;
897	854	endif;
898	855
899		- $pinged_that = ( is_null( $uri ) or ( $uri == '*' ) or in_array( $uri, array( $feed->uri(), $feed->homepage() ) ) );
	856	+ $pinged_that = (is_null($uri) or ($uri=='*') or in_array($uri, array($feed->uri(), $feed->homepage())));
900	857
901		- if ( ! is_null( $uri ) ) : // A site-specific ping always updates
	858	+ if (!is_null($uri)) : // A site-specific ping always updates
902	859	$timely = true;
903	860	else :
904	861	$timely = $feed->stale();
905	862	endif;
		@@ -904,45 +861,36 @@
904	861	$timely = $feed->stale();
905	862	endif;
906	863
907	864	// If at least one feed was hit for updating...
908		- if ( $pinged_that and is_null( $delta ) ) :
	865	+ if ($pinged_that and is_null($delta)) :
909	866	// ... don't return error condition
910		- $delta = array( 'new' => 0, 'updated' => 0, 'stored' => 0 );
	867	+ $delta = array('new' => 0, 'updated' => 0, 'stored' => 0);
911	868	endif;
912	869
913		- if ( $pinged_that and $timely ) :
	870	+ if ($pinged_that and $timely) :
914	871	$remaining = $remaining - 1;
915	872
916		- do_action( 'feedwordpress_check_feed', $feed->settings );
	873	+ do_action('feedwordpress_check_feed', $feed->settings);
917	874	$start_ts = time();
918		- $added = $feed->poll( $crash_ts );
919		- do_action( 'feedwordpress_check_feed_complete', $feed->settings, $added, time() - $start_ts );
	875	+ $added = $feed->poll($crash_ts);
	876	+ do_action('feedwordpress_check_feed_complete', $feed->settings, $added, time() - $start_ts);
920	877
921		- if ( is_array( $added ) ) : // Success
922		- foreach ( $added as $key => $count ) :
923		- $delta[ $key ] += $added[ $key ];
	878	+ if (is_array($added)) : // Success
	879	+ foreach ($added as $key => $count) :
	880	+ $delta[$key] += $added[$key];
924	881	endforeach;
925	882	endif;
926	883	endif;
927	884	endforeach;
928	885
929		- do_action( 'feedwordpress_update_complete', $delta );
	886	+ do_action('feedwordpress_update_complete', $delta);
930	887	return $delta;
931	888	} /* FeedWordPress::update () */
932	889
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 ) :
	890	+ public function crash_ts ($default = null) {
	891	+ $crash_dt = (int) get_option('feedwordpress_update_time_limit', 0);
	892	+ if ($crash_dt > 0) :
945	893	$crash_ts = time() + $crash_dt;
946	894	else :
947	895	$crash_ts = $default;
948	896	endif;
		@@ -948,71 +896,44 @@
948	896	endif;
949	897	return $crash_ts;
950	898	} /* FeedWordPress::crash_ts () */
951	899
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 );
	900	+ public function secret_key () {
	901	+ $secret = get_option('feedwordpress_secret_key', false);
	902	+ if (!$secret) : // Generate random key.
	903	+ $secret = substr(md5(uniqid(microtime())), 0, 6);
	904	+ update_option('feedwordpress_secret_key', $secret);
966	905	endif;
967	906	return $secret;
968	907	} /* FeedWordPress::secret_key () */
969	908
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() );
	909	+ public function has_secret () {
	910	+ return (MyPHP::request('feedwordpress_key')==$this->secret_key());
979	911	} /* FeedWordPress::has_secret () */
980	912
981	913	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
	914	+ public function automatic_update_hook ($params = array()) {
	915	+ $params = wp_parse_args($params, array( // Defaults
995	916	'setting only' => false,
996	917	));
997		- $hook = get_option( 'feedwordpress_automatic_updates', null );
	918	+ $hook = get_option('feedwordpress_automatic_updates', null);
998	919	$method = 'FeedWordPress option';
999	920
1000	921	// Allow for forced behavior in testing.
1001	922	if (
1002		- ! $params['setting only']
	923	+ !$params['setting only']
1003	924	and $this->has_secret()
1004		- and MyPHP::request( 'automatic_update' )
	925	+ and MyPHP::request('automatic_update')
1005	926	) :
1006		- $hook = MyPHP::request( 'automatic_update') ;
	927	+ $hook = MyPHP::request('automatic_update');
1007	928	$method = 'URL parameter';
1008	929	endif;
1009	930
1010	931	$exact = $hook; // Before munging
1011	932
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' );
	933	+ if (!!$hook) :
	934	+ if ($hook == 'init' or $hook == 'wp_loaded') : // Re-map init to wp_loaded
	935	+ $hook = ($params['setting only'] ? 'init' : 'wp_loaded');
1015	936
1016	937	// Constrain possible values. If it's not an init or wp_loaded, it's a shutdown
1017	938	else :
1018	939	$hook = 'shutdown';
		@@ -1018,10 +939,10 @@
1018	939	$hook = 'shutdown';
1019	940	endif;
1020	941	endif;
1021	942
1022		- if ( $hook ) :
1023		- $this->update_hooked = "Initiating an AUTOMATIC CHECK FOR UPDATES ON PAGE LOAD " . $hook . " due to " . $method . " = " . trim( $this->val( $exact ) );
	943	+ if ($hook) :
	944	+ $this->update_hooked = "Initiating an AUTOMATIC CHECK FOR UPDATES ON PAGE LOAD ".$hook." due to ".$method." = ".trim($this->val($exact));
1024	945	endif;
1025	946
1026	947	return $hook;
1027	948	} /* FeedWordPress::automatic_update_hook () */
		@@ -1040,9 +961,9 @@
1040	961	return ($this->has_secret() and FeedWordPress::param( 'force_update_feeds' ));
1041	962	} /* FeedWordPress::force_update_all () */
1042	963
1043	964	public function stale () {
1044		- if ( !is_null($this->automatic_update_hook())) :
	965	+ if (!is_null($this->automatic_update_hook())) :
1045	966	// Do our best to avoid possible simultaneous
1046	967	// updates by getting up-to-the-minute settings.
1047	968
1048	969	$last = $this->last_update_all();
		@@ -1074,14 +995,12 @@
1074	995	static function admin_init () {
1075	996	// 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	997	// 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	998	// 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))) :
	999	+ if (!intval(get_option('link_manager_enabled', false))) :
1081	1000	update_option('link_manager_enabled', true);
1082	1001	endif;
1083		-
	1002	+
1084	1003	if (defined('FEEDWORDPRESS_PREPARE_TO_ZAP') and FEEDWORDPRESS_PREPARE_TO_ZAP) :
1085	1004	$post_id = FEEDWORDPRESS_PREPARE_TO_ZAP;
1086	1005	$sendback = wp_get_referer();
1087	1006	if (
		@@ -1088,9 +1007,9 @@
1088	1007	! $sendback
1089	1008	or strpos( $sendback, 'post.php' ) !== false
1090	1009	or strpos( $sendback, 'post-new.php' ) !== false
1091	1010	) :
1092		- if ( 'attachment' == $post_type ) : // where does this come from?? I put it as a global...(gwyneth 20230916)
	1011	+ if ( 'attachment' == $post_type ) :
1093	1012	$sendback = admin_url( 'upload.php' );
1094	1013	else :
1095	1014	$sendback = admin_url( 'edit.php' );
1096	1015	$sendback .= ( ! empty( $post_type ) ) ? '?post_type=' . $post_type : '';
		@@ -1099,9 +1018,9 @@
1099	1018	$sendback = esc_url( remove_query_arg( array('trashed', 'untrashed', 'deleted', 'zapped', 'unzapped', 'ids'), $sendback ) );
1100	1019	endif;
1101	1020
1102	1021	// 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)
	1022	+ $post = $post_type = $post_type_object = null;
1104	1023	if ( $post_id ) :
1105	1024	$post = get_post( $post_id );
1106	1025	endif;
1107	1026
		@@ -1107,32 +1026,28 @@
1107	1026
1108	1027	if ( $post ) :
1109	1028	$post_type = $post->post_type;
1110	1029	endif;
1111		- $p = get_post( $post_id );
	1030	+ $p = get_post($post_id);
1112	1031
1113	1032	if ( ! $post ) :
1114		- wp_die( esc_html__( 'The item you are trying to zap no longer exists.' ) );
	1033	+ wp_die( __( 'The item you are trying to zap no longer exists.' ) );
1115	1034	endif;
1116		-
	1035	+
1117	1036	if ( ! current_user_can( 'delete_post', $post_id ) ) :
1118		- wp_die( esc_html__( 'You are not allowed to zap this item.' ) );
	1037	+ wp_die( __( 'You are not allowed to zap this item.' ) );
1119	1038	endif;
1120		-
	1039	+
1121	1040	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;
	1041	+ $user = get_userdata( $user_id );
	1042	+ wp_die( sprintf( __( 'You cannot retire this item. %s is currently editing.' ), $user->display_name ) );
1128	1043	endif;
1129		-
	1044	+
1130	1045	if (FeedWordPress::param( 'fwp_post_delete' ) == 'zap') :
1131	1046	FeedWordPress::diagnostic('syndicated_posts', 'Zapping existing post # '.$p->ID.' "'.$p->post_title.'" due to user request.');
1132		-
	1047	+
1133	1048	$old_status = $post->post_status;
1134		-
	1049	+
1135	1050	set_post_field('post_status', 'fwpzapped', $post_id);
1136	1051	wp_transition_post_status('fwpzapped', $old_status, $post);
1137	1052
1138	1053	# Set up the post to have its content blanked on
		@@ -1138,17 +1053,17 @@
1138	1053	# Set up the post to have its content blanked on
1139	1054	# next update if you do not undo the zapping.
1140	1055	add_post_meta($post_id, '_feedwordpress_zapped_blank_me', 1, /*unique=*/ true);
1141	1056	add_post_meta($post_id, '_feedwordpress_zapped_blank_old_status', $old_status, /*unique=*/ true);
1142		-
	1057	+
1143	1058	wp_redirect( esc_url_raw( add_query_arg( array('zapped' => 1, 'ids' => $post_id), $sendback ) ) );
1144	1059
1145	1060	else :
1146	1061	$old_status = get_post_meta($post_id, '_feedwordpress_zapped_blank_old_status', /*single=*/ true);
1147		-
	1062	+
1148	1063	set_post_field('post_status', $old_status, $post_id);
1149	1064	wp_transition_post_status($old_status, 'fwpzapped', $post);
1150		-
	1065	+
1151	1066	# O.K., make sure this post does not get blanked
1152	1067	delete_post_meta($post_id, '_feedwordpress_zapped_blank_me');
1153	1068	delete_post_meta($post_id, '_feedwordpress_zapped_blank_old_status');
1154	1069
		@@ -1154,9 +1069,9 @@
1154	1069
1155	1070	wp_redirect( esc_url_raw( add_query_arg( array('unzapped' => 1, 'ids' => $post_id), $sendback ) ) );
1156	1071
1157	1072	endif;
1158		-
	1073	+
1159	1074	// Intercept, don't pass on.
1160	1075	exit;
1161	1076	endif;
1162	1077	} /* FeedWordPress::admin_init() */
		@@ -1170,9 +1085,9 @@
1170	1085
1171	1086	if (FeedWordPress::param( 'fwp_post_delete' ) == 'nuke') :
1172	1087	// Get post ID #
1173	1088	$post_id = FeedWordPress::param( 'post' );
1174		- if ( ! $post_id) :
	1089	+ if (!$post_id) :
1175	1090	$post_id = FeedWordPress::param( 'post_ID' );
1176	1091	endif;
1177	1092
1178	1093	// Make sure we've got the right nonce and all that.
		@@ -1179,22 +1094,24 @@
1179	1094	check_admin_referer('delete-post_' . $post_id);
1180	1095
1181	1096	// If so, disable the trashcan.
1182	1097	define('EMPTY_TRASH_DAYS', 0);
	1098	+
1183	1099	elseif ( FeedWordPress::param( 'fwp_post_delete' ) == 'zap' || FeedWordPress::param( 'fwp_post_delete' ) == 'unzap' ) :
1184	1100	// Get post ID #
1185	1101	$post_id = FeedWordPress::param( 'post' );
1186		- if ( ! $post_id) :
	1102	+ if (!$post_id) :
1187	1103	$post_id = FeedWordPress::param( 'post_ID' );
1188	1104	endif;
1189		-
	1105	+
1190	1106	// Make sure we've got the right nonce and all that
1191	1107	check_admin_referer('delete-post_' . $post_id);
1192	1108
1193	1109	// If so, get ready to intercept the call a little
1194	1110	// further down the line.
	1111	+
1195	1112	define('FEEDWORDPRESS_PREPARE_TO_ZAP', $post_id);
1196		-
	1113	+
1197	1114	endif;
1198	1115
1199	1116	} /* FeedWordPress::admin_api () */
1200	1117
		@@ -1204,22 +1121,23 @@
1204	1121	?>
1205	1122	<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>
1206	1123	<?php
1207	1124	endif;
	1125	+
1208	1126	if ( FeedWordPress::param( 'unzapped' ) ) :
1209	1127	$n = intval( FeedWordPress::param( 'unzapped' ) );
1210	1128	?>
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>
	1129	+<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>
1212	1130	<?php
1213	1131	endif;
1214	1132	} /* FeedWordPress::all_admin_notices () */
1215		-
	1133	+
1216	1134	public function process_retirements ($delta) {
1217	1135	update_option('feedwordpress_process_zaps', 1);
1218	1136
1219	1137	return $delta;
1220	1138	}
1221		-
	1139	+
1222	1140	public function feedwordpress_cleanup () {
1223	1141	if (get_option('feedwordpress_process_zaps', null)) :
1224	1142	$q = new WP_Query(array(
1225	1143	'fields' => '_synfrom',
		@@ -1227,34 +1145,34 @@
1227	1145	'ignore_sticky_posts' => true,
1228	1146	'meta_key' => '_feedwordpress_zapped_blank_me',
1229	1147	'meta_value' => 1,
1230	1148	));
1231		-
	1149	+
1232	1150	if ($q->have_posts()) :
1233	1151	foreach ($q->posts as $p) :
1234	1152
1235	1153	$post_id = $p->ID;
1236	1154	$revisions = wp_get_post_revisions($post_id, array("check_enabled" => false));
1237		-
	1155	+
1238	1156	# Now nuke the content of the post & its revisions
1239	1157	set_post_field('post_content', '', $post_id);
1240	1158	set_post_field('post_excerpt', '', $post_id);
1241		-
	1159	+
1242	1160	foreach ($revisions as $rev) :
1243	1161	set_post_field('post_content', '', $rev->ID);
1244	1162	set_post_field('post_excerpt', '', $rev->ID);
1245	1163	endforeach;
1246		-
	1164	+
1247	1165	# Un-tag it for blanking.
1248	1166	delete_post_meta($p->ID, '_feedwordpress_zapped_blank_me');
1249		-
	1167	+
1250	1168	# Don't remove old_status indicator. A later
1251	1169	# update from the feed may cause us to once
1252	1170	# again have some content so we can un-zap.
1253		-
	1171	+
1254	1172	endforeach;
1255	1173	endif;
1256		-
	1174	+
1257	1175	$q = new WP_Query(array(
1258	1176	'fields' => '_synfrom',
1259	1177	'post_status' => 'fwpzapped',
1260	1178	'ignore_sticky_posts' => true,
		@@ -1260,19 +1178,19 @@
1260	1178	'ignore_sticky_posts' => true,
1261	1179	'meta_key' => '_feedwordpress_zapped_blank_me',
1262	1180	'meta_value' => 2,
1263	1181	));
1264		-
	1182	+
1265	1183	if ($q->have_posts()) :
1266	1184	foreach ($q->posts as $p) :
1267	1185	update_post_meta($p->ID, '_feedwordpress_zapped_blank_me', 1);
1268	1186	endforeach;
1269	1187	endif;
1270		-
	1188	+
1271	1189	update_option('feedwordpress_process_zaps', 0);
1272	1190	endif;
1273	1191	} /* FeedWordPress::feedwordpress_cleanup () */
1274		-
	1192	+
1275	1193	public function init () {
1276	1194
1277	1195	// If this is a FeedWordPress admin page, queue up scripts for AJAX
1278	1196	// functions that FWP uses. If it is a display page or a non-FWP admin
		@@ -1319,10 +1237,8 @@
1319	1237	add_action('wp_ajax_fwp_feeds', array($this, 'fwp_feeds'));
1320	1238	add_action('wp_ajax_fwp_feedcontents', array($this, 'fwp_feedcontents'));
1321	1239	add_action('wp_ajax_fwp_xpathtest', array($this, 'fwp_xpathtest'));
1322	1240
1323		- // Prepare for future translations... (gwyneth 20210714)
1324		- // add_action('init', array($this, 'load_textdomain');
1325	1241	} /* FeedWordPress::init() */
1326	1242
1327	1243	/**
1328	1244	* FeedWordPress::wp_loaded (): Once all plugin and theme modules have been
		@@ -1335,9 +1251,9 @@
1335	1251	public function wp_loaded () {
1336	1252	$this->clear_cache_magic_url();
1337	1253	$this->update_magic_url();
1338	1254	} /* FeedWordPress::wp_loaded () */
1339		-
	1255	+
1340	1256	/**
1341	1257	* FeedWordPress::cron_schedules(): Filter hook to add WP-Cron schedules
1342	1258	* that plugins like FeedWordPress can use to carry out scheduled events.
1343	1259	*
		@@ -1419,9 +1335,9 @@
1419	1335	// Let's load up some data from the feed . . .
1420	1336	$feed = $this->subscription($feed_id);
1421	1337	$posts = $feed->live_posts();
1422	1338
1423		- if ( !is_wp_error($posts)) :
	1339	+ if (!is_wp_error($posts)) :
1424	1340	if (strlen($post_id) == 0) :
1425	1341	$post = $posts[0];
1426	1342	else :
1427	1343	$post = null;
		@@ -1470,9 +1386,9 @@
1470	1386	or 'fwpzapped'==$wp_query->post->post_status
1471	1387	) :
1472	1388	do_action('feedwordpress_redirect_retired', $wp_query->post);
1473	1389
1474		- if ( !($template = get_404_template())) :
	1390	+ if (!($template = get_404_template())) :
1475	1391	$template = get_index_template();
1476	1392	endif;
1477	1393	if ($template = apply_filters('template_include', $template)) :
1478	1394	header("HTTP/1.1 410 Gone");
		@@ -1489,9 +1405,9 @@
1489	1405	$eraseLink = MyPHP::url($link, array("fwp_post_delete" => "nuke"));
1490	1406
1491	1407	$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	1408	$linktext = apply_filters('feedwordpress_ui_erase_link_text', __('Erase/Resyndicate'));
1493		-
	1409	+
1494	1410	$retireClass = null;
1495	1411	if ($post->post_status == 'fwpzapped') :
1496	1412	if (count(get_post_meta($post->ID, '_feedwordpress_zapped_blank_me')) > 0) :
1497	1413	$retireCap = 'Un-Zap this syndicated post (so it will appear on the site again)';
		@@ -1504,13 +1420,13 @@
1504	1420	$retireLink = null;
1505	1421	endif;
1506	1422	else :
1507	1423	$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'));
	1424	+ $retireText = apply_filters('feedwordpress_ui_zap_link_text', __('Zap/Don&#8217;t Resyndicate'));
1509	1425	$retireLink = MyPHP::url($link, array("fwp_post_delete" => "zap"));
1510	1426	$retireClass = 'submitdelete';
1511	1427	endif;
1512		-
	1428	+
1513	1429	$keys = array_keys($actions);
1514	1430	$links = array();
1515	1431	foreach ($keys as $key) :
1516	1432	$links[$key] = $actions[$key];
		@@ -1518,9 +1434,9 @@
1518	1434	if ('trash'==$key) :
1519	1435	#$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	1436
1521	1437	// Placeholder.
1522		- if ( !is_null($retireLink)) :
	1438	+ if (!is_null($retireLink)) :
1523	1439	$links['zap trash'] = '';
1524	1440	endif;
1525	1441	$links['delete'] = '';
1526	1442	endif;
		@@ -1525,9 +1441,9 @@
1525	1441	$links['delete'] = '';
1526	1442	endif;
1527	1443	endforeach;
1528	1444
1529		- if ( !is_null($retireLink)) :
	1445	+ if (!is_null($retireLink)) :
1530	1446	$links['zap trash'] = '<a class="'.esc_attr($retireClass).'" title="'.esc_attr(__($retireCap)).'" href="' . $retireLink . '">' . __($retireText) . '</a>';
1531	1447	endif;
1532	1448	$links['delete'] = '<a class="submitdelete" title="'.esc_attr(__($caption)).'" href="' . $eraseLink . '">' . __($linktext) . '</a>';
1533	1449
		@@ -1535,26 +1451,19 @@
1535	1451	endif;
1536	1452	return $actions;
1537	1453	} /* FeedWordPress::row_actions () */
1538	1454
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 */
	1455	+ public function dashboard_setup () {
1547	1456	$see_it = FeedWordPress::menu_cap();
1548	1457
1549		- if ( current_user_can( $see_it ) ) :
	1458	+ if (current_user_can($see_it)) :
1550	1459	// Get the stylesheet
1551		- wp_enqueue_style( 'feedwordpress-elements' );
	1460	+ wp_enqueue_style('feedwordpress-elements');
1552	1461
1553		- $widget_id = 'feedwordpress_dashboard';
1554		- $widget_name = __( 'Syndicated Sources' );
1555		- $column = 'side';
1556		- $priority = 'core';
	1462	+ $widget_id = 'feedwordpress_dashboard';
	1463	+ $widget_name = __('Syndicated Sources');
	1464	+ $column = 'side';
	1465	+ $priority = 'core';
1557	1466
1558	1467	// I would love to use wp_add_dashboard_widget() here and save
1559	1468	// myself some trouble. But WP 3 does not yet have any way to
1560	1469	// push a dashboard widget onto the side, or to give it a default
		@@ -1561,40 +1470,41 @@
1561	1470	// location.
1562	1471	add_meta_box(
1563	1472	/*id=*/ $widget_id,
1564	1473	/*title=*/ $widget_name,
1565		- /*callback=*/ array( $this, 'dashboard' ),
1566		- /*screen=*/ 'dashboard',
	1474	+ /*callback=*/ array($this, 'dashboard'),
	1475	+ /*page=*/ 'dashboard',
1567	1476	/*context=*/ $column,
1568	1477	/*priority=*/ $priority
1569	1478	);
1570	1479	/*control_callback= array($this, 'dashboard_control') */
1571	1480
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		- */
	1481	+ // This is kind of rude, I know, but the dashboard widget isn't
	1482	+ // worth much if users don't know that it exists, and I don't
	1483	+ // know of any better way to reorder the boxen.
	1484	+ //
	1485	+ // Gleefully ripped off of codex.wordpress.org/Dashboard_Widgets_API
1578	1486
1579		- /** @var mixed Globalizes the metaboxes array, this holds all the widgets for wp-admin. */
	1487	+ // Globalize the metaboxes array, this holds all the widgets for wp-admin
1580	1488	global $wp_meta_boxes;
1581	1489
1582		- /** @var mixed Get the regular dashboard widgets array
1583		- * (which has our new widget already but at the end). */
	1490	+ // Get the regular dashboard widgets array
	1491	+ // (which has our new widget already but at the end)
	1492	+
1584	1493	$normal_dashboard = $wp_meta_boxes['dashboard'][$column][$priority];
1585	1494
1586	1495	// Backup and delete our new dashbaord widget from the end of the array
1587		- if ( isset( $normal_dashboard[ $widget_id ] ) ) :
	1496	+ if (isset($normal_dashboard[$widget_id])) :
1588	1497	$backup = array();
1589		- $backup[ $widget_id ] = $normal_dashboard[ $widget_id ];
1590		- unset( $normal_dashboard[ $widget_id ] );
	1498	+ $backup[$widget_id] = $normal_dashboard[$widget_id];
	1499	+ unset($normal_dashboard[$widget_id]);
1591	1500
1592		- /** @var array Merge the two arrays together so our widget is at the beginning. */
1593		- $sorted_dashboard = array_merge( $backup, $normal_dashboard );
	1501	+ // Merge the two arrays together so our widget is at the
	1502	+ // beginning
	1503	+ $sorted_dashboard = array_merge($backup, $normal_dashboard);
1594	1504
1595		- // Save the sorted array back into the original €es
1596		- $wp_meta_boxes['dashboard'][ $column ][ $priority ] = $sorted_dashboard;
	1505	+ // Save the sorted array back into the original metaboxes
	1506	+ $wp_meta_boxes['dashboard'][$column][$priority] = $sorted_dashboard;
1597	1507	endif;
1598	1508	endif;
1599	1509	} /* FeedWordPress::dashboard_setup () */
1600	1510
		@@ -1606,9 +1516,9 @@
1606	1516	public function user_can_richedit ($rich_edit) {
1607	1517
1608	1518	$post = new FeedWordPressLocalPost;
1609	1519
1610		- if ( ! $post->is_exposed_to_formatting_filters()) :
	1520	+ if (!$post->is_exposed_to_formatting_filters()) :
1611	1521	// Disable visual editor and only allow operations
1612	1522	// directly on HTML if post is bypassing fmt filters
1613	1523	# $rich_edit = false;
1614	1524	endif;
		@@ -1632,8 +1542,9 @@
1632	1542
1633	1543	// Explicit update request in the HTTP request (e.g. from a cron job)
1634	1544	if (self::update_requested()) :
1635	1545	/*DBG*/ header("Content-Type: text/plain");
	1546	+
1636	1547	$this->update_hooked = "Initiating a CRON JOB CHECK-IN ON UPDATE SCHEDULE due to URL parameter = " . trim( $this->val( FeedWordPress::param('update_feedwordpress' ) ) );
1637	1548
1638	1549	$this->update($this->update_requested_url());
1639	1550
		@@ -1642,9 +1553,9 @@
1642	1553	$byTime = array();
1643	1554	foreach ($wpdb->queries as $query) :
1644	1555	$time = $query[1] * 1000000.0;
1645	1556	$mysqlTime += $query[1];
1646		- if ( !isset($byTime[$time])) : $byTime[$time] = array(); endif;
	1557	+ if (!isset($byTime[$time])) : $byTime[$time] = array(); endif;
1647	1558	$byTime[$time][] = $query[0]. ' // STACK: ' . $query[2];
1648	1559	endforeach;
1649	1560	krsort($byTime);
1650	1561
		@@ -1649,12 +1560,12 @@
1649	1560	krsort($byTime);
1650	1561
1651	1562	foreach ($byTime as $time => $querySet) :
1652	1563	foreach ($querySet as $query) :
1653		- printf( '[%s ms] %s', esc_html( sprintf( '%4.4f', $time/1000.0 ) ), esc_html( $query ) ) . "\n";
	1564	+ print "[".(sprintf('%4.4f', $time/1000.0)) . "ms] $query\n";
1654	1565	endforeach;
1655	1566	endforeach;
1656		- echo esc_html( self::log_prefix()."$wpdb->num_queries queries. $mysqlTime seconds in MySQL. Total of " ); timer_stop(1); print " seconds.";
	1567	+ echo self::log_prefix()."$wpdb->num_queries queries. $mysqlTime seconds in MySQL. Total of "; timer_stop(1); print " seconds.";
1657	1568	endif;
1658	1569
1659	1570	debug_out_feedwordpress_footer();
1660	1571
		@@ -1666,9 +1577,9 @@
1666	1577
1667	1578	public static function update_requested () {
1668	1579	return FeedWordPress::param( 'update_feedwordpress' );
1669	1580	} /* FeedWordPress::update_requested() */
1670		-
	1581	+
1671	1582	public function update_requested_url () {
1672	1583	$ret = null;
1673	1584
1674	1585	$uf = FeedWordPress::update_requested();
		@@ -1732,9 +1643,9 @@
1732	1643	*/
1733	1644	public static function syndicate_link ($name, $uri, $rss) {
1734	1645	// Get the category ID#
1735	1646	$cat_id = FeedWordPress::link_category_id();
1736		- if ( !is_wp_error($cat_id)) :
	1647	+ if (!is_wp_error($cat_id)) :
1737	1648	$link_category = array($cat_id);
1738	1649	else :
1739	1650	$link_category = array();
1740	1651	endif;
		@@ -1739,9 +1650,9 @@
1739	1650	$link_category = array();
1740	1651	endif;
1741	1652
1742	1653	// WordPress gets cranky if there's no homepage URI
1743		- if ( !is_string($uri) or strlen($uri)<1) : $uri = $rss; endif;
	1654	+ if (!is_string($uri) or strlen($uri)<1) : $uri = $rss; endif;
1744	1655
1745	1656	// Check if this feed URL is already being syndicated.
1746	1657	$link_id = wp_insert_link(/*linkdata=*/ array(
1747	1658	"link_id" => FeedWordPress::find_link($rss), // insert if nothing was found; else update
		@@ -1756,9 +1667,9 @@
1756	1667	} /* function FeedWordPress::syndicate_link() */
1757	1668
1758	1669	static function syndicated_status ($what, $default) {
1759	1670	$ret = get_option("feedwordpress_syndicated_{$what}_status");
1760		- if ( ! $ret) :
	1671	+ if (!$ret) :
1761	1672	$ret = $default;
1762	1673	endif;
1763	1674	return $ret;
1764	1675	} /* FeedWordPress::syndicated_status() */
		@@ -1810,9 +1721,9 @@
1810	1721	} /* FeedWordPress::munge_permalinks() */
1811	1722
1812	1723	public static function syndicated_links ($args = array()) {
1813	1724	$contributors = FeedWordPress::link_category_id();
1814		- if ( !is_wp_error($contributors)) :
	1725	+ if (!is_wp_error($contributors)) :
1815	1726	$links = get_bookmarks(array_merge(
1816	1727	array("category" => $contributors),
1817	1728	$args
1818	1729	));
		@@ -1823,12 +1734,14 @@
1823	1734	return $links;
1824	1735	} /* FeedWordPress::syndicated_links() */
1825	1736
1826	1737	public static function link_category_id () {
	1738	+ global $wpdb, $wp_db_version;
	1739	+
1827	1740	$cat_id = get_option('feedwordpress_cat_id');
1828	1741
1829	1742	// If we don't yet have the category ID stored, search by name
1830		- if ( ! $cat_id) :
	1743	+ if (!$cat_id) :
1831	1744	$cat_id = FeedWordPressCompatibility::link_category_id(DEFAULT_SYNDICATION_CATEGORY);
1832	1745
1833	1746	if ($cat_id) :
1834	1747	// We found it; let's stamp it.
		@@ -1841,11 +1754,11 @@
1841	1754	endif;
1842	1755
1843	1756	// If we could not find an appropriate link category,
1844	1757	// make a new one for ourselves.
1845		- if ( ! $cat_id) :
	1758	+ if (!$cat_id) :
1846	1759	$cat_id = FeedWordPressCompatibility::insert_link_category(DEFAULT_SYNDICATION_CATEGORY);
1847		- if ( !is_wp_error($cat_id)) :
	1760	+ if (!is_wp_error($cat_id)) :
1848	1761	// Stamp it
1849	1762	update_option('feedwordpress_cat_id', $cat_id);
1850	1763	endif;
1851	1764	endif;
		@@ -1854,8 +1767,10 @@
1854	1767	} /* FeedWordPress::link_category_id() */
1855	1768
1856	1769	# Upgrades and maintenance...
1857	1770	static function needs_upgrade () {
	1771	+
	1772	+ global $wpdb;
1858	1773	$fwp_db_version = get_option('feedwordpress_version', null);
1859	1774	$ret = false; // innocent until proven guilty
1860	1775	if (is_null($fwp_db_version) or ($fwp_db_version < FEEDWORDPRESS_VERSION)) :
1861	1776
		@@ -1914,10 +1829,11 @@
1914	1829	endif;
1915	1830	return $ret;
1916	1831	} /* FeedWordPress::needs_upgrade () */
1917	1832
1918		- static function upgrade_database ($from = null)
1919		- {
	1833	+ static function upgrade_database ($from = null) {
	1834	+ global $wpdb;
	1835	+
1920	1836	if (is_null($from) or $from <= 0.96) : $from = 0.96; endif;
1921	1837
1922	1838	switch ($from) :
1923	1839	case 0.96:
		@@ -1985,9 +1901,9 @@
1985	1901	// Allow user to change default feed-fetch timeout with a global setting.
1986	1902	// Props Erigami Scholey-Fuller <http://www.piepalace.ca/blog/2010/11/feedwordpress-broke-my-heart.html>
1987	1903	$timeout = FeedWordPress::fetch_timeout();
1988	1904
1989		- if ( !is_array($params)) :
	1905	+ if (!is_array($params)) :
1990	1906	$force_feed = $params;
1991	1907	else : // Parameter array
1992	1908	$args = wp_parse_args(array(
1993	1909	'force_feed' => $force_feed,
		@@ -2057,9 +1973,9 @@
2057	1973	"cache" => true,
2058	1974	));
2059	1975
2060	1976	$duration = null;
2061		- if ( ! $params['cache']) :
	1977	+ if (!$params['cache']) :
2062	1978	$duration = 0;
2063	1979	elseif (defined('FEEDWORDPRESS_CACHE_AGE')) :
2064	1980	$duration = FEEDWORDPRESS_CACHE_AGE;
2065	1981	endif;
		@@ -2100,36 +2016,20 @@
2100	2016	return in_array( strtolower( trim( $q ) ), $nego );
2101	2017	} /* FeedWordPress::negative () */
2102	2018
2103	2019	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)
	2020	+ $affirmo = array ('y', 'yes', 't', 'true', 1);
2108	2021	$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		- }
	2022	+ return in_array( strtolower( trim( $q ) ), $affirmo );
	2023	+ } /* FeedWordPress::affirmative () */
2114	2024
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 () */
	2025	+ # Internal debugging functions
2118	2026
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 ) {
	2027	+ static function diagnostic ($level, $out, $persist = null, $since = null, $mostRecent = null) {
2128	2028	global $feedwordpress_admin_footer;
2129	2029
2130		- $output = (array) get_option( 'feedwordpress_diagnostics_output', array() );
2131		- $dlog = get_option( 'feedwordpress_diagnostics_log', array() );
	2030	+ $output = get_option('feedwordpress_diagnostics_output', array());
	2031	+ $dlog = get_option('feedwordpress_diagnostics_log', array());
2132	2032
2133	2033	$diagnostic_nesting = count( explode( ":", $level ) );
2134	2034
2135	2035	if (FeedWordPressDiagnostic::is_on($level)) :
		@@ -2135,15 +2035,15 @@
2135	2035	if (FeedWordPressDiagnostic::is_on($level)) :
2136	2036	foreach ($output as $method) :
2137	2037	switch ($method) :
2138	2038	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";
	2039	+ if (!self::update_requested()) :
	2040	+ echo "<div><pre><strong>Diag".str_repeat('====', $diagnostic_nesting-1).'|</strong> '.$out."</pre></div>\n";
2141	2041	endif;
2142	2042	break;
2143	2043	case 'echo_in_cronjob' :
2144	2044	if (self::update_requested()) :
2145		- echo esc_html( self::log_prefix() ) . ' ' . esc_html( $out ) . "\n";
	2045	+ echo self::log_prefix() . ' ' . esc_html( $out ) . "\n";
2146	2046	endif;
2147	2047	break;
2148	2048	case 'admin_footer' :
2149	2049	$feedwordpress_admin_footer[] = $out;
		@@ -2162,10 +2062,10 @@
2162	2062	$hook = md5($level."\n".$persist);
2163	2063	$line = array("Since" => $since, "Message" => $out, "Most Recent" => $mostRecent);
2164	2064	endif;
2165	2065
2166		- if ( !isset($dlog['mesg'])) : $dlog['mesg'] = array(); endif;
2167		- if ( !isset($dlog['mesg'][$sect])) : $dlog['mesg'][$sect] = array(); endif;
	2066	+ if (!isset($dlog['mesg'])) : $dlog['mesg'] = array(); endif;
	2067	+ if (!isset($dlog['mesg'][$sect])) : $dlog['mesg'][$sect] = array(); endif;
2168	2068
2169	2069	$dlog['mesg'][$sect][$hook] = $line;
2170	2070	endswitch;
2171	2071	endforeach;
		@@ -2170,14 +2070,14 @@
2170	2070	endswitch;
2171	2071	endforeach;
2172	2072	endif;
2173	2073
2174		- update_option( 'feedwordpress_diagnostics_log', $dlog );
2175		- } /* FeedWordPress::diagnostic() */
	2074	+ update_option('feedwordpress_diagnostics_log', $dlog);
	2075	+ } /* FeedWordPress::diagnostic () */
2176	2076
2177	2077	public function email_diagnostics_override () {
2178	2078	return ( $this->has_secret() and ! ! FeedWordPress::param( 'feedwordpress_email_diagnostics' ) );
2179		- } /* FeedWordPress::email_diagnostics_override() */
	2079	+ } /* FeedWordPress::email_diagnostics_override () */
2180	2080
2181	2081	public function has_emailed_diagnostics ($dlog) {
2182	2082	$ret = false;
2183	2083	if ($this->email_diagnostics_override()
		@@ -2184,9 +2084,9 @@
2184	2084	or (isset($dlog['schedule']) and isset($dlog['schedule']['last']))) :
2185	2085	$ret = true;
2186	2086	endif;
2187	2087	return $ret;
2188		- } /* FeedWordPress::has_emailed_diagnostics() */
	2088	+ } /* FeedWordPress::has_emailed_diagnostics () */
2189	2089
2190	2090	public function ready_to_email_diagnostics ($dlog) {
2191	2091	$ret = false;
2192	2092	if ($this->email_diagnostics_override()
		@@ -2193,19 +2093,14 @@
2193	2093	or (time() > ($dlog['schedule']['last'] + $dlog['schedule']['freq']))) :
2194	2094	$ret = true;
2195	2095	endif;
2196	2096	return $ret;
2197		- } /* FeedWordPress::ready_to_email_diagnostics() */
	2097	+ } /* FeedWordPress::ready_to_email_diagnostics () */
2198	2098
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		- ) );
	2099	+ public function email_diagnostic_log ($params = array()) {
	2100	+ $params = wp_parse_args($params, array(
	2101	+ "force" => false,
	2102	+ ));
2208	2103
2209	2104	$dlog = get_option('feedwordpress_diagnostics_log', array());
2210	2105
2211	2106	if ($this->has_emailed_diagnostics($dlog)) :
		@@ -2212,9 +2107,9 @@
2212	2107	if ($this->ready_to_email_diagnostics($dlog)) :
2213	2108	// No news is good news; only send if
2214	2109	// there are some messages to send.
2215	2110	$body = null;
2216		- if ( !isset($dlog['mesg'])) : $dlog['mesg'] = array(); endif;
	2111	+ if (!isset($dlog['mesg'])) : $dlog['mesg'] = array(); endif;
2217	2112
2218	2113	foreach ($dlog['mesg'] as $sect => $mesgs) :
2219	2114	if (count($mesgs) > 0) :
2220	2115	if (is_null($body)) : $body = ''; endif;
		@@ -2222,9 +2117,9 @@
2222	2117	$paradigm = reset($mesgs);
2223	2118	$body .= "<h2>".ucfirst($sect)." issues</h2>\n"
2224	2119	."<table>\n"
2225	2120	."<thead><tr>\n";
2226		- foreach ( $paradigm as $col => $value ) :
	2121	+ foreach ($paradigm as $col => $value) :
2227	2122	$body .= '<th scope="col">'.$col."</th>\n";
2228	2123	endforeach;
2229	2124	$body .= "</tr></thead>\n"
2230	2125	."<tbody>\n";
		@@ -2235,9 +2130,9 @@
2235	2130	if (is_numeric($cell)) :
2236	2131	$cell = date('j-M-y, h:i a', $cell);
2237	2132	endif;
2238	2133	$class = strtolower(preg_replace('/\s+/', '-', $col));
2239		- $body .= "<td class=\"$class\">{$cell}</td>";
	2134	+ $body .= "<td class=\"$class\">${cell}</td>";
2240	2135	endforeach;
2241	2136	$body .= "</tr>\n";
2242	2137	endforeach;
2243	2138
		@@ -2245,9 +2140,9 @@
2245	2140	endif;
2246	2141	endforeach;
2247	2142
2248	2143	$body = apply_filters('feedwordpress_diagnostic_email_body', $body, $dlog);
2249		- if ( !is_null($body)) :
	2144	+ if (!is_null($body)) :
2250	2145	$home = feedwordpress_display_url(get_bloginfo('url'));
2251	2146	$subj = apply_filters('feedwordpress_diagnostic_email_subject', $home . " syndication issues", $dlog);
2252	2147	$agent = 'FeedWordPress '.FEEDWORDPRESS_VERSION;
2253	2148	$body = <<<EOMAIL
		@@ -2281,16 +2176,10 @@
2281	2176	$recipients = array($ref[1]);
2282	2177
2283	2178	// userid
2284	2179	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;
	2180	+ $userdata = get_userdata((int) $ref[1]);
	2181	+ $recipients = array($userdata->user_email);
2293	2182
2294	2183	// admins
2295	2184	else :
2296	2185	$recipients = FeedWordPressDiagnostic::admin_emails();
		@@ -2299,9 +2188,9 @@
2299	2188	$mesgId = 'feedwordpress+'.time().'@'.$home;
2300	2189	$parentId = get_option('feedwordpress_diagnostics_email_root_message_id', null);
2301	2190
2302	2191	$head = array("Message-ID: <$mesgId>");
2303		- if ( !is_null($parentId)) :
	2192	+ if (!is_null($parentId)) :
2304	2193	// We've already sent off a diagnostic message in the past. Let's do some
2305	2194	// magic to help with threading, in the hopes that all diagnostic messages
2306	2195	// get threaded together.
2307	2196	$head[] = "References: <$parentId>";
		@@ -2333,13 +2222,12 @@
2333	2222	'last' => time(),
2334	2223	);
2335	2224	endif;
2336	2225
2337		- update_option( 'feedwordpress_diagnostics_log', $dlog );
	2226	+ update_option('feedwordpress_diagnostics_log', $dlog);
2338	2227	} /* FeedWordPress::email_diagnostic_log () */
2339	2228
2340		-
2341		- static function allow_html_mail() {
	2229	+ static function allow_html_mail () {
2342	2230	return 'text/html';
2343	2231	} /* FeedWordPress::allow_html_mail () */
2344	2232
2345	2233	static function admin_footer () {
		@@ -2348,14 +2236,8 @@
2348	2236	echo '<div><pre>' . esc_html( $line ) . '</pre></div>';
2349	2237	endforeach;
2350	2238	} /* FeedWordPress::admin_footer () */
2351	2239
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	2240	static function log_prefix ($date = false) {
2359	2241	$home = get_bloginfo('url');
2360	2242	$prefix = '['.feedwordpress_display_url($home).'] [feedwordpress] ';
2361	2243	if ($date) :
		@@ -2363,14 +2245,8 @@
2363	2245	endif;
2364	2246	return $prefix;
2365	2247	} /* FeedWordPress::log_prefix () */
2366	2248
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	2249	static function menu_cap ($sub = false) {
2374	2250	if ($sub) :
2375	2251	$cap = apply_filters('feedwordpress_menu_settings_capacity', 'manage_options');
2376	2252	else :
		@@ -2380,17 +2256,17 @@
2380	2256	} /* FeedWordPress::menu_cap () */
2381	2257
2382	2258	public function plugin_dir_path ($path = '') {
2383	2259	$dir = plugin_dir_path( __FILE__ );
2384		- $file_path = "{$dir}{$path}";
	2260	+ $file_path = "${dir}${path}";
2385	2261	return apply_filters( "feedwordpress_plugin_dir_path", $file_path );
2386	2262	} /* FeedWordPress::plugin_dir_path () */
2387		-
	2263	+
2388	2264	public function plugin_dir_url ($path = '') {
2389	2265	$url_path = plugins_url( $path, __FILE__ );
2390	2266	return apply_filters( "feedwordpress_plugin_dir_url", $url_path );
2391	2267	} /* FeedWordPRess::plugin_dir_url () */
2392		-
	2268	+
2393	2269	static function path ($filename = '') {
2394	2270	global $fwp_path;
2395	2271
2396	2272	$path = $fwp_path;
		@@ -2396,9 +2272,9 @@
2396	2272	$path = $fwp_path;
2397	2273	if (strlen($filename) > 0) :
2398	2274	$path .= '/'.$filename;
2399	2275	endif;
2400		-
	2276	+
2401	2277	return $path;
2402	2278	} /* FeedWordPress::path () */
2403	2279
2404	2280	// -- DEPRCATED UTILITY FUNCTIONS -------------------------------------
		@@ -2412,9 +2288,9 @@
2412	2288	return self::sanitized_parameter( MyPHP::param( $key, $default, $type ), $sanitizer );
2413	2289	} /* FeedWordPress::param () */
2414	2290
2415	2291	static function post( $key, $default = null, $sanitizer = null ) {
2416		- return self::sanitized_parameter( MyPHP::post( $key, $default ), $sanitizer );
	2292	+ return self::sanitized_parameter( MyPHP::post( $key, $default, $type ), $sanitizer );
2417	2293	} /* FeedWordPress::post () */
2418	2294
2419	2295	static function shallow_sanitize( $item, $sanitizer = null ) {
2420	2296	if ( $sanitizer == 'raw' ) :
		@@ -2439,9 +2315,9 @@
2439	2315	$ret = null; // "Sanitized" objects or resources currently get nothing.
2440	2316	endif;
2441	2317	return $ret;
2442	2318	}
2443		-
	2319	+
2444	2320	static function val ($v, $no_newlines = false) {
2445	2321	return MyPHP::val($v, $no_newlines);
2446	2322	} /* FeedWordPress::val () */
2447	2323
		@@ -2449,9 +2325,9 @@
2449	2325	FeedWordPressDiagnostic::critical_bug($varname, $var, $line, $file);
2450	2326	} /* FeedWordPress::critical_bug () */
2451	2327
2452	2328	static function noncritical_bug ($varname, $var, $line, $file = null) {
2453		- FeedWordPressDiagnostic::noncritical_bug($varname, $var, $line, $file);
	2329	+ FeedWordPressDiagnostic::noncritical_bug($varname, $var, $line, $file);
2454	2330	} /* FeedWordPress::noncritical_bug () */
2455	2331
2456	2332	static function diagnostic_on ($level) {
2457	2333	return FeedWordPressDiagnostic::is_on($level);
		@@ -2468,21 +2344,9 @@
2468	2344	define( 'FWP_REGEX_EMAIL_PREFIX_NAME', '/^\s*' . FWP_REGEX_EMAIL_NAME . '\s*<' . FWP_REGEX_EMAIL_ADDY . '>\s*$/' );
2469	2345	define( 'FWP_REGEX_EMAIL_JUST_ADDY', '/^\s*' . FWP_REGEX_EMAIL_ADDY . '\s*$/' );
2470	2346	define( 'FWP_REGEX_EMAIL_JUST_NAME', '/^\s*' . FWP_REGEX_EMAIL_NAME . '\s*$/' );
2471	2347
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	2348	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	2349	if ( preg_match( FWP_REGEX_EMAIL_POSTFIX_NAME, $email, $matches ) ) :
2486	2350	( $ret['name'] = $matches[3] ) || ( $ret['name'] = $matches[2] );
2487	2351	$ret['email'] = $matches[1];
2488	2352	elseif ( preg_match( FWP_REGEX_EMAIL_PREFIX_NAME, $email, $matches ) ) :
		@@ -2487,9 +2351,8 @@
2487	2351	$ret['email'] = $matches[1];
2488	2352	elseif ( preg_match( FWP_REGEX_EMAIL_PREFIX_NAME, $email, $matches ) ) :
2489	2353	( $ret['name'] = $matches[2] ) || ( $ret['name'] = $matches[3] );
2490	2354	$ret['email'] = $matches[4];
2491		-
2492	2355	elseif ( preg_match( FWP_REGEX_EMAIL_JUST_ADDY, $email, $matches ) ) :
2493	2356	$ret['name'] = null;
2494	2357	$ret['email'] = $matches[1];
2495	2358	elseif ( preg_match( FWP_REGEX_EMAIL_JUST_NAME, $email, $matches ) ) :
		@@ -2494,7 +2357,10 @@
2494	2357	$ret['email'] = $matches[1];
2495	2358	elseif ( preg_match( FWP_REGEX_EMAIL_JUST_NAME, $email, $matches ) ) :
2496	2359	$ret['email'] = null;
2497	2360	( $ret['name'] = $matches[2] ) || ( $ret['name'] = $matches[3] );
	2361	+ else :
	2362	+ $ret['name'] = null;
	2363	+ $ret['email'] = null;
2498	2364	endif;
2499	2365	return $ret;
2500	2366	}