← All changes | feedwordpress.php +2009 -787 2010.0127 → 2020.0118 View file →

		@@ -2,39 +2,47 @@
2	2	/*
3	3	Plugin Name: FeedWordPress
4	4	Plugin URI: http://feedwordpress.radgeek.com/
5	5	Description: simple and flexible Atom/RSS syndication for WordPress
6		-Version: 2010.0127
7		-Author: Charles Johnson
8		-Author URI: http://radgeek.com/
	6	+Version: 2020.0118
	7	+Author: C. Johnson
	8	+Author URI: https://feedwordpress.radgeek.com/contact/
9	9	License: GPL
10	10	*/
11	11
12		-# This uses code derived from:
	12	+/**
	13	+ * @package FeedWordPress
	14	+ * @version 2020.0118
	15	+ */
	16	+
	17	+# This plugin uses code derived from:
13	18	# - wp-rss-aggregate.php by Kellan Elliot-McCrea <kellan@protest.net>
14		-# - HTTP Navigator 2 by Keyvan Minoukadeh <keyvan@k1m.com>
	19	+# - SimplePie feed parser by Ryan Parman, Geoffrey Sneddon, Ryan McCue, et al.
	20	+# - MagpieRSS feed parser by Kellan Elliot-McCrea <kellan@protest.net>
15	21	# - Ultra-Liberal Feed Finder by Mark Pilgrim <mark@diveintomark.org>
	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, and @inanimatt
16	26	# according to the terms of the GNU General Public License.
17		-#
18		-# INSTALLATION: see readme.txt or <http://projects.radgeek.com/install>
19		-#
20		-# USAGE: once FeedWordPress is installed, you manage just about everything from
21		-# the WordPress Dashboard, under the Syndication menu. To ensure that fresh
22		-# content is added as it becomes available, you can convince your contributors
23		-# to put your XML-RPC URI (if WordPress is installed at
24		-# <http://www.zyx.com/blog>, XML-RPC requests should be sent to
25		-# <http://www.zyx.com/blog/xmlrpc.php>), or update manually under the
26		-# Syndication menu, or set up automatic updates under Syndication --> Settings,
27		-# or use a cron job.
28	27
29		-# -- Don't change these unless you know what you're doing...
	28	+####################################################################################
	29	+## CONSTANTS & DEFAULTS ############################################################
	30	+####################################################################################
30	31
31		-define ('FEEDWORDPRESS_VERSION', '2010.0127');
32		-define ('FEEDWORDPRESS_AUTHOR_CONTACT', 'http://radgeek.com/contact');
	32	+define ('FEEDWORDPRESS_VERSION', '2020.0118');
	33	+define ('FEEDWORDPRESS_AUTHOR_CONTACT', 'http://feedwordpress.radgeek.com/contact');
33	34
	35	+if (!defined('FEEDWORDPRESS_BLEG')) :
	36	+ define ('FEEDWORDPRESS_BLEG', true);
	37	+endif;
	38	+define('FEEDWORDPRESS_BLEG_BTC', '15EsQ9QMZtLytsaVYZUaUCmrkSMaxZBTso');
	39	+define('FEEDWORDPRESS_BLEG_PAYPAL', '22PAJZZCK5Z3W');
	40	+
34	41	// Defaults
35	42	define ('DEFAULT_SYNDICATION_CATEGORY', 'Contributors');
36	43	define ('DEFAULT_UPDATE_PERIOD', 60); // value in minutes
	44	+define ('FEEDWORDPRESS_DEFAULT_CHECKIN_INTERVAL', DEFAULT_UPDATE_PERIOD/10);
37	45
38	46	if (isset($_REQUEST['feedwordpress_debug'])) :
39	47	$feedwordpress_debug = $_REQUEST['feedwordpress_debug'];
40	48	else :
		@@ -43,8 +51,10 @@
43	51	$feedwordpress_debug = ($feedwordpress_debug == 'yes');
44	52	endif;
45	53	endif;
46	54	define ('FEEDWORDPRESS_DEBUG', $feedwordpress_debug);
	55	+$feedwordpress_compatibility = true;
	56	+define ('FEEDWORDPRESS_COMPATIBILITY', $feedwordpress_compatibility);
47	57
48	58	define ('FEEDWORDPRESS_CAT_SEPARATOR_PATTERN', '/[:\n]/');
49	59	define ('FEEDWORDPRESS_CAT_SEPARATOR', "\n");
50	60
		@@ -51,69 +61,111 @@
51	61	define ('FEEDVALIDATOR_URI', 'http://feedvalidator.org/check.cgi');
52	62
53	63	define ('FEEDWORDPRESS_FRESHNESS_INTERVAL', 10*60); // Every ten minutes
54	64
55		-define ('FWP_SCHEMA_HAS_USERMETA', 2966);
56		-define ('FWP_SCHEMA_20', 3308); // Database schema # for WP 2.0
57		-define ('FWP_SCHEMA_21', 4772); // Database schema # for WP 2.1
58		-define ('FWP_SCHEMA_23', 5495); // Database schema # for WP 2.3
59		-define ('FWP_SCHEMA_25', 7558); // Database schema # for WP 2.5
60		-define ('FWP_SCHEMA_26', 8201); // Database schema # for WP 2.6
61		-define ('FWP_SCHEMA_27', 9872); // Database schema # for WP 2.7
62		-define ('FWP_SCHEMA_28', 11548); // Database schema # for WP 2.8
63		-define ('FWP_SCHEMA_29', 12329); // Database schema # for WP 2.9
	65	+define('FEEDWORDPRESS_BOILERPLATE_DEFAULT_HOOK_ORDER', 11000); // at the tail end of the filtering process
64	66
65	67	if (FEEDWORDPRESS_DEBUG) :
66	68	// Help us to pick out errors, if any.
67	69	ini_set('error_reporting', E_ALL & ~E_NOTICE);
68	70	ini_set('display_errors', true);
69		- define('MAGPIE_DEBUG', true);
70		-
	71	+
71	72	// When testing we don't want cache issues to interfere. But this is
72		- // a VERY BAD SETTING for a production server. Webmasters will eat your
	73	+ // a VERY BAD SETTING for a production server. Webmasters will eat your
73	74	// face for breakfast if you use it, and the baby Jesus will cry. So
74	75	// make sure FEEDWORDPRESS_DEBUG is FALSE for any site that will be
75	76	// used for more than testing purposes!
76		- define('MAGPIE_CACHE_AGE', 1);
	77	+ define('FEEDWORDPRESS_CACHE_AGE', 1);
	78	+ define('FEEDWORDPRESS_CACHE_LIFETIME', 1);
	79	+ define('FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT', 60);
77	80	else :
78		- define('MAGPIE_DEBUG', false);
79		-
80		- define('MAGPIE_CACHE_AGE', 1*60);
	81	+ // Hold onto data all day for conditional GET purposes,
	82	+ // but consider it stale after 1 min (requiring a conditional GET)
	83	+ define('FEEDWORDPRESS_CACHE_LIFETIME', 24*60*60);
	84	+ define('FEEDWORDPRESS_CACHE_AGE', 1*60);
	85	+ define('FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT', 20);
81	86	endif;
82	87
83		-// Note that the rss-functions.php that comes prepackaged with WordPress is
84		-// old & busted. For the new hotness, drop a copy of rss.php from
85		-// this archive into wp-includes/rss.php
	88	+####################################################################################
	89	+## CORE DEPENDENCIES & PLUGIN MODULES ##############################################
	90	+####################################################################################
86	91
87		-if (is_readable(ABSPATH . WPINC . '/rss.php')) :
88		- require_once (ABSPATH . WPINC . '/rss.php');
89		-else :
90		- require_once (ABSPATH . WPINC . '/rss-functions.php');
91		-endif;
	92	+// Dependencies: modules packaged with WordPress core
	93	+$wpCoreDependencies = array(
	94	+"class:SimplePie" => "class-simplepie",
	95	+"class:WP_Feed_Cache" => "class-wp-feed-cache",
	96	+"class:WP_Feed_Cache_Transient" => "class-wp-feed-cache-transient",
	97	+"class:WP_SimplePie_File" => "class-wp-simplepie-file",
	98	+"class:WP_SimplePie_Sanitize_KSES" => "class-wp-simplepie-sanitize-kses",
	99	+"function:wp_insert_user" => "registration",
	100	+);
92	101
93		-if (isset($wp_db_version)) :
94		- if ($wp_db_version >= FWP_SCHEMA_23) :
95		- require_once (ABSPATH . WPINC . '/registration.php'); // for wp_insert_user
96		- elseif ($wp_db_version >= FWP_SCHEMA_21) : // WordPress 2.1 and 2.2, but not 2.3
97		- require_once (ABSPATH . WPINC . '/registration.php'); // for wp_insert_user
98		- require_once (ABSPATH . 'wp-admin/admin-db.php'); // for wp_insert_category
99		- elseif ($wp_db_version >= FWP_SCHEMA_20) : // WordPress 2.0
100		- require_once (ABSPATH . WPINC . '/registration-functions.php'); // for wp_insert_user
101		- require_once (ABSPATH . 'wp-admin/admin-db.php'); // for wp_insert_category
	102	+// Ensure that we have SimplePie loaded up and ready to go
	103	+// along with the WordPress auxiliary classes.
	104	+$unmetCoreDependencies = array();
	105	+foreach ($wpCoreDependencies as $unit => $fileSlug) :
	106	+ list($unitType, $unitName) = explode(":", $unit, 2);
	107	+
	108	+ $dependencyMet = (('class'==$unitType) ? class_exists($unitName) : function_exists($unitName));
	109	+ if (!$dependencyMet) :
	110	+ $phpFileName = ABSPATH . WPINC . "/${fileSlug}.php";
	111	+ if (file_exists($phpFileName)) :
	112	+ require_once($phpFileName);
	113	+ else :
	114	+ $unmetCoreDependencies[] = $unitName;
	115	+ endif;
102	116	endif;
	117	+endforeach;
	118	+
	119	+// Fallback garbage-pail module used in WP < 4.7 which may meet our dependencies
	120	+if (count($unmetCoreDependencies) > 0) :
	121	+ require_once(ABSPATH . WPINC . "/class-feed.php");
103	122	endif;
104	123
105		-require_once(dirname(__FILE__) . '/compatability.php'); // LEGACY API: Replicate or mock up functions for legacy support purposes
106		-require_once(dirname(__FILE__) . '/feedwordpresshtml.class.php');
	124	+// Dependences: modules packaged with FeedWordPress plugin
	125	+$dir = dirname(__FILE__);
	126	+require_once("${dir}/externals/myphp/myphp.class.php");
	127	+require_once("${dir}/feedwordpressadminpage.class.php");
	128	+require_once("${dir}/feedwordpresssettingsui.class.php");
	129	+require_once("${dir}/feedwordpressdiagnostic.class.php");
	130	+require_once("${dir}/admin-ui.php");
	131	+require_once("${dir}/template-functions.php");
	132	+require_once("${dir}/feedwordpresssyndicationpage.class.php");
	133	+require_once("${dir}/compatability.php"); // Legacy API
	134	+require_once("${dir}/syndicatedpost.class.php");
	135	+require_once("${dir}/syndicatedlink.class.php");
	136	+require_once("${dir}/feedwordpresshtml.class.php");
	137	+require_once("${dir}/feedwordpress-content-type-sniffer.class.php");
	138	+require_once("${dir}/inspectpostmeta.class.php");
	139	+require_once("${dir}/syndicationdataqueries.class.php");
	140	+require_once("${dir}/feedwordpie.class.php");
	141	+require_once("${dir}/feedwordpie_item.class.php");
	142	+require_once("${dir}/feedwordpress_file.class.php");
	143	+require_once("${dir}/feedwordpress_parser.class.php");
	144	+require_once("${dir}/feedwordpressrpc.class.php");
	145	+require_once("${dir}/feedwordpresshttpauthenticator.class.php");
	146	+require_once("${dir}/feedwordpresslocalpost.class.php");
107	147
108		-// Magic quotes are just about the stupidest thing ever.
	148	+####################################################################################
	149	+## GLOBAL PARAMETERS ###############################################################
	150	+####################################################################################
	151	+
	152	+// $fwp_post used to be a global variable used to make it easier to cope
	153	+// with the frustrating sometime presence of "Magic Quotes" in earlier
	154	+// versions of PHP (<http://php.net/manual/en/security.magicquotes.php>).
	155	+// Magic quotes were DEPRECATED as of PHP 5.3.0, and REMOVED as of PHP
	156	+// 5.4.0, so for the time being $fwp_post just gets a copy of $_POST.
	157	+global $fwp_post;
	158	+
109	159	if (is_array($_POST)) :
110		- $fwp_post = stripslashes_deep($_POST);
	160	+ $fwp_post = $_POST;
	161	+else:
	162	+ $fwp_post = null;
111	163	endif;
112	164
113	165	// Get the path relative to the plugins directory in which FWP is stored
114	166	preg_match (
115		- '|/wp-content/plugins/(.+)$|',
	167	+ '|'.preg_quote(WP_PLUGIN_DIR).'/(.+)$|',
116	168	dirname(__FILE__),
117	169	$ref
118	170	);
119	171
		@@ -122,41 +174,15 @@
122	174	else : // Something went wrong. Let's just guess.
123	175	$fwp_path = 'feedwordpress';
124	176	endif;
125	177
126		-function feedwordpress_admin_scripts () {
127		- wp_enqueue_script('post'); // for magic tag and category boxes
128		- wp_enqueue_script('admin-forms'); // for checkbox selection
129		-}
	178	+####################################################################################
	179	+## FEEDWORDPRESS: INITIALIZE OBJECT AND FILTERS ####################################
	180	+####################################################################################
130	181
131		-// If this is a FeedWordPress admin page, queue up scripts for AJAX functions that FWP uses
132		-// If it is a display page or a non-FeedWordPress admin page, don't.
133		-if (is_admin() and isset($_REQUEST['page']) and preg_match("|^{$fwp_path}/|", $_REQUEST['page'])) :
134		- if (function_exists('wp_enqueue_script')) :
135		- if (FeedWordPressCompatibility::test_version(FWP_SCHEMA_29)) :
136		- add_action('admin_print_scripts', 'feedwordpress_admin_scripts');
137		- elseif (FeedWordPressCompatibility::test_version(FWP_SCHEMA_25)) :
138		- wp_enqueue_script('post'); // for magic tag and category boxes
139		- wp_enqueue_script('thickbox'); // for fold-up boxes
140		- wp_enqueue_script('admin-forms'); // for checkbox selection
141		- else :
142		- wp_enqueue_script( 'ajaxcat' ); // Provides the handy-dandy new category text box
143		- endif;
144		- endif;
145		- if (function_exists('wp_enqueue_style')) :
146		- if (fwp_test_wp_version(FWP_SCHEMA_25)) :
147		- wp_enqueue_style('dashboard');
148		- endif;
149		- endif;
150		- if (function_exists('wp_admin_css')) :
151		- if (fwp_test_wp_version(FWP_SCHEMA_25)) :
152		- wp_admin_css('css/dashboard');
153		- endif;
154		- endif;
155		-endif;
	182	+$feedwordpress = new FeedWordPress;
	183	+if (!$feedwordpress->needs_upgrade()) : // only work if the conditions are safe!
156	184
157		-if (!FeedWordPress::needs_upgrade()) : // only work if the conditions are safe!
158		-
159	185	# Syndicated items are generally received in output-ready (X)HTML and
160	186	# should not be folded, crumpled, mutilated, or spindled by WordPress
161	187	# formatting filters. But we don't want to interfere with filters for
162	188	# any locally-authored posts, either.
		@@ -170,14 +196,22 @@
170	196	# this is a syndicated post
171	197
172	198	add_filter('the_content', 'feedwordpress_preserve_syndicated_content', -10000);
173	199	add_filter('the_content', 'feedwordpress_restore_syndicated_content', 10000);
174		-
	200	+
175	201	add_action('atom_entry', 'feedwordpress_item_feed_data');
176		-
	202	+
177	203	# Filter in original permalinks if the user wants that
178		- add_filter('post_link', 'syndication_permalink', 1);
	204	+ add_filter('post_link', 'syndication_permalink', /*priority=*/ 1, /*arguments=*/ 3);
	205	+ add_filter('post_type_link', 'syndication_permalink', /*priority=*/ 1, /*arguments=*/ 4);
179	206
	207	+ # When foreign URLs are used for permalinks in feeds or display
	208	+ # contexts, they need to be escaped properly.
	209	+ add_filter('the_permalink', 'syndication_permalink_escaped');
	210	+ add_filter('the_permalink_rss', 'syndication_permalink_escaped');
	211	+
	212	+ add_filter('post_comments_feed_link', 'syndication_comments_feed_link');
	213	+
180	214	# WTF? By default, wp_insert_link runs incoming link_url and link_rss
181	215	# URIs through default filters that include `wp_kses()`. But `wp_kses()`
182	216	# just happens to escape any occurrence of & to &amp; -- which just
183	217	# happens to fuck up any URI with a & to separate GET parameters.
		@@ -182,21 +216,49 @@
182	216	# just happens to escape any occurrence of & to &amp; -- which just
183	217	# happens to fuck up any URI with a & to separate GET parameters.
184	218	remove_filter('pre_link_rss', 'wp_filter_kses');
185	219	remove_filter('pre_link_url', 'wp_filter_kses');
186		-
	220	+
	221	+ # Boilerplate functionality: hook in to title, excerpt, and content to add boilerplate text
	222	+ $hookOrder = get_option('feedwordpress_boilerplate_hook_order', FEEDWORDPRESS_BOILERPLATE_DEFAULT_HOOK_ORDER);
	223	+ add_filter(
	224	+ /*hook=*/ 'the_title',
	225	+ /*function=*/ 'add_boilerplate_title',
	226	+ /*priority=*/ $hookOrder,
	227	+ /*arguments=*/ 2
	228	+ );
	229	+ add_filter(
	230	+ /*hook=*/ 'get_the_excerpt',
	231	+ /*function=*/ 'add_boilerplate_excerpt',
	232	+ /*priority=*/ $hookOrder,
	233	+ /*arguments=*/ 1
	234	+ );
	235	+ add_filter(
	236	+ /*hook=*/ 'the_content',
	237	+ /*function=*/ 'add_boilerplate_content',
	238	+ /*priority=*/ $hookOrder,
	239	+ /*arguments=*/ 1
	240	+ );
	241	+ add_filter(
	242	+ /*hook=*/ 'the_content_rss',
	243	+ /*function=*/ 'add_boilerplate_content',
	244	+ /*priority=*/ $hookOrder,
	245	+ /*arguments=*/ 1
	246	+ );
	247	+
187	248	# Admin menu
	249	+ add_action('admin_init', array($feedwordpress, 'admin_init'));
188	250	add_action('admin_menu', 'fwp_add_pages');
189	251	add_action('admin_notices', 'fwp_check_debug');
190		- add_action('admin_notices', 'fwp_check_magpie');
191		- add_action('init', 'feedwordpress_check_for_magpie_fix');
192	252
193	253	add_action('admin_menu', 'feedwordpress_add_post_edit_controls');
194	254	add_action('save_post', 'feedwordpress_save_post_edit_controls');
195	255
	256	+ add_action('admin_footer', array($feedwordpress, 'admin_footer'));
	257	+
196	258	# Inbound XML-RPC update methods
197		- add_filter('xmlrpc_methods', 'feedwordpress_xmlrpc_hook');
198		-
	259	+ $feedwordpressRPC = new FeedWordPressRPC;
	260	+
