← All changes | feedwordpress.php +1048 -438 2010.0528 → 2012.1212 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: 2012.1212
7	7	Author: Charles Johnson
8	8	Author URI: http://radgeek.com/
9	9	License: GPL
10	10	*/
		@@ -10,15 +10,16 @@
10	10	*/
11	11
12	12	/**
13	13	* @package FeedWordPress
14		- * @version 2010.0528
	14	+ * @version 2012.1212
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	+# - MagpieRSS by Kellan Elliot-McCrea <kellan@protest.net>
20	20	# - Ultra-Liberal Feed Finder by Mark Pilgrim <mark@diveintomark.org>
	21	+# - WordPress Blog Tool and Publishing Platform <http://wordpress.org/>
21	22	# according to the terms of the GNU General Public License.
22	23	#
23	24	# INSTALLATION: see readme.txt or <http://projects.radgeek.com/install>
24	25	#
		@@ -32,11 +33,15 @@
32	33	# or use a cron job.
33	34
34	35	# -- Don't change these unless you know what you're doing...
35	36
36		-define ('FEEDWORDPRESS_VERSION', '2010.0528');
	37	+define ('FEEDWORDPRESS_VERSION', '2012.1212');
37	38	define ('FEEDWORDPRESS_AUTHOR_CONTACT', 'http://radgeek.com/contact');
38	39
	40	+if (!defined('FEEDWORDPRESS_BLEG')) :
	41	+ define ('FEEDWORDPRESS_BLEG', true);
	42	+endif;
	43	+
39	44	// Defaults
40	45	define ('DEFAULT_SYNDICATION_CATEGORY', 'Contributors');
41	46	define ('DEFAULT_UPDATE_PERIOD', 60); // value in minutes
42	47
		@@ -48,8 +53,10 @@
48	53	$feedwordpress_debug = ($feedwordpress_debug == 'yes');
49	54	endif;
50	55	endif;
51	56	define ('FEEDWORDPRESS_DEBUG', $feedwordpress_debug);
	57	+$feedwordpress_compatibility = true;
	58	+define ('FEEDWORDPRESS_COMPATIBILITY', $feedwordpress_compatibility);
52	59
53	60	define ('FEEDWORDPRESS_CAT_SEPARATOR_PATTERN', '/[:\n]/');
54	61	define ('FEEDWORDPRESS_CAT_SEPARATOR', "\n");
55	62
		@@ -57,8 +64,9 @@
57	64
58	65	define ('FEEDWORDPRESS_FRESHNESS_INTERVAL', 10*60); // Every ten minutes
59	66
60	67	define ('FWP_SCHEMA_HAS_USERMETA', 2966);
	68	+define ('FWP_SCHEMA_USES_ARGS_TAXONOMY', 12694); // Revision # for using $args['taxonomy'] to get link categories
61	69	define ('FWP_SCHEMA_20', 3308); // Database schema # for WP 2.0
62	70	define ('FWP_SCHEMA_21', 4772); // Database schema # for WP 2.1
63	71	define ('FWP_SCHEMA_23', 5495); // Database schema # for WP 2.3
64	72	define ('FWP_SCHEMA_25', 7558); // Database schema # for WP 2.5
		@@ -65,8 +73,9 @@
65	73	define ('FWP_SCHEMA_26', 8201); // Database schema # for WP 2.6
66	74	define ('FWP_SCHEMA_27', 9872); // Database schema # for WP 2.7
67	75	define ('FWP_SCHEMA_28', 11548); // Database schema # for WP 2.8
68	76	define ('FWP_SCHEMA_29', 12329); // Database schema # for WP 2.9
	77	+define ('FWP_SCHEMA_30', 12694); // Database schema # for WP 3.0
69	78
70	79	if (FEEDWORDPRESS_DEBUG) :
71	80	// Help us to pick out errors, if any.
72	81	ini_set('error_reporting', E_ALL & ~E_NOTICE);
		@@ -78,15 +87,15 @@
78	87	// make sure FEEDWORDPRESS_DEBUG is FALSE for any site that will be
79	88	// used for more than testing purposes!
80	89	define('FEEDWORDPRESS_CACHE_AGE', 1);
81	90	define('FEEDWORDPRESS_CACHE_LIFETIME', 1);
82		- define('FEEDWORDPRESS_FETCH_TIME_OUT', 60);
	91	+ define('FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT', 60);
83	92	else :
84	93	// Hold onto data all day for conditional GET purposes,
85	94	// but consider it stale after 1 min (requiring a conditional GET)
86	95	define('FEEDWORDPRESS_CACHE_LIFETIME', 24*60*60);
87	96	define('FEEDWORDPRESS_CACHE_AGE', 1*60);
88		- define('FEEDWORDPRESS_FETCH_TIME_OUT', 10);
	97	+ define('FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT', 20);
89	98	endif;
90	99
91	100	// Use our the cache settings that we want.
92	101	add_filter('wp_feed_cache_transient_lifetime', array('FeedWordPress', 'cache_lifetime'));
		@@ -92,33 +101,45 @@
92	101	add_filter('wp_feed_cache_transient_lifetime', array('FeedWordPress', 'cache_lifetime'));
93	102
94	103	// Ensure that we have SimplePie loaded up and ready to go.
95	104	// We no longer need a MagpieRSS upgrade module. Hallelujah!
96		-require_once(ABSPATH . WPINC . '/feed.php');
	105	+if (!class_exists('SimplePie')) :
	106	+ require_once(ABSPATH . WPINC . '/class-simplepie.php');
	107	+endif;
	108	+require_once(ABSPATH . WPINC . '/class-feed.php');
97	109
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;
	110	+if (!function_exists('wp_insert_user')) :
	111	+ require_once (ABSPATH . WPINC . '/registration.php'); // for wp_insert_user
108	112	endif;
109	113
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');
	114	+$dir = dirname(__FILE__);
	115	+require_once("${dir}/admin-ui.php");
	116	+require_once("${dir}/feedwordpresssyndicationpage.class.php");
	117	+require_once("${dir}/compatability.php"); // Legacy API
	118	+require_once("${dir}/syndicatedpost.class.php");
	119	+require_once("${dir}/syndicatedlink.class.php");
	120	+require_once("${dir}/feedwordpresshtml.class.php");
	121	+require_once("${dir}/feedwordpress-content-type-sniffer.class.php");
	122	+require_once("${dir}/inspectpostmeta.class.php");
	123	+require_once("${dir}/syndicationdataqueries.class.php");
	124	+require_once("${dir}/feedwordpie.class.php");
	125	+require_once("${dir}/feedwordpie_item.class.php");
	126	+require_once("${dir}/feedwordpress_file.class.php");
	127	+require_once("${dir}/feedwordpress_parser.class.php");
	128	+require_once("${dir}/feedwordpressrpc.class.php");
	129	+require_once("${dir}/feedwordpresshttpauthenticator.class.php");
112	130
113	131	// Magic quotes are just about the stupidest thing ever.
114	132	if (is_array($_POST)) :
115		- $fwp_post = stripslashes_deep($_POST);
	133	+ $fwp_post = $_POST;
	134	+ if (get_magic_quotes_gpc()) :
	135	+ $fwp_post = stripslashes_deep($fwp_post);
	136	+ endif;
116	137	endif;
117	138
118	139	// Get the path relative to the plugins directory in which FWP is stored
119	140	preg_match (
120		- '|/wp-content/plugins/(.+)$|',
	141	+ '|'.preg_quote(WP_PLUGIN_DIR).'/(.+)$|',
121	142	dirname(__FILE__),
122	143	$ref
123	144	);
124	145
		@@ -127,39 +148,8 @@
127	148	else : // Something went wrong. Let's just guess.
128	149	$fwp_path = 'feedwordpress';
129	150	endif;
130	151
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	152	if (!FeedWordPress::needs_upgrade()) : // only work if the conditions are safe!
163	153
164	154	# Syndicated items are generally received in output-ready (X)HTML and
165	155	# should not be folded, crumpled, mutilated, or spindled by WordPress
		@@ -179,9 +169,9 @@
179	169
180	170	add_action('atom_entry', 'feedwordpress_item_feed_data');
181	171
182	172	# Filter in original permalinks if the user wants that
183		- add_filter('post_link', 'syndication_permalink', 1);
	173	+ add_filter('post_link', 'syndication_permalink', /*priority=*/ 1, /*arguments=*/ 3);
184	174
185	175	# When foreign URLs are used for permalinks in feeds or display
186	176	# contexts, they need to be escaped properly.
187	177	add_filter('the_permalink', 'syndication_permalink_escaped');
		@@ -196,8 +186,9 @@
196	186	remove_filter('pre_link_rss', 'wp_filter_kses');
197	187	remove_filter('pre_link_url', 'wp_filter_kses');
198	188
199	189	# Admin menu
	190	+ add_action('admin_init', array('feedwordpress', 'admin_init'));
200	191	add_action('admin_menu', 'fwp_add_pages');
201	192	add_action('admin_notices', 'fwp_check_debug');
202	193
203	194	add_action('admin_menu', 'feedwordpress_add_post_edit_controls');
		@@ -202,11 +193,13 @@
202	193
203	194	add_action('admin_menu', 'feedwordpress_add_post_edit_controls');
204	195	add_action('save_post', 'feedwordpress_save_post_edit_controls');
205	196
	197	+ add_action('admin_footer', array('FeedWordPress', 'admin_footer'));
	198	+
206	199	# Inbound XML-RPC update methods
207		- add_filter('xmlrpc_methods', 'feedwordpress_xmlrpc_hook');
208		-
	200	+ $feedwordpressRPC = new FeedWordPressRPC;
	201	+
209	202	# Outbound XML-RPC ping reform
210	203	remove_action('publish_post', 'generic_ping'); // WP 1.5.x
211	204	remove_action('do_pings', 'do_all_pings', 10, 1); // WP 2.1, 2.2
212	205	remove_action('publish_post', '_publish_post_hook', 5, 1); // WP 2.3
		@@ -215,39 +208,25 @@
