← All changes | feedwordpress.php +1005 -941 trunk → 2014.0805 View file →

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