← All changes | feedwordpress.php +1855 -935 2010.0127 → 2022.0123 View file →

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