215	208	add_action('do_pings', 'fwp_do_pings', 10, 1);
216	209	add_action('feedwordpress_update', 'fwp_hold_pings');
217	210	add_action('feedwordpress_update_complete', 'fwp_release_pings');
218	211
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;
	212	+ add_action('syndicated_feed_error', array('FeedWordPressDiagnostic', 'feed_error'), 100, 3);
	213	+
	214	+ add_action('wp_footer', 'debug_out_feedwordpress_footer', -100);
	215	+ add_action('admin_footer', 'debug_out_feedwordpress_footer', -100);
228	216
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;
	217	+ $feedwordpress = new FeedWordPress;
237	218
238		- add_action('feedwordpress_check_feed_complete', 'debug_out_feedwordpress_feed_error', 100, 3);
239		- endif;
240		-
241	219	# Cron-less auto-update. Hooray!
242		- $autoUpdateHook = get_option('feedwordpress_automatic_updates');
243		- if ($autoUpdateHook != 'init') :
244		- $autoUpdateHook = 'shutdown';
	220	+ $autoUpdateHook = $feedwordpress->automatic_update_hook();
	221	+ if (!is_null($autoUpdateHook)) :
	222	+ add_action($autoUpdateHook, array($feedwordpress, 'auto_update'));
245	223	endif;
246		- add_action($autoUpdateHook, 'feedwordpress_auto_update');
	224	+
	225	+ add_action('init', array($feedwordpress, 'init'));
	226	+ add_action('shutdown', array($feedwordpress, 'email_diagnostic_log'));
	227	+ add_action('wp_dashboard_setup', array($feedwordpress, 'dashboard_setup'));
247	228
248		- add_action('init', 'feedwordpress_update_magic_url');
249		-
250	229	# Default sanitizers
251	230	add_filter('syndicated_item_content', array('SyndicatedPost', 'resolve_relative_uris'), 0, 2);
252	231	add_filter('syndicated_item_content', array('SyndicatedPost', 'sanitize_content'), 0, 2);
253	232
		@@ -255,127 +234,78 @@
255	234	# Hook in the menus, which will just point to the upgrade interface
256	235	add_action('admin_menu', 'fwp_add_pages');
257	236	endif; // if (!FeedWordPress::needs_upgrade())
258	237
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	238	################################################################################
301	239	## LOGGING FUNCTIONS: log status updates to error_log if you want it ###########
302	240	################################################################################
303	241
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		-}
	242	+class FeedWordPressDiagnostic {
	243	+ function feed_error ($error, $old, $link) {
	244	+ $wpError = $error['object'];
	245	+ $url = $link->uri();
	246	+
	247	+ $mesgs = $wpError->get_error_messages();
	248	+ foreach ($mesgs as $mesg) :
	249	+ $mesg = esc_html($mesg);
	250	+ FeedWordPress::diagnostic(
	251	+ 'updated_feeds:errors',
	252	+ "Feed Error: [${url}] update returned error: $mesg"
	253	+ );
	254	+
	255	+ $hours = get_option('feedwordpress_diagnostics_persistent_errors_hours', 2);
	256	+ $span = ($error['ts'] - $error['since']);
309	257
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		-}
	258	+ if ($span >= ($hours * 60 * 60)) :
	259	+ $since = date('r', $error['since']);
	260	+ $mostRecent = date('r', $error['ts']);
	261	+ FeedWordPress::diagnostic(
	262	+ 'updated_feeds:errors:persistent',
	263	+ "Feed Update Error: [${url}] returning errors"
	264	+ ." since ${since}:<br/><code>$mesg</code>",
	265	+ $url, $error['since'], $error['ts']
	266	+ );
	267	+ endif;
	268	+ endforeach;
	269	+ }
316	270
317		-function log_feedwordpress_update_feeds ($uri) {
318		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] update('$uri')");
319		-}
	271	+ function admin_emails ($id = '') {
	272	+ $users = get_users_of_blog($id);
	273	+ $recipients = array();
	274	+ foreach ($users as $user) :
	275	+ $user_id = (isset($user->user_id) ? $user->user_id : $user->ID);
	276	+ $dude = new WP_User($user_id);
	277	+ if ($dude->has_cap('administrator')) :
	278	+ if ($dude->user_email) :
	279	+ $recipients[] = $dude->user_email;
	280	+ endif;
	281	+ endif;
	282	+ endforeach;
	283	+ return $recipients;
	284	+ }
	285	+} /* class FeedWordPressDiagnostic */
320	286
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>");
	287	+function debug_out_human_readable_bytes ($quantity) {
	288	+ $quantity = (int) $quantity;
	289	+ $magnitude = 'B';
	290	+ $orders = array('KB', 'MB', 'GB', 'TB');
	291	+ while (($quantity > (1024*100)) and (count($orders) > 0)) :
	292	+ $quantity = floor($quantity / 1024);
	293	+ $magnitude = array_shift($orders);
	294	+ endwhile;
	295	+ return "${quantity} ${magnitude}";
324	296	}
325	297
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;
	298	+function debug_out_feedwordpress_footer () {
	299	+ if (FeedWordPress::diagnostic_on('memory_usage')) :
	300	+ if (function_exists('memory_get_usage')) :
	301	+ FeedWordPress::diagnostic ('memory_usage', "Memory: Current usage: ".debug_out_human_readable_bytes(memory_get_usage()));
	302	+ endif;
	303	+ if (function_exists('memory_get_peak_usage')) :
	304	+ FeedWordPress::diagnostic ('memory_usage', "Memory: Peak usage: ".debug_out_human_readable_bytes(memory_get_peak_usage()));
	305	+ endif;
376	306	endif;
377		-}
	307	+} /* debug_out_feedwordpress_footer() */
378	308
379	309	################################################################################
380	310	## TEMPLATE API: functions to make your templates syndication-aware ############
381	311	################################################################################
		@@ -392,34 +322,16 @@
392	322	function is_syndicated ($id = NULL) {
393	323	return (strlen(get_syndication_feed_id($id)) > 0);
394	324	} /* function is_syndicated() */
395	325
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	326	function feedwordpress_display_url ($url, $before = 60, $after = 0) {
417	327	$bits = parse_url($url);
418	328
419	329	// Strip out crufty subdomains
420		- $bits['host'] = preg_replace('/^www[0-9]*\./i', '', $bits['host']);
421		-
	330	+ if (isset($bits['host'])) :
	331	+ $bits['host'] = preg_replace('/^www[0-9]*\./i', '', $bits['host']);
	332	+ endif;
	333	+
422	334	// Reassemble bit-by-bit with minimum of crufty elements
423	335	$url = (isset($bits['user'])?$bits['user'].'@':'')
424	336	.(isset($bits['host'])?$bits['host']:'')
425	337	.(isset($bits['path'])?$bits['path']:'')
		@@ -430,97 +342,68 @@
430	342	$url = substr($url, 0, $before).'…'.substr($url, 0 - $after, $after);
431	343	endif;
432	344
433	345	return $url;
434		-}
	346	+} /* feedwordpress_display_url () */
435	347
436		-function get_syndication_source ($original = NULL, $id = NULL) {
	348	+function get_syndication_source_property ($original, $id, $local, $remote = NULL) {
	349	+ $ret = NULL;
437	350	if (is_null($original)) :
438	351	$original = FeedWordPress::use_aggregator_source_data();
439	352	endif;
440		-
441		- if ($original) :
442		- $vals = get_post_custom_values('syndication_source_original', $id);
443		- else :
444		- $vals = array();
	353	+
	354	+ if (is_null($remote)) :
	355	+ $remote = $local . '_original';
445	356	endif;
446	357
447		- if (count($vals) == 0) :
448		- $vals = get_post_custom_values('syndication_source', $id);
	358	+ $vals = ($original ? get_post_custom_values($remote, $id) : array());
	359	+ if (count($vals) < 1) :
	360	+ $vals = get_post_custom_values($local, $id);
449	361	endif;
450	362
451	363	if (count($vals) > 0) :
452	364	$ret = $vals[0];
453		- else :
454		- $ret = NULL;
455	365	endif;
	366	+ return $ret;
	367	+} /* function get_syndication_source_property () */
456	368
457		- if (is_null($ret) or strlen(trim($ret)) == 0) :
458		- // Fall back to URL of blog
	369	+function the_syndication_source_link ($original = NULL, $id = NULL) { echo get_syndication_source_link($original, $id); }
	370	+function get_syndication_source_link ($original = NULL, $id = NULL) {
	371	+ return get_syndication_source_property($original, $id, 'syndication_source_uri');
	372	+} /* function get_syndication_source_link() */
	373	+
	374	+function the_syndication_source ($original = NULL, $id = NULL) { echo get_syndication_source($original, $id); }
	375	+function get_syndication_source ($original = NULL, $id = NULL) {
	376	+ $ret = get_syndication_source_property($original, $id, 'syndication_source');
	377	+ if (is_null($ret) or strlen(trim($ret)) == 0) : // Fall back to URL of blog
459	378	$ret = feedwordpress_display_url(get_syndication_source_link());
460	379	endif;
461		-
462	380	return $ret;
463	381	} /* function get_syndication_source() */
464	382
465		-function the_syndication_source ($original = NULL, $id = NULL) { echo get_syndication_source($original, $id); }
466		-
	383	+function the_syndication_feed ($original = NULL, $id = NULL) { echo get_syndication_feed($original, $id); }
467	384	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;
	385	+ return get_syndication_source_property($original, $id, 'syndication_feed');
481	386	} /* function get_syndication_feed() */
482	387
483		-function the_syndication_feed ($original = NULL, $id = NULL) { echo get_syndication_feed($original, $id); }
484		-
	388	+function the_syndication_feed_guid ($original = NULL, $id = NULL) { echo get_syndication_feed_guid($original, $id); }
