← All changes | feedwordpress.php +1826 -2304 2008.1105 → 2022.0222 View file →

		@@ -1,39 +1,68 @@
1	1	<?php
2	2	/*
3	3	Plugin Name: FeedWordPress
4		-Plugin URI: http://projects.radgeek.com/feedwordpress
	4	+Plugin URI: http://feedwordpress.radgeek.com/
5	5	Description: simple and flexible Atom/RSS syndication for WordPress
6		-Version: 2008.1105
7		-Author: Charles Johnson
8		-Author URI: http://radgeek.com/
	6	+Version: 2022.0222
	7	+Author: C. Johnson
	8	+Author URI: https://feedwordpress.radgeek.com/contact/
9	9	License: GPL
10		-Last modified: 2008-11-05 4:35pm PST
11	10	*/
12	11
13		-# This uses code derived from:
	12	+/**
	13	+ * @package FeedWordPress
	14	+ * @version 2022.0222
	15	+ */
	16	+
	17	+# This plugin uses code derived from:
14	18	# - wp-rss-aggregate.php by Kellan Elliot-McCrea <kellan@protest.net>
15		-# - 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>
16	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
17	27	# according to the terms of the GNU General Public License.
18		-#
19		-# INSTALLATION: see README.text or <http://projects.radgeek.com/install>
20		-#
21		-# USAGE: once FeedWordPress is installed, you manage just about everything from
22		-# the WordPress Dashboard, under Options --> Syndication or Links --> Syndicated
23		-# To ensure that fresh content is added as it becomes available, get your
24		-# contributors to put your XML-RPC URI (if WordPress is installed at
25		-# <http://www.zyx.com/blog>, XML-RPC requests should be sent to
26		-# <http://www.zyx.com/blog/xmlrpc.php>), or see `update-feeds.php`
27	28
28		-# -- Don't change these unless you know what you're doing...
	29	+####################################################################################
	30	+## CONSTANTS & DEFAULTS ############################################################
	31	+####################################################################################
29	32
30		-define ('FEEDWORDPRESS_VERSION', '2008.1105');
31		-define ('FEEDWORDPRESS_AUTHOR_CONTACT', 'http://radgeek.com/contact');
	33	+define ('FEEDWORDPRESS_VERSION', '2022.0222');
	34	+define ('FEEDWORDPRESS_AUTHOR_CONTACT', 'http://feedwordpress.radgeek.com/contact');
	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	+
	46	+// Defaults
32	47	define ('DEFAULT_SYNDICATION_CATEGORY', 'Contributors');
	48	+define ('DEFAULT_UPDATE_PERIOD', 60); // value in minutes
	49	+define ('FEEDWORDPRESS_DEFAULT_CHECKIN_INTERVAL', DEFAULT_UPDATE_PERIOD/10);
33	50
34		-define ('FEEDWORDPRESS_DEBUG', false);
	51	+// Dependencies: modules packaged with FeedWordPress plugin
	52	+$dir = dirname( __FILE__ );
	53	+require_once("${dir}/externals/myphp/myphp.class.php");
35	54
	55	+$feedwordpress_debug = FeedWordPress::param( 'feedwordpress_debug', get_option('feedwordpress_debug') );
	56	+
	57	+if (is_string($feedwordpress_debug)) :
	58	+ $feedwordpress_debug = ($feedwordpress_debug == 'yes');
	59	+endif;
	60	+
	61	+define ('FEEDWORDPRESS_DEBUG', $feedwordpress_debug);
	62	+$feedwordpress_compatibility = true;
	63	+define ('FEEDWORDPRESS_COMPATIBILITY', $feedwordpress_compatibility);
	64	+
36	65	define ('FEEDWORDPRESS_CAT_SEPARATOR_PATTERN', '/[:\n]/');
37	66	define ('FEEDWORDPRESS_CAT_SEPARATOR', "\n");
38	67
39	68	define ('FEEDVALIDATOR_URI', 'http://feedvalidator.org/check.cgi');
		@@ -39,63 +68,96 @@
39	68	define ('FEEDVALIDATOR_URI', 'http://feedvalidator.org/check.cgi');
40	69
41	70	define ('FEEDWORDPRESS_FRESHNESS_INTERVAL', 10*60); // Every ten minutes
42	71
43		-define ('FWP_SCHEMA_HAS_USERMETA', 2966);
44		-define ('FWP_SCHEMA_20', 3308); // Database schema # for WP 2.0
45		-define ('FWP_SCHEMA_21', 4772); // Database schema # for WP 2.1
46		-define ('FWP_SCHEMA_23', 5495); // Database schema # for WP 2.3
47		-define ('FWP_SCHEMA_25', 7558); // Database schema # for WP 2.5
48		-define ('FWP_SCHEMA_26', 8201); // Database schema # for WP 2.6
	72	+define('FEEDWORDPRESS_BOILERPLATE_DEFAULT_HOOK_ORDER', 11000); // at the tail end of the filtering process
49	73
50	74	if (FEEDWORDPRESS_DEBUG) :
51	75	// Help us to pick out errors, if any.
52	76	ini_set('error_reporting', E_ALL & ~E_NOTICE);
53	77	ini_set('display_errors', true);
54		- define('MAGPIE_DEBUG', true);
55		-
	78	+
56	79	// When testing we don't want cache issues to interfere. But this is
57		- // a VERY BAD SETTING for a production server. Webmasters will eat your
	80	+ // a VERY BAD SETTING for a production server. Webmasters will eat your
58	81	// face for breakfast if you use it, and the baby Jesus will cry. So
59	82	// make sure FEEDWORDPRESS_DEBUG is FALSE for any site that will be
60	83	// used for more than testing purposes!
61		- define('MAGPIE_CACHE_AGE', 1);
	84	+ define('FEEDWORDPRESS_CACHE_AGE', 1);
	85	+ define('FEEDWORDPRESS_CACHE_LIFETIME', 1);
	86	+ define('FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT', 60);
62	87	else :
63		- define('MAGPIE_DEBUG', false);
	88	+ // Hold onto data all day for conditional GET purposes,
	89	+ // but consider it stale after 1 min (requiring a conditional GET)
	90	+ define('FEEDWORDPRESS_CACHE_LIFETIME', 24*60*60);
	91	+ define('FEEDWORDPRESS_CACHE_AGE', 1*60);
	92	+ define('FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT', 20);
64	93	endif;
65	94
66		-// Note that the rss-functions.php that comes prepackaged with WordPress is
67		-// old & busted. For the new hotness, drop a copy of rss.php from
68		-// this archive into wp-includes/rss.php
	95	+####################################################################################
	96	+## CORE DEPENDENCIES & PLUGIN MODULES ##############################################
	97	+####################################################################################
69	98
70		-if (is_readable(ABSPATH . WPINC . '/rss.php')) :
71		- require_once (ABSPATH . WPINC . '/rss.php');
72		-else :
73		- require_once (ABSPATH . WPINC . '/rss-functions.php');
74		-endif;
	99	+// Dependencies: modules packaged with WordPress core
	100	+$wpCoreDependencies = array(
	101	+"class:SimplePie" => "class-simplepie",
	102	+"class:WP_SimplePie_File" => "class-wp-simplepie-file",
	103	+"class:WP_SimplePie_Sanitize_KSES" => "class-wp-simplepie-sanitize-kses",
	104	+"function:wp_insert_user" => "registration",
	105	+);
75	106
76		-if (isset($wp_db_version)) :
77		- if ($wp_db_version >= FWP_SCHEMA_23) :
78		- require_once (ABSPATH . WPINC . '/registration.php'); // for wp_insert_user
79		- elseif ($wp_db_version >= FWP_SCHEMA_21) : // WordPress 2.1 and 2.2, but not 2.3
80		- require_once (ABSPATH . WPINC . '/registration.php'); // for wp_insert_user
81		- require_once (ABSPATH . 'wp-admin/admin-db.php'); // for wp_insert_category
82		- elseif ($wp_db_version >= FWP_SCHEMA_20) : // WordPress 2.0
83		- require_once (ABSPATH . WPINC . '/registration-functions.php'); // for wp_insert_user
84		- require_once (ABSPATH . 'wp-admin/admin-db.php'); // for wp_insert_category
	107	+// Ensure that we have SimplePie loaded up and ready to go
	108	+// along with the WordPress auxiliary classes.
	109	+$unmetCoreDependencies = array();
	110	+foreach ($wpCoreDependencies as $unit => $fileSlug) :
	111	+ list($unitType, $unitName) = explode(":", $unit, 2);
	112	+
	113	+ $dependencyMet = (('class'==$unitType) ? class_exists($unitName) : function_exists($unitName));
	114	+ if (!$dependencyMet) :
	115	+ $phpFileName = ABSPATH . WPINC . "/${fileSlug}.php";
	116	+ if (file_exists($phpFileName)) :
	117	+ require_once($phpFileName);
	118	+ else :
	119	+ $unmetCoreDependencies[] = $unitName;
	120	+ endif;
85	121	endif;
	122	+endforeach;
	123	+
	124	+// Fallback garbage-pail module used in WP < 4.7 which may meet our dependencies
	125	+if (count($unmetCoreDependencies) > 0) :
	126	+ require_once(ABSPATH . WPINC . "/class-feed.php");
86	127	endif;
87	128
88		-require_once(dirname(__FILE__) . '/compatability.php'); // LEGACY API: Replicate or mock up functions for legacy support purposes
	129	+// Dependencies: modules packaged with FeedWordPress plugin
	130	+$dir = dirname( __FILE__ );
	131	+require_once("${dir}/feedwordpressadminpage.class.php");
	132	+require_once("${dir}/feedwordpresssettingsui.class.php");
	133	+require_once("${dir}/feedwordpressdiagnostic.class.php");
	134	+require_once("${dir}/admin-ui.php");
	135	+require_once("${dir}/template-functions.php");
	136	+require_once("${dir}/feedwordpresssyndicationpage.class.php");
	137	+require_once("${dir}/compatability.php"); // Legacy API
	138	+require_once("${dir}/syndicatedpost.class.php");
	139	+require_once("${dir}/syndicatedlink.class.php");
	140	+require_once("${dir}/feedwordpresshtml.class.php");
	141	+require_once("${dir}/inspectpostmeta.class.php");
	142	+require_once("${dir}/syndicationdataqueries.class.php");
	143	+require_once("${dir}/extend/SimplePie/feedwordpie.class.php");
	144	+require_once("${dir}/extend/SimplePie/feedwordpie_cache.class.php");
	145	+require_once("${dir}/extend/SimplePie/feedwordpie_item.class.php");
	146	+require_once("${dir}/extend/SimplePie/feedwordpie_file.class.php");
	147	+require_once("${dir}/extend/SimplePie/feedwordpie_parser.class.php");
	148	+require_once("${dir}/extend/SimplePie/feedwordpie_content_type_sniffer.class.php");
	149	+require_once("${dir}/feedwordpressrpc.class.php");
	150	+require_once("${dir}/feedwordpresshttpauthenticator.class.php");
	151	+require_once("${dir}/feedwordpresslocalpost.class.php");
89	152
90		-// Magic quotes are just about the stupidest thing ever.
91		-if (is_array($_POST)) :
92		- $fwp_post = stripslashes_deep($_POST);
93		-endif;
	153	+####################################################################################
	154	+## GLOBAL PARAMETERS ###############################################################
	155	+####################################################################################
94	156
95	157	// Get the path relative to the plugins directory in which FWP is stored
96	158	preg_match (
97		- '|/wp-content/plugins/(.+)$|',
	159	+ '|'.preg_quote(WP_PLUGIN_DIR).'/(.+)$|',
98	160	dirname(__FILE__),
99	161	$ref
100	162	);
101	163
		@@ -104,68 +166,19 @@
104	166	else : // Something went wrong. Let's just guess.
105	167	$fwp_path = 'feedwordpress';
106	168	endif;
107	169
108		-// If this is a FeedWordPress admin page, queue up scripts for AJAX functions that FWP uses
109		-// If it is a display page or a non-FeedWordPress admin page, don't.
110		-if (is_admin() and isset($_REQUEST['page']) and preg_match("|^{$fwp_path}/|", $_REQUEST['page'])) :
111		- if (function_exists('wp_enqueue_script')) :
112		- if (isset($wp_db_version) and $wp_db_version >= FWP_SCHEMA_25) :
113		- wp_enqueue_script('post'); // for magic tag and category boxes
114		- wp_enqueue_script('thickbox'); // for fold-up boxes
115		- wp_enqueue_script('admin-forms'); // for checkbox selection
116		- else :
117		- wp_enqueue_script( 'ajaxcat' ); // Provides the handy-dandy new category text box
118		- endif;
119		- endif;
120		- if (function_exists('wp_enqueue_style')) :
121		- if (fwp_test_wp_version(FWP_SCHEMA_25)) :
122		- wp_enqueue_style('dashboard');
123		- endif;
124		- endif;
125		- if (function_exists('wp_admin_css')) :
126		- if (fwp_test_wp_version(FWP_SCHEMA_25)) :
127		- wp_admin_css('css/dashboard');
128		- endif;
129		- endif;
130		-endif;
	170	+####################################################################################
	171	+## FEEDWORDPRESS: INITIALIZE OBJECT AND FILTERS ####################################
	172	+####################################################################################
131	173
132		-if (!FeedWordPress::needs_upgrade()) : // only work if the conditions are safe!
	174	+$feedwordpress = new FeedWordPress;
	175	+if (!$feedwordpress->needs_upgrade()) : // only work if the conditions are safe!
	176	+ $feedwordpress->add_filters();
133	177
134		- # Syndicated items are generally received in output-ready (X)HTML and
135		- # should not be folded, crumpled, mutilated, or spindled by WordPress
136		- # formatting filters. But we don't want to interfere with filters for
137		- # any locally-authored posts, either.
138		- #
139		- # What WordPress should really have is a way for upstream filters to
140		- # stop downstream filters from running at all. Since it doesn't, and
141		- # since a downstream filter can't access the original copy of the text
142		- # that is being filtered, what we will do here is (1) save a copy of the
143		- # original text upstream, before any other filters run, and then (2)
144		- # retrieve that copy downstream, after all the other filters run, *if*
145		- # this is a syndicated post
	178	+ # Inbound XML-RPC update methods
	179	+ $feedwordpressRPC = new FeedWordPressRPC;
146	180
147		- add_filter('the_content', 'feedwordpress_preserve_syndicated_content', -10000);
148		- add_filter('the_content', 'feedwordpress_restore_syndicated_content', 10000);
149		-
150		- add_action('atom_entry', 'feedwordpress_item_feed_data');
151		-
152		- # Filter in original permalinks if the user wants that
153		- add_filter('post_link', 'syndication_permalink', 1);
154		-
155		- # WTF? By default, wp_insert_link runs incoming link_url and link_rss
156		- # URIs through default filters that include `wp_kses()`. But `wp_kses()`
157		- # just happens to escape any occurrence of & to &amp; -- which just
158		- # happens to fuck up any URI with a & to separate GET parameters.
159		- remove_filter('pre_link_rss', 'wp_filter_kses');
160		- remove_filter('pre_link_url', 'wp_filter_kses');
161		-
162		- # Admin menu
163		- add_action('admin_menu', 'fwp_add_pages');
164		-
165		- # Inbound XML-RPC update methods
166		- add_filter('xmlrpc_methods', 'feedwordpress_xmlrpc_hook');
167		-
168	181	# Outbound XML-RPC ping reform
169	182	remove_action('publish_post', 'generic_ping'); // WP 1.5.x
170	183	remove_action('do_pings', 'do_all_pings', 10, 1); // WP 2.1, 2.2
171	184	remove_action('publish_post', '_publish_post_hook', 5, 1); // WP 2.3
		@@ -174,198 +187,59 @@
174	187	add_action('do_pings', 'fwp_do_pings', 10, 1);
175	188	add_action('feedwordpress_update', 'fwp_hold_pings');
176	189	add_action('feedwordpress_update_complete', 'fwp_release_pings');
177	190
178		- # Hook in logging functions only if the logging option is ON
179		- $update_logging = get_option('feedwordpress_update_logging');
180		- if ($update_logging == 'yes') :
181		- add_action('post_syndicated_item', 'log_feedwordpress_post', 100);
182		- add_action('update_syndicated_item', 'log_feedwordpress_update_post', 100);
183		- add_action('feedwordpress_update', 'log_feedwordpress_update_feeds', 100);
184		- add_action('feedwordpress_check_feed', 'log_feedwordpress_check_feed', 100);
185		- add_action('feedwordpress_update_complete', 'log_feedwordpress_update_complete', 100);
186		- endif;
187		-
188		- # Cron-less auto-update. Hooray!
189		- add_action('init', 'feedwordpress_auto_update');
190		-
191		- # Default sanitizers
192		- add_filter('syndicated_item_content', array('SyndicatedPost', 'sanitize_content'), 0, 2);
193		-
194	191	else :
195	192	# Hook in the menus, which will just point to the upgrade interface
196		- add_action('admin_menu', 'fwp_add_pages');
	193	+ add_action('admin_menu', array($feedwordpress, 'add_pages'));
197	194	endif; // if (!FeedWordPress::needs_upgrade())
198	195
199		-function feedwordpress_auto_update () {
200		- if (FeedWordPress::stale()) :
201		- $feedwordpress =& new FeedWordPress;
202		- $feedwordpress->update();
203		- endif;
204		-
205		- if (FeedWordPress::update_requested()) :
206		- exit;
207		- endif;
208		-} /* feedwordpress_auto_update () */
	196	+register_deactivation_hook(__FILE__, 'feedwordpress_deactivate');
	197	+function feedwordpress_deactivate () {
	198	+ wp_clear_scheduled_hook('fwp_scheduled_update_checkin');
	199	+} /* feedwordpress_deactivate () */
209	200
210	201	################################################################################
211	202	## LOGGING FUNCTIONS: log status updates to error_log if you want it ###########
212	203	################################################################################
213	204
214		-function log_feedwordpress_post ($id) {
215		- $post = wp_get_single_post($id);
216		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] posted "
217		- ."'{$post->post_title}' ({$post->post_date})");
	205	+function debug_out_human_readable_bytes ($quantity) {
	206	+ $quantity = (int) $quantity;
	207	+ $magnitude = 'B';
	208	+ $orders = array('KB', 'MB', 'GB', 'TB');
	209	+ while (($quantity > (1024*100)) and (count($orders) > 0)) :
	210	+ $quantity = floor($quantity / 1024);
	211	+ $magnitude = array_shift($orders);
	212	+ endwhile;
	213	+ return "${quantity} ${magnitude}";
218	214	}
219	215
220		-function log_feedwordpress_update_post ($id) {
221		- $post = wp_get_single_post($id);
222		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] updated "
223		- ."'{$post->post_title}' ({$post->post_date})"
224		- ." (as of {$post->post_modified})");
225		-}
226		-
227		-function log_feedwordpress_update_feeds ($uri) {
228		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] update('$uri')");
229		-}
230		-
231		-function log_feedwordpress_check_feed ($feed) {
232		- $uri = $feed['link/uri']; $name = $feed['link/name'];
233		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] Examining $name <$uri>");
234		-}
235		-
236		-function log_feedwordpress_update_complete ($delta) {
237		- $mesg = array();
238		- if (isset($delta['new'])) $mesg[] = 'added '.$delta['new'].' new posts';
239		- if (isset($delta['updated'])) $mesg[] = 'updated '.$delta['updated'].' existing posts';
240		- if (empty($mesg)) $mesg[] = 'nothing changed';
241		-
242		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] "
243		- .(is_null($delta) ? "Error: I don't syndicate that URI"
244		- : implode(' and ', $mesg)));
245		-}
246		-
247		-################################################################################
248		-## TEMPLATE API: functions to make your templates syndication-aware ############
249		-################################################################################
250		-
251		-function is_syndicated () { return (strlen(get_syndication_feed_id()) > 0); }
252		-
253		-function get_syndication_source_link ($original = NULL) {
254		- if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data();
255		- endif;
256		-
257		- if ($original) : $vals = get_post_custom_values('syndication_source_uri_original');
258		- else : $vals = array();
259		- endif;
260		-
261		- if (count($vals) == 0) : $vals = get_post_custom_values('syndication_source_uri');
262		- endif;
263		-
264		- if (count($vals) > 0) : $ret = $vals[0]; else : $ret = NULL; endif;
265		-
266		- return $ret;
267		-} /* function get_syndication_source_link() */
268		-
269		-function the_syndication_source_link ($original = NULL) { echo get_syndication_source_link($original); }
270		-
271		-function get_syndication_source ($original = NULL) {
272		- if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data();
273		- endif;
274		-
275		- if ($original) : $vals = get_post_custom_values('syndication_source_original');
276		- else : $vals = array();
277		- endif;
278		-
279		- if (count($vals) == 0) : $vals = get_post_custom_values('syndication_source');
280		- endif;
281		-
282		- if (count($vals) > 0) : $ret = $vals[0]; else : $ret = NULL; endif;
283		-
284		- return $ret;
285		-} /* function get_syndication_source() */
286		-
287		-function the_syndication_source ($original = NULL) { echo get_syndication_source($original); }
288		-
289		-function get_syndication_feed ($original = NULL) {
290		- if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data();
291		- endif;
292		-
293		- if ($original) : $vals = get_post_custom_values('syndication_feed_original');
294		- else : $vals = array();
295		- endif;
296		-
297		- if (count($vals) == 0) : $vals = get_post_custom_values('syndication_feed');
298		- endif;
299		-
300		- if (count($vals) > 0) : $ret = $vals[0]; else : $ret = NULL; endif;
301		-
302		- return $ret;
303		-} /* function get_syndication_feed() */
304		-
305		-function the_syndication_feed ($original = NULL) { echo get_syndication_feed ($original); }
306		-
307		-function get_syndication_feed_guid ($original = NULL) {
308		- if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data();
309		- endif;
310		-
311		- if ($original) : $vals = get_post_custom_values('syndication_source_id_original');
312		- else : $vals = array();
313		- endif;
314		-
315		- if (count($vals) == 0) : $vals = array(get_feed_meta('feed/id'));
316		- endif;
317		-
318		- if (count($vals) > 0) : $ret = $vals[0]; else : $ret = NULL; endif;
319		-
320		- return $ret;
321		-} /* function get_syndication_feed_guid () */
322		-
323		-function the_syndication_feed_guid ($original = NULL) { echo get_syndication_feed_guid($original); }
324		-
325		-function get_syndication_feed_id () { list($u) = get_post_custom_values('syndication_feed_id'); return $u; }
326		-function the_syndication_feed_id () { echo get_syndication_feed_id(); }
327		-
328		-$feedwordpress_linkcache = array (); // only load links from database once
329		-
330		-function get_feed_meta ($key) {
331		- global $wpdb, $feedwordpress_linkcache;
332		- $feed_id = get_syndication_feed_id();
333		-
334		- $ret = NULL;
335		- if (strlen($feed_id) > 0):
336		- if (isset($feedwordpress_linkcache[$feed_id])) :
337		- $link = $feedwordpress_linkcache[$feed_id];
338		- else :
339		- $link =& new SyndicatedLink($feed_id);
340		- $feedwordpress_linkcache[$feed_id] = $link;
	216	+function debug_out_feedwordpress_footer () {
	217	+ if (FeedWordPressDiagnostic::is_on('memory_usage')) :
	218	+ if (function_exists('memory_get_usage')) :
	219	+ FeedWordPress::diagnostic ('memory_usage', "Memory: Current usage: ".debug_out_human_readable_bytes(memory_get_usage()));
341	220	endif;
342		-
343		- $ret = $link->settings[$key];
	221	+ if (function_exists('memory_get_peak_usage')) :
	222	+ FeedWordPress::diagnostic ('memory_usage', "Memory: Peak usage: ".debug_out_human_readable_bytes(memory_get_peak_usage()));
	223	+ endif;
344	224	endif;
345		- return $ret;
346		-} /* get_feed_meta() */
	225	+} /* debug_out_feedwordpress_footer() */
347	226
348		-function get_syndication_permalink () {
349		- list($u) = get_post_custom_values('syndication_permalink'); return $u;
350		-}
351		-function the_syndication_permalink () {
352		- echo get_syndication_permalink();
353		-}
354		-
355	227	################################################################################
356	228	## FILTERS: syndication-aware handling of post data for templates and feeds ####
357	229	################################################################################
358	230
359		-$feedwordpress_the_syndicated_content = NULL;
	231	+$feedwordpress_the_syndicated_content = null;
	232	+$feedwordpress_the_original_permalink = null;
360	233
361	234	function feedwordpress_preserve_syndicated_content ($text) {
362	235	global $feedwordpress_the_syndicated_content;
363	236
364		- if ( is_syndicated() and get_option('feedwordpress_formatting_filters') != 'yes' ) :
	237	+ $p = new FeedWordPressLocalPost;
	238	+ if (!$p->is_exposed_to_formatting_filters()) :
365	239	$feedwordpress_the_syndicated_content = $text;
366	240	else :
367		- $feedwordpress_the_syndicated_content = NULL;
	241	+ $feedwordpress_the_syndicated_content = null;
368	242	endif;
369	243	return $text;
370	244	}
371	245
		@@ -370,9 +244,9 @@