199	261	# Outbound XML-RPC ping reform
200	262	remove_action('publish_post', 'generic_ping'); // WP 1.5.x
201	263	remove_action('do_pings', 'do_all_pings', 10, 1); // WP 2.1, 2.2
202	264	remove_action('publish_post', '_publish_post_hook', 5, 1); // WP 2.3
		@@ -205,344 +267,85 @@
205	267	add_action('do_pings', 'fwp_do_pings', 10, 1);
206	268	add_action('feedwordpress_update', 'fwp_hold_pings');
207	269	add_action('feedwordpress_update_complete', 'fwp_release_pings');
208	270
209		- # Hook in logging functions only if the logging option is ON
210		- $update_logging = get_option('feedwordpress_update_logging');
211		- if ($update_logging == 'yes') :
212		- add_action('post_syndicated_item', 'log_feedwordpress_post', 100);
213		- add_action('update_syndicated_item', 'log_feedwordpress_update_post', 100);
214		- add_action('feedwordpress_update', 'log_feedwordpress_update_feeds', 100);
215		- add_action('feedwordpress_check_feed', 'log_feedwordpress_check_feed', 100);
216		- add_action('feedwordpress_update_complete', 'log_feedwordpress_update_complete', 100);
217		- endif;
218		-
219		- if (FeedWordPress::update_requested() and FEEDWORDPRESS_DEBUG) :
220		- add_action('post_syndicated_item', 'debug_out_feedwordpress_post', 100);
221		- add_action('update_syndicated_item', 'debug_out_feedwordpress_update_post', 100);
222		- add_action('feedwordpress_update', 'debug_out_feedwordpress_update_feeds', 100);
223		- add_action('feedwordpress_check_feed', 'debug_out_feedwordpress_check_feed', 100);
224		- add_action('feedwordpress_update_complete', 'debug_out_feedwordpress_update_complete', 100);
225		- endif;
	271	+ add_action('syndicated_feed_error', array('FeedWordPressDiagnostic', 'feed_error'), 100, 3);
226	272
	273	+ add_action('wp_footer', 'debug_out_feedwordpress_footer', -100);
	274	+ add_action('admin_footer', 'debug_out_feedwordpress_footer', -100);
	275	+
227	276	# Cron-less auto-update. Hooray!
228		- $autoUpdateHook = get_option('feedwordpress_automatic_updates');
229		- if ($autoUpdateHook != 'init') :
230		- $autoUpdateHook = 'shutdown';
	277	+ $autoUpdateHook = $feedwordpress->automatic_update_hook();
	278	+ if (!is_null($autoUpdateHook)) :
	279	+ add_action($autoUpdateHook, array($feedwordpress, 'auto_update'));
231	280	endif;
232		- add_action($autoUpdateHook, 'feedwordpress_auto_update');
233	281
234		- add_action('init', 'feedwordpress_update_magic_url');
	282	+ add_action('init', array($feedwordpress, 'init'));
	283	+ add_action('wp_loaded', array($feedwordpress, 'wp_loaded'));
235	284
	285	+ add_action('shutdown', array($feedwordpress, 'email_diagnostic_log'));
	286	+ add_action('shutdown', array($feedwordpress, 'feedwordpress_cleanup'));
	287	+ add_action('wp_dashboard_setup', array($feedwordpress, 'dashboard_setup'));
	288	+
236	289	# Default sanitizers
237	290	add_filter('syndicated_item_content', array('SyndicatedPost', 'resolve_relative_uris'), 0, 2);
238	291	add_filter('syndicated_item_content', array('SyndicatedPost', 'sanitize_content'), 0, 2);
239	292
	293	+ add_action('plugins_loaded', array($feedwordpress, 'admin_api'));
	294	+ add_action('all_admin_notices', array($feedwordpress, 'all_admin_notices'));
	295	+
	296	+ // Use our the cache settings that we want.
	297	+ add_filter('wp_feed_cache_transient_lifetime', array('FeedWordPress', 'cache_lifetime'));
	298	+
	299	+
240	300	else :
241	301	# Hook in the menus, which will just point to the upgrade interface
242	302	add_action('admin_menu', 'fwp_add_pages');
243	303	endif; // if (!FeedWordPress::needs_upgrade())
244	304
245		-function feedwordpress_check_for_magpie_fix () {
246		- if (isset($_POST['action']) and $_POST['action']=='fix_magpie_version') :
247		- FeedWordPressCompatibility::validate_http_request(/*action=*/ 'feedwordpress_fix_magpie', /*capability=*/ 'edit_files');
	305	+register_deactivation_hook(__FILE__, 'feedwordpress_deactivate');
	306	+function feedwordpress_deactivate () {
	307	+ wp_clear_scheduled_hook('fwp_scheduled_update_checkin');
	308	+} /* feedwordpress_deactivate () */
248	309
249		- $back_to = $_SERVER['REQUEST_URI'];
250		- if (isset($_POST['ignore'])) :
251		- // kill error message by telling it we ignored the upgrade request for this version
252		- update_option('feedwordpress_magpie_ignored_upgrade_to', EXPECTED_MAGPIE_VERSION);
253		- $ret = 'ignored';
254		- elseif (isset($_POST['upgrade'])) :
255		- $source = dirname(__FILE__)."/MagpieRSS-upgrade/rss.php";
256		- $destination = ABSPATH . WPINC . '/rss.php';
257		- $success = @copy($source, $destination);
258		-
259		- // Copy over rss-functions.php, too, to avoid collisions
260		- // on pre-lapsarian versions of WordPress.
261		- if ($success) :
262		- $source = dirname(__FILE__)."/MagpieRSS-upgrade/rss-functions.php";
263		- $destination = ABSPATH . WPINC . '/rss-functions.php';
264		- $success = @copy($source, $destination);
265		- endif;
266		- $ret = (int) $success;
267		- endif;
268		-
269		- if (strpos($back_to, '?')===false) : $sep = '?';
270		- else : $sep = '&';
271		- endif;
272		-
273		- header("Location: {$back_to}{$sep}feedwordpress_magpie_fix=".$ret);
274		- exit;
275		- endif;
276		-} /* feedwordpress_check_for_magpie_fix() */
277		-
278		-function feedwordpress_auto_update () {
279		- if (FeedWordPress::stale()) :
280		- $feedwordpress =& new FeedWordPress;
281		- $feedwordpress->update();
282		- endif;
283		-} /* feedwordpress_auto_update () */
284		-
285		-function feedwordpress_update_magic_url () {
286		- global $wpdb;
287		-
288		- // Explicit update request in the HTTP request (e.g. from a cron job)
289		- if (FeedWordPress::update_requested()) :
290		- $feedwordpress =& new FeedWordPress;
291		- $feedwordpress->update(FeedWordPress::update_requested_url());
292		-
293		- if (FEEDWORDPRESS_DEBUG and count($wpdb->queries) > 0) :
294		- $mysqlTime = 0.0;
295		- $byTime = array();
296		- foreach ($wpdb->queries as $query) :
297		- $time = $query[1] * 1000000.0;
298		- $mysqlTime += $query[1];
299		- if (!isset($byTime[$time])) : $byTime[$time] = array(); endif;
300		- $byTime[$time][] = $query[0]. ' // STACK: ' . $query[2];
301		- endforeach;
302		- krsort($byTime);
303		-
304		- foreach ($byTime as $time => $querySet) :
305		- foreach ($querySet as $query) :
306		- print "[".(sprintf('%4.4f', $time/1000.0)) . "ms] $query\n";
307		- endforeach;
308		- endforeach;
309		- echo "[feedwordpress] $wpdb->num_queries queries. $mysqlTime seconds in MySQL. Total of "; timer_stop(1); print " seconds.";
310		- endif;
311		-
312		-
313		- // Magic URL should return nothing but a 200 OK header packet
314		- // when successful.
315		- exit;
316		- endif;
317		-} /* feedwordpress_magic_update_url () */
318		-
319	310	################################################################################
320	311	## LOGGING FUNCTIONS: log status updates to error_log if you want it ###########
321	312	################################################################################
322	313
323		-function log_feedwordpress_post ($id) {
324		- $post = wp_get_single_post($id);
325		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] posted "
326		- ."'{$post->post_title}' ({$post->post_date})");
	314	+function debug_out_human_readable_bytes ($quantity) {
	315	+ $quantity = (int) $quantity;
	316	+ $magnitude = 'B';
	317	+ $orders = array('KB', 'MB', 'GB', 'TB');
	318	+ while (($quantity > (1024*100)) and (count($orders) > 0)) :
	319	+ $quantity = floor($quantity / 1024);
	320	+ $magnitude = array_shift($orders);
	321	+ endwhile;
	322	+ return "${quantity} ${magnitude}";
327	323	}
328	324
329		-function log_feedwordpress_update_post ($id) {
330		- $post = wp_get_single_post($id);
331		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] updated "
332		- ."'{$post->post_title}' ({$post->post_date})"
333		- ." (as of {$post->post_modified})");
334		-}
335		-
336		-function log_feedwordpress_update_feeds ($uri) {
337		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] update('$uri')");
338		-}
339		-
340		-function log_feedwordpress_check_feed ($feed) {
341		- $uri = $feed['link/uri']; $name = $feed['link/name'];
342		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] Examining $name <$uri>");
343		-}
344		-
345		-function log_feedwordpress_update_complete ($delta) {
346		- $mesg = array();
347		- if (isset($delta['new'])) $mesg[] = 'added '.$delta['new'].' new posts';
348		- if (isset($delta['updated'])) $mesg[] = 'updated '.$delta['updated'].' existing posts';
349		- if (empty($mesg)) $mesg[] = 'nothing changed';
350		-
351		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] "
352		- .(is_null($delta) ? "Error: I don't syndicate that URI"
353		- : implode(' and ', $mesg)));
354		-}
355		-
356		-function debug_out_feedwordpress_post ($id) {
357		- $post = wp_get_single_post($id);
358		- print ("[".date('Y-m-d H:i:s')."][feedwordpress] posted "
359		- ."'{$post->post_title}' ({$post->post_date})\n");
360		-}
361		-
362		-function debug_out_feedwordpress_update_post ($id) {
363		- $post = wp_get_single_post($id);
364		- print ("[".date('Y-m-d H:i:s')."][feedwordpress] updated "
365		- ."'{$post->post_title}' ({$post->post_date})"
366		- ." (as of {$post->post_modified})\n");
367		-}
368		-
369		-function debug_out_feedwordpress_update_feeds ($uri) {
370		- print ("[".date('Y-m-d H:i:s')."][feedwordpress] update('$uri')\n");
371		-}
372		-
373		-function debug_out_feedwordpress_check_feed ($feed) {
374		- $uri = $feed['link/uri']; $name = $feed['link/name'];
375		- print ("[".date('Y-m-d H:i:s')."][feedwordpress] Examining $name <$uri>\n");
376		-}
377		-
378		-function debug_out_feedwordpress_update_complete ($delta) {
379		- $mesg = array();
380		- if (isset($delta['new'])) $mesg[] = 'added '.$delta['new'].' new posts';
381		- if (isset($delta['updated'])) $mesg[] = 'updated '.$delta['updated'].' existing posts';
382		- if (empty($mesg)) $mesg[] = 'nothing changed';
383		-
384		- print ("[".date('Y-m-d H:i:s')."][feedwordpress] "
385		- .(is_null($delta) ? "Error: I don't syndicate that URI"
386		- : implode(' and ', $mesg))."\n");
387		-}
388		-
389		-################################################################################
390		-## TEMPLATE API: functions to make your templates syndication-aware ############
391		-################################################################################
392		-
393		-function is_syndicated ($id = NULL) { return (strlen(get_syndication_feed_id($id)) > 0); }
394		-
395		-function get_syndication_source_link ($original = NULL, $id = NULL) {
396		- if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data();
397		- endif;
398		-
399		- if ($original) : $vals = get_post_custom_values('syndication_source_uri_original', $id);
400		- else : $vals = array();
401		- endif;
402		-
403		- if (count($vals) == 0) : $vals = get_post_custom_values('syndication_source_uri', $id);
404		- endif;
405		-
406		- if (count($vals) > 0) : $ret = $vals[0]; else : $ret = NULL; endif;
407		-
408		- return $ret;
409		-} /* function get_syndication_source_link() */
410		-
411		-function the_syndication_source_link ($original = NULL, $id = NULL) {
412		- echo get_syndication_source_link($original, $id);
413		-}
414		-
415		-function feedwordpress_display_url ($url, $before = 60, $after = 0) {
416		- $bits = parse_url($url);
417		-
418		- // Strip out crufty subdomains
419		- $bits['host'] = preg_replace('/^www[0-9]*\./i', '', $bits['host']);
420		-
421		- // Reassemble bit-by-bit with minimum of crufty elements
422		- $url = (isset($bits['user'])?$bits['user'].'@':'')
423		- .(isset($bits['host'])?$bits['host']:'')
424		- .(isset($bits['path'])?$bits['path']:'')
425		- .(isset($bits['query'])?'?'.$bits['query']:'');
426		-
427		- if (strlen($url) > ($before+$after)) :
428		- $url = substr($url, 0, $before).'…'.substr($url, 0 - $after, $after);
429		- endif;
430		-
431		- return $url;
432		-}
433		-
434		-function get_syndication_source ($original = NULL, $id = NULL) {
435		- if (is_null($original)) :
436		- $original = FeedWordPress::use_aggregator_source_data();
437		- endif;
438		-
439		- if ($original) :
440		- $vals = get_post_custom_values('syndication_source_original', $id);
441		- else :
442		- $vals = array();
443		- endif;
444		-
445		- if (count($vals) == 0) :
446		- $vals = get_post_custom_values('syndication_source', $id);
447		- endif;
448		-
449		- if (count($vals) > 0) :
450		- $ret = $vals[0];
451		- else :
452		- $ret = NULL;
453		- endif;
454		-
455		- if (is_null($ret) or strlen(trim($ret)) == 0) :
456		- // Fall back to URL of blog
457		- $ret = feedwordpress_display_url(get_syndication_source_link());
458		- endif;
459		-
460		- return $ret;
461		-} /* function get_syndication_source() */
462		-
463		-function the_syndication_source ($original = NULL, $id = NULL) { echo get_syndication_source($original, $id); }
464		-
465		-function get_syndication_feed ($original = NULL, $id = NULL) {
466		- if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data();
467		- endif;
468		-
469		- if ($original) : $vals = get_post_custom_values('syndication_feed_original', $id);
470		- else : $vals = array();
471		- endif;
472		-
473		- if (count($vals) == 0) : $vals = get_post_custom_values('syndication_feed', $id);
474		- endif;
475		-
476		- if (count($vals) > 0) : $ret = $vals[0]; else : $ret = NULL; endif;
477		-
478		- return $ret;
479		-} /* function get_syndication_feed() */
480		-
481		-function the_syndication_feed ($original = NULL, $id = NULL) { echo get_syndication_feed($original, $id); }
482		-
483		-function get_syndication_feed_guid ($original = NULL, $id = NULL) {
484		- if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data();
485		- endif;
486		-
487		- if ($original) : $vals = get_post_custom_values('syndication_source_id_original', $id);
488		- else : $vals = array();
489		- endif;
490		-
491		- if (count($vals) == 0) : $vals = array(get_feed_meta('feed/id', $id));
492		- endif;
493		-
494		- if (count($vals) > 0) : $ret = $vals[0]; else : $ret = NULL; endif;
495		-
496		- return $ret;
497		-} /* function get_syndication_feed_guid () */
498		-
499		-function the_syndication_feed_guid ($original = NULL, $id = NULL) { echo get_syndication_feed_guid($original, $id); }
500		-
501		-function get_syndication_feed_id ($id = NULL) { list($u) = get_post_custom_values('syndication_feed_id', $id); return $u; }
502		-function the_syndication_feed_id ($id = NULL) { echo get_syndication_feed_id($id); }
503		-
504		-$feedwordpress_linkcache = array (); // only load links from database once
505		-
506		-function get_feed_meta ($key, $id = NULL) {
507		- global $wpdb, $feedwordpress_linkcache;
508		- $feed_id = get_syndication_feed_id($id);
509		-
510		- $ret = NULL;
511		- if (strlen($feed_id) > 0):
512		- if (isset($feedwordpress_linkcache[$feed_id])) :
513		- $link = $feedwordpress_linkcache[$feed_id];
514		- else :
515		- $link =& new SyndicatedLink($feed_id);
516		- $feedwordpress_linkcache[$feed_id] = $link;
	325	+function debug_out_feedwordpress_footer () {
	326	+ if (FeedWordPressDiagnostic::is_on('memory_usage')) :
	327	+ if (function_exists('memory_get_usage')) :
	328	+ FeedWordPress::diagnostic ('memory_usage', "Memory: Current usage: ".debug_out_human_readable_bytes(memory_get_usage()));
517	329	endif;
518		-
519		- $ret = $link->settings[$key];
	330	+ if (function_exists('memory_get_peak_usage')) :
	331	+ FeedWordPress::diagnostic ('memory_usage', "Memory: Peak usage: ".debug_out_human_readable_bytes(memory_get_peak_usage()));
	332	+ endif;
520	333	endif;
521		- return $ret;
522		-} /* get_feed_meta() */
	334	+} /* debug_out_feedwordpress_footer() */
523	335
524		-function get_syndication_permalink ($id = NULL) {
525		- list($u) = get_post_custom_values('syndication_permalink', $id); return $u;
526		-}
527		-function the_syndication_permalink ($id = NULL) {
528		- echo get_syndication_permalink($id);
529		-}
530		-
531	336	################################################################################
532	337	## FILTERS: syndication-aware handling of post data for templates and feeds ####
533	338	################################################################################
534	339
535	340	$feedwordpress_the_syndicated_content = NULL;
	341	+$feedwordpress_the_original_permalink = NULL;