485	389	function get_syndication_feed_guid ($original = NULL, $id = NULL) {
486		- if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data();
	390	+ $ret = get_syndication_source_property($original, $id, 'syndication_source_id');
	391	+ if (is_null($ret) or strlen(trim($ret))==0) : // Fall back to URL of feed
	392	+ $ret = get_syndication_feed();
487	393	endif;
488		-
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;
497		-
498	394	return $ret;
499	395	} /* function get_syndication_feed_guid () */
500	396
501		-function the_syndication_feed_guid ($original = NULL, $id = NULL) { echo get_syndication_feed_guid($original, $id); }
502		-
503	397	function get_syndication_feed_id ($id = NULL) { list($u) = get_post_custom_values('syndication_feed_id', $id); return $u; }
504	398	function the_syndication_feed_id ($id = NULL) { echo get_syndication_feed_id($id); }
505	399
506		-$feedwordpress_linkcache = array (); // only load links from database once
507	400	function get_syndication_feed_object ($id = NULL) {
508		- global $feedwordpress_linkcache;
509		-
510		- $link = NULL;
511		-
	401	+ global $feedwordpress;
	402	+
512	403	$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		-}
	404	+ return $feedwordpress->subscription($feed_id);
	405	+} /* function get_syndication_feed_object() */
523	406
524	407	function get_feed_meta ($key, $id = NULL) {
525	408	$ret = NULL;
526	409
		@@ -528,9 +411,9 @@
528	411	if (is_object($link) and isset($link->settings[$key])) :
529	412	$ret = $link->settings[$key];
530	413	endif;
531	414	return $ret;
532		-} /* get_feed_meta() */
	415	+} /* function get_feed_meta() */
533	416
534	417	function get_syndication_permalink ($id = NULL) {
535	418	list($u) = get_post_custom_values('syndication_permalink', $id); return $u;
536	419	}
		@@ -647,30 +530,43 @@
647	530	* @return string The new permalink. Same as the old if the post is not
648	531	* syndicated, or if FWP is set to use internal permalinks, or if the post
649	532	* was syndicated, but didn't have a proper permalink recorded.
650	533	*
651		- * @uses FeedWordPress::munge_permalinks()
	534	+ * @uses SyndicatedLink::setting()
652	535	* @uses get_syndication_permalink()
	536	+ * @uses get_syndication_feed_object()
	537	+ * @uses url_to_postid()
	538	+ * @global $id
653	539	* @global $feedwordpress_the_original_permalink
654		- */
655		-function syndication_permalink ($permalink = '') {
	540	+ */
	541	+function syndication_permalink ($permalink = '', $post = null, $leavename = false) {
	542	+ global $id;
656	543	global $feedwordpress_the_original_permalink;
657	544
658	545	// Save the local permalink in case we need to retrieve it later.
659	546	$feedwordpress_the_original_permalink = $permalink;
660	547
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);
	548	+ if (is_object($post) and isset($post->ID) and !empty($post->ID)) :
	549	+ // Use the post ID we've been provided with.
	550	+ $postId = $post->ID;
	551	+ elseif (is_string($permalink) and strlen($permalink) > 0) :
	552	+ // Map this permalink to a post ID so we can get the correct
	553	+ // permalink even outside of the Post Loop. Props Björn.
	554	+ $postId = url_to_postid($permalink);
	555	+ else :
	556	+ // If the permalink string is empty but Post Loop context
	557	+ // provides an id.
	558	+ $postId = $id;
	559	+ endif;
664	560
665	561	$munge = false;
666		- $link = get_syndication_feed_object($id);
	562	+ $link = get_syndication_feed_object($postId);
667	563	if (is_object($link)) :
668	564	$munge = ($link->setting('munge permalink', 'munge_permalink', 'yes') != 'no');
669	565	endif;
670	566
671	567	if ($munge):
672		- $uri = get_syndication_permalink($id);
	568	+ $uri = get_syndication_permalink($postId);
673	569	$permalink = ((strlen($uri) > 0) ? $uri : $permalink);
674	570	endif;
675	571	return $permalink;
676	572	} /* function syndication_permalink () */
		@@ -686,8 +582,9 @@
686	582	* @uses FeedWordPress::munge_permalinks()
687	583	*
688	584	*/
689	585	function syndication_permalink_escaped ($permalink) {
	586	+ /* FIXME: This should review link settings not just global settings */
690	587	if (is_syndicated() and FeedWordPress::munge_permalinks()) :
691	588	// This is a foreign link; WordPress can't vouch for its not
692	589	// having any entities that need to be &-escaped. So we'll do
693	590	// it here.
		@@ -764,23 +661,61 @@
764	661	## ADMIN MENU ADD-ONS: register Dashboard management pages #####################
765	662	################################################################################
766	663
767	664	function fwp_add_pages () {
768		- global $fwp_capability;
769		- global $fwp_path;
	665	+ $menu_cap = FeedWordPress::menu_cap();
	666	+ $settings_cap = FeedWordPress::menu_cap(/*sub=*/ true);
	667	+ $syndicationMenu = FeedWordPress::path('syndication.php');
	668	+
	669	+ add_menu_page(
	670	+ 'Syndicated Sites', 'Syndication',
	671	+ $menu_cap,
	672	+ $syndicationMenu,
	673	+ NULL,
	674	+ WP_PLUGIN_URL.'/'.FeedWordPress::path('feedwordpress-tiny.png')
	675	+ );
770	676
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;
	677	+ do_action('feedwordpress_admin_menu_pre_feeds', $menu_cap, $settings_cap);
	678	+ add_submenu_page(
	679	+ $syndicationMenu, 'Syndicated Sites', 'Syndicated Sites',
	680	+ $settings_cap, $syndicationMenu
	681	+ );
776	682
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');
	683	+ do_action('feedwordpress_admin_menu_pre_feeds', $menu_cap, $settings_cap);
	684	+ add_submenu_page(
	685	+ $syndicationMenu, 'Syndicated Feeds & Updates', 'Feeds & Updates',
	686	+ $settings_cap, FeedWordPress::path('feeds-page.php')
	687	+ );
	688	+
	689	+ do_action('feedwordpress_admin_menu_pre_posts', $menu_cap, $settings_cap);
	690	+ add_submenu_page(
	691	+ $syndicationMenu, 'Syndicated Posts & Links', 'Posts & Links',
	692	+ $settings_cap, FeedWordPress::path('posts-page.php')
	693	+ );
	694	+
	695	+ do_action('feedwordpress_admin_menu_pre_authors', $menu_cap, $settings_cap);
	696	+ add_submenu_page(
	697	+ $syndicationMenu, 'Syndicated Authors', 'Authors',
	698	+ $settings_cap, FeedWordPress::path('authors-page.php')
	699	+ );
	700	+
	701	+ do_action('feedwordpress_admin_menu_pre_categories', $menu_cap, $settings_cap);
	702	+ add_submenu_page(
	703	+ $syndicationMenu, 'Categories & Tags', 'Categories & Tags',
	704	+ $settings_cap, FeedWordPress::path('categories-page.php')
	705	+ );
	706	+
	707	+ do_action('feedwordpress_admin_menu_pre_performance', $menu_cap, $settings_cap);
	708	+ add_submenu_page(
	709	+ $syndicationMenu, 'FeedWordPress Performance', 'Performance',
	710	+ $settings_cap, FeedWordPress::path('performance-page.php')
	711	+ );
	712	+
	713	+ do_action('feedwordpress_admin_menu_pre_diagnostics', $menu_cap, $settings_cap);
	714	+ add_submenu_page(
	715	+ $syndicationMenu, 'FeedWordPress Diagnostics', 'Diagnostics',
	716	+ $settings_cap, FeedWordPress::path('diagnostics-page.php')
	717	+ );
783	718	} /* function fwp_add_pages () */
784	719
785	720	function fwp_check_debug () {
786	721	// This is a horrible fucking kludge that I have to do because the
		@@ -861,9 +796,18 @@
861	796	endif;
862	797	}
863	798
864	799	function feedwordpress_add_post_edit_controls () {
	800	+ global $feedwordpress;
	801	+
	802	+ // Put in Manual Editing checkbox
865	803	add_meta_box('feedwordpress-post-controls', __('Syndication'), 'feedwordpress_post_edit_controls', 'post', 'side', 'high');
	804	+
	805	+ add_filter('user_can_richedit', array($feedwordpress, 'user_can_richedit'), 1000, 1);
	806	+
	807	+ if (FeedWordPress::diagnostic_on('syndicated_posts:static_meta_data')) :
	808	+ $GLOBALS['inspectPostMeta'] = new InspectPostMeta;
	809	+ endif;
866	810	} // function FeedWordPress::postEditControls
867	811
868	812	function feedwordpress_post_edit_controls () {
869	813	global $post;
		@@ -909,14 +853,16 @@
909	853	endif;
910	854
911	855	// OK, we're golden. Now let's save some data.
912	856	if (isset($_POST['freeze_updates'])) :
913		- update_post_meta($post_id, '_syndication_freeze_updates', $_POST['freeze_updates']);
	857	+ update_post_meta($post_id, '_syndication_freeze_updates', $_POST['freeze_updates']);
	858	+ $ret = $_POST['freeze_updates'];
914	859	else :
915	860	delete_post_meta($post_id, '_syndication_freeze_updates');
	861	+ $ret = NULL;
916	862	endif;
917	863
918		- return $_POST['freeze_updates'];
	864	+ return $ret;
919	865	} // function feedwordpress_save_edit_controls
920	866
921	867	################################################################################
922	868	## class FeedWordPress #########################################################
		@@ -956,18 +902,55 @@
956	902	array('script', 'src')
957	903	);
958	904
959	905	var $feeds = NULL;
960		-
	906	+ var $feedurls = NULL;
	907	+ var $httpauth = NULL;
	908	+