370	244	}
371	245
372	246	function feedwordpress_restore_syndicated_content ($text) {
373	247	global $feedwordpress_the_syndicated_content;
374		-
	248	+
375	249	if ( !is_null($feedwordpress_the_syndicated_content) ) :
376	250	$text = $feedwordpress_the_syndicated_content;
377	251	endif;
378	252
		@@ -383,21 +257,21 @@
383	257	// In a post context....
384	258	if (is_syndicated()) :
385	259	?>
386	260	<source>
387		- <title><?php the_syndication_source(); ?></title>
388		- <link rel="alternate" type="text/html" href="<?php the_syndication_source_link(); ?>" />
389		- <link rel="self" href="<?php the_syndication_feed(); ?>" />
	261	+ <title><?php print htmlspecialchars(get_syndication_source()); ?></title>
	262	+ <link rel="alternate" type="text/html" href="<?php print htmlspecialchars(get_syndication_source_link()); ?>" />
	263	+ <link rel="self" href="<?php print htmlspecialchars(get_syndication_feed()); ?>" />
390	264	<?php
391	265	$id = get_syndication_feed_guid();
392	266	if (strlen($id) > 0) :
393	267	?>
394		- <id><?php print $id; ?></id>
	268	+ <id><?php print htmlspecialchars($id); ?></id>
395	269	<?php
396	270	endif;
397	271	$updated = get_feed_meta('feed/updated');
398	272	if (strlen($updated) > 0) : ?>
399		- <updated><?php print $updated; ?></updated>
	273	+ <updated><?php print esc_xml($updated); ?></updated>
400	274	<?php
401	275	endif;
402	276	?>
403	277	</source>
		@@ -404,87 +278,156 @@
404	278	<?php
405	279	endif;
406	280	}
407	281
408		-function syndication_permalink ($permalink = '') {
409		- if (get_option('feedwordpress_munge_permalink') != 'no'):
410		- $uri = get_syndication_permalink();
411		- return ((strlen($uri) > 0) ? $uri : $permalink);
412		- else:
413		- return $permalink;
	282	+/**
	283	+ * syndication_permalink: Allow WordPress to use the original remote URL of
	284	+ * syndicated posts as their permalink. Can be turned on or off by by setting in
	285	+ * Syndication => Posts & Links. Saves the old internal permalink in a global
	286	+ * variable for later use.
	287	+ *
	288	+ * @param string $permalink The internal permalink
	289	+ * @return string The new permalink. Same as the old if the post is not
	290	+ * syndicated, or if FWP is set to use internal permalinks, or if the post
	291	+ * was syndicated, but didn't have a proper permalink recorded.
	292	+ *
	293	+ * @uses SyndicatedLink::setting()
	294	+ * @uses get_syndication_permalink()
	295	+ * @uses get_syndication_feed_object()
	296	+ * @uses url_to_postid()
	297	+ * @global $id
	298	+ * @global $feedwordpress_the_original_permalink
	299	+ */
	300	+function syndication_permalink ($permalink = '', $post = null, $leavename = false, $sample = false) {
	301	+ global $id;
	302	+ global $feedwordpress_the_original_permalink;
	303	+
	304	+ // Save the local permalink in case we need to retrieve it later.
	305	+ $feedwordpress_the_original_permalink = $permalink;
	306	+
	307	+ if (is_object($post) and isset($post->ID) and !empty($post->ID)) :
	308	+ // Use the post ID we've been provided with.
	309	+ $postId = $post->ID;
	310	+ elseif (is_string($permalink) and strlen($permalink) > 0) :
	311	+ // Map this permalink to a post ID so we can get the correct
	312	+ // permalink even outside of the Post Loop. Props Björn.
	313	+ $postId = url_to_postid($permalink);
	314	+ else :
	315	+ // If the permalink string is empty but Post Loop context
	316	+ // provides an id.
	317	+ $postId = $id;
414	318	endif;
415		-} // function syndication_permalink ()
416	319
417		-################################################################################
418		-## ADMIN MENU ADD-ONS: register Dashboard management pages #####################
419		-################################################################################
	320	+ $munge = false;
	321	+ $link = get_syndication_feed_object($postId);
	322	+ if (is_object($link)) :
	323	+ $munge = ($link->setting('munge permalink', 'munge_permalink', 'yes') != 'no');
	324	+ endif;
420	325
421		-function fwp_add_pages () {
422		- global $fwp_capability;
423		- global $fwp_path;
	326	+ if ($munge):
	327	+ $uri = get_syndication_permalink($postId);
	328	+ $permalink = ((strlen($uri) > 0) ? $uri : $permalink);
	329	+ endif;
	330	+ return $permalink;
	331	+} /* function syndication_permalink () */
424	332
425		- add_menu_page('Syndicated Sites', 'Syndication', $fwp_capability['manage_links'], $fwp_path.'/syndication.php');
426		- add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Authors', 'Authors', $fwp_capability['manage_options'], $fwp_path.'/authors.php');
427		- add_submenu_page($fwp_path.'/syndication.php', 'Syndication Options', 'Options', $fwp_capability['manage_options'], $fwp_path.'/syndication-options.php');
428		- add_options_page('Syndication Options', 'Syndication', $fwp_capability['manage_options'], $fwp_path.'/syndication-options.php');
429		-} // function fwp_add_pages () */
	333	+/**
	334	+ * syndication_permalink_escaped: Escape XML special characters in syndicated
	335	+ * permalinks when used in feed contexts and HTML display contexts.
	336	+ *
	337	+ * @param string $permalink
	338	+ * @return string
	339	+ *
	340	+ * @uses is_syndicated()
	341	+ * @uses FeedWordPress::munge_permalinks()
	342	+ *
	343	+ */
	344	+function syndication_permalink_escaped ($permalink) {
	345	+ /* FIXME: This should review link settings not just global settings */
	346	+ if (is_syndicated() and FeedWordPress::munge_permalinks()) :
	347	+ // This is a foreign link; WordPress can't vouch for its not
	348	+ // having any entities that need to be &-escaped. So we'll do
	349	+ // it here.
	350	+ $permalink = esc_html($permalink);
	351	+ endif;
	352	+ return $permalink;
	353	+} /* function syndication_permalink_escaped() */
430	354
431		-################################################################################
432		-## fwp_hold_pings() and fwp_release_pings(): Outbound XML-RPC ping reform ####
433		-## ... 'coz it's rude to send 500 pings the first time your aggregator runs ####
434		-################################################################################
	355	+/**
	356	+ * syndication_comments_feed_link: Escape XML special characters in comments
	357	+ * feed links
	358	+ *
	359	+ * @param string $link
	360	+ * @return string
	361	+ *
	362	+ * @uses is_syndicated()
	363	+ * @uses FeedWordPress::munge_permalinks()
	364	+ */
	365	+function syndication_comments_feed_link ($link) {
	366	+ global $feedwordpress_the_original_permalink, $id;
435	367
436		-$fwp_held_ping = NULL; // NULL: not holding pings yet
	368	+ if (is_syndicated() and FeedWordPress::munge_permalinks()) :
	369	+ // If the source post provided a comment feed URL using
	370	+ // wfw:commentRss or atom:link/@rel="replies" we can make use of
	371	+ // that value here.
	372	+ $source = get_syndication_feed_object();
	373	+ $replacement = null;
437	374
438		-function fwp_hold_pings () {
439		- global $fwp_held_ping;
440		- if (is_null($fwp_held_ping)):
441		- $fwp_held_ping = 0; // 0: ready to hold pings; none yet received
442		- endif;
443		-}
	375	+ if (is_object($source) && $source->setting('munge comments feed links', 'munge_comments_feed_links', 'yes') != 'no') :
	376	+ $commentFeeds = get_post_custom_values('wfw:commentRSS');
	377	+ if (
	378	+ is_array($commentFeeds)
	379	+ and (count($commentFeeds) > 0)
	380	+ and (strlen($commentFeeds[0]) > 0)
	381	+ ) :
	382	+ $replacement = $commentFeeds[0];
444	383
445		-function fwp_release_pings () {
446		- global $fwp_held_ping;
447		- if ($fwp_held_ping):
448		- if (function_exists('wp_schedule_single_event')) :
449		- wp_schedule_single_event(time(), 'do_pings');
450		- else :
451		- generic_ping($fwp_held_ping);
	384	+ // This is a foreign link; WordPress can't vouch for its not
	385	+ // having any entities that need to be &-escaped. So we'll do it
	386	+ // here.
	387	+ $replacement = esc_html($replacement);
	388	+ endif;
452	389	endif;
	390	+
	391	+ if (is_null($replacement)) :
	392	+ // Q: How can we get the proper feed format, since the
	393	+ // format is, stupidly, not passed to the filter?
	394	+ // A: Kludge kludge kludge kludge!
	395	+ $fancy_permalinks = ('' != get_option('permalink_structure'));
	396	+ if ($fancy_permalinks) :
	397	+ preg_match('|/feed(/([^/]+))?/?$|', $link, $ref);
	398	+
	399	+ $format = (isset($ref[2]) ? $ref[2] : '');
	400	+ if (strlen($format) == 0) : $format = get_default_feed(); endif;
	401	+
	402	+ $replacement = trailingslashit($feedwordpress_the_original_permalink) . 'feed';
	403	+ if ($format != get_default_feed()) :
	404	+ $replacement .= '/'.$format;
	405	+ endif;
	406	+ $replacement = user_trailingslashit($replacement, 'single_feed');
	407	+ else :
	408	+ // No fancy permalinks = no problem
	409	+ // WordPress doesn't call get_permalink() to
	410	+ // generate the comment feed URL, so the
	411	+ // comments feed link is never munged by FWP.
	412	+ endif;
	413	+ endif;
	414	+
	415	+ if (!is_null($replacement)) : $link = $replacement; endif;
453	416	endif;
454		- $fwp_held_ping = NULL; // NULL: not holding pings anymore
455		-}
	417	+ return $link;
	418	+} /* function syndication_comments_feed_link() */
456	419
457		-function fwp_do_pings () {
458		- if (!is_null($fwp_held_ping) and $post_id) : // Defer until we're done updating
459		- $fwp_held_ping = $post_id;
460		- elseif (function_exists('do_all_pings')) :
461		- do_all_pings();
462		- else :
463		- generic_ping($fwp_held_ping);
464		- endif;
465		-}
	420	+ require_once("${dir}/feedwordpress.pings.functions.php");
466	421
467		-function fwp_publish_post_hook ($post_id) {
468		- global $fwp_held_ping;
	422	+ require_once("${dir}/feedwordpress.wp-admin.post-edit.functions.php");
469	423
470		- if (!is_null($fwp_held_ping)) : // Syndicated post. Don't mark with _pingme
471		- if ( defined('XMLRPC_REQUEST') )
472		- do_action('xmlrpc_publish_post', $post_id);
473		- if ( defined('APP_REQUEST') )
474		- do_action('app_publish_post', $post_id);
475		-
476		- if ( defined('WP_IMPORTING') )
477		- return;
	424	+################################################################################
	425	+## class FeedWordPressBoilerplateReformatter ###################################
	426	+################################################################################
478	427
479		- // Defer sending out pings until we finish updating
480		- $fwp_held_ping = $post_id;
481		- else :
482		- if (function_exists('_publish_post_hook')) : // WordPress 2.3
483		- _publish_post_hook($post_id);
484		- endif;
485		- endif;
486		-}
	428	+require_once("${dir}/feedwordpressboilerplatereformatter.class.php");
	429	+require_once("${dir}/feedwordpressboilerplatereformatter.shortcode.functions.php");
487	430
488	431	################################################################################
489	432	## class FeedWordPress #########################################################
490	433	################################################################################
		@@ -522,27 +465,293 @@
522	465	array('q', 'cite'),
523	466	array('script', 'src')
524	467	);
525	468
526		- var $feeds = NULL;
	469	+ var $feeds = null;
	470	+ var $feedurls = null;
	471	+ var $httpauth = null;
527	472
528		- # function FeedWordPress (): Contructor; retrieve a list of feeds
529		- function FeedWordPress () {
	473	+ /**
	474	+ * FeedWordPress::__construct (): Construct FeedWordPress singleton object
	475	+ * and retrieves a list of feeds for later reference.
	476	+ */
	477	+ public function __construct () {
530	478	$this->feeds = array ();
	479	+ $this->feedurls = array();
531	480	$links = FeedWordPress::syndicated_links();
	481	+
532	482	if ($links): foreach ($links as $link):
533		- $this->feeds[] =& new SyndicatedLink($link);
	483	+ $id = intval($link->link_id);
	484	+ $url = $link->link_rss;
	485	+
	486	+ // Store for later reference.
	487	+ $this->feeds[$id] = $id;
	488	+ if (strlen($url) > 0) :
	489	+ $this->feedurls[$url] = $id;
	490	+ endif;
534	491	endforeach; endif;
535		- } // FeedWordPress::FeedWordPress ()
536	492
	493	+ // System-related event hooks
	494	+ add_filter('cron_schedules', array($this, 'cron_schedules'), 10, 1);
	495	+
	496	+ // FeedWordPress-related event hooks
	497	+ add_filter('feedwordpress_update_complete', array($this, 'process_retirements'), 1000, 1);
	498	+
	499	+ $this->httpauth = new FeedWordPressHTTPAuthenticator;
	500	+ } /* FeedWordPress::__construct () */
	501	+
	502	+ /**
	503	+ * FeedWordPress::add_filters() connects FeedWordPress to WordPress lifecycle
	504	+ * events by setting up action and filter hooks.
	505	+ *
	506	+ * @uses get_option()
	507	+ * @uses add_filter()
	508	+ * @uses add_action()
	509	+ * @uses remove_filter()
	510	+ */
	511	+ public function add_filters () {
	512	+ # Syndicated items are generally received in output-ready (X)HTML and
	513	+ # should not be folded, crumpled, mutilated, or spindled by WordPress
	514	+ # formatting filters. But we don't want to interfere with filters for
	515	+ # any locally-authored posts, either.
	516	+ #
	517	+ # What WordPress should really have is a way for upstream filters to
	518	+ # stop downstream filters from running at all. Since it doesn't, and
	519	+ # since a downstream filter can't access the original copy of the text
	520	+ # that is being filtered, what we will do here is (1) save a copy of the
	521	+ # original text upstream, before any other filters run, and then (2)
	522	+ # retrieve that copy downstream, after all the other filters run, *if*
	523	+ # this is a syndicated post
	524	+
	525	+ add_filter('the_content', 'feedwordpress_preserve_syndicated_content', -10000);
	526	+ add_filter('the_content', 'feedwordpress_restore_syndicated_content', 10000);
	527	+
	528	+ add_action('atom_entry', 'feedwordpress_item_feed_data');
	529	+
	530	+ # Filter in original permalinks if the user wants that
	531	+ add_filter('post_link', 'syndication_permalink', /*priority=*/ 1, /*arguments=*/ 3);
	532	+ add_filter('post_type_link', 'syndication_permalink', /*priority=*/ 1, /*arguments=*/ 4);
	533	+
	534	+ # When foreign URLs are used for permalinks in feeds or display
	535	+ # contexts, they need to be escaped properly.
	536	+ add_filter('the_permalink', 'syndication_permalink_escaped');
	537	+ add_filter('the_permalink_rss', 'syndication_permalink_escaped');
	538	+
	539	+ add_filter('post_comments_feed_link', 'syndication_comments_feed_link');
	540	+
	541	+ # WTF? By default, wp_insert_link runs incoming link_url and link_rss
	542	+ # URIs through default filters that include `wp_kses()`. But `wp_kses()`
	543	+ # just happens to escape any occurrence of & to &amp; -- which just
	544	+ # happens to fuck up any URI with a & to separate GET parameters.
	545	+ remove_filter('pre_link_rss', 'wp_filter_kses');
	546	+ remove_filter('pre_link_url', 'wp_filter_kses');
	547	+
	548	+ # Boilerplate functionality: hook in to title, excerpt, and content to add boilerplate text
	549	+ $hookOrder = get_option('feedwordpress_boilerplate_hook_order', FEEDWORDPRESS_BOILERPLATE_DEFAULT_HOOK_ORDER);
	550	+ add_filter(
	551	+ /*hook=*/ 'the_title',
	552	+ /*function=*/ 'add_boilerplate_title',
	553	+ /*priority=*/ $hookOrder,
	554	+ /*arguments=*/ 2
	555	+ );
	556	+ add_filter(
	557	+ /*hook=*/ 'get_the_excerpt',
	558	+ /*function=*/ 'add_boilerplate_excerpt',
	559	+ /*priority=*/ $hookOrder,
	560	+ /*arguments=*/ 1
	561	+ );
	562	+ add_filter(
	563	+ /*hook=*/ 'the_content',
	564	+ /*function=*/ 'add_boilerplate_content',
	565	+ /*priority=*/ $hookOrder,
	566	+ /*arguments=*/ 1
	567	+ );
	568	+ add_filter(
	569	+ /*hook=*/ 'the_content_rss',
	570	+ /*function=*/ 'add_boilerplate_content',
	571	+ /*priority=*/ $hookOrder,
	572	+ /*arguments=*/ 1
	573	+ );
	574	+
	575	+ # Admin menu
	576	+ add_action('admin_init', array($this, 'admin_init'));
	577	+ add_action('admin_menu', array($this, 'add_pages'));
	578	+ add_action('admin_notices', array($this, 'check_debug'));
	579	+
	580	+ add_action('admin_menu', 'feedwordpress_add_post_edit_controls');
	581	+ add_action('save_post', 'feedwordpress_save_post_edit_controls');
	582	+
	583	+ add_action('admin_footer', array($this, 'admin_footer'));
	584	+
	585	+ add_action('syndicated_feed_error', array('FeedWordPressDiagnostic', 'feed_error'), 100, 3);
	586	+
	587	+ add_action('wp_footer', 'debug_out_feedwordpress_footer', -100);
	588	+ add_action('admin_footer', 'debug_out_feedwordpress_footer', -100);
	589	+
	590	+ # Cron-less auto-update. Hooray!
	591	+ $autoUpdateHook = $this->automatic_update_hook();
	592	+ if (!is_null($autoUpdateHook)) :
	593	+ add_action($autoUpdateHook, array($this, 'auto_update'));
	594	+ endif;
	595	+
	596	+ add_action('init', array($this, 'init'));
	597	+ add_action('wp_loaded', array($this, 'wp_loaded'));
	598	+
	599	+ add_action('shutdown', array($this, 'email_diagnostic_log'));
	600	+ add_action('shutdown', array($this, 'feedwordpress_cleanup'));
	601	+ add_action('wp_dashboard_setup', array($this, 'dashboard_setup'));
	602	+
	603	+ # Default sanitizers
	604	+ add_filter('syndicated_item_content', array('SyndicatedPost', 'resolve_relative_uris'), 0, 2);
	605	+ add_filter('syndicated_item_content', array('SyndicatedPost', 'sanitize_content'), 0, 2);
	606	+
	607	+ add_action('plugins_loaded', array($this, 'admin_api'));
	608	+ add_action('all_admin_notices', array($this, 'all_admin_notices'));
	609	+
	610	+ // Use the cache settings that we want, from a static method
	611	+ add_filter('wp_feed_cache_transient_lifetime', array(get_class($this), 'cache_lifetime'));
	612	+
	613	+ } /* FeedWordPress::add_filters () */
	614	+
	615	+ ################################################################################
	616	+ ## ADMIN MENU ADD-ONS: register Dashboard management pages #####################
	617	+ ################################################################################
	618	+
	619	+ /**
	620	+ * FeedWordPress::add_pages(): set up WordPress admin interface pages thru
	621	+ * hooking in Syndication menu and submenus
	622	+ *
	623	+ * @uses FeedWordPress::menu_cap()
	624	+ * @uses FeedWordPress::path()
	625	+ * @uses add_menu_page()
	626	+ * @uses add_submenu_page()
	627	+ * @uses do_action()
	628	+ * @uses add_filter()
	629	+ */
	630	+ public function add_pages () {
	631	+
	632	+ $menu_cap = FeedWordPress::menu_cap();
	633	+ $settings_cap = FeedWordPress::menu_cap(/*sub=*/ true);
	634	+ $syndicationMenu = FeedWordPress::path('syndication.php');
	635	+
	636	+ add_menu_page(
	637	+ 'Syndicated Sites', 'Syndication',
	638	+ $menu_cap,
	639	+ $syndicationMenu,
	640	+ null,
	641	+ $this->plugin_dir_url( 'assets/images/feedwordpress-tiny.png' )
	642	+ );
	643	+
	644	+ do_action('feedwordpress_admin_menu_pre_feeds', $menu_cap, $settings_cap);
	645	+ add_submenu_page(
	646	+ $syndicationMenu, 'Syndicated Sites', 'Syndicated Sites',
	647	+ $settings_cap, $syndicationMenu
	648	+ );
	649	+
	650	+ do_action('feedwordpress_admin_menu_pre_feeds', $menu_cap, $settings_cap);
	651	+ add_submenu_page(
	652	+ $syndicationMenu, 'Syndicated Feeds & Updates', 'Feeds & Updates',
	653	+ $settings_cap, FeedWordPress::path('feeds-page.php')
	654	+ );
	655	+
	656	+ do_action('feedwordpress_admin_menu_pre_posts', $menu_cap, $settings_cap);
	657	+ add_submenu_page(
	658	+ $syndicationMenu, 'Syndicated Posts & Links', 'Posts & Links',
	659	+ $settings_cap, FeedWordPress::path('posts-page.php')
	660	+ );
	661	+
	662	+ do_action('feedwordpress_admin_menu_pre_authors', $menu_cap, $settings_cap);
	663	+ add_submenu_page(
	664	+ $syndicationMenu, 'Syndicated Authors', 'Authors',
	665	+ $settings_cap, FeedWordPress::path('authors-page.php')
	666	+ );
	667	+
	668	+ do_action('feedwordpress_admin_menu_pre_categories', $menu_cap, $settings_cap);
	669	+ add_submenu_page(
	670	+ $syndicationMenu, 'Categories & Tags', 'Categories & Tags',
	671	+ $settings_cap, FeedWordPress::path('categories-page.php')
	672	+ );
	673	+
	674	+ do_action('feedwordpress_admin_menu_pre_performance', $menu_cap, $settings_cap);
	675	+ add_submenu_page(
	676	+ $syndicationMenu, 'FeedWordPress Performance', 'Performance',
	677	+ $settings_cap, FeedWordPress::path('performance-page.php')
	678	+ );
	679	+
	680	+ do_action('feedwordpress_admin_menu_pre_diagnostics', $menu_cap, $settings_cap);
	681	+ add_submenu_page(
	682	+ $syndicationMenu, 'FeedWordPress Diagnostics', 'Diagnostics',
	683	+ $settings_cap, FeedWordPress::path('diagnostics-page.php')
	684	+ );
	685	+
	686	+ add_filter('page_row_actions', array($this, 'row_actions'), 10, 2);
	687	+ add_filter('post_row_actions', array($this, 'row_actions'), 10, 2);
	688	+ } /* function FeedWordPress::add_pages () */
	689	+
	690	+ public function check_debug () {
	691	+ // This is a horrible fucking kludge that I have to do because the
	692	+ // admin notice code is triggered before the code that updates the
	693	+ // setting.
	694	+ $feedwordpress_debug = FeedWordPress::param( 'feedwordpress_debug', get_option( 'feedwordpress_debug' ) );
	695	+
	696	+ FeedWordPressSettingsUI::get_template_part('notice-debug-mode', $feedwordpress_debug, 'html');
	697	+ } /* function FeedWordPress::check_debug () */
	698	+
	699	+ /**
	700	+ * FeedWordPress::subscribed (): Check whether a feed is currently in the
	701	+ * subscription list for FeedWordPress.
	702	+ *
	703	+ * @param mixed $id Numeric ID of a WordPress link object or URL of a feed
	704	+ * @return bool TRUE if currently subscribed; FALSE otherwise.
	705	+ */
	706	+ public function subscribed ($id) {
	707	+ return (isset($this->feedurls[$id]) or isset($this->feeds[$id]));
	708	+ } /* FeedWordPress::subscribed () */
	709	+
	710	+ /**
	711	+ * FeedWordPress::subscription (): Get the SyndicatedLink object for a
	712	+ * given URL or numeric ID, if we have either an active subscription to
	713	+ * it; or a de-activated subscription.
	714	+ *
	715	+ * @param mixed $which Numeric ID for a WordPress link object or string URL for a feed
	716	+ * @return mixed SyndicatedLink object if subscription is found; null if not
	717	+ */
	718	+ public function subscription ($which) {
	719	+ $sub = null;
	720	+
	721	+ if (is_string($which) and isset($this->feedurls[$which])) :
	722	+ $which = $this->feedurls[$which];
	723	+ endif;
	724	+
	725	+ if (isset($this->feeds[$which])) :
	726	+ $sub = $this->feeds[$which];
	727	+ endif;
	728	+
	729	+ // If it's not in the in-memory cache already, try to load it from DB.
	730	+ // This is necessary to fill requests for subscriptions that we don't
	731	+ // cache in memory, e.g. for deactivated feeds.
	732	+ if (is_null($sub)) :
	733	+ $sub = get_bookmark($which);
	734	+ endif;
	735	+
	736	+ // Load 'er up if you haven't already.
	737	+ if (!is_null($sub) and !($sub InstanceOf SyndicatedLink)) :
	738	+ $link = new SyndicatedLink($sub);
	739	+ $this->feeds[$which] = $link;
	740	+ $sub = $link;
	741	+ endif;
	742	+
	743	+ return $sub;
	744	+ } /* FeedWordPress::subscription () */
	745	+
537	746	# function update (): polls for updates on one or more Contributor feeds
538	747	#
539	748	# Arguments:
540	749	# ----------
541	750	# * $uri (string): either the URI of the feed to poll, the URI of the
542		- # (human-readable) website whose feed you want to poll, or NULL.
	751	+ # (human-readable) website whose feed you want to poll, or null.
543	752	#
544		- # If $uri is NULL, then FeedWordPress will poll any feeds that are
	753	+ # If $uri is null, then FeedWordPress will poll any feeds that are
545	754	# ready for polling. It will not poll feeds that are marked as
546	755	# "Invisible" Links (signifying that the subscription has been
547	756	# de-activated), or feeds that are not yet stale according to their
548	757	# TTL setting (which is either set in the feed, or else set
		@@ -554,9 +763,9 @@
554	763	# of new posts added during the update, and 'updated' => the number
555	764	# of old posts that were updated during the update. If both numbers
556	765	# are zero, there was no change since the last poll on that URI.
557	766	#
558		- # * Returns NULL if URI it was passed was not a URI that this
	767	+ # * Returns null if URI it was passed was not a URI that this
559	768	# installation of FeedWordPress syndicates.
560	769	#
561	770	# Effects:
562	771	# --------
		@@ -578,22 +787,29 @@
578	787	# module elements) or else from a randomly-generated time window
579	788	# (between 30 minutes and 2 hours).
580	789	#
581	790	# * New posts from the polled feed are added to the WordPress store.
582		- #
	791	+ #
583	792	# * Updates to existing posts since the last poll are mirrored in the
584	793	# WordPress store.
585	794	#
586		- function update ($uri = null, $crash_ts = null) {
	795	+ public function update ($uri = null, $crash_ts = null) {
587	796	global $wpdb;
588	797
589	798	if (FeedWordPress::needs_upgrade()) : // Will make duplicate posts if we don't hold off
590		- return NULL;
	799	+ return null;
591	800	endif;
592		-
593		- if (!is_null($uri)) :
	801	+
	802	+ if (!is_null($uri) and $uri != '*') :
594	803	$uri = trim($uri);
595	804	else : // Update all
	805	+ if ($this->update_hooked) :
	806	+ $diag = $this->update_hooked;
	807	+ else :
	808	+ $diag = 'Initiating a MANUAL check-in on the update schedule at '.date('r', time());
	809	+ endif;
	810	+ $this->diagnostic('update_schedule:check', $diag);
	811	+
596	812	update_option('feedwordpress_last_update_all', time());
597	813	endif;
598	814
599	815	do_action('feedwordpress_update', $uri);
		@@ -598,28 +814,47 @@
598	814
599	815	do_action('feedwordpress_update', $uri);
600	816
601	817	if (is_null($crash_ts)) :
602		- $crash_dt = (int) get_option('feedwordpress_update_time_limit');
603		- if ($crash_dt > 0) :
604		- $crash_ts = time() + $crash_dt;
605		- else :
606		- $crash_ts = NULL;
607		- endif;
	818	+ $crash_ts = $this->crash_ts();
608	819	endif;
609		-
	820	+
610	821	// Randomize order for load balancing purposes
611		- $feed_set = $this->feeds;
	822	+ $feed_set = array_keys($this->feeds);
612	823	shuffle($feed_set);
613	824
	825	+ $updateWindow = (int) get_option('feedwordpress_update_window', DEFAULT_UPDATE_PERIOD) * 60 /* sec/min */;
	826	+ $interval = (int) get_option('feedwordpress_freshness', FEEDWORDPRESS_FRESHNESS_INTERVAL);
	827	+ $portion = max(
	828	+ (int) ceil(count($feed_set) / ($updateWindow / $interval)),
	829	+ 10
	830	+ );
	831	+
	832	+ $max_polls = apply_filters('feedwordpress_polls_per_update', get_option(
	833	+ 'feedwordpress_polls_per_update', $portion
	834	+ ), $uri);
	835	+
	836	+ $feed_set = apply_filters('feedwordpress_update_feeds', $feed_set, $uri);
	837	+
	838	+
614	839	// Loop through and check for new posts
615		- $delta = NULL;
616		- foreach ($feed_set as $feed) :
617		- if (!is_null($crash_ts) and (time() > $crash_ts)) : // Check whether we've exceeded the time limit
	840	+ $delta = null; $remaining = $max_polls;
	841	+ foreach ($feed_set as $feed_id) :
	842	+
	843	+ $feed = $this->subscription($feed_id);
	844	+
	845	+ // Has this process overstayed its welcome?
	846	+ if (
	847	+ // Over time limit?
	848	+ (!is_null($crash_ts) and (time() > $crash_ts))
	849	+
	850	+ // Over feed count?
	851	+ or ($remaining == 0)
	852	+ ) :
618	853	break;
619	854	endif;
620	855
621		- $pinged_that = (is_null($uri) or in_array($uri, array($feed->uri(), $feed->homepage())));
	856	+ $pinged_that = (is_null($uri) or ($uri=='*') or in_array($uri, array($feed->uri(), $feed->homepage())));
622	857
623	858	if (!is_null($uri)) : // A site-specific ping always updates
624	859	$timely = true;
625	860	else :
		@@ -625,37 +860,120 @@
625	860	else :
626	861	$timely = $feed->stale();
627	862	endif;
628	863
629		- if ($pinged_that and is_null($delta)) : // If at least one feed was hit for updating...
630		- $delta = array('new' => 0, 'updated' => 0); // ... don't return error condition
	864	+ // If at least one feed was hit for updating...
	865	+ if ($pinged_that and is_null($delta)) :
	866	+ // ... don't return error condition
	867	+ $delta = array('new' => 0, 'updated' => 0, 'stored' => 0);
631	868	endif;
632	869
633	870	if ($pinged_that and $timely) :
	871	+ $remaining = $remaining - 1;
	872	+
634	873	do_action('feedwordpress_check_feed', $feed->settings);
635	874	$start_ts = time();
636	875	$added = $feed->poll($crash_ts);
637	876	do_action('feedwordpress_check_feed_complete', $feed->settings, $added, time() - $start_ts);
638	877
639		- if (isset($added['new'])) : $delta['new'] += $added['new']; endif;
640		- if (isset($added['updated'])) : $delta['updated'] += $added['updated']; endif;
	878	+ if (is_array($added)) : // Success
	879	+ foreach ($added as $key => $count) :
	880	+ $delta[$key] += $added[$key];
	881	+ endforeach;
	882	+ endif;
641	883	endif;
642	884	endforeach;
643	885
644	886	do_action('feedwordpress_update_complete', $delta);
	887	+ return $delta;
	888	+ } /* FeedWordPress::update () */
645	889
646		- return $delta;
647		- }
	890	+ public function crash_ts ($default = null) {
	891	+ $crash_dt = (int) get_option('feedwordpress_update_time_limit', 0);
	892	+ if ($crash_dt > 0) :
	893	+ $crash_ts = time() + $crash_dt;
	894	+ else :
	895	+ $crash_ts = $default;
	896	+ endif;
	897	+ return $crash_ts;
	898	+ } /* FeedWordPress::crash_ts () */