536	342
537	343	function feedwordpress_preserve_syndicated_content ($text) {
538	344	global $feedwordpress_the_syndicated_content;
539	345
540		- $globalExpose = (get_option('feedwordpress_formatting_filters') == 'yes');
541		- $localExpose = get_post_custom_values('_feedwordpress_formatting_filters');
542		- $expose = ($globalExpose or ((count($localExpose) > 0) and $localExpose[0]));
543		-
544		- if ( is_syndicated() and !$expose ) :
	346	+ $p = new FeedWordPressLocalPost;
	347	+ if (!$p->is_exposed_to_formatting_filters()) :
545	348	$feedwordpress_the_syndicated_content = $text;
546	349	else :
547	350	$feedwordpress_the_syndicated_content = NULL;
548	351	endif;
		@@ -550,9 +353,9 @@
550	353	}
551	354
552	355	function feedwordpress_restore_syndicated_content ($text) {
553	356	global $feedwordpress_the_syndicated_content;
554		-
	357	+
555	358	if ( !is_null($feedwordpress_the_syndicated_content) ) :
556	359	$text = $feedwordpress_the_syndicated_content;
557	360	endif;
558	361
		@@ -584,37 +387,209 @@
584	387	<?php
585	388	endif;
586	389	}
587	390
588		-function syndication_permalink ($permalink = '') {
589		- if (get_option('feedwordpress_munge_permalink') != 'no'):
590		- $uri = get_syndication_permalink();
591		- return ((strlen($uri) > 0) ? $uri : $permalink);
592		- else:
593		- return $permalink;
	391	+/**
	392	+ * syndication_permalink: Allow WordPress to use the original remote URL of
	393	+ * syndicated posts as their permalink. Can be turned on or off by by setting in
	394	+ * Syndication => Posts & Links. Saves the old internal permalink in a global
	395	+ * variable for later use.
	396	+ *
	397	+ * @param string $permalink The internal permalink
	398	+ * @return string The new permalink. Same as the old if the post is not
	399	+ * syndicated, or if FWP is set to use internal permalinks, or if the post
	400	+ * was syndicated, but didn't have a proper permalink recorded.
	401	+ *
	402	+ * @uses SyndicatedLink::setting()
	403	+ * @uses get_syndication_permalink()
	404	+ * @uses get_syndication_feed_object()
	405	+ * @uses url_to_postid()
	406	+ * @global $id
	407	+ * @global $feedwordpress_the_original_permalink
	408	+ */
	409	+function syndication_permalink ($permalink = '', $post = null, $leavename = false, $sample = false) {
	410	+ global $id;
	411	+ global $feedwordpress_the_original_permalink;
	412	+
	413	+ // Save the local permalink in case we need to retrieve it later.
	414	+ $feedwordpress_the_original_permalink = $permalink;
	415	+
	416	+ if (is_object($post) and isset($post->ID) and !empty($post->ID)) :
	417	+ // Use the post ID we've been provided with.
	418	+ $postId = $post->ID;
	419	+ elseif (is_string($permalink) and strlen($permalink) > 0) :
	420	+ // Map this permalink to a post ID so we can get the correct
	421	+ // permalink even outside of the Post Loop. Props Björn.
	422	+ $postId = url_to_postid($permalink);
	423	+ else :
	424	+ // If the permalink string is empty but Post Loop context
	425	+ // provides an id.
	426	+ $postId = $id;
594	427	endif;
595		-} // function syndication_permalink ()
596	428
	429	+ $munge = false;
	430	+ $link = get_syndication_feed_object($postId);
	431	+ if (is_object($link)) :
	432	+ $munge = ($link->setting('munge permalink', 'munge_permalink', 'yes') != 'no');
	433	+ endif;
	434	+
	435	+ if ($munge):
	436	+ $uri = get_syndication_permalink($postId);
	437	+ $permalink = ((strlen($uri) > 0) ? $uri : $permalink);
	438	+ endif;
	439	+ return $permalink;
	440	+} /* function syndication_permalink () */
	441	+
	442	+/**
	443	+ * syndication_permalink_escaped: Escape XML special characters in syndicated
	444	+ * permalinks when used in feed contexts and HTML display contexts.
	445	+ *
	446	+ * @param string $permalink
	447	+ * @return string
	448	+ *
	449	+ * @uses is_syndicated()
	450	+ * @uses FeedWordPress::munge_permalinks()
	451	+ *
	452	+ */
	453	+function syndication_permalink_escaped ($permalink) {
	454	+ /* FIXME: This should review link settings not just global settings */
	455	+ if (is_syndicated() and FeedWordPress::munge_permalinks()) :
	456	+ // This is a foreign link; WordPress can't vouch for its not
	457	+ // having any entities that need to be &-escaped. So we'll do
	458	+ // it here.
	459	+ $permalink = esc_html($permalink);
	460	+ endif;
	461	+ return $permalink;
	462	+} /* function syndication_permalink_escaped() */
	463	+
	464	+/**
	465	+ * syndication_comments_feed_link: Escape XML special characters in comments
	466	+ * feed links
	467	+ *
	468	+ * @param string $link
	469	+ * @return string
	470	+ *
	471	+ * @uses is_syndicated()
	472	+ * @uses FeedWordPress::munge_permalinks()
	473	+ */
	474	+function syndication_comments_feed_link ($link) {
	475	+ global $feedwordpress_the_original_permalink, $id;
	476	+
	477	+ if (is_syndicated() and FeedWordPress::munge_permalinks()) :
	478	+ // If the source post provided a comment feed URL using
	479	+ // wfw:commentRss or atom:link/@rel="replies" we can make use of
	480	+ // that value here.
	481	+ $source = get_syndication_feed_object();
	482	+ $replacement = NULL;
	483	+
	484	+ if (is_object($source) && $source->setting('munge comments feed links', 'munge_comments_feed_links', 'yes') != 'no') :
	485	+ $commentFeeds = get_post_custom_values('wfw:commentRSS');
	486	+ if (
	487	+ is_array($commentFeeds)
	488	+ and (count($commentFeeds) > 0)
	489	+ and (strlen($commentFeeds[0]) > 0)
	490	+ ) :
	491	+ $replacement = $commentFeeds[0];
	492	+
	493	+ // This is a foreign link; WordPress can't vouch for its not
	494	+ // having any entities that need to be &-escaped. So we'll do it
	495	+ // here.
	496	+ $replacement = esc_html($replacement);
	497	+ endif;
	498	+ endif;
	499	+
	500	+ if (is_null($replacement)) :
	501	+ // Q: How can we get the proper feed format, since the
	502	+ // format is, stupidly, not passed to the filter?
	503	+ // A: Kludge kludge kludge kludge!
	504	+ $fancy_permalinks = ('' != get_option('permalink_structure'));
	505	+ if ($fancy_permalinks) :
	506	+ preg_match('|/feed(/([^/]+))?/?$|', $link, $ref);
	507	+
	508	+ $format = (isset($ref[2]) ? $ref[2] : '');
	509	+ if (strlen($format) == 0) : $format = get_default_feed(); endif;
	510	+
	511	+ $replacement = trailingslashit($feedwordpress_the_original_permalink) . 'feed';
	512	+ if ($format != get_default_feed()) :
	513	+ $replacement .= '/'.$format;
	514	+ endif;
	515	+ $replacement = user_trailingslashit($replacement, 'single_feed');
	516	+ else :
	517	+ // No fancy permalinks = no problem
	518	+ // WordPress doesn't call get_permalink() to
	519	+ // generate the comment feed URL, so the
	520	+ // comments feed link is never munged by FWP.
	521	+ endif;
	522	+ endif;
	523	+
	524	+ if (!is_null($replacement)) : $link = $replacement; endif;
	525	+ endif;
	526	+ return $link;
	527	+} /* function syndication_comments_feed_link() */
	528	+
597	529	################################################################################
598	530	## ADMIN MENU ADD-ONS: register Dashboard management pages #####################
599	531	################################################################################
600	532
601	533	function fwp_add_pages () {
602		- global $fwp_capability;
603		- global $fwp_path;
	534	+ global $feedwordpress;
604	535
605		- $menu = array('Syndicated Sites', 'Syndication', $fwp_capability['manage_links'], $fwp_path.'/syndication.php', NULL);
606		- if (fwp_test_wp_version(FWP_SCHEMA_27)) :
607		- // add icon parameter
608		- $menu[] = WP_PLUGIN_URL.'/'.$fwp_path.'/feedwordpress-tiny.png';
609		- endif;
	536	+ $menu_cap = FeedWordPress::menu_cap();
	537	+ $settings_cap = FeedWordPress::menu_cap(/*sub=*/ true);
	538	+ $syndicationMenu = FeedWordPress::path('syndication.php');
610	539
611		- call_user_func_array('add_menu_page', $menu);
612		- add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Feeds & Updates', 'Feeds & Updates', $fwp_capability['manage_options'], $fwp_path.'/feeds-page.php');
613		- add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Posts & Links', 'Posts & Links', $fwp_capability['manage_options'], $fwp_path.'/posts-page.php');
614		- add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Authors', 'Authors', $fwp_capability['manage_options'], $fwp_path.'/authors-page.php');
615		- add_submenu_page($fwp_path.'/syndication.php', 'Categories'.FEEDWORDPRESS_AND_TAGS, 'Categories'.FEEDWORDPRESS_AND_TAGS, $fwp_capability['manage_options'], $fwp_path.'/categories-page.php');
616		- add_submenu_page($fwp_path.'/syndication.php', 'FeedWordPress Back End', 'Back End', $fwp_capability['manage_options'], $fwp_path.'/backend-page.php');
	540	+ add_menu_page(
	541	+ 'Syndicated Sites', 'Syndication',
	542	+ $menu_cap,
	543	+ $syndicationMenu,
	544	+ NULL,
	545	+ plugins_url( '/'.FeedWordPress::path('feedwordpress-tiny.png') )
	546	+ );
	547	+
	548	+ do_action('feedwordpress_admin_menu_pre_feeds', $menu_cap, $settings_cap);
	549	+ add_submenu_page(
	550	+ $syndicationMenu, 'Syndicated Sites', 'Syndicated Sites',
	551	+ $settings_cap, $syndicationMenu
	552	+ );
	553	+
	554	+ do_action('feedwordpress_admin_menu_pre_feeds', $menu_cap, $settings_cap);
	555	+ add_submenu_page(
	556	+ $syndicationMenu, 'Syndicated Feeds & Updates', 'Feeds & Updates',
	557	+ $settings_cap, FeedWordPress::path('feeds-page.php')
	558	+ );
	559	+
	560	+ do_action('feedwordpress_admin_menu_pre_posts', $menu_cap, $settings_cap);
	561	+ add_submenu_page(
	562	+ $syndicationMenu, 'Syndicated Posts & Links', 'Posts & Links',
	563	+ $settings_cap, FeedWordPress::path('posts-page.php')
	564	+ );
	565	+
	566	+ do_action('feedwordpress_admin_menu_pre_authors', $menu_cap, $settings_cap);
	567	+ add_submenu_page(
	568	+ $syndicationMenu, 'Syndicated Authors', 'Authors',
	569	+ $settings_cap, FeedWordPress::path('authors-page.php')
	570	+ );
	571	+
	572	+ do_action('feedwordpress_admin_menu_pre_categories', $menu_cap, $settings_cap);
	573	+ add_submenu_page(
	574	+ $syndicationMenu, 'Categories & Tags', 'Categories & Tags',
	575	+ $settings_cap, FeedWordPress::path('categories-page.php')
	576	+ );
	577	+
	578	+ do_action('feedwordpress_admin_menu_pre_performance', $menu_cap, $settings_cap);
	579	+ add_submenu_page(
	580	+ $syndicationMenu, 'FeedWordPress Performance', 'Performance',
	581	+ $settings_cap, FeedWordPress::path('performance-page.php')
	582	+ );
	583	+
	584	+ do_action('feedwordpress_admin_menu_pre_diagnostics', $menu_cap, $settings_cap);
	585	+ add_submenu_page(
	586	+ $syndicationMenu, 'FeedWordPress Diagnostics', 'Diagnostics',
	587	+ $settings_cap, FeedWordPress::path('diagnostics-page.php')
	588	+ );
	589	+
	590	+ add_filter('page_row_actions', array($feedwordpress, 'row_actions'), 10, 2);
	591	+ add_filter('post_row_actions', array($feedwordpress, 'row_actions'), 10, 2);
617	592	} /* function fwp_add_pages () */
618	593
619	594	function fwp_check_debug () {
620	595	// This is a horrible fucking kludge that I have to do because the
		@@ -637,97 +612,8 @@
637	612	<?php
638	613	endif;
639	614	} /* function fwp_check_debug () */
640	615
641		-define('EXPECTED_MAGPIE_VERSION', '2010.0122');
642		-function fwp_check_magpie () {
643		- if (isset($_REQUEST['feedwordpress_magpie_fix'])) :
644		- if ($_REQUEST['feedwordpress_magpie_fix']=='ignored') :
645		-?>
646		-<div class="updated fade">
647		-<p>O.K., we'll ignore the problem for now. FeedWordPress will not display any
648		-more error messages.</p>
649		-</div>
650		-<?php
651		- elseif ((bool) $_REQUEST['feedwordpress_magpie_fix']) :
652		-?>
653		-<div class="updated fade">
654		-<p>Congratulations! Your MagpieRSS has been successfully upgraded to the version
655		-shipped with FeedWordPress.</p>
656		-</div>
657		-<?php
658		- else :
659		- $source = dirname(__FILE__)."/MagpieRSS-upgrade/rss.php";
660		- $destination = ABSPATH . WPINC . '/rss.php';
661		- $cmd = "cp '".htmlspecialchars(addslashes($source))."' '".htmlspecialchars(addslashes($destination))."'";
662		- $cmd = wordwrap($cmd, /*width=*/ 75, /*break=*/ " \\\n\t");
663		-
664		-?>
665		-<div class="error">
666		-<p><strong>FeedWordPress was unable to automatically upgrade your copy of MagpieRSS.</strong></p>
667		-<p>It's likely that you need to change the file permissions on <code><?php print htmlspecialchars($source); ?></code>
668		-to allow FeedWordPress to overwrite it.</p>
669		-<p><strong>To perform the upgrade manually,</strong> you can
670		-use a SFTP or FTP client to upload a copy of <code>rss.php</code> from the
671		-<code>MagpieRSS-upgrades/</code> directory of your FeedWordPress archive so that
672		-it overwrites <code><?php print htmlspecialchars($destination); ?></code>. Or,
673		-if your web host provides shell access, you can issue the following command from
674		-a command prompt to perform the upgrade:</p>
675		-<pre>
676		-<samp>$</samp> <kbd><?php print $cmd; ?></kbd>
677		-</pre>
678		-<p><strong>If you've fixed the file permissions,</strong> you can try the
679		-automatic upgrade again.</p>
680		-
681		-<?php feedwordpress_upgrade_old_and_busted_buttons(); ?>
682		-</div>
683		-<?php
684		- endif;
685		- else :
686		- $magpie_version = FeedWordPress::magpie_version();
687		-
688		- $ignored = get_option('feedwordpress_magpie_ignored_upgrade_to');
689		- if (EXPECTED_MAGPIE_VERSION != $magpie_version and EXPECTED_MAGPIE_VERSION != $ignored) :
690		- if (current_user_can('edit_files')) :
691		- $youAre = 'you are';
692		- $itIsRecommendedThatYou = 'It is <strong>strongly recommended</strong> that you';
693		- else :
694		- $youAre = 'this site is';
695		- $itIsRecommendedThatYou = 'You may want to contact the administrator of the site; it is <strong>strongly recommended</strong> that they';
696		- endif;
697		- print '<div class="error">';
698		-?>
699		-<p style="font-style: italic"><strong>FeedWordPress has detected that <?php print $youAre; ?> currently using a version of
700		-MagpieRSS other than the upgraded version that ships with this version of FeedWordPress.</strong></p>
701		-<ul>
702		-<li><strong>Currently running:</strong> MagpieRSS <?php print $magpie_version; ?></li>
703		-<li><strong>Version included with FeedWordPress <?php print FEEDWORDPRESS_VERSION; ?>:</strong> MagpieRSS <?php print EXPECTED_MAGPIE_VERSION; ?></li>
704		-</ul>
705		-<p><?php print $itIsRecommendedThatYou; ?> install the upgraded
706		-version of MagpieRSS supplied with FeedWordPress. The version of
707		-MagpieRSS that ships with WordPress is very old and buggy, and
708		-encounters a number of errors when trying to parse modern Atom
709		-and RSS feeds.</p>
710		-<?php
711		- feedwordpress_upgrade_old_and_busted_buttons();
712		- print '</div>';
713		- endif;
714		- endif;
715		-}
716		-
717		-function feedwordpress_upgrade_old_and_busted_buttons() {
718		- if (current_user_can('edit_files')) :
719		-?>
720		-<form action="" method="post"><div>
721		-<?php FeedWordPressCompatibility::stamp_nonce('feedwordpress_fix_magpie'); ?>
722		-<input type="hidden" name="action" value="fix_magpie_version" />
723		-<input class="button-secondary" type="submit" name="ignore" value="<?php _e('Ignore this problem'); ?>" />
724		-<input class="button-primary" type="submit" name="upgrade" value="<?php _e('Upgrade'); ?>" />
725		-</div></form>
726		-<?php
727		- endif;
728		-}
729		-
730	616	################################################################################
731	617	## fwp_hold_pings() and fwp_release_pings(): Outbound XML-RPC ping reform ####
732	618	## ... 'coz it's rude to send 500 pings the first time your aggregator runs ####
733	619	################################################################################
		@@ -770,9 +656,9 @@
770	656	if ( defined('XMLRPC_REQUEST') )
771	657	do_action('xmlrpc_publish_post', $post_id);
772	658	if ( defined('APP_REQUEST') )
773	659	do_action('app_publish_post', $post_id);
774		-
	660	+
775	661	if ( defined('WP_IMPORTING') )
776	662	return;
777	663
778	664	// Defer sending out pings until we finish updating
		@@ -784,22 +670,45 @@
784	670	endif;
785	671	}
786	672
787	673	function feedwordpress_add_post_edit_controls () {
788		- add_meta_box('feedwordpress-post-controls', __('Syndication'), 'feedwordpress_post_edit_controls', 'post', 'side', 'high');
789		- } // function FeedWordPress::postEditControls
790		-
	674	+ global $feedwordpress;
	675	+ global $inspectPostMeta;
	676	+
	677	+ // Put in Manual Editing checkbox
	678	+ add_action('add_meta_boxes', 'feedwordpress_post_add_meta_boxes', 10, 2);
	679	+
	680	+ add_filter('user_can_richedit', array($feedwordpress, 'user_can_richedit'), 1000, 1);
	681	+
	682	+ if (FeedWordPressDiagnostic::is_on('syndicated_posts:static_meta_data')) :
	683	+ $inspectPostMeta = new InspectPostMeta;
	684	+ endif;
	685	+ } // function feedwordpress_add_post_edit_controls ()
	686	+
	687	+ function feedwordpress_post_add_meta_boxes ($post_type, $post) {
	688	+ add_meta_box(
	689	+ 'feedwordpress-post-controls',
	690	+ __('Syndication'),
	691	+ 'feedwordpress_post_edit_controls',
	692	+ $post_type,
	693	+ 'side',
	694	+ 'high'
	695	+ );
	696	+ }
	697	+
791	698	function feedwordpress_post_edit_controls () {
792	699	global $post;
793		-
	700	+
794	701	$frozen_values = get_post_custom_values('_syndication_freeze_updates', $post->ID);
795		- $frozen_post = (count($frozen_values) > 0 and 'yes' == $frozen_values[0]);
	702	+ $frozen_post = ($frozen_values !== null and count($frozen_values) > 0 and 'yes' == $frozen_values[0]);
796	703
797	704	if (is_syndicated($post->ID)) :
798	705	?>
799	706	<p>This is a syndicated post, which originally appeared at
800		- <cite><?php print wp_specialchars(get_syndication_source(NULL, $post->ID)); ?></cite>.
801		- <a href="<?php print wp_specialchars(get_syndication_permalink($post->ID)); ?>">View original post</a>.</p>
	707	+ <cite><?php print esc_html(get_syndication_source(NULL, $post->ID)); ?></cite>.
	708	+ <a href="<?php print esc_html(get_syndication_permalink($post->ID)); ?>">View original post</a>.</p>
	709	+
	710	+ <?php do_action('feedwordpress_post_edit_controls_pre', $post); ?>
802	711
803	712	<p><input type="hidden" name="feedwordpress_noncename" id="feedwordpress_noncename" value="<?php print wp_create_nonce(plugin_basename(__FILE__)); ?>" />
804	713	<label><input type="checkbox" name="freeze_updates" value="yes" <?php if ($frozen_post) : ?>checked="checked"<?php endif; ?> /> <strong>Manual editing.</strong>
805	714	If set, FeedWordPress will not overwrite the changes you make manually
		@@ -804,8 +713,11 @@
804	713	<label><input type="checkbox" name="freeze_updates" value="yes" <?php if ($frozen_post) : ?>checked="checked"<?php endif; ?> /> <strong>Manual editing.</strong>
805	714	If set, FeedWordPress will not overwrite the changes you make manually
806	715	to this post, if the syndicated content is updated on the
807	716	feed.</label></p>
	717	+
	718	+ <?php do_action('feedwordpress_post_edit_controls', $post); ?>
	719	+
808	720	<?php
809	721	else :
810	722	?>
811	723	<p>This post was created locally at this website.</p>
		@@ -810,38 +722,239 @@
810	722	?>
811	723	<p>This post was created locally at this website.</p>
812	724	<?php
813	725	endif;
814		- } // function feedwordpress_post_edit_controls () */
	726	+ } /* function feedwordpress_post_edit_controls () */