961	909	# function FeedWordPress (): Contructor; retrieve a list of feeds
962	910	function FeedWordPress () {
963	911	$this->feeds = array ();
	912	+ $this->feedurls = array();
964	913	$links = FeedWordPress::syndicated_links();
965	914	if ($links): foreach ($links as $link):
966		- $this->feeds[] = new SyndicatedLink($link);
	915	+ $id = intval($link->link_id);
	916	+ $url = $link->link_rss;
	917	+
	918	+ // Store for later reference.
	919	+ $this->feeds[$id] = $id;
	920	+ if (strlen($url) > 0) :
	921	+ $this->feedurls[$url] = $id;
	922	+ endif;
967	923	endforeach; endif;
	924	+
	925	+ $this->httpauth = new FeedWordPressHTTPAuthenticator;
968	926	} // FeedWordPress::FeedWordPress ()
969	927
	928	+ function subscribed ($id) {
	929	+ return (isset($this->feedurls[$id]) or isset($this->feeds[$id]));
	930	+ } /* FeedWordPress::subscribed () */
	931	+
	932	+ function subscription ($which) {
	933	+ $sub = NULL;
	934	+
	935	+ if (is_string($which) and isset($this->feedurls[$which])) :
	936	+ $which = $this->feedurls[$which];
	937	+ endif;
	938	+
	939	+ if (isset($this->feeds[$which])) :
	940	+ $sub = $this->feeds[$which];
	941	+ endif;
	942	+
	943	+ // Load 'er up if you haven't already.
	944	+ if (!is_null($sub) and !($sub InstanceOf SyndicatedLink)) :
	945	+ $link = new SyndicatedLink($sub);
	946	+ $this->feeds[$which] = $link;
	947	+ $sub = $link;
	948	+ endif;
	949	+
	950	+ return $sub;
	951	+ } /* FeedWordPress::subscriptions () */
	952	+
970	953	# function update (): polls for updates on one or more Contributor feeds
971	954	#
972	955	# Arguments:
973	956	# ----------
		@@ -1022,11 +1005,18 @@
1022	1005	if (FeedWordPress::needs_upgrade()) : // Will make duplicate posts if we don't hold off
1023	1006	return NULL;
1024	1007	endif;
1025	1008
1026		- if (!is_null($uri)) :
	1009	+ if (!is_null($uri) and $uri != '*') :
1027	1010	$uri = trim($uri);
1028	1011	else : // Update all
	1012	+ if ($this->update_hooked) :
	1013	+ $diag = $this->update_hooked;
	1014	+ else :
	1015	+ $diag = 'Initiating a MANUAL check-in on the update schedule at '.date('r', time());
	1016	+ endif;
	1017	+ $this->diagnostic('update_schedule:check', $diag);
	1018	+
1029	1019	update_option('feedwordpress_last_update_all', time());
1030	1020	endif;
1031	1021
1032	1022	do_action('feedwordpress_update', $uri);
		@@ -1031,27 +1021,46 @@
1031	1021
1032	1022	do_action('feedwordpress_update', $uri);
1033	1023
1034	1024	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;
	1025	+ $crash_ts = $this->crash_ts();
1041	1026	endif;
1042	1027
1043	1028	// Randomize order for load balancing purposes
1044		- $feed_set = $this->feeds;
	1029	+ $feed_set = array_keys($this->feeds);
1045	1030	shuffle($feed_set);
1046	1031
	1032	+ $updateWindow = (int) get_option('feedwordpress_update_window', DEFAULT_UPDATE_PERIOD) * 60 /* sec/min */;
	1033	+ $interval = (int) get_option('feedwordpress_freshness', FEEDWORDPRESS_FRESHNESS_INTERVAL);
	1034	+ $portion = max(
	1035	+ (int) ceil(count($feed_set) / ($updateWindow / $interval)),
	1036	+ 10
	1037	+ );
	1038	+
	1039	+ $max_polls = apply_filters('feedwordpress_polls_per_update', get_option(
	1040	+ 'feedwordpress_polls_per_update', $portion
	1041	+ ), $uri);
	1042	+
	1043	+ $feed_set = apply_filters('feedwordpress_update_feeds', $feed_set, $uri);
	1044	+
	1045	+
1047	1046	// 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
	1047	+ $delta = NULL; $remaining = $max_polls;
	1048	+ foreach ($feed_set as $feed_id) :
	1049	+
	1050	+ $feed = $this->subscription($feed_id);
	1051	+
	1052	+ // Has this process overstayed its welcome?
	1053	+ if (
	1054	+ // Over time limit?
	1055	+ (!is_null($crash_ts) and (time() > $crash_ts))
	1056	+
	1057	+ // Over feed count?
	1058	+ or ($remaining == 0)
	1059	+ ) :
1051	1060	break;
1052	1061	endif;
1053		-
	1062	+
1054	1063	$pinged_that = (is_null($uri) or ($uri=='*') or in_array($uri, array($feed->uri(), $feed->homepage())));
1055	1064
1056	1065	if (!is_null($uri)) : // A site-specific ping always updates
1057	1066	$timely = true;
		@@ -1058,13 +1067,15 @@
1058	1067	else :
1059	1068	$timely = $feed->stale();
1060	1069	endif;
1061	1070
1062		- if ($pinged_that and is_null($delta)) : // If at least one feed was hit for updating...
	1071	+ if ($pinged_that and is_null($delta)) : // If at least one feed was hit for updating...
1063	1072	$delta = array('new' => 0, 'updated' => 0); // ... don't return error condition
1064	1073	endif;
1065	1074
1066	1075	if ($pinged_that and $timely) :
	1076	+ $remaining = $remaining - 1;
	1077	+
1067	1078	do_action('feedwordpress_check_feed', $feed->settings);
1068	1079	$start_ts = time();
1069	1080	$added = $feed->poll($crash_ts);
1070	1081	do_action('feedwordpress_check_feed_complete', $feed->settings, $added, time() - $start_ts);
		@@ -1080,14 +1091,91 @@
1080	1091
1081	1092	return $delta;
1082	1093	}
1083	1094
	1095	+ function crash_ts ($default = NULL) {
	1096	+ $crash_dt = (int) get_option('feedwordpress_update_time_limit', 0);
	1097	+ if ($crash_dt > 0) :
	1098	+ $crash_ts = time() + $crash_dt;
	1099	+ else :
	1100	+ $crash_ts = $default;
	1101	+ endif;
	1102	+ return $crash_ts;
	1103	+ }
	1104	+
	1105	+ function secret_key () {
	1106	+ $secret = get_option('feedwordpress_secret_key', false);
	1107	+ if (!$secret) : // Generate random key.
	1108	+ $secret = substr(md5(uniqid(microtime())), 0, 6);
	1109	+ update_option('feedwordpress_secret_key', $secret);
	1110	+ endif;
	1111	+ return $secret;
	1112	+ }
	1113	+
	1114	+ function has_secret () {
	1115	+ return ($this->by_request('feedwordpress_key', $this->secret_key()));
	1116	+ }
	1117	+
	1118	+ // Utility function so I don't have to repeat myself w/ 1,000,003 isset()'s
	1119	+ function by_request ($param, $eq = NULL) {
	1120	+ $match = false;
	1121	+ if (isset($_REQUEST[$param])) :
	1122	+ $match = (is_null($eq) ? $_REQUEST[$param] : ($eq==$_REQUEST[$param]));
	1123	+ endif;
	1124	+ return $match;
	1125	+ }
	1126	+
	1127	+ var $update_hooked = NULL;
	1128	+ function automatic_update_hook ($params = array()) {
	1129	+ $params = wp_parse_args($params, array( // Defaults
	1130	+ 'setting only' => false,
	1131	+ ));
	1132	+ $hook = get_option('feedwordpress_automatic_updates', NULL);
	1133	+ $method = 'FeedWordPress option';
	1134	+
	1135	+ // Allow for forced behavior in testing.
	1136	+ if (
	1137	+ !$params['setting only']
	1138	+ and $this->has_secret()
	1139	+ and $this->by_request('automatic_update')
	1140	+ ) :
	1141	+ $hook = $_REQUEST['automatic_update'];
	1142	+ $method = 'URL parameter';
	1143	+ endif;
	1144	+
	1145	+ $exact = $hook; // Before munging
	1146	+
	1147	+ if (!!$hook) :
	1148	+ if ($hook != 'init') : // Constrain values.
	1149	+ $hook = 'shutdown';
	1150	+ endif;
	1151	+ endif;
	1152	+
	1153	+ if ($hook) :
	1154	+ $this->update_hooked = "Initiating an AUTOMATIC CHECK FOR UPDATES ON PAGE LOAD ".$hook." due to ".$method." = ".trim($this->val($exact));
	1155	+ endif;
	1156	+
	1157	+ return $hook;
	1158	+ }
	1159	+ function last_update_all () {
	1160	+ $last = get_option('feedwordpress_last_update_all');
	1161	+ if ($this->has_secret() and $this->by_request('automatic_update')) :
	1162	+ $last = 1; // A long, long time ago.
	1163	+ elseif ($this->has_secret() and $this->by_request('last_update_all')) :
	1164	+ $last = $_REQUEST['last_update_all'];
	1165	+ endif;
	1166	+ return $last;
	1167	+ }
	1168	+ function force_update_all () {
	1169	+ return ($this->has_secret() and $this->by_request('force_update_feeds'));
	1170	+ }
	1171	+
