← All changes | feedwordpress.php +1798 -2334 2008.1214 → 2022.0208 View file →

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