815	727
816	728	function feedwordpress_save_post_edit_controls ( $post_id ) {
817	729	global $post;
818		-
819	730	if (!isset($_POST['feedwordpress_noncename']) or !wp_verify_nonce($_POST['feedwordpress_noncename'], plugin_basename(__FILE__))) :
820	731	return $post_id;
821	732	endif;
822		-
	733	+
823	734	// Verify if this is an auto save routine. If it is our form has
824	735	// not been submitted, so we don't want to do anything.
825	736	if ( defined('DOING_AUTOSAVE') and DOING_AUTOSAVE ) :
826	737	return $post_id;
827	738	endif;
	739	+
	740	+ // The data in $_POST is for applying only to the post actually
	741	+ // in the edit window, i.e. $post
	742	+ if ($post_id != $post->ID) :
	743	+ return $post_id;
	744	+ endif;
828	745
829	746	// Check permissions
830		- if ( !current_user_can( 'edit_'.$_POST['post_type'], $post_id) ) :
	747	+ $cap[0] = 'edit_post';
	748	+ $cap[1] = 'edit_' . $_POST['post_type'];
	749	+ if (
	750	+ !current_user_can( $cap[0], $post_id )
	751	+ and !current_user_can( $cap[1], $post_id )
	752	+ ) :
831	753	return $post_id;
832	754	endif;
833	755
834	756	// OK, we're golden. Now let's save some data.
835	757	if (isset($_POST['freeze_updates'])) :
836		- update_post_meta($post_id, '_syndication_freeze_updates', $_POST['freeze_updates']);
	758	+
	759	+ update_post_meta($post_id, '_syndication_freeze_updates', $_POST['freeze_updates']);
	760	+ $ret = $_POST['freeze_updates'];
	761	+
	762	+ // If you make manual edits through the WordPress editing
	763	+ // UI then they should be run through normal WP formatting
	764	+ // filters.
	765	+ update_post_meta($post_id, '_feedwordpress_formatting_filters', 'yes');
	766	+
837	767	else :
838	768	delete_post_meta($post_id, '_syndication_freeze_updates');
	769	+ $ret = NULL;
839	770	endif;
	771	+
	772	+ do_action('feedwordpress_save_edit_controls', $post_id);
	773	+
	774	+ return $ret;
	775	+ } // function feedwordpress_save_edit_controls
	776	+
	777	+################################################################################
	778	+## class FeedWordPressBoilerplateReformatter ###################################
	779	+################################################################################
	780	+
	781	+class FeedWordPressBoilerplateReformatter {
	782	+ var $id, $element;
	783	+
	784	+ public function __construct ($id = NULL, $element = 'post') {
	785	+ $this->id = $id;
	786	+ $this->element = $element;
	787	+ }
	788	+
	789	+ function shortcode_methods () {
	790	+ return array(
	791	+ 'source' => 'source_link',
	792	+ 'source-name' => 'source_name',
	793	+ 'source-url' => 'source_url',
	794	+ 'original-link' => 'original_link',
	795	+ 'original-url' => 'original_url',
	796	+ 'author' => 'source_author_link',
	797	+ 'author-name' => 'source_author',
	798	+ 'feed-setting' => 'source_setting',
	799	+ );
	800	+ }
	801	+ function do_shortcode ($template) {
	802	+ $codes = $this->shortcode_methods();
	803	+
	804	+ // Register shortcodes relative to this object/post ID/element.
	805	+ foreach ($codes as $code => $method) :
	806	+ add_shortcode($code, array($this, $method));
	807	+ endforeach;
	808	+
	809	+ $template = do_shortcode($template);
840	810
841		- return $_POST['freeze_updates'];
842		- } // function feedwordpress_save_edit_controls
	811	+ // Unregister shortcodes.
	812	+ foreach ($codes as $code => $method) :
	813	+ remove_shortcode($code);
	814	+ endforeach;
	815	+
	816	+ return $template;
	817	+ }
	818	+
	819	+ function source_name ($atts) {
	820	+ $param = shortcode_atts(array(
	821	+ 'original' => NULL,
	822	+ ), $atts);
	823	+ return get_syndication_source($param['original'], $this->id);
	824	+ }
	825	+ function source_url ($atts) {
	826	+ $param = shortcode_atts(array(
	827	+ 'original' => NULL,
	828	+ ), $atts);
	829	+ return get_syndication_source_link($param['original'], $this->id);
	830	+ }
	831	+ function source_link ($atts) {
	832	+ switch (strtolower($atts[0])) :
	833	+ case '-name' :
	834	+ $ret = $this->source_name($atts);
	835	+ break;
	836	+ case '-url' :
	837	+ $ret = $this->source_url($atts);
	838	+ break;
	839	+ default :
	840	+ $param = shortcode_atts(array(
	841	+ 'original' => NULL,
	842	+ ), $atts);
	843	+ if ('title' == $this->element) :
	844	+ $ret = $this->source_name($atts);
	845	+ else :
	846	+ $ret = '<a href="'.htmlspecialchars($this->source_url($atts)).'">'.htmlspecialchars($this->source_name($atts)).'</a>';
	847	+ endif;
	848	+ endswitch;
	849	+ return $ret;
	850	+ }
	851	+ function source_setting ($atts) {
	852	+ $param = shortcode_atts(array(
	853	+ 'key' => NULL,
	854	+ ), $atts);
	855	+ return get_feed_meta($param['key'], $this->id);
	856	+ }
	857	+ function original_link ($atts, $text) {
	858	+ $url = $this->original_url($atts);
	859	+ return '<a href="'.esc_url($url).'">'.do_shortcode($text).'</a>';
	860	+ }
	861	+ function original_url ($atts) {
	862	+ return get_syndication_permalink($this->id);
	863	+ }
	864	+ function source_author ($atts) {
	865	+ return get_the_author();
	866	+ }
	867	+ function source_author_link ($atts) {
	868	+ switch (strtolower($atts[0])) :
	869	+ case '-name' :
	870	+ $ret = $this->source_author($atts);
	871	+ break;
	872	+ default :
	873	+ global $authordata; // Janky.
	874	+ if ('title' == $this->element) :
	875	+ $ret = $this->source_author($atts);
	876	+ else :
	877	+ $ret = get_the_author();
	878	+ $url = get_author_posts_url((int) $authordata->ID, (int) $authordata->user_nicename);
	879	+ if ($url) :
	880	+ $ret = '<a href="'.$url.'" '
	881	+ .'title="Read other posts by '.esc_html($authordata->display_name).'">'
	882	+ .$ret
	883	+ .'</a>';
	884	+ endif;
	885	+ endif;
	886	+ endswitch;
	887	+ return $ret;
	888	+ }
	889	+}
843	890
	891	+function add_boilerplate_reformat ($template, $element, $id = NULL) {
	892	+ if ('post' == $element and !preg_match('/< (p|div) ( \s [^>]+ )? >/xi', $template)) :
	893	+ $template = '<p class="syndicated-attribution">'.$template.'</p>';
	894	+ endif;
	895	+
	896	+ $ref = new FeedWordPressBoilerplateReformatter($id, $element);
	897	+ return $ref->do_shortcode($template);
	898	+}
	899	+
	900	+function add_boilerplate_simple ($element, $title, $id = NULL) {
	901	+ if (is_syndicated($id)) :
	902	+ $meta = get_feed_meta('boilerplate rules', $id);
	903	+ if ($meta and !is_array($meta)) : $meta = unserialize($meta); endif;
	904	+
	905	+ if (!is_array($meta) or empty($meta)) :
	906	+ $meta = get_option('feedwordpress_boilerplate');
	907	+ endif;
	908	+
	909	+ if (is_array($meta) and !empty($meta)) :
	910	+ foreach ($meta as $rule) :
	911	+ if ($element==$rule['element']) :
	912	+ $rule['template'] = add_boilerplate_reformat($rule['template'], $element, $id);
	913	+
	914	+ if ('before'==$rule['placement']) :
	915	+ $title = $rule['template'] . ' ' . $title;
	916	+ else :
	917	+ $title = $title . ' ' . $rule['template'];
	918	+ endif;
	919	+ endif;
	920	+ endforeach;
	921	+ endif;
	922	+ endif;
	923	+ return $title;
	924	+}
	925	+function add_boilerplate_title ($title, $id = NULL) {
	926	+ return add_boilerplate_simple('title', $title, $id);
	927	+}
	928	+function add_boilerplate_excerpt ($title, $id = NULL) {
	929	+ return add_boilerplate_simple('excerpt', $title, $id);
	930	+}
	931	+function add_boilerplate_content ($content) {
	932	+ if (is_syndicated()) :
	933	+ $meta = get_feed_meta('boilerplate rules');
	934	+ if ($meta and !is_array($meta)) : $meta = unserialize($meta); endif;
	935	+
	936	+ if (!is_array($meta) or empty($meta)) :
	937	+ $meta = get_option('feedwordpress_boilerplate');
	938	+ endif;
	939	+
	940	+ if (is_array($meta) and !empty($meta)) :
	941	+ foreach ($meta as $rule) :
	942	+ if ('post'==$rule['element']) :
	943	+ $rule['template'] = add_boilerplate_reformat($rule['template'], 'post');
	944	+
	945	+ if ('before'==$rule['placement']) :
	946	+ $content = $rule['template'] . "\n" . $content;
	947	+ else :
	948	+ $content = $content . "\n" . $rule['template'];
	949	+ endif;
	950	+ endif;
	951	+ endforeach;
	952	+ endif;
	953	+ endif;
	954	+ return $content;
	955	+}
	956	+
844	957	################################################################################
845	958	## class FeedWordPress #########################################################
846	959	################################################################################
847	960
		@@ -879,18 +992,87 @@
879	992	array('script', 'src')
880	993	);
881	994
882	995	var $feeds = NULL;
	996	+ var $feedurls = NULL;
	997	+ var $httpauth = NULL;
883	998
884		- # function FeedWordPress (): Contructor; retrieve a list of feeds
885		- function FeedWordPress () {
	999	+ /**
	1000	+ * FeedWordPress::__construct (): Construct FeedWordPress singleton object
	1001	+ * and retrieves a list of feeds for later reference.
	1002	+ */
	1003	+ public function __construct () {
886	1004	$this->feeds = array ();
	1005	+ $this->feedurls = array();
887	1006	$links = FeedWordPress::syndicated_links();
	1007	+
888	1008	if ($links): foreach ($links as $link):
889		- $this->feeds[] =& new SyndicatedLink($link);
	1009	+ $id = intval($link->link_id);
	1010	+ $url = $link->link_rss;
	1011	+
	1012	+ // Store for later reference.
	1013	+ $this->feeds[$id] = $id;
	1014	+ if (strlen($url) > 0) :
	1015	+ $this->feedurls[$url] = $id;
	1016	+ endif;
890	1017	endforeach; endif;
891		- } // FeedWordPress::FeedWordPress ()
892	1018
	1019	+ // System-related event hooks
	1020	+ add_filter('cron_schedules', array($this, 'cron_schedules'), 10, 1);
	1021	+
	1022	+ // FeedWordPress-related event hooks
	1023	+ add_filter('feedwordpress_update_complete', array($this, 'process_retirements'), 1000, 1);
	1024	+
	1025	+ $this->httpauth = new FeedWordPressHTTPAuthenticator;
	1026	+ } /* FeedWordPress::__construct () */
	1027	+
	1028	+ /**
	1029	+ * FeedWordPress::subscribed (): Check whether a feed is currently in the
	1030	+ * subscription list for FeedWordPress.
	1031	+ *
	1032	+ * @param mixed $id Numeric ID of a WordPress link object or URL of a feed
	1033	+ * @return bool TRUE if currently subscribed; FALSE otherwise.
	1034	+ */
	1035	+ public function subscribed ($id) {
	1036	+ return (isset($this->feedurls[$id]) or isset($this->feeds[$id]));
	1037	+ } /* FeedWordPress::subscribed () */
	1038	+
	1039	+ /**
	1040	+ * FeedWordPress::subscription (): Get the SyndicatedLink object for a
	1041	+ * given URL or numeric ID, if we have either an active subscription to
	1042	+ * it; or a de-activated subscription.
	1043	+ *
	1044	+ * @param mixed $which Numeric ID for a WordPress link object or string URL for a feed
	1045	+ * @return mixed SyndicatedLink object if subscription is found; NULL if not
	1046	+ */
	1047	+ public function subscription ($which) {
	1048	+ $sub = NULL;
	1049	+
	1050	+ if (is_string($which) and isset($this->feedurls[$which])) :
	1051	+ $which = $this->feedurls[$which];
	1052	+ endif;
	1053	+
	1054	+ if (isset($this->feeds[$which])) :
	1055	+ $sub = $this->feeds[$which];
	1056	+ endif;
	1057	+
	1058	+ // If it's not in the in-memory cache already, try to load it from DB.
	1059	+ // This is necessary to fill requests for subscriptions that we don't
	1060	+ // cache in memory, e.g. for deactivated feeds.
	1061	+ if (is_null($sub)) :
	1062	+ $sub = get_bookmark($which);
	1063	+ endif;
	1064	+
	1065	+ // Load 'er up if you haven't already.
	1066	+ if (!is_null($sub) and !($sub InstanceOf SyndicatedLink)) :
	1067	+ $link = new SyndicatedLink($sub);
	1068	+ $this->feeds[$which] = $link;
	1069	+ $sub = $link;
	1070	+ endif;
	1071	+
	1072	+ return $sub;
	1073	+ } /* FeedWordPress::subscription () */
	1074	+
893	1075	# function update (): polls for updates on one or more Contributor feeds
894	1076	#
895	1077	# Arguments:
896	1078	# ----------
		@@ -934,22 +1116,29 @@
934	1116	# module elements) or else from a randomly-generated time window
935	1117	# (between 30 minutes and 2 hours).
936	1118	#
937	1119	# * New posts from the polled feed are added to the WordPress store.
938		- #
	1120	+ #
939	1121	# * Updates to existing posts since the last poll are mirrored in the
940	1122	# WordPress store.
941	1123	#
942		- function update ($uri = null, $crash_ts = null) {
	1124	+ public function update ($uri = null, $crash_ts = null) {
943	1125	global $wpdb;
944	1126
945	1127	if (FeedWordPress::needs_upgrade()) : // Will make duplicate posts if we don't hold off
946	1128	return NULL;
947	1129	endif;
948		-
949		- if (!is_null($uri)) :
	1130	+
	1131	+ if (!is_null($uri) and $uri != '*') :
950	1132	$uri = trim($uri);
951	1133	else : // Update all
	1134	+ if ($this->update_hooked) :
	1135	+ $diag = $this->update_hooked;
	1136	+ else :
	1137	+ $diag = 'Initiating a MANUAL check-in on the update schedule at '.date('r', time());
	1138	+ endif;
	1139	+ $this->diagnostic('update_schedule:check', $diag);
	1140	+
952	1141	update_option('feedwordpress_last_update_all', time());
953	1142	endif;
954	1143
955	1144	do_action('feedwordpress_update', $uri);
		@@ -954,24 +1143,43 @@
954	1143
955	1144	do_action('feedwordpress_update', $uri);
956	1145
957	1146	if (is_null($crash_ts)) :
958		- $crash_dt = (int) get_option('feedwordpress_update_time_limit');
959		- if ($crash_dt > 0) :
960		- $crash_ts = time() + $crash_dt;
961		- else :
962		- $crash_ts = NULL;
963		- endif;
	1147	+ $crash_ts = $this->crash_ts();
964	1148	endif;
965		-
	1149	+
966	1150	// Randomize order for load balancing purposes
967		- $feed_set = $this->feeds;
	1151	+ $feed_set = array_keys($this->feeds);
968	1152	shuffle($feed_set);
969	1153
	1154	+ $updateWindow = (int) get_option('feedwordpress_update_window', DEFAULT_UPDATE_PERIOD) * 60 /* sec/min */;
	1155	+ $interval = (int) get_option('feedwordpress_freshness', FEEDWORDPRESS_FRESHNESS_INTERVAL);
	1156	+ $portion = max(
	1157	+ (int) ceil(count($feed_set) / ($updateWindow / $interval)),
	1158	+ 10
	1159	+ );
	1160	+
	1161	+ $max_polls = apply_filters('feedwordpress_polls_per_update', get_option(
	1162	+ 'feedwordpress_polls_per_update', $portion
	1163	+ ), $uri);
	1164	+
	1165	+ $feed_set = apply_filters('feedwordpress_update_feeds', $feed_set, $uri);
	1166	+
	1167	+
970	1168	// Loop through and check for new posts
971		- $delta = NULL;
972		- foreach ($feed_set as $feed) :
973		- if (!is_null($crash_ts) and (time() > $crash_ts)) : // Check whether we've exceeded the time limit
	1169	+ $delta = NULL; $remaining = $max_polls;
	1170	+ foreach ($feed_set as $feed_id) :
	1171	+
	1172	+ $feed = $this->subscription($feed_id);
	1173	+
	1174	+ // Has this process overstayed its welcome?
	1175	+ if (
	1176	+ // Over time limit?
	1177	+ (!is_null($crash_ts) and (time() > $crash_ts))
	1178	+
	1179	+ // Over feed count?
	1180	+ or ($remaining == 0)
	1181	+ ) :
974	1182	break;
975	1183	endif;
976	1184
977	1185	$pinged_that = (is_null($uri) or ($uri=='*') or in_array($uri, array($feed->uri(), $feed->homepage())));
		@@ -981,40 +1189,120 @@
981	1189	else :
982	1190	$timely = $feed->stale();
983	1191	endif;
984	1192
985		- if ($pinged_that and is_null($delta)) : // If at least one feed was hit for updating...
986		- $delta = array('new' => 0, 'updated' => 0); // ... don't return error condition
	1193	+ // If at least one feed was hit for updating...
	1194	+ if ($pinged_that and is_null($delta)) :
	1195	+ // ... don't return error condition
	1196	+ $delta = array('new' => 0, 'updated' => 0, 'stored' => 0);
987	1197	endif;
988	1198
989	1199	if ($pinged_that and $timely) :
	1200	+ $remaining = $remaining - 1;
	1201	+
990	1202	do_action('feedwordpress_check_feed', $feed->settings);
991	1203	$start_ts = time();
992	1204	$added = $feed->poll($crash_ts);
993	1205	do_action('feedwordpress_check_feed_complete', $feed->settings, $added, time() - $start_ts);
994	1206
995		- if (isset($added['new'])) : $delta['new'] += $added['new']; endif;
996		- if (isset($added['updated'])) : $delta['updated'] += $added['updated']; endif;
	1207	+ if (is_array($added)) : // Success
	1208	+ foreach ($added as $key => $count) :
	1209	+ $delta[$key] += $added[$key];
	1210	+ endforeach;
	1211	+ endif;
997	1212	endif;
998	1213	endforeach;
999	1214
1000	1215	do_action('feedwordpress_update_complete', $delta);
	1216	+ return $delta;
	1217	+ } /* FeedWordPress::update () */
1001	1218
1002		- return $delta;
1003		- }
	1219	+ public function crash_ts ($default = NULL) {
	1220	+ $crash_dt = (int) get_option('feedwordpress_update_time_limit', 0);
	1221	+ if ($crash_dt > 0) :
	1222	+ $crash_ts = time() + $crash_dt;
	1223	+ else :
	1224	+ $crash_ts = $default;
	1225	+ endif;
	1226	+ return $crash_ts;
	1227	+ } /* FeedWordPress::crash_ts () */