1084	1172	function stale () {
1085		- if (get_option('feedwordpress_automatic_updates')) :
	1173	+ if (!is_null($this->automatic_update_hook())) :
1086	1174	// Do our best to avoid possible simultaneous
1087	1175	// updates by getting up-to-the-minute settings.
1088	1176
1089		- $last = get_option('feedwordpress_last_update_all');
	1177	+ $last = $this->last_update_all();
1090	1178
1091	1179	// If we haven't updated all yet, give it a time window
1092	1180	if (false === $last) :
1093	1181	$ret = false;
		@@ -1098,13 +1186,13 @@
1098	1186	$freshness = get_option('feedwordpress_freshness');
1099	1187	if (false === $freshness) : // Use default
1100	1188	$freshness = FEEDWORDPRESS_FRESHNESS_INTERVAL;
1101	1189	endif;
1102		- $ret = ( (time() - $last) > $freshness);
1103		-
1104		- // This should never happen.
	1190	+ $ret = ( (time() - $last) > $freshness );
	1191	+
	1192	+ // This should never happen.
1105	1193	else :
1106		- FeedWordPress::critical_bug('FeedWordPress::stale::last', $last, __LINE__);
	1194	+ FeedWordPress::critical_bug('FeedWordPress::stale::last', $last, __LINE__, __FILE__);
1107	1195	endif;
1108	1196
1109	1197	else :
1110	1198	$ret = false;
		@@ -1110,69 +1198,260 @@
1110	1198	$ret = false;
1111	1199	endif;
1112	1200	return $ret;
1113	1201	} // FeedWordPress::stale()
	1202	+
	1203	+ static function admin_init () {
	1204	+ // WordPress 3.5+ compat: the WP devs are in the midst of removing Links from the WordPress core. Eventually we'll have to deal
	1205	+ // with the possible disappearance of the wp_links table as a whole; but in the meantime, we just need to turn on the interface
	1206	+ // element to avoid problems with user capabilities that presume the presence of the Links Manager in the admin UI.
	1207	+ if (!intval(get_option('link_manager_enabled', false))) :
	1208	+ update_option('link_manager_enabled', true);
	1209	+ endif;
	1210	+ } /* FeedWordPress::admin_init() */
	1211	+
	1212	+ function init () {
	1213	+ global $fwp_path;
	1214	+
	1215	+ // If this is a FeedWordPress admin page, queue up scripts for AJAX
	1216	+ // functions that FWP uses. If it is a display page or a non-FWP admin
	1217	+ // page, don't.
	1218	+ wp_register_style('feedwordpress-elements', WP_PLUGIN_URL.'/'.$fwp_path.'/feedwordpress-elements.css');
	1219	+ if (FeedWordPressSettingsUI::is_admin()) :
	1220	+ // For JavaScript that needs to be generated dynamically
	1221	+ add_action('admin_print_scripts', array('FeedWordPressSettingsUI', 'admin_scripts'));
	1222	+
	1223	+ // For CSS that needs to be generated dynamically.
	1224	+ add_action('admin_print_styles', array('FeedWordPressSettingsUI', 'admin_styles'));
	1225	+
	1226	+ wp_enqueue_style('dashboard');
	1227	+ wp_enqueue_style('feedwordpress-elements');
	1228	+
	1229	+ /*if (function_exists('wp_admin_css')) :
	1230	+ wp_admin_css('css/dashboard');
	1231	+ endif;*/
	1232	+ endif;
	1233	+
	1234	+ // This is a special post status for hiding posts that have expired
	1235	+ register_post_status('fwpretired', array(
	1236	+ 'label' => _x('Retired', 'post'),
	1237	+ 'label_count' => _n_noop('Retired <span class="count">(%s)</span>', 'Retired <span class="count">(%s)</span>'),
	1238	+ 'exclude_from_search' => true,
	1239	+ 'public' => false,
	1240	+ 'publicly_queryable' => false,
	1241	+ 'show_in_admin_all_list' => false,
	1242	+ 'show_in_admin_status_list' => true,
	1243	+ ));
	1244	+ add_action(
	1245	+ /*hook=*/ 'template_redirect',
	1246	+ /*function=*/ array($this, 'redirect_retired'),
	1247	+ /*priority=*/ -100
	1248	+ );
	1249	+
	1250	+ $this->clear_cache_magic_url();
	1251	+ $this->update_magic_url();
	1252	+ } /* FeedWordPress::init() */
1114	1253
1115		- function update_requested () {
	1254	+ function redirect_retired () {
	1255	+ global $wp_query;
	1256	+ if (is_singular()) :
	1257	+ if ('fwpretired'==$wp_query->post->post_status) :
	1258	+ do_action('feedwordpress_redirect_retired', $wp_query->post);
	1259	+
	1260	+ if (!($template = get_404_template())) :
	1261	+ $template = get_index_template();
	1262	+ endif;
	1263	+ if ($template = apply_filters('template_include', $template)) :
	1264	+ header("HTTP/1.1 410 Gone");
	1265	+ include($template);
	1266	+ endif;
	1267	+ exit;
	1268	+ endif;
	1269	+ endif;
	1270	+ }
	1271	+
	1272	+ function dashboard_setup () {
	1273	+ $see_it = FeedWordPress::menu_cap();
	1274	+
	1275	+ if (current_user_can($see_it)) :
	1276	+ // Get the stylesheet
	1277	+ wp_enqueue_style('feedwordpress-elements');
	1278	+
	1279	+ $widget_id = 'feedwordpress_dashboard';
	1280	+ $widget_name = __('Syndicated Sources');
	1281	+ $column = 'side';
	1282	+ $priority = 'core';
	1283	+
	1284	+ // I would love to use wp_add_dashboard_widget() here and save
	1285	+ // myself some trouble. But WP 3 does not yet have any way to
	1286	+ // push a dashboard widget onto the side, or to give it a default
	1287	+ // location.
	1288	+ add_meta_box(
	1289	+ /*id=*/ $widget_id,
	1290	+ /*title=*/ $widget_name,
	1291	+ /*callback=*/ array($this, 'dashboard'),
	1292	+ /*page=*/ 'dashboard',
	1293	+ /*context=*/ $column,
	1294	+ /*priority=*/ $priority
	1295	+ );
	1296	+ /*control_callback= array($this, 'dashboard_control') */
	1297	+
	1298	+ // This is kind of rude, I know, but the dashboard widget isn't
	1299	+ // worth much if users don't know that it exists, and I don't
	1300	+ // know of any better way to reorder the boxen.
	1301	+ //
	1302	+ // Gleefully ripped off of codex.wordpress.org/Dashboard_Widgets_API
	1303	+
	1304	+ // Globalize the metaboxes array, this holds all the widgets for wp-admin
	1305	+ global $wp_meta_boxes;
	1306	+
	1307	+ // Get the regular dashboard widgets array
	1308	+ // (which has our new widget already but at the end)
	1309	+
	1310	+ $normal_dashboard = $wp_meta_boxes['dashboard'][$column][$priority];
	1311	+
	1312	+ // Backup and delete our new dashbaord widget from the end of the array
	1313	+ if (isset($normal_dashboard[$widget_id])) :
	1314	+ $backup = array();
	1315	+ $backup[$widget_id] = $normal_dashboard[$widget_id];
	1316	+ unset($normal_dashboard[$widget_id]);
	1317	+
	1318	+ // Merge the two arrays together so our widget is at the
	1319	+ // beginning
	1320	+ $sorted_dashboard = array_merge($backup, $normal_dashboard);
	1321	+
	1322	+ // Save the sorted array back into the original metaboxes
	1323	+ $wp_meta_boxes['dashboard'][$column][$priority] = $sorted_dashboard;
	1324	+ endif;
	1325	+ endif;
	1326	+ } /* FeedWordPress::dashboard_setup () */
	1327	+
	1328	+ function dashboard () {
	1329	+ $syndicationPage = new FeedWordPressSyndicationPage(dirname(__FILE__).'/syndication.php');
	1330	+ $syndicationPage->dashboard_box($syndicationPage);
	1331	+ } /* FeedWordPress::dashboard () */
	1332	+
	1333	+ function user_can_richedit ($rich_edit) {
	1334	+
	1335	+ global $post;
	1336	+
	1337	+ if (is_syndicated($post->ID)) :
	1338	+ // Disable visual editor and only allow operations
	1339	+ // directly on HTML if post is syndicated.
	1340	+ $rich_edit = false;
	1341	+ endif;
	1342	+
	1343	+ return $rich_edit;
	1344	+
	1345	+ } /* FeedWordPress::user_can_richedit () */
	1346	+
	1347	+ function update_magic_url () {
	1348	+ global $wpdb;
	1349	+
	1350	+ // Explicit update request in the HTTP request (e.g. from a cron job)
	1351	+ if ($this->update_requested()) :
	1352	+ $this->update_hooked = "Initiating a CRON JOB CHECK-IN ON UPDATE SCHEDULE due to URL parameter = ".trim($this->val($_REQUEST['update_feedwordpress']));
	1353	+
	1354	+ $this->update($this->update_requested_url());
	1355	+
	1356	+ if (FEEDWORDPRESS_DEBUG and count($wpdb->queries) > 0) :
	1357	+ $mysqlTime = 0.0;
	1358	+ $byTime = array();
	1359	+ foreach ($wpdb->queries as $query) :
	1360	+ $time = $query[1] * 1000000.0;
	1361	+ $mysqlTime += $query[1];
	1362	+ if (!isset($byTime[$time])) : $byTime[$time] = array(); endif;
	1363	+ $byTime[$time][] = $query[0]. ' // STACK: ' . $query[2];
	1364	+ endforeach;
	1365	+ krsort($byTime);
	1366	+
	1367	+ foreach ($byTime as $time => $querySet) :
	1368	+ foreach ($querySet as $query) :
	1369	+ print "[".(sprintf('%4.4f', $time/1000.0)) . "ms] $query\n";
	1370	+ endforeach;
	1371	+ endforeach;
	1372	+ echo $this->log_prefix()."$wpdb->num_queries queries. $mysqlTime seconds in MySQL. Total of "; timer_stop(1); print " seconds.";
	1373	+ endif;
	1374	+
	1375	+ debug_out_feedwordpress_footer();
	1376	+
	1377	+ // Magic URL should return nothing but a 200 OK header packet
	1378	+ // when successful.
	1379	+ exit;
	1380	+ endif;
	1381	+ } /* FeedWordPress::magic_update_url () */
	1382	+
	1383	+ function clear_cache_magic_url () {
	1384	+ if ($this->clear_cache_requested()) :
	1385	+ $this->clear_cache();
	1386	+ endif;
	1387	+ } /* FeedWordPress::clear_cache_magic_url() */
	1388	+
	1389	+ function clear_cache_requested () {
1116	1390	return (
1117		- isset($_REQUEST['update_feedwordpress'])
1118		- and $_REQUEST['update_feedwordpress']
	1391	+ isset($_GET['clear_cache'])
	1392	+ and $_GET['clear_cache']
1119	1393	);
	1394	+ } /* FeedWordPress::clear_cache_requested() */
	1395	+
	1396	+ function update_requested () {
	1397	+ return FeedWordPress::by_request('update_feedwordpress');
1120	1398	} // FeedWordPress::update_requested()
1121	1399
1122	1400	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;
	1401	+ $ret = null;
	1402	+
	1403	+ if (($_REQUEST['update_feedwordpress']=='*')
	1404	+ or (preg_match('|^http://.*|i', $_REQUEST['update_feedwordpress']))) :
	1405	+ $ret = $_REQUEST['update_feedwordpress'];
	1406	+ endif;
1129	1407
1130		- return $ret;
	1408	+ return $ret;
1131	1409	} // FeedWordPress::update_requested_url()
1132	1410
1133		- function syndicate_link ($name, $uri, $rss) {
	1411	+ function auto_update () {
	1412	+ if ($this->stale()) :
	1413	+ $this->update();
	1414	+ endif;
	1415	+ } /* FeedWordPress::auto_update () */
	1416	+
	1417	+ function find_link ($uri, $field = 'link_rss') {
1134	1418	global $wpdb;
1135	1419
	1420	+ $unslashed = untrailingslashit($uri);
	1421	+ $slashed = trailingslashit($uri);
	1422	+ $link_id = $wpdb->get_var($wpdb->prepare("
	1423	+ SELECT link_id FROM $wpdb->links WHERE $field IN ('%s', '%s')
	1424	+ LIMIT 1", $unslashed, $slashed
	1425	+ ));
	1426	+
	1427	+ return $link_id;
	1428	+ } /* FeedWordPress::find_link () */
	1429	+
	1430	+ function syndicate_link ($name, $uri, $rss) {
1136	1431	// Get the category ID#
1137	1432	$cat_id = FeedWordPress::link_category_id();
1138		-
	1433	+ if (!is_wp_error($cat_id)) :
	1434	+ $link_category = array($cat_id);
	1435	+ else :
	1436	+ $link_category = array();
	1437	+ endif;
	1438	+
1139	1439	// WordPress gets cranky if there's no homepage URI
1140		- if (!isset($uri) or strlen($uri)<1) : $uri = $rss; endif;
	1440	+ if (!is_string($uri) or strlen($uri)<1) : $uri = $rss; endif;
1141	1441
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;
	1442	+ // Check if this feed URL is already being syndicated.
	1443	+ $link_id = wp_insert_link(array(
	1444	+ "link_id" => FeedWordPress::find_link($rss), // insert if nothing was found; else update
	1445	+ "link_rss" => $rss,
	1446	+ "link_name" => $name,
	1447	+ "link_url" => $uri,
	1448	+ "link_category" => $link_category,
	1449	+ "link_visible" => 'Y', // reactivate if inactivated
	1450	+ ));
1155	1451
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	1452	return $link_id;
1174		- } // function FeedWordPress::syndicate_link()
	1453	+ } /* function FeedWordPress::syndicate_link() */
