← All changes | feedwordpress.php +1240 -478 2010.0528 → 2013.0503 View file →

		@@ -2,9 +2,9 @@
2	2	/*
3	3	Plugin Name: FeedWordPress
4	4	Plugin URI: http://feedwordpress.radgeek.com/
5	5	Description: simple and flexible Atom/RSS syndication for WordPress
6		-Version: 2010.0528
	6	+Version: 2013.0502
7	7	Author: Charles Johnson
8	8	Author URI: http://radgeek.com/
9	9	License: GPL
10	10	*/
		@@ -10,33 +10,36 @@
10	10	*/
11	11
12	12	/**
13	13	* @package FeedWordPress
14		- * @version 2010.0528
	14	+ * @version 2013.0502
15	15	*/
16	16
17	17	# This uses code derived from:
18	18	# - wp-rss-aggregate.php by Kellan Elliot-McCrea <kellan@protest.net>
19		-# - 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>
20	21	# - Ultra-Liberal Feed Finder by Mark Pilgrim <mark@diveintomark.org>
	22	+# - WordPress Blog Tool and Publishing Platform <http://wordpress.org/>
21	23	# according to the terms of the GNU General Public License.
22	24	#
23		-# INSTALLATION: see readme.txt or <http://projects.radgeek.com/install>
	25	+# INSTALLATION: see readme.txt or <http://feedwordpress.radgeek.com/install>
24	26	#
25	27	# USAGE: once FeedWordPress is installed, you manage just about everything from
26		-# the WordPress Dashboard, under the Syndication menu. To ensure that fresh
27		-# content is added as it becomes available, you can convince your contributors
28		-# to put your XML-RPC URI (if WordPress is installed at
29		-# <http://www.zyx.com/blog>, XML-RPC requests should be sent to
30		-# <http://www.zyx.com/blog/xmlrpc.php>), or update manually under the
31		-# Syndication menu, or set up automatic updates under Syndication --> Settings,
32		-# or use a cron job.
	28	+# the WordPress Dashboard, under the Syndication menu. To keep fresh content
	29	+# coming in as it becomes available, you'll have to either check for updates
	30	+# manually, or set up one of the automatically-scheduled update methods. See
	31	+# <http://feedwordpress.radgeek.com/wiki/quick-start/> for some details.
33	32
34	33	# -- Don't change these unless you know what you're doing...
35	34
36		-define ('FEEDWORDPRESS_VERSION', '2010.0528');
	35	+define ('FEEDWORDPRESS_VERSION', '2013.0502');
37	36	define ('FEEDWORDPRESS_AUTHOR_CONTACT', 'http://radgeek.com/contact');
38	37
	38	+if (!defined('FEEDWORDPRESS_BLEG')) :
	39	+ define ('FEEDWORDPRESS_BLEG', true);
	40	+endif;
	41	+
39	42	// Defaults
40	43	define ('DEFAULT_SYNDICATION_CATEGORY', 'Contributors');
41	44	define ('DEFAULT_UPDATE_PERIOD', 60); // value in minutes
42	45
		@@ -48,8 +51,10 @@
48	51	$feedwordpress_debug = ($feedwordpress_debug == 'yes');
49	52	endif;
50	53	endif;
51	54	define ('FEEDWORDPRESS_DEBUG', $feedwordpress_debug);
	55	+$feedwordpress_compatibility = true;
	56	+define ('FEEDWORDPRESS_COMPATIBILITY', $feedwordpress_compatibility);
52	57
53	58	define ('FEEDWORDPRESS_CAT_SEPARATOR_PATTERN', '/[:\n]/');
54	59	define ('FEEDWORDPRESS_CAT_SEPARATOR', "\n");
55	60
		@@ -57,16 +62,10 @@
57	62
58	63	define ('FEEDWORDPRESS_FRESHNESS_INTERVAL', 10*60); // Every ten minutes
59	64
60	65	define ('FWP_SCHEMA_HAS_USERMETA', 2966);
61		-define ('FWP_SCHEMA_20', 3308); // Database schema # for WP 2.0
62		-define ('FWP_SCHEMA_21', 4772); // Database schema # for WP 2.1
63		-define ('FWP_SCHEMA_23', 5495); // Database schema # for WP 2.3
64		-define ('FWP_SCHEMA_25', 7558); // Database schema # for WP 2.5
65		-define ('FWP_SCHEMA_26', 8201); // Database schema # for WP 2.6
66		-define ('FWP_SCHEMA_27', 9872); // Database schema # for WP 2.7
67		-define ('FWP_SCHEMA_28', 11548); // Database schema # for WP 2.8
68		-define ('FWP_SCHEMA_29', 12329); // Database schema # for WP 2.9
	66	+define ('FWP_SCHEMA_USES_ARGS_TAXONOMY', 12694); // Revision # for using $args['taxonomy'] to get link categories
	67	+define ('FWP_SCHEMA_30', 12694); // Database schema # for WP 3.0
69	68
70	69	if (FEEDWORDPRESS_DEBUG) :
71	70	// Help us to pick out errors, if any.
72	71	ini_set('error_reporting', E_ALL & ~E_NOTICE);
		@@ -78,15 +77,15 @@
78	77	// make sure FEEDWORDPRESS_DEBUG is FALSE for any site that will be
79	78	// used for more than testing purposes!
80	79	define('FEEDWORDPRESS_CACHE_AGE', 1);
81	80	define('FEEDWORDPRESS_CACHE_LIFETIME', 1);
82		- define('FEEDWORDPRESS_FETCH_TIME_OUT', 60);
	81	+ define('FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT', 60);
83	82	else :
84	83	// Hold onto data all day for conditional GET purposes,
85	84	// but consider it stale after 1 min (requiring a conditional GET)
86	85	define('FEEDWORDPRESS_CACHE_LIFETIME', 24*60*60);
87	86	define('FEEDWORDPRESS_CACHE_AGE', 1*60);
88		- define('FEEDWORDPRESS_FETCH_TIME_OUT', 10);
	87	+ define('FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT', 20);
89	88	endif;
90	89
91	90	// Use our the cache settings that we want.
92	91	add_filter('wp_feed_cache_transient_lifetime', array('FeedWordPress', 'cache_lifetime'));
		@@ -92,33 +91,47 @@
92	91	add_filter('wp_feed_cache_transient_lifetime', array('FeedWordPress', 'cache_lifetime'));
93	92
94	93	// Ensure that we have SimplePie loaded up and ready to go.
95	94	// We no longer need a MagpieRSS upgrade module. Hallelujah!
96		-require_once(ABSPATH . WPINC . '/feed.php');
	95	+if (!class_exists('SimplePie')) :
	96	+ require_once(ABSPATH . WPINC . '/class-simplepie.php');
	97	+endif;
	98	+require_once(ABSPATH . WPINC . '/class-feed.php');
97	99
98		-if (isset($wp_db_version)) :
99		- if ($wp_db_version >= FWP_SCHEMA_23) :
100		- require_once (ABSPATH . WPINC . '/registration.php'); // for wp_insert_user
101		- elseif ($wp_db_version >= FWP_SCHEMA_21) : // WordPress 2.1 and 2.2, but not 2.3
102		- require_once (ABSPATH . WPINC . '/registration.php'); // for wp_insert_user
103		- require_once (ABSPATH . 'wp-admin/admin-db.php'); // for wp_insert_category
104		- elseif ($wp_db_version >= FWP_SCHEMA_20) : // WordPress 2.0
105		- require_once (ABSPATH . WPINC . '/registration-functions.php'); // for wp_insert_user
106		- require_once (ABSPATH . 'wp-admin/admin-db.php'); // for wp_insert_category
107		- endif;
	100	+if (!function_exists('wp_insert_user')) :
	101	+ require_once (ABSPATH . WPINC . '/registration.php'); // for wp_insert_user
108	102	endif;
109	103
110		-require_once(dirname(__FILE__) . '/compatability.php'); // LEGACY API: Replicate or mock up functions for legacy support purposes
111		-require_once(dirname(__FILE__) . '/feedwordpresshtml.class.php');
	104	+$dir = dirname(__FILE__);
	105	+require_once("${dir}/externals/myphp/myphp.class.php");
	106	+require_once("${dir}/admin-ui.php");
	107	+require_once("${dir}/feedwordpresssyndicationpage.class.php");
	108	+require_once("${dir}/compatability.php"); // Legacy API
	109	+require_once("${dir}/syndicatedpost.class.php");
	110	+require_once("${dir}/syndicatedlink.class.php");
	111	+require_once("${dir}/feedwordpresshtml.class.php");
	112	+require_once("${dir}/feedwordpress-content-type-sniffer.class.php");
	113	+require_once("${dir}/inspectpostmeta.class.php");
	114	+require_once("${dir}/syndicationdataqueries.class.php");
	115	+require_once("${dir}/feedwordpie.class.php");
	116	+require_once("${dir}/feedwordpie_item.class.php");
	117	+require_once("${dir}/feedwordpress_file.class.php");
	118	+require_once("${dir}/feedwordpress_parser.class.php");
	119	+require_once("${dir}/feedwordpressrpc.class.php");
	120	+require_once("${dir}/feedwordpresshttpauthenticator.class.php");
	121	+require_once("${dir}/feedwordpresslocalpost.class.php");
112	122
113	123	// Magic quotes are just about the stupidest thing ever.
114	124	if (is_array($_POST)) :
115		- $fwp_post = stripslashes_deep($_POST);
	125	+ $fwp_post = $_POST;
	126	+ if (get_magic_quotes_gpc()) :
	127	+ $fwp_post = stripslashes_deep($fwp_post);
	128	+ endif;
116	129	endif;
117	130
118	131	// Get the path relative to the plugins directory in which FWP is stored
119	132	preg_match (
120		- '|/wp-content/plugins/(.+)$|',
	133	+ '|'.preg_quote(WP_PLUGIN_DIR).'/(.+)$|',
121	134	dirname(__FILE__),
122	135	$ref
123	136	);
124	137
		@@ -127,39 +140,8 @@
127	140	else : // Something went wrong. Let's just guess.
128	141	$fwp_path = 'feedwordpress';
129	142	endif;
130	143
131		-function feedwordpress_admin_scripts () {
132		- wp_enqueue_script('post'); // for magic tag and category boxes
133		- wp_enqueue_script('admin-forms'); // for checkbox selection
134		-}
135		-
136		-// If this is a FeedWordPress admin page, queue up scripts for AJAX functions that FWP uses
137		-// If it is a display page or a non-FeedWordPress admin page, don't.
138		-if (is_admin() and isset($_REQUEST['page']) and preg_match("|^{$fwp_path}/|", $_REQUEST['page'])) :
139		- if (function_exists('wp_enqueue_script')) :
140		- if (FeedWordPressCompatibility::test_version(FWP_SCHEMA_29)) :
141		- add_action('admin_print_scripts', 'feedwordpress_admin_scripts');
142		- elseif (FeedWordPressCompatibility::test_version(FWP_SCHEMA_25)) :
143		- wp_enqueue_script('post'); // for magic tag and category boxes
144		- wp_enqueue_script('thickbox'); // for fold-up boxes
145		- wp_enqueue_script('admin-forms'); // for checkbox selection
146		- else :
147		- wp_enqueue_script( 'ajaxcat' ); // Provides the handy-dandy new category text box
148		- endif;
149		- endif;
150		- if (function_exists('wp_enqueue_style')) :
151		- if (fwp_test_wp_version(FWP_SCHEMA_25)) :
152		- wp_enqueue_style('dashboard');
153		- endif;
154		- endif;
155		- if (function_exists('wp_admin_css')) :
156		- if (fwp_test_wp_version(FWP_SCHEMA_25)) :
157		- wp_admin_css('css/dashboard');
158		- endif;
159		- endif;
160		-endif;
161		-
162	144	if (!FeedWordPress::needs_upgrade()) : // only work if the conditions are safe!
163	145
164	146	# Syndicated items are generally received in output-ready (X)HTML and
165	147	# should not be folded, crumpled, mutilated, or spindled by WordPress
		@@ -179,10 +161,11 @@
179	161
180	162	add_action('atom_entry', 'feedwordpress_item_feed_data');
181	163
182	164	# Filter in original permalinks if the user wants that
183		- add_filter('post_link', 'syndication_permalink', 1);
184		-
	165	+ add_filter('post_link', 'syndication_permalink', /*priority=*/ 1, /*arguments=*/ 3);
	166	+ add_filter('post_type_link', 'syndication_permalink', /*priority=*/ 1, /*arguments=*/ 4);
	167	+
185	168	# When foreign URLs are used for permalinks in feeds or display
186	169	# contexts, they need to be escaped properly.
187	170	add_filter('the_permalink', 'syndication_permalink_escaped');
188	171	add_filter('the_permalink_rss', 'syndication_permalink_escaped');
		@@ -196,8 +179,9 @@
196	179	remove_filter('pre_link_rss', 'wp_filter_kses');
197	180	remove_filter('pre_link_url', 'wp_filter_kses');
198	181
199	182	# Admin menu
	183	+ add_action('admin_init', array('feedwordpress', 'admin_init'));
200	184	add_action('admin_menu', 'fwp_add_pages');
201	185	add_action('admin_notices', 'fwp_check_debug');
202	186
203	187	add_action('admin_menu', 'feedwordpress_add_post_edit_controls');
		@@ -202,11 +186,13 @@