648	899
649		- function stale () {
650		- if (get_option('feedwordpress_automatic_updates')) :
651		- $last = get_option('feedwordpress_last_update_all');
652		-
	900	+ public function secret_key () {
	901	+ $secret = get_option('feedwordpress_secret_key', false);
	902	+ if (!$secret) : // Generate random key.
	903	+ $secret = substr(md5(uniqid(microtime())), 0, 6);
	904	+ update_option('feedwordpress_secret_key', $secret);
	905	+ endif;
	906	+ return $secret;
	907	+ } /* FeedWordPress::secret_key () */
	908	+
	909	+ public function has_secret () {
	910	+ return (MyPHP::request('feedwordpress_key')==$this->secret_key());
	911	+ } /* FeedWordPress::has_secret () */
	912	+
	913	+ var $update_hooked = null;
	914	+ public function automatic_update_hook ($params = array()) {
	915	+ $params = wp_parse_args($params, array( // Defaults
	916	+ 'setting only' => false,
	917	+ ));
	918	+ $hook = get_option('feedwordpress_automatic_updates', null);
	919	+ $method = 'FeedWordPress option';
	920	+
	921	+ // Allow for forced behavior in testing.
	922	+ if (
	923	+ !$params['setting only']
	924	+ and $this->has_secret()
	925	+ and MyPHP::request('automatic_update')
	926	+ ) :
	927	+ $hook = MyPHP::request('automatic_update');
	928	+ $method = 'URL parameter';
	929	+ endif;
	930	+
	931	+ $exact = $hook; // Before munging
	932	+
	933	+ if (!!$hook) :
	934	+ if ($hook == 'init' or $hook == 'wp_loaded') : // Re-map init to wp_loaded
	935	+ $hook = ($params['setting only'] ? 'init' : 'wp_loaded');
	936	+
	937	+ // Constrain possible values. If it's not an init or wp_loaded, it's a shutdown
	938	+ else :
	939	+ $hook = 'shutdown';
	940	+ endif;
	941	+ endif;
	942	+
	943	+ if ($hook) :
	944	+ $this->update_hooked = "Initiating an AUTOMATIC CHECK FOR UPDATES ON PAGE LOAD ".$hook." due to ".$method." = ".trim($this->val($exact));
	945	+ endif;
	946	+
	947	+ return $hook;
	948	+ } /* FeedWordPress::automatic_update_hook () */
	949	+
	950	+ public function last_update_all () {
	951	+ $last = get_option('feedwordpress_last_update_all');
	952	+ if ( $this->has_secret() and FeedWordPress::param('automatic_update') ) :
	953	+ $last = 1; // A long, long time ago.
	954	+ elseif ( $this->has_secret() and FeedWordPress::param('last_update_all') ) :
	955	+ $last = FeedWordPress::param( 'last_update_all' );
	956	+ endif;
	957	+ return $last;
	958	+ } /* FeedWordPress::last_update_all () */
	959	+
	960	+ public function force_update_all () {
	961	+ return ($this->has_secret() and FeedWordPress::param( 'force_update_feeds' ));
	962	+ } /* FeedWordPress::force_update_all () */
	963	+
	964	+ public function stale () {
	965	+ if (!is_null($this->automatic_update_hook())) :
	966	+ // Do our best to avoid possible simultaneous
	967	+ // updates by getting up-to-the-minute settings.
	968	+
	969	+ $last = $this->last_update_all();
	970	+
653	971	// If we haven't updated all yet, give it a time window
654	972	if (false === $last) :
655	973	$ret = false;
656	974	update_option('feedwordpress_last_update_all', time());
657		-
	975	+
658	976	// Otherwise, check against freshness interval
659	977	elseif (is_numeric($last)) : // Expect a timestamp
660	978	$freshness = get_option('feedwordpress_freshness');
661	979	if (false === $freshness) : // Use default
		@@ -660,2185 +978,1389 @@
660	978	$freshness = get_option('feedwordpress_freshness');
661	979	if (false === $freshness) : // Use default
662	980	$freshness = FEEDWORDPRESS_FRESHNESS_INTERVAL;
663	981	endif;
664		- $ret = ( (time() - $last) > $freshness);
	982	+ $ret = ( (time() - $last) > $freshness );
665	983
666		- // This should never happen.
	984	+ // This should never happen.
667	985	else :
668		- FeedWordPress::critical_bug('FeedWordPress::stale::last', $last, __LINE__);
	986	+ FeedWordPressDiagnostic::critical_bug('FeedWordPress::stale::last', $last, __LINE__, __FILE__);
669	987	endif;
670	988
671		- // Explicit request for an update (e.g. from a cron job).
672		- elseif (FeedWordPress::update_requested()) :
673		- $ret = true;
674		-
675	989	else :
676	990	$ret = false;
677	991	endif;
678	992	return $ret;
679		- } // FeedWordPress::stale()
680		-
681		- function update_requested () {
682		- return (isset($_REQUEST['update_feedwordpress']) and $_REQUEST['update_feedwordpress']);
683		- } // FeedWordPress::update_requested()
	993	+ } /* FeedWordPress::stale() */