1175	1454
1176	1455	/*static*/ function syndicated_status ($what, $default) {
1177	1456	$ret = get_option("feedwordpress_syndicated_{$what}_status");
1178	1457	if (!$ret) :
		@@ -1180,28 +1459,16 @@
1180	1459	endif;
1181	1460	return $ret;
1182	1461	} /* FeedWordPress::syndicated_status() */
1183	1462
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		- );
	1463	+ function on_unfamiliar ($what = 'author') {
	1464	+ switch ($what) :
	1465	+ case 'category' : $suffix = ':category'; break;
	1466	+ case 'post_tag' : $suffix = ':post_tag'; break;
	1467	+ default: $suffix = '';
	1468	+ endswitch;
1189	1469
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;
	1470	+ return get_option('feedwordpress_unfamiliar_'.$what, 'create'.$suffix);
1204	1471	} // function FeedWordPress::on_unfamiliar()
1205	1472
1206	1473	function null_email_set () {
1207	1474	$base = get_option('feedwordpress_null_email_set');
		@@ -1238,14 +1505,17 @@
1238	1505	/*static*/ function munge_permalinks () {
1239	1506	return (get_option('feedwordpress_munge_permalink', /*default=*/ 'yes') != 'no');
1240	1507	} /* FeedWordPress::munge_permalinks() */
1241	1508
1242		- function syndicated_links () {
	1509	+ function syndicated_links ($args = array()) {
1243	1510	$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
	1511	+ if (!is_wp_error($contributors)) :
	1512	+ $links = get_bookmarks(array_merge(
	1513	+ array("category" => $contributors),
	1514	+ $args
	1515	+ ));
	1516	+ else :
	1517	+ $links = array();
1248	1518	endif;
1249	1519	return $links;
1250	1520	} // function FeedWordPress::syndicated_links()
1251	1521
		@@ -1271,11 +1541,12 @@
1271	1541	// If we could not find an appropriate link category,
1272	1542	// make a new one for ourselves.
1273	1543	if (!$cat_id) :
1274	1544	$cat_id = FeedWordPressCompatibility::insert_link_category(DEFAULT_SYNDICATION_CATEGORY);
1275		-
1276		- // Stamp it
1277		- update_option('feedwordpress_cat_id', $cat_id);
	1545	+ if (!is_wp_error($cat_id)) :
	1546	+ // Stamp it
	1547	+ update_option('feedwordpress_cat_id', $cat_id);
	1548	+ endif;
1278	1549	endif;
1279	1550
1280	1551	return $cat_id;
1281	1552	} // function FeedWordPress::link_category_id()
		@@ -1301,15 +1572,47 @@
1301	1572	update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
1302	1573	endif;
1303	1574	elseif ($fwp_db_version < 2009.0707) :
1304	1575	// 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		- ");
	1576	+ $wpdb->query("
	1577	+ DELETE FROM $wpdb->usermeta
	1578	+ WHERE LOCATE('feedwordpress', meta_key)
	1579	+ AND LOCATE('box', meta_key);
	1580	+ ");
	1581	+
	1582	+ update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
	1583	+ elseif ($fwp_db_version < 2010.0814) :
	1584	+ // Change in terminology.
	1585	+ if (get_option('feedwordpress_unfamiliar_category', 'create')=='default') :
	1586	+ update_option('feedwordpress_unfamiliar_category', 'null');
1311	1587	endif;
	1588	+ foreach (FeedWordPress::syndicated_links() as $link) :
	1589	+ $sub = new SyndicatedLink($link);
	1590	+
	1591	+ $remap_uf = array(
	1592	+ 'default' => 'null',
	1593	+ 'filter' => 'null',
	1594	+ 'create' => 'create:category',
	1595	+ 'tag' => 'create:post_tag'
	1596	+ );
	1597	+ if (isset($sub->settings['unfamiliar category'])) :
	1598	+ if ($sub->settings['unfamiliar category']=='filter') :
	1599	+ $sub->settings['match/filter'] = array('category');
	1600	+ endif;
	1601	+ foreach ($remap_uf as $from => $to) :
	1602	+ if ($sub->settings['unfamiliar category']==$from) :
	1603	+ $sub->settings['unfamiliar category'] = $to;
	1604	+ endif;
	1605	+ endforeach;
	1606	+ endif;
	1607	+
	1608	+ if (isset($sub->settings['add global categories'])) :
	1609	+ $sub->settings['add/category'] = $sub->settings['add global categories'];
	1610	+ unset($sub->settings['add global categories']);
	1611	+ endif;
	1612	+
	1613	+ $sub->save_settings(/*reload=*/ true);
	1614	+ endforeach;
1312	1615	update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
1313	1616	else :
1314	1617	// No. Just brand it with the new version.
1315	1618	update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
		@@ -1370,15 +1673,56 @@
1370	1673	DROP INDEX {$wpdb->posts}_guid_idx ON {$wpdb->posts}
1371	1674	");
1372	1675	}
1373	1676
1374		- /*static*/ function fetch ($url) {
1375		- require_once (ABSPATH . WPINC . '/class-feed.php');
1376		- $feed = new SimplePie();
	1677	+ /*static*/ function fetch_timeout () {
	1678	+ return apply_filters(
	1679	+ 'feedwordpress_fetch_timeout',
	1680	+ intval(get_option('feedwordpress_fetch_timeout', FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT))
	1681	+ );
	1682	+ }
	1683	+
	1684	+ /*static*/ function fetch ($url, $params = array()) {
	1685	+ if (is_wp_error($url)) :
	1686	+ // Let's bounce.
	1687	+ return $url;
	1688	+ endif;
	1689	+
	1690	+ $force_feed = true; // Default
	1691	+
	1692	+ // 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' =>
	1693	+ $timeout = FeedWordPress::fetch_timeout();
	1694	+
	1695	+ if (!is_array($params)) :
	1696	+ $force_feed = $params;
	1697	+ else : // Parameter array
	1698	+ $args = wp_parse_args(array(
	1699	+ 'force_feed' => $force_feed,
	1700	+ 'timeout' => $timeout
	1701	+ ), $params);
	1702	+
	1703	+ extract($args);
	1704	+ endif;
	1705	+ $timeout = intval($timeout);
	1706	+
	1707	+ $pie_class = apply_filters('feedwordpress_simplepie_class', 'FeedWordPie');
	1708	+ $cache_class = apply_filters('feedwordpress_cache_class', 'WP_Feed_Cache');
	1709	+ $file_class = apply_filters('feedwordpress_file_class', 'FeedWordPress_File');
	1710	+ $parser_class = apply_filters('feedwordpress_parser_class', 'FeedWordPress_Parser');
	1711	+ $item_class = apply_filters('feedwordpress_item_class', 'FeedWordPie_Item');
	1712	+ $sniffer_class = apply_filters('feedwordpress_sniffer_class', 'FeedWordPress_Content_Type_Sniffer');
	1713	+
	1714	+ $feed = new $pie_class;
1377	1715	$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());
	1716	+ $feed->set_cache_class($cache_class);
	1717	+ $feed->set_timeout($timeout);
	1718	+
	1719	+ $feed->set_content_type_sniffer_class($sniffer_class);
	1720	+ $feed->set_file_class($file_class);
	1721	+ $feed->set_parser_class($parser_class);
	1722	+ $feed->set_item_class($item_class);
	1723	+ $feed->force_feed($force_feed);
	1724	+ $feed->set_cache_duration(FeedWordPress::cache_duration($params));
1381	1725	$feed->init();
1382	1726	$feed->handle_content_type();
1383	1727
1384	1728	if ($feed->error()) :
		@@ -1391,8 +1735,14 @@
1391	1735
1392	1736	function clear_cache () {
1393	1737	global $wpdb;
1394	1738
	1739	+ // Just in case, clear out any old MagpieRSS cache records.
	1740	+ $magpies = $wpdb->query("
	1741	+ DELETE FROM {$wpdb->options}
	1742	+ WHERE option_name LIKE 'rss_%' AND LENGTH(option_name) > 32
	1743	+ ");
	1744	+
1395	1745	// The WordPress SimplePie module stores its cached feeds as
1396	1746	// transient records in the options table. The data itself is
1397	1747	// stored in `_transient_feed_{md5 of url}` and the last-modified
1398	1748	// timestamp in `_transient_feed_mod_{md5 of url}`. Timeouts for
		@@ -1398,17 +1748,26 @@
1398	1748	// timestamp in `_transient_feed_mod_{md5 of url}`. Timeouts for
1399	1749	// these records are stored in `_transient_timeout_feed_{md5}`.
1400	1750	// Since the md5 is always 32 characters in length, the
1401	1751	// option_name is always over 32 characters.
1402		- $wpdb->query("
	1752	+ $simplepies = $wpdb->query("
1403	1753	DELETE FROM {$wpdb->options}
1404	1754	WHERE option_name LIKE '_transient%_feed_%' AND LENGTH(option_name) > 32
1405	1755	");
	1756	+ $simplepies = (int) ($simplepies / 4); // Each transient has 4 rows: the data, the modified timestamp; and the timeouts for each
	1757	+
	1758	+ return ($magpies + $simplepies);
1406	1759	} /* FeedWordPress::clear_cache () */
1407	1760
1408		- function cache_duration () {
	1761	+ function cache_duration ($params = array()) {
	1762	+ $params = wp_parse_args($params, array(
	1763	+ "cache" => true,
	1764	+ ));
	1765	+
1409	1766	$duration = NULL;
1410		- if (defined('FEEDWORDPRESS_CACHE_AGE')) :
	1767	+ if (!$params['cache']) :
	1768	+ $duration = 0;
	1769	+ elseif (defined('FEEDWORDPRESS_CACHE_AGE')) :
1411	1770	$duration = FEEDWORDPRESS_CACHE_AGE;
1412	1771	endif;
1413	1772	return $duration;
1414	1773	}
		@@ -1436,58 +1795,309 @@
1436	1795	$affirmo = array ('y', 'yes', 't', 'true', 1);
1437	1796	return (isset($f[$setting]) and in_array(strtolower($f[$setting]), $affirmo));
1438	1797	}
1439	1798
1440		-
1441	1799	# Internal debugging functions
1442		- function critical_bug ($varname, $var, $line) {
	1800	+ function critical_bug ($varname, $var, $line, $file = NULL) {
1443	1801	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";
	1802	+
	1803	+ if (!is_null($file)) :
	1804	+ $location = "line # ${line} of ".basename($file);
	1805	+ else :
	1806	+ $location = "line # ${line}";
	1807	+ endif;
	1808	+
	1809	+ 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>';
	1810	+ print "\n<plaintext>";
	1811	+ print "Triggered at ${location}\n";
	1812	+ print "FeedWordPress: ".FEEDWORDPRESS_VERSION."\n";
	1813	+ print "WordPress: {$wp_version}\n";
	1814	+ print "PHP: ".phpversion()."\n";
	1815	+ print "Error data: ";
	1816	+ print $varname.": "; var_dump($var); echo "\n";
1453	1817	die;
1454	1818	}
1455	1819
1456		- function noncritical_bug ($varname, $var, $line) {
	1820	+ function noncritical_bug ($varname, $var, $line, $file = NULL) {
1457	1821	if (FEEDWORDPRESS_DEBUG) : // halt only when we are doing debugging
1458		- FeedWordPress::critical_bug($varname, $var, $line);
	1822	+ FeedWordPress::critical_bug($varname, $var, $line, $file);
1459	1823	endif;
1460	1824	}
1461		-} // class FeedWordPress
	1825	+
	1826	+ function val ($v, $no_newlines = false) {
	1827	+ ob_start();
	1828	+ var_dump($v);
	1829	+ $out = ob_get_contents(); ob_end_clean();
	1830	+
	1831	+ if ($no_newlines) :
	1832	+ $out = preg_replace('/\s+/', " ", $out);
	1833	+ endif;
	1834	+ return $out;
	1835	+ } /* FeedWordPress::val () */
1462	1836
1463		-require_once(dirname(__FILE__) . '/syndicatedpost.class.php');
1464		-require_once(dirname(__FILE__) . '/syndicatedlink.class.php');
	1837	+ function diagnostic_on ($level) {
	1838	+ $show = get_option('feedwordpress_diagnostics_show', array());
	1839	+ return (in_array($level, $show));
	1840	+ } /* FeedWordPress::diagnostic_on () */
1465	1841
1466		-################################################################################
1467		-## XML-RPC HOOKS: accept XML-RPC update pings from Contributors ################
1468		-################################################################################
	1842	+ function diagnostic ($level, $out, $persist = NULL, $since = NULL, $mostRecent = NULL) {
	1843	+ global $feedwordpress_admin_footer;
1469	1844
1470		-function feedwordpress_xmlrpc_hook ($args = array ()) {
1471		- $args['weblogUpdates.ping'] = 'feedwordpress_pong';
1472		- return $args;
1473		-}
	1845	+ $output = get_option('feedwordpress_diagnostics_output', array());
	1846	+ $dlog = get_option('feedwordpress_diagnostics_log', array());
1474	1847
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'; }
	1848	+ $diagnostic_nesting = count(explode(":", $level));
1484	1849
1485		- return array('flerror' => false, 'message' => "Thanks for the ping.".implode(' and', $mesg));
1486		- endif;
1487		-}
	1850	+ if (FeedWordPress::diagnostic_on($level)) :
	1851	+ foreach ($output as $method) :
	1852	+ switch ($method) :
	1853	+ case 'echo' :
	1854	+ if (!FeedWordPress::update_requested()) :
	1855	+ echo "<div><pre><strong>Diag".str_repeat('====', $diagnostic_nesting-1).'|</strong> '.$out."</pre></div>";
	1856	+ endif;
	1857	+ break;
	1858	+ case 'echo_in_cronjob' :
	1859	+ if (FeedWordPress::update_requested()) :
	1860	+ echo FeedWordPress::log_prefix()." ".$out."\n";
	1861	+ endif;
	1862	+ break;
	1863	+ case 'admin_footer' :
	1864	+ $feedwordpress_admin_footer[] = $out;
	1865	+ break;
	1866	+ case 'error_log' :
	1867	+ error_log(FeedWordPress::log_prefix().' '.$out);
	1868	+ break;
	1869	+ case 'email' :
	1870	+
	1871	+ if (is_null($persist)) :
	1872	+ $sect = 'occurrent';
	1873	+ $hook = (isset($dlog['mesg'][$sect]) ? count($dlog['mesg'][$sect]) : 0);
	1874	+ $line = array("Time" => time(), "Message" => $out);
	1875	+ else :
	1876	+ $sect = 'persistent';
	1877	+ $hook = md5($level."\n".$persist);
	1878	+ $line = array("Since" => $since, "Message" => $out, "Most Recent" => $mostRecent);
	1879	+ endif;
	1880	+
	1881	+ if (!isset($dlog['mesg'])) : $dlog['mesg'] = array(); endif;
	1882	+ if (!isset($dlog['mesg'][$sect])) : $dlog['mesg'][$sect] = array(); endif;
	1883	+
	1884	+ $dlog['mesg'][$sect][$hook] = $line;
	1885	+ endswitch;
	1886	+ endforeach;
	1887	+ endif;
	1888	+
	1889	+ update_option('feedwordpress_diagnostics_log', $dlog);
	1890	+ } /* FeedWordPress::diagnostic () */
	1891	+
	1892	+ function email_diagnostics_override () {
	1893	+ return ($this->has_secret() and isset($_REQUEST['feedwordpress_email_diagnostics']) and !!$_REQUEST['feedwordpress_email_diagnostics']);
	1894	+ }
	1895	+ function has_emailed_diagnostics ($dlog) {
	1896	+ $ret = false;
	1897	+ if ($this->email_diagnostics_override()
	1898	+ or (isset($dlog['schedule']) and isset($dlog['schedule']['last']))) :
	1899	+ $ret = true;
	1900	+ endif;
	1901	+ return $ret;
	1902	+ }
	1903	+ function ready_to_email_diagnostics ($dlog) {
	1904	+ $ret = false;
	1905	+ if ($this->email_diagnostics_override()
	1906	+ or (time() > ($dlog['schedule']['last'] + $dlog['schedule']['freq']))) :
	1907	+ $ret = true;
	1908	+ endif;
	1909	+ return $ret;
	1910	+ }
	1911	+
	1912	+ function email_diagnostic_log ($params = array()) {
	1913	+ $params = wp_parse_args($params, array(
	1914	+ "force" => false,
	1915	+ ));
1488	1916
1489		-require_once(dirname(__FILE__) . '/relative_uri.class.php');
	1917	+ $dlog = get_option('feedwordpress_diagnostics_log', array());
	1918	+
	1919	+ if ($this->has_emailed_diagnostics($dlog)) :
	1920	+ if ($this->ready_to_email_diagnostics($dlog)) :
	1921	+ // No news is good news; only send if
	1922	+ // there are some messages to send.
	1923	+ $body = NULL;
	1924	+ if (!isset($dlog['mesg'])) : $dlog['mesg'] = array(); endif;
	1925	+
	1926	+ foreach ($dlog['mesg'] as $sect => $mesgs) :
	1927	+ if (count($mesgs) > 0) :
	1928	+ if (is_null($body)) : $body = ''; endif;
	1929	+
	1930	+ $paradigm = reset($mesgs);
	1931	+ $body .= "<h2>".ucfirst($sect)." issues</h2>\n"
	1932	+ ."<table>\n"
	1933	+ ."<thead><tr>\n";
	1934	+ foreach ($paradigm as $col => $value) :
	1935	+ $body .= '<th scope="col">'.$col."</th>\n";
	1936	+ endforeach;
	1937	+ $body .= "</tr></thead>\n"
	1938	+ ."<tbody>\n";
	1939	+
	1940	+ foreach ($mesgs as $line) :
	1941	+ $body .= "<tr>\n";
	1942	+ foreach ($line as $col => $cell) :
	1943	+ if (is_numeric($cell)) :
	1944	+ $cell = date('j-M-y, h:i a', $cell);
	1945	+ endif;
	1946	+ $class = strtolower(preg_replace('/\s+/', '-', $col));
	1947	+ $body .= "<td class=\"$class\">${cell}</td>";
	1948	+ endforeach;
	1949	+ $body .= "</tr>\n";
	1950	+ endforeach;
	1951	+
	1952	+ $body .= "</tbody>\n</table>\n\n";
	1953	+ endif;
	1954	+ endforeach;
	1955	+
	1956	+ $body = apply_filters('feedwordpress_diagnostic_email_body', $body, $dlog);
	1957	+ if (!is_null($body)) :
	1958	+ $home = feedwordpress_display_url(get_bloginfo('url'));
	1959	+ $subj = apply_filters('feedwordpress_diagnostic_email_subject', $home . " syndication issues", $dlog);
	1960	+ $agent = 'FeedWordPress '.FEEDWORDPRESS_VERSION;
	1961	+ $body = <<<EOMAIL
	1962	+<html>
	1963	+<head>
	1964	+<title>$subj</title>
	1965	+<style type="text/css">
	1966	+ body { background-color: white; color: black; }
	1967	+ table { width: 100%; border: 1px solid black; }
	1968	+ table thead tr th { background-color: #ff7700; color: white; border-bottom: 1px solid black; }
	1969	+ table thead tr { border-bottom: 1px solid black; }
	1970	+ table tr { vertical-align: top; }
	1971	+ table .since { width: 20%; }
	1972	+ table .time { width: 20%; }
	1973	+ table .most-recently { width: 20%; }
	1974	+ table .message { width: auto; }
	1975	+</style>
	1976	+</head>
	1977	+<body>
	1978	+<h1>Syndication Issues encountered by $agent on $home</h1>
	1979	+$body
	1980	+</body>
	1981	+</html>
	1982	+
	1983	+EOMAIL;
	1984	+
	1985	+ $ded = get_option('feedwordpress_diagnostics_email_destination', 'admins');
	1986	+
	1987	+ // e-mail address
	1988	+ if (preg_match('/^mailto:(.*)$/', $ded, $ref)) :
	1989	+ $recipients = array($ref[1]);
	1990	+
	1991	+ // userid
	1992	+ elseif (preg_match('/^user:(.*)$/', $ded, $ref)) :
	1993	+ $userdata = get_userdata((int) $ref[1]);
	1994	+ $recipients = array($userdata->user_email);
	1995	+
	1996	+ // admins
	1997	+ else :
	1998	+ $recipients = FeedWordPressDiagnostic::admin_emails();
	1999	+ endif;
	2000	+
	2001	+ $mesgId = 'feedwordpress+'.time().'@'.$home;
	2002	+ $parentId = get_option('feedwordpress_diagnostics_email_root_message_id', NULL);
	2003	+
	2004	+ $head = array("Message-ID: <$mesgId>");
	2005	+ if (!is_null($parentId)) :
	2006	+ // We've already sent off a diagnostic message in the past. Let's do some
	2007	+ // magic to help with threading, in the hopes that all diagnostic messages
	2008	+ // get threaded together.
	2009	+ $head[] = "References: <$parentId>";
	2010	+ $head[] = "In-Reply-To: <$parentId>";
	2011	+ $subj = "Re: ".$subj;
	2012	+ else :
	2013	+ // This is the first of its kind. Let's mark it as such.
	2014	+ update_option('feedwordpress_diagnostics_email_root_message_id', $mesgId);
	2015	+ endif;
	2016	+ $head = apply_filters('feedwordpress_diagnostic_email_headers', $head);
	2017	+
	2018	+ foreach ($recipients as $email) :
	2019	+ add_filter('wp_mail_content_type', array('FeedWordPress', 'allow_html_mail'));
	2020	+ wp_mail($email, $subj, $body, $head);
	2021	+ remove_filter('wp_mail_content_type', array('FeedWordPress', 'allow_html_mail'));
	2022	+ endforeach;
	2023	+ endif;
	2024	+
	2025	+ // Clear the logs
	2026	+ $dlog['mesg']['persistent'] = array();
	2027	+ $dlog['mesg']['occurrent'] = array();
	2028	+
	2029	+ // Set schedule for next update
	2030	+ $dlog['schedule']['last'] = time();
	2031	+ endif;
	2032	+ else :
	2033	+ $dlog['schedule'] = array(
	2034	+ 'freq' => 24 /*hr*/ * 60 /*min*/ * 60 /*s*/,
	2035	+ 'last' => time(),
	2036	+ );
	2037	+ endif;
	2038	+
	2039	+ update_option('feedwordpress_diagnostics_log', $dlog);
	2040	+ } /* FeedWordPress::email_diagnostic_log () */
	2041	+
	2042	+ function allow_html_mail () {
	2043	+ return 'text/html';
	2044	+ } /* FeedWordPress::allow_html_mail () */
	2045	+
	2046	+ function admin_footer () {
	2047	+ global $feedwordpress_admin_footer;
	2048	+ foreach ($feedwordpress_admin_footer as $line) :
	2049	+ echo '<div><pre>'.$line.'</pre></div>';
	2050	+ endforeach;
	2051	+ } /* FeedWordPress::admin_footer () */
	2052	+
	2053	+ function log_prefix ($date = false) {
	2054	+ $home = get_bloginfo('url');
	2055	+ $prefix = '['.feedwordpress_display_url($home).'] [feedwordpress] ';
	2056	+ if ($date) :
	2057	+ $prefix = "[".date('Y-m-d H:i:s')."]".$prefix;
	2058	+ endif;
	2059	+ return $prefix;
	2060	+ } /* FeedWordPress::log_prefix () */
	2061	+
	2062	+ function menu_cap ($sub = false) {
	2063	+ if ($sub) :
	2064	+ $cap = apply_filters('feedwordpress_menu_settings_capacity', 'manage_options');
	2065	+ else :
	2066	+ $cap = apply_filters('feedwordpress_menu_main_capacity', 'manage_links');
	2067	+ endif;
	2068	+ return $cap;
	2069	+ } /* FeedWordPress::menu_cap () */
	2070	+
	2071	+ function path ($filename = '') {
	2072	+ global $fwp_path;
	2073	+
	2074	+ $path = $fwp_path;
	2075	+ if (strlen($filename) > 0) :
	2076	+ $path .= '/'.$filename;
	2077	+ endif;
	2078	+ return $path;
	2079	+ }
	2080	+
	2081	+ function param ($key, $type = 'REQUEST', $default = NULL) {
	2082	+ $where = '_'.strtoupper($type);
	2083	+ $ret = $default;
	2084	+ if (isset($GLOBALS[$where]) and is_array($GLOBALS[$where])) :
	2085	+ if (isset($GLOBALS[$where][$key])) :
	2086	+ $ret = $GLOBALS[$where][$key];
	2087	+ if (get_magic_quotes_gpc()) :
	2088	+ $ret = stripslashes_deep($ret);
	2089	+ endif;
	2090	+ endif;
	2091	+ endif;
	2092	+ return $ret;
	2093	+ }
	2094	+ function post ($key, $default = NULL) {
	2095	+ return FeedWordPress::param($key, 'POST');
	2096	+ }
	2097	+} // class FeedWordPress
	2098	+
	2099	+$feedwordpress_admin_footer = array();
1490	2100
1491	2101	// take your best guess at the realname and e-mail, given a string
1492	2102	define('FWP_REGEX_EMAIL_ADDY', '([^@"(<\s]+@[^"@(<\s]+\.[^"@(<\s]+)');
1493	2103	define('FWP_REGEX_EMAIL_NAME', '("([^"]*)"|([^"<(]+\S))');