202	186
203	187	add_action('admin_menu', 'feedwordpress_add_post_edit_controls');
204	188	add_action('save_post', 'feedwordpress_save_post_edit_controls');
205	189
	190	+ add_action('admin_footer', array('FeedWordPress', 'admin_footer'));
	191	+
206	192	# Inbound XML-RPC update methods
207		- add_filter('xmlrpc_methods', 'feedwordpress_xmlrpc_hook');
208		-
	193	+ $feedwordpressRPC = new FeedWordPressRPC;
	194	+
209	195	# Outbound XML-RPC ping reform
210	196	remove_action('publish_post', 'generic_ping'); // WP 1.5.x
211	197	remove_action('do_pings', 'do_all_pings', 10, 1); // WP 2.1, 2.2
212	198	remove_action('publish_post', '_publish_post_hook', 5, 1); // WP 2.3
		@@ -215,167 +201,105 @@
215	201	add_action('do_pings', 'fwp_do_pings', 10, 1);
216	202	add_action('feedwordpress_update', 'fwp_hold_pings');
217	203	add_action('feedwordpress_update_complete', 'fwp_release_pings');
218	204
219		- # Hook in logging functions only if the logging option is ON
220		- $update_logging = get_option('feedwordpress_update_logging');
221		- if ($update_logging == 'yes') :
222		- add_action('post_syndicated_item', 'log_feedwordpress_post', 100);
223		- add_action('update_syndicated_item', 'log_feedwordpress_update_post', 100);
224		- add_action('feedwordpress_update', 'log_feedwordpress_update_feeds', 100);
225		- add_action('feedwordpress_check_feed', 'log_feedwordpress_check_feed', 100);
226		- add_action('feedwordpress_update_complete', 'log_feedwordpress_update_complete', 100);
227		- endif;
	205	+ add_action('syndicated_feed_error', array('FeedWordPressDiagnostic', 'feed_error'), 100, 3);
	206	+
	207	+ add_action('wp_footer', 'debug_out_feedwordpress_footer', -100);
	208	+ add_action('admin_footer', 'debug_out_feedwordpress_footer', -100);
228	209
229		- if (FeedWordPress::update_requested()) :
230		- if (FEEDWORDPRESS_DEBUG) :
231		- add_action('post_syndicated_item', 'debug_out_feedwordpress_post', 100);
232		- add_action('update_syndicated_item', 'debug_out_feedwordpress_update_post', 100);
233		- add_action('feedwordpress_update', 'debug_out_feedwordpress_update_feeds', 100);
234		- add_action('feedwordpress_check_feed', 'debug_out_feedwordpress_check_feed', 100);
235		- add_action('feedwordpress_update_complete', 'debug_out_feedwordpress_update_complete', 100);
236		- endif;
	210	+ $feedwordpress = new FeedWordPress;
237	211
238		- add_action('feedwordpress_check_feed_complete', 'debug_out_feedwordpress_feed_error', 100, 3);
239		- endif;
240		-
241	212	# Cron-less auto-update. Hooray!
242		- $autoUpdateHook = get_option('feedwordpress_automatic_updates');
243		- if ($autoUpdateHook != 'init') :
244		- $autoUpdateHook = 'shutdown';
	213	+ $autoUpdateHook = $feedwordpress->automatic_update_hook();
	214	+ if (!is_null($autoUpdateHook)) :
	215	+ add_action($autoUpdateHook, array($feedwordpress, 'auto_update'));
245	216	endif;
246		- add_action($autoUpdateHook, 'feedwordpress_auto_update');
	217	+
	218	+ add_action('init', array($feedwordpress, 'init'));
	219	+ add_action('shutdown', array($feedwordpress, 'email_diagnostic_log'));
	220	+ add_action('wp_dashboard_setup', array($feedwordpress, 'dashboard_setup'));
247	221
248		- add_action('init', 'feedwordpress_update_magic_url');
249		-
250	222	# Default sanitizers
251	223	add_filter('syndicated_item_content', array('SyndicatedPost', 'resolve_relative_uris'), 0, 2);
252	224	add_filter('syndicated_item_content', array('SyndicatedPost', 'sanitize_content'), 0, 2);
253	225
	226	+ add_action('plugins_loaded', array('FeedWordPress', 'admin_api'));
254	227	else :
255	228	# Hook in the menus, which will just point to the upgrade interface
256	229	add_action('admin_menu', 'fwp_add_pages');
257	230	endif; // if (!FeedWordPress::needs_upgrade())
258	231
259		-function feedwordpress_auto_update () {
260		- if (FeedWordPress::stale()) :
261		- $feedwordpress = new FeedWordPress;
262		- $feedwordpress->update();
263		- endif;
264		-} /* feedwordpress_auto_update () */
265		-
266		-function feedwordpress_update_magic_url () {
267		- global $wpdb;
268		-
269		- // Explicit update request in the HTTP request (e.g. from a cron job)
270		- if (FeedWordPress::update_requested()) :
271		- $feedwordpress = new FeedWordPress;
272		- $feedwordpress->update(FeedWordPress::update_requested_url());
273		-
274		- if (FEEDWORDPRESS_DEBUG and count($wpdb->queries) > 0) :
275		- $mysqlTime = 0.0;
276		- $byTime = array();
277		- foreach ($wpdb->queries as $query) :
278		- $time = $query[1] * 1000000.0;
279		- $mysqlTime += $query[1];
280		- if (!isset($byTime[$time])) : $byTime[$time] = array(); endif;
281		- $byTime[$time][] = $query[0]. ' // STACK: ' . $query[2];
282		- endforeach;
283		- krsort($byTime);
284		-
285		- foreach ($byTime as $time => $querySet) :
286		- foreach ($querySet as $query) :
287		- print "[".(sprintf('%4.4f', $time/1000.0)) . "ms] $query\n";
288		- endforeach;
289		- endforeach;
290		- echo "[feedwordpress] $wpdb->num_queries queries. $mysqlTime seconds in MySQL. Total of "; timer_stop(1); print " seconds.";
291		- endif;
292		-
293		-
294		- // Magic URL should return nothing but a 200 OK header packet
295		- // when successful.
296		- exit;
297		- endif;
298		-} /* feedwordpress_magic_update_url () */
299		-
300	232	################################################################################
301	233	## LOGGING FUNCTIONS: log status updates to error_log if you want it ###########
302	234	################################################################################
303	235
304		-function log_feedwordpress_post ($id) {
305		- $post = wp_get_single_post($id);
306		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] posted "
307		- ."'{$post->post_title}' ({$post->post_date})");
308		-}
	236	+class FeedWordPressDiagnostic {
	237	+ function feed_error ($error, $old, $link) {
	238	+ $wpError = $error['object'];
	239	+ $url = $link->uri();
	240	+
	241	+ $mesgs = $wpError->get_error_messages();
	242	+ foreach ($mesgs as $mesg) :
	243	+ $mesg = esc_html($mesg);
	244	+ FeedWordPress::diagnostic(
	245	+ 'updated_feeds:errors',
	246	+ "Feed Error: [${url}] update returned error: $mesg"
	247	+ );
	248	+
	249	+ $hours = get_option('feedwordpress_diagnostics_persistent_errors_hours', 2);
	250	+ $span = ($error['ts'] - $error['since']);
309	251
310		-function log_feedwordpress_update_post ($id) {
311		- $post = wp_get_single_post($id);
312		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] updated "
313		- ."'{$post->post_title}' ({$post->post_date})"
314		- ." (as of {$post->post_modified})");
315		-}
	252	+ if ($span >= ($hours * 60 * 60)) :
	253	+ $since = date('r', $error['since']);
	254	+ $mostRecent = date('r', $error['ts']);
	255	+ FeedWordPress::diagnostic(
	256	+ 'updated_feeds:errors:persistent',
	257	+ "Feed Update Error: [${url}] returning errors"
	258	+ ." since ${since}:<br/><code>$mesg</code>",
	259	+ $url, $error['since'], $error['ts']
	260	+ );
	261	+ endif;
	262	+ endforeach;
	263	+ }
316	264
317		-function log_feedwordpress_update_feeds ($uri) {
318		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] update('$uri')");
319		-}
	265	+ function admin_emails ($id = '') {
	266	+ $users = get_users_of_blog($id);
	267	+ $recipients = array();
	268	+ foreach ($users as $user) :
	269	+ $user_id = (isset($user->user_id) ? $user->user_id : $user->ID);
	270	+ $dude = new WP_User($user_id);
	271	+ if ($dude->has_cap('administrator')) :
	272	+ if ($dude->user_email) :
	273	+ $recipients[] = $dude->user_email;
	274	+ endif;
	275	+ endif;
	276	+ endforeach;
	277	+ return $recipients;
	278	+ }
	279	+} /* class FeedWordPressDiagnostic */
320	280
321		-function log_feedwordpress_check_feed ($feed) {
322		- $uri = $feed['link/uri']; $name = $feed['link/name'];
323		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] Examining $name <$uri>");
	281	+function debug_out_human_readable_bytes ($quantity) {
	282	+ $quantity = (int) $quantity;
	283	+ $magnitude = 'B';
	284	+ $orders = array('KB', 'MB', 'GB', 'TB');
	285	+ while (($quantity > (1024*100)) and (count($orders) > 0)) :
	286	+ $quantity = floor($quantity / 1024);
	287	+ $magnitude = array_shift($orders);
	288	+ endwhile;
	289	+ return "${quantity} ${magnitude}";
324	290	}
325	291
326		-function log_feedwordpress_update_complete ($delta) {
327		- $mesg = array();
328		- if (isset($delta['new'])) $mesg[] = 'added '.$delta['new'].' new posts';
329		- if (isset($delta['updated'])) $mesg[] = 'updated '.$delta['updated'].' existing posts';
330		- if (empty($mesg)) $mesg[] = 'nothing changed';
331		-
332		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] "
333		- .(is_null($delta) ? "Error: I don't syndicate that URI"
334		- : implode(' and ', $mesg)));
335		-}
336		-
337		-function debug_out_feedwordpress_post ($id) {
338		- $post = wp_get_single_post($id);
339		- print ("[".date('Y-m-d H:i:s')."][feedwordpress] posted "
340		- ."'{$post->post_title}' ({$post->post_date})\n");
341		-}
342		-
343		-function debug_out_feedwordpress_update_post ($id) {
344		- $post = wp_get_single_post($id);
345		- print ("[".date('Y-m-d H:i:s')."][feedwordpress] updated "
346		- ."'{$post->post_title}' ({$post->post_date})"
347		- ." (as of {$post->post_modified})\n");
348		-}
349		-
350		-function debug_out_feedwordpress_update_feeds ($uri) {
351		- print ("[".date('Y-m-d H:i:s')."][feedwordpress] update('$uri')\n");
352		-}
353		-
354		-function debug_out_feedwordpress_check_feed ($feed) {
355		- $uri = $feed['link/uri']; $name = $feed['link/name'];
356		- print ("[".date('Y-m-d H:i:s')."][feedwordpress] Examining $name <$uri>\n");
357		-}
358		-
359		-function debug_out_feedwordpress_update_complete ($delta) {
360		- $mesg = array();
361		- if (isset($delta['new'])) $mesg[] = 'added '.$delta['new'].' new posts';
362		- if (isset($delta['updated'])) $mesg[] = 'updated '.$delta['updated'].' existing posts';
363		- if (empty($mesg)) $mesg[] = 'nothing changed';
364		-
365		- print ("[".date('Y-m-d H:i:s')."][feedwordpress] "
366		- .(is_null($delta) ? "Error: I don't syndicate that URI"
367		- : implode(' and ', $mesg))."\n");
368		-}
369		-
370		-function debug_out_feedwordpress_feed_error ($feed, $added, $dt) {
371		- if (is_wp_error($added)) :
372		- $mesgs = $added->get_error_messages();
373		- foreach ($mesgs as $mesg) :
374		- echo "[feedwordpress] Error updating [{$feed['link/uri']}]: $mesg\n";
375		- endforeach;
	292	+function debug_out_feedwordpress_footer () {
	293	+ if (FeedWordPress::diagnostic_on('memory_usage')) :
	294	+ if (function_exists('memory_get_usage')) :
	295	+ FeedWordPress::diagnostic ('memory_usage', "Memory: Current usage: ".debug_out_human_readable_bytes(memory_get_usage()));
	296	+ endif;
	297	+ if (function_exists('memory_get_peak_usage')) :
	298	+ FeedWordPress::diagnostic ('memory_usage', "Memory: Peak usage: ".debug_out_human_readable_bytes(memory_get_peak_usage()));
	299	+ endif;
376	300	endif;
377		-}
	301	+} /* debug_out_feedwordpress_footer() */
378	302
379	303	################################################################################
380	304	## TEMPLATE API: functions to make your templates syndication-aware ############
381	305	################################################################################
		@@ -389,37 +313,20 @@