1004	1228
1005		- function stale () {
1006		- if (get_option('feedwordpress_automatic_updates')) :
	1229	+ public function secret_key () {
	1230	+ $secret = get_option('feedwordpress_secret_key', false);
	1231	+ if (!$secret) : // Generate random key.
	1232	+ $secret = substr(md5(uniqid(microtime())), 0, 6);
	1233	+ update_option('feedwordpress_secret_key', $secret);
	1234	+ endif;
	1235	+ return $secret;
	1236	+ } /* FeedWordPress::secret_key () */
	1237	+
	1238	+ public function has_secret () {
	1239	+ return (MyPHP::request('feedwordpress_key')==$this->secret_key());
	1240	+ } /* FeedWordPress::has_secret () */
	1241	+
	1242	+ var $update_hooked = NULL;
	1243	+ public function automatic_update_hook ($params = array()) {
	1244	+ $params = wp_parse_args($params, array( // Defaults
	1245	+ 'setting only' => false,
	1246	+ ));
	1247	+ $hook = get_option('feedwordpress_automatic_updates', NULL);
	1248	+ $method = 'FeedWordPress option';
	1249	+
	1250	+ // Allow for forced behavior in testing.
	1251	+ if (
	1252	+ !$params['setting only']
	1253	+ and $this->has_secret()
	1254	+ and MyPHP::request('automatic_update')
	1255	+ ) :
	1256	+ $hook = MyPHP::request('automatic_update');
	1257	+ $method = 'URL parameter';
	1258	+ endif;
	1259	+
	1260	+ $exact = $hook; // Before munging
	1261	+
	1262	+ if (!!$hook) :
	1263	+ if ($hook == 'init' or $hook == 'wp_loaded') : // Re-map init to wp_loaded
	1264	+ $hook = ($params['setting only'] ? 'init' : 'wp_loaded');
	1265	+
	1266	+ // Constrain possible values. If it's not an init or wp_loaded, it's a shutdown
	1267	+ else :
	1268	+ $hook = 'shutdown';
	1269	+ endif;
	1270	+ endif;
	1271	+
	1272	+ if ($hook) :
	1273	+ $this->update_hooked = "Initiating an AUTOMATIC CHECK FOR UPDATES ON PAGE LOAD ".$hook." due to ".$method." = ".trim($this->val($exact));
	1274	+ endif;
	1275	+
	1276	+ return $hook;
	1277	+ } /* FeedWordPress::automatic_update_hook () */
	1278	+
	1279	+ public function last_update_all () {
	1280	+ $last = get_option('feedwordpress_last_update_all');
	1281	+ if ($this->has_secret() and MyPHP::request('automatic_update')) :
	1282	+ $last = 1; // A long, long time ago.
	1283	+ elseif ($this->has_secret() and MyPHP::request('last_update_all')) :
	1284	+ $last = MyPHP::request('last_update_all');
	1285	+ endif;
	1286	+ return $last;
	1287	+ } /* FeedWordPress::last_update_all () */
	1288	+
	1289	+ public function force_update_all () {
	1290	+ return ($this->has_secret() and MyPHP::request('force_update_feeds'));
	1291	+ } /* FeedWordPress::force_update_all () */
	1292	+
	1293	+ public function stale () {
	1294	+ if (!is_null($this->automatic_update_hook())) :
1007	1295	// Do our best to avoid possible simultaneous
1008	1296	// updates by getting up-to-the-minute settings.
1009		-
1010		- $last = get_option('feedwordpress_last_update_all');
1011		-
	1297	+
	1298	+ $last = $this->last_update_all();
	1299	+
1012	1300	// If we haven't updated all yet, give it a time window
1013	1301	if (false === $last) :
1014	1302	$ret = false;
1015	1303	update_option('feedwordpress_last_update_all', time());
1016		-
	1304	+
1017	1305	// Otherwise, check against freshness interval
1018	1306	elseif (is_numeric($last)) : // Expect a timestamp
1019	1307	$freshness = get_option('feedwordpress_freshness');
1020	1308	if (false === $freshness) : // Use default
		@@ -1019,13 +1307,13 @@
1019	1307	$freshness = get_option('feedwordpress_freshness');
1020	1308	if (false === $freshness) : // Use default
1021	1309	$freshness = FEEDWORDPRESS_FRESHNESS_INTERVAL;
1022	1310	endif;
1023		- $ret = ( (time() - $last) > $freshness);
	1311	+ $ret = ( (time() - $last) > $freshness );
1024	1312
1025		- // This should never happen.
	1313	+ // This should never happen.
1026	1314	else :
1027		- FeedWordPress::critical_bug('FeedWordPress::stale::last', $last, __LINE__);
	1315	+ FeedWordPressDiagnostic::critical_bug('FeedWordPress::stale::last', $last, __LINE__, __FILE__);
1028	1316	endif;
1029	1317
1030	1318	else :
1031	1319	$ret = false;
		@@ -1030,72 +1318,683 @@
1030	1318	else :
1031	1319	$ret = false;
1032	1320	endif;
1033	1321	return $ret;
1034		- } // FeedWordPress::stale()
	1322	+ } /* FeedWordPress::stale() */
	1323	+
	1324	+ static function admin_init () {
	1325	+ // WordPress 3.5+ compat: the WP devs are in the midst of removing Links from the WordPress core. Eventually we'll have to deal
	1326	+ // with the possible disappearance of the wp_links table as a whole; but in the meantime, we just need to turn on the interface
	1327	+ // element to avoid problems with user capabilities that presume the presence of the Links Manager in the admin UI.
	1328	+ if (!intval(get_option('link_manager_enabled', false))) :
	1329	+ update_option('link_manager_enabled', true);
	1330	+ endif;
	1331	+
	1332	+ if (defined('FEEDWORDPRESS_PREPARE_TO_ZAP') and FEEDWORDPRESS_PREPARE_TO_ZAP) :
	1333	+ $post_id = FEEDWORDPRESS_PREPARE_TO_ZAP;
	1334	+ $sendback = wp_get_referer();
	1335	+ if (
	1336	+ ! $sendback
	1337	+ or strpos( $sendback, 'post.php' ) !== false
	1338	+ or strpos( $sendback, 'post-new.php' ) !== false
	1339	+ ) :
	1340	+ if ( 'attachment' == $post_type ) :
	1341	+ $sendback = admin_url( 'upload.php' );
	1342	+ else :
	1343	+ $sendback = admin_url( 'edit.php' );
	1344	+ $sendback .= ( ! empty( $post_type ) ) ? '?post_type=' . $post_type : '';
	1345	+ endif;
	1346	+ else :
	1347	+ $sendback = esc_url( remove_query_arg( array('trashed', 'untrashed', 'deleted', 'zapped', 'unzapped', 'ids'), $sendback ) );
	1348	+ endif;
	1349	+
	1350	+ // Make sure we have a post corresponding to this ID.
	1351	+ $post = $post_type = $post_type_object = null;
	1352	+ if ( $post_id ) :
	1353	+ $post = get_post( $post_id );
	1354	+ endif;
	1355	+
	1356	+ if ( $post ) :
	1357	+ $post_type = $post->post_type;
	1358	+ endif;
	1359	+ $p = get_post($post_id);
	1360	+
	1361	+ if ( ! $post ) :
	1362	+ wp_die( __( 'The item you are trying to zap no longer exists.' ) );
	1363	+ endif;
	1364	+
	1365	+ if ( ! current_user_can( 'delete_post', $post_id ) ) :
	1366	+ wp_die( __( 'You are not allowed to zap this item.' ) );
	1367	+ endif;
	1368	+
	1369	+ if ( $user_id = wp_check_post_lock( $post_id ) ) :
	1370	+ $user = get_userdata( $user_id );
	1371	+ wp_die( sprintf( __( 'You cannot retire this item. %s is currently editing.' ), $user->display_name ) );
	1372	+ endif;
	1373	+
	1374	+ if (MyPHP::request('fwp_post_delete')=='zap') :
	1375	+ FeedWordPress::diagnostic('syndicated_posts', 'Zapping existing post # '.$p->ID.' "'.$p->post_title.'" due to user request.');
	1376	+
	1377	+ $old_status = $post->post_status;
	1378	+
	1379	+ set_post_field('post_status', 'fwpzapped', $post_id);
	1380	+ wp_transition_post_status('fwpzapped', $old_status, $post);
	1381	+
	1382	+ # Set up the post to have its content blanked on
	1383	+ # next update if you do not undo the zapping.
	1384	+ add_post_meta($post_id, '_feedwordpress_zapped_blank_me', 1, /*unique=*/ true);
	1385	+ add_post_meta($post_id, '_feedwordpress_zapped_blank_old_status', $old_status, /*unique=*/ true);
	1386	+
	1387	+ wp_redirect( esc_url_raw( add_query_arg( array('zapped' => 1, 'ids' => $post_id), $sendback ) ) );
	1388	+
	1389	+ else :
	1390	+ $old_status = get_post_meta($post_id, '_feedwordpress_zapped_blank_old_status', /*single=*/ true);
	1391	+
	1392	+ set_post_field('post_status', $old_status, $post_id);
	1393	+ wp_transition_post_status($old_status, 'fwpzapped', $post);
	1394	+
	1395	+ # O.K., make sure this post does not get blanked
	1396	+ delete_post_meta($post_id, '_feedwordpress_zapped_blank_me');
	1397	+ delete_post_meta($post_id, '_feedwordpress_zapped_blank_old_status');
	1398	+
	1399	+ wp_redirect( esc_url_raw( add_query_arg( array('unzapped' => 1, 'ids' => $post_id), $sendback ) ) );
	1400	+
	1401	+ endif;
	1402	+
	1403	+ // Intercept, don't pass on.
	1404	+ exit;
	1405	+ endif;
	1406	+ } /* FeedWordPress::admin_init() */
	1407	+
	1408	+ public function admin_api () {
	1409	+ // This sucks, but WordPress doesn't give us any other way to
	1410	+ // easily invoke a permanent-delete from a plugged in post
	1411	+ // actions link. So we create a magic parameter, and when this
	1412	+ // magic parameter is activated, the WordPress trashcan is
	1413	+ // temporarily de-activated.
	1414	+
	1415	+ if (MyPHP::request('fwp_post_delete')=='nuke') :
	1416	+ // Get post ID #
	1417	+ $post_id = MyPHP::request('post');
	1418	+ if (!$post_id) :
	1419	+ $post_id = MyPHP::request('post_ID');
	1420	+ endif;
	1421	+
	1422	+ // Make sure we've got the right nonce and all that.
	1423	+ check_admin_referer('delete-post_' . $post_id);
	1424	+
	1425	+ // If so, disable the trashcan.
	1426	+ define('EMPTY_TRASH_DAYS', 0);
	1427	+
	1428	+ elseif (MyPHP::request('fwp_post_delete')=='zap' OR MyPHP::request('fwp_post_delete') == 'unzap') :
	1429	+ // Get post ID #
	1430	+ $post_id = MyPHP::request('post');
	1431	+ if (!$post_id) :
	1432	+ $post_id = MyPHP::request('post_ID');
	1433	+ endif;
	1434	+
	1435	+ // Make sure we've got the right nonce and all that
	1436	+ check_admin_referer('delete-post_' . $post_id);
	1437	+
	1438	+ // If so, get ready to intercept the call a little
	1439	+ // further down the line.
	1440	+
	1441	+ define('FEEDWORDPRESS_PREPARE_TO_ZAP', $post_id);
	1442	+
	1443	+ endif;
	1444	+
	1445	+ } /* FeedWordPress::admin_api () */
	1446	+
	1447	+ public function all_admin_notices () {
	1448	+ if (MyPHP::request('zapped')) :
	1449	+ $n = intval(MyPHP::request('zapped'));
	1450	+?>
	1451	+<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>
	1452	+<?php
	1453	+ endif;
	1454	+
	1455	+ if (MyPHP::request('unzapped')) :
	1456	+ $n = intval(MyPHP::request('unzapped'));
	1457	+?>
	1458	+<div id="message" class="updated"><p><?php print $n; ?> syndicated item<?php print ($n!=1?'s':'') ?> un-zapped and restored to normal.</p></div>
	1459	+<?php
	1460	+ endif;
	1461	+ } /* FeedWordPress::all_admin_notices () */