684	994
685		- function syndicate_link ($name, $uri, $rss) {
686		- global $wpdb;
687		-
688		- // Get the category ID#
689		- $cat_id = FeedWordPress::link_category_id();
	995	+ static function admin_init () {
	996	+ // WordPress 3.5+ compat: the WP devs are in the midst of removing Links from the WordPress core. Eventually we'll have to deal
	997	+ // with the possible disappearance of the wp_links table as a whole; but in the meantime, we just need to turn on the interface
	998	+ // element to avoid problems with user capabilities that presume the presence of the Links Manager in the admin UI.
	999	+ if (!intval(get_option('link_manager_enabled', false))) :
	1000	+ update_option('link_manager_enabled', true);
	1001	+ endif;
690	1002
691		- // WordPress gets cranky if there's no homepage URI
692		- if (!isset($uri) or strlen($uri)<1) : $uri = $rss; endif;
693		-
694		- if (function_exists('wp_insert_link')) { // WordPress 2.x
695		- $link_id = wp_insert_link(array(
696		- "link_name" => $name,
697		- "link_url" => $uri,
698		- "link_category" => array($cat_id),
699		- "link_rss" => $rss
700		- ));
701		- } else { // WordPress 1.5.x
702		- $result = $wpdb->query("
703		- INSERT INTO $wpdb->links
704		- SET
705		- link_name = '".$wpdb->escape($name)."',
706		- link_url = '".$wpdb->escape($uri)."',
707		- link_category = '".$wpdb->escape($cat_id)."',
708		- link_rss = '".$wpdb->escape($rss)."'
709		- ");
710		- $link_id = $wpdb->insert_id;
711		- } // if
712		- return $link_id;
713		- } // function FeedWordPress::syndicate_link()
	1003	+ if (defined('FEEDWORDPRESS_PREPARE_TO_ZAP') and FEEDWORDPRESS_PREPARE_TO_ZAP) :
	1004	+ $post_id = FEEDWORDPRESS_PREPARE_TO_ZAP;
	1005	+ $sendback = wp_get_referer();
	1006	+ if (
	1007	+ ! $sendback
	1008	+ or strpos( $sendback, 'post.php' ) !== false
	1009	+ or strpos( $sendback, 'post-new.php' ) !== false
	1010	+ ) :
	1011	+ if ( 'attachment' == $post_type ) :
	1012	+ $sendback = admin_url( 'upload.php' );
	1013	+ else :
	1014	+ $sendback = admin_url( 'edit.php' );
	1015	+ $sendback .= ( ! empty( $post_type ) ) ? '?post_type=' . $post_type : '';
	1016	+ endif;
	1017	+ else :
	1018	+ $sendback = esc_url( remove_query_arg( array('trashed', 'untrashed', 'deleted', 'zapped', 'unzapped', 'ids'), $sendback ) );
	1019	+ endif;
714	1020
715		- function on_unfamiliar ($what = 'author', $override = NULL) {
716		- $set = array(
717		- 'author' => array('create', 'default', 'filter'),
718		- 'category' => array('create', 'tag', 'default', 'filter'),
719		- );
720		-
721		- if (is_string($override)) :
722		- $ret = strtolower($override);
723		- endif;
	1021	+ // Make sure we have a post corresponding to this ID.
	1022	+ $post = $post_type = $post_type_object = null;
	1023	+ if ( $post_id ) :
	1024	+ $post = get_post( $post_id );
	1025	+ endif;
724	1026
725		- if (!is_numeric($override) and !in_array($ret, $set[$what])) :
726		- $ret = get_option('feedwordpress_unfamiliar_'.$what);
727		- if (!is_numeric($ret) and !in_array($ret, $set[$what])) :
728		- $ret = 'create';
	1027	+ if ( $post ) :
	1028	+ $post_type = $post->post_type;
729	1029	endif;
730		- endif;
	1030	+ $p = get_post($post_id);
731	1031
732		- return $ret;
733		- } // function FeedWordPress::on_unfamiliar()
734		-
735		- function null_email_set () {
736		- $base = get_option('feedwordpress_null_email_set');
737		-
738		- if ($base===false) :
739		- $ret = array('noreply@blogger.com'); // default
740		- else :
741		- $ret = array_map('strtolower',
742		- array_map('trim', explode("\n", $base)));
743		- endif;
744		- $ret = apply_filters('syndicated_item_author_null_email_set', $ret);
745		- return $ret;
746		-
747		- } /* FeedWordPress::null_email_set () */
748		-
749		- function is_null_email ($email) {
750		- $ret = in_array(strtolower(trim($email)), FeedWordPress::null_email_set());
751		- $ret = apply_filters('syndicated_item_author_is_null_email', $ret, $email);
752		- return $ret;
753		- } /* FeedWordPress::is_null_email () */
754		-
755		- function use_aggregator_source_data () {
756		- $ret = get_option('feedwordpress_use_aggregator_source_data');
757		- return apply_filters('syndicated_post_use_aggregator_source_data', ($ret=='yes'));
758		- }
759		-
760		- function syndicated_links () {
761		- $contributors = FeedWordPress::link_category_id();
762		- if (function_exists('get_bookmarks')) :
763		- $links = get_bookmarks(array("category" => $contributors));
764		- else:
765		- $links = get_linkobjects($contributors); // deprecated as of WP 2.1
766		- endif;
767		- return $links;
768		- } // function FeedWordPress::syndicated_links()
769		-
770		- function link_category_id () {
771		- global $wpdb, $wp_db_version;
772		-
773		- $cat_id = get_option('feedwordpress_cat_id');
774		-
775		- // If we don't yet *have* the category, we'll have to create it
776		- if ($cat_id === false) :
777		- $cat = $wpdb->escape(DEFAULT_SYNDICATION_CATEGORY);
	1032	+ if ( ! $post ) :
	1033	+ wp_die( __( 'The item you are trying to zap no longer exists.' ) );
	1034	+ endif;
778	1035
779		- // Look for something with the right name...
780		- // -----------------------------------------
781		-
782		- // WordPress 2.3 introduces a new taxonomy/term API
783		- if (function_exists('is_term')) :
784		- $cat_id = is_term($cat, 'link_category');
785		- // WordPress 2.1 and 2.2 use a common table for both link and post categories
786		- elseif (isset($wp_db_version) and ($wp_db_version >= FWP_SCHEMA_21 and $wp_db_version < FWP_SCHEMA_23) ) :
787		- $cat_id = $wpdb->get_var("SELECT cat_id FROM {$wpdb->categories} WHERE cat_name='$cat'");
788		- // WordPress 1.5 and 2.0.x have a separate table for link categories
789		- elseif (!isset($wp_db_version) or $wp_db_version < FWP_SCHEMA_21) :
790		- $cat_id = $wpdb->get_var("SELECT cat_id FROM {$wpdb->linkcategories} WHERE cat_name='$cat'");
791		- // This should never happen.
792		- else :
793		- FeedWordPress::critical_bug('FeedWordPress::link_category_id::wp_db_version', $wp_db_version, __LINE__);
	1036	+ if ( ! current_user_can( 'delete_post', $post_id ) ) :
	1037	+ wp_die( __( 'You are not allowed to zap this item.' ) );
794	1038	endif;
795		-
796		- // If you still can't find anything, make it for yourself.
797		- // -------------------------------------------------------
798		- if (!$cat_id) :
799		- // WordPress 2.3+ term/taxonomy API
800		- if (function_exists('wp_insert_term')) :
801		- $term = wp_insert_term($cat, 'link_category');
802		- $cat_id = $term['term_id'];
803		- // WordPress 2.1, 2.2 category API. By the way, why the fuck is this API function only available in a wp-admin module?
804		- elseif (function_exists('wp_insert_category')) :
805		- $cat_id = wp_insert_category(array('cat_name' => $cat));
806		- // WordPress 1.5 and 2.0.x
807		- elseif (!isset($wp_db_version) or $wp_db_version < FWP_SCHEMA_21) :
808		- $result = $wpdb->query("
809		- INSERT INTO $wpdb->linkcategories
810		- SET
811		- cat_id = 0,
812		- cat_name='$cat',
813		- show_images='N',
814		- show_description='N',
815		- show_rating='N',
816		- show_updated='N',
817		- sort_order='name'
818		- ");
819		- $cat_id = $wpdb->insert_id;
820		- // This should never happen.
821		- else :
822		- FeedWordPress::critical_bug('FeedWordPress::link_category_id::wp_db_version', $wp_db_version, __LINE__);
823		- endif;
	1039	+
	1040	+ if ( $user_id = wp_check_post_lock( $post_id ) ) :
	1041	+ $user = get_userdata( $user_id );
	1042	+ wp_die( sprintf( __( 'You cannot retire this item. %s is currently editing.' ), $user->display_name ) );
824	1043	endif;
	1044	+
	1045	+ if (FeedWordPress::param( 'fwp_post_delete' ) == 'zap') :
	1046	+ FeedWordPress::diagnostic('syndicated_posts', 'Zapping existing post # '.$p->ID.' "'.$p->post_title.'" due to user request.');
	1047	+
	1048	+ $old_status = $post->post_status;
	1049	+
	1050	+ set_post_field('post_status', 'fwpzapped', $post_id);
	1051	+ wp_transition_post_status('fwpzapped', $old_status, $post);
825	1052
826		- update_option('feedwordpress_cat_id', $cat_id);
827		- endif;
828		- return $cat_id;
829		- } // function FeedWordPress::link_category_id()
	1053	+ # Set up the post to have its content blanked on
	1054	+ # next update if you do not undo the zapping.
	1055	+ add_post_meta($post_id, '_feedwordpress_zapped_blank_me', 1, /*unique=*/ true);
	1056	+ add_post_meta($post_id, '_feedwordpress_zapped_blank_old_status', $old_status, /*unique=*/ true);
	1057	+
	1058	+ wp_redirect( esc_url_raw( add_query_arg( array('zapped' => 1, 'ids' => $post_id), $sendback ) ) );
830	1059
831		- # Upgrades and maintenance...
832		- function needs_upgrade () {
833		- global $wpdb;
834		- $fwp_db_version = get_option('feedwordpress_version');
835		- $ret = false; // innocent until proven guilty
836		- if (!$fwp_db_version or $fwp_db_version < FEEDWORDPRESS_VERSION) :
837		- // This is an older version or a fresh install. Does it
838		- // require a database upgrade or database initialization?
839		- if ($fwp_db_version > 0.96) :
840		- // No. Just brand it with the new version.
841		- update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
842	1060	else :
843		- // Yes. Check to see whether this is a fresh install or an upgrade.
844		- $syn = $wpdb->get_col("
845		- SELECT post_id
846		- FROM $wpdb->postmeta
847		- WHERE meta_key = 'syndication_feed'
848		- ");
849		- if (count($syn) > 0) : // contains at least one syndicated post
850		- $ret = true;
851		- else : // fresh install; brand it as ours
852		- update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
853		- endif;
	1061	+ $old_status = get_post_meta($post_id, '_feedwordpress_zapped_blank_old_status', /*single=*/ true);
	1062	+
	1063	+ set_post_field('post_status', $old_status, $post_id);
	1064	+ wp_transition_post_status($old_status, 'fwpzapped', $post);
	1065	+
	1066	+ # O.K., make sure this post does not get blanked
	1067	+ delete_post_meta($post_id, '_feedwordpress_zapped_blank_me');
	1068	+ delete_post_meta($post_id, '_feedwordpress_zapped_blank_old_status');
	1069	+
	1070	+ wp_redirect( esc_url_raw( add_query_arg( array('unzapped' => 1, 'ids' => $post_id), $sendback ) ) );
	1071	+
854	1072	endif;
	1073	+
	1074	+ // Intercept, don't pass on.
	1075	+ exit;
855	1076	endif;
856		- return $ret;
857		- }
	1077	+ } /* FeedWordPress::admin_init() */
858	1078
859		- function upgrade_database ($from = NULL) {
860		- global $wpdb;
	1079	+ public function admin_api () {
	1080	+ // This sucks, but WordPress doesn't give us any other way to
	1081	+ // easily invoke a permanent-delete from a plugged in post
	1082	+ // actions link. So we create a magic parameter, and when this
	1083	+ // magic parameter is activated, the WordPress trashcan is
	1084	+ // temporarily de-activated.
861	1085
862		- if (is_null($from) or $from <= 0.96) : $from = 0.96; endif;
	1086	+ if (FeedWordPress::param( 'fwp_post_delete' ) == 'nuke') :
	1087	+ // Get post ID #
	1088	+ $post_id = FeedWordPress::param( 'post' );
	1089	+ if (!$post_id) :
	1090	+ $post_id = FeedWordPress::param( 'post_ID' );
	1091	+ endif;
863	1092
864		- switch ($from) :
865		- case 0.96: // account for changes to syndication custom values and guid
866		- echo "<p>Upgrading database from {$from} to ".FEEDWORDPRESS_VERSION."...</p>\n";
	1093	+ // Make sure we've got the right nonce and all that.
	1094	+ check_admin_referer('delete-post_' . $post_id);
867	1095
868		- $cat_id = FeedWordPress::link_category_id();
	1096	+ // If so, disable the trashcan.
	1097	+ define('EMPTY_TRASH_DAYS', 0);
869	1098
870		- // Avoid duplicates
871		- $wpdb->query("DELETE FROM `{$wpdb->postmeta}` WHERE meta_key = 'syndication_feed_id'");
	1099	+ elseif ( FeedWordPress::param( 'fwp_post_delete' ) == 'zap' || FeedWordPress::param( 'fwp_post_delete' ) == 'unzap' ) :
	1100	+ // Get post ID #
	1101	+ $post_id = FeedWordPress::param( 'post' );
	1102	+ if (!$post_id) :
	1103	+ $post_id = FeedWordPress::param( 'post_ID' );
	1104	+ endif;
872	1105
873		- // Look up all the link IDs
874		- $wpdb->query("
875		- CREATE TEMPORARY TABLE tmp_custom_values
876		- SELECT
877		- NULL AS meta_id,
878		- post_id,
879		- 'syndication_feed_id' AS meta_key,
880		- link_id AS meta_value
881		- FROM `{$wpdb->postmeta}`, `{$wpdb->links}`
882		- WHERE
883		- meta_key='syndication_feed'
884		- AND meta_value=link_rss
885		- AND link_category = {$cat_id}
886		- ");
	1106	+ // Make sure we've got the right nonce and all that
	1107	+ check_admin_referer('delete-post_' . $post_id);
	1108	+
	1109	+ // If so, get ready to intercept the call a little
	1110	+ // further down the line.
887	1111
888		- // Now attach them to their posts
889		- $wpdb->query("INSERT INTO `{$wpdb->postmeta}` SELECT * FROM tmp_custom_values");
	1112	+ define('FEEDWORDPRESS_PREPARE_TO_ZAP', $post_id);
890	1113
891		- // And clean up after ourselves.
892		- $wpdb->query("DROP TABLE tmp_custom_values");
893		-
894		- // Now fix the guids to avoid duplicate posts
895		- echo "<ul>";
896		- foreach ($this->feeds as $feed) :
897		- echo "<li>Fixing post meta-data for <cite>".$feed['link/name']."</cite> &#8230; "; flush();
898		- $rss = @fetch_rss($feed['link/uri']);
899		- if (is_array($rss->items)) :
900		- foreach ($rss->items as $item) :
901		- $guid = $wpdb->escape(FeedWordPress::guid($item, $feed)); // new GUID algorithm
902		- $link = $wpdb->escape($item['link']);
903		-
904		- $wpdb->query("
905		- UPDATE `{$wpdb->posts}` SET guid='{$guid}' WHERE guid='{$link}'
906		- ");
907		- endforeach;
908		- endif;
909		- echo "<strong>complete.</strong></li>\n";
910		- endforeach;
911		- echo "</ul>\n";
	1114	+ endif;
912	1115
913		- // Mark the upgrade as successful.
914		- update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
915		- endswitch;
916		- echo "<p>Upgrade complete. FeedWordPress is now ready to use again.</p>";
917		- } /* FeedWordPress::upgrade_database() */
	1116	+ } /* FeedWordPress::admin_api () */
918	1117
919		- function create_guid_index () {
920		- global $wpdb;
	1118	+ public function all_admin_notices () {
	1119	+ if (FeedWordPress::param( 'zapped' )) :
	1120	+ $n = intval( FeedWordPress::param( 'zapped' ) );
	1121	+?>
	1122	+<div id="message" class="updated"><p><?php print esc_html( $n ); ?> syndicated item<?php print esc_html( $n != 1 ? 's' : '' ); ?> zapped. <strong>These items will not be re-syndicated.</strong> If this was a mistake, you must <strong>immediately</strong> Un-Zap them in the Zapped items section to avoid losing the data.</p></div>
	1123	+<?php
	1124	+ endif;
921	1125
922		- $wpdb->query("
923		- CREATE INDEX {$wpdb->posts}_guid_idx ON {$wpdb->posts}(guid)
924		- ");
925		- } /* FeedWordPress::create_guid_index () */
	1126	+ if ( FeedWordPress::param( 'unzapped' ) ) :
	1127	+ $n = intval( FeedWordPress::param( 'unzapped' ) );
	1128	+?>
	1129	+<div id="message" class="updated"><p><?php print esc-html( $n ); ?> syndicated item<?php print esc_html( $n != 1 ? 's' : '' ) ?> un-zapped and restored to normal.</p></div>
	1130	+<?php
	1131	+ endif;
	1132	+ } /* FeedWordPress::all_admin_notices () */
926	1133
927		- # Utility functions for handling text settings
928		- function negative ($f, $setting) {
929		- $nego = array ('n', 'no', 'f', 'false');
930		- return (isset($f[$setting]) and in_array(strtolower($f[$setting]), $nego));
	1134	+ public function process_retirements ($delta) {
	1135	+ update_option('feedwordpress_process_zaps', 1);
	1136	+
	1137	+ return $delta;
931	1138	}
	1139	+
	1140	+ public function feedwordpress_cleanup () {
	1141	+ if (get_option('feedwordpress_process_zaps', null)) :
	1142	+ $q = new WP_Query(array(
	1143	+ 'fields' => '_synfrom',
	1144	+ 'post_status' => 'fwpzapped',
	1145	+ 'ignore_sticky_posts' => true,
	1146	+ 'meta_key' => '_feedwordpress_zapped_blank_me',
	1147	+ 'meta_value' => 1,
	1148	+ ));
	1149	+
	1150	+ if ($q->have_posts()) :
	1151	+ foreach ($q->posts as $p) :
932	1152
933		- function affirmative ($f, $setting) {
934		- $affirmo = array ('y', 'yes', 't', 'true', 1);
935		- return (isset($f[$setting]) and in_array(strtolower($f[$setting]), $affirmo));
936		- }
	1153	+ $post_id = $p->ID;
	1154	+ $revisions = wp_get_post_revisions($post_id, array("check_enabled" => false));
	1155	+
	1156	+ # Now nuke the content of the post & its revisions
	1157	+ set_post_field('post_content', '', $post_id);
	1158	+ set_post_field('post_excerpt', '', $post_id);
	1159	+
	1160	+ foreach ($revisions as $rev) :
	1161	+ set_post_field('post_content', '', $rev->ID);
	1162	+ set_post_field('post_excerpt', '', $rev->ID);
	1163	+ endforeach;
	1164	+
	1165	+ # Un-tag it for blanking.
	1166	+ delete_post_meta($p->ID, '_feedwordpress_zapped_blank_me');
	1167	+
	1168	+ # Don't remove old_status indicator. A later
	1169	+ # update from the feed may cause us to once
	1170	+ # again have some content so we can un-zap.
	1171	+
	1172	+ endforeach;
	1173	+ endif;
	1174	+
	1175	+ $q = new WP_Query(array(
	1176	+ 'fields' => '_synfrom',
	1177	+ 'post_status' => 'fwpzapped',
	1178	+ 'ignore_sticky_posts' => true,
	1179	+ 'meta_key' => '_feedwordpress_zapped_blank_me',
	1180	+ 'meta_value' => 2,
	1181	+ ));
	1182	+
	1183	+ if ($q->have_posts()) :
	1184	+ foreach ($q->posts as $p) :
	1185	+ update_post_meta($p->ID, '_feedwordpress_zapped_blank_me', 1);
	1186	+ endforeach;
	1187	+ endif;
	1188	+
	1189	+ update_option('feedwordpress_process_zaps', 0);
	1190	+ endif;
	1191	+ } /* FeedWordPress::feedwordpress_cleanup () */
	1192	+
	1193	+ public function init () {
937	1194
	1195	+ // If this is a FeedWordPress admin page, queue up scripts for AJAX
	1196	+ // functions that FWP uses. If it is a display page or a non-FWP admin
	1197	+ // page, don't.
	1198	+ wp_register_style('feedwordpress-elements', $this->plugin_dir_url( 'assets/css/feedwordpress-elements.css') );
	1199	+ if (FeedWordPressSettingsUI::is_admin()) :
	1200	+ // For JavaScript that needs to be generated dynamically
	1201	+ add_action('admin_print_scripts', array('FeedWordPressSettingsUI', 'admin_scripts'));
938	1202
939		- # Internal debugging functions
940		- function critical_bug ($varname, $var, $line) {
941		- global $wp_version;
	1203	+ // For CSS that needs to be generated dynamically.
	1204	+ add_action('admin_print_styles', array('FeedWordPressSettingsUI', 'admin_styles'));
942	1205
943		- 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>';
944		- echo "\n<plaintext>";
945		- echo "Triggered at line # ".$line."\n";
946		- echo "FeedWordPress version: ".FEEDWORDPRESS_VERSION."\n";
947		- echo "WordPress version: $wp_version\n";
948		- echo "PHP version: ".phpversion()."\n";
949		- echo "\n";
950		- echo $varname.": "; var_dump($var); echo "\n";
951		- die;
952		- }
953		-} // class FeedWordPress
	1206	+ wp_enqueue_style('dashboard');
	1207	+ wp_enqueue_style('feedwordpress-elements');
	1208	+ endif;
954	1209
955		-class SyndicatedPost {
956		- var $item = null;
957		-
958		- var $link = null;
959		- var $feed = null;
960		- var $feedmeta = null;
961		-
962		- var $post = array ();
963		- var $_base = null;
	1210	+ // These are a special post statuses for hiding posts that have
	1211	+ // expired from the feed or been marked for permanent zapping by
	1212	+ // the FWP admin.
	1213	+ register_post_status('fwpretired', array(
	1214	+ 'label' => _x('Retired', 'post'),
	1215	+ 'label_count' => _n_noop('Retired <span class="count">(%s)</span>', 'Retired <span class="count">(%s)</span>'),
	1216	+ 'exclude_from_search' => true,
	1217	+ 'public' => false,
	1218	+ 'publicly_queryable' => false,
	1219	+ 'show_in_admin_all_list' => false,
	1220	+ 'show_in_admin_status_list' => true,
	1221	+ ));
	1222	+ register_post_status('fwpzapped', array(
	1223	+ 'label' => _x('Zapped', 'post'),
	1224	+ 'label_count' => _n_noop('Zapped <span class="count">(%s)</span>', 'Retired <span class="count">(%s)</span>'),
	1225	+ 'exclude_from_search' => true,
	1226	+ 'public' => false,
	1227	+ 'publicly_queryable' => false,
	1228	+ 'show_in_admin_all_list' => false,
	1229	+ 'show_in_admin_status_list' => true,
	1230	+ ));
	1231	+ add_action(
	1232	+ /*hook=*/ 'template_redirect',
	1233	+ /*function=*/ array($this, 'redirect_retired'),
	1234	+ /*priority=*/ -100
	1235	+ );
964	1236
965		- var $_freshness = null;
966		- var $_wp_id = null;
	1237	+ add_action('wp_ajax_fwp_feeds', array($this, 'fwp_feeds'));
	1238	+ add_action('wp_ajax_fwp_feedcontents', array($this, 'fwp_feedcontents'));
	1239	+ add_action('wp_ajax_fwp_xpathtest', array($this, 'fwp_xpathtest'));
967	1240
968		- function SyndicatedPost ($item, $link) {
969		- global $wpdb;
	1241	+ } /* FeedWordPress::init() */
970	1242
971		- $this->link = $link;
972		- $feedmeta = $link->settings;
973		- $feed = $link->magpie;
	1243	+ /**
	1244	+ * FeedWordPress::wp_loaded (): Once all plugin and theme modules have been
	1245	+ * loaded and initialized (by actions on the init hook, etc.), check the HTTP
	1246	+ * request to see if we need to perform any special FeedWordPress-related
	1247	+ * actions.
	1248	+ *
	1249	+ * @since 2016.0614
	1250	+ */
	1251	+ public function wp_loaded () {
	1252	+ $this->clear_cache_magic_url();
	1253	+ $this->update_magic_url();
	1254	+ } /* FeedWordPress::wp_loaded () */
	1255	+
	1256	+ /**
	1257	+ * FeedWordPress::cron_schedules(): Filter hook to add WP-Cron schedules
	1258	+ * that plugins like FeedWordPress can use to carry out scheduled events.
	1259	+ *
	1260	+ * @param array $schedules An associative array containing the current set of cron schedules (hourly, daily, etc.)
	1261	+ * @return array The same array, with a new entry ('fwp_checkin_interval') added to the list.
	1262	+ *
	1263	+ * @since 2017.1021
	1264	+ */
	1265	+ public function cron_schedules ($schedules) {
	1266	+ $interval = FEEDWORDPRESS_DEFAULT_CHECKIN_INTERVAL*60 /*sec/min*/;
974	1267
975		- # This is ugly as all hell. I'd like to use apply_filters()'s
976		- # alleged support for a variable argument count, but this seems
977		- # to have been broken in WordPress 1.5. It'll be fixed somehow
978		- # in WP 1.5.1, but I'm aiming at WP 1.5 compatibility across
979		- # the board here.
980		- #
981		- # Cf.: <http://mosquito.wordpress.org/view.php?id=901>
982		- global $fwp_channel, $fwp_feedmeta;
983		- $fwp_channel = $feed; $fwp_feedmeta = $feedmeta;
	1268	+ // add 'fwp_checkin_interval' to the existing set
	1269	+ $schedules['fwp_checkin_interval'] = array(
	1270	+ 'interval' => $interval,
	1271	+ 'display' => 'FeedWordPress update schedule check-in',
	1272	+ );
984	1273
985		- $this->feed = $feed;
986		- $this->feedmeta = $feedmeta;
	1274	+ return $schedules;
	1275	+ } /* FeedWordPress::cron_schedules () */
987	1276
988		- $this->item = $item;
989		- $this->item = apply_filters('syndicated_item', $this->item, $this);
	1277	+ public function fwp_feeds () {
	1278	+ $feeds = array();
	1279	+ $feed_ids = $this->feeds;
990	1280
991		- # Filters can halt further processing by returning NULL
992		- if (is_null($this->item)) :
993		- $this->post = NULL;
994		- else :
995		- # Note that nothing is run through $wpdb->escape() here.
996		- # That's deliberate. The escaping is done at the point
997		- # of insertion, not here, to avoid double-escaping and
998		- # to avoid screwing with syndicated_post filters
	1281	+ foreach ($feed_ids as $id) :
	1282	+ $sub = $this->subscription($id);
	1283	+ $feeds[] = array(
	1284	+ "id" => $id,
	1285	+ "url" => $sub->uri(),
	1286	+ "name" => $sub->name(/*fromFeed=*/ false),
	1287	+ );
	1288	+ endforeach;
999	1289
1000		- $this->post['post_title'] = apply_filters('syndicated_item_title', $this->item['title'], $this);
	1290	+ header("Content-Type: application/json");
	1291	+ echo json_encode($feeds);
	1292	+ exit;
	1293	+ } /* FeedWordPress::fwp_feeds () */
1001	1294
1002		- // This just gives us an alphanumeric representation of
1003		- // the author. We will look up (or create) the numeric
1004		- // ID for the author in SyndicatedPost::add()
1005		- $this->post['named']['author'] = apply_filters('syndicated_item_author', $this->author(), $this);
	1295	+ public function fwp_feedcontents () {
	1296	+ $feed_id = FeedWordPress::param( 'feed_id' );
1006	1297
1007		- # Identify content and sanitize it.
1008		- # ---------------------------------
1009		- if (isset($this->item['xhtml']['body'])) :
1010		- $content = $this->item['xhtml']['body'];
1011		- elseif (isset($this->item['xhtml']['div'])) :
1012		- $content = $this->item['xhtml']['div'];
1013		- elseif (isset($this->item['content']['encoded']) and $this->item['content']['encoded']):
1014		- $content = $this->item['content']['encoded'];
1015		- else:
1016		- $content = $this->item['description'];
1017		- endif;
1018		- $this->post['post_content'] = apply_filters('syndicated_item_content', $content, $this);
	1298	+ // Let's load up some data from the feed . . .
	1299	+ $feed = $this->subscription($feed_id);
	1300	+ $posts = $feed->live_posts();
1019	1301
1020		- # Identify and sanitize excerpt
1021		- $excerpt = NULL;
1022		- if ( isset($this->item['description']) and $this->item['description'] ) :
1023		- $excerpt = $this->item['description'];
1024		- elseif ( isset($content) and $content ) :
1025		- $excerpt = strip_tags($content);
1026		- if (strlen($excerpt) > 255) :
1027		- $excerpt = substr($excerpt,0,252).'...';
1028		- endif;
1029		- endif;
1030		- $excerpt = apply_filters('syndicated_item_excerpt', $excerpt, $this);
	1302	+ if (is_wp_error($posts)) :
	1303	+ header("HTTP/1.1 502 Bad Gateway");
	1304	+ $result = $posts;
	1305	+ else :
	1306	+ $result = array();
1031	1307
1032		- if (!is_null($excerpt)):
1033		- $this->post['post_excerpt'] = $excerpt;
1034		- endif;
1035		-
1036		- // This is unnecessary if we use wp_insert_post
1037		- if (!$this->use_api('wp_insert_post')) :
1038		- $this->post['post_name'] = sanitize_title($this->post['post_title']);
1039		- endif;
	1308	+ foreach ($posts as $post) :
	1309	+ $p = new SyndicatedPost($post, $feed);
1040	1310
1041		- $this->post['epoch']['issued'] = apply_filters('syndicated_item_published', $this->published(), $this);
1042		- $this->post['epoch']['created'] = apply_filters('syndicated_item_created', $this->created(), $this);
1043		- $this->post['epoch']['modified'] = apply_filters('syndicated_item_updated', $this->updated(), $this);
	1311	+ $result[] = array(
	1312	+ "post_title" => $p->entry->get_title(),
	1313	+ "post_link" => $p->permalink(),
	1314	+ "guid" => $p->guid(),
	1315	+ "post_date" => $p->published(),
	1316	+ );
	1317	+ endforeach;
	1318	+ endif;
1044	1319
1045		- // Dealing with timestamps in WordPress is so fucking fucked.
1046		- $offset = (int) get_option('gmt_offset') * 60 * 60;
1047		- $this->post['post_date'] = gmdate('Y-m-d H:i:s', $this->published() + $offset);
1048		- $this->post['post_modified'] = gmdate('Y-m-d H:i:s', $this->updated() + $offset);
1049		- $this->post['post_date_gmt'] = gmdate('Y-m-d H:i:s', $this->published());
1050		- $this->post['post_modified_gmt'] = gmdate('Y-m-d H:i:s', $this->updated());
	1320	+ header("Content-Type: application/json");
1051	1321
1052		- // Use feed-level preferences or the global default.
1053		- $this->post['post_status'] = $this->link->syndicated_status('post', 'publish');
1054		- $this->post['comment_status'] = $this->link->syndicated_status('comment', 'closed');
1055		- $this->post['ping_status'] = $this->link->syndicated_status('ping', 'closed');
	1322	+ echo json_encode($result);
1056	1323
1057		- // Unique ID (hopefully a unique tag: URI); failing that, the permalink
1058		- $this->post['guid'] = apply_filters('syndicated_item_guid', $this->guid(), $this);
	1324	+ // This is an AJAX request, so close it out thus.
	1325	+ die;
	1326	+ } /* FeedWordPress::fwp_feedcontents () */
1059	1327
1060		- // RSS 2.0 / Atom 1.0 enclosure support
1061		- if ( isset($this->item['enclosure#']) ) :
1062		- for ($i = 1; $i <= $this->item['enclosure#']; $i++) :
1063		- $eid = (($i > 1) ? "#{$id}" : "");
1064		- $this->post['meta']['enclosure'][] =
1065		- apply_filters('syndicated_item_enclosure_url', $this->item["enclosure{$eid}@url"], $this)."\n".
1066		- apply_filters('syndicated_item_enclosure_length', $this->item["enclosure{$eid}@length"], $this)."\n".
1067		- apply_filters('syndicated_item_enclosure_type', $this->item["enclosure{$eid}@type"], $this);
1068		- endfor;
1069		- endif;
	1328	+ public function fwp_xpathtest () {
	1329	+ $xpath = FeedWordPress::param( 'xpath' );
	1330	+ $feed_id = FeedWordPress::param( 'feed_id' );
	1331	+ $post_id = FeedWordPress::param( 'post_id' );
1070	1332
1071		- // In case you want to point back to the blog this was syndicated from
1072		- if (isset($this->feed->channel['title'])) :
1073		- $this->post['meta']['syndication_source'] = apply_filters('syndicated_item_source_title', $this->feed->channel['title'], $this);
1074		- endif;
	1333	+ $expr = new FeedWordPressParsedPostMeta($xpath);
1075	1334
1076		- if (isset($this->feed->channel['link'])) :
1077		- $this->post['meta']['syndication_source_uri'] = apply_filters('syndicated_item_source_link', $this->feed->channel['link'], $this);
1078		- endif;
1079		-
1080		- // Make use of atom:source data, if present in an aggregated feed
1081		- if (isset($this->item['source_title'])) :
1082		- $this->post['meta']['syndication_source_original'] = $this->item['source_title'];
1083		- endif;
	1335	+ // Let's load up some data from the feed . . .
	1336	+ $feed = $this->subscription($feed_id);
	1337	+ $posts = $feed->live_posts();
1084	1338
1085		- if (isset($this->item['source_link'])) :
1086		- $this->post['meta']['syndication_source_uri_original'] = $this->item['source_link'];
	1339	+ if (!is_wp_error($posts)) :
	1340	+ if (strlen($post_id) == 0) :
	1341	+ $post = $posts[0];
	1342	+ else :
	1343	+ $post = null;
	1344	+
	1345	+ foreach ($posts as $p) :
	1346	+ if ($p->get_id() == $post_id) :
	1347	+ $post = $p;
	1348	+ endif;
	1349	+ endforeach;
1087	1350	endif;
1088		-
1089		- if (isset($this->item['source_id'])) :
1090		- $this->post['meta']['syndication_source_id_original'] = $this->item['source_id'];
1091		- endif;
1092	1351
1093		- // Store information on human-readable and machine-readable comment URIs
1094		- if (isset($this->item['comments'])) :
1095		- $this->post['meta']['rss:comments'] = apply_filters('syndicated_item_comments', $this->item['comments']);
1096		- endif;
1097		- if (isset($this->item['wfw']['commentrss'])) :
1098		- $this->post['meta']['wfw:commentRSS'] = apply_filters('syndicated_item_commentrss', $this->item['wfw']['commentrss']);
1099		- endif;
	1352	+ $post = new SyndicatedPost($post, $feed);
	1353	+ $meta = $expr->do_substitutions($post);
1100	1354
1101		- // Store information to identify the feed that this came from
1102		- $this->post['meta']['syndication_feed'] = $this->feedmeta['link/uri'];
1103		- $this->post['meta']['syndication_feed_id'] = $this->feedmeta['link/id'];
	1355	+ $result = array(
	1356	+ "post_title" => $post->entry->get_title(),
	1357	+ "post_link" => $post->permalink(),
	1358	+ "guid" => $post->guid(),
	1359	+ "expression" => $xpath,
	1360	+ "results" => $meta
	1361	+ );
	1362	+ else :
	1363	+ $result = array(
	1364	+ "expression" => $xpath,
	1365	+ "feed_id" => $feed_id,
	1366	+ "post_id" => $post_id,
	1367	+ "results" => $posts
	1368	+ );
1104	1369
1105		- if (isset($this->item['source_link_self'])) :
1106		- $this->post['meta']['syndication_feed_original'] = $this->item['source_link_self'];
1107		- endif;
	1370	+ header("HTTP/1.1 503 Bad Gateway");
	1371	+ endif;
1108	1372
1109		- // In case you want to know the external permalink...
1110		- $this->post['meta']['syndication_permalink'] = apply_filters('syndicated_item_link', $this->item['link']);
	1373	+ header("Content-Type: application/json");
1111	1374
1112		- // Store a hash of the post content for checking whether something needs to be updated
1113		- $this->post['meta']['syndication_item_hash'] = $this->update_hash();
	1375	+ echo json_encode($result);
1114	1376
1115		- // Feed-by-feed options for author and category creation
1116		- $this->post['named']['unfamiliar']['author'] = $this->feedmeta['unfamiliar author'];
1117		- $this->post['named']['unfamiliar']['category'] = $this->feedmeta['unfamiliar category'];
	1377	+ // This is an AJAX request, so close it out thus.
	1378	+ die;
	1379	+ } /* FeedWordPress::fwp_xpathtest () */
1118	1380
1119		- // Categories: start with default categories, if any
1120		- $fc = get_option("feedwordpress_syndication_cats");
1121		- if ($fc) :
1122		- $this->post['named']['preset/category'] = explode("\n", $fc);
1123		- else :
1124		- $this->post['named']['preset/category'] = array();
1125		- endif;
	1381	+ public function redirect_retired () {
	1382	+ global $wp_query;
	1383	+ if (is_singular()) :
	1384	+ if (
	1385	+ 'fwpretired'==$wp_query->post->post_status
	1386	+ or 'fwpzapped'==$wp_query->post->post_status
	1387	+ ) :
	1388	+ do_action('feedwordpress_redirect_retired', $wp_query->post);
1126	1389
1127		- if (is_array($this->feedmeta['cats'])) :
1128		- $this->post['named']['preset/category'] = array_merge($this->post['named']['preset/category'], $this->feedmeta['cats']);
	1390	+ if (!($template = get_404_template())) :
	1391	+ $template = get_index_template();
	1392	+ endif;
	1393	+ if ($template = apply_filters('template_include', $template)) :
	1394	+ header("HTTP/1.1 410 Gone");
	1395	+ include($template);
	1396	+ endif;
	1397	+ exit;
1129	1398	endif;
	1399	+ endif;
	1400	+ } /* FeedWordPress::redirect_retired () */
1130	1401
1131		- // Now add categories from the post, if we have 'em
1132		- $this->post['named']['category'] = array();
1133		- if ( isset($this->item['category#']) ) :
1134		- for ($i = 1; $i <= $this->item['category#']; $i++) :
1135		- $cat_idx = (($i > 1) ? "#{$i}" : "");
1136		- $cat = $this->item["category{$cat_idx}"];
	1402	+ public function row_actions ($actions, $post) {
	1403	+ if (is_syndicated($post->ID) && current_user_can('edit_post', $post->ID)) :
	1404	+ $link = get_delete_post_link($post->ID, '', true);
	1405	+ $eraseLink = MyPHP::url($link, array("fwp_post_delete" => "nuke"));
1137	1406
1138		- if ( isset($this->feedmeta['cat_split']) and strlen($this->feedmeta['cat_split']) > 0) :
1139		- $pcre = "\007".$this->feedmeta['cat_split']."\007";
1140		- $this->post['named']['category'] = array_merge($this->post['named']['category'], preg_split($pcre, $cat, -1 /*=no limit*/, PREG_SPLIT_NO_EMPTY));
1141		- else :
1142		- $this->post['named']['category'][] = $cat;
1143		- endif;
1144		- endfor;
1145		- endif;
1146		- $this->post['named']['category'] = apply_filters('syndicated_item_categories', $this->post['named']['category'], $this);
	1407	+ $caption = apply_filters('feedwordpress_ui_erase_link_caption', __('Erase the record of this post (will be re-syndicated if it still appears on the feed).'));
	1408	+ $linktext = apply_filters('feedwordpress_ui_erase_link_text', __('Erase/Resyndicate'));
1147	1409
1148		- // Tags: start with default tags, if any
1149		- $ft = get_option("feedwordpress_syndication_tags");
1150		- if ($ft) :
1151		- $this->post['tags_input'] = explode('FEEDWORDPRESS_CAT_SEPARATOR', $ft);
	1410	+ $retireClass = null;
	1411	+ if ($post->post_status == 'fwpzapped') :
	1412	+ if (count(get_post_meta($post->ID, '_feedwordpress_zapped_blank_me')) > 0) :
	1413	+ $retireCap = 'Un-Zap this syndicated post (so it will appear on the site again)';
	1414	+ $retireText = 'Un-Zap &amp; Restore';
	1415	+ $retireLink = MyPHP::url($link, array("fwp_post_delete" => "unzap"));
	1416	+ else :
	1417	+ // No Un-Zap link for posts that have
	1418	+ // been blanked. You'll just have to
	1419	+ // Erase and hope you can resyndicate...
	1420	+ $retireLink = null;
	1421	+ endif;
1152	1422	else :
1153		- $this->post['tags_input'] = array();
	1423	+ $retireCap = apply_filters('feedwordpress_ui_zap_link_caption', __('Zap this syndicated post (so it will not be re-syndicated if it still appears on the feed).'));
	1424	+ $retireText = apply_filters('feedwordpress_ui_zap_link_text', __('Zap/Don&#8217;t Resyndicate'));
	1425	+ $retireLink = MyPHP::url($link, array("fwp_post_delete" => "zap"));
	1426	+ $retireClass = 'submitdelete';
1154	1427	endif;
1155	1428
1156		- if (is_array($this->feedmeta['tags'])) :
1157		- $this->post['tags_input'] = array_merge($this->post['tags_input'], $this->feedmeta['tags']);
	1429	+ $keys = array_keys($actions);
	1430	+ $links = array();
	1431	+ foreach ($keys as $key) :
	1432	+ $links[$key] = $actions[$key];
	1433	+
	1434	+ if ('trash'==$key) :
	1435	+ #$links[$key] = "<a class='submitdelete' title='" . esc_attr( __( 'Move this item to the Trash (will NOT be re-syndicated)' ) ) . "' href='" . get_delete_post_link( $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
	1436	+
	1437	+ // Placeholder.
	1438	+ if (!is_null($retireLink)) :
	1439	+ $links['zap trash'] = '';
	1440	+ endif;
	1441	+ $links['delete'] = '';
	1442	+ endif;
	1443	+ endforeach;
	1444	+
	1445	+ if (!is_null($retireLink)) :
	1446	+ $links['zap trash'] = '<a class="'.esc_attr($retireClass).'" title="'.esc_attr(__($retireCap)).'" href="' . $retireLink . '">' . __($retireText) . '</a>';
1158	1447	endif;
	1448	+ $links['delete'] = '<a class="submitdelete" title="'.esc_attr(__($caption)).'" href="' . $eraseLink . '">' . __($linktext) . '</a>';
1159	1449
	1450	+ $actions = $links;
1160	1451	endif;
1161		- } // SyndicatedPost::SyndicatedPost()
	1452	+ return $actions;
	1453	+ } /* FeedWordPress::row_actions () */
1162	1454
1163		- function filtered () {
1164		- return is_null($this->post);
1165		- }
	1455	+ public function dashboard_setup () {
	1456	+ $see_it = FeedWordPress::menu_cap();
1166	1457
1167		- function freshness () {
1168		- global $wpdb;
	1458	+ if (current_user_can($see_it)) :
	1459	+ // Get the stylesheet
	1460	+ wp_enqueue_style('feedwordpress-elements');
1169	1461
1170		- if ($this->filtered()) : // This should never happen.
1171		- FeedWordPress::critical_bug('SyndicatedPost', $this, __LINE__);
1172		- endif;
1173		-
1174		- if (is_null($this->_freshness)) :
1175		- $guid = $wpdb->escape($this->guid());
	1462	+ $widget_id = 'feedwordpress_dashboard';
	1463	+ $widget_name = __('Syndicated Sources');
	1464	+ $column = 'side';
	1465	+ $priority = 'core';
1176	1466
1177		- $result = $wpdb->get_row("
1178		- SELECT id, guid, post_modified_gmt
1179		- FROM $wpdb->posts WHERE guid='$guid'
1180		- ");
	1467	+ // I would love to use wp_add_dashboard_widget() here and save
	1468	+ // myself some trouble. But WP 3 does not yet have any way to
	1469	+ // push a dashboard widget onto the side, or to give it a default
	1470	+ // location.
	1471	+ add_meta_box(
	1472	+ /*id=*/ $widget_id,
	1473	+ /*title=*/ $widget_name,
	1474	+ /*callback=*/ array($this, 'dashboard'),
	1475	+ /*page=*/ 'dashboard',
	1476	+ /*context=*/ $column,
	1477	+ /*priority=*/ $priority
	1478	+ );
	1479	+ /*control_callback= array($this, 'dashboard_control') */
1181	1480
1182		- if (!$result) :
1183		- $this->_freshness = 2; // New content
1184		- else:
1185		- $stored_update_hashes = get_post_custom_values('syndication_item_hash', $result->id);
1186		- if (count($stored_update_hashes) > 0) :
1187		- $stored_update_hash = $stored_update_hashes[0];
1188		- $update_hash_changed = ($stored_update_hash != $this->update_hash());
1189		- else :
1190		- $update_hash_changed = false;
1191		- endif;
	1481	+ // This is kind of rude, I know, but the dashboard widget isn't
	1482	+ // worth much if users don't know that it exists, and I don't
	1483	+ // know of any better way to reorder the boxen.
	1484	+ //
	1485	+ // Gleefully ripped off of codex.wordpress.org/Dashboard_Widgets_API
1192	1486
1193		- preg_match('/([0-9]+)-([0-9]+)-([0-9]+) ([0-9]+):([0-9]+):([0-9]+)/', $result->post_modified_gmt, $backref);
	1487	+ // Globalize the metaboxes array, this holds all the widgets for wp-admin
	1488	+ global $wp_meta_boxes;
1194	1489
1195		- $last_rev_ts = gmmktime($backref[4], $backref[5], $backref[6], $backref[2], $backref[3], $backref[1]);
1196		- $updated_ts = $this->updated(/*fallback=*/ true, /*default=*/ NULL);
1197		- $updated = ((
1198		- !is_null($updated_ts)
1199		- and ($updated_ts > $last_rev_ts)
1200		- ) or $update_hash_changed);
	1490	+ // Get the regular dashboard widgets array
	1491	+ // (which has our new widget already but at the end)
1201	1492
1202		- if ($updated) :
1203		- $this->_freshness = 1; // Updated content
1204		- $this->_wp_id = $result->id;
1205		- else :
1206		- $this->_freshness = 0; // Same old, same old
1207		- $this->_wp_id = $result->id;
1208		- endif;
1209		- endif;
1210		- endif;
1211		- return $this->_freshness;
1212		- }
	1493	+ $normal_dashboard = $wp_meta_boxes['dashboard'][$column][$priority];
1213	1494
1214		- function wp_id () {
1215		- if ($this->filtered()) : // This should never happen.
1216		- FeedWordPress::critical_bug('SyndicatedPost', $this, __LINE__);
1217		- endif;
1218		-
1219		- if (is_null($this->_wp_id) and is_null($this->_freshness)) :
1220		- $fresh = $this->freshness(); // sets WP DB id in the process
1221		- endif;
1222		- return $this->_wp_id;
1223		- }
	1495	+ // Backup and delete our new dashbaord widget from the end of the array
	1496	+ if (isset($normal_dashboard[$widget_id])) :
	1497	+ $backup = array();
	1498	+ $backup[$widget_id] = $normal_dashboard[$widget_id];
	1499	+ unset($normal_dashboard[$widget_id]);
1224	1500
1225		- function store () {
1226		- global $wpdb;
	1501	+ // Merge the two arrays together so our widget is at the
	1502	+ // beginning
	1503	+ $sorted_dashboard = array_merge($backup, $normal_dashboard);
1227	1504
1228		- if ($this->filtered()) : // This should never happen.
1229		- FeedWordPress::critical_bug('SyndicatedPost', $this, __LINE__);
	1505	+ // Save the sorted array back into the original metaboxes
	1506	+ $wp_meta_boxes['dashboard'][$column][$priority] = $sorted_dashboard;
	1507	+ endif;
1230	1508	endif;
1231		-
1232		- $freshness = $this->freshness();
1233		- if ($freshness > 0) :
1234		- # -- Look up, or create, numeric ID for author
1235		- $this->post['post_author'] = $this->author_id (
1236		- FeedWordPress::on_unfamiliar('author', $this->post['named']['unfamiliar']['author'])
1237		- );
	1509	+ } /* FeedWordPress::dashboard_setup () */
1238	1510
1239		- if (is_null($this->post['post_author'])) :
1240		- $this->post = NULL;
1241		- endif;
1242		- endif;
1243		-
1244		- if (!$this->filtered() and $freshness > 0) :
1245		- # -- Look up, or create, numeric ID for categories
1246		- list($pcats, $ptags) = $this->category_ids (
1247		- $this->post['named']['category'],
1248		- FeedWordPress::on_unfamiliar('category', $this->post['named']['unfamiliar']['category']),
1249		- /*tags_too=*/ true
1250		- );
	1511	+ public function dashboard () {
	1512	+ $syndicationPage = new FeedWordPressSyndicationPage(dirname(__FILE__).'/syndication.php');
	1513	+ $syndicationPage->dashboard_box($syndicationPage);
	1514	+ } /* FeedWordPress::dashboard () */
1251	1515
1252		- $this->post['post_category'] = $pcats;
1253		- $this->post['tags_input'] = array_merge($this->post['tags_input'], $ptags);
	1516	+ public function user_can_richedit ($rich_edit) {
1254	1517
1255		- if (is_null($this->post['post_category'])) :
1256		- // filter mode on, no matching categories; drop the post
1257		- $this->post = NULL;
1258		- else :
1259		- // filter mode off or at least one match; now add on the feed and global presets
1260		- $this->post['post_category'] = array_merge (
1261		- $this->post['post_category'],
1262		- $this->category_ids (
1263		- $this->post['named']['preset/category'],
1264		- 'default'
1265		- )
1266		- );
	1518	+ $post = new FeedWordPressLocalPost;
1267	1519
1268		- if (count($this->post['post_category']) < 1) :
1269		- $this->post['post_category'][] = 1; // Default to category 1 ("Uncategorized" / "General") if nothing else
1270		- endif;
1271		- endif;
	1520	+ if (!$post->is_exposed_to_formatting_filters()) :
	1521	+ // Disable visual editor and only allow operations
	1522	+ // directly on HTML if post is bypassing fmt filters
	1523	+ # $rich_edit = false;
1272	1524	endif;
1273		-
1274		- if (!$this->filtered() and $freshness > 0) :
1275		- unset($this->post['named']);
1276		- $this->post = apply_filters('syndicated_post', $this->post, $this);
1277		- endif;
1278		-
1279		- if (!$this->filtered() and $freshness == 2) :
1280		- // The item has not yet been added. So let's add it.
1281		- $this->insert_new();
1282		- $this->add_rss_meta();
1283		- do_action('post_syndicated_item', $this->wp_id());
1284	1525
1285		- $ret = 'new';
1286		- elseif (!$this->filtered() and $freshness == 1) :
1287		- $this->post['ID'] = $this->wp_id();
1288		- $this->update_existing();
1289		- $this->add_rss_meta();
1290		- do_action('update_syndicated_item', $this->wp_id());
	1526	+ return $rich_edit;
1291	1527
1292		- $ret = 'updated';
1293		- else :
1294		- $ret = false;
	1528	+ } /* FeedWordPress::user_can_richedit () */
	1529	+
	1530	+ public function clear_cache_magic_url () {
	1531	+ if ($this->clear_cache_requested()) :
	1532	+ $this->clear_cache();
1295	1533	endif;
1296		-
1297		- return $ret;
1298		- } // function SyndicatedPost::store ()
1299		-
1300		- function insert_new () {
1301		- global $wpdb, $wp_db_version;
1302		-
1303		- // Why the fuck doesn't wp_insert_post already do this?
1304		- foreach ($this->post as $key => $value) :
1305		- if (is_string($value)) :
1306		- $dbpost[$key] = $wpdb->escape($value);
1307		- else :
1308		- $dbpost[$key] = $value;
1309		- endif;
1310		- endforeach;
	1534	+ } /* FeedWordPress::clear_cache_magic_url() */
1311	1535
1312		- if (strlen($dbpost['post_title'].$dbpost['post_content'].$dbpost['post_excerpt']) == 0) :
1313		- // FIXME: Option for filtering out empty posts
1314		- endif;
1315		- if (strlen($dbpost['post_title'])==0) :
1316		- $dbpost['post_title'] = $this->post['meta']['syndication_source']
1317		- .' '.gmdate('Y-m-d H:i:s', $this->published() + $offset);
1318		- // FIXME: Option for what to fill a blank title with...
1319		- endif;
	1536	+ public function clear_cache_requested () {
	1537	+ return FeedWordPress::param( 'clear_cache' );
	1538	+ } /* FeedWordPress::clear_cache_requested() */
1320	1539
1321		- if ($this->use_api('wp_insert_post')) :
1322		- $dbpost['post_pingback'] = false; // Tell WP 2.1 and 2.2 not to process for pingbacks
	1540	+ public function update_magic_url () {
	1541	+ global $wpdb;
1323	1542
1324		- // This is a ridiculous fucking kludge necessitated by WordPress 2.6 munging authorship meta-data
1325		- add_action('_wp_put_post_revision', array($this, 'fix_revision_meta'));
	1543	+ // Explicit update request in the HTTP request (e.g. from a cron job)
	1544	+ if (self::update_requested()) :
	1545	+ /*DBG*/ header("Content-Type: text/plain");
1326	1546
1327		- // Kludge to prevent kses filters from stripping the
1328		- // content of posts when updating without a logged in
1329		- // user who has `unfiltered_html` capability.
1330		- add_filter('content_save_pre', array($this, 'avoid_kses_munge'), 11);
1331		-
1332		- $this->_wp_id = wp_insert_post($dbpost);
	1547	+ $this->update_hooked = "Initiating a CRON JOB CHECK-IN ON UPDATE SCHEDULE due to URL parameter = " . trim( $this->val( FeedWordPress::param('update_feedwordpress' ) ) );
1333	1548
1334		- // Turn off ridiculous fucking kludges #1 and #2
1335		- remove_action('_wp_put_post_revision', array($this, 'fix_revision_meta'));
1336		- remove_filter('content_save_pre', array($this, 'avoid_kses_munge'), 11);
	1549	+ $this->update($this->update_requested_url());
1337	1550
1338		- // This should never happen.
1339		- if (!is_numeric($this->_wp_id) or ($this->_wp_id == 0)) :
1340		- FeedWordPress::critical_bug('SyndicatedPost (_wp_id problem)', array("dbpost" => $dbpost, "this" => $this), __LINE__);
	1551	+ if (FEEDWORDPRESS_DEBUG and is_array($wpdb->queries) and count($wpdb->queries) > 0) :
	1552	+ $mysqlTime = 0.0;
	1553	+ $byTime = array();
	1554	+ foreach ($wpdb->queries as $query) :
	1555	+ $time = $query[1] * 1000000.0;
	1556	+ $mysqlTime += $query[1];
	1557	+ if (!isset($byTime[$time])) : $byTime[$time] = array(); endif;
	1558	+ $byTime[$time][] = $query[0]. ' // STACK: ' . $query[2];
	1559	+ endforeach;
	1560	+ krsort($byTime);
	1561	+
	1562	+ foreach ($byTime as $time => $querySet) :
	1563	+ foreach ($querySet as $query) :
	1564	+ print "[".(sprintf('%4.4f', $time/1000.0)) . "ms] $query\n";
	1565	+ endforeach;
	1566	+ endforeach;
	1567	+ echo self::log_prefix()."$wpdb->num_queries queries. $mysqlTime seconds in MySQL. Total of "; timer_stop(1); print " seconds.";
1341	1568	endif;
1342		-
1343		- // Unfortunately, as of WordPress 2.3, wp_insert_post()
1344		- // *still* offers no way to use a guid of your choice,
1345		- // and munges your post modified timestamp, too.
1346		- $result = $wpdb->query("
1347		- UPDATE $wpdb->posts
1348		- SET
1349		- guid='{$dbpost['guid']}',
1350		- post_modified='{$dbpost['post_modified']}',
1351		- post_modified_gmt='{$dbpost['post_modified_gmt']}'
1352		- WHERE ID='{$this->_wp_id}'
1353		- ");
1354		- else :
1355		- # The right way to do this is the above. But, alas,
1356		- # in earlier versions of WordPress, wp_insert_post has
1357		- # too much behavior (mainly related to pings) that can't
1358		- # be overridden. In WordPress 1.5, it's enough of a
1359		- # resource hog to make PHP segfault after inserting
1360		- # 50-100 posts. This can get pretty annoying, especially
1361		- # if you are trying to update your feeds for the first
1362		- # time.
1363	1569
1364		- $result = $wpdb->query("
1365		- INSERT INTO $wpdb->posts
1366		- SET
1367		- guid = '{$dbpost['guid']}',
1368		- post_author = '{$dbpost['post_author']}',
1369		- post_date = '{$dbpost['post_date']}',
1370		- post_date_gmt = '{$dbpost['post_date_gmt']}',
1371		- post_content = '{$dbpost['post_content']}',"
1372		- .(isset($dbpost['post_excerpt']) ? "post_excerpt = '{$dbpost['post_excerpt']}'," : "")."
1373		- post_title = '{$dbpost['post_title']}',
1374		- post_name = '{$dbpost['post_name']}',
1375		- post_modified = '{$dbpost['post_modified']}',
1376		- post_modified_gmt = '{$dbpost['post_modified_gmt']}',
1377		- comment_status = '{$dbpost['comment_status']}',
1378		- ping_status = '{$dbpost['ping_status']}',
1379		- post_status = '{$dbpost['post_status']}'
1380		- ");
1381		- $this->_wp_id = $wpdb->insert_id;
	1570	+ debug_out_feedwordpress_footer();
1382	1571
1383		- // This should never happen.
1384		- if (!is_numeric($this->_wp_id) or ($this->_wp_id == 0)) :
1385		- FeedWordPress::critical_bug('SyndicatedPost (_wp_id problem)', array("dbpost" => $dbpost, "this" => $this), __LINE__);
1386		- endif;
	1572	+ // Magic URL should return nothing but a 200 OK header packet
	1573	+ // when successful.
	1574	+ exit;
	1575	+ endif;
	1576	+ } /* FeedWordPress::update_magic_url () */
1387	1577
1388		- // WordPress 1.5.x - 2.0.x
1389		- wp_set_post_cats('1', $this->wp_id(), $this->post['post_category']);
	1578	+ public static function update_requested () {
	1579	+ return FeedWordPress::param( 'update_feedwordpress' );
	1580	+ } /* FeedWordPress::update_requested() */
1390	1581
1391		- // Since we are not going through official channels, we need to
1392		- // manually tell WordPress that we've published a new post.
1393		- // We need to make sure to do this in order for FeedWordPress
1394		- // to play well with the staticize-reloaded plugin (something
1395		- // that a large aggregator website is going to *want* to be
1396		- // able to use).
1397		- do_action('publish_post', $this->_wp_id);
	1582	+ public function update_requested_url () {
	1583	+ $ret = null;
	1584	+
	1585	+ $uf = FeedWordPress::update_requested();
	1586	+ if (
	1587	+ ( '*' == $uf )
	1588	+ || ( preg_match( '|^[a-z]+://.*|i', $uf ) )
	1589	+ ) :
	1590	+ $ret = $uf;
1398	1591	endif;
1399		- } /* SyndicatedPost::insert_new() */
1400	1592
1401		- function update_existing () {
1402		- global $wpdb;
	1593	+ return $ret;
	1594	+ } /* FeedWordPress::update_requested_url() */
1403	1595
1404		- // Why the fuck doesn't wp_insert_post already do this?
1405		- $dbpost = array();
1406		- foreach ($this->post as $key => $value) :
1407		- if (is_string($value)) :
1408		- $dbpost[$key] = $wpdb->escape($value);
1409		- else :
1410		- $dbpost[$key] = $value;
1411		- endif;
1412		- endforeach;
	1596	+ public function auto_update () {
	1597	+ if ($this->stale()) :
	1598	+ $this->update();
	1599	+ endif;
	1600	+ } /* FeedWordPress::auto_update () */
1413	1601
1414		- if ($this->use_api('wp_insert_post')) :
1415		- $dbpost['post_pingback'] = false; // Tell WP 2.1 and 2.2 not to process for pingbacks
	1602	+ public static function find_link ($uri, $field = 'link_rss') {
	1603	+ global $wpdb;
1416	1604
1417		- // This is a ridiculous fucking kludge necessitated by WordPress 2.6 munging authorship meta-data
1418		- add_action('_wp_put_post_revision', array($this, 'fix_revision_meta'));
	1605	+ $unslashed = untrailingslashit($uri);
	1606	+ $slashed = trailingslashit($uri);
	1607	+ $link_id = $wpdb->get_var($wpdb->prepare("
	1608	+ SELECT link_id FROM $wpdb->links WHERE $field IN ('%s', '%s')
	1609	+ LIMIT 1", $unslashed, $slashed
	1610	+ ));
1419	1611
1420		- // Kludge to prevent kses filters from stripping the
1421		- // content of posts when updating without a logged in
1422		- // user who has `unfiltered_html` capability.
1423		- add_filter('content_save_pre', array($this, 'avoid_kses_munge'), 11);
	1612	+ return $link_id;
	1613	+ } /* FeedWordPress::find_link () */
1424	1614
1425		- $this->_wp_id = wp_insert_post($dbpost);
1426		-
1427		- // Turn off ridiculous fucking kludges #1 and #2
1428		- remove_action('_wp_put_post_revision', array($this, 'fix_revision_meta'));
1429		- remove_filter('content_save_pre', array($this, 'avoid_kses_munge'), 11);
1430		-
1431		- // This should never happen.
1432		- if (!is_numeric($this->_wp_id) or ($this->_wp_id == 0)) :
1433		- FeedWordPress::critical_bug('SyndicatedPost (_wp_id problem)', array("dbpost" => $dbpost, "this" => $this), __LINE__);
1434		- endif;
1435		-
1436		- // Unfortunately, as of WordPress 2.3, wp_insert_post()
1437		- // munges your post modified timestamp.
1438		- $result = $wpdb->query("
1439		- UPDATE $wpdb->posts
1440		- SET
1441		- post_modified='{$dbpost['post_modified']}',
1442		- post_modified_gmt='{$dbpost['post_modified_gmt']}'
1443		- WHERE ID='{$this->_wp_id}'
1444		- ");
1445		- else :
1446		-
1447		- $result = $wpdb->query("
1448		- UPDATE $wpdb->posts
1449		- SET
1450		- post_author = '{$dbpost['post_author']}',
1451		- post_content = '{$dbpost['post_content']}',"
1452		- .(isset($dbpost['post_excerpt']) ? "post_excerpt = '{$dbpost['post_excerpt']}'," : "")."
1453		- post_title = '{$dbpost['post_title']}',
1454		- post_name = '{$dbpost['post_name']}',
1455		- post_modified = '{$dbpost['post_modified']}',
1456		- post_modified_gmt = '{$dbpost['post_modified_gmt']}'
1457		- WHERE guid='{$dbpost['guid']}'
1458		- ");
1459		-
1460		- // WordPress 2.1.x and up
1461		- if (function_exists('wp_set_post_categories')) :
1462		- wp_set_post_categories($this->wp_id(), $this->post['post_category']);
1463		- // WordPress 1.5.x - 2.0.x
1464		- elseif (function_exists('wp_set_post_cats')) :
1465		- wp_set_post_cats('1', $this->wp_id(), $this->post['post_category']);
1466		- // This should never happen.
1467		- else :
1468		- FeedWordPress::critical_bug('SyndicatedPost (_wp_id problem)', array("dbpost" => $dbpost, "this" => $this), __LINE__);
1469		- endif;
1470		-
1471		- // Since we are not going through official channels, we need to
1472		- // manually tell WordPress that we've published a new post.
1473		- // We need to make sure to do this in order for FeedWordPress
1474		- // to play well with the staticize-reloaded plugin (something
1475		- // that a large aggregator website is going to *want* to be
1476		- // able to use).
1477		- do_action('edit_post', $this->post['ID']);
1478		- endif;
1479		- } /* SyndicatedPost::update_existing() */
1480		-
1481	1615	/**
1482		- * SyndicatedPost::fix_revision_meta() - Fixes the way WP 2.6+ fucks up
1483		- * meta-data (authorship, etc.) when storing revisions of an updated
1484		- * syndicated post.
	1616	+ * FeedWordPress:syndicate_link(): add or update a feed subscription
1485	1617	*
1486		- * In their infinite wisdom, the WordPress coders have made it completely
1487		- * impossible for a plugin that uses wp_insert_post() to set certain
1488		- * meta-data (such as the author) when you store an old revision of an
1489		- * updated post. Instead, it uses the WordPress defaults (= currently
1490		- * active user ID if the process is running with a user logged in, or
1491		- * = #0 if there is no user logged in). This results in bogus authorship
1492		- * data for revisions that are syndicated from off the feed, unless we
1493		- * use a ridiculous kludge like this to end-run the munging of meta-data
1494		- * by _wp_put_post_revision.
	1618	+ * Add a new subscription to, or update an existing subscription in,
	1619	+ * FWP's list of subscribed feeds.
1495	1620	*
1496		- * @param int $revision_id The revision ID to fix up meta-data
1497		- */
1498		- function fix_revision_meta ($revision_id) {
1499		- global $wpdb;
1500		-
1501		- $post_author = (int) $this->post['post_author'];
1502		-
1503		- $revision_id = (int) $revision_id;
1504		- $wpdb->query("
1505		- UPDATE $wpdb->posts
1506		- SET post_author={$this->post['post_author']}
1507		- WHERE post_type = 'revision' AND ID='$revision_id'
1508		- ");
1509		- } /* SyndicatedPost::fix_revision_meta () */
1510		-
1511		- /**
1512		- * SyndicatedPost::avoid_kses_munge() -- If FeedWordPress is processing
1513		- * an automatic update, that generally means that wp_insert_post() is
1514		- * being called under the user credentials of whoever is viewing the
1515		- * blog at the time -- usually meaning no user at all. But if WordPress
1516		- * gets a wp_insert_post() when current_user_can('unfiltered_html') is
1517		- * false, it will run the content of the post through a kses function
1518		- * that strips out lots of HTML tags -- notably <object> and some others.
1519		- * This causes problems for syndicating (for example) feeds that contain
1520		- * YouTube videos. It also produces an unexpected asymmetry between
1521		- * automatically-initiated updates and updates initiated manually from
1522		- * the WordPress Dashboard (which are usually initiated under the
1523		- * credentials of a logged-in admin, and so don't get run through the
1524		- * kses function). So, to avoid the whole mess, what we do here is
1525		- * just forcibly disable the kses munging for a single syndicated post,
1526		- * by restoring the contents of the `post_content` field.
	1621	+ * Postcondition: If $rss is the URL of a feed not yet on FWP's list of
	1622	+ * subscribed feeds, then a new subscription will be added, using $name
	1623	+ * as its initial title and $uri as its initial homepage URL (normally
	1624	+ * these will be updated with new values taken from the feed, the first
	1625	+ * time the new feed is checked for syndicated content, unless feed
	1626	+ * settings prevent this). If $rss is the URL of a feed that is already
	1627	+ * on FWP's list of subscribed feeds, then that feed will be updated to
	1628	+ * use the title provided in $name and the homepage URL in $uri
1527	1629	*
1528		- * @param string $content The content of the post, after other filters have gotten to it
1529		- * @return string The original content of the post, before other filters had a chance to munge it.
	1630	+ * @param string $name The human-readable title of the feed (for example, "Rad Geek People's Daily")
	1631	+ * @param string $uri The URI for the human-readable homepage associated with the feed (for example, <http://radgeek.com/>)
	1632	+ * @param string $rss The URI for the feed itself (for example, <http://radgeek.com/feed/>)
	1633	+ *
	1634	+ * @return mixed Returns an int with the numeric ID of the new
	1635	+ * subscription's wp_links record if successful or a WP_Error object
	1636	+ * if wp_insert_link() failed.
	1637	+ *
	1638	+ * @uses FeedWordPress::link_category_id()
	1639	+ * @uses FeedWordPress::find_link()
	1640	+ * @uses is_wp_error()
	1641	+ * @uses wp_insert_link()
	1642	+ *
1530	1643	*/
1531		- function avoid_kses_munge ($content) {
1532		- global $wpdb;
1533		- return $wpdb->escape($this->post['post_content']);
1534		- }
1535		-
1536		- // SyndicatedPost::add_rss_meta: adds interesting meta-data to each entry
1537		- // using the space for custom keys. The set of keys and values to add is
1538		- // specified by the keys and values of $post['meta']. This is used to
1539		- // store anything that the WordPress user might want to access from a
1540		- // template concerning the post's original source that isn't provided
1541		- // for by standard WP meta-data (i.e., any interesting data about the
1542		- // syndicated post other than author, title, timestamp, categories, and
1543		- // guid). It's also used to hook into WordPress's support for
1544		- // enclosures.
1545		- function add_rss_meta () {
1546		- global $wpdb;
1547		- if ( is_array($this->post) and isset($this->post['meta']) and is_array($this->post['meta']) ) :
1548		- $postId = $this->wp_id();
1549		-
1550		- // Aggregated posts should NOT send out pingbacks.
1551		- // WordPress 2.1-2.2 claim you can tell them not to
1552		- // using $post_pingback, but they don't listen, so we
1553		- // make sure here.
1554		- $result = $wpdb->query("
1555		- DELETE FROM $wpdb->postmeta
1556		- WHERE post_id='$postId' AND meta_key='_pingme'
1557		- ");
	1644	+ public static function syndicate_link ($name, $uri, $rss) {
	1645	+ // Get the category ID#
	1646	+ $cat_id = FeedWordPress::link_category_id();
	1647	+ if (!is_wp_error($cat_id)) :
	1648	+ $link_category = array($cat_id);
	1649	+ else :
	1650	+ $link_category = array();
	1651	+ endif;
1558	1652
1559		- foreach ( $this->post['meta'] as $key => $values ) :
	1653	+ // WordPress gets cranky if there's no homepage URI
	1654	+ if (!is_string($uri) or strlen($uri)<1) : $uri = $rss; endif;
1560	1655
1561		- $key = $wpdb->escape($key);
	1656	+ // Check if this feed URL is already being syndicated.
	1657	+ $link_id = wp_insert_link(/*linkdata=*/ array(
	1658	+ "link_id" => FeedWordPress::find_link($rss), // insert if nothing was found; else update
	1659	+ "link_rss" => $rss,
	1660	+ "link_name" => $name,
	1661	+ "link_url" => $uri,
	1662	+ "link_category" => $link_category,
	1663	+ "link_visible" => 'Y', // reactivate if inactivated
	1664	+ ), /*wp_error=*/ true);
1562	1665
1563		- // If this is an update, clear out the old
1564		- // values to avoid duplication.
1565		- $result = $wpdb->query("
1566		- DELETE FROM $wpdb->postmeta
1567		- WHERE post_id='$postId' AND meta_key='$key'
1568		- ");
	1666	+ return $link_id;
	1667	+ } /* function FeedWordPress::syndicate_link() */
1569	1668
1570		- // Allow for either a single value or an array
1571		- if (!is_array($values)) $values = array($values);
1572		- foreach ( $values as $value ) :
1573		- $value = $wpdb->escape($value);
1574		- $result = $wpdb->query("
1575		- INSERT INTO $wpdb->postmeta
1576		- SET
1577		- post_id='$postId',
1578		- meta_key='$key',
1579		- meta_value='$value'
1580		- ");
1581		- endforeach;
1582		- endforeach;
	1669	+ static function syndicated_status ($what, $default) {
	1670	+ $ret = get_option("feedwordpress_syndicated_{$what}_status");
	1671	+ if (!$ret) :
	1672	+ $ret = $default;
1583	1673	endif;
1584		- } /* SyndicatedPost::add_rss_meta () */
	1674	+ return $ret;
	1675	+ } /* FeedWordPress::syndicated_status() */
1585	1676
1586		- // SyndicatedPost::author_id (): get the ID for an author name from
1587		- // the feed. Create the author if necessary.
1588		- function author_id ($unfamiliar_author = 'create') {
1589		- global $wpdb;
	1677	+ public static function on_unfamiliar ($what = 'author') {
	1678	+ switch ($what) :
	1679	+ case 'category' : $suffix = ':category'; break;
	1680	+ case 'post_tag' : $suffix = ':post_tag'; break;
	1681	+ default: $suffix = '';
	1682	+ endswitch;
1590	1683
1591		- $a = $this->author();
1592		- $author = $a['name'];
1593		- $email = $a['email'];
1594		- $url = $a['uri'];
	1684	+ return get_option('feedwordpress_unfamiliar_'.$what, 'create'.$suffix);
	1685	+ } // function FeedWordPress::on_unfamiliar()
1595	1686
1596		- $match_author_by_email = !('yes' == get_option("feedwordpress_do_not_match_author_by_email"));
1597		- if ($match_author_by_email and !FeedWordPress::is_null_email($email)) :
1598		- $test_email = $email;
	1687	+ public static function null_email_set () {
	1688	+ $base = get_option('feedwordpress_null_email_set');
	1689	+
	1690	+ if ($base===false) :
	1691	+ $ret = array('noreply@blogger.com'); // default
1599	1692	else :
1600		- $test_email = NULL;
	1693	+ $ret = array_map('strtolower',
	1694	+ array_map('trim', explode("\n", $base)));
1601	1695	endif;
	1696	+ $ret = apply_filters('syndicated_item_author_null_email_set', $ret);
	1697	+ return $ret;
1602	1698
1603		- // Never can be too careful...
1604		- $login = sanitize_user($author, /*strict=*/ true);
1605		- $login = apply_filters('pre_user_login', $login);
	1699	+ } /* FeedWordPress::null_email_set () */
1606	1700
1607		- $nice_author = sanitize_title($author);
1608		- $nice_author = apply_filters('pre_user_nicename', $nice_author);
	1701	+ public static function is_null_email( $email ) {
	1702	+ $ret = in_array( strtolower( trim( $email ) ), FeedWordPress::null_email_set() );
	1703	+ $ret = apply_filters( 'syndicated_item_author_is_null_email', $ret, $email );
	1704	+ return $ret;
	1705	+ } /* FeedWordPress::is_null_email () */
1609	1706
1610		- $reg_author = $wpdb->escape(preg_quote($author));
1611		- $author = $wpdb->escape($author);
1612		- $email = $wpdb->escape($email);
1613		- $test_email = $wpdb->escape($test_email);
1614		- $url = $wpdb->escape($url);
	1707	+ public static function use_aggregator_source_data () {
	1708	+ $ret = get_option('feedwordpress_use_aggregator_source_data');
	1709	+ return apply_filters('syndicated_post_use_aggregator_source_data', ($ret=='yes'));
	1710	+ } /* FeedWordPress::use_aggregator_source_data () */
1615	1711
1616		- // Check for an existing author rule....
1617		- if (isset($this->link->settings['map authors']['name'][strtolower(trim($author))])) :
1618		- $author_rule = $this->link->settings['map authors']['name'][strtolower(trim($author))];
	1712	+ /**
	1713	+ * FeedWordPress::munge_permalinks: check whether or not FeedWordPress
	1714	+ * should rewrite permalinks for syndicated items to reflect their
	1715	+ * original location.
	1716	+ *
	1717	+ * @return bool TRUE if FeedWordPress SHOULD rewrite permalinks; FALSE otherwise
	1718	+ */
	1719	+ static function munge_permalinks () {
	1720	+ return (get_option('feedwordpress_munge_permalink', /*default=*/ 'yes') != 'no');
	1721	+ } /* FeedWordPress::munge_permalinks() */
	1722	+
	1723	+ public static function syndicated_links ($args = array()) {
	1724	+ $contributors = FeedWordPress::link_category_id();
	1725	+ if (!is_wp_error($contributors)) :
	1726	+ $links = get_bookmarks(array_merge(
	1727	+ array("category" => $contributors),
	1728	+ $args
	1729	+ ));
1619	1730	else :
1620		- $author_rule = NULL;
	1731	+ $links = array();
1621	1732	endif;
1622	1733
1623		- // User name is mapped to a particular author. If that author ID exists, use it.
1624		- if (is_numeric($author_rule) and get_userdata((int) $author_rule)) :
1625		- $id = (int) $author_rule;
	1734	+ return $links;
	1735	+ } /* FeedWordPress::syndicated_links() */
1626	1736
1627		- // User name is filtered out
1628		- elseif ('filter' == $author_rule) :
1629		- $id = NULL;
1630		-
1631		- else :
1632		- // Check the database for an existing author record that might fit
	1737	+ public static function link_category_id () {
	1738	+ global $wpdb, $wp_db_version;
1633	1739
1634		- #-- WordPress 2.0+
1635		- if (fwp_test_wp_version(FWP_SCHEMA_HAS_USERMETA)) :
	1740	+ $cat_id = get_option('feedwordpress_cat_id');
1636	1741
1637		- // First try the user core data table.
1638		- $id = $wpdb->get_var(
1639		- "SELECT ID FROM $wpdb->users
1640		- WHERE
1641		- TRIM(LCASE(user_login)) = TRIM(LCASE('$login'))
1642		- OR (
1643		- LENGTH(TRIM(LCASE(user_email))) > 0
1644		- AND TRIM(LCASE(user_email)) = TRIM(LCASE('$test_email'))
1645		- )
1646		- OR TRIM(LCASE(user_nicename)) = TRIM(LCASE('$nice_author'))
1647		- ");
1648		-
1649		- // If that fails, look for aliases in the user meta data table
1650		- if (is_null($id)) :
1651		- $id = $wpdb->get_var(
1652		- "SELECT user_id FROM $wpdb->usermeta
1653		- WHERE
1654		- (meta_key = 'description' AND TRIM(LCASE(meta_value)) = TRIM(LCASE('$author')))
1655		- OR (
1656		- meta_key = 'description'
1657		- AND TRIM(LCASE(meta_value))
1658		- RLIKE CONCAT(
1659		- '(^|\\n)a\\.?k\\.?a\\.?( |\\t)*:?( |\\t)*',
1660		- TRIM(LCASE('$reg_author')),
1661		- '( |\\t|\\r)*(\\n|\$)'
1662		- )
1663		- )
1664		- ");
1665		- endif;
	1742	+ // If we don't yet have the category ID stored, search by name
	1743	+ if (!$cat_id) :
	1744	+ $cat_id = FeedWordPressCompatibility::link_category_id(DEFAULT_SYNDICATION_CATEGORY);
1666	1745
1667		- #-- WordPress 1.5.x
1668		- else :
1669		- $id = $wpdb->get_var(
1670		- "SELECT ID from $wpdb->users
1671		- WHERE
1672		- TRIM(LCASE(user_login)) = TRIM(LCASE('$login')) OR
1673		- (
1674		- LENGTH(TRIM(LCASE(user_email))) > 0
1675		- AND TRIM(LCASE(user_email)) = TRIM(LCASE('$test_email'))
1676		- ) OR
1677		- TRIM(LCASE(user_firstname)) = TRIM(LCASE('$author')) OR
1678		- TRIM(LCASE(user_nickname)) = TRIM(LCASE('$author')) OR
1679		- TRIM(LCASE(user_nicename)) = TRIM(LCASE('$nice_author')) OR
1680		- TRIM(LCASE(user_description)) = TRIM(LCASE('$author')) OR
1681		- (
1682		- LOWER(user_description)
1683		- RLIKE CONCAT(
1684		- '(^|\\n)a\\.?k\\.?a\\.?( |\\t)*:?( |\\t)*',
1685		- LCASE('$reg_author'),
1686		- '( |\\t|\\r)*(\\n|\$)'
1687		- )
1688		- )
1689		- ");
1690		-
	1746	+ if ($cat_id) :
	1747	+ // We found it; let's stamp it.
	1748	+ update_option('feedwordpress_cat_id', $cat_id);
1691	1749	endif;
1692	1750
1693		- // ... if you don't find one, then do what you need to do
1694		- if (is_null($id)) :
1695		- if ($unfamiliar_author === 'create') :
1696		- $userdata = array();
	1751	+ // If we *do* have the category ID stored, verify that it exists
	1752	+ else :
	1753	+ $cat_id = FeedWordPressCompatibility::link_category_id((int) $cat_id, 'cat_id');
	1754	+ endif;
1697	1755
1698		- #-- user table data
1699		- $userdata['ID'] = NULL; // new user
1700		- $userdata['user_login'] = $login;
1701		- $userdata['user_nicename'] = $nice_author;
1702		- $userdata['user_pass'] = substr(md5(uniqid(microtime())), 0, 6); // just something random to lock it up
1703		- $userdata['user_email'] = $email;
1704		- $userdata['user_url'] = $url;
1705		- $userdata['display_name'] = $author;
1706		-
1707		- $id = wp_insert_user($userdata);
1708		- elseif (is_numeric($unfamiliar_author) and get_userdata((int) $unfamiliar_author)) :
1709		- $id = (int) $unfamiliar_author;
1710		- elseif ($unfamiliar_author === 'default') :
1711		- $id = 1;
1712		- endif;
	1756	+ // If we could not find an appropriate link category,
	1757	+ // make a new one for ourselves.
	1758	+ if (!$cat_id) :
	1759	+ $cat_id = FeedWordPressCompatibility::insert_link_category(DEFAULT_SYNDICATION_CATEGORY);
	1760	+ if (!is_wp_error($cat_id)) :
	1761	+ // Stamp it
	1762	+ update_option('feedwordpress_cat_id', $cat_id);
1713	1763	endif;
1714	1764	endif;
1715	1765
1716		- if ($id) :
1717		- $this->link->settings['map authors']['name'][strtolower(trim($author))] = $id;
1718		- endif;
1719		- return $id;
1720		- } // function SyndicatedPost::author_id ()
	1766	+ return $cat_id;
	1767	+ } /* FeedWordPress::link_category_id() */
1721	1768
1722		- // look up (and create) category ids from a list of categories
1723		- function category_ids ($cats, $unfamiliar_category = 'create', $tags_too = false) {
	1769	+ # Upgrades and maintenance...
	1770	+ static function needs_upgrade () {
	1771	+
1724	1772	global $wpdb;
	1773	+ $fwp_db_version = get_option('feedwordpress_version', null);
	1774	+ $ret = false; // innocent until proven guilty
	1775	+ if (is_null($fwp_db_version) or ($fwp_db_version < FEEDWORDPRESS_VERSION)) :
1725	1776
1726		- // We need to normalize whitespace because (1) trailing
1727		- // whitespace can cause PHP and MySQL not to see eye to eye on
1728		- // VARCHAR comparisons for some versions of MySQL (cf.
1729		- // <http://dev.mysql.com/doc/mysql/en/char.html>), and (2)
1730		- // because I doubt most people want to make a semantic
1731		- // distinction between 'Computers' and 'Computers '
1732		- $cats = array_map('trim', $cats);
	1777	+ // This is an older version or a fresh install. Does it require a database
	1778	+ // upgrade or database initialization?
1733	1779
1734		- $tags = array();
	1780	+ if (is_null($fwp_db_version)) :
1735	1781
1736		- $cat_ids = array ();
1737		- foreach ($cats as $cat_name) :
1738		- if (preg_match('/^{#([0-9]+)}$/', $cat_name, $backref)) :
1739		- $cat_id = (int) $backref[1];
1740		- if (function_exists('is_term') and is_term($cat_id, 'category')) :
1741		- $cat_ids[] = $cat_id;
1742		- elseif (get_category($cat_id)) :
1743		- $cat_ids[] = $cat_id;
	1782	+ // Fresh install; brand it as ours. Or possibly a version of FWP
	1783	+ // from before 0.96. But I'm no longer supporting upgrade paths
	1784	+ // for versions from the previous decade. Sorry.
	1785	+ update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
	1786	+
	1787	+ elseif ($fwp_db_version < 2010.0814) :
	1788	+
	1789	+ // Change in terminology.
	1790	+ if (get_option('feedwordpress_unfamiliar_category', 'create')=='default') :
	1791	+ update_option('feedwordpress_unfamiliar_category', 'null');
1744	1792	endif;
1745		- else :
1746		- $esc = $wpdb->escape($cat_name);
1747		- $resc = $wpdb->escape(preg_quote($cat_name));
1748		-
1749		- // WordPress 2.3+
1750		- if (function_exists('is_term')) :
1751		- $cat_id = is_term($cat_name, 'category');
1752		- if ($cat_id) :
1753		- $cat_ids[] = $cat_id['term_id'];
1754		- // There must be a better way to do this...
1755		- elseif ($results = $wpdb->get_results(
1756		- "SELECT term_id
1757		- FROM $wpdb->term_taxonomy
1758		- WHERE
1759		- LOWER(description) RLIKE
1760		- CONCAT('(^|\\n)a\\.?k\\.?a\\.?( |\\t)*:?( |\\t)*', LOWER('{$resc}'), '( |\\t|\\r)*(\\n|\$)')"
1761		- )) :
1762		- foreach ($results AS $term) :
1763		- $cat_ids[] = (int) $term->term_id;
	1793	+ foreach (FeedWordPress::syndicated_links() as $link) :
	1794	+ $sub = new SyndicatedLink($link);
	1795	+
	1796	+ $remap_uf = array(
	1797	+ 'default' => 'null',
	1798	+ 'filter' => 'null',
	1799	+ 'create' => 'create:category',
	1800	+ 'tag' => 'create:post_tag'
	1801	+ );
	1802	+ if (isset($sub->settings['unfamiliar category'])) :
	1803	+ if ($sub->settings['unfamiliar category']=='filter') :
	1804	+ $sub->settings['match/filter'] = array('category');
	1805	+ endif;
	1806	+ foreach ($remap_uf as $from => $to) :
	1807	+ if ($sub->settings['unfamiliar category']==$from) :
	1808	+ $sub->settings['unfamiliar category'] = $to;
	1809	+ endif;
1764	1810	endforeach;
1765		- elseif ('tag'==$unfamiliar_category) :
1766		- $tags[] = $cat_name;
1767		- elseif ('create'===$unfamiliar_category) :
1768		- $term = wp_insert_term($cat_name, 'category');
1769		- $cat_ids[] = $term['term_id'];
1770	1811	endif;
1771		-
1772		- // WordPress 1.5.x - 2.2.x
1773		- else :
1774		- $results = $wpdb->get_results(
1775		- "SELECT cat_ID
1776		- FROM $wpdb->categories
1777		- WHERE
1778		- (LOWER(cat_name) = LOWER('$esc'))
1779		- OR (LOWER(category_description)
1780		- RLIKE CONCAT('(^|\\n)a\\.?k\\.?a\\.?( |\\t)*:?( |\\t)*', LOWER('{$resc}'), '( |\\t|\\r)*(\\n|\$)'))
1781		- ");
1782		- if ($results) :
1783		- foreach ($results as $term) :
1784		- $cat_ids[] = (int) $term->cat_ID;
1785		- endforeach;
1786		- elseif ('create'===$unfamiliar_category) :
1787		- if (function_exists('wp_insert_category')) :
1788		- $cat_id = wp_insert_category(array('cat_name' => $cat_name));
1789		- // And into the database we go.
1790		- else :
1791		- $nice_kitty = sanitize_title($cat_name);
1792		- $wpdb->query(sprintf("
1793		- INSERT INTO $wpdb->categories
1794		- SET
1795		- cat_name='%s',
1796		- category_nicename='%s'
1797		- ", $wpdb->escape($cat_name), $nice_kitty
1798		- ));
1799		- $cat_id = $wpdb->insert_id;
1800		- endif;
1801		- $cat_ids[] = $cat_id;
	1812	+
	1813	+ if (isset($sub->settings['add global categories'])) :
	1814	+ $sub->settings['add/category'] = $sub->settings['add global categories'];
	1815	+ unset($sub->settings['add global categories']);
1802	1816	endif;
1803		- endif;
1804		- endif;
1805		- endforeach;
1806	1817
1807		- if ((count($cat_ids) == 0) and ($unfamiliar_category === 'filter')) :
1808		- $cat_ids = NULL; // Drop the post
1809		- else :
1810		- $cat_ids = array_unique($cat_ids);
1811		- endif;
1812		-
1813		- if ($tags_too) : $ret = array($cat_ids, $tags);
1814		- else : $ret = $cat_ids;
1815		- endif;
	1818	+ $sub->save_settings(/*reload=*/ true);
	1819	+ endforeach;
	1820	+ update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
1816	1821
1817		- return $ret;
1818		- } // function SyndicatedPost::category_ids ()
	1822	+ else :
1819	1823
1820		- function use_api ($tag) {
1821		- global $wp_db_version;
1822		- switch ($tag) :
1823		- case 'wp_insert_post':
1824		- // Before 2.2, wp_insert_post does too much of the wrong stuff to use it
1825		- // In 1.5 it was such a resource hog it would make PHP segfault on big updates
1826		- $ret = (isset($wp_db_version) and $wp_db_version > FWP_SCHEMA_21);
1827		- break;
1828		- case 'post_status_pending':
1829		- $ret = (isset($wp_db_version) and $wp_db_version > FWP_SCHEMA_23);
1830		- break;
1831		- endswitch;
1832		- return $ret;
1833		- } // function SyndicatedPost::use_api ()
	1824	+ // No upgrade needed. Just brand it with the new version.
	1825	+ update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
1834	1826
1835		- #### EXTRACT DATA FROM FEED ITEM ####
	1827	+ endif;
1836	1828
1837		- function created () {
1838		- $epoch = null;
1839		- if (isset($this->item['dc']['created'])) :
1840		- $epoch = @parse_w3cdtf($this->item['dc']['created']);
1841		- elseif (isset($this->item['dcterms']['created'])) :
1842		- $epoch = @parse_w3cdtf($this->item['dcterms']['created']);
1843		- elseif (isset($this->item['created'])): // Atom 0.3
1844		- $epoch = @parse_w3cdtf($this->item['created']);
1845	1829	endif;
1846		- return $epoch;
1847		- }
1848		- function published ($fallback = true) {
1849		- $epoch = null;
	1830	+ return $ret;
	1831	+ } /* FeedWordPress::needs_upgrade () */
1850	1832
1851		- # RSS is a fucking mess. Figure out whether we have a date in
1852		- # <dc:date>, <issued>, <pubDate>, etc., and get it into Unix
1853		- # epoch format for reformatting. If we can't find anything,
1854		- # we'll use the last-updated time.
1855		- if (isset($this->item['dc']['date'])): // Dublin Core
1856		- $epoch = @parse_w3cdtf($this->item['dc']['date']);
1857		- elseif (isset($this->item['dcterms']['issued'])) : // Dublin Core extensions
1858		- $epoch = @parse_w3cdtf($this->item['dcterms']['issued']);
1859		- elseif (isset($this->item['published'])) : // Atom 1.0
1860		- $epoch = @parse_w3cdtf($this->item['published']);
1861		- elseif (isset($this->item['issued'])): // Atom 0.3
1862		- $epoch = @parse_w3cdtf($this->item['issued']);
1863		- elseif (isset($this->item['pubdate'])): // RSS 2.0
1864		- $epoch = strtotime($this->item['pubdate']);
1865		- elseif ($fallback) : // Fall back to <updated> / <modified> if present
1866		- $epoch = $this->updated(/*fallback=*/ false);
1867		- endif;
1868		-
1869		- # If everything failed, then default to the current time.
1870		- if (is_null($epoch)) :
1871		- if (-1 == $default) :
1872		- $epoch = time();
1873		- else :
1874		- $epoch = $default;
1875		- endif;
1876		- endif;
1877		-
1878		- return $epoch;
1879		- }
1880		- function updated ($fallback = true, $default = -1) {
1881		- $epoch = null;
	1833	+ static function upgrade_database ($from = null) {
	1834	+ global $wpdb;
1882	1835
1883		- # As far as I know, only dcterms and Atom have reliable ways to
1884		- # specify when something was *modified* last. If neither is
1885		- # available, then we'll try to get the time of publication.
1886		- if (isset($this->item['dc']['modified'])) : // Not really correct
1887		- $epoch = @parse_w3cdtf($this->item['dc']['modified']);
1888		- elseif (isset($this->item['dcterms']['modified'])) : // Dublin Core extensions
1889		- $epoch = @parse_w3cdtf($this->item['dcterms']['modified']);
1890		- elseif (isset($this->item['modified'])): // Atom 0.3
1891		- $epoch = @parse_w3cdtf($this->item['modified']);
1892		- elseif (isset($this->item['updated'])): // Atom 1.0
1893		- $epoch = @parse_w3cdtf($this->item['updated']);
1894		- elseif ($fallback) : // Fall back to issued / dc:date
1895		- $epoch = $this->published(/*fallback=*/ false, /*default=*/ $default);
1896		- endif;
1897		-
1898		- # If everything failed, then default to the current time.
1899		- if (is_null($epoch)) :
1900		- if (-1 == $default) :
1901		- $epoch = time();
1902		- else :
1903		- $epoch = $default;
1904		- endif;
1905		- endif;
	1836	+ if (is_null($from) or $from <= 0.96) : $from = 0.96; endif;
1906	1837
1907		- return $epoch;
1908		- }
	1838	+ switch ($from) :
	1839	+ case 0.96:
	1840	+ // Dropping legacy upgrade code. If anyone is still
	1841	+ // using 0.96 and just now decided to upgrade, well, I'm
	1842	+ // sorry about that. You'll just have to cope with a few
	1843	+ // duplicate posts.
1909	1844
1910		- function update_hash () {
1911		- return md5(serialize($this->item));
1912		- }
	1845	+ // Mark the upgrade as successful.
	1846	+ update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
	1847	+ endswitch;
	1848	+ echo "<p>Upgrade complete. FeedWordPress is now ready to use again.</p>";
	1849	+ } /* FeedWordPress::upgrade_database() */
1913	1850
1914		- function guid () {
1915		- $guid = null;
1916		- if (isset($this->item['id'])): // Atom 0.3 / 1.0
1917		- $guid = $this->item['id'];
1918		- elseif (isset($this->item['atom']['id'])) : // Namespaced Atom
1919		- $guid = $this->item['atom']['id'];
1920		- elseif (isset($this->item['guid'])) : // RSS 2.0
1921		- $guid = $this->item['guid'];
1922		- elseif (isset($this->item['dc']['identifier'])) :// yeah, right
1923		- $guid = $this->item['dc']['identifier'];
1924		- else :
1925		- // The feed does not seem to have provided us with a
1926		- // unique identifier, so we'll have to cobble together
1927		- // a tag: URI that might work for us. The base of the
1928		- // URI will be the host name of the feed source ...
1929		- $bits = parse_url($this->feedmeta['link/uri']);
1930		- $guid = 'tag:'.$bits['host'];
	1851	+ public static function has_guid_index () {
	1852	+ global $wpdb;
1931	1853
1932		- // If we have a date of creation, then we can use that
1933		- // to uniquely identify the item. (On the other hand, if
1934		- // the feed producer was consicentious enough to
1935		- // generate dates of creation, she probably also was
1936		- // conscientious enough to generate unique identifiers.)
1937		- if (!is_null($this->created())) :
1938		- $guid .= '://post.'.date('YmdHis', $this->created());
1939		-
1940		- // Otherwise, use both the URI of the item, *and* the
1941		- // item's title. We have to use both because titles are
1942		- // often not unique, and sometimes links aren't unique
1943		- // either (e.g. Bitch (S)HITLIST, Mozilla Dot Org news,
1944		- // some podcasts). But it's rare to have *both* the same
1945		- // title *and* the same link for two different items. So
1946		- // this is about the best we can do.
1947		- else :
1948		- $guid .= '://'.md5($this->item['link'].'/'.$this->item['title']);
1949		- endif;
1950		- endif;
1951		- return $guid;
1952		- }
1953		-
1954		- function author () {
1955		- $author = array ();
1956		-
1957		- if (isset($this->item['author_name'])):
1958		- $author['name'] = $this->item['author_name'];
1959		- elseif (isset($this->item['dc']['creator'])):
1960		- $author['name'] = $this->item['dc']['creator'];
1961		- elseif (isset($this->item['dc']['contributor'])):
1962		- $author['name'] = $this->item['dc']['contributor'];
1963		- elseif (isset($this->feed->channel['dc']['creator'])) :
1964		- $author['name'] = $this->feed->channel['dc']['creator'];
1965		- elseif (isset($this->feed->channel['dc']['contributor'])) :
1966		- $author['name'] = $this->feed->channel['dc']['contributor'];
1967		- elseif (isset($this->feed->channel['author_name'])) :
1968		- $author['name'] = $this->feed->channel['author_name'];
1969		- elseif ($this->feed->is_rss() and isset($this->item['author'])) :
1970		- // The author element in RSS is allegedly an
1971		- // e-mail address, but lots of people don't use
1972		- // it that way. So let's make of it what we can.
1973		- $author = parse_email_with_realname($this->item['author']);
1974		-
1975		- if (!isset($author['name'])) :
1976		- if (isset($author['email'])) :
1977		- $author['name'] = $author['email'];
1978		- else :
1979		- $author['name'] = $this->feed->channel['title'];
	1854	+ $found = false; // Guilty until proven innocent.
	1855	+
	1856	+ $results = $wpdb->get_results("
	1857	+ SHOW INDEXES FROM {$wpdb->posts}
	1858	+ ");
	1859	+ if ($results) :
	1860	+ foreach ($results as $index) :
	1861	+ if (isset($index->Column_name)
	1862	+ and ('guid' == $index->Column_name)) :
	1863	+ $found = true;
1980	1864	endif;
1981		- endif;
1982		- else :
1983		- $author['name'] = $this->feed->channel['title'];
	1865	+ endforeach;
1984	1866	endif;
1985		-
1986		- if (isset($this->item['author_email'])):
1987		- $author['email'] = $this->item['author_email'];
1988		- elseif (isset($this->feed->channel['author_email'])) :
1989		- $author['email'] = $this->feed->channel['author_email'];
1990		- endif;
1991		-
1992		- if (isset($this->item['author_url'])):
1993		- $author['uri'] = $this->item['author_url'];
1994		- elseif (isset($this->feed->channel['author_url'])) :
1995		- $author['uri'] = $this->item['author_url'];
1996		- else:
1997		- $author['uri'] = $this->feed->channel['link'];
1998		- endif;
	1867	+ return $found;
	1868	+ } /* FeedWordPress::has_guid_index () */
1999	1869
2000		- return $author;
2001		- } // SyndicatedPost::author()
2002		-
2003		- var $strip_attrs = array (
2004		- array('[a-z]+', 'style'),
2005		- array('[a-z]+', 'target'),
2006		- );
2007		- function sanitize_content ($content, $obj) {
2008		- # FeedWordPress used to resolve URIs relative to the
2009		- # feed URI. It now relies on the xml:base support
2010		- # baked in to the MagpieRSS upgrade. So all we do here
2011		- # now is to sanitize problematic attributes.
2012		- #
2013		- # This kind of sucks. I intend to replace it with
2014		- # lib_filter sometime soon.
2015		- foreach ($obj->strip_attrs as $pair):
2016		- list($tag,$attr) = $pair;
2017		- $content = preg_replace (
2018		- ":(<$tag [^>]*)($attr=(\"[^\">]*\"|[^>\\s]+))([^>]*>):i",
2019		- "\\1\\4",
2020		- $content
2021		- );
2022		- endforeach;
2023		- return $content;
2024		- }
2025		-} // class SyndicatedPost
	1870	+ public static function create_guid_index () {
	1871	+ global $wpdb;
2026	1872
2027		-# class SyndicatedLink: represents a syndication feed stored within the
2028		-# WordPress database
2029		-#
2030		-# To keep things compact and editable from within WordPress, we use all the
2031		-# links under a particular category in the WordPress "Blogroll" for the list of
2032		-# feeds to syndicate. "Contributors" is the category used by default; you can
2033		-# configure that under Options --> Syndication.
2034		-#
2035		-# Fields used are:
2036		-#
2037		-# * link_rss: the URI of the Atom/RSS feed to syndicate
2038		-#
2039		-# * link_notes: user-configurable options, with keys and values
2040		-# like so:
2041		-#
2042		-# key: value
2043		-# cats: computers\nweb
2044		-# feed/key: value
2045		-#
2046		-# Keys that start with "feed/" are gleaned from the data supplied
2047		-# by the feed itself, and will be overwritten with each update.
2048		-#
2049		-# Values have linebreak characters escaped with C-style
2050		-# backslashes (so, for example, a newline becomes "\n").
2051		-#
2052		-# The value of `cats` is used as a newline-separated list of
2053		-# default categories for any post coming from a particular feed.
2054		-# (In the example above, any posts from this feed will be placed
2055		-# in the "computers" and "web" categories--*in addition to* any
2056		-# categories that may already be applied to the posts.)
2057		-#
2058		-# Values of keys in link_notes are accessible from templates using
2059		-# the function `get_feed_meta($key)` if this plugin is activated.
	1873	+ $wpdb->query("
	1874	+ CREATE INDEX {$wpdb->posts}_guid_idx ON {$wpdb->posts}(guid)
	1875	+ ");
	1876	+ } /* FeedWordPress::create_guid_index () */
2060	1877
2061		-class SyndicatedLink {
2062		- var $id = null;
2063		- var $link = null;
2064		- var $settings = array ();
2065		- var $magpie = null;
	1878	+ public static function remove_guid_index () {
	1879	+ global $wpdb;
2066	1880
2067		- function SyndicatedLink ($link) {
2068		- global $wpdb;
	1881	+ $wpdb->query("
	1882	+ DROP INDEX {$wpdb->posts}_guid_idx ON {$wpdb->posts}
	1883	+ ");
	1884	+ }
2069	1885
2070		- if (is_object($link)) :
2071		- $this->link = $link;
2072		- $this->id = $link->link_id;
2073		- else :
2074		- $this->id = $link;
2075		- if (function_exists('get_bookmark')) : // WP 2.1+
2076		- $this->link = get_bookmark($link);
2077		- else :
2078		- $this->link = $wpdb->get_row("
2079		- SELECT * FROM $wpdb->links
2080		- WHERE (link_id = '".$wpdb->escape($link)."')"
2081		- );
2082		- endif;
	1886	+ static function fetch_timeout () {
	1887	+ return apply_filters(
	1888	+ 'feedwordpress_fetch_timeout',
	1889	+ intval(get_option('feedwordpress_fetch_timeout', FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT))
	1890	+ );
	1891	+ }
	1892	+
	1893	+ static function fetch ($url, $params = array()) {
	1894	+ if (is_wp_error($url)) :
	1895	+ // Let's bounce.
	1896	+ return $url;
2083	1897	endif;
2084	1898
2085		- if (strlen($this->link->link_rss) > 0) :
2086		- // Read off feed settings from link_notes
2087		- $notes = explode("\n", $this->link->link_notes);
2088		- foreach ($notes as $note):
2089		- list($key, $value) = explode(": ", $note, 2);
2090		-
2091		- if (strlen($key) > 0) :
2092		- // Unescape and trim() off the whitespace.
2093		- // Thanks to Ray Lischner for pointing out the
2094		- // need to trim off whitespace.
2095		- $this->settings[$key] = stripcslashes (trim($value));
2096		- endif;
2097		- endforeach;
	1899	+ $force_feed = true; // Default
2098	1900
2099		- // "Magic" feed settings
2100		- $this->settings['link/uri'] = $this->link->link_rss;
2101		- $this->settings['link/name'] = $this->link->link_name;
2102		- $this->settings['link/id'] = $this->link->link_id;
2103		-
2104		- // `hardcode categories` and `unfamiliar categories` are deprecated in favor of `unfamiliar category`
2105		- if (
2106		- isset($this->settings['unfamiliar categories'])
2107		- and !isset($this->settings['unfamiliar category'])
2108		- ) :
2109		- $this->settings['unfamiliar category'] = $this->settings['unfamiliar categories'];
2110		- endif;
2111		- if (
2112		- FeedWordPress::affirmative($this->settings, 'hardcode categories')
2113		- and !isset($this->settings['unfamiliar category'])
2114		- ) :
2115		- $this->settings['unfamiliar category'] = 'default';
2116		- endif;
	1901	+ // Allow user to change default feed-fetch timeout with a global setting.
	1902	+ // Props Erigami Scholey-Fuller <http://www.piepalace.ca/blog/2010/11/feedwordpress-broke-my-heart.html>
	1903	+ $timeout = FeedWordPress::fetch_timeout();
2117	1904
2118		- // Set this up automagically for del.icio.us
2119		- $bits = parse_url($this->link->link_rss);
2120		- $tagspacers = array('del.icio.us', 'feeds.delicious.com');
2121		- if (!isset($this->settings['cat_split']) and in_array($bits['host'], $tagspacers)) :
2122		- $this->settings['cat_split'] = '\s'; // Whitespace separates multiple tags in del.icio.us RSS feeds
2123		- endif;
	1905	+ if (!is_array($params)) :
	1906	+ $force_feed = $params;
	1907	+ else : // Parameter array
	1908	+ $args = wp_parse_args(array(
	1909	+ 'force_feed' => $force_feed,
	1910	+ 'timeout' => $timeout
	1911	+ ), $params);
2124	1912
2125		- if (isset($this->settings['cats'])):
2126		- $this->settings['cats'] = preg_split(FEEDWORDPRESS_CAT_SEPARATOR_PATTERN, $this->settings['cats']);
2127		- endif;
2128		- if (isset($this->settings['tags'])):
2129		- $this->settings['tags'] = preg_split(FEEDWORDPRESS_CAT_SEPARATOR_PATTERN, $this->settings['tags']);
2130		- endif;
2131		-
2132		- if (isset($this->settings['map authors'])) :
2133		- $author_rules = explode("\n\n", $this->settings['map authors']);
2134		- $ma = array();
2135		- foreach ($author_rules as $rule) :
2136		- list($rule_type, $author_name, $author_action) = explode("\n", $rule);
2137		-
2138		- // Normalize for case and whitespace
2139		- $rule_type = strtolower(trim($rule_type));
2140		- $author_name = strtolower(trim($author_name));
2141		- $author_action = strtolower(trim($author_action));
2142		-
2143		- $ma[$rule_type][$author_name] = $author_action;
2144		- endforeach;
2145		- $this->settings['map authors'] = $ma;
2146		- endif;
	1913	+ extract($args);
2147	1914	endif;
2148		- } /* SyndicatedLink::SyndicatedLink () */
2149		-
2150		- function found () {
2151		- return is_object($this->link);
2152		- } /* SyndicatedLink::found () */
	1915	+ $timeout = intval($timeout);
2153	1916
2154		- function stale () {
2155		- $stale = true;
2156		- if (isset($this->settings['update/hold']) and ($this->settings['update/hold']=='ping')) :
2157		- $stale = false; // don't update on any timed updates; pings only
2158		- elseif (isset($this->settings['update/hold']) and ($this->settings['update/hold']=='next')) :
2159		- $stale = true; // update on the next timed update
2160		- elseif (!isset($this->settings['update/ttl']) or !isset($this->settings['update/last'])) :
2161		- $stale = true; // initial update
2162		- else :
2163		- $after = ((int) $this->settings['update/last'])
2164		- +((int) $this->settings['update/ttl'] * 60);
2165		- $stale = (time() >= $after);
2166		- endif;
2167		- return $stale;
2168		- } /* SyndicatedLink::stale () */
	1917	+ $pie_class = apply_filters('feedwordpress_simplepie_class', 'FeedWordPie');
	1918	+ $cache_class = apply_filters('feedwordpress_cache_class', 'FeedWordPie_Cache');
	1919	+ $file_class = apply_filters('feedwordpress_file_class', 'FeedWordPie_File');
	1920	+ $parser_class = apply_filters('feedwordpress_parser_class', 'FeedWordPie_Parser');
	1921	+ $item_class = apply_filters('feedwordpress_item_class', 'FeedWordPie_Item');
	1922	+ $sniffer_class = apply_filters('feedwordpress_sniffer_class', 'FeedWordPie_Content_Type_Sniffer');
2169	1923
2170		- function poll ($crash_ts = NULL) {
2171		- global $wpdb;
	1924	+ $feed = new $pie_class;
	1925	+ $feed->set_feed_url($url);
	1926	+ $feed->registry->register('Cache', $cache_class);
	1927	+ $feed->set_timeout($timeout);
2172	1928
2173		- $this->magpie = fetch_rss($this->link->link_rss);
2174		- $new_count = NULL;
	1929	+ $feed->set_content_type_sniffer_class($sniffer_class);
	1930	+ $feed->set_file_class($file_class);
	1931	+ $feed->set_parser_class($parser_class);
	1932	+ $feed->set_item_class($item_class);
	1933	+ $feed->force_feed($force_feed);
	1934	+ $feed->set_cache_duration(FeedWordPress::cache_duration($params));
	1935	+ $feed->init();
	1936	+ $feed->handle_content_type();
2175	1937
2176		- $resume = FeedWordPress::affirmative($this->settings, 'update/unfinished');
2177		- if ($resume) :
2178		- // pick up where we left off
2179		- $processed = array_map('trim', explode("\n", $this->settings['update/processed']));
	1938	+ if ($feed->error()) :
	1939	+ $ret = new WP_Error('simplepie-error', $feed->error());
2180	1940	else :
2181		- // begin at the beginning
2182		- $processed = array();
	1941	+ $ret = $feed;
2183	1942	endif;
	1943	+ return $ret;
	1944	+ } /* FeedWordPress::fetch () */
2184	1945
2185		- if (is_object($this->magpie)) :
2186		- $new_count = array('new' => 0, 'updated' => 0);
	1946	+ public function clear_cache () {
	1947	+ global $wpdb;
2187	1948
2188		- # -- Update Link metadata live from feed
2189		- $channel = $this->magpie->channel;
	1949	+ // Just in case, clear out any old MagpieRSS cache records.
	1950	+ $magpies = $wpdb->query("
	1951	+ DELETE FROM {$wpdb->options}
	1952	+ WHERE option_name LIKE 'rss_%' AND LENGTH(option_name) > 32
	1953	+ ");
2190	1954
2191		- if (!isset($channel['id'])) :
2192		- $channel['id'] = $this->link->link_rss;
2193		- endif;
2194		-
2195		- $update = array();
2196		- if (!$this->hardcode('url') and isset($channel['link'])) :
2197		- $update[] = "link_url = '".$wpdb->escape($channel['link'])."'";
2198		- endif;
2199		-
2200		- if (!$this->hardcode('name') and isset($channel['title'])) :
2201		- $update[] = "link_name = '".$wpdb->escape($channel['title'])."'";
2202		- endif;
2203		-
2204		- if (!$this->hardcode('description')) :
2205		- if (isset($channel['tagline'])) :
2206		- $update[] = "link_description = '".$wpdb->escape($channel['tagline'])."'";
2207		- elseif (isset($channel['description'])) :
2208		- $update[] = "link_description = '".$wpdb->escape($channel['description'])."'";
2209		- endif;
2210		- endif;
2211		-
2212		- $this->settings = array_merge($this->settings, $this->flatten_array($channel));
	1955	+ // The WordPress SimplePie module stores its cached feeds as
	1956	+ // transient records in the options table. The data itself is
	1957	+ // stored in `_transient_feed_{md5 of url}` and the last-modified
	1958	+ // timestamp in `_transient_feed_mod_{md5 of url}`. Timeouts for
	1959	+ // these records are stored in `_transient_timeout_feed_{md5}`.
	1960	+ // Since the md5 is always 32 characters in length, the
	1961	+ // option_name is always over 32 characters.
	1962	+ $simplepies = $wpdb->query("
	1963	+ DELETE FROM {$wpdb->options}
	1964	+ WHERE option_name LIKE '_transient%_feed_%' AND LENGTH(option_name) > 32
	1965	+ ");
	1966	+ $simplepies = (int) ($simplepies / 4); // Each transient has 4 rows: the data, the modified timestamp; and the timeouts for each
2213	1967
2214		- $this->settings['update/last'] = time(); $ttl = $this->ttl();
2215		- if (!is_null($ttl)) :
2216		- $this->settings['update/ttl'] = $ttl;
2217		- $this->settings['update/timed'] = 'feed';
2218		- else :
2219		- $this->settings['update/ttl'] = rand(30, 120); // spread over time interval for staggered updates
2220		- $this->settings['update/timed'] = 'automatically';
2221		- endif;
	1968	+ return ($magpies + $simplepies);
	1969	+ } /* FeedWordPress::clear_cache () */
2222	1970
2223		- if (!isset($this->settings['update/hold']) or $this->settings['update/hold']!='ping') :
2224		- $this->settings['update/hold'] = 'scheduled';
2225		- endif;
	1971	+ static public function cache_duration ($params = array()) {
	1972	+ $params = wp_parse_args($params, array(
	1973	+ "cache" => true,
	1974	+ ));
2226	1975
2227		- $this->settings['update/unfinished'] = 'yes';
	1976	+ $duration = null;
	1977	+ if (!$params['cache']) :
	1978	+ $duration = 0;
	1979	+ elseif (defined('FEEDWORDPRESS_CACHE_AGE')) :
	1980	+ $duration = FEEDWORDPRESS_CACHE_AGE;
	1981	+ endif;
	1982	+ return $duration;
	1983	+ }
2228	1984
2229		- $update[] = "link_notes = '".$wpdb->escape($this->settings_to_notes())."'";
	1985	+ static public function cache_lifetime ($duration) {
	1986	+ // Check for explicit setting of a lifetime duration
	1987	+ if (defined('FEEDWORDPRESS_CACHE_LIFETIME')) :
	1988	+ $duration = FEEDWORDPRESS_CACHE_LIFETIME;
2230	1989
2231		- $update_set = implode(',', $update);
2232		-
2233		- // Update the properties of the link from the feed information
2234		- $result = $wpdb->query("
2235		- UPDATE $wpdb->links
2236		- SET $update_set
2237		- WHERE link_id='$this->id'
2238		- ");
	1990	+ // Fall back to the cache freshness duration
	1991	+ elseif (defined('FEEDWORDPRESS_CACHE_AGE')) :
	1992	+ $duration = FEEDWORDPRESS_CACHE_AGE;
	1993	+ endif;
2239	1994
2240		- # -- Add new posts from feed and update any updated posts
2241		- $crashed = false;
	1995	+ // Fall back to WordPress default
	1996	+ return $duration;
	1997	+ } /* FeedWordPress::cache_lifetime () */
2242	1998
2243		- if (is_array($this->magpie->items)) :
2244		- foreach ($this->magpie->items as $item) :
2245		- $post =& new SyndicatedPost($item, $this);
2246		- if (!$resume or !in_array(trim($post->guid()), $processed)) :
2247		- $processed[] = $post->guid();
2248		- if (!$post->filtered()) :
2249		- $new = $post->store();
2250		- if ( $new !== false ) $new_count[$new]++;
2251		- endif;
	1999	+ # Utility functions for handling text settings
	2000	+ static function get_field( $f, $setting = null ) {
2252	2001
2253		- if (!is_null($crash_ts) and (time() > $crash_ts)) :
2254		- $crashed = true;
2255		- break;
2256		- endif;
2257		- endif;
2258		- endforeach;
	2002	+ $ret = $f;
	2003	+ if ( ! is_null( $setting ) ) :
	2004	+ $ret = null;
	2005	+ if ( array_key_exists( $setting, $f ) ) :
	2006	+ $ret = $f[ $setting ];
2259	2007	endif;
2260		-
2261		- // Copy back any changes to feed settings made in the course of updating (e.g. new author rules)
2262		- $to_notes = $this->settings;
2263		-
2264		- $this->settings['update/processed'] = $processed;
2265		- if (!$crashed) :
2266		- $this->settings['update/unfinished'] = 'no';
2267		- endif;
2268		-
2269		- $update_set = "link_notes = '".$wpdb->escape($this->settings_to_notes())."'";
2270		-
2271		- // Update the properties of the link from the feed information
2272		- $result = $wpdb->query("
2273		- UPDATE $wpdb->links
2274		- SET $update_set
2275		- WHERE link_id='$this->id'
2276		- ");
2277	2008	endif;
2278		-
2279		- return $new_count;
2280		- } /* SyndicatedLink::poll() */
	2009	+ return $ret;
2281	2010
2282		- function map_name_to_new_user ($name, $newuser_name) {
2283		- global $wpdb;
	2011	+ } /* FeedWordPress::get_field () */
2284	2012
2285		- if (strlen($newuser_name) > 0) :
2286		- $userdata = array();
2287		- $userdata['ID'] = NULL;
2288		-
2289		- $userdata['user_login'] = sanitize_user($newuser_name);
2290		- $userdata['user_login'] = apply_filters('pre_user_login', $userdata['user_login']);
2291		-
2292		- $userdata['user_nicename'] = sanitize_title($newuser_name);
2293		- $userdata['user_nicename'] = apply_filters('pre_user_nicename', $userdata['user_nicename']);
2294		-
2295		- $userdata['display_name'] = $wpdb->escape($newuser_name);
2296		-
2297		- $newuser_id = wp_insert_user($userdata);
2298		- if (is_numeric($newuser_id)) :
2299		- if (is_null($name)) : // Unfamiliar author
2300		- $this->settings['unfamiliar author'] = $newuser_id;
2301		- else :
2302		- $this->settings['map authors']['name'][$name] = $newuser_id;
2303		- endif;
2304		- else :
2305		- // TODO: Add some error detection and reporting
2306		- endif;
2307		- else :
2308		- // TODO: Add some error reporting
2309		- endif;
2310		- } /* SyndicatedLink::map_name_to_new_user () */
	2013	+ static function negative ($f, $setting = null) {
	2014	+ $nego = array ('n', 'no', 'f', 'false');
	2015	+ $q = self::get_field( $f, $setting );
	2016	+ return in_array( strtolower( trim( $q ) ), $nego );
	2017	+ } /* FeedWordPress::negative () */
2311	2018
2312		- function settings_to_notes () {
2313		- $to_notes = $this->settings;
	2019	+ static function affirmative ($f, $setting = null) {
	2020	+ $affirmo = array ('y', 'yes', 't', 'true', 1);
	2021	+ $q = self::get_field( $f, $setting );
	2022	+ return in_array( strtolower( trim( $q ) ), $affirmo );
	2023	+ } /* FeedWordPress::affirmative () */
2314	2024
2315		- unset($to_notes['link/id']); // Magic setting; don't save
2316		- unset($to_notes['link/uri']); // Magic setting; don't save
2317		- unset($to_notes['link/name']); // Magic setting; don't save
2318		- unset($to_notes['hardcode categories']); // Deprecated
2319		- unset($to_notes['unfamiliar categories']); // Deprecated
	2025	+ # Internal debugging functions
2320	2026
2321		- // Collapse array settings
2322		- if (isset($to_notes['update/processed']) and (is_array($to_notes['update/processed']))) :
2323		- $to_notes['update/processed'] = implode("\n", $to_notes['update/processed']);
2324		- endif;
	2027	+ static function diagnostic ($level, $out, $persist = null, $since = null, $mostRecent = null) {
	2028	+ global $feedwordpress_admin_footer;
2325	2029
2326		- if (is_array($to_notes['cats'])) :
2327		- $to_notes['cats'] = implode(FEEDWORDPRESS_CAT_SEPARATOR, $to_notes['cats']);
2328		- endif;
2329		- if (is_array($to_notes['tags'])) :
2330		- $to_notes['tags'] = implode(FEEDWORDPRESS_CAT_SEPARATOR, $to_notes['tags']);
2331		- endif;
	2030	+ $output = get_option('feedwordpress_diagnostics_output', array());
	2031	+ $dlog = get_option('feedwordpress_diagnostics_log', array());
2332	2032
2333		- // Collapse the author mapping rule structure back into a flat string
2334		- if (isset($to_notes['map authors'])) :
2335		- $ma = array();
2336		- foreach ($to_notes['map authors'] as $rule_type => $author_rules) :
2337		- foreach ($author_rules as $author_name => $author_action) :
2338		- $ma[] = $rule_type."\n".$author_name."\n".$author_action;
2339		- endforeach;
2340		- endforeach;
2341		- $to_notes['map authors'] = implode("\n\n", $ma);
2342		- endif;
	2033	+ $diagnostic_nesting = count( explode( ":", $level ) );
2343	2034
2344		- $notes = '';
2345		- foreach ($to_notes as $key => $value) :
2346		- $notes .= $key . ": ". addcslashes($value, "\0..\37".'\\') . "\n";
2347		- endforeach;
2348		- return $notes;
2349		- } /* SyndicatedLink::settings_to_notes () */
	2035	+ if (FeedWordPressDiagnostic::is_on($level)) :
	2036	+ foreach ($output as $method) :
	2037	+ switch ($method) :
	2038	+ case 'echo' :
	2039	+ if (!self::update_requested()) :
	2040	+ echo "<div><pre><strong>Diag".str_repeat('====', $diagnostic_nesting-1).'|</strong> '.$out."</pre></div>\n";
	2041	+ endif;
	2042	+ break;
	2043	+ case 'echo_in_cronjob' :
	2044	+ if (self::update_requested()) :
	2045	+ echo self::log_prefix() . ' ' . esc_html( $out ) . "\n";
	2046	+ endif;
	2047	+ break;
	2048	+ case 'admin_footer' :
	2049	+ $feedwordpress_admin_footer[] = $out;
	2050	+ break;
	2051	+ case 'error_log' :
	2052	+ error_log(self::log_prefix() . ' ' . $out);
	2053	+ break;
	2054	+ case 'email' :
2350	2055
2351		- function uri () {
2352		- return (is_object($this->link) ? $this->link->link_rss : NULL);
2353		- } /* SyndicatedLink::uri () */
	2056	+ if (is_null($persist)) :
	2057	+ $sect = 'occurrent';
	2058	+ $hook = (isset($dlog['mesg'][$sect]) ? count($dlog['mesg'][$sect]) : 0);
	2059	+ $line = array("Time" => time(), "Message" => $out);
	2060	+ else :
	2061	+ $sect = 'persistent';
	2062	+ $hook = md5($level."\n".$persist);
	2063	+ $line = array("Since" => $since, "Message" => $out, "Most Recent" => $mostRecent);
	2064	+ endif;
2354	2065
2355		- function homepage () {
2356		- return (isset($this->settings['feed/link']) ? $this->settings['feed/link'] : NULL);
2357		- } /* SyndicatedLink::homepage () */
	2066	+ if (!isset($dlog['mesg'])) : $dlog['mesg'] = array(); endif;
	2067	+ if (!isset($dlog['mesg'][$sect])) : $dlog['mesg'][$sect] = array(); endif;
2358	2068
2359		- function ttl () {
2360		- if (is_object($this->magpie)) :
2361		- $channel = $this->magpie->channel;
2362		- else :
2363		- $channel = array();
	2069	+ $dlog['mesg'][$sect][$hook] = $line;
	2070	+ endswitch;
	2071	+ endforeach;
2364	2072	endif;
2365	2073
2366		- if (isset($channel['ttl'])) :
2367		- // "ttl stands for time to live. It's a number of
2368		- // minutes that indicates how long a channel can be
2369		- // cached before refreshing from the source."
2370		- // <http://blogs.law.harvard.edu/tech/rss#ltttlgtSubelementOfLtchannelgt>
2371		- $ret = $channel['ttl'];
2372		- elseif (isset($channel['sy']['updatefrequency']) or isset($channel['sy']['updateperiod'])) :
2373		- $period_minutes = array (
2374		- 'hourly' => 60, /* minutes in an hour */
2375		- 'daily' => 1440, /* minutes in a day */
2376		- 'weekly' => 10080, /* minutes in a week */
2377		- 'monthly' => 43200, /* minutes in a month */
2378		- 'yearly' => 525600, /* minutes in a year */
2379		- );
	2074	+ update_option('feedwordpress_diagnostics_log', $dlog);
	2075	+ } /* FeedWordPress::diagnostic () */
2380	2076
2381		- // "sy:updatePeriod: Describes the period over which the
2382		- // channel format is updated. Acceptable values are:
2383		- // hourly, daily, weekly, monthly, yearly. If omitted,
2384		- // daily is assumed." <http://web.resource.org/rss/1.0/modules/syndication/>
2385		- if (isset($channel['sy']['updateperiod'])) : $period = $channel['sy']['updateperiod'];
2386		- else : $period = 'daily';
2387		- endif;
2388		-
2389		- // "sy:updateFrequency: Used to describe the frequency
2390		- // of updates in relation to the update period. A
2391		- // positive integer indicates how many times in that
2392		- // period the channel is updated. ... If omitted a value
2393		- // of 1 is assumed." <http://web.resource.org/rss/1.0/modules/syndication/>
2394		- if (isset($channel['sy']['updatefrequency'])) : $freq = (int) $channel['sy']['updatefrequency'];
2395		- else : $freq = 1;
2396		- endif;
2397		-
2398		- $ret = (int) ($period_minutes[$period] / $freq);
2399		- else :
2400		- $ret = NULL;
	2077	+ public function email_diagnostics_override () {
	2078	+ return ( $this->has_secret() and ! ! FeedWordPress::param( 'feedwordpress_email_diagnostics' ) );
	2079	+ } /* FeedWordPress::email_diagnostics_override () */
	2080	+
	2081	+ public function has_emailed_diagnostics ($dlog) {
	2082	+ $ret = false;
	2083	+ if ($this->email_diagnostics_override()
	2084	+ or (isset($dlog['schedule']) and isset($dlog['schedule']['last']))) :
	2085	+ $ret = true;
2401	2086	endif;
2402	2087	return $ret;
2403		- } /* SyndicatedLink::ttl() */
	2088	+ } /* FeedWordPress::has_emailed_diagnostics () */
2404	2089
2405		- // SyndicatedLink::flatten_array (): flatten an array. Useful for
2406		- // hierarchical and namespaced elements.
2407		- //
2408		- // Given an array which may contain array or object elements in it,
2409		- // return a "flattened" array: a one-dimensional array of scalars
2410		- // containing each of the scalar elements contained within the array
2411		- // structure. Thus, for example, if $a['b']['c']['d'] == 'e', then the
2412		- // returned array for FeedWordPress::flatten_array($a) will contain a key
2413		- // $a['feed/b/c/d'] with value 'e'.
2414		- function flatten_array ($arr, $prefix = 'feed/', $separator = '/') {
2415		- $ret = array ();
2416		- if (is_array($arr)) :
2417		- foreach ($arr as $key => $value) :
2418		- if (is_scalar($value)) :
2419		- $ret[$prefix.$key] = $value;
2420		- else :
2421		- $ret = array_merge($ret, $this->flatten_array($value, $prefix.$key.$separator, $separator));
2422		- endif;
2423		- endforeach;
	2090	+ public function ready_to_email_diagnostics ($dlog) {
	2091	+ $ret = false;
	2092	+ if ($this->email_diagnostics_override()
	2093	+ or (time() > ($dlog['schedule']['last'] + $dlog['schedule']['freq']))) :
	2094	+ $ret = true;
2424	2095	endif;
2425	2096	return $ret;
2426		- } /* SyndicatedLink::flatten_array () */
	2097	+ } /* FeedWordPress::ready_to_email_diagnostics () */
2427	2098
2428		- function hardcode ($what) {
2429		- $default = get_option("feedwordpress_hardcode_$what");
2430		- if ( $default === 'yes' ) :
2431		- // If the default is to hardcode, then we want the
2432		- // negation of negative(): TRUE by default and FALSE if
2433		- // the setting is explicitly "no"
2434		- $ret = !FeedWordPress::negative($this->settings, "hardcode $what");
2435		- else :
2436		- // If the default is NOT to hardcode, then we want
2437		- // affirmative(): FALSE by default and TRUE if the
2438		- // setting is explicitly "yes"
2439		- $ret = FeedWordPress::affirmative($this->settings, "hardcode $what");
2440		- endif;
2441		- return $ret;
2442		- } /* SyndicatedLink::hardcode () */
	2099	+ public function email_diagnostic_log ($params = array()) {
	2100	+ $params = wp_parse_args($params, array(
	2101	+ "force" => false,
	2102	+ ));
2443	2103
2444		- function syndicated_status ($what, $default) {
2445		- global $wpdb;
	2104	+ $dlog = get_option('feedwordpress_diagnostics_log', array());
2446	2105
2447		- $ret = get_option("feedwordpress_syndicated_{$what}_status");
2448		- if ( isset($this->settings["$what status"]) ) :
2449		- $ret = $this->settings["$what status"];
2450		- elseif (!$ret) :
2451		- $ret = $default;
2452		- endif;
2453		- return $wpdb->escape(trim(strtolower($ret)));
2454		- } /* SyndicatedLink:syndicated_status () */
2455		-} // class SyndicatedLink
	2106	+ if ($this->has_emailed_diagnostics($dlog)) :
	2107	+ if ($this->ready_to_email_diagnostics($dlog)) :
	2108	+ // No news is good news; only send if
	2109	+ // there are some messages to send.
	2110	+ $body = null;
	2111	+ if (!isset($dlog['mesg'])) : $dlog['mesg'] = array(); endif;
2456	2112
2457		-################################################################################
2458		-## XML-RPC HOOKS: accept XML-RPC update pings from Contributors ################
2459		-################################################################################
	2113	+ foreach ($dlog['mesg'] as $sect => $mesgs) :
	2114	+ if (count($mesgs) > 0) :
	2115	+ if (is_null($body)) : $body = ''; endif;
2460	2116
2461		-function feedwordpress_xmlrpc_hook ($args = array ()) {
2462		- $args['weblogUpdates.ping'] = 'feedwordpress_pong';
2463		- return $args;
2464		-}
	2117	+ $paradigm = reset($mesgs);
	2118	+ $body .= "<h2>".ucfirst($sect)." issues</h2>\n"
	2119	+ ."<table>\n"
	2120	+ ."<thead><tr>\n";
	2121	+ foreach ($paradigm as $col => $value) :
	2122	+ $body .= '<th scope="col">'.$col."</th>\n";
	2123	+ endforeach;
	2124	+ $body .= "</tr></thead>\n"
	2125	+ ."<tbody>\n";
2465	2126
2466		-function feedwordpress_pong ($args) {
2467		- $feedwordpress =& new FeedWordPress;
2468		- $delta = @$feedwordpress->update($args[1]);
2469		- if (is_null($delta)):
2470		- return array('flerror' => true, 'message' => "Sorry. I don't syndicate <$args[1]>.");
2471		- else:
2472		- $mesg = array();
2473		- if (isset($delta['new'])) { $mesg[] = ' '.$delta['new'].' new posts were syndicated'; }
2474		- if (isset($delta['updated'])) { $mesg[] = ' '.$delta['updated'].' existing posts were updated'; }
	2127	+ foreach ($mesgs as $line) :
	2128	+ $body .= "<tr>\n";
	2129	+ foreach ($line as $col => $cell) :
	2130	+ if (is_numeric($cell)) :
	2131	+ $cell = date('j-M-y, h:i a', $cell);
	2132	+ endif;
	2133	+ $class = strtolower(preg_replace('/\s+/', '-', $col));
	2134	+ $body .= "<td class=\"$class\">${cell}</td>";
	2135	+ endforeach;
	2136	+ $body .= "</tr>\n";
	2137	+ endforeach;
2475	2138
2476		- return array('flerror' => false, 'message' => "Thanks for the ping.".implode(' and', $mesg));
2477		- endif;
2478		-}
	2139	+ $body .= "</tbody>\n</table>\n\n";
	2140	+ endif;
	2141	+ endforeach;
2479	2142
2480		-################################################################################
2481		-## class FeedFinder: find likely feeds using autodetection and/or guesswork ####
2482		-################################################################################
	2143	+ $body = apply_filters('feedwordpress_diagnostic_email_body', $body, $dlog);
	2144	+ if (!is_null($body)) :
	2145	+ $home = feedwordpress_display_url(get_bloginfo('url'));
	2146	+ $subj = apply_filters('feedwordpress_diagnostic_email_subject', $home . " syndication issues", $dlog);
	2147	+ $agent = 'FeedWordPress '.FEEDWORDPRESS_VERSION;
	2148	+ $body = <<<EOMAIL
	2149	+<html>
	2150	+<head>
	2151	+<title>$subj</title>
	2152	+<style type="text/css">
	2153	+ body { background-color: white; color: black; }
	2154	+ table { width: 100%; border: 1px solid black; }
	2155	+ table thead tr th { background-color: #ff7700; color: white; border-bottom: 1px solid black; }
	2156	+ table thead tr { border-bottom: 1px solid black; }
	2157	+ table tr { vertical-align: top; }
	2158	+ table .since { width: 20%; }
	2159	+ table .time { width: 20%; }
	2160	+ table .most-recently { width: 20%; }
	2161	+ table .message { width: auto; }
	2162	+</style>
	2163	+</head>
	2164	+<body>
	2165	+<h1>Syndication Issues encountered by $agent on $home</h1>
	2166	+$body
	2167	+</body>
	2168	+</html>
2483	2169
2484		-class FeedFinder {
2485		- var $uri = NULL;
2486		- var $_cache_uri = NULL;
2487		-
2488		- var $verify = FALSE;
2489		-
2490		- var $_data = NULL;
2491		- var $_head = NULL;
	2170	+EOMAIL;
2492	2171
2493		- # -- Recognition patterns
2494		- var $_feed_types = array(
2495		- 'application/rss+xml',
2496		- 'text/xml',
2497		- 'application/atom+xml',
2498		- 'application/x.atom+xml',
2499		- 'application/x-atom+xml'
2500		- );
2501		- var $_feed_markers = array('\\<feed', '\\<rss', 'xmlns="http://purl.org/rss/1.0');
2502		- var $_html_markers = array('\\<html');
2503		- var $_obvious_feed_url = array('[./]rss', '[./]rdf', '[./]atom', '[./]feed', '\.xml');
2504		- var $_maybe_feed_url = array ('rss', 'rdf', 'atom', 'feed', 'xml');
	2172	+ $ded = get_option('feedwordpress_diagnostics_email_destination', 'admins');
2505	2173
2506		- function FeedFinder ($uri = NULL, $verify = TRUE) {
2507		- $this->uri = $uri; $this->verify = $verify;
2508		- } /* FeedFinder::FeedFinder () */
	2174	+ // e-mail address
	2175	+ if (preg_match('/^mailto:(.*)$/', $ded, $ref)) :
	2176	+ $recipients = array($ref[1]);
2509	2177
2510		- function find ($uri = NULL) {
2511		- $ret = array ();
2512		- if (!is_null($this->data($uri))) {
2513		- if ($this->is_feed($uri)) {
2514		- $ret = array($this->uri);
2515		- } else {
2516		- // Assume that we have HTML or XHTML (even if we don't, who's it gonna hurt?)
2517		- // Autodiscovery is the preferred method
2518		- $href = $this->_link_rel_feeds();
2519		-
2520		- // ... but we'll also take the little orange buttons
2521		- $href = array_merge($href, $this->_a_href_feeds(TRUE));
2522		-
2523		- // If all that failed, look harder
2524		- if (count($href) == 0) $href = $this->_a_href_feeds(FALSE);
	2178	+ // userid
	2179	+ elseif (preg_match('/^user:(.*)$/', $ded, $ref)) :
	2180	+ $userdata = get_userdata((int) $ref[1]);
	2181	+ $recipients = array($userdata->user_email);
2525	2182
2526		- // Verify feeds and resolve relative URIs
2527		- foreach ($href as $u) {
2528		- $the_uri = Relative_URI::resolve($u, $this->uri);
2529		- if ($this->verify) {
2530		- $feed =& new FeedFinder($the_uri);
2531		- if ($feed->is_feed()) $ret[] = $the_uri;
2532		- $feed = NULL;
2533		- } else {
2534		- $ret[] = $the_uri;
2535		- }
2536		- } /* foreach */
2537		- } /* if */
2538		- } /* if */
2539		- return array_unique($ret);
2540		- } /* FeedFinder::find () */
	2183	+ // admins
	2184	+ else :
	2185	+ $recipients = FeedWordPressDiagnostic::admin_emails();
	2186	+ endif;
2541	2187
2542		- function data ($uri = NULL) {
2543		- $this->_get($uri);
2544		- return $this->_data;
2545		- }
	2188	+ $mesgId = 'feedwordpress+'.time().'@'.$home;
	2189	+ $parentId = get_option('feedwordpress_diagnostics_email_root_message_id', null);
2546	2190
2547		- function is_feed ($uri = NULL) {
2548		- $data = $this->data($uri);
	2191	+ $head = array("Message-ID: <$mesgId>");
	2192	+ if (!is_null($parentId)) :
	2193	+ // We've already sent off a diagnostic message in the past. Let's do some
	2194	+ // magic to help with threading, in the hopes that all diagnostic messages
	2195	+ // get threaded together.
	2196	+ $head[] = "References: <$parentId>";
	2197	+ $head[] = "In-Reply-To: <$parentId>";
	2198	+ $subj = "Re: ".$subj;
	2199	+ else :
	2200	+ // This is the first of its kind. Let's mark it as such.
	2201	+ update_option('feedwordpress_diagnostics_email_root_message_id', $mesgId);
	2202	+ endif;
	2203	+ $head = apply_filters('feedwordpress_diagnostic_email_headers', $head);
2549	2204
2550		- return (
2551		- preg_match (
2552		- "\007(".implode('|',$this->_feed_markers).")\007i",
2553		- $data
2554		- ) and !preg_match (
2555		- "\007(".implode('|',$this->_html_markers).")\007i",
2556		- $data
2557		- )
2558		- );
2559		- } /* FeedFinder::is_feed () */
	2205	+ foreach ($recipients as $email) :
	2206	+ add_filter('wp_mail_content_type', array('FeedWordPress', 'allow_html_mail'));
	2207	+ wp_mail($email, $subj, $body, $head);
	2208	+ remove_filter('wp_mail_content_type', array('FeedWordPress', 'allow_html_mail'));
	2209	+ endforeach;
	2210	+ endif;
2560	2211
2561		- # --- Private methods ---
2562		- function _get ($uri = NULL) {
2563		- if ($uri) $this->uri = $uri;
	2212	+ // Clear the logs
	2213	+ $dlog['mesg']['persistent'] = array();
	2214	+ $dlog['mesg']['occurrent'] = array();
2564	2215
2565		- // Is the result not yet cached?
2566		- if ($this->_cache_uri !== $this->uri) :
2567		- // Snoopy is an HTTP client in PHP
2568		- $client = new Snoopy();
2569		-
2570		- // Prepare headers and internal settings
2571		- $client->rawheaders['Connection'] = 'close';
2572		- $client->accept = 'application/atom+xml application/rdf+xml application/rss+xml application/xml text/html */*';
2573		- $client->agent = 'feedfinder/1.2 (compatible; PHP FeedFinder) +http://projects.radgeek.com/feedwordpress';
2574		- $client->read_timeout = 25;
2575		-
2576		- // Fetch the HTML or feed
2577		- @$client->fetch($this->uri);
2578		- $this->_data = $client->results;
	2216	+ // Set schedule for next update
	2217	+ $dlog['schedule']['last'] = time();
	2218	+ endif;
	2219	+ else :
	2220	+ $dlog['schedule'] = array(
	2221	+ 'freq' => 24 /*hr*/ * 60 /*min*/ * 60 /*s*/,
	2222	+ 'last' => time(),
	2223	+ );
	2224	+ endif;
2579	2225
2580		- // Kilroy was here
2581		- $this->_cache_uri = $this->uri;
	2226	+ update_option('feedwordpress_diagnostics_log', $dlog);
	2227	+ } /* FeedWordPress::email_diagnostic_log () */
	2228	+
	2229	+ static function allow_html_mail () {
	2230	+ return 'text/html';
	2231	+ } /* FeedWordPress::allow_html_mail () */
	2232	+
	2233	+ static function admin_footer () {
	2234	+ global $feedwordpress_admin_footer;
	2235	+ foreach ($feedwordpress_admin_footer as $line) :
	2236	+ echo '<div><pre>' . esc_html( $line ) . '</pre></div>';
	2237	+ endforeach;
	2238	+ } /* FeedWordPress::admin_footer () */
	2239	+
	2240	+ static function log_prefix ($date = false) {
	2241	+ $home = get_bloginfo('url');
	2242	+ $prefix = '['.feedwordpress_display_url($home).'] [feedwordpress] ';
	2243	+ if ($date) :
	2244	+ $prefix = "[".date('Y-m-d H:i:s')."]".$prefix;
2582	2245	endif;
2583		- } /* FeedFinder::_get () */
	2246	+ return $prefix;
	2247	+ } /* FeedWordPress::log_prefix () */
2584	2248
2585		- function _link_rel_feeds () {
2586		- $links = $this->_tags('link');
2587		- $link_count = count($links);
	2249	+ static function menu_cap ($sub = false) {
	2250	+ if ($sub) :
	2251	+ $cap = apply_filters('feedwordpress_menu_settings_capacity', 'manage_options');
	2252	+ else :
	2253	+ $cap = apply_filters('feedwordpress_menu_main_capacity', 'manage_links');
	2254	+ endif;
	2255	+ return $cap;
	2256	+ } /* FeedWordPress::menu_cap () */
2588	2257
2589		- // now figure out which one points to the RSS file
2590		- $href = array ();
2591		- for ($n=0; $n<$link_count; $n++) {
2592		- if (strtolower($links[$n]['rel']) == 'alternate') {
2593		- if (in_array(strtolower($links[$n]['type']), $this->_feed_types)) {
2594		- $href[] = $links[$n]['href'];
2595		- } /* if */
2596		- } /* if */
2597		- } /* for */
2598		- return $href;
2599		- }
	2258	+ public function plugin_dir_path ($path = '') {
	2259	+ $dir = plugin_dir_path( __FILE__ );
	2260	+ $file_path = "${dir}${path}";
	2261	+ return apply_filters( "feedwordpress_plugin_dir_path", $file_path );
	2262	+ } /* FeedWordPress::plugin_dir_path () */
	2263	+
	2264	+ public function plugin_dir_url ($path = '') {
	2265	+ $url_path = plugins_url( $path, __FILE__ );
	2266	+ return apply_filters( "feedwordpress_plugin_dir_url", $url_path );
	2267	+ } /* FeedWordPRess::plugin_dir_url () */
	2268	+
	2269	+ static function path ($filename = '') {
	2270	+ global $fwp_path;
2600	2271
2601		- function _a_href_feeds ($obvious = TRUE) {
2602		- $pattern = ($obvious ? $this->_obvious_feed_url : $this->_maybe_feed_url);
	2272	+ $path = $fwp_path;
	2273	+ if (strlen($filename) > 0) :
	2274	+ $path .= '/'.$filename;
	2275	+ endif;
	2276	+
	2277	+ return $path;
	2278	+ } /* FeedWordPress::path () */
2603	2279
2604		- $links = $this->_tags('a');
2605		- $link_count = count($links);
	2280	+ // -- DEPRCATED UTILITY FUNCTIONS -------------------------------------
	2281	+ // These are superceded by later code re-organization, (for example
	2282	+ // MyPHP::param/post/get/request, or FeedWordPressDiagnostic methods),
	2283	+ // but for the last several versions have been kept here for backward
	2284	+ // compatibility with add-ons, older code, etc. Maybe someday they
	2285	+ // will go away.
	2286	+ // -------------------------------------------------------------------
	2287	+ static function param( $key, $type = 'REQUEST', $default = null, $sanitizer = null ) {
	2288	+ return self::sanitized_parameter( MyPHP::param( $key, $default, $type ), $sanitizer );
	2289	+ } /* FeedWordPress::param () */
2606	2290
2607		- // now figure out which one points to the RSS file
2608		- $href = array ();
2609		- for ($n=0; $n<$link_count; $n++) {
2610		- if (preg_match("\007(".implode('|',$pattern).")\007i", $links[$n]['href'])) {
2611		- $href[] = $links[$n]['href'];
2612		- } /* if */
2613		- } /* for */
2614		- return $href;
	2291	+ static function post( $key, $default = null, $sanitizer = null ) {
	2292	+ return self::sanitized_parameter( MyPHP::post( $key, $default, $type ), $sanitizer );
	2293	+ } /* FeedWordPress::post () */
	2294	+
	2295	+ static function shallow_sanitize( $item, $sanitizer = null ) {
	2296	+ if ( $sanitizer == 'raw' ) :
	2297	+ $value = $item;
	2298	+ elseif ( $sanitizer == 'textarea' ) :
	2299	+ $value = sanitize_textarea_field( $item );
	2300	+ else :
	2301	+ $value = sanitize_text_field( $item );
	2302	+ endif;
	2303	+ return $value;
2615	2304	}
2616	2305
2617		- function _tags ($tag) {
2618		- $html = $this->data();
2619		-
2620		- // search through the HTML, save all <link> tags
2621		- // and store each link's attributes in an associative array
2622		- preg_match_all('/<'.$tag.'\s+(.*?)\s*\/?>/si', $html, $matches);
2623		- $links = $matches[1];
2624		- $ret = array();
2625		- $link_count = count($links);
2626		- for ($n=0; $n<$link_count; $n++) {
2627		- $attributes = preg_split('/\s+/s', $links[$n]);
2628		- foreach($attributes as $attribute) {
2629		- $att = preg_split('/\s*=\s*/s', $attribute, 2);
2630		- if (isset($att[1])) {
2631		- $att[1] = preg_replace('/([\'"]?)(.*)\1/', '$2', $att[1]);
2632		- $final_link[strtolower($att[0])] = $att[1];
2633		- } /* if */
2634		- } /* foreach */
2635		- $ret[$n] = $final_link;
2636		- } /* for */
	2306	+ static function sanitized_parameter( $value, $sanitizer = null ) {
	2307	+ if ( $sanitizer === 'raw' || is_scalar( $value ) ) :
	2308	+ $ret = self::shallow_sanitize( $value, $sanitizer );
	2309	+ elseif ( is_array( $value ) ) :
	2310	+ $ret = array();
	2311	+ foreach ( $value as $key => $item ) :
	2312	+ $ret[ $key ] = self::sanitized_parameter( $item, $sanitizer );
	2313	+ endforeach;
	2314	+ else :
	2315	+ $ret = null; // "Sanitized" objects or resources currently get nothing.
	2316	+ endif;
2637	2317	return $ret;
2638	2318	}
2639		-} /* class FeedFinder */
	2319	+
	2320	+ static function val ($v, $no_newlines = false) {
	2321	+ return MyPHP::val($v, $no_newlines);
	2322	+ } /* FeedWordPress::val () */
2640	2323
2641		-# Relative URI static class: PHP class for resolving relative URLs
2642		-#
2643		-# This class is derived (under the terms of the GPL) from URL Class 0.3 by
2644		-# Keyvan Minoukadeh <keyvan@k1m.com>, which is great but more than we need
2645		-# for FeedWordPress's purposes. The class has been stripped down to a single
2646		-# public method: Relative_URI::resolve($url, $base), which resolves the URI in
2647		-# $url relative to the URI in $base
2648		-#
2649		-# The upgraded MagpieRSS also uses this class. So if we have it loaded
2650		-# in, don't load it again.
2651		-if (!class_exists('Relative_URI')) {
	2324	+ static function critical_bug ($varname, $var, $line, $file = null) {
	2325	+ FeedWordPressDiagnostic::critical_bug($varname, $var, $line, $file);
	2326	+ } /* FeedWordPress::critical_bug () */
2652	2327
2653		- class Relative_URI
2654		- {
2655		- // Resolve relative URI in $url against the base URI in $base. If $base
2656		- // is not supplied, then we use the REQUEST_URI of this script.
2657		- //
2658		- // I'm hoping this method reflects RFC 2396 Section 5.2
2659		- function resolve ($url, $base = NULL)
2660		- {
2661		- if (is_null($base)):
2662		- $base = 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
2663		- endif;
2664		-
2665		- $base = Relative_URI::_encode(trim($base));
2666		- $uri_parts = Relative_URI::_parse_url($base);
2667		-
2668		- $url = Relative_URI::_encode(trim($url));
2669		- $parts = Relative_URI::_parse_url($url);
2670		-
2671		- $uri_parts['fragment'] = (isset($parts['fragment']) ? $parts['fragment'] : null);
2672		- $uri_parts['query'] = (isset($parts['query']) ? $parts['query'] : null);
2673		-
2674		- // if path is empty, and scheme, host, and query are undefined,
2675		- // the URL is referring the base URL
2676		-
2677		- if (($parts['path'] == '') && !isset($parts['scheme']) && !isset($parts['host']) && !isset($parts['query'])) {
2678		- // If the URI is empty or only a fragment, return the base URI
2679		- return $base . (isset($parts['fragment']) ? '#'.$parts['fragment'] : '');
2680		- } elseif (isset($parts['scheme'])) {
2681		- // If the scheme is set, then the URI is absolute.
2682		- return $url;
2683		- } elseif (isset($parts['host'])) {
2684		- $uri_parts['host'] = $parts['host'];
2685		- $uri_parts['path'] = $parts['path'];
2686		- } else {
2687		- // We have a relative path but not a host.
2688		-
2689		- // start ugly fix:
2690		- // prepend slash to path if base host is set, base path is not set, and url path is not absolute
2691		- if ($uri_parts['host'] && ($uri_parts['path'] == '')
2692		- && (strlen($parts['path']) > 0)
2693		- && (substr($parts['path'], 0, 1) != '/')) {
2694		- $parts['path'] = '/'.$parts['path'];
2695		- } // end ugly fix
2696		-
2697		- if (substr($parts['path'], 0, 1) == '/') {
2698		- $uri_parts['path'] = $parts['path'];
2699		- } else {
2700		- // copy base path excluding any characters after the last (right-most) slash character
2701		- $buffer = substr($uri_parts['path'], 0, (int)strrpos($uri_parts['path'], '/')+1);
2702		- // append relative path
2703		- $buffer .= $parts['path'];
2704		- // remove "./" where "." is a complete path segment.
2705		- $buffer = str_replace('/./', '/', $buffer);
2706		- if (substr($buffer, 0, 2) == './') {
2707		- $buffer = substr($buffer, 2);
2708		- }
2709		- // if buffer ends with "." as a complete path segment, remove it
2710		- if (substr($buffer, -2) == '/.') {
2711		- $buffer = substr($buffer, 0, -1);
2712		- }
2713		- // remove "<segment>/../" where <segment> is a complete path segment not equal to ".."
2714		- $search_finished = false;
2715		- $segment = explode('/', $buffer);
2716		- while (!$search_finished) {
2717		- for ($x=0; $x+1 < count($segment);) {
2718		- if (($segment[$x] != '') && ($segment[$x] != '..') && ($segment[$x+1] == '..')) {
2719		- if ($x+2 == count($segment)) $segment[] = '';
2720		- unset($segment[$x], $segment[$x+1]);
2721		- $segment = array_values($segment);
2722		- continue 2;
2723		- } else {
2724		- $x++;
2725		- }
2726		- }
2727		- $search_finished = true;
2728		- }
2729		- $buffer = (count($segment) == 1) ? '/' : implode('/', $segment);
2730		- $uri_parts['path'] = $buffer;
2731		-
2732		- }
2733		- }
2734		-
2735		- // If we've gotten to this point, we can try to put the pieces
2736		- // back together.
2737		- $ret = '';
2738		- if (isset($uri_parts['scheme'])) $ret .= $uri_parts['scheme'].':';
2739		- if (isset($uri_parts['user'])) {
2740		- $ret .= $uri_parts['user'];
2741		- if (isset($uri_parts['pass'])) $ret .= ':'.$uri_parts['parts'];
2742		- $ret .= '@';
2743		- }
2744		- if (isset($uri_parts['host'])) {
2745		- $ret .= '//'.$uri_parts['host'];
2746		- if (isset($uri_parts['port'])) $ret .= ':'.$uri_parts['port'];
2747		- }
2748		- $ret .= $uri_parts['path'];
2749		- if (isset($uri_parts['query'])) $ret .= '?'.$uri_parts['query'];
2750		- if (isset($uri_parts['fragment'])) $ret .= '#'.$uri_parts['fragment'];
2751		-
2752		- return $ret;
2753		- }
2754		-
2755		- /**
2756		- * Parse URL
2757		- *
2758		- * Regular expression grabbed from RFC 2396 Appendix B.
2759		- * This is a replacement for PHPs builtin parse_url().
2760		- * @param string $url
2761		- * @access private
2762		- * @return array
2763		- */
2764		- function _parse_url($url)
2765		- {
2766		- // I'm using this pattern instead of parse_url() as there's a few strings where parse_url()
2767		- // generates a warning.
2768		- if (preg_match('!^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?!', $url, $match)) {
2769		- $parts = array();
2770		- if ($match[1] != '') $parts['scheme'] = $match[2];
2771		- if ($match[3] != '') $parts['auth'] = $match[4];
2772		- // parse auth
2773		- if (isset($parts['auth'])) {
2774		- // store user info
2775		- if (($at_pos = strpos($parts['auth'], '@')) !== false) {
2776		- $userinfo = explode(':', substr($parts['auth'], 0, $at_pos), 2);
2777		- $parts['user'] = $userinfo[0];
2778		- if (isset($userinfo[1])) $parts['pass'] = $userinfo[1];
2779		- $parts['auth'] = substr($parts['auth'], $at_pos+1);
2780		- }
2781		- // get port number
2782		- if ($port_pos = strrpos($parts['auth'], ':')) {
2783		- $parts['host'] = substr($parts['auth'], 0, $port_pos);
2784		- $parts['port'] = (int)substr($parts['auth'], $port_pos+1);
2785		- if ($parts['port'] < 1) $parts['port'] = null;
2786		- } else {
2787		- $parts['host'] = $parts['auth'];
2788		- }
2789		- }
2790		- unset($parts['auth']);
2791		- $parts['path'] = $match[5];
2792		- if (isset($match[6]) && ($match[6] != '')) $parts['query'] = $match[7];
2793		- if (isset($match[8]) && ($match[8] != '')) $parts['fragment'] = $match[9];
2794		- return $parts;
2795		- }
2796		- // shouldn't reach here
2797		- return array('path'=>'');
2798		- }
2799		-
2800		- function _encode($string)
2801		- {
2802		- static $replace = array();
2803		- if (!count($replace)) {
2804		- $find = array(32, 34, 60, 62, 123, 124, 125, 91, 92, 93, 94, 96, 127);
2805		- $find = array_merge(range(0, 31), $find);
2806		- $find = array_map('chr', $find);
2807		- foreach ($find as $char) {
2808		- $replace[$char] = '%'.bin2hex($char);
2809		- }
2810		- }
2811		- // escape control characters and a few other characters
2812		- $encoded = strtr($string, $replace);
2813		- // remove any character outside the hex range: 21 - 7E (see www.asciitable.com)
2814		- return preg_replace('/[^\x21-\x7e]/', '', $encoded);
2815		- }
2816		- } // class Relative_URI
2817		-}
	2328	+ static function noncritical_bug ($varname, $var, $line, $file = null) {
	2329	+ FeedWordPressDiagnostic::noncritical_bug($varname, $var, $line, $file);
	2330	+ } /* FeedWordPress::noncritical_bug () */
2818	2331
	2332	+ static function diagnostic_on ($level) {
	2333	+ return FeedWordPressDiagnostic::is_on($level);
	2334	+ } /* FeedWordPress::diagnostic_on () */
	2335	+
	2336	+} /* class FeedWordPress */
	2337	+
	2338	+$feedwordpress_admin_footer = array();
	2339	+
2819	2340	// take your best guess at the realname and e-mail, given a string
2820		-define('FWP_REGEX_EMAIL_ADDY', '([^@"(<\s]+@[^"@(<\s]+\.[^"@(<\s]+)');
2821		-define('FWP_REGEX_EMAIL_NAME', '("([^"]*)"|([^"<(]+\S))');
2822		-define('FWP_REGEX_EMAIL_POSTFIX_NAME', '/^\s*'.FWP_REGEX_EMAIL_ADDY."\s+\(".FWP_REGEX_EMAIL_NAME.'\)\s*$/');
2823		-define('FWP_REGEX_EMAIL_PREFIX_NAME', '/^\s*'.FWP_REGEX_EMAIL_NAME.'\s*<'.FWP_REGEX_EMAIL_ADDY.'>\s*$/');
2824		-define('FWP_REGEX_EMAIL_JUST_ADDY', '/^\s*'.FWP_REGEX_EMAIL_ADDY.'\s*$/');
2825		-define('FWP_REGEX_EMAIL_JUST_NAME', '/^\s*'.FWP_REGEX_EMAIL_NAME.'\s*$/');
	2341	+define( 'FWP_REGEX_EMAIL_ADDY', '([^@"(<\s]+@[^"@(<\s]+\.[^"@(<\s]+)' );
	2342	+define( 'FWP_REGEX_EMAIL_NAME', '("([^"]*)"|([^"<(]+\S))' );
	2343	+define( 'FWP_REGEX_EMAIL_POSTFIX_NAME', '/^\s*' . FWP_REGEX_EMAIL_ADDY . '\s+\(' . FWP_REGEX_EMAIL_NAME . '\)\s*$/' );
	2344	+define( 'FWP_REGEX_EMAIL_PREFIX_NAME', '/^\s*' . FWP_REGEX_EMAIL_NAME . '\s*<' . FWP_REGEX_EMAIL_ADDY . '>\s*$/' );
	2345	+define( 'FWP_REGEX_EMAIL_JUST_ADDY', '/^\s*' . FWP_REGEX_EMAIL_ADDY . '\s*$/' );
	2346	+define( 'FWP_REGEX_EMAIL_JUST_NAME', '/^\s*' . FWP_REGEX_EMAIL_NAME . '\s*$/' );
2826	2347
2827		-function parse_email_with_realname ($email) {
2828		- if (preg_match(FWP_REGEX_EMAIL_POSTFIX_NAME, $email, $matches)) :
2829		- ($ret['name'] = $matches[3]) or ($ret['name'] = $matches[2]);
	2348	+function parse_email_with_realname( $email ) {
	2349	+ if ( preg_match( FWP_REGEX_EMAIL_POSTFIX_NAME, $email, $matches ) ) :
	2350	+ ( $ret['name'] = $matches[3] ) || ( $ret['name'] = $matches[2] );
2830	2351	$ret['email'] = $matches[1];
2831		- elseif (preg_match(FWP_REGEX_EMAIL_PREFIX_NAME, $email, $matches)) :
2832		- ($ret['name'] = $matches[2]) or ($ret['name'] = $matches[3]);
	2352	+ elseif ( preg_match( FWP_REGEX_EMAIL_PREFIX_NAME, $email, $matches ) ) :
	2353	+ ( $ret['name'] = $matches[2] ) || ( $ret['name'] = $matches[3] );
2833	2354	$ret['email'] = $matches[4];
2834		- elseif (preg_match(FWP_REGEX_EMAIL_JUST_ADDY, $email, $matches)) :
2835		- $ret['name'] = NULL; $ret['email'] = $matches[1];
2836		- elseif (preg_match(FWP_REGEX_EMAIL_JUST_NAME, $email, $matches)) :
2837		- $ret['email'] = NULL;
2838		- ($ret['name'] = $matches[2]) or ($ret['name'] = $matches[3]);
	2355	+ elseif ( preg_match( FWP_REGEX_EMAIL_JUST_ADDY, $email, $matches ) ) :
	2356	+ $ret['name'] = null;
	2357	+ $ret['email'] = $matches[1];
	2358	+ elseif ( preg_match( FWP_REGEX_EMAIL_JUST_NAME, $email, $matches ) ) :
	2359	+ $ret['email'] = null;
	2360	+ ( $ret['name'] = $matches[2] ) || ( $ret['name'] = $matches[3] );
2839	2361	else :
2840		- $ret['name'] = NULL; $ret['email'] = NULL;
	2362	+ $ret['name'] = null;
	2363	+ $ret['email'] = null;
2841	2364	endif;
2842	2365	return $ret;
2843	2366	}
2844		-