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