1035	1462
1036		- function update_requested () {
1037		- return (
1038		- isset($_REQUEST['update_feedwordpress'])
1039		- and $_REQUEST['update_feedwordpress']
	1463	+ public function process_retirements ($delta) {
	1464	+ update_option('feedwordpress_process_zaps', 1);
	1465	+
	1466	+ return $delta;
	1467	+ }
	1468	+
	1469	+ public function feedwordpress_cleanup () {
	1470	+ if (get_option('feedwordpress_process_zaps', null)) :
	1471	+ $q = new WP_Query(array(
	1472	+ 'fields' => '_synfrom',
	1473	+ 'post_status' => 'fwpzapped',
	1474	+ 'ignore_sticky_posts' => true,
	1475	+ 'meta_key' => '_feedwordpress_zapped_blank_me',
	1476	+ 'meta_value' => 1,
	1477	+ ));
	1478	+
	1479	+ if ($q->have_posts()) :
	1480	+ foreach ($q->posts as $p) :
	1481	+
	1482	+ $post_id = $p->ID;
	1483	+ $revisions = wp_get_post_revisions($post_id, array("check_enabled" => false));
	1484	+
	1485	+ # Now nuke the content of the post & its revisions
	1486	+ set_post_field('post_content', '', $post_id);
	1487	+ set_post_field('post_excerpt', '', $post_id);
	1488	+
	1489	+ foreach ($revisions as $rev) :
	1490	+ set_post_field('post_content', '', $rev->ID);
	1491	+ set_post_field('post_excerpt', '', $rev->ID);
	1492	+ endforeach;
	1493	+
	1494	+ # Un-tag it for blanking.
	1495	+ delete_post_meta($p->ID, '_feedwordpress_zapped_blank_me');
	1496	+
	1497	+ # Don't remove old_status indicator. A later
	1498	+ # update from the feed may cause us to once
	1499	+ # again have some content so we can un-zap.
	1500	+
	1501	+ endforeach;
	1502	+ endif;
	1503	+
	1504	+ $q = new WP_Query(array(
	1505	+ 'fields' => '_synfrom',
	1506	+ 'post_status' => 'fwpzapped',
	1507	+ 'ignore_sticky_posts' => true,
	1508	+ 'meta_key' => '_feedwordpress_zapped_blank_me',
	1509	+ 'meta_value' => 2,
	1510	+ ));
	1511	+
	1512	+ if ($q->have_posts()) :
	1513	+ foreach ($q->posts as $p) :
	1514	+ update_post_meta($p->ID, '_feedwordpress_zapped_blank_me', 1);
	1515	+ endforeach;
	1516	+ endif;
	1517	+
	1518	+ update_option('feedwordpress_process_zaps', 0);
	1519	+ endif;
	1520	+ } /* FeedWordPress::feedwordpress_cleanup () */
	1521	+
	1522	+ public function init () {
	1523	+ global $fwp_path;
	1524	+
	1525	+ // If this is a FeedWordPress admin page, queue up scripts for AJAX
	1526	+ // functions that FWP uses. If it is a display page or a non-FWP admin
	1527	+ // page, don't.
	1528	+ wp_register_style('feedwordpress-elements', plugins_url( '/'.$fwp_path.'/feedwordpress-elements.css') );
	1529	+ if (FeedWordPressSettingsUI::is_admin()) :
	1530	+ // For JavaScript that needs to be generated dynamically
	1531	+ add_action('admin_print_scripts', array('FeedWordPressSettingsUI', 'admin_scripts'));
	1532	+
	1533	+ // For CSS that needs to be generated dynamically.
	1534	+ add_action('admin_print_styles', array('FeedWordPressSettingsUI', 'admin_styles'));
	1535	+
	1536	+ wp_enqueue_style('dashboard');
	1537	+ wp_enqueue_style('feedwordpress-elements');
	1538	+ endif;
	1539	+
	1540	+ // These are a special post statuses for hiding posts that have
	1541	+ // expired from the feed or been marked for permanent zapping by
	1542	+ // the FWP admin.
	1543	+ register_post_status('fwpretired', array(
	1544	+ 'label' => _x('Retired', 'post'),
	1545	+ 'label_count' => _n_noop('Retired <span class="count">(%s)</span>', 'Retired <span class="count">(%s)</span>'),
	1546	+ 'exclude_from_search' => true,
	1547	+ 'public' => false,
	1548	+ 'publicly_queryable' => false,
	1549	+ 'show_in_admin_all_list' => false,
	1550	+ 'show_in_admin_status_list' => true,
	1551	+ ));
	1552	+ register_post_status('fwpzapped', array(
	1553	+ 'label' => _x('Zapped', 'post'),
	1554	+ 'label_count' => _n_noop('Zapped <span class="count">(%s)</span>', 'Retired <span class="count">(%s)</span>'),
	1555	+ 'exclude_from_search' => true,
	1556	+ 'public' => false,
	1557	+ 'publicly_queryable' => false,
	1558	+ 'show_in_admin_all_list' => false,
	1559	+ 'show_in_admin_status_list' => true,
	1560	+ ));
	1561	+ add_action(
	1562	+ /*hook=*/ 'template_redirect',
	1563	+ /*function=*/ array($this, 'redirect_retired'),
	1564	+ /*priority=*/ -100
1040	1565	);
1041		- } // FeedWordPress::update_requested()
1042	1566
1043		- function update_requested_url () {
1044		- $ret = null;
	1567	+ add_action('wp_ajax_fwp_feeds', array($this, 'fwp_feeds'));
	1568	+ add_action('wp_ajax_fwp_feedcontents', array($this, 'fwp_feedcontents'));
	1569	+ add_action('wp_ajax_fwp_xpathtest', array($this, 'fwp_xpathtest'));
	1570	+
	1571	+ } /* FeedWordPress::init() */
	1572	+
	1573	+ /**
	1574	+ * FeedWordPress::wp_loaded (): Once all plugin and theme modules have been
	1575	+ * loaded and initialized (by actions on the init hook, etc.), check the HTTP
	1576	+ * request to see if we need to perform any special FeedWordPress-related
	1577	+ * actions.
	1578	+ *
	1579	+ * @since 2016.0614
	1580	+ */
	1581	+ public function wp_loaded () {
	1582	+ $this->clear_cache_magic_url();
	1583	+ $this->update_magic_url();
	1584	+ } /* FeedWordPress::wp_loaded () */
	1585	+
	1586	+ /**
	1587	+ * FeedWordPress::cron_schedules(): Filter hook to add WP-Cron schedules
	1588	+ * that plugins like FeedWordPress can use to carry out scheduled events.
	1589	+ *
	1590	+ * @param array $schedules An associative array containing the current set of cron schedules (hourly, daily, etc.)
	1591	+ * @return array The same array, with a new entry ('fwp_checkin_interval') added to the list.
	1592	+ *
	1593	+ * @since 2017.1021
	1594	+ */
	1595	+ public function cron_schedules ($schedules) {
	1596	+ $interval = FEEDWORDPRESS_DEFAULT_CHECKIN_INTERVAL*60 /*sec/min*/;
	1597	+
	1598	+ // add 'fwp_checkin_interval' to the existing set
	1599	+ $schedules['fwp_checkin_interval'] = array(
	1600	+ 'interval' => $interval,
	1601	+ 'display' => 'FeedWordPress update schedule check-in',
	1602	+ );
	1603	+
	1604	+ return $schedules;
	1605	+ } /* FeedWordPress::cron_schedules () */
	1606	+
	1607	+ public function fwp_feeds () {
	1608	+ $feeds = array();
	1609	+ $feed_ids = $this->feeds;
	1610	+
	1611	+ foreach ($feed_ids as $id) :
	1612	+ $sub = $this->subscription($id);
	1613	+ $feeds[] = array(
	1614	+ "id" => $id,
	1615	+ "url" => $sub->uri(),
	1616	+ "name" => $sub->name(/*fromFeed=*/ false),
	1617	+ );
	1618	+ endforeach;
	1619	+
	1620	+ header("Content-Type: application/json");
	1621	+ echo json_encode($feeds);
	1622	+ exit;
	1623	+ } /* FeedWordPress::fwp_feeds () */
	1624	+
	1625	+ public function fwp_feedcontents () {
	1626	+ $feed_id = MyPHP::request('feed_id');
	1627	+
	1628	+ // Let's load up some data from the feed . . .
	1629	+ $feed = $this->subscription($feed_id);
	1630	+ $posts = $feed->live_posts();
	1631	+
	1632	+ if (is_wp_error($posts)) :
	1633	+ header("HTTP/1.1 502 Bad Gateway");
	1634	+ $result = $posts;
	1635	+ else :
	1636	+ $result = array();
	1637	+
	1638	+ foreach ($posts as $post) :
	1639	+ $p = new SyndicatedPost($post, $feed);
	1640	+
	1641	+ $result[] = array(
	1642	+ "post_title" => $p->entry->get_title(),
	1643	+ "post_link" => $p->permalink(),
	1644	+ "guid" => $p->guid(),
	1645	+ "post_date" => $p->published(),
	1646	+ );
	1647	+ endforeach;
	1648	+ endif;
	1649	+
	1650	+ header("Content-Type: application/json");
	1651	+
	1652	+ echo json_encode($result);
	1653	+
	1654	+ // This is an AJAX request, so close it out thus.
	1655	+ die;
	1656	+ } /* FeedWordPress::fwp_feedcontents () */
	1657	+
	1658	+ public function fwp_xpathtest () {
	1659	+ $xpath = MyPHP::request('xpath');
	1660	+ $feed_id = MyPHP::request('feed_id');
	1661	+ $post_id = MyPHP::request('post_id');
	1662	+
	1663	+ $expr = new FeedWordPressParsedPostMeta($xpath);
	1664	+
	1665	+ // Let's load up some data from the feed . . .
	1666	+ $feed = $this->subscription($feed_id);
	1667	+ $posts = $feed->live_posts();
	1668	+
	1669	+ if (!is_wp_error($posts)) :
	1670	+ if (strlen($post_id) == 0) :
	1671	+ $post = $posts[0];
	1672	+ else :
	1673	+ $post = null;
	1674	+
	1675	+ foreach ($posts as $p) :
	1676	+ if ($p->get_id() == $post_id) :
	1677	+ $post = $p;
	1678	+ endif;
	1679	+ endforeach;
	1680	+ endif;
	1681	+
	1682	+ $post = new SyndicatedPost($post, $feed);
	1683	+ $meta = $expr->do_substitutions($post);
	1684	+
	1685	+ $result = array(
	1686	+ "post_title" => $post->entry->get_title(),
	1687	+ "post_link" => $post->permalink(),
	1688	+ "guid" => $post->guid(),
	1689	+ "expression" => $xpath,
	1690	+ "results" => $meta
	1691	+ );
	1692	+ else :
	1693	+ $result = array(
	1694	+ "expression" => $xpath,
	1695	+ "feed_id" => $feed_id,
	1696	+ "post_id" => $post_id,
	1697	+ "results" => $posts
	1698	+ );
	1699	+
	1700	+ header("HTTP/1.1 503 Bad Gateway");
	1701	+ endif;
	1702	+
	1703	+ header("Content-Type: application/json");
	1704	+
	1705	+ echo json_encode($result);
	1706	+
	1707	+ // This is an AJAX request, so close it out thus.
	1708	+ die;
	1709	+ } /* FeedWordPress::fwp_xpathtest () */
	1710	+
	1711	+ public function redirect_retired () {
	1712	+ global $wp_query;
	1713	+ if (is_singular()) :
	1714	+ if (
	1715	+ 'fwpretired'==$wp_query->post->post_status
	1716	+ or 'fwpzapped'==$wp_query->post->post_status
	1717	+ ) :
	1718	+ do_action('feedwordpress_redirect_retired', $wp_query->post);
	1719	+
	1720	+ if (!($template = get_404_template())) :
	1721	+ $template = get_index_template();
	1722	+ endif;
	1723	+ if ($template = apply_filters('template_include', $template)) :
	1724	+ header("HTTP/1.1 410 Gone");
	1725	+ include($template);
	1726	+ endif;
	1727	+ exit;
	1728	+ endif;
	1729	+ endif;
	1730	+ } /* FeedWordPress::redirect_retired () */
	1731	+
	1732	+ public function row_actions ($actions, $post) {
	1733	+ if (is_syndicated($post->ID) && current_user_can('edit_post', $post->ID)) :
	1734	+ $link = get_delete_post_link($post->ID, '', true);
	1735	+ $eraseLink = MyPHP::url($link, array("fwp_post_delete" => "nuke"));
	1736	+
	1737	+ $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).'));
	1738	+ $linktext = apply_filters('feedwordpress_ui_erase_link_text', __('Erase/Resyndicate'));
1045	1739
1046		- if (($_REQUEST['update_feedwordpress']=='*')
1047		- or (preg_match('|^http://.*|i', $_REQUEST['update_feedwordpress']))) :
1048		- $ret = $_REQUEST['update_feedwordpress'];
	1740	+ $retireClass = NULL;
	1741	+ if ($post->post_status == 'fwpzapped') :
	1742	+ if (count(get_post_meta($post->ID, '_feedwordpress_zapped_blank_me')) > 0) :
	1743	+ $retireCap = 'Un-Zap this syndicated post (so it will appear on the site again)';
	1744	+ $retireText = 'Un-Zap &amp; Restore';
	1745	+ $retireLink = MyPHP::url($link, array("fwp_post_delete" => "unzap"));
	1746	+ else :
	1747	+ // No Un-Zap link for posts that have
	1748	+ // been blanked. You'll just have to
	1749	+ // Erase and hope you can resyndicate...
	1750	+ $retireLink = NULL;
	1751	+ endif;
	1752	+ else :
	1753	+ $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).'));
	1754	+ $retireText = apply_filters('feedwordpress_ui_zap_link_text', __('Zap/Don&#8217;t Resyndicate'));
	1755	+ $retireLink = MyPHP::url($link, array("fwp_post_delete" => "zap"));
	1756	+ $retireClass = 'submitdelete';
1049	1757	endif;
	1758	+
	1759	+ $keys = array_keys($actions);
	1760	+ $links = array();
	1761	+ foreach ($keys as $key) :
	1762	+ $links[$key] = $actions[$key];
1050	1763
1051		- return $ret;
1052		- } // FeedWordPress::update_requested_url()
	1764	+ if ('trash'==$key) :
	1765	+ #$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>";
1053	1766
1054		- function syndicate_link ($name, $uri, $rss) {
	1767	+ // Placeholder.
	1768	+ if (!is_null($retireLink)) :
	1769	+ $links['zap trash'] = '';
	1770	+ endif;
	1771	+ $links['delete'] = '';
	1772	+ endif;
	1773	+ endforeach;
	1774	+
	1775	+ if (!is_null($retireLink)) :
	1776	+ $links['zap trash'] = '<a class="'.esc_attr($retireClass).'" title="'.esc_attr(__($retireCap)).'" href="' . $retireLink . '">' . __($retireText) . '</a>';
	1777	+ endif;
	1778	+ $links['delete'] = '<a class="submitdelete" title="'.esc_attr(__($caption)).'" href="' . $eraseLink . '">' . __($linktext) . '</a>';
	1779	+
	1780	+ $actions = $links;
	1781	+ endif;
	1782	+ return $actions;
	1783	+ } /* FeedWordPress::row_actions () */
	1784	+
	1785	+ public function dashboard_setup () {
	1786	+ $see_it = FeedWordPress::menu_cap();
	1787	+
	1788	+ if (current_user_can($see_it)) :
	1789	+ // Get the stylesheet
	1790	+ wp_enqueue_style('feedwordpress-elements');
	1791	+
	1792	+ $widget_id = 'feedwordpress_dashboard';
	1793	+ $widget_name = __('Syndicated Sources');
	1794	+ $column = 'side';
	1795	+ $priority = 'core';
	1796	+
	1797	+ // I would love to use wp_add_dashboard_widget() here and save
	1798	+ // myself some trouble. But WP 3 does not yet have any way to
	1799	+ // push a dashboard widget onto the side, or to give it a default
	1800	+ // location.
	1801	+ add_meta_box(
	1802	+ /*id=*/ $widget_id,
	1803	+ /*title=*/ $widget_name,
	1804	+ /*callback=*/ array($this, 'dashboard'),
	1805	+ /*page=*/ 'dashboard',
	1806	+ /*context=*/ $column,
	1807	+ /*priority=*/ $priority
	1808	+ );
	1809	+ /*control_callback= array($this, 'dashboard_control') */
	1810	+
	1811	+ // This is kind of rude, I know, but the dashboard widget isn't
	1812	+ // worth much if users don't know that it exists, and I don't
	1813	+ // know of any better way to reorder the boxen.
	1814	+ //
	1815	+ // Gleefully ripped off of codex.wordpress.org/Dashboard_Widgets_API
	1816	+
	1817	+ // Globalize the metaboxes array, this holds all the widgets for wp-admin
	1818	+ global $wp_meta_boxes;
	1819	+
	1820	+ // Get the regular dashboard widgets array
	1821	+ // (which has our new widget already but at the end)
	1822	+
	1823	+ $normal_dashboard = $wp_meta_boxes['dashboard'][$column][$priority];
	1824	+
	1825	+ // Backup and delete our new dashbaord widget from the end of the array
	1826	+ if (isset($normal_dashboard[$widget_id])) :
	1827	+ $backup = array();
	1828	+ $backup[$widget_id] = $normal_dashboard[$widget_id];
	1829	+ unset($normal_dashboard[$widget_id]);
	1830	+
	1831	+ // Merge the two arrays together so our widget is at the
	1832	+ // beginning
	1833	+ $sorted_dashboard = array_merge($backup, $normal_dashboard);
	1834	+
	1835	+ // Save the sorted array back into the original metaboxes
	1836	+ $wp_meta_boxes['dashboard'][$column][$priority] = $sorted_dashboard;
	1837	+ endif;
	1838	+ endif;
	1839	+ } /* FeedWordPress::dashboard_setup () */
	1840	+
	1841	+ public function dashboard () {
	1842	+ $syndicationPage = new FeedWordPressSyndicationPage(dirname(__FILE__).'/syndication.php');
	1843	+ $syndicationPage->dashboard_box($syndicationPage);
	1844	+ } /* FeedWordPress::dashboard () */
	1845	+
	1846	+ public function user_can_richedit ($rich_edit) {
	1847	+
	1848	+ $post = new FeedWordPressLocalPost;
	1849	+
	1850	+ if (!$post->is_exposed_to_formatting_filters()) :
	1851	+ // Disable visual editor and only allow operations
	1852	+ // directly on HTML if post is bypassing fmt filters
	1853	+ # $rich_edit = false;
	1854	+ endif;
	1855	+
	1856	+ return $rich_edit;
	1857	+
	1858	+ } /* FeedWordPress::user_can_richedit () */
	1859	+
	1860	+ public function clear_cache_magic_url () {
	1861	+ if ($this->clear_cache_requested()) :
	1862	+ $this->clear_cache();
	1863	+ endif;
	1864	+ } /* FeedWordPress::clear_cache_magic_url() */
	1865	+
	1866	+ public function clear_cache_requested () {
	1867	+ return MyPHP::request('clear_cache');
	1868	+ } /* FeedWordPress::clear_cache_requested() */
	1869	+
	1870	+ public function update_magic_url () {
1055	1871	global $wpdb;
1056	1872
	1873	+ // Explicit update request in the HTTP request (e.g. from a cron job)
	1874	+ if (self::update_requested()) :
	1875	+ /*DBG*/ header("Content-Type: text/plain");
	1876	+
	1877	+ $this->update_hooked = "Initiating a CRON JOB CHECK-IN ON UPDATE SCHEDULE due to URL parameter = ".trim($this->val($_REQUEST['update_feedwordpress']));
	1878	+
	1879	+ $this->update($this->update_requested_url());
	1880	+
	1881	+ if (FEEDWORDPRESS_DEBUG and count($wpdb->queries) > 0) :
	1882	+ $mysqlTime = 0.0;
	1883	+ $byTime = array();
	1884	+ foreach ($wpdb->queries as $query) :
	1885	+ $time = $query[1] * 1000000.0;
	1886	+ $mysqlTime += $query[1];
	1887	+ if (!isset($byTime[$time])) : $byTime[$time] = array(); endif;
	1888	+ $byTime[$time][] = $query[0]. ' // STACK: ' . $query[2];
	1889	+ endforeach;
	1890	+ krsort($byTime);
	1891	+
	1892	+ foreach ($byTime as $time => $querySet) :
	1893	+ foreach ($querySet as $query) :
	1894	+ print "[".(sprintf('%4.4f', $time/1000.0)) . "ms] $query\n";
	1895	+ endforeach;
	1896	+ endforeach;
	1897	+ echo self::log_prefix()."$wpdb->num_queries queries. $mysqlTime seconds in MySQL. Total of "; timer_stop(1); print " seconds.";
	1898	+ endif;
	1899	+
	1900	+ debug_out_feedwordpress_footer();
	1901	+
	1902	+ // Magic URL should return nothing but a 200 OK header packet
	1903	+ // when successful.
	1904	+ exit;
	1905	+ endif;
	1906	+ } /* FeedWordPress::update_magic_url () */
	1907	+
	1908	+ public static function update_requested () {
	1909	+ return MyPHP::request('update_feedwordpress');
	1910	+ } /* FeedWordPress::update_requested() */
	1911	+
	1912	+ public function update_requested_url () {
	1913	+ $ret = null;
	1914	+
	1915	+ if (($_REQUEST['update_feedwordpress']=='*')
	1916	+ or (preg_match('|^[a-z]+://.*|i', $_REQUEST['update_feedwordpress']))) :
	1917	+ $ret = $_REQUEST['update_feedwordpress'];
	1918	+ endif;
	1919	+
	1920	+ return $ret;
	1921	+ } /* FeedWordPress::update_requested_url() */
	1922	+
	1923	+ public function auto_update () {
	1924	+ if ($this->stale()) :
	1925	+ $this->update();
	1926	+ endif;
	1927	+ } /* FeedWordPress::auto_update () */
	1928	+
	1929	+ public static function find_link ($uri, $field = 'link_rss') {
	1930	+ global $wpdb;
	1931	+
	1932	+ $unslashed = untrailingslashit($uri);
	1933	+ $slashed = trailingslashit($uri);
	1934	+ $link_id = $wpdb->get_var($wpdb->prepare("
	1935	+ SELECT link_id FROM $wpdb->links WHERE $field IN ('%s', '%s')
	1936	+ LIMIT 1", $unslashed, $slashed
	1937	+ ));
	1938	+
	1939	+ return $link_id;
	1940	+ } /* FeedWordPress::find_link () */
	1941	+
	1942	+ /**
	1943	+ * FeedWordPress:syndicate_link(): add or update a feed subscription
	1944	+ *
	1945	+ * Add a new subscription to, or update an existing subscription in,
	1946	+ * FWP's list of subscribed feeds.
	1947	+ *
	1948	+ * Postcondition: If $rss is the URL of a feed not yet on FWP's list of
	1949	+ * subscribed feeds, then a new subscription will be added, using $name
	1950	+ * as its initial title and $uri as its initial homepage URL (normally
	1951	+ * these will be updated with new values taken from the feed, the first
	1952	+ * time the new feed is checked for syndicated content, unless feed
	1953	+ * settings prevent this). If $rss is the URL of a feed that is already
	1954	+ * on FWP's list of subscribed feeds, then that feed will be updated to
	1955	+ * use the title provided in $name and the homepage URL in $uri
	1956	+ *
	1957	+ * @param string $name The human-readable title of the feed (for example, "Rad Geek People's Daily")
	1958	+ * @param string $uri The URI for the human-readable homepage associated with the feed (for example, <http://radgeek.com/>)
	1959	+ * @param string $rss The URI for the feed itself (for example, <http://radgeek.com/feed/>)
	1960	+ *
	1961	+ * @return mixed Returns an int with the numeric ID of the new
	1962	+ * subscription's wp_links record if successful or a WP_Error object
	1963	+ * if wp_insert_link() failed.
	1964	+ *
	1965	+ * @uses FeedWordPress::link_category_id()
	1966	+ * @uses FeedWordPress::find_link()
	1967	+ * @uses is_wp_error()
	1968	+ * @uses wp_insert_link()
	1969	+ *
	1970	+ */
	1971	+ public static function syndicate_link ($name, $uri, $rss) {
1057	1972	// Get the category ID#
1058	1973	$cat_id = FeedWordPress::link_category_id();
1059		-
	1974	+ if (!is_wp_error($cat_id)) :
	1975	+ $link_category = array($cat_id);
	1976	+ else :
	1977	+ $link_category = array();
	1978	+ endif;
	1979	+
1060	1980	// WordPress gets cranky if there's no homepage URI
1061		- if (!isset($uri) or strlen($uri)<1) : $uri = $rss; endif;
1062		-
1063		- if (function_exists('wp_insert_link')) : // WordPress 2.x
1064		- if (FeedWordPressCompatibility::test_version(0, FWP_SCHEMA_21)) :
1065		- // Morons.
1066		- $name = $wpdb->escape($name);
1067		- $uri = $wpdb->escape($uri);
1068		- $rss = $wpdb->escape($rss);
1069		-
1070		- // Comes in as a single category
1071		- $linkCats = $cat_id;
1072		- else :
1073		- // Comes in as an array of categories
1074		- $linkCats = array($cat_id);
1075		- endif;
	1981	+ if (!is_string($uri) or strlen($uri)<1) : $uri = $rss; endif;
1076	1982
1077		- $link_id = wp_insert_link(array(
1078		- "link_name" => $name,
1079		- "link_url" => $uri,
1080		- "link_category" => $linkCats,
1081		- "link_rss" => $rss
1082		- ));
1083		- else : // WordPress 1.5.x
1084		- $result = $wpdb->query("
1085		- INSERT INTO $wpdb->links
1086		- SET
1087		- link_name = '".$wpdb->escape($name)."',
1088		- link_url = '".$wpdb->escape($uri)."',
1089		- link_category = '".$wpdb->escape($cat_id)."',
1090		- link_rss = '".$wpdb->escape($rss)."'
1091		- ");
1092		- $link_id = $wpdb->insert_id;
1093		- endif;
	1983	+ // Check if this feed URL is already being syndicated.
	1984	+ $link_id = wp_insert_link(/*linkdata=*/ array(
	1985	+ "link_id" => FeedWordPress::find_link($rss), // insert if nothing was found; else update
	1986	+ "link_rss" => $rss,
	1987	+ "link_name" => $name,
	1988	+ "link_url" => $uri,
	1989	+ "link_category" => $link_category,
	1990	+ "link_visible" => 'Y', // reactivate if inactivated
	1991	+ ), /*wp_error=*/ true);
	1992	+
1094	1993	return $link_id;
1095		- } // function FeedWordPress::syndicate_link()
	1994	+ } /* function FeedWordPress::syndicate_link() */