389	313	* @param int $id The post to check for syndicated status. Defaults to the current post in a Loop context.
390	314	* @return bool TRUE if the post's meta-data indicates it was syndicated; FALSE otherwise
391	315	*/
392	316	function is_syndicated ($id = NULL) {
393		- return (strlen(get_syndication_feed_id($id)) > 0);
	317	+ $p = new FeedWordPressLocalPost($id);
	318	+ return $p->is_syndicated();
394	319	} /* function is_syndicated() */
395	320
396		-function get_syndication_source_link ($original = NULL, $id = NULL) {
397		- if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data();
398		- endif;
399		-
400		- if ($original) : $vals = get_post_custom_values('syndication_source_uri_original', $id);
401		- else : $vals = array();
402		- endif;
403		-
404		- if (count($vals) == 0) : $vals = get_post_custom_values('syndication_source_uri', $id);
405		- endif;
406		-
407		- if (count($vals) > 0) : $ret = $vals[0]; else : $ret = NULL; endif;
408		-
409		- return $ret;
410		-} /* function get_syndication_source_link() */
411		-
412		-function the_syndication_source_link ($original = NULL, $id = NULL) {
413		- echo get_syndication_source_link($original, $id);
414		-}
415		-
416	321	function feedwordpress_display_url ($url, $before = 60, $after = 0) {
417	322	$bits = parse_url($url);
418	323
419	324	// Strip out crufty subdomains
420		- $bits['host'] = preg_replace('/^www[0-9]*\./i', '', $bits['host']);
421		-
	325	+ if (isset($bits['host'])) :
	326	+ $bits['host'] = preg_replace('/^www[0-9]*\./i', '', $bits['host']);
	327	+ endif;
	328	+
422	329	// Reassemble bit-by-bit with minimum of crufty elements
423	330	$url = (isset($bits['user'])?$bits['user'].'@':'')
424	331	.(isset($bits['host'])?$bits['host']:'')
425	332	.(isset($bits['path'])?$bits['path']:'')
		@@ -430,98 +337,65 @@
430	337	$url = substr($url, 0, $before).'…'.substr($url, 0 - $after, $after);
431	338	endif;
432	339
433	340	return $url;
434		-}
	341	+} /* feedwordpress_display_url () */
435	342
436		-function get_syndication_source ($original = NULL, $id = NULL) {
437		- if (is_null($original)) :
438		- $original = FeedWordPress::use_aggregator_source_data();
439		- endif;
	343	+function get_syndication_source_property ($original, $id, $local, $remote = NULL) {
	344	+ $p = new FeedWordPressLocalPost($id);
	345	+ return $p->meta($local, array("unproxy" => $original, "unproxied setting" => $remote));
	346	+} /* function get_syndication_source_property () */
440	347
441		- if ($original) :
442		- $vals = get_post_custom_values('syndication_source_original', $id);
443		- else :
444		- $vals = array();
445		- endif;
446		-
447		- if (count($vals) == 0) :
448		- $vals = get_post_custom_values('syndication_source', $id);
449		- endif;
450		-
451		- if (count($vals) > 0) :
452		- $ret = $vals[0];
453		- else :
454		- $ret = NULL;
455		- endif;
	348	+function get_syndication_source_link ($original = NULL, $id = NULL) {
	349	+ $p = new FeedWordPressLocalPost($id);
	350	+ return $p->syndication_source_link($original);
	351	+} /* function get_syndication_source_link() */
456	352
457		- if (is_null($ret) or strlen(trim($ret)) == 0) :
458		- // Fall back to URL of blog
459		- $ret = feedwordpress_display_url(get_syndication_source_link());
460		- endif;
	353	+function the_syndication_source_link ($original = NULL, $id = NULL) {
	354	+ echo get_syndication_source_link($original, $id);
	355	+} /* function the_syndication_source_link() */
461	356
462		- return $ret;
	357	+function get_syndication_source ($original = NULL, $id = NULL) {
	358	+ $p = new FeedWordPressLocalPost($id);
	359	+ return $p->syndication_source($original);
463	360	} /* function get_syndication_source() */
464	361
465		-function the_syndication_source ($original = NULL, $id = NULL) { echo get_syndication_source($original, $id); }
	362	+function the_syndication_source ($original = NULL, $id = NULL) {
	363	+ echo get_syndication_source($original, $id);
	364	+} /* function the_syndication_source () */
466	365
467	366	function get_syndication_feed ($original = NULL, $id = NULL) {
468		- if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data();
469		- endif;
470		-
471		- if ($original) : $vals = get_post_custom_values('syndication_feed_original', $id);
472		- else : $vals = array();
473		- endif;
474		-
475		- if (count($vals) == 0) : $vals = get_post_custom_values('syndication_feed', $id);
476		- endif;
477		-
478		- if (count($vals) > 0) : $ret = $vals[0]; else : $ret = NULL; endif;
479		-
480		- return $ret;
	367	+ $p = new FeedWordPressLocalPost($id);
	368	+ return $p->syndication_feed($original);
481	369	} /* function get_syndication_feed() */
482	370
483		-function the_syndication_feed ($original = NULL, $id = NULL) { echo get_syndication_feed($original, $id); }
	371	+function the_syndication_feed ($original = NULL, $id = NULL) {
	372	+ echo get_syndication_feed($original, $id);
	373	+} /* function the_syndication_feed() */
484	374
485	375	function get_syndication_feed_guid ($original = NULL, $id = NULL) {
486		- if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data();
487		- endif;
	376	+ $p = new FeedWordPressLocalPost($id);
	377	+ return $p->syndication_feed_guid($original);
	378	+} /* function get_syndication_feed_guid () */
488	379
489		- if ($original) : $vals = get_post_custom_values('syndication_source_id_original', $id);
490		- else : $vals = array();
491		- endif;
492		-
493		- if (count($vals) == 0) : $vals = array(get_feed_meta('feed/id', $id));
494		- endif;
495		-
496		- if (count($vals) > 0) : $ret = $vals[0]; else : $ret = NULL; endif;
	380	+function the_syndication_feed_guid ($original = NULL, $id = NULL) {
	381	+ echo get_syndication_feed_guid($original, $id);
	382	+} /* function the_syndication_feed_guid () */
497	383
498		- return $ret;
499		-} /* function get_syndication_feed_guid () */
	384	+function get_syndication_feed_id ($id = NULL) {
	385	+ $p = new FeedWordPressLocalPost($id);
	386	+ return $p->feed_id();
	387	+} /* function get_syndication_feed_id () */
500	388
501		-function the_syndication_feed_guid ($original = NULL, $id = NULL) { echo get_syndication_feed_guid($original, $id); }
	389	+function the_syndication_feed_id ($id = NULL) {
	390	+ echo get_syndication_feed_id($id);
	391	+} /* function the_syndication_feed_id () */
502	392
503		-function get_syndication_feed_id ($id = NULL) { list($u) = get_post_custom_values('syndication_feed_id', $id); return $u; }
504		-function the_syndication_feed_id ($id = NULL) { echo get_syndication_feed_id($id); }
505		-
506		-$feedwordpress_linkcache = array (); // only load links from database once
507	393	function get_syndication_feed_object ($id = NULL) {
508		- global $feedwordpress_linkcache;
	394	+ $p = new FeedWordPressLocalPost($id);
	395	+ return $p->feed();
	396	+} /* function get_syndication_feed_object() */
509	397
510		- $link = NULL;
511		-
512		- $feed_id = get_syndication_feed_id($id);
513		- if (strlen($feed_id) > 0):
514		- if (isset($feedwordpress_linkcache[$feed_id])) :
515		- $link = $feedwordpress_linkcache[$feed_id];
516		- else :
517		- $link = new SyndicatedLink($feed_id);
518		- $feedwordpress_linkcache[$feed_id] = $link;
519		- endif;
520		- endif;
521		- return $link;
522		-}
523		-
524	398	function get_feed_meta ($key, $id = NULL) {
525	399	$ret = NULL;
526	400
527	401	$link = get_syndication_feed_object($id);
		@@ -528,16 +402,18 @@
528	402	if (is_object($link) and isset($link->settings[$key])) :
529	403	$ret = $link->settings[$key];
530	404	endif;
531	405	return $ret;
532		-} /* get_feed_meta() */
	406	+} /* function get_feed_meta() */
533	407
534	408	function get_syndication_permalink ($id = NULL) {
535		- list($u) = get_post_custom_values('syndication_permalink', $id); return $u;
536		-}
	409	+ $p = new FeedWordPressLocalPost($id);
	410	+ return $p->syndication_permalink();
	411	+} /* function get_syndication_permalink () */
	412	+
537	413	function the_syndication_permalink ($id = NULL) {
538	414	echo get_syndication_permalink($id);
539		-}
	415	+} /* function the_syndication_permalink () */