1096	1995
1097		- /*static*/ function syndicated_status ($what, $default) {
	1996	+ static function syndicated_status ($what, $default) {
1098	1997	$ret = get_option("feedwordpress_syndicated_{$what}_status");
1099	1998	if (!$ret) :
1100	1999	$ret = $default;
1101	2000	endif;
		@@ -1101,31 +2000,19 @@
1101	2000	endif;
1102	2001	return $ret;
1103	2002	} /* FeedWordPress::syndicated_status() */
1104	2003
1105		- function on_unfamiliar ($what = 'author', $override = NULL) {
1106		- $set = array(
1107		- 'author' => array('create', 'default', 'filter'),
1108		- 'category' => array('create', 'tag', 'default', 'filter'),
1109		- );
1110		-
1111		- if (is_string($override)) :
1112		- $ret = strtolower($override);
1113		- else :
1114		- $ret = NULL;
1115		- endif;
	2004	+ public static function on_unfamiliar ($what = 'author') {
	2005	+ switch ($what) :
	2006	+ case 'category' : $suffix = ':category'; break;
	2007	+ case 'post_tag' : $suffix = ':post_tag'; break;
	2008	+ default: $suffix = '';
	2009	+ endswitch;
1116	2010
1117		- if (!is_numeric($override) and !in_array($ret, $set[$what])) :
1118		- $ret = get_option('feedwordpress_unfamiliar_'.$what);
1119		- if (!is_numeric($ret) and !in_array($ret, $set[$what])) :
1120		- $ret = 'create';
1121		- endif;
1122		- endif;
1123		-
1124		- return $ret;
	2011	+ return get_option('feedwordpress_unfamiliar_'.$what, 'create'.$suffix);
1125	2012	} // function FeedWordPress::on_unfamiliar()
1126	2013
1127		- function null_email_set () {
	2014	+ public static function null_email_set () {
1128	2015	$base = get_option('feedwordpress_null_email_set');
1129	2016
1130	2017	if ($base===false) :
1131	2018	$ret = array('noreply@blogger.com'); // default
		@@ -1137,34 +2024,49 @@
1137	2024	return $ret;
1138	2025
1139	2026	} /* FeedWordPress::null_email_set () */
1140	2027
1141		- function is_null_email ($email) {
	2028	+ public static function is_null_email ($email) {
1142	2029	$ret = in_array(strtolower(trim($email)), FeedWordPress::null_email_set());
1143	2030	$ret = apply_filters('syndicated_item_author_is_null_email', $ret, $email);
1144	2031	return $ret;
1145	2032	} /* FeedWordPress::is_null_email () */
1146	2033
1147		- function use_aggregator_source_data () {
	2034	+ public static function use_aggregator_source_data () {
1148	2035	$ret = get_option('feedwordpress_use_aggregator_source_data');
1149	2036	return apply_filters('syndicated_post_use_aggregator_source_data', ($ret=='yes'));
1150		- }
	2037	+ } /* FeedWordPress::use_aggregator_source_data () */
1151	2038
1152		- function syndicated_links () {
	2039	+ /**
	2040	+ * FeedWordPress::munge_permalinks: check whether or not FeedWordPress
	2041	+ * should rewrite permalinks for syndicated items to reflect their
	2042	+ * original location.
	2043	+ *
	2044	+ * @return bool TRUE if FeedWordPress SHOULD rewrite permalinks; FALSE otherwise
	2045	+ */
	2046	+ static function munge_permalinks () {
	2047	+ return (get_option('feedwordpress_munge_permalink', /*default=*/ 'yes') != 'no');
	2048	+ } /* FeedWordPress::munge_permalinks() */
	2049	+
	2050	+ public static function syndicated_links ($args = array()) {
1153	2051	$contributors = FeedWordPress::link_category_id();
1154		- if (function_exists('get_bookmarks')) :
1155		- $links = get_bookmarks(array("category" => $contributors));
1156		- else:
1157		- $links = get_linkobjects($contributors); // deprecated as of WP 2.1
	2052	+ if (!is_wp_error($contributors)) :
	2053	+ $links = get_bookmarks(array_merge(
	2054	+ array("category" => $contributors),
	2055	+ $args
	2056	+ ));
	2057	+ else :
	2058	+ $links = array();
1158	2059	endif;
	2060	+
1159	2061	return $links;
1160		- } // function FeedWordPress::syndicated_links()
	2062	+ } /* FeedWordPress::syndicated_links() */
1161	2063
1162		- function link_category_id () {
	2064	+ public static function link_category_id () {
1163	2065	global $wpdb, $wp_db_version;
1164	2066
1165	2067	$cat_id = get_option('feedwordpress_cat_id');
1166		-
	2068	+
1167	2069	// If we don't yet have the category ID stored, search by name
1168	2070	if (!$cat_id) :
1169	2071	$cat_id = FeedWordPressCompatibility::link_category_id(DEFAULT_SYNDICATION_CATEGORY);
1170	2072
		@@ -1176,115 +2078,98 @@
1176	2078	// If we *do* have the category ID stored, verify that it exists
1177	2079	else :
1178	2080	$cat_id = FeedWordPressCompatibility::link_category_id((int) $cat_id, 'cat_id');
1179	2081	endif;
1180		-
	2082	+
1181	2083	// If we could not find an appropriate link category,
1182	2084	// make a new one for ourselves.
1183	2085	if (!$cat_id) :
1184	2086	$cat_id = FeedWordPressCompatibility::insert_link_category(DEFAULT_SYNDICATION_CATEGORY);
1185		-
1186		- // Stamp it
1187		- update_option('feedwordpress_cat_id', $cat_id);
	2087	+ if (!is_wp_error($cat_id)) :
	2088	+ // Stamp it
	2089	+ update_option('feedwordpress_cat_id', $cat_id);
	2090	+ endif;
1188	2091	endif;
1189	2092
1190	2093	return $cat_id;
1191		- } // function FeedWordPress::link_category_id()
	2094	+ } /* FeedWordPress::link_category_id() */
1192	2095
1193	2096	# Upgrades and maintenance...
1194		- function needs_upgrade () {
	2097	+ static function needs_upgrade () {
	2098	+
1195	2099	global $wpdb;
1196		- $fwp_db_version = get_option('feedwordpress_version');
	2100	+ $fwp_db_version = get_option('feedwordpress_version', NULL);
1197	2101	$ret = false; // innocent until proven guilty
1198		- if (!$fwp_db_version or $fwp_db_version < FEEDWORDPRESS_VERSION) :
1199		- // This is an older version or a fresh install. Does it
1200		- // require a database upgrade or database initialization?
1201		- if ($fwp_db_version <= 0.96) :
1202		- // Yes. Check to see whether this is a fresh install or an upgrade.
1203		- $syn = $wpdb->get_col("
1204		- SELECT post_id
1205		- FROM $wpdb->postmeta
1206		- WHERE meta_key = 'syndication_feed'
1207		- ");
1208		- if (count($syn) > 0) : // contains at least one syndicated post
1209		- $ret = true;
1210		- else : // fresh install; brand it as ours
1211		- update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
	2102	+ if (is_null($fwp_db_version) or ($fwp_db_version < FEEDWORDPRESS_VERSION)) :
	2103	+
	2104	+ // This is an older version or a fresh install. Does it require a database
	2105	+ // upgrade or database initialization?
	2106	+
	2107	+ if (is_null($fwp_db_version)) :
	2108	+
	2109	+ // Fresh install; brand it as ours. Or possibly a version of FWP
	2110	+ // from before 0.96. But I'm no longer supporting upgrade paths
	2111	+ // for versions from the previous decade. Sorry.
	2112	+ update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
	2113	+
	2114	+ elseif ($fwp_db_version < 2010.0814) :
	2115	+
	2116	+ // Change in terminology.
	2117	+ if (get_option('feedwordpress_unfamiliar_category', 'create')=='default') :
	2118	+ update_option('feedwordpress_unfamiliar_category', 'null');
1212	2119	endif;
1213		- elseif ($fwp_db_version < 2009.0707) :
1214		- // We need to clear out any busted AJAX crap
1215		- if (fwp_test_wp_version(FWP_SCHEMA_HAS_USERMETA)) :
1216		- $wpdb->query("
1217		- DELETE FROM $wpdb->usermeta
1218		- WHERE LOCATE('feedwordpress', meta_key)
1219		- AND LOCATE('box', meta_key);
1220		- ");
1221		- endif;
	2120	+ foreach (FeedWordPress::syndicated_links() as $link) :
	2121	+ $sub = new SyndicatedLink($link);
	2122	+
	2123	+ $remap_uf = array(
	2124	+ 'default' => 'null',
	2125	+ 'filter' => 'null',
	2126	+ 'create' => 'create:category',
	2127	+ 'tag' => 'create:post_tag'
	2128	+ );
	2129	+ if (isset($sub->settings['unfamiliar category'])) :
	2130	+ if ($sub->settings['unfamiliar category']=='filter') :
	2131	+ $sub->settings['match/filter'] = array('category');
	2132	+ endif;
	2133	+ foreach ($remap_uf as $from => $to) :
	2134	+ if ($sub->settings['unfamiliar category']==$from) :
	2135	+ $sub->settings['unfamiliar category'] = $to;
	2136	+ endif;
	2137	+ endforeach;
	2138	+ endif;
	2139	+
	2140	+ if (isset($sub->settings['add global categories'])) :
	2141	+ $sub->settings['add/category'] = $sub->settings['add global categories'];
	2142	+ unset($sub->settings['add global categories']);
	2143	+ endif;
	2144	+
	2145	+ $sub->save_settings(/*reload=*/ true);
	2146	+ endforeach;
1222	2147	update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
	2148	+
1223	2149	else :
1224		- // No. Just brand it with the new version.
	2150	+
	2151	+ // No upgrade needed. Just brand it with the new version.
1225	2152	update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
	2153	+
1226	2154	endif;
	2155	+
1227	2156	endif;
1228	2157	return $ret;
1229		- }
	2158	+ } /* FeedWordPress::needs_upgrade () */
1230	2159
1231		- function upgrade_database ($from = NULL) {
	2160	+ static function upgrade_database ($from = NULL) {
1232	2161	global $wpdb;
1233	2162
1234	2163	if (is_null($from) or $from <= 0.96) : $from = 0.96; endif;
1235	2164
1236	2165	switch ($from) :
1237		- case 0.96: // account for changes to syndication custom values and guid
1238		- echo "<p>Upgrading database from {$from} to ".FEEDWORDPRESS_VERSION."...</p>\n";
	2166	+ case 0.96:
	2167	+ // Dropping legacy upgrade code. If anyone is still
	2168	+ // using 0.96 and just now decided to upgrade, well, I'm
	2169	+ // sorry about that. You'll just have to cope with a few
	2170	+ // duplicate posts.
1239	2171
1240		- $cat_id = FeedWordPress::link_category_id();
1241		-
1242		- // Avoid duplicates
1243		- $wpdb->query("DELETE FROM `{$wpdb->postmeta}` WHERE meta_key = 'syndication_feed_id'");
1244		-
1245		- // Look up all the link IDs
1246		- $wpdb->query("
1247		- CREATE TEMPORARY TABLE tmp_custom_values
1248		- SELECT
1249		- NULL AS meta_id,
1250		- post_id,
1251		- 'syndication_feed_id' AS meta_key,
1252		- link_id AS meta_value
1253		- FROM `{$wpdb->postmeta}`, `{$wpdb->links}`
1254		- WHERE
1255		- meta_key='syndication_feed'
1256		- AND meta_value=link_rss
1257		- AND link_category = {$cat_id}
1258		- ");
1259		-
1260		- // Now attach them to their posts
1261		- $wpdb->query("INSERT INTO `{$wpdb->postmeta}` SELECT * FROM tmp_custom_values");
1262		-
1263		- // And clean up after ourselves.
1264		- $wpdb->query("DROP TABLE tmp_custom_values");
1265		-
1266		- // Now fix the guids to avoid duplicate posts
1267		- echo "<ul>";
1268		- foreach ($this->feeds as $syndicatedLink) :
1269		- $feed = $syndicatedLink->settings;
1270		- echo "<li>Fixing post meta-data for <cite>".$feed['link/name']."</cite> &#8230; "; flush();
1271		- $rss = @fetch_rss($feed['link/uri']);
1272		- if (is_array($rss->items)) :
1273		- foreach ($rss->items as $item) :
1274		- $post = new SyndicatedPost($item, $syndicatedLink);
1275		- $guid = $wpdb->escape($post->guid()); // new GUID algorithm
1276		- $link = $wpdb->escape($item['link']);
1277		-
1278		- $wpdb->query("
1279		- UPDATE `{$wpdb->posts}` SET guid='{$guid}' WHERE guid='{$link}'
1280		- ");
1281		- endforeach;
1282		- endif;
1283		- echo "<strong>complete.</strong></li>\n";
1284		- endforeach;
1285		- echo "</ul>\n";
1286		-
1287	2172	// Mark the upgrade as successful.
1288	2173	update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
1289	2174	endswitch;
1290	2175	echo "<p>Upgrade complete. FeedWordPress is now ready to use again.</p>";
		@@ -1289,107 +2174,444 @@
1289	2174	endswitch;
1290	2175	echo "<p>Upgrade complete. FeedWordPress is now ready to use again.</p>";
1291	2176	} /* FeedWordPress::upgrade_database() */
1292	2177
1293		- function create_guid_index () {
	2178	+ public static function has_guid_index () {
1294	2179	global $wpdb;
1295		-
	2180	+
	2181	+ $found = false; // Guilty until proven innocent.
	2182	+
	2183	+ $results = $wpdb->get_results("
	2184	+ SHOW INDEXES FROM {$wpdb->posts}
	2185	+ ");
	2186	+ if ($results) :
	2187	+ foreach ($results as $index) :
	2188	+ if (isset($index->Column_name)
	2189	+ and ('guid' == $index->Column_name)) :
	2190	+ $found = true;
	2191	+ endif;
	2192	+ endforeach;
	2193	+ endif;
	2194	+ return $found;
	2195	+ } /* FeedWordPress::has_guid_index () */
	2196	+
	2197	+ public static function create_guid_index () {
	2198	+ global $wpdb;
	2199	+
1296	2200	$wpdb->query("
1297	2201	CREATE INDEX {$wpdb->posts}_guid_idx ON {$wpdb->posts}(guid)
1298	2202	");
1299	2203	} /* FeedWordPress::create_guid_index () */
1300		-
1301		- function clear_cache () {
	2204	+
	2205	+ public static function remove_guid_index () {
1302	2206	global $wpdb;
1303		-
1304		- // MagpieRSS stores its cached feeds in options table rows with
1305		- // name = `rss_{md5 of url}` and timestamps for cached feeds in
1306		- // table rows with name = `rss_{md5 of url}_ts`. The md5 is
1307		- // always 32 characters in length, so the total option_name is
1308		- // always over 32 characters.
	2207	+
1309	2208	$wpdb->query("
	2209	+ DROP INDEX {$wpdb->posts}_guid_idx ON {$wpdb->posts}
	2210	+ ");
	2211	+ }
	2212	+
	2213	+ static function fetch_timeout () {
	2214	+ return apply_filters(
	2215	+ 'feedwordpress_fetch_timeout',
	2216	+ intval(get_option('feedwordpress_fetch_timeout', FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT))
	2217	+ );
	2218	+ }
	2219	+
	2220	+ static function fetch ($url, $params = array()) {
	2221	+ if (is_wp_error($url)) :
	2222	+ // Let's bounce.
	2223	+ return $url;
	2224	+ endif;
	2225	+
	2226	+ $force_feed = true; // Default
	2227	+
	2228	+ // Allow user to change default feed-fetch timeout with a global setting.
	2229	+ // Props Erigami Scholey-Fuller <http://www.piepalace.ca/blog/2010/11/feedwordpress-broke-my-heart.html>
	2230	+ $timeout = FeedWordPress::fetch_timeout();
	2231	+
	2232	+ if (!is_array($params)) :
	2233	+ $force_feed = $params;
	2234	+ else : // Parameter array
	2235	+ $args = wp_parse_args(array(
	2236	+ 'force_feed' => $force_feed,
	2237	+ 'timeout' => $timeout
	2238	+ ), $params);
	2239	+
	2240	+ extract($args);
	2241	+ endif;
	2242	+ $timeout = intval($timeout);
	2243	+
	2244	+ $pie_class = apply_filters('feedwordpress_simplepie_class', 'FeedWordPie');
	2245	+ $cache_class = apply_filters('feedwordpress_cache_class', 'WP_Feed_Cache');
	2246	+ $file_class = apply_filters('feedwordpress_file_class', 'FeedWordPress_File');
	2247	+ $parser_class = apply_filters('feedwordpress_parser_class', 'FeedWordPress_Parser');
	2248	+ $item_class = apply_filters('feedwordpress_item_class', 'FeedWordPie_Item');
	2249	+ $sniffer_class = apply_filters('feedwordpress_sniffer_class', 'FeedWordPress_Content_Type_Sniffer');
	2250	+
	2251	+ $feed = new $pie_class;
	2252	+ $feed->set_feed_url($url);
	2253	+ $feed->set_cache_class($cache_class);
	2254	+ $feed->set_timeout($timeout);
	2255	+
	2256	+ $feed->set_content_type_sniffer_class($sniffer_class);
	2257	+ $feed->set_file_class($file_class);
	2258	+ $feed->set_parser_class($parser_class);
	2259	+ $feed->set_item_class($item_class);
	2260	+ $feed->force_feed($force_feed);
	2261	+ $feed->set_cache_duration(FeedWordPress::cache_duration($params));
	2262	+ $feed->init();
	2263	+ $feed->handle_content_type();
	2264	+
	2265	+ if ($feed->error()) :
	2266	+ $ret = new WP_Error('simplepie-error', $feed->error());
	2267	+ else :
	2268	+ $ret = $feed;
	2269	+ endif;
	2270	+ return $ret;
	2271	+ } /* FeedWordPress::fetch () */
	2272	+
	2273	+ public function clear_cache () {
	2274	+ global $wpdb;
	2275	+
	2276	+ // Just in case, clear out any old MagpieRSS cache records.
	2277	+ $magpies = $wpdb->query("
1310	2278	DELETE FROM {$wpdb->options}
1311		- WHERE LOCATE('rss_', option_name) AND LENGTH(option_name) > 32
	2279	+ WHERE option_name LIKE 'rss_%' AND LENGTH(option_name) > 32
1312	2280	");
	2281	+
	2282	+ // The WordPress SimplePie module stores its cached feeds as
	2283	+ // transient records in the options table. The data itself is
	2284	+ // stored in `_transient_feed_{md5 of url}` and the last-modified
	2285	+ // timestamp in `_transient_feed_mod_{md5 of url}`. Timeouts for
	2286	+ // these records are stored in `_transient_timeout_feed_{md5}`.
	2287	+ // Since the md5 is always 32 characters in length, the
	2288	+ // option_name is always over 32 characters.
	2289	+ $simplepies = $wpdb->query("
	2290	+ DELETE FROM {$wpdb->options}
	2291	+ WHERE option_name LIKE '_transient%_feed_%' AND LENGTH(option_name) > 32
	2292	+ ");
	2293	+ $simplepies = (int) ($simplepies / 4); // Each transient has 4 rows: the data, the modified timestamp; and the timeouts for each
	2294	+
	2295	+ return ($magpies + $simplepies);
1313	2296	} /* FeedWordPress::clear_cache () */
1314	2297
1315		- function magpie_version () {
1316		- if (!defined('MAGPIE_VERSION')) : $magpie_version = $GLOBALS['wp_version'].'-default';
1317		- else : $magpie_version = MAGPIE_VERSION;
	2298	+ static public function cache_duration ($params = array()) {
	2299	+ $params = wp_parse_args($params, array(
	2300	+ "cache" => true,
	2301	+ ));
	2302	+
	2303	+ $duration = NULL;
	2304	+ if (!$params['cache']) :
	2305	+ $duration = 0;
	2306	+ elseif (defined('FEEDWORDPRESS_CACHE_AGE')) :
	2307	+ $duration = FEEDWORDPRESS_CACHE_AGE;
1318	2308	endif;
1319		- return $magpie_version;
	2309	+ return $duration;
1320	2310	}
1321	2311
	2312	+ static public function cache_lifetime ($duration) {
	2313	+ // Check for explicit setting of a lifetime duration
	2314	+ if (defined('FEEDWORDPRESS_CACHE_LIFETIME')) :
	2315	+ $duration = FEEDWORDPRESS_CACHE_LIFETIME;
	2316	+
	2317	+ // Fall back to the cache freshness duration
	2318	+ elseif (defined('FEEDWORDPRESS_CACHE_AGE')) :
	2319	+ $duration = FEEDWORDPRESS_CACHE_AGE;
	2320	+ endif;
	2321	+
	2322	+ // Fall back to WordPress default
	2323	+ return $duration;
	2324	+ } /* FeedWordPress::cache_lifetime () */
	2325	+
1322	2326	# Utility functions for handling text settings
1323		- function negative ($f, $setting) {
	2327	+ static function negative ($f, $setting) {
1324	2328	$nego = array ('n', 'no', 'f', 'false');
1325	2329	return (isset($f[$setting]) and in_array(strtolower($f[$setting]), $nego));
1326		- }
	2330	+ } /* FeedWordPress::negative () */
1327	2331
1328		- function affirmative ($f, $setting) {
	2332	+ static function affirmative ($f, $setting) {
1329	2333	$affirmo = array ('y', 'yes', 't', 'true', 1);
1330	2334	return (isset($f[$setting]) and in_array(strtolower($f[$setting]), $affirmo));
1331		- }
	2335	+ } /* FeedWordPress::affirmative () */
1332	2336
	2337	+ # Internal debugging functions
1333	2338
1334		- # Internal debugging functions
1335		- function critical_bug ($varname, $var, $line) {
1336		- global $wp_version;
	2339	+ static function diagnostic ($level, $out, $persist = NULL, $since = NULL, $mostRecent = NULL) {
	2340	+ global $feedwordpress_admin_footer;
1337	2341
1338		- if (defined('MAGPIE_VERSION')) : $mv = MAGPIE_VERSION;
1339		- else : $mv = 'WordPress '.$wp_version.' default.';
	2342	+ $output = get_option('feedwordpress_diagnostics_output', array());
	2343	+ $dlog = get_option('feedwordpress_diagnostics_log', array());
	2344	+
	2345	+ $diagnostic_nesting = count(explode(":", $level));
	2346	+
	2347	+ if (FeedWordPressDiagnostic::is_on($level)) :
	2348	+ foreach ($output as $method) :
	2349	+ switch ($method) :
	2350	+ case 'echo' :
	2351	+ if (!self::update_requested()) :
	2352	+ echo "<div><pre><strong>Diag".str_repeat('====', $diagnostic_nesting-1).'|</strong> '.$out."</pre></div>\n";
	2353	+ endif;
	2354	+ break;
	2355	+ case 'echo_in_cronjob' :
	2356	+ if (self::update_requested()) :
	2357	+ echo self::log_prefix()." ".$out."\n";
	2358	+ endif;
	2359	+ break;
	2360	+ case 'admin_footer' :
	2361	+ $feedwordpress_admin_footer[] = $out;
	2362	+ break;
	2363	+ case 'error_log' :
	2364	+ error_log(self::log_prefix().' '.$out);
	2365	+ break;
	2366	+ case 'email' :
	2367	+
	2368	+ if (is_null($persist)) :
	2369	+ $sect = 'occurrent';
	2370	+ $hook = (isset($dlog['mesg'][$sect]) ? count($dlog['mesg'][$sect]) : 0);
	2371	+ $line = array("Time" => time(), "Message" => $out);
	2372	+ else :
	2373	+ $sect = 'persistent';
	2374	+ $hook = md5($level."\n".$persist);
	2375	+ $line = array("Since" => $since, "Message" => $out, "Most Recent" => $mostRecent);
	2376	+ endif;
	2377	+
	2378	+ if (!isset($dlog['mesg'])) : $dlog['mesg'] = array(); endif;
	2379	+ if (!isset($dlog['mesg'][$sect])) : $dlog['mesg'][$sect] = array(); endif;
	2380	+
	2381	+ $dlog['mesg'][$sect][$hook] = $line;
	2382	+ endswitch;
	2383	+ endforeach;
1340	2384	endif;
1341	2385
1342		- echo '<p>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>';
1343		- echo "\n<plaintext>";
1344		- echo "Triggered at line # ".$line."\n";
1345		- echo "FeedWordPress version: ".FEEDWORDPRESS_VERSION."\n";
1346		- echo "MagpieRSS version: {$mv}\n";
1347		- echo "WordPress version: {$wp_version}\n";
1348		- echo "PHP version: ".phpversion()."\n";
1349		- echo "\n";
1350		- echo $varname.": "; var_dump($var); echo "\n";
1351		- die;
1352		- }
1353		-
1354		- function noncritical_bug ($varname, $var, $line) {
1355		- if (FEEDWORDPRESS_DEBUG) : // halt only when we are doing debugging
1356		- FeedWordPress::critical_bug($varname, $var, $line);
	2386	+ update_option('feedwordpress_diagnostics_log', $dlog);
	2387	+ } /* FeedWordPress::diagnostic () */
	2388	+
	2389	+ public function email_diagnostics_override () {
	2390	+ return ($this->has_secret() and isset($_REQUEST['feedwordpress_email_diagnostics']) and !!$_REQUEST['feedwordpress_email_diagnostics']);
	2391	+ } /* FeedWordPress::email_diagnostics_override () */
	2392	+
	2393	+ public function has_emailed_diagnostics ($dlog) {
	2394	+ $ret = false;
	2395	+ if ($this->email_diagnostics_override()
	2396	+ or (isset($dlog['schedule']) and isset($dlog['schedule']['last']))) :
	2397	+ $ret = true;
1357	2398	endif;
1358		- }
1359		-} // class FeedWordPress
	2399	+ return $ret;
	2400	+ } /* FeedWordPress::has_emailed_diagnostics () */
1360	2401
1361		-require_once(dirname(__FILE__) . '/syndicatedpost.class.php');
1362		-require_once(dirname(__FILE__) . '/syndicatedlink.class.php');
	2402	+ public function ready_to_email_diagnostics ($dlog) {
	2403	+ $ret = false;
	2404	+ if ($this->email_diagnostics_override()
	2405	+ or (time() > ($dlog['schedule']['last'] + $dlog['schedule']['freq']))) :
	2406	+ $ret = true;
	2407	+ endif;
	2408	+ return $ret;
	2409	+ } /* FeedWordPress::ready_to_email_diagnostics () */
1363	2410
1364		-################################################################################
1365		-## XML-RPC HOOKS: accept XML-RPC update pings from Contributors ################
1366		-################################################################################
	2411	+ public function email_diagnostic_log ($params = array()) {
	2412	+ $params = wp_parse_args($params, array(
	2413	+ "force" => false,
	2414	+ ));
1367	2415
1368		-function feedwordpress_xmlrpc_hook ($args = array ()) {
1369		- $args['weblogUpdates.ping'] = 'feedwordpress_pong';
1370		- return $args;
1371		-}
	2416	+ $dlog = get_option('feedwordpress_diagnostics_log', array());
1372	2417
1373		-function feedwordpress_pong ($args) {
1374		- $feedwordpress =& new FeedWordPress;
1375		- $delta = @$feedwordpress->update($args[1]);
1376		- if (is_null($delta)):
1377		- return array('flerror' => true, 'message' => "Sorry. I don't syndicate <$args[1]>.");
1378		- else:
1379		- $mesg = array();
1380		- if (isset($delta['new'])) { $mesg[] = ' '.$delta['new'].' new posts were syndicated'; }
1381		- if (isset($delta['updated'])) { $mesg[] = ' '.$delta['updated'].' existing posts were updated'; }
	2418	+ if ($this->has_emailed_diagnostics($dlog)) :
	2419	+ if ($this->ready_to_email_diagnostics($dlog)) :
	2420	+ // No news is good news; only send if
	2421	+ // there are some messages to send.
	2422	+ $body = NULL;
	2423	+ if (!isset($dlog['mesg'])) : $dlog['mesg'] = array(); endif;
1382	2424
1383		- return array('flerror' => false, 'message' => "Thanks for the ping.".implode(' and', $mesg));
1384		- endif;
1385		-}
	2425	+ foreach ($dlog['mesg'] as $sect => $mesgs) :
	2426	+ if (count($mesgs) > 0) :
	2427	+ if (is_null($body)) : $body = ''; endif;
1386	2428
1387		-# The upgraded MagpieRSS also uses this class. So if we have it loaded
1388		-# in, don't load it again.
1389		-if (!class_exists('Relative_URI')) {
1390		- require_once(dirname(__FILE__) . '/relative_uri.class.php');
1391		-}
	2429	+ $paradigm = reset($mesgs);
	2430	+ $body .= "<h2>".ucfirst($sect)." issues</h2>\n"
	2431	+ ."<table>\n"
	2432	+ ."<thead><tr>\n";
	2433	+ foreach ($paradigm as $col => $value) :
	2434	+ $body .= '<th scope="col">'.$col."</th>\n";
	2435	+ endforeach;
	2436	+ $body .= "</tr></thead>\n"
	2437	+ ."<tbody>\n";
	2438	+
	2439	+ foreach ($mesgs as $line) :
	2440	+ $body .= "<tr>\n";
	2441	+ foreach ($line as $col => $cell) :
	2442	+ if (is_numeric($cell)) :
	2443	+ $cell = date('j-M-y, h:i a', $cell);
	2444	+ endif;
	2445	+ $class = strtolower(preg_replace('/\s+/', '-', $col));
	2446	+ $body .= "<td class=\"$class\">${cell}</td>";
	2447	+ endforeach;
	2448	+ $body .= "</tr>\n";
	2449	+ endforeach;
	2450	+
	2451	+ $body .= "</tbody>\n</table>\n\n";
	2452	+ endif;
	2453	+ endforeach;
	2454	+
	2455	+ $body = apply_filters('feedwordpress_diagnostic_email_body', $body, $dlog);
	2456	+ if (!is_null($body)) :
	2457	+ $home = feedwordpress_display_url(get_bloginfo('url'));
	2458	+ $subj = apply_filters('feedwordpress_diagnostic_email_subject', $home . " syndication issues", $dlog);
	2459	+ $agent = 'FeedWordPress '.FEEDWORDPRESS_VERSION;
	2460	+ $body = <<<EOMAIL
	2461	+<html>
	2462	+<head>
	2463	+<title>$subj</title>
	2464	+<style type="text/css">
	2465	+ body { background-color: white; color: black; }
	2466	+ table { width: 100%; border: 1px solid black; }
	2467	+ table thead tr th { background-color: #ff7700; color: white; border-bottom: 1px solid black; }
	2468	+ table thead tr { border-bottom: 1px solid black; }
	2469	+ table tr { vertical-align: top; }
	2470	+ table .since { width: 20%; }
	2471	+ table .time { width: 20%; }
	2472	+ table .most-recently { width: 20%; }
	2473	+ table .message { width: auto; }
	2474	+</style>
	2475	+</head>
	2476	+<body>
	2477	+<h1>Syndication Issues encountered by $agent on $home</h1>
	2478	+$body
	2479	+</body>
	2480	+</html>
	2481	+
	2482	+EOMAIL;
	2483	+
	2484	+ $ded = get_option('feedwordpress_diagnostics_email_destination', 'admins');
	2485	+
	2486	+ // e-mail address
	2487	+ if (preg_match('/^mailto:(.*)$/', $ded, $ref)) :
	2488	+ $recipients = array($ref[1]);
	2489	+
	2490	+ // userid
	2491	+ elseif (preg_match('/^user:(.*)$/', $ded, $ref)) :
	2492	+ $userdata = get_userdata((int) $ref[1]);
	2493	+ $recipients = array($userdata->user_email);
	2494	+
	2495	+ // admins
	2496	+ else :
	2497	+ $recipients = FeedWordPressDiagnostic::admin_emails();
	2498	+ endif;
	2499	+
	2500	+ $mesgId = 'feedwordpress+'.time().'@'.$home;
	2501	+ $parentId = get_option('feedwordpress_diagnostics_email_root_message_id', NULL);
	2502	+
	2503	+ $head = array("Message-ID: <$mesgId>");
	2504	+ if (!is_null($parentId)) :
	2505	+ // We've already sent off a diagnostic message in the past. Let's do some
	2506	+ // magic to help with threading, in the hopes that all diagnostic messages
	2507	+ // get threaded together.
	2508	+ $head[] = "References: <$parentId>";
	2509	+ $head[] = "In-Reply-To: <$parentId>";
	2510	+ $subj = "Re: ".$subj;
	2511	+ else :
	2512	+ // This is the first of its kind. Let's mark it as such.
	2513	+ update_option('feedwordpress_diagnostics_email_root_message_id', $mesgId);
	2514	+ endif;
	2515	+ $head = apply_filters('feedwordpress_diagnostic_email_headers', $head);
	2516	+
	2517	+ foreach ($recipients as $email) :
	2518	+ add_filter('wp_mail_content_type', array('FeedWordPress', 'allow_html_mail'));
	2519	+ wp_mail($email, $subj, $body, $head);
	2520	+ remove_filter('wp_mail_content_type', array('FeedWordPress', 'allow_html_mail'));
	2521	+ endforeach;
	2522	+ endif;
	2523	+
	2524	+ // Clear the logs
	2525	+ $dlog['mesg']['persistent'] = array();
	2526	+ $dlog['mesg']['occurrent'] = array();
	2527	+
	2528	+ // Set schedule for next update
	2529	+ $dlog['schedule']['last'] = time();
	2530	+ endif;
	2531	+ else :
	2532	+ $dlog['schedule'] = array(
	2533	+ 'freq' => 24 /*hr*/ * 60 /*min*/ * 60 /*s*/,
	2534	+ 'last' => time(),
	2535	+ );
	2536	+ endif;
	2537	+
	2538	+ update_option('feedwordpress_diagnostics_log', $dlog);
	2539	+ } /* FeedWordPress::email_diagnostic_log () */
	2540	+
	2541	+ static function allow_html_mail () {
	2542	+ return 'text/html';
	2543	+ } /* FeedWordPress::allow_html_mail () */
	2544	+
	2545	+ static function admin_footer () {
	2546	+ global $feedwordpress_admin_footer;
	2547	+ foreach ($feedwordpress_admin_footer as $line) :
	2548	+ echo '<div><pre>'.$line.'</pre></div>';
	2549	+ endforeach;
	2550	+ } /* FeedWordPress::admin_footer () */
	2551	+
	2552	+ static function log_prefix ($date = false) {
	2553	+ $home = get_bloginfo('url');
	2554	+ $prefix = '['.feedwordpress_display_url($home).'] [feedwordpress] ';
	2555	+ if ($date) :
	2556	+ $prefix = "[".date('Y-m-d H:i:s')."]".$prefix;
	2557	+ endif;
	2558	+ return $prefix;
	2559	+ } /* FeedWordPress::log_prefix () */
	2560	+
	2561	+ static function menu_cap ($sub = false) {
	2562	+ if ($sub) :
	2563	+ $cap = apply_filters('feedwordpress_menu_settings_capacity', 'manage_options');
	2564	+ else :
	2565	+ $cap = apply_filters('feedwordpress_menu_main_capacity', 'manage_links');
	2566	+ endif;
	2567	+ return $cap;
	2568	+ } /* FeedWordPress::menu_cap () */
	2569	+
	2570	+ static function path ($filename = '') {
	2571	+ global $fwp_path;
	2572	+
	2573	+ $path = $fwp_path;
	2574	+ if (strlen($filename) > 0) :
	2575	+ $path .= '/'.$filename;
	2576	+ endif;
	2577	+ return $path;
	2578	+ } /* FeedWordPress::path () */
	2579	+
	2580	+ // -- DEPRCATED UTILITY FUNCTIONS -------------------------------------
	2581	+ // These are superceded by later code re-organization, (for example
	2582	+ // MyPHP::param/post/get/request, or FeedWordPressDiagnostic methods),
	2583	+ // but for the last several versions have been kept here for backward
	2584	+ // compatibility with add-ons, older code, etc. Maybe someday they
	2585	+ // will go away.
	2586	+ // -------------------------------------------------------------------
	2587	+ static function param ($key, $type = 'REQUEST', $default = NULL) {
	2588	+ return MyPHP::param($key, $default, $type);
	2589	+ } /* FeedWordPress::param () */
	2590	+
	2591	+ static function post ($key, $default = NULL) {
	2592	+ return MyPHP::post($key, $default);
	2593	+ } /* FeedWordPress::post () */
	2594	+
	2595	+ static function val ($v, $no_newlines = false) {
	2596	+ return MyPHP::val($v, $no_newlines);
	2597	+ } /* FeedWordPress::val () */
	2598	+
	2599	+ static function critical_bug ($varname, $var, $line, $file = NULL) {
	2600	+ FeedWordPressDiagnostic::critical_bug($varname, $var, $line, $file);
	2601	+ } /* FeedWordPress::critical_bug () */
	2602	+
	2603	+ static function noncritical_bug ($varname, $var, $line, $file = NULL) {
	2604	+ FeedWordPressDiagnostic::noncritical_bug($varname, $var, $line, $file);
	2605	+ } /* FeedWordPress::noncritical_bug () */
	2606	+
	2607	+ static function diagnostic_on ($level) {
	2608	+ return FeedWordPressDiagnostic::is_on($level);
	2609	+ } /* FeedWordPress::diagnostic_on () */
	2610	+
	2611	+} /* class FeedWordPress */
	2612	+
	2613	+$feedwordpress_admin_footer = array();
1392	2614
1393	2615	// take your best guess at the realname and e-mail, given a string
1394	2616	define('FWP_REGEX_EMAIL_ADDY', '([^@"(<\s]+@[^"@(<\s]+\.[^"@(<\s]+)');
1395	2617	define('FWP_REGEX_EMAIL_NAME', '("([^"]*)"|([^"<(]+\S))');