540	416
541	417	/**
542	418	* get_local_permalink: returns a string containing the internal permalink
543	419	* for a post (whether syndicated or not) on your local WordPress installation.
		@@ -588,13 +464,10 @@
588	464
589	465	function feedwordpress_preserve_syndicated_content ($text) {
590	466	global $feedwordpress_the_syndicated_content;
591	467
592		- $globalExpose = (get_option('feedwordpress_formatting_filters') == 'yes');
593		- $localExpose = get_post_custom_values('_feedwordpress_formatting_filters');
594		- $expose = ($globalExpose or ((count($localExpose) > 0) and $localExpose[0]));
595		-
596		- if ( is_syndicated() and !$expose ) :
	468	+ $p = new FeedWordPressLocalPost;
	469	+ if (!$p->is_exposed_to_formatting_filters()) :
597	470	$feedwordpress_the_syndicated_content = $text;
598	471	else :
599	472	$feedwordpress_the_syndicated_content = NULL;
600	473	endif;
		@@ -647,30 +520,43 @@
647	520	* @return string The new permalink. Same as the old if the post is not
648	521	* syndicated, or if FWP is set to use internal permalinks, or if the post
649	522	* was syndicated, but didn't have a proper permalink recorded.
650	523	*
651		- * @uses FeedWordPress::munge_permalinks()
	524	+ * @uses SyndicatedLink::setting()
652	525	* @uses get_syndication_permalink()
	526	+ * @uses get_syndication_feed_object()
	527	+ * @uses url_to_postid()
	528	+ * @global $id
653	529	* @global $feedwordpress_the_original_permalink
654		- */
655		-function syndication_permalink ($permalink = '') {
	530	+ */
	531	+function syndication_permalink ($permalink = '', $post = null, $leavename = false, $sample = false) {
	532	+ global $id;
656	533	global $feedwordpress_the_original_permalink;
657	534
658	535	// Save the local permalink in case we need to retrieve it later.
659	536	$feedwordpress_the_original_permalink = $permalink;
660	537
661		- // Map this permalink to a post ID so we can get the correct permalink
662		- // even outside of the Post Loop. Props Björn.
663		- $id = url_to_postid($permalink);
	538	+ if (is_object($post) and isset($post->ID) and !empty($post->ID)) :
	539	+ // Use the post ID we've been provided with.
	540	+ $postId = $post->ID;
	541	+ elseif (is_string($permalink) and strlen($permalink) > 0) :
	542	+ // Map this permalink to a post ID so we can get the correct
	543	+ // permalink even outside of the Post Loop. Props Björn.
	544	+ $postId = url_to_postid($permalink);
	545	+ else :
	546	+ // If the permalink string is empty but Post Loop context
	547	+ // provides an id.
	548	+ $postId = $id;
	549	+ endif;
664	550
665	551	$munge = false;
666		- $link = get_syndication_feed_object($id);
	552	+ $link = get_syndication_feed_object($postId);
667	553	if (is_object($link)) :
668	554	$munge = ($link->setting('munge permalink', 'munge_permalink', 'yes') != 'no');
669	555	endif;
670	556
671	557	if ($munge):
672		- $uri = get_syndication_permalink($id);
	558	+ $uri = get_syndication_permalink($postId);
673	559	$permalink = ((strlen($uri) > 0) ? $uri : $permalink);
674	560	endif;
675	561	return $permalink;
676	562	} /* function syndication_permalink () */
		@@ -686,8 +572,9 @@
686	572	* @uses FeedWordPress::munge_permalinks()
687	573	*
688	574	*/
689	575	function syndication_permalink_escaped ($permalink) {
	576	+ /* FIXME: This should review link settings not just global settings */
690	577	if (is_syndicated() and FeedWordPress::munge_permalinks()) :
691	578	// This is a foreign link; WordPress can't vouch for its not
692	579	// having any entities that need to be &-escaped. So we'll do
693	580	// it here.
		@@ -714,8 +601,9 @@
714	601	// wfw:commentRss or atom:link/@rel="replies" we can make use of
715	602	// that value here.
716	603	$source = get_syndication_feed_object();
717	604	$replacement = NULL;
	605	+
718	606	if ($source->setting('munge comments feed links', 'munge_comments_feed_links', 'yes') != 'no') :
719	607	$commentFeeds = get_post_custom_values('wfw:commentRSS');
720	608	if (
721	609	is_array($commentFeeds)
		@@ -764,23 +652,66 @@
764	652	## ADMIN MENU ADD-ONS: register Dashboard management pages #####################
765	653	################################################################################
766	654
767	655	function fwp_add_pages () {
768		- global $fwp_capability;
769		- global $fwp_path;
	656	+ global $feedwordpress;
	657	+
	658	+ $menu_cap = FeedWordPress::menu_cap();
	659	+ $settings_cap = FeedWordPress::menu_cap(/*sub=*/ true);
	660	+ $syndicationMenu = FeedWordPress::path('syndication.php');
	661	+
	662	+ add_menu_page(
	663	+ 'Syndicated Sites', 'Syndication',
	664	+ $menu_cap,
	665	+ $syndicationMenu,
	666	+ NULL,
	667	+ WP_PLUGIN_URL.'/'.FeedWordPress::path('feedwordpress-tiny.png')
	668	+ );
770	669
771		- $menu = array('Syndicated Sites', 'Syndication', $fwp_capability['manage_links'], $fwp_path.'/syndication.php', NULL);
772		- if (fwp_test_wp_version(FWP_SCHEMA_27)) :
773		- // add icon parameter
774		- $menu[] = WP_PLUGIN_URL.'/'.$fwp_path.'/feedwordpress-tiny.png';
775		- endif;
	670	+ do_action('feedwordpress_admin_menu_pre_feeds', $menu_cap, $settings_cap);
	671	+ add_submenu_page(
	672	+ $syndicationMenu, 'Syndicated Sites', 'Syndicated Sites',
	673	+ $settings_cap, $syndicationMenu
	674	+ );
776	675
777		- call_user_func_array('add_menu_page', $menu);
778		- add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Feeds & Updates', 'Feeds & Updates', $fwp_capability['manage_options'], $fwp_path.'/feeds-page.php');
779		- add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Posts & Links', 'Posts & Links', $fwp_capability['manage_options'], $fwp_path.'/posts-page.php');
780		- add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Authors', 'Authors', $fwp_capability['manage_options'], $fwp_path.'/authors-page.php');
781		- add_submenu_page($fwp_path.'/syndication.php', 'Categories'.FEEDWORDPRESS_AND_TAGS, 'Categories'.FEEDWORDPRESS_AND_TAGS, $fwp_capability['manage_options'], $fwp_path.'/categories-page.php');
782		- add_submenu_page($fwp_path.'/syndication.php', 'FeedWordPress Back End', 'Back End', $fwp_capability['manage_options'], $fwp_path.'/backend-page.php');
	676	+ do_action('feedwordpress_admin_menu_pre_feeds', $menu_cap, $settings_cap);
	677	+ add_submenu_page(
	678	+ $syndicationMenu, 'Syndicated Feeds & Updates', 'Feeds & Updates',
	679	+ $settings_cap, FeedWordPress::path('feeds-page.php')
	680	+ );
	681	+
	682	+ do_action('feedwordpress_admin_menu_pre_posts', $menu_cap, $settings_cap);
	683	+ add_submenu_page(
	684	+ $syndicationMenu, 'Syndicated Posts & Links', 'Posts & Links',
	685	+ $settings_cap, FeedWordPress::path('posts-page.php')
	686	+ );
	687	+
	688	+ do_action('feedwordpress_admin_menu_pre_authors', $menu_cap, $settings_cap);
	689	+ add_submenu_page(
	690	+ $syndicationMenu, 'Syndicated Authors', 'Authors',
	691	+ $settings_cap, FeedWordPress::path('authors-page.php')
	692	+ );
	693	+
	694	+ do_action('feedwordpress_admin_menu_pre_categories', $menu_cap, $settings_cap);
	695	+ add_submenu_page(
	696	+ $syndicationMenu, 'Categories & Tags', 'Categories & Tags',
	697	+ $settings_cap, FeedWordPress::path('categories-page.php')
	698	+ );
	699	+
	700	+ do_action('feedwordpress_admin_menu_pre_performance', $menu_cap, $settings_cap);
	701	+ add_submenu_page(
	702	+ $syndicationMenu, 'FeedWordPress Performance', 'Performance',
	703	+ $settings_cap, FeedWordPress::path('performance-page.php')
	704	+ );
	705	+
	706	+ do_action('feedwordpress_admin_menu_pre_diagnostics', $menu_cap, $settings_cap);
	707	+ add_submenu_page(
	708	+ $syndicationMenu, 'FeedWordPress Diagnostics', 'Diagnostics',
	709	+ $settings_cap, FeedWordPress::path('diagnostics-page.php')
	710	+ );
	711	+
	712	+ add_filter('page_row_actions', array($feedwordpress, 'row_actions'), 10, 2);
	713	+ add_filter('post_row_actions', array($feedwordpress, 'row_actions'), 10, 2);
783	714	} /* function fwp_add_pages () */
784	715
785	716	function fwp_check_debug () {
786	717	// This is a horrible fucking kludge that I have to do because the
		@@ -861,9 +792,18 @@
861	792	endif;
862	793	}
863	794
864	795	function feedwordpress_add_post_edit_controls () {
	796	+ global $feedwordpress;
	797	+
	798	+ // Put in Manual Editing checkbox
865	799	add_meta_box('feedwordpress-post-controls', __('Syndication'), 'feedwordpress_post_edit_controls', 'post', 'side', 'high');
	800	+
	801	+ add_filter('user_can_richedit', array($feedwordpress, 'user_can_richedit'), 1000, 1);
	802	+
	803	+ if (FeedWordPress::diagnostic_on('syndicated_posts:static_meta_data')) :
	804	+ $GLOBALS['inspectPostMeta'] = new InspectPostMeta;
	805	+ endif;
866	806	} // function FeedWordPress::postEditControls
867	807
868	808	function feedwordpress_post_edit_controls () {
869	809	global $post;
		@@ -909,14 +849,16 @@
909	849	endif;
910	850
911	851	// OK, we're golden. Now let's save some data.
912	852	if (isset($_POST['freeze_updates'])) :
913		- update_post_meta($post_id, '_syndication_freeze_updates', $_POST['freeze_updates']);
	853	+ update_post_meta($post_id, '_syndication_freeze_updates', $_POST['freeze_updates']);
	854	+ $ret = $_POST['freeze_updates'];
914	855	else :
915	856	delete_post_meta($post_id, '_syndication_freeze_updates');
	857	+ $ret = NULL;
916	858	endif;
917	859
918		- return $_POST['freeze_updates'];
	860	+ return $ret;
919	861	} // function feedwordpress_save_edit_controls
920	862
921	863	################################################################################
922	864	## class FeedWordPress #########################################################
		@@ -956,18 +898,62 @@
956	898	array('script', 'src')
957	899	);
958	900
959	901	var $feeds = NULL;
960		-
	902	+ var $feedurls = NULL;
	903	+ var $httpauth = NULL;
	904	+
961	905	# function FeedWordPress (): Contructor; retrieve a list of feeds
962	906	function FeedWordPress () {
963	907	$this->feeds = array ();
	908	+ $this->feedurls = array();
964	909	$links = FeedWordPress::syndicated_links();
965	910	if ($links): foreach ($links as $link):
966		- $this->feeds[] = new SyndicatedLink($link);
	911	+ $id = intval($link->link_id);
	912	+ $url = $link->link_rss;
	913	+
	914	+ // Store for later reference.
	915	+ $this->feeds[$id] = $id;
	916	+ if (strlen($url) > 0) :
	917	+ $this->feedurls[$url] = $id;
	918	+ endif;
967	919	endforeach; endif;
	920	+
	921	+ $this->httpauth = new FeedWordPressHTTPAuthenticator;
968	922	} // FeedWordPress::FeedWordPress ()
969	923
	924	+ function subscribed ($id) {
	925	+ return (isset($this->feedurls[$id]) or isset($this->feeds[$id]));
	926	+ } /* FeedWordPress::subscribed () */
	927	+
	928	+ function subscription ($which) {
	929	+ $sub = NULL;
	930	+
	931	+ if (is_string($which) and isset($this->feedurls[$which])) :
	932	+ $which = $this->feedurls[$which];
	933	+ endif;
	934	+
	935	+ if (isset($this->feeds[$which])) :
	936	+ $sub = $this->feeds[$which];
	937	+ endif;
	938	+
	939	+ // If it's not in the in-memory cache already, try to load it from DB.
	940	+ // This is necessary to fill requests for subscriptions that we don't
	941	+ // cache in memory, e.g. for deactivated feeds.
	942	+ if (is_null($sub)) :
	943	+ $sub = get_bookmark($which);
	944	+ endif;
	945	+
	946	+ // Load 'er up if you haven't already.
	947	+ if (!is_null($sub) and !($sub InstanceOf SyndicatedLink)) :
	948	+ $link = new SyndicatedLink($sub);
	949	+ $this->feeds[$which] = $link;
	950	+ $sub = $link;
	951	+ endif;
	952	+
	953	+ return $sub;
	954	+ } /* FeedWordPress::subscription () */
	955	+
970	956	# function update (): polls for updates on one or more Contributor feeds
971	957	#
972	958	# Arguments:
973	959	# ----------
		@@ -1022,11 +1008,18 @@
1022	1008	if (FeedWordPress::needs_upgrade()) : // Will make duplicate posts if we don't hold off
1023	1009	return NULL;
1024	1010	endif;
1025	1011
1026		- if (!is_null($uri)) :
	1012	+ if (!is_null($uri) and $uri != '*') :
1027	1013	$uri = trim($uri);
1028	1014	else : // Update all
	1015	+ if ($this->update_hooked) :
	1016	+ $diag = $this->update_hooked;
	1017	+ else :
	1018	+ $diag = 'Initiating a MANUAL check-in on the update schedule at '.date('r', time());
	1019	+ endif;
	1020	+ $this->diagnostic('update_schedule:check', $diag);
	1021	+
1029	1022	update_option('feedwordpress_last_update_all', time());
1030	1023	endif;
1031	1024
1032	1025	do_action('feedwordpress_update', $uri);
		@@ -1031,27 +1024,46 @@
1031	1024
1032	1025	do_action('feedwordpress_update', $uri);
1033	1026
1034	1027	if (is_null($crash_ts)) :
1035		- $crash_dt = (int) get_option('feedwordpress_update_time_limit');
1036		- if ($crash_dt > 0) :
1037		- $crash_ts = time() + $crash_dt;
1038		- else :
1039		- $crash_ts = NULL;
1040		- endif;
	1028	+ $crash_ts = $this->crash_ts();
1041	1029	endif;
1042	1030
1043	1031	// Randomize order for load balancing purposes
1044		- $feed_set = $this->feeds;
	1032	+ $feed_set = array_keys($this->feeds);
1045	1033	shuffle($feed_set);
1046	1034
	1035	+ $updateWindow = (int) get_option('feedwordpress_update_window', DEFAULT_UPDATE_PERIOD) * 60 /* sec/min */;
	1036	+ $interval = (int) get_option('feedwordpress_freshness', FEEDWORDPRESS_FRESHNESS_INTERVAL);
	1037	+ $portion = max(
	1038	+ (int) ceil(count($feed_set) / ($updateWindow / $interval)),
	1039	+ 10
	1040	+ );
	1041	+
	1042	+ $max_polls = apply_filters('feedwordpress_polls_per_update', get_option(
	1043	+ 'feedwordpress_polls_per_update', $portion
	1044	+ ), $uri);
	1045	+
	1046	+ $feed_set = apply_filters('feedwordpress_update_feeds', $feed_set, $uri);
	1047	+
	1048	+
1047	1049	// Loop through and check for new posts
1048		- $delta = NULL;
1049		- foreach ($feed_set as $feed) :
1050		- if (!is_null($crash_ts) and (time() > $crash_ts)) : // Check whether we've exceeded the time limit
	1050	+ $delta = NULL; $remaining = $max_polls;
	1051	+ foreach ($feed_set as $feed_id) :
	1052	+
	1053	+ $feed = $this->subscription($feed_id);
	1054	+
	1055	+ // Has this process overstayed its welcome?
	1056	+ if (
	1057	+ // Over time limit?
	1058	+ (!is_null($crash_ts) and (time() > $crash_ts))
	1059	+
	1060	+ // Over feed count?
	1061	+ or ($remaining == 0)
	1062	+ ) :
1051	1063	break;
1052	1064	endif;
1053		-
	1065	+
1054	1066	$pinged_that = (is_null($uri) or ($uri=='*') or in_array($uri, array($feed->uri(), $feed->homepage())));
1055	1067
1056	1068	if (!is_null($uri)) : // A site-specific ping always updates
1057	1069	$timely = true;
		@@ -1058,13 +1070,15 @@
1058	1070	else :
1059	1071	$timely = $feed->stale();
1060	1072	endif;
1061	1073
1062		- if ($pinged_that and is_null($delta)) : // If at least one feed was hit for updating...
	1074	+ if ($pinged_that and is_null($delta)) : // If at least one feed was hit for updating...
1063	1075	$delta = array('new' => 0, 'updated' => 0); // ... don't return error condition
1064	1076	endif;
1065	1077
1066	1078	if ($pinged_that and $timely) :
	1079	+ $remaining = $remaining - 1;
	1080	+
1067	1081	do_action('feedwordpress_check_feed', $feed->settings);
1068	1082	$start_ts = time();
1069	1083	$added = $feed->poll($crash_ts);
1070	1084	do_action('feedwordpress_check_feed_complete', $feed->settings, $added, time() - $start_ts);
		@@ -1080,14 +1094,91 @@
1080	1094
1081	1095	return $delta;
1082	1096	}
1083	1097
	1098	+ function crash_ts ($default = NULL) {
	1099	+ $crash_dt = (int) get_option('feedwordpress_update_time_limit', 0);
	1100	+ if ($crash_dt > 0) :
	1101	+ $crash_ts = time() + $crash_dt;
	1102	+ else :
	1103	+ $crash_ts = $default;
	1104	+ endif;
	1105	+ return $crash_ts;
	1106	+ }
	1107	+
	1108	+ function secret_key () {
	1109	+ $secret = get_option('feedwordpress_secret_key', false);
	1110	+ if (!$secret) : // Generate random key.
	1111	+ $secret = substr(md5(uniqid(microtime())), 0, 6);
	1112	+ update_option('feedwordpress_secret_key', $secret);
	1113	+ endif;
	1114	+ return $secret;
	1115	+ }
	1116	+
	1117	+ function has_secret () {
	1118	+ return ($this->by_request('feedwordpress_key', $this->secret_key()));
	1119	+ }
	1120	+
	1121	+ // Utility function so I don't have to repeat myself w/ 1,000,003 isset()'s
	1122	+ function by_request ($param, $eq = NULL) {
	1123	+ $match = false;
	1124	+ if (isset($_REQUEST[$param])) :
	1125	+ $match = (is_null($eq) ? $_REQUEST[$param] : ($eq==$_REQUEST[$param]));
	1126	+ endif;
	1127	+ return $match;
	1128	+ }
	1129	+
	1130	+ var $update_hooked = NULL;
	1131	+ function automatic_update_hook ($params = array()) {
	1132	+ $params = wp_parse_args($params, array( // Defaults
	1133	+ 'setting only' => false,
	1134	+ ));
	1135	+ $hook = get_option('feedwordpress_automatic_updates', NULL);
	1136	+ $method = 'FeedWordPress option';
	1137	+
	1138	+ // Allow for forced behavior in testing.
	1139	+ if (
	1140	+ !$params['setting only']
	1141	+ and $this->has_secret()
	1142	+ and $this->by_request('automatic_update')
	1143	+ ) :
	1144	+ $hook = $_REQUEST['automatic_update'];
	1145	+ $method = 'URL parameter';
	1146	+ endif;
	1147	+
	1148	+ $exact = $hook; // Before munging
	1149	+
	1150	+ if (!!$hook) :
	1151	+ if ($hook != 'init') : // Constrain values.
	1152	+ $hook = 'shutdown';
	1153	+ endif;
	1154	+ endif;
	1155	+
	1156	+ if ($hook) :
	1157	+ $this->update_hooked = "Initiating an AUTOMATIC CHECK FOR UPDATES ON PAGE LOAD ".$hook." due to ".$method." = ".trim($this->val($exact));
	1158	+ endif;
	1159	+
	1160	+ return $hook;
	1161	+ }
	1162	+ function last_update_all () {
	1163	+ $last = get_option('feedwordpress_last_update_all');
	1164	+ if ($this->has_secret() and $this->by_request('automatic_update')) :
	1165	+ $last = 1; // A long, long time ago.
	1166	+ elseif ($this->has_secret() and $this->by_request('last_update_all')) :
	1167	+ $last = $_REQUEST['last_update_all'];
	1168	+ endif;
	1169	+ return $last;
	1170	+ }
	1171	+ function force_update_all () {
	1172	+ return ($this->has_secret() and $this->by_request('force_update_feeds'));
	1173	+ }
	1174	+
1084	1175	function stale () {
1085		- if (get_option('feedwordpress_automatic_updates')) :
	1176	+ if (!is_null($this->automatic_update_hook())) :
1086	1177	// Do our best to avoid possible simultaneous
1087	1178	// updates by getting up-to-the-minute settings.
1088	1179
1089		- $last = get_option('feedwordpress_last_update_all');
	1180	+ $last = $this->last_update_all();
1090	1181
1091	1182	// If we haven't updated all yet, give it a time window
1092	1183	if (false === $last) :
1093	1184	$ret = false;
		@@ -1098,13 +1189,13 @@
1098	1189	$freshness = get_option('feedwordpress_freshness');
1099	1190	if (false === $freshness) : // Use default
1100	1191	$freshness = FEEDWORDPRESS_FRESHNESS_INTERVAL;
1101	1192	endif;
1102		- $ret = ( (time() - $last) > $freshness);
1103		-
1104		- // This should never happen.
	1193	+ $ret = ( (time() - $last) > $freshness );
	1194	+
	1195	+ // This should never happen.
1105	1196	else :
1106		- FeedWordPress::critical_bug('FeedWordPress::stale::last', $last, __LINE__);
	1197	+ FeedWordPress::critical_bug('FeedWordPress::stale::last', $last, __LINE__, __FILE__);
1107	1198	endif;
1108	1199
1109	1200	else :
1110	1201	$ret = false;
		@@ -1110,69 +1201,416 @@
1110	1201	$ret = false;
1111	1202	endif;
1112	1203	return $ret;
1113	1204	} // FeedWordPress::stale()
	1205	+
	1206	+ static function admin_init () {
	1207	+ // WordPress 3.5+ compat: the WP devs are in the midst of removing Links from the WordPress core. Eventually we'll have to deal
	1208	+ // with the possible disappearance of the wp_links table as a whole; but in the meantime, we just need to turn on the interface
	1209	+ // element to avoid problems with user capabilities that presume the presence of the Links Manager in the admin UI.
	1210	+ if (!intval(get_option('link_manager_enabled', false))) :
	1211	+ update_option('link_manager_enabled', true);
	1212	+ endif;
	1213	+ } /* FeedWordPress::admin_init() */
	1214	+
	1215	+ function admin_api () {
	1216	+ // This sucks, but WordPress doesn't give us any other way to
	1217	+ // easily invoke a permanent-delete from a plugged in post
	1218	+ // actions link. So we create a magic parameter, and when this
	1219	+ // magic parameter is activated, the WordPress trashcan is
	1220	+ // temporarily de-activated.
	1221	+
	1222	+ if (MyPHP::request('fwp_post_delete')=='nuke') :
	1223	+ // Get post ID #
	1224	+ $post_id = MyPHP::request('post');
	1225	+ if (!$post_id) :
	1226	+ $post_id = MyPHP::request('post_ID');
	1227	+ endif;
	1228	+
	1229	+ // Make sure we've got the right nonce and all that.
	1230	+ check_admin_referer('delete-post_' . $post_id);
	1231	+
	1232	+ // If so, disable the trashcan.
	1233	+ define('EMPTY_TRASH_DAYS', 0);
	1234	+ endif;
	1235	+
	1236	+ }
	1237	+
	1238	+ function init () {
	1239	+ global $fwp_path;
	1240	+
	1241	+ // If this is a FeedWordPress admin page, queue up scripts for AJAX
	1242	+ // functions that FWP uses. If it is a display page or a non-FWP admin
	1243	+ // page, don't.
	1244	+ wp_register_style('feedwordpress-elements', WP_PLUGIN_URL.'/'.$fwp_path.'/feedwordpress-elements.css');
	1245	+ if (FeedWordPressSettingsUI::is_admin()) :
	1246	+ // For JavaScript that needs to be generated dynamically
	1247	+ add_action('admin_print_scripts', array('FeedWordPressSettingsUI', 'admin_scripts'));
	1248	+
	1249	+ // For CSS that needs to be generated dynamically.
	1250	+ add_action('admin_print_styles', array('FeedWordPressSettingsUI', 'admin_styles'));
	1251	+
	1252	+ wp_enqueue_style('dashboard');
	1253	+ wp_enqueue_style('feedwordpress-elements');
	1254	+
	1255	+ /*if (function_exists('wp_admin_css')) :
	1256	+ wp_admin_css('css/dashboard');
	1257	+ endif;*/
	1258	+ endif;
	1259	+
	1260	+ // This is a special post status for hiding posts that have expired
	1261	+ register_post_status('fwpretired', array(
	1262	+ 'label' => _x('Retired', 'post'),
	1263	+ 'label_count' => _n_noop('Retired <span class="count">(%s)</span>', 'Retired <span class="count">(%s)</span>'),
	1264	+ 'exclude_from_search' => true,
	1265	+ 'public' => false,
	1266	+ 'publicly_queryable' => false,
	1267	+ 'show_in_admin_all_list' => false,
	1268	+ 'show_in_admin_status_list' => true,
	1269	+ ));
	1270	+ add_action(
	1271	+ /*hook=*/ 'template_redirect',
	1272	+ /*function=*/ array($this, 'redirect_retired'),
	1273	+ /*priority=*/ -100
	1274	+ );
	1275	+
	1276	+ add_action('wp_ajax_fwp_feeds', array($this, 'fwp_feeds'));
	1277	+ add_action('wp_ajax_fwp_feedcontents', array($this, 'fwp_feedcontents'));
	1278	+ add_action('wp_ajax_fwp_xpathtest', array($this, 'fwp_xpathtest'));
	1279	+
	1280	+ $this->clear_cache_magic_url();
	1281	+ $this->update_magic_url();
	1282	+ } /* FeedWordPress::init() */
1114	1283
	1284	+ function fwp_feeds () {
	1285	+ $feeds = array();
	1286	+ $feed_ids = $this->feeds;
	1287	+
	1288	+ foreach ($feed_ids as $id) :
	1289	+ $sub = $this->subscription($id);
	1290	+ $feeds[] = array(
	1291	+ "id" => $id,
	1292	+ "url" => $sub->uri(),
	1293	+ "name" => $sub->name(/*fromFeed=*/ false),
	1294	+ );
	1295	+ endforeach;
	1296	+
	1297	+ header("Content-Type: application/json");
	1298	+ echo json_encode($feeds);
	1299	+ exit;
	1300	+ }
	1301	+
	1302	+ function fwp_feedcontents () {
	1303	+ $feed_id = MyPHP::request('feed_id');
	1304	+
	1305	+ // Let's load up some data from the feed . . .
	1306	+ $feed = $this->subscription($feed_id);
	1307	+ $posts = $feed->live_posts();
	1308	+
	1309	+ if (is_wp_error($posts)) :
	1310	+ header("HTTP/1.1 502 Bad Gateway");
	1311	+ $result = $posts;
	1312	+ else :
	1313	+ $result = array();
	1314	+
	1315	+ foreach ($posts as $post) :
	1316	+ $p = new SyndicatedPost($post, $feed);
	1317	+
	1318	+ $result[] = array(
	1319	+ "post_title" => $p->entry->get_title(),
	1320	+ "post_link" => $p->permalink(),
	1321	+ "guid" => $p->guid(),
	1322	+ "post_date" => $p->published(),
	1323	+ );
	1324	+ endforeach;
	1325	+ endif;
	1326	+
	1327	+ header("Content-Type: application/json");
	1328	+
	1329	+ echo json_encode($result);
	1330	+
	1331	+ // This is an AJAX request, so close it out thus.
	1332	+ die;
	1333	+ } /* FeedWordPress::fwp_feedcontents () */
	1334	+
	1335	+ function fwp_xpathtest () {
	1336	+ $xpath = MyPHP::request('xpath');
	1337	+ $feed_id = MyPHP::request('feed_id');
	1338	+ $post_id = MyPHP::request('post_id');
	1339	+
	1340	+ $expr = new FeedWordPressParsedPostMeta($xpath);
	1341	+
	1342	+ // Let's load up some data from the feed . . .
	1343	+ $feed = $this->subscription($feed_id);
	1344	+ $posts = $feed->live_posts();
	1345	+
	1346	+ if (!is_wp_error($posts)) :
	1347	+ if (strlen($post_id) == 0) :
	1348	+ $post = $posts[0];
	1349	+ else :
	1350	+ $post = null;
	1351	+
	1352	+ foreach ($posts as $p) :
	1353	+ if ($p->get_id() == $post_id) :
	1354	+ $post = $p;
	1355	+ endif;
	1356	+ endforeach;
	1357	+ endif;
	1358	+
	1359	+ $post = new SyndicatedPost($post, $feed);
	1360	+ $meta = $expr->do_substitutions($post);
	1361	+
	1362	+ $result = array(
	1363	+ "post_title" => $post->entry->get_title(),
	1364	+ "post_link" => $post->permalink(),
	1365	+ "guid" => $post->guid(),
	1366	+ "expression" => $xpath,
	1367	+ "results" => $meta
	1368	+ );
	1369	+ else :
	1370	+ $result = array(
	1371	+ "expression" => $xpath,
	1372	+ "feed_id" => $feed_id,
	1373	+ "post_id" => $post_id,
	1374	+ "results" => $posts
	1375	+ );
	1376	+
	1377	+ header("HTTP/1.1 503 Bad Gateway");
	1378	+ endif;
	1379	+
	1380	+ header("Content-Type: application/json");
	1381	+
	1382	+ echo json_encode($result);
	1383	+
	1384	+ // This is an AJAX request, so close it out thus.
	1385	+ die;
	1386	+ } /* FeedWordPress::fwp_xpathtest () */
	1387	+
	1388	+ function redirect_retired () {
	1389	+ global $wp_query;
	1390	+ if (is_singular()) :
	1391	+ if ('fwpretired'==$wp_query->post->post_status) :
	1392	+ do_action('feedwordpress_redirect_retired', $wp_query->post);
	1393	+
	1394	+ if (!($template = get_404_template())) :
	1395	+ $template = get_index_template();
	1396	+ endif;
	1397	+ if ($template = apply_filters('template_include', $template)) :
	1398	+ header("HTTP/1.1 410 Gone");
	1399	+ include($template);
	1400	+ endif;
	1401	+ exit;
	1402	+ endif;
	1403	+ endif;
	1404	+ }
	1405	+
	1406	+ function row_actions ($actions, $post) {
	1407	+ if (is_syndicated($post->ID)) :
	1408	+ $link = get_delete_post_link($post->ID, '', true);
	1409	+ $link = MyPHP::url($link, array("fwp_post_delete" => "nuke"));
	1410	+
	1411	+ $caption = 'Erase the record of this post (will be re-syndicated if it still appears on the feed).';
	1412	+ $linktext = 'Erase/Resyndicate';
	1413	+
	1414	+ $keys = array_keys($actions);
	1415	+ $links = array();
	1416	+ foreach ($keys as $key) :
	1417	+ $links[$key] = $actions[$key];
	1418	+
	1419	+ if ('trash'==$key) :
	1420	+ $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/Don&#8217;t Resyndicate' ) . "</a>";
	1421	+
	1422	+ // Placeholder.
	1423	+ $links['delete'] = '';
	1424	+ endif;
	1425	+ endforeach;
	1426	+
	1427	+ $links['delete'] = '<a class="submitdelete" title="'.esc_attr(__($caption)).'" href="' . $link . '">' . __($linktext) . '</a>';
	1428	+
	1429	+ $actions = $links;
	1430	+ endif;
	1431	+ return $actions;
	1432	+ }
	1433	+
	1434	+ function dashboard_setup () {
	1435	+ $see_it = FeedWordPress::menu_cap();
	1436	+
	1437	+ if (current_user_can($see_it)) :
	1438	+ // Get the stylesheet
	1439	+ wp_enqueue_style('feedwordpress-elements');
	1440	+
	1441	+ $widget_id = 'feedwordpress_dashboard';
	1442	+ $widget_name = __('Syndicated Sources');
	1443	+ $column = 'side';
	1444	+ $priority = 'core';
	1445	+
	1446	+ // I would love to use wp_add_dashboard_widget() here and save
	1447	+ // myself some trouble. But WP 3 does not yet have any way to
	1448	+ // push a dashboard widget onto the side, or to give it a default
	1449	+ // location.
	1450	+ add_meta_box(
	1451	+ /*id=*/ $widget_id,
	1452	+ /*title=*/ $widget_name,
	1453	+ /*callback=*/ array($this, 'dashboard'),
	1454	+ /*page=*/ 'dashboard',
	1455	+ /*context=*/ $column,
	1456	+ /*priority=*/ $priority
	1457	+ );
	1458	+ /*control_callback= array($this, 'dashboard_control') */
	1459	+
	1460	+ // This is kind of rude, I know, but the dashboard widget isn't
	1461	+ // worth much if users don't know that it exists, and I don't
	1462	+ // know of any better way to reorder the boxen.
	1463	+ //
	1464	+ // Gleefully ripped off of codex.wordpress.org/Dashboard_Widgets_API
	1465	+
	1466	+ // Globalize the metaboxes array, this holds all the widgets for wp-admin
	1467	+ global $wp_meta_boxes;
	1468	+
	1469	+ // Get the regular dashboard widgets array
	1470	+ // (which has our new widget already but at the end)
	1471	+
	1472	+ $normal_dashboard = $wp_meta_boxes['dashboard'][$column][$priority];
	1473	+
	1474	+ // Backup and delete our new dashbaord widget from the end of the array
	1475	+ if (isset($normal_dashboard[$widget_id])) :
	1476	+ $backup = array();
	1477	+ $backup[$widget_id] = $normal_dashboard[$widget_id];
	1478	+ unset($normal_dashboard[$widget_id]);
	1479	+
	1480	+ // Merge the two arrays together so our widget is at the
	1481	+ // beginning
	1482	+ $sorted_dashboard = array_merge($backup, $normal_dashboard);
	1483	+
	1484	+ // Save the sorted array back into the original metaboxes
	1485	+ $wp_meta_boxes['dashboard'][$column][$priority] = $sorted_dashboard;
	1486	+ endif;
	1487	+ endif;
	1488	+ } /* FeedWordPress::dashboard_setup () */
	1489	+
	1490	+ function dashboard () {
	1491	+ $syndicationPage = new FeedWordPressSyndicationPage(dirname(__FILE__).'/syndication.php');
	1492	+ $syndicationPage->dashboard_box($syndicationPage);
	1493	+ } /* FeedWordPress::dashboard () */
	1494	+
	1495	+ function user_can_richedit ($rich_edit) {
	1496	+
	1497	+ $post = new FeedWordPressLocalPost;
	1498	+
	1499	+ if (!$post->is_exposed_to_formatting_filters()) :
	1500	+ // Disable visual editor and only allow operations
	1501	+ // directly on HTML if post is bypassing fmt filters
	1502	+ $rich_edit = false;
	1503	+ endif;
	1504	+
	1505	+ return $rich_edit;
	1506	+
	1507	+ } /* FeedWordPress::user_can_richedit () */
	1508	+
	1509	+ function update_magic_url () {
	1510	+ global $wpdb;
	1511	+
	1512	+ // Explicit update request in the HTTP request (e.g. from a cron job)
	1513	+ if ($this->update_requested()) :
	1514	+ $this->update_hooked = "Initiating a CRON JOB CHECK-IN ON UPDATE SCHEDULE due to URL parameter = ".trim($this->val($_REQUEST['update_feedwordpress']));
	1515	+
	1516	+ $this->update($this->update_requested_url());
	1517	+
	1518	+ if (FEEDWORDPRESS_DEBUG and count($wpdb->queries) > 0) :
	1519	+ $mysqlTime = 0.0;
	1520	+ $byTime = array();
	1521	+ foreach ($wpdb->queries as $query) :
	1522	+ $time = $query[1] * 1000000.0;
	1523	+ $mysqlTime += $query[1];
	1524	+ if (!isset($byTime[$time])) : $byTime[$time] = array(); endif;
	1525	+ $byTime[$time][] = $query[0]. ' // STACK: ' . $query[2];
	1526	+ endforeach;
	1527	+ krsort($byTime);
	1528	+
	1529	+ foreach ($byTime as $time => $querySet) :
	1530	+ foreach ($querySet as $query) :
	1531	+ print "[".(sprintf('%4.4f', $time/1000.0)) . "ms] $query\n";
	1532	+ endforeach;
	1533	+ endforeach;
	1534	+ echo $this->log_prefix()."$wpdb->num_queries queries. $mysqlTime seconds in MySQL. Total of "; timer_stop(1); print " seconds.";
	1535	+ endif;
	1536	+
	1537	+ debug_out_feedwordpress_footer();
	1538	+
	1539	+ // Magic URL should return nothing but a 200 OK header packet
	1540	+ // when successful.
	1541	+ exit;
	1542	+ endif;
	1543	+ } /* FeedWordPress::magic_update_url () */
	1544	+
	1545	+ function clear_cache_magic_url () {
	1546	+ if ($this->clear_cache_requested()) :
	1547	+ $this->clear_cache();
	1548	+ endif;
	1549	+ } /* FeedWordPress::clear_cache_magic_url() */
	1550	+
	1551	+ function clear_cache_requested () {
	1552	+ return MyPHP::request('clear_cache');
	1553	+ } /* FeedWordPress::clear_cache_requested() */
	1554	+
1115	1555	function update_requested () {
1116		- return (
1117		- isset($_REQUEST['update_feedwordpress'])
1118		- and $_REQUEST['update_feedwordpress']
1119		- );
	1556	+ return FeedWordPress::by_request('update_feedwordpress');
1120	1557	} // FeedWordPress::update_requested()
1121	1558
1122	1559	function update_requested_url () {
1123		- $ret = null;
1124		-
1125		- if (($_REQUEST['update_feedwordpress']=='*')
1126		- or (preg_match('|^http://.*|i', $_REQUEST['update_feedwordpress']))) :
1127		- $ret = $_REQUEST['update_feedwordpress'];
1128		- endif;
	1560	+ $ret = null;
	1561	+
	1562	+ if (($_REQUEST['update_feedwordpress']=='*')
	1563	+ or (preg_match('|^http://.*|i', $_REQUEST['update_feedwordpress']))) :
	1564	+ $ret = $_REQUEST['update_feedwordpress'];
	1565	+ endif;
1129	1566
1130		- return $ret;
	1567	+ return $ret;
1131	1568	} // FeedWordPress::update_requested_url()
1132	1569
1133		- function syndicate_link ($name, $uri, $rss) {
	1570	+ function auto_update () {
	1571	+ if ($this->stale()) :
	1572	+ $this->update();
	1573	+ endif;
	1574	+ } /* FeedWordPress::auto_update () */
	1575	+
	1576	+ function find_link ($uri, $field = 'link_rss') {
1134	1577	global $wpdb;
1135	1578
	1579	+ $unslashed = untrailingslashit($uri);
	1580	+ $slashed = trailingslashit($uri);
	1581	+ $link_id = $wpdb->get_var($wpdb->prepare("
	1582	+ SELECT link_id FROM $wpdb->links WHERE $field IN ('%s', '%s')
	1583	+ LIMIT 1", $unslashed, $slashed
	1584	+ ));
	1585	+
	1586	+ return $link_id;
	1587	+ } /* FeedWordPress::find_link () */
	1588	+
	1589	+ function syndicate_link ($name, $uri, $rss) {
1136	1590	// Get the category ID#
1137	1591	$cat_id = FeedWordPress::link_category_id();
1138		-
	1592	+ if (!is_wp_error($cat_id)) :
	1593	+ $link_category = array($cat_id);
	1594	+ else :
	1595	+ $link_category = array();
	1596	+ endif;
	1597	+
1139	1598	// WordPress gets cranky if there's no homepage URI
1140		- if (!isset($uri) or strlen($uri)<1) : $uri = $rss; endif;
	1599	+ if (!is_string($uri) or strlen($uri)<1) : $uri = $rss; endif;
1141	1600
1142		- if (function_exists('wp_insert_link')) : // WordPress 2.x
1143		- if (FeedWordPressCompatibility::test_version(0, FWP_SCHEMA_21)) :
1144		- // Morons.
1145		- $name = $wpdb->escape($name);
1146		- $uri = $wpdb->escape($uri);
1147		- $rss = $wpdb->escape($rss);
1148		-
1149		- // Comes in as a single category
1150		- $linkCats = $cat_id;
1151		- else :
1152		- // Comes in as an array of categories
1153		- $linkCats = array($cat_id);
1154		- endif;
	1601	+ // Check if this feed URL is already being syndicated.
	1602	+ $link_id = wp_insert_link(array(
	1603	+ "link_id" => FeedWordPress::find_link($rss), // insert if nothing was found; else update
	1604	+ "link_rss" => $rss,
	1605	+ "link_name" => $name,
	1606	+ "link_url" => $uri,
	1607	+ "link_category" => $link_category,
	1608	+ "link_visible" => 'Y', // reactivate if inactivated
	1609	+ ));
1155	1610
1156		- $link_id = wp_insert_link(array(
1157		- "link_name" => $name,
1158		- "link_url" => $uri,
1159		- "link_category" => $linkCats,
1160		- "link_rss" => $rss
1161		- ));
1162		- else : // WordPress 1.5.x
1163		- $result = $wpdb->query("
1164		- INSERT INTO $wpdb->links
1165		- SET
1166		- link_name = '".$wpdb->escape($name)."',
1167		- link_url = '".$wpdb->escape($uri)."',
1168		- link_category = '".$wpdb->escape($cat_id)."',
1169		- link_rss = '".$wpdb->escape($rss)."'
1170		- ");
1171		- $link_id = $wpdb->insert_id;
1172		- endif;
1173	1611	return $link_id;
1174		- } // function FeedWordPress::syndicate_link()
	1612	+ } /* function FeedWordPress::syndicate_link() */
1175	1613
1176	1614	/*static*/ function syndicated_status ($what, $default) {
1177	1615	$ret = get_option("feedwordpress_syndicated_{$what}_status");
1178	1616	if (!$ret) :
		@@ -1180,28 +1618,16 @@
1180	1618	endif;
1181	1619	return $ret;
1182	1620	} /* FeedWordPress::syndicated_status() */
1183	1621
1184		- function on_unfamiliar ($what = 'author', $override = NULL) {
1185		- $set = array(
1186		- 'author' => array('create', 'default', 'filter'),
1187		- 'category' => array('create', 'tag', 'default', 'filter'),
1188		- );
	1622	+ function on_unfamiliar ($what = 'author') {
	1623	+ switch ($what) :
	1624	+ case 'category' : $suffix = ':category'; break;
	1625	+ case 'post_tag' : $suffix = ':post_tag'; break;
	1626	+ default: $suffix = '';
	1627	+ endswitch;
1189	1628
1190		- if (is_string($override)) :
1191		- $ret = strtolower($override);
1192		- else :
1193		- $ret = NULL;
1194		- endif;
1195		-
1196		- if (!is_numeric($override) and !in_array($ret, $set[$what])) :
1197		- $ret = get_option('feedwordpress_unfamiliar_'.$what);
1198		- if (!is_numeric($ret) and !in_array($ret, $set[$what])) :
1199		- $ret = 'create';
1200		- endif;
1201		- endif;
1202		-
1203		- return $ret;
	1629	+ return get_option('feedwordpress_unfamiliar_'.$what, 'create'.$suffix);
1204	1630	} // function FeedWordPress::on_unfamiliar()
1205	1631
1206	1632	function null_email_set () {
1207	1633	$base = get_option('feedwordpress_null_email_set');
		@@ -1238,15 +1664,19 @@
1238	1664	/*static*/ function munge_permalinks () {
1239	1665	return (get_option('feedwordpress_munge_permalink', /*default=*/ 'yes') != 'no');
1240	1666	} /* FeedWordPress::munge_permalinks() */
1241	1667
1242		- function syndicated_links () {
	1668	+ function syndicated_links ($args = array()) {
1243	1669	$contributors = FeedWordPress::link_category_id();
1244		- if (function_exists('get_bookmarks')) :
1245		- $links = get_bookmarks(array("category" => $contributors));
1246		- else:
1247		- $links = get_linkobjects($contributors); // deprecated as of WP 2.1
	1670	+ if (!is_wp_error($contributors)) :
	1671	+ $links = get_bookmarks(array_merge(
	1672	+ array("category" => $contributors),
	1673	+ $args
	1674	+ ));
	1675	+ else :
	1676	+ $links = array();
1248	1677	endif;
	1678	+
1249	1679	return $links;
1250	1680	} // function FeedWordPress::syndicated_links()
1251	1681
1252	1682	function link_category_id () {
		@@ -1271,11 +1701,12 @@
1271	1701	// If we could not find an appropriate link category,
1272	1702	// make a new one for ourselves.
1273	1703	if (!$cat_id) :
1274	1704	$cat_id = FeedWordPressCompatibility::insert_link_category(DEFAULT_SYNDICATION_CATEGORY);
1275		-
1276		- // Stamp it
1277		- update_option('feedwordpress_cat_id', $cat_id);
	1705	+ if (!is_wp_error($cat_id)) :
	1706	+ // Stamp it
	1707	+ update_option('feedwordpress_cat_id', $cat_id);
	1708	+ endif;
1278	1709	endif;
1279	1710
1280	1711	return $cat_id;
1281	1712	} // function FeedWordPress::link_category_id()
		@@ -1301,15 +1732,47 @@
1301	1732	update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
1302	1733	endif;
1303	1734	elseif ($fwp_db_version < 2009.0707) :
1304	1735	// We need to clear out any busted AJAX crap
1305		- if (fwp_test_wp_version(FWP_SCHEMA_HAS_USERMETA)) :
1306		- $wpdb->query("
1307		- DELETE FROM $wpdb->usermeta
1308		- WHERE LOCATE('feedwordpress', meta_key)
1309		- AND LOCATE('box', meta_key);
1310		- ");
	1736	+ $wpdb->query("
	1737	+ DELETE FROM $wpdb->usermeta
	1738	+ WHERE LOCATE('feedwordpress', meta_key)
	1739	+ AND LOCATE('box', meta_key);
	1740	+ ");
	1741	+
	1742	+ update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
	1743	+ elseif ($fwp_db_version < 2010.0814) :
	1744	+ // Change in terminology.
	1745	+ if (get_option('feedwordpress_unfamiliar_category', 'create')=='default') :
	1746	+ update_option('feedwordpress_unfamiliar_category', 'null');
1311	1747	endif;
	1748	+ foreach (FeedWordPress::syndicated_links() as $link) :
	1749	+ $sub = new SyndicatedLink($link);
	1750	+
	1751	+ $remap_uf = array(
	1752	+ 'default' => 'null',
	1753	+ 'filter' => 'null',
	1754	+ 'create' => 'create:category',
	1755	+ 'tag' => 'create:post_tag'
	1756	+ );
	1757	+ if (isset($sub->settings['unfamiliar category'])) :
	1758	+ if ($sub->settings['unfamiliar category']=='filter') :
	1759	+ $sub->settings['match/filter'] = array('category');
	1760	+ endif;
	1761	+ foreach ($remap_uf as $from => $to) :
	1762	+ if ($sub->settings['unfamiliar category']==$from) :
	1763	+ $sub->settings['unfamiliar category'] = $to;
	1764	+ endif;
	1765	+ endforeach;
	1766	+ endif;
	1767	+
	1768	+ if (isset($sub->settings['add global categories'])) :
	1769	+ $sub->settings['add/category'] = $sub->settings['add global categories'];
	1770	+ unset($sub->settings['add global categories']);
	1771	+ endif;
	1772	+
	1773	+ $sub->save_settings(/*reload=*/ true);
	1774	+ endforeach;
1312	1775	update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
1313	1776	else :
1314	1777	// No. Just brand it with the new version.
1315	1778	update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
		@@ -1370,15 +1833,56 @@
1370	1833	DROP INDEX {$wpdb->posts}_guid_idx ON {$wpdb->posts}
1371	1834	");
1372	1835	}
1373	1836
1374		- /*static*/ function fetch ($url) {
1375		- require_once (ABSPATH . WPINC . '/class-feed.php');
1376		- $feed = new SimplePie();
	1837	+ /*static*/ function fetch_timeout () {
	1838	+ return apply_filters(
	1839	+ 'feedwordpress_fetch_timeout',
	1840	+ intval(get_option('feedwordpress_fetch_timeout', FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT))
	1841	+ );
	1842	+ }
	1843	+
	1844	+ /*static*/ function fetch ($url, $params = array()) {
	1845	+ if (is_wp_error($url)) :
	1846	+ // Let's bounce.
	1847	+ return $url;
	1848	+ endif;
	1849	+
	1850	+ $force_feed = true; // Default
	1851	+
	1852	+ // Allow user to change default feed-fetch timeout with a global setting. Props Erigami Scholey-Fuller <http://www.piepalace.ca/blog/2010/11/feedwordpress-broke-my-heart.html> 'timeout' =>
	1853	+ $timeout = FeedWordPress::fetch_timeout();
	1854	+
	1855	+ if (!is_array($params)) :
	1856	+ $force_feed = $params;
	1857	+ else : // Parameter array
	1858	+ $args = wp_parse_args(array(
	1859	+ 'force_feed' => $force_feed,
	1860	+ 'timeout' => $timeout
	1861	+ ), $params);
	1862	+
	1863	+ extract($args);
	1864	+ endif;
	1865	+ $timeout = intval($timeout);
	1866	+
	1867	+ $pie_class = apply_filters('feedwordpress_simplepie_class', 'FeedWordPie');
	1868	+ $cache_class = apply_filters('feedwordpress_cache_class', 'WP_Feed_Cache');
	1869	+ $file_class = apply_filters('feedwordpress_file_class', 'FeedWordPress_File');
	1870	+ $parser_class = apply_filters('feedwordpress_parser_class', 'FeedWordPress_Parser');
	1871	+ $item_class = apply_filters('feedwordpress_item_class', 'FeedWordPie_Item');
	1872	+ $sniffer_class = apply_filters('feedwordpress_sniffer_class', 'FeedWordPress_Content_Type_Sniffer');
	1873	+
	1874	+ $feed = new $pie_class;
1377	1875	$feed->set_feed_url($url);
1378		- $feed->set_cache_class('WP_Feed_Cache');
1379		- $feed->set_file_class('WP_SimplePie_File');
1380		- $feed->set_cache_duration(FeedWordPress::cache_duration());
	1876	+ $feed->set_cache_class($cache_class);
	1877	+ $feed->set_timeout($timeout);
	1878	+
	1879	+ $feed->set_content_type_sniffer_class($sniffer_class);
	1880	+ $feed->set_file_class($file_class);
	1881	+ $feed->set_parser_class($parser_class);
	1882	+ $feed->set_item_class($item_class);
	1883	+ $feed->force_feed($force_feed);
	1884	+ $feed->set_cache_duration(FeedWordPress::cache_duration($params));
1381	1885	$feed->init();
1382	1886	$feed->handle_content_type();
1383	1887
1384	1888	if ($feed->error()) :
		@@ -1391,8 +1895,14 @@
1391	1895
1392	1896	function clear_cache () {
1393	1897	global $wpdb;
1394	1898
	1899	+ // Just in case, clear out any old MagpieRSS cache records.
	1900	+ $magpies = $wpdb->query("
	1901	+ DELETE FROM {$wpdb->options}
	1902	+ WHERE option_name LIKE 'rss_%' AND LENGTH(option_name) > 32
	1903	+ ");
	1904	+
1395	1905	// The WordPress SimplePie module stores its cached feeds as
1396	1906	// transient records in the options table. The data itself is
1397	1907	// stored in `_transient_feed_{md5 of url}` and the last-modified
1398	1908	// timestamp in `_transient_feed_mod_{md5 of url}`. Timeouts for
		@@ -1398,17 +1908,26 @@
1398	1908	// timestamp in `_transient_feed_mod_{md5 of url}`. Timeouts for
1399	1909	// these records are stored in `_transient_timeout_feed_{md5}`.
1400	1910	// Since the md5 is always 32 characters in length, the
1401	1911	// option_name is always over 32 characters.
1402		- $wpdb->query("
	1912	+ $simplepies = $wpdb->query("
1403	1913	DELETE FROM {$wpdb->options}
1404	1914	WHERE option_name LIKE '_transient%_feed_%' AND LENGTH(option_name) > 32
1405	1915	");
	1916	+ $simplepies = (int) ($simplepies / 4); // Each transient has 4 rows: the data, the modified timestamp; and the timeouts for each
	1917	+
	1918	+ return ($magpies + $simplepies);
1406	1919	} /* FeedWordPress::clear_cache () */
1407	1920
1408		- function cache_duration () {
	1921	+ function cache_duration ($params = array()) {
	1922	+ $params = wp_parse_args($params, array(
	1923	+ "cache" => true,
	1924	+ ));
	1925	+
1409	1926	$duration = NULL;
1410		- if (defined('FEEDWORDPRESS_CACHE_AGE')) :
	1927	+ if (!$params['cache']) :
	1928	+ $duration = 0;
	1929	+ elseif (defined('FEEDWORDPRESS_CACHE_AGE')) :
1411	1930	$duration = FEEDWORDPRESS_CACHE_AGE;
1412	1931	endif;
1413	1932	return $duration;
1414	1933	}
		@@ -1436,58 +1955,301 @@
1436	1955	$affirmo = array ('y', 'yes', 't', 'true', 1);
1437	1956	return (isset($f[$setting]) and in_array(strtolower($f[$setting]), $affirmo));
1438	1957	}
1439	1958
1440		-
1441	1959	# Internal debugging functions
1442		- function critical_bug ($varname, $var, $line) {
	1960	+ function critical_bug ($varname, $var, $line, $file = NULL) {
1443	1961	global $wp_version;
1444		-
1445		- 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>';
1446		- echo "\n<plaintext>";
1447		- echo "Triggered at line # ".$line."\n";
1448		- echo "FeedWordPress version: ".FEEDWORDPRESS_VERSION."\n";
1449		- echo "WordPress version: {$wp_version}\n";
1450		- echo "PHP version: ".phpversion()."\n";
1451		- echo "\n";
1452		- echo $varname.": "; var_dump($var); echo "\n";
	1962	+
	1963	+ if (!is_null($file)) :
	1964	+ $location = "line # ${line} of ".basename($file);
	1965	+ else :
	1966	+ $location = "line # ${line}";
	1967	+ endif;
	1968	+
	1969	+ print '<p><strong>Critical error:</strong> There may be a bug in FeedWordPress. Please <a href="'.FEEDWORDPRESS_AUTHOR_CONTACT.'">contact the author</a> and paste the following information into your e-mail:</p>';
	1970	+ print "\n<plaintext>";
	1971	+ print "Triggered at ${location}\n";
	1972	+ print "FeedWordPress: ".FEEDWORDPRESS_VERSION."\n";
	1973	+ print "WordPress: {$wp_version}\n";
	1974	+ print "PHP: ".phpversion()."\n";
	1975	+ print "Error data: ";
	1976	+ print $varname.": "; var_dump($var); echo "\n";
1453	1977	die;
1454	1978	}
1455	1979
1456		- function noncritical_bug ($varname, $var, $line) {
	1980	+ function noncritical_bug ($varname, $var, $line, $file = NULL) {
1457	1981	if (FEEDWORDPRESS_DEBUG) : // halt only when we are doing debugging
1458		- FeedWordPress::critical_bug($varname, $var, $line);
	1982	+ FeedWordPress::critical_bug($varname, $var, $line, $file);
1459	1983	endif;
1460	1984	}
1461		-} // class FeedWordPress
	1985	+
	1986	+ function val ($v, $no_newlines = false) {
	1987	+ ob_start();
	1988	+ var_dump($v);
	1989	+ $out = ob_get_contents(); ob_end_clean();
	1990	+
	1991	+ if ($no_newlines) :
	1992	+ $out = preg_replace('/\s+/', " ", $out);
	1993	+ endif;
	1994	+ return $out;
	1995	+ } /* FeedWordPress::val () */
1462	1996
1463		-require_once(dirname(__FILE__) . '/syndicatedpost.class.php');
1464		-require_once(dirname(__FILE__) . '/syndicatedlink.class.php');
	1997	+ function diagnostic_on ($level) {
	1998	+ $show = get_option('feedwordpress_diagnostics_show', array());
	1999	+ return (in_array($level, $show));
	2000	+ } /* FeedWordPress::diagnostic_on () */
1465	2001
1466		-################################################################################
1467		-## XML-RPC HOOKS: accept XML-RPC update pings from Contributors ################
1468		-################################################################################
	2002	+ function diagnostic ($level, $out, $persist = NULL, $since = NULL, $mostRecent = NULL) {
	2003	+ global $feedwordpress_admin_footer;
1469	2004
1470		-function feedwordpress_xmlrpc_hook ($args = array ()) {
1471		- $args['weblogUpdates.ping'] = 'feedwordpress_pong';
1472		- return $args;
1473		-}
	2005	+ $output = get_option('feedwordpress_diagnostics_output', array());
	2006	+ $dlog = get_option('feedwordpress_diagnostics_log', array());
1474	2007
1475		-function feedwordpress_pong ($args) {
1476		- $feedwordpress = new FeedWordPress;
1477		- $delta = @$feedwordpress->update($args[1]);
1478		- if (is_null($delta)):
1479		- return array('flerror' => true, 'message' => "Sorry. I don't syndicate <$args[1]>.");
1480		- else:
1481		- $mesg = array();
1482		- if (isset($delta['new'])) { $mesg[] = ' '.$delta['new'].' new posts were syndicated'; }
1483		- if (isset($delta['updated'])) { $mesg[] = ' '.$delta['updated'].' existing posts were updated'; }
	2008	+ $diagnostic_nesting = count(explode(":", $level));
1484	2009
1485		- return array('flerror' => false, 'message' => "Thanks for the ping.".implode(' and', $mesg));
1486		- endif;
1487		-}
	2010	+ if (FeedWordPress::diagnostic_on($level)) :
	2011	+ foreach ($output as $method) :
	2012	+ switch ($method) :
	2013	+ case 'echo' :
	2014	+ if (!FeedWordPress::update_requested()) :
	2015	+ echo "<div><pre><strong>Diag".str_repeat('====', $diagnostic_nesting-1).'|</strong> '.$out."</pre></div>";
	2016	+ endif;
	2017	+ break;
	2018	+ case 'echo_in_cronjob' :
	2019	+ if (FeedWordPress::update_requested()) :
	2020	+ echo FeedWordPress::log_prefix()." ".$out."\n";
	2021	+ endif;
	2022	+ break;
	2023	+ case 'admin_footer' :
	2024	+ $feedwordpress_admin_footer[] = $out;
	2025	+ break;
	2026	+ case 'error_log' :
	2027	+ error_log(FeedWordPress::log_prefix().' '.$out);
	2028	+ break;
	2029	+ case 'email' :
	2030	+
	2031	+ if (is_null($persist)) :
	2032	+ $sect = 'occurrent';
	2033	+ $hook = (isset($dlog['mesg'][$sect]) ? count($dlog['mesg'][$sect]) : 0);
	2034	+ $line = array("Time" => time(), "Message" => $out);
	2035	+ else :
	2036	+ $sect = 'persistent';
	2037	+ $hook = md5($level."\n".$persist);
	2038	+ $line = array("Since" => $since, "Message" => $out, "Most Recent" => $mostRecent);
	2039	+ endif;
	2040	+
	2041	+ if (!isset($dlog['mesg'])) : $dlog['mesg'] = array(); endif;
	2042	+ if (!isset($dlog['mesg'][$sect])) : $dlog['mesg'][$sect] = array(); endif;
	2043	+
	2044	+ $dlog['mesg'][$sect][$hook] = $line;
	2045	+ endswitch;
	2046	+ endforeach;
	2047	+ endif;
	2048	+
	2049	+ update_option('feedwordpress_diagnostics_log', $dlog);
	2050	+ } /* FeedWordPress::diagnostic () */
	2051	+
	2052	+ function email_diagnostics_override () {
	2053	+ return ($this->has_secret() and isset($_REQUEST['feedwordpress_email_diagnostics']) and !!$_REQUEST['feedwordpress_email_diagnostics']);
	2054	+ }
	2055	+ function has_emailed_diagnostics ($dlog) {
	2056	+ $ret = false;
	2057	+ if ($this->email_diagnostics_override()
	2058	+ or (isset($dlog['schedule']) and isset($dlog['schedule']['last']))) :
	2059	+ $ret = true;
	2060	+ endif;
	2061	+ return $ret;
	2062	+ }
	2063	+ function ready_to_email_diagnostics ($dlog) {
	2064	+ $ret = false;
	2065	+ if ($this->email_diagnostics_override()
	2066	+ or (time() > ($dlog['schedule']['last'] + $dlog['schedule']['freq']))) :
	2067	+ $ret = true;
	2068	+ endif;
	2069	+ return $ret;
	2070	+ }
	2071	+
	2072	+ function email_diagnostic_log ($params = array()) {
	2073	+ $params = wp_parse_args($params, array(
	2074	+ "force" => false,
	2075	+ ));
1488	2076
1489		-require_once(dirname(__FILE__) . '/relative_uri.class.php');
	2077	+ $dlog = get_option('feedwordpress_diagnostics_log', array());
	2078	+
	2079	+ if ($this->has_emailed_diagnostics($dlog)) :
	2080	+ if ($this->ready_to_email_diagnostics($dlog)) :
	2081	+ // No news is good news; only send if
	2082	+ // there are some messages to send.
	2083	+ $body = NULL;
	2084	+ if (!isset($dlog['mesg'])) : $dlog['mesg'] = array(); endif;
	2085	+
	2086	+ foreach ($dlog['mesg'] as $sect => $mesgs) :
	2087	+ if (count($mesgs) > 0) :
	2088	+ if (is_null($body)) : $body = ''; endif;
	2089	+
	2090	+ $paradigm = reset($mesgs);
	2091	+ $body .= "<h2>".ucfirst($sect)." issues</h2>\n"
	2092	+ ."<table>\n"
	2093	+ ."<thead><tr>\n";
	2094	+ foreach ($paradigm as $col => $value) :
	2095	+ $body .= '<th scope="col">'.$col."</th>\n";
	2096	+ endforeach;
	2097	+ $body .= "</tr></thead>\n"
	2098	+ ."<tbody>\n";
	2099	+
	2100	+ foreach ($mesgs as $line) :
	2101	+ $body .= "<tr>\n";
	2102	+ foreach ($line as $col => $cell) :
	2103	+ if (is_numeric($cell)) :
	2104	+ $cell = date('j-M-y, h:i a', $cell);
	2105	+ endif;
	2106	+ $class = strtolower(preg_replace('/\s+/', '-', $col));
	2107	+ $body .= "<td class=\"$class\">${cell}</td>";
	2108	+ endforeach;
	2109	+ $body .= "</tr>\n";
	2110	+ endforeach;
	2111	+
	2112	+ $body .= "</tbody>\n</table>\n\n";
	2113	+ endif;
	2114	+ endforeach;
	2115	+
	2116	+ $body = apply_filters('feedwordpress_diagnostic_email_body', $body, $dlog);
	2117	+ if (!is_null($body)) :
	2118	+ $home = feedwordpress_display_url(get_bloginfo('url'));
	2119	+ $subj = apply_filters('feedwordpress_diagnostic_email_subject', $home . " syndication issues", $dlog);
	2120	+ $agent = 'FeedWordPress '.FEEDWORDPRESS_VERSION;
	2121	+ $body = <<<EOMAIL
	2122	+<html>
	2123	+<head>
	2124	+<title>$subj</title>
	2125	+<style type="text/css">
	2126	+ body { background-color: white; color: black; }
	2127	+ table { width: 100%; border: 1px solid black; }
	2128	+ table thead tr th { background-color: #ff7700; color: white; border-bottom: 1px solid black; }
	2129	+ table thead tr { border-bottom: 1px solid black; }
	2130	+ table tr { vertical-align: top; }
	2131	+ table .since { width: 20%; }
	2132	+ table .time { width: 20%; }
	2133	+ table .most-recently { width: 20%; }
	2134	+ table .message { width: auto; }
	2135	+</style>
	2136	+</head>
	2137	+<body>
	2138	+<h1>Syndication Issues encountered by $agent on $home</h1>
	2139	+$body
	2140	+</body>
	2141	+</html>
	2142	+
	2143	+EOMAIL;
	2144	+
	2145	+ $ded = get_option('feedwordpress_diagnostics_email_destination', 'admins');
	2146	+
	2147	+ // e-mail address
	2148	+ if (preg_match('/^mailto:(.*)$/', $ded, $ref)) :
	2149	+ $recipients = array($ref[1]);
	2150	+
	2151	+ // userid
	2152	+ elseif (preg_match('/^user:(.*)$/', $ded, $ref)) :
	2153	+ $userdata = get_userdata((int) $ref[1]);
	2154	+ $recipients = array($userdata->user_email);
	2155	+
	2156	+ // admins
	2157	+ else :
	2158	+ $recipients = FeedWordPressDiagnostic::admin_emails();
	2159	+ endif;
	2160	+
	2161	+ $mesgId = 'feedwordpress+'.time().'@'.$home;
	2162	+ $parentId = get_option('feedwordpress_diagnostics_email_root_message_id', NULL);
	2163	+
	2164	+ $head = array("Message-ID: <$mesgId>");
	2165	+ if (!is_null($parentId)) :
	2166	+ // We've already sent off a diagnostic message in the past. Let's do some
	2167	+ // magic to help with threading, in the hopes that all diagnostic messages
	2168	+ // get threaded together.
	2169	+ $head[] = "References: <$parentId>";
	2170	+ $head[] = "In-Reply-To: <$parentId>";
	2171	+ $subj = "Re: ".$subj;
	2172	+ else :
	2173	+ // This is the first of its kind. Let's mark it as such.
	2174	+ update_option('feedwordpress_diagnostics_email_root_message_id', $mesgId);
	2175	+ endif;
	2176	+ $head = apply_filters('feedwordpress_diagnostic_email_headers', $head);
	2177	+
	2178	+ foreach ($recipients as $email) :
	2179	+ add_filter('wp_mail_content_type', array('FeedWordPress', 'allow_html_mail'));
	2180	+ wp_mail($email, $subj, $body, $head);
	2181	+ remove_filter('wp_mail_content_type', array('FeedWordPress', 'allow_html_mail'));
	2182	+ endforeach;
	2183	+ endif;
	2184	+
	2185	+ // Clear the logs
	2186	+ $dlog['mesg']['persistent'] = array();
	2187	+ $dlog['mesg']['occurrent'] = array();
	2188	+
	2189	+ // Set schedule for next update
	2190	+ $dlog['schedule']['last'] = time();
	2191	+ endif;
	2192	+ else :
	2193	+ $dlog['schedule'] = array(
	2194	+ 'freq' => 24 /*hr*/ * 60 /*min*/ * 60 /*s*/,
	2195	+ 'last' => time(),
	2196	+ );
	2197	+ endif;
	2198	+
	2199	+ update_option('feedwordpress_diagnostics_log', $dlog);
	2200	+ } /* FeedWordPress::email_diagnostic_log () */
	2201	+
	2202	+ function allow_html_mail () {
	2203	+ return 'text/html';
	2204	+ } /* FeedWordPress::allow_html_mail () */
	2205	+
	2206	+ function admin_footer () {
	2207	+ global $feedwordpress_admin_footer;
	2208	+ foreach ($feedwordpress_admin_footer as $line) :
	2209	+ echo '<div><pre>'.$line.'</pre></div>';
	2210	+ endforeach;
	2211	+ } /* FeedWordPress::admin_footer () */
	2212	+
	2213	+ function log_prefix ($date = false) {
	2214	+ $home = get_bloginfo('url');
	2215	+ $prefix = '['.feedwordpress_display_url($home).'] [feedwordpress] ';
	2216	+ if ($date) :
	2217	+ $prefix = "[".date('Y-m-d H:i:s')."]".$prefix;
	2218	+ endif;
	2219	+ return $prefix;
	2220	+ } /* FeedWordPress::log_prefix () */
	2221	+
	2222	+ function menu_cap ($sub = false) {
	2223	+ if ($sub) :
	2224	+ $cap = apply_filters('feedwordpress_menu_settings_capacity', 'manage_options');
	2225	+ else :
	2226	+ $cap = apply_filters('feedwordpress_menu_main_capacity', 'manage_links');
	2227	+ endif;
	2228	+ return $cap;
	2229	+ } /* FeedWordPress::menu_cap () */
	2230	+
	2231	+ function path ($filename = '') {
	2232	+ global $fwp_path;
	2233	+
	2234	+ $path = $fwp_path;
	2235	+ if (strlen($filename) > 0) :
	2236	+ $path .= '/'.$filename;
	2237	+ endif;
	2238	+ return $path;
	2239	+ }
	2240	+
	2241	+ // These are superceded by MyPHP::param/post/get/request, but kept
	2242	+ // here for backward compatibility.
	2243	+ function param ($key, $type = 'REQUEST', $default = NULL) {
	2244	+ return MyPHP::param($key, $default, $type);
	2245	+ }
	2246	+ function post ($key, $default = NULL) {
	2247	+ return MyPHP::post($key, $default);
	2248	+ }
	2249	+} // class FeedWordPress
	2250	+
	2251	+$feedwordpress_admin_footer = array();
1490	2252
1491	2253	// take your best guess at the realname and e-mail, given a string
1492	2254	define('FWP_REGEX_EMAIL_ADDY', '([^@"(<\s]+@[^"@(<\s]+\.[^"@(<\s]+)');
1493	2255	define('FWP_REGEX_EMAIL_NAME', '("([^"]*)"|([^"<(]+\S))');