feedwordpress.php: 2011.1018 vs 2010.0127 · FeedWordPress

← All changes | feedwordpress.php +1181 -607 2010.0127 → 2011.1018 View file →

		@@ -2,18 +2,24 @@
2	2	/*
3	3	Plugin Name: FeedWordPress
4	4	Plugin URI: http://feedwordpress.radgeek.com/
5	5	Description: simple and flexible Atom/RSS syndication for WordPress
6		-Version: 2010.0127
	6	+Version: 2011.1018
7	7	Author: Charles Johnson
8	8	Author URI: http://radgeek.com/
9	9	License: GPL
10	10	*/
11	11
	12	+/**
	13	+ * @package FeedWordPress
	14	+ * @version 2011.1018
	15	+ */
	16	+
12	17	# This uses code derived from:
13	18	# - wp-rss-aggregate.php by Kellan Elliot-McCrea <kellan@protest.net>
14		-# - HTTP Navigator 2 by Keyvan Minoukadeh <keyvan@k1m.com>
	19	+# - MagpieRSS by Kellan Elliot-McCrea <kellan@protest.net>
15	20	# - Ultra-Liberal Feed Finder by Mark Pilgrim <mark@diveintomark.org>
	21	+# - WordPress Blog Tool and Publishing Platform <http://wordpress.org/>
16	22	# according to the terms of the GNU General Public License.
17	23	#
18	24	# INSTALLATION: see readme.txt or <http://projects.radgeek.com/install>
19	25	#
		@@ -27,11 +33,15 @@
27	33	# or use a cron job.
28	34
29	35	# -- Don't change these unless you know what you're doing...
30	36
31		-define ('FEEDWORDPRESS_VERSION', '2010.0127');
	37	+define ('FEEDWORDPRESS_VERSION', '2011.1018');
32	38	define ('FEEDWORDPRESS_AUTHOR_CONTACT', 'http://radgeek.com/contact');
33	39
	40	+if (!defined('FEEDWORDPRESS_BLEG')) :
	41	+ define ('FEEDWORDPRESS_BLEG', true);
	42	+endif;
	43	+
34	44	// Defaults
35	45	define ('DEFAULT_SYNDICATION_CATEGORY', 'Contributors');
36	46	define ('DEFAULT_UPDATE_PERIOD', 60); // value in minutes
37	47
		@@ -52,8 +62,9 @@
52	62
53	63	define ('FEEDWORDPRESS_FRESHNESS_INTERVAL', 10*60); // Every ten minutes
54	64
55	65	define ('FWP_SCHEMA_HAS_USERMETA', 2966);
	66	+define ('FWP_SCHEMA_USES_ARGS_TAXONOMY', 12694); // Revision # for using $args['taxonomy'] to get link categories
56	67	define ('FWP_SCHEMA_20', 3308); // Database schema # for WP 2.0
57	68	define ('FWP_SCHEMA_21', 4772); // Database schema # for WP 2.1
58	69	define ('FWP_SCHEMA_23', 5495); // Database schema # for WP 2.3
59	70	define ('FWP_SCHEMA_25', 7558); // Database schema # for WP 2.5
		@@ -60,14 +71,14 @@
60	71	define ('FWP_SCHEMA_26', 8201); // Database schema # for WP 2.6
61	72	define ('FWP_SCHEMA_27', 9872); // Database schema # for WP 2.7
62	73	define ('FWP_SCHEMA_28', 11548); // Database schema # for WP 2.8
63	74	define ('FWP_SCHEMA_29', 12329); // Database schema # for WP 2.9
	75	+define ('FWP_SCHEMA_30', 12694); // Database schema # for WP 3.0
64	76
65	77	if (FEEDWORDPRESS_DEBUG) :
66	78	// Help us to pick out errors, if any.
67	79	ini_set('error_reporting', E_ALL & ~E_NOTICE);
68	80	ini_set('display_errors', true);
69		- define('MAGPIE_DEBUG', true);
70	81
71	82	// When testing we don't want cache issues to interfere. But this is
72	83	// a VERY BAD SETTING for a production server. Webmasters will eat your
73	84	// face for breakfast if you use it, and the baby Jesus will cry. So
		@@ -72,48 +83,59 @@
72	83	// a VERY BAD SETTING for a production server. Webmasters will eat your
73	84	// face for breakfast if you use it, and the baby Jesus will cry. So
74	85	// make sure FEEDWORDPRESS_DEBUG is FALSE for any site that will be
75	86	// used for more than testing purposes!
76		- define('MAGPIE_CACHE_AGE', 1);
	87	+ define('FEEDWORDPRESS_CACHE_AGE', 1);
	88	+ define('FEEDWORDPRESS_CACHE_LIFETIME', 1);
	89	+ define('FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT', 60);
77	90	else :
78		- define('MAGPIE_DEBUG', false);
79		-
80		- define('MAGPIE_CACHE_AGE', 1*60);
	91	+ // Hold onto data all day for conditional GET purposes,
	92	+ // but consider it stale after 1 min (requiring a conditional GET)
	93	+ define('FEEDWORDPRESS_CACHE_LIFETIME', 246060);
	94	+ define('FEEDWORDPRESS_CACHE_AGE', 1*60);
	95	+ define('FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT', 20);
81	96	endif;
82	97
83		-// Note that the rss-functions.php that comes prepackaged with WordPress is
84		-// old & busted. For the new hotness, drop a copy of rss.php from
85		-// this archive into wp-includes/rss.php
	98	+// Use our the cache settings that we want.
	99	+add_filter('wp_feed_cache_transient_lifetime', array('FeedWordPress', 'cache_lifetime'));
86	100
87		-if (is_readable(ABSPATH . WPINC . '/rss.php')) :
88		- require_once (ABSPATH . WPINC . '/rss.php');
89		-else :
90		- require_once (ABSPATH . WPINC . '/rss-functions.php');
	101	+// Ensure that we have SimplePie loaded up and ready to go.
	102	+// We no longer need a MagpieRSS upgrade module. Hallelujah!
	103	+if (!class_exists('SimplePie')) :
	104	+ require_once(ABSPATH . WPINC . '/class-simplepie.php');
91	105	endif;
	106	+require_once(ABSPATH . WPINC . '/class-feed.php');
92	107
93		-if (isset($wp_db_version)) :
94		- if ($wp_db_version >= FWP_SCHEMA_23) :
95		- require_once (ABSPATH . WPINC . '/registration.php'); // for wp_insert_user
96		- elseif ($wp_db_version >= FWP_SCHEMA_21) : // WordPress 2.1 and 2.2, but not 2.3
97		- require_once (ABSPATH . WPINC . '/registration.php'); // for wp_insert_user
98		- require_once (ABSPATH . 'wp-admin/admin-db.php'); // for wp_insert_category
99		- elseif ($wp_db_version >= FWP_SCHEMA_20) : // WordPress 2.0
100		- require_once (ABSPATH . WPINC . '/registration-functions.php'); // for wp_insert_user
101		- require_once (ABSPATH . 'wp-admin/admin-db.php'); // for wp_insert_category
102		- endif;
	108	+if (!function_exists('wp_insert_user')) :
	109	+ require_once (ABSPATH . WPINC . '/registration.php'); // for wp_insert_user
103	110	endif;
104	111
105		-require_once(dirname(__FILE__) . '/compatability.php'); // LEGACY API: Replicate or mock up functions for legacy support purposes
106		-require_once(dirname(__FILE__) . '/feedwordpresshtml.class.php');
	112	+$dir = dirname(__FILE__);
	113	+require_once("${dir}/admin-ui.php");
	114	+require_once("${dir}/feedwordpresssyndicationpage.class.php");
	115	+require_once("${dir}/compatability.php"); // Legacy API
	116	+require_once("${dir}/syndicatedpost.class.php");
	117	+require_once("${dir}/syndicatedlink.class.php");
	118	+require_once("${dir}/feedwordpresshtml.class.php");
	119	+require_once("${dir}/feedwordpress-content-type-sniffer.class.php");
	120	+require_once("${dir}/inspectpostmeta.class.php");
	121	+require_once("${dir}/syndicationdataqueries.class.php");
	122	+require_once("${dir}/feedwordpress_file.class.php");
	123	+require_once("${dir}/feedwordpress_parser.class.php");
	124	+require_once("${dir}/feedwordpressrpc.class.php");
	125	+require_once("${dir}/feedwordpresshttpauthenticator.class.php");
107	126
108	127	// Magic quotes are just about the stupidest thing ever.
109	128	if (is_array($_POST)) :
110		- $fwp_post = stripslashes_deep($_POST);
	129	+ $fwp_post = $_POST;
	130	+ if (get_magic_quotes_gpc()) :
	131	+ $fwp_post = stripslashes_deep($fwp_post);
	132	+ endif;
111	133	endif;
112	134
113	135	// Get the path relative to the plugins directory in which FWP is stored
114	136	preg_match (
115		- '\|/wp-content/plugins/(.+)$\|',
	137	+ '\|'.preg_quote(WP_PLUGIN_DIR).'/(.+)$\|',
116	138	dirname(__FILE__),
117	139	$ref
118	140	);
119	141
		@@ -122,39 +144,8 @@
122	144	else : // Something went wrong. Let's just guess.
123	145	$fwp_path = 'feedwordpress';
124	146	endif;
125	147
126		-function feedwordpress_admin_scripts () {
127		- wp_enqueue_script('post'); // for magic tag and category boxes
128		- wp_enqueue_script('admin-forms'); // for checkbox selection
129		-}
130		-
131		-// If this is a FeedWordPress admin page, queue up scripts for AJAX functions that FWP uses
132		-// If it is a display page or a non-FeedWordPress admin page, don't.
133		-if (is_admin() and isset($_REQUEST['page']) and preg_match("\|^{$fwp_path}/\|", $_REQUEST['page'])) :
134		- if (function_exists('wp_enqueue_script')) :
135		- if (FeedWordPressCompatibility::test_version(FWP_SCHEMA_29)) :
136		- add_action('admin_print_scripts', 'feedwordpress_admin_scripts');
137		- elseif (FeedWordPressCompatibility::test_version(FWP_SCHEMA_25)) :
138		- wp_enqueue_script('post'); // for magic tag and category boxes
139		- wp_enqueue_script('thickbox'); // for fold-up boxes
140		- wp_enqueue_script('admin-forms'); // for checkbox selection
141		- else :
142		- wp_enqueue_script( 'ajaxcat' ); // Provides the handy-dandy new category text box
143		- endif;
144		- endif;
145		- if (function_exists('wp_enqueue_style')) :
146		- if (fwp_test_wp_version(FWP_SCHEMA_25)) :
147		- wp_enqueue_style('dashboard');
148		- endif;
149		- endif;
150		- if (function_exists('wp_admin_css')) :
151		- if (fwp_test_wp_version(FWP_SCHEMA_25)) :
152		- wp_admin_css('css/dashboard');
153		- endif;
154		- endif;
155		-endif;
156		-
157	148	if (!FeedWordPress::needs_upgrade()) : // only work if the conditions are safe!
158	149
159	150	# Syndicated items are generally received in output-ready (X)HTML and
160	151	# should not be folded, crumpled, mutilated, or spindled by WordPress
		@@ -174,10 +165,17 @@
174	165
175	166	add_action('atom_entry', 'feedwordpress_item_feed_data');
176	167
177	168	# Filter in original permalinks if the user wants that
178		- add_filter('post_link', 'syndication_permalink', 1);
	169	+ add_filter('post_link', 'syndication_permalink', /priority=/ 1, /arguments=/ 3);
179	170
	171	+ # When foreign URLs are used for permalinks in feeds or display
	172	+ # contexts, they need to be escaped properly.
	173	+ add_filter('the_permalink', 'syndication_permalink_escaped');
	174	+ add_filter('the_permalink_rss', 'syndication_permalink_escaped');
	175	+
	176	+ add_filter('post_comments_feed_link', 'syndication_comments_feed_link');
	177	+
180	178	# WTF? By default, wp_insert_link runs incoming link_url and link_rss
181	179	# URIs through default filters that include `wp_kses()`. But `wp_kses()`
182	180	# just happens to escape any occurrence of & to & -- which just
183	181	# happens to fuck up any URI with a & to separate GET parameters.
		@@ -186,17 +184,17 @@
186	184
187	185	# Admin menu
188	186	add_action('admin_menu', 'fwp_add_pages');
189	187	add_action('admin_notices', 'fwp_check_debug');
190		- add_action('admin_notices', 'fwp_check_magpie');
191		- add_action('init', 'feedwordpress_check_for_magpie_fix');
192	188
193	189	add_action('admin_menu', 'feedwordpress_add_post_edit_controls');
194	190	add_action('save_post', 'feedwordpress_save_post_edit_controls');
195	191
	192	+ add_action('admin_footer', array('FeedWordPress', 'admin_footer'));
	193	+
196	194	# Inbound XML-RPC update methods
197		- add_filter('xmlrpc_methods', 'feedwordpress_xmlrpc_hook');
198		-
	195	+ $feedwordpressRPC = new FeedWordPressRPC;
	196	+
199	197	# Outbound XML-RPC ping reform
200	198	remove_action('publish_post', 'generic_ping'); // WP 1.5.x
201	199	remove_action('do_pings', 'do_all_pings', 10, 1); // WP 2.1, 2.2
202	200	remove_action('publish_post', '_publish_post_hook', 5, 1); // WP 2.3
		@@ -205,35 +203,25 @@
205	203	add_action('do_pings', 'fwp_do_pings', 10, 1);
206	204	add_action('feedwordpress_update', 'fwp_hold_pings');
207	205	add_action('feedwordpress_update_complete', 'fwp_release_pings');
208	206
209		- # Hook in logging functions only if the logging option is ON
210		- $update_logging = get_option('feedwordpress_update_logging');
211		- if ($update_logging == 'yes') :
212		- add_action('post_syndicated_item', 'log_feedwordpress_post', 100);
213		- add_action('update_syndicated_item', 'log_feedwordpress_update_post', 100);
214		- add_action('feedwordpress_update', 'log_feedwordpress_update_feeds', 100);
215		- add_action('feedwordpress_check_feed', 'log_feedwordpress_check_feed', 100);
216		- add_action('feedwordpress_update_complete', 'log_feedwordpress_update_complete', 100);
217		- endif;
	207	+ add_action('syndicated_feed_error', array('FeedWordPressDiagnostic', 'feed_error'), 100, 3);
	208	+
	209	+ add_action('wp_footer', 'debug_out_feedwordpress_footer', -100);
	210	+ add_action('admin_footer', 'debug_out_feedwordpress_footer', -100);
218	211
219		- if (FeedWordPress::update_requested() and FEEDWORDPRESS_DEBUG) :
220		- add_action('post_syndicated_item', 'debug_out_feedwordpress_post', 100);
221		- add_action('update_syndicated_item', 'debug_out_feedwordpress_update_post', 100);
222		- add_action('feedwordpress_update', 'debug_out_feedwordpress_update_feeds', 100);
223		- add_action('feedwordpress_check_feed', 'debug_out_feedwordpress_check_feed', 100);
224		- add_action('feedwordpress_update_complete', 'debug_out_feedwordpress_update_complete', 100);
225		- endif;
	212	+ $feedwordpress = new FeedWordPress;
226	213
227	214	# Cron-less auto-update. Hooray!
228		- $autoUpdateHook = get_option('feedwordpress_automatic_updates');
229		- if ($autoUpdateHook != 'init') :
230		- $autoUpdateHook = 'shutdown';
	215	+ $autoUpdateHook = $feedwordpress->automatic_update_hook();
	216	+ if (!is_null($autoUpdateHook)) :
	217	+ add_action($autoUpdateHook, array(&$feedwordpress, 'auto_update'));
231	218	endif;
232		- add_action($autoUpdateHook, 'feedwordpress_auto_update');
	219	+
	220	+ add_action('init', array(&$feedwordpress, 'init'));
	221	+ add_action('shutdown', array(&$feedwordpress, 'email_diagnostic_log'));
	222	+ add_action('wp_dashboard_setup', array(&$feedwordpress, 'dashboard_setup'));
233	223
234		- add_action('init', 'feedwordpress_update_magic_url');
235		-
236	224	# Default sanitizers
237	225	add_filter('syndicated_item_content', array('SyndicatedPost', 'resolve_relative_uris'), 0, 2);
238	226	add_filter('syndicated_item_content', array('SyndicatedPost', 'sanitize_content'), 0, 2);
239	227
		@@ -241,188 +229,109 @@
241	229	# Hook in the menus, which will just point to the upgrade interface
242	230	add_action('admin_menu', 'fwp_add_pages');
243	231	endif; // if (!FeedWordPress::needs_upgrade())
244	232
245		-function feedwordpress_check_for_magpie_fix () {
246		- if (isset($_POST['action']) and $_POST['action']=='fix_magpie_version') :
247		- FeedWordPressCompatibility::validate_http_request(/action=/ 'feedwordpress_fix_magpie', /capability=/ 'edit_files');
248		-
249		- $back_to = $_SERVER['REQUEST_URI'];
250		- if (isset($_POST['ignore'])) :
251		- // kill error message by telling it we ignored the upgrade request for this version
252		- update_option('feedwordpress_magpie_ignored_upgrade_to', EXPECTED_MAGPIE_VERSION);
253		- $ret = 'ignored';
254		- elseif (isset($_POST['upgrade'])) :
255		- $source = dirname(__FILE__)."/MagpieRSS-upgrade/rss.php";
256		- $destination = ABSPATH . WPINC . '/rss.php';
257		- $success = @copy($source, $destination);
258		-
259		- // Copy over rss-functions.php, too, to avoid collisions
260		- // on pre-lapsarian versions of WordPress.
261		- if ($success) :
262		- $source = dirname(__FILE__)."/MagpieRSS-upgrade/rss-functions.php";
263		- $destination = ABSPATH . WPINC . '/rss-functions.php';
264		- $success = @copy($source, $destination);
265		- endif;
266		- $ret = (int) $success;
267		- endif;
268		-
269		- if (strpos($back_to, '?')===false) : $sep = '?';
270		- else : $sep = '&';
271		- endif;
272		-
273		- header("Location: {$back_to}{$sep}feedwordpress_magpie_fix=".$ret);
274		- exit;
275		- endif;
276		-} /* feedwordpress_check_for_magpie_fix() */
277		-
278		-function feedwordpress_auto_update () {
279		- if (FeedWordPress::stale()) :
280		- $feedwordpress =& new FeedWordPress;
281		- $feedwordpress->update();
282		- endif;
283		-} /* feedwordpress_auto_update () */
284		-
285		-function feedwordpress_update_magic_url () {
286		- global $wpdb;
287		-
288		- // Explicit update request in the HTTP request (e.g. from a cron job)
289		- if (FeedWordPress::update_requested()) :
290		- $feedwordpress =& new FeedWordPress;
291		- $feedwordpress->update(FeedWordPress::update_requested_url());
292		-
293		- if (FEEDWORDPRESS_DEBUG and count($wpdb->queries) > 0) :
294		- $mysqlTime = 0.0;
295		- $byTime = array();
296		- foreach ($wpdb->queries as $query) :
297		- $time = $query[1] * 1000000.0;
298		- $mysqlTime += $query[1];
299		- if (!isset($byTime[$time])) : $byTime[$time] = array(); endif;
300		- $byTime[$time][] = $query[0]. ' // STACK: ' . $query[2];
301		- endforeach;
302		- krsort($byTime);
303		-
304		- foreach ($byTime as $time => $querySet) :
305		- foreach ($querySet as $query) :
306		- print "[".(sprintf('%4.4f', $time/1000.0)) . "ms] $query\n";
307		- endforeach;
308		- endforeach;
309		- echo "[feedwordpress] $wpdb->num_queries queries. $mysqlTime seconds in MySQL. Total of "; timer_stop(1); print " seconds.";
310		- endif;
311		-
312		-
313		- // Magic URL should return nothing but a 200 OK header packet
314		- // when successful.
315		- exit;
316		- endif;
317		-} /* feedwordpress_magic_update_url () */
318		-
319	233	################################################################################
320	234	## LOGGING FUNCTIONS: log status updates to error_log if you want it ###########
321	235	################################################################################
322	236
323		-function log_feedwordpress_post ($id) {
324		- $post = wp_get_single_post($id);
325		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] posted "
326		- ."'{$post->post_title}' ({$post->post_date})");
327		-}
	237	+class FeedWordPressDiagnostic {
	238	+ function feed_error ($error, $old, $link) {
	239	+ $wpError = $error['object'];
	240	+ $url = $link->uri();
	241	+
	242	+ $mesgs = $wpError->get_error_messages();
	243	+ foreach ($mesgs as $mesg) :
	244	+ $mesg = esc_html($mesg);
	245	+ FeedWordPress::diagnostic(
	246	+ 'updated_feeds:errors',
	247	+ "Feed Error: [${url}] update returned error: $mesg"
	248	+ );
	249	+
	250	+ $hours = get_option('feedwordpress_diagnostics_persistent_errors_hours', 2);
	251	+ $span = ($error['ts'] - $error['since']);
328	252
329		-function log_feedwordpress_update_post ($id) {
330		- $post = wp_get_single_post($id);
331		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] updated "
332		- ."'{$post->post_title}' ({$post->post_date})"
333		- ." (as of {$post->post_modified})");
334		-}
	253	+ if ($span >= ($hours * 60 * 60)) :
	254	+ $since = date('r', $error['since']);
	255	+ $mostRecent = date('r', $error['ts']);
	256	+ FeedWordPress::diagnostic(
	257	+ 'updated_feeds:errors:persistent',
	258	+ "Feed Update Error: [${url}] returning errors"
	259	+ ." since ${since}:<br/><code>$mesg</code>",
	260	+ $url, $error['since'], $error['ts']
	261	+ );
	262	+ endif;
	263	+ endforeach;
	264	+ }
335	265
336		-function log_feedwordpress_update_feeds ($uri) {
337		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] update('$uri')");
338		-}
	266	+ function admin_emails ($id = '') {
	267	+ $users = get_users_of_blog($id);
	268	+ $recipients = array();
	269	+ foreach ($users as $user) :
	270	+ $user_id = (isset($user->user_id) ? $user->user_id : $user->ID);
	271	+ $dude = new WP_User($user_id);
	272	+ if ($dude->has_cap('administrator')) :
	273	+ if ($dude->user_email) :
	274	+ $recipients[] = $dude->user_email;
	275	+ endif;
	276	+ endif;
	277	+ endforeach;
	278	+ return $recipients;
	279	+ }
	280	+} /* class FeedWordPressDiagnostic */
339	281
340		-function log_feedwordpress_check_feed ($feed) {
341		- $uri = $feed['link/uri']; $name = $feed['link/name'];
342		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] Examining $name <$uri>");
	282	+function debug_out_human_readable_bytes ($quantity) {
	283	+ $quantity = (int) $quantity;
	284	+ $magnitude = 'B';
	285	+ $orders = array('KB', 'MB', 'GB', 'TB');
	286	+ while (($quantity > (1024*100)) and (count($orders) > 0)) :
	287	+ $quantity = floor($quantity / 1024);
	288	+ $magnitude = array_shift($orders);
	289	+ endwhile;
	290	+ return "${quantity} ${magnitude}";
343	291	}
344	292
345		-function log_feedwordpress_update_complete ($delta) {
346		- $mesg = array();
347		- if (isset($delta['new'])) $mesg[] = 'added '.$delta['new'].' new posts';
348		- if (isset($delta['updated'])) $mesg[] = 'updated '.$delta['updated'].' existing posts';
349		- if (empty($mesg)) $mesg[] = 'nothing changed';
	293	+function debug_out_feedwordpress_footer () {
	294	+ if (FeedWordPress::diagnostic_on('memory_usage')) :
	295	+ if (function_exists('memory_get_usage')) :
	296	+ FeedWordPress::diagnostic ('memory_usage', "Memory: Current usage: ".debug_out_human_readable_bytes(memory_get_usage()));
	297	+ endif;
	298	+ if (function_exists('memory_get_peak_usage')) :
	299	+ FeedWordPress::diagnostic ('memory_usage', "Memory: Peak usage: ".debug_out_human_readable_bytes(memory_get_peak_usage()));
	300	+ endif;
	301	+ endif;
	302	+} /* debug_out_feedwordpress_footer() */
350	303
351		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] "
352		- .(is_null($delta) ? "Error: I don't syndicate that URI"
353		- : implode(' and ', $mesg)));
354		-}
355		-
356		-function debug_out_feedwordpress_post ($id) {
357		- $post = wp_get_single_post($id);
358		- print ("[".date('Y-m-d H:i:s')."][feedwordpress] posted "
359		- ."'{$post->post_title}' ({$post->post_date})\n");
360		-}
361		-
362		-function debug_out_feedwordpress_update_post ($id) {
363		- $post = wp_get_single_post($id);
364		- print ("[".date('Y-m-d H:i:s')."][feedwordpress] updated "
365		- ."'{$post->post_title}' ({$post->post_date})"
366		- ." (as of {$post->post_modified})\n");
367		-}
368		-
369		-function debug_out_feedwordpress_update_feeds ($uri) {
370		- print ("[".date('Y-m-d H:i:s')."][feedwordpress] update('$uri')\n");
371		-}
372		-
373		-function debug_out_feedwordpress_check_feed ($feed) {
374		- $uri = $feed['link/uri']; $name = $feed['link/name'];
375		- print ("[".date('Y-m-d H:i:s')."][feedwordpress] Examining $name <$uri>\n");
376		-}
377		-
378		-function debug_out_feedwordpress_update_complete ($delta) {
379		- $mesg = array();
380		- if (isset($delta['new'])) $mesg[] = 'added '.$delta['new'].' new posts';
381		- if (isset($delta['updated'])) $mesg[] = 'updated '.$delta['updated'].' existing posts';
382		- if (empty($mesg)) $mesg[] = 'nothing changed';
383		-
384		- print ("[".date('Y-m-d H:i:s')."][feedwordpress] "
385		- .(is_null($delta) ? "Error: I don't syndicate that URI"
386		- : implode(' and ', $mesg))."\n");
387		-}
388		-
389	304	################################################################################
390	305	## TEMPLATE API: functions to make your templates syndication-aware ############
391	306	################################################################################
392	307
393		-function is_syndicated ($id = NULL) { return (strlen(get_syndication_feed_id($id)) > 0); }
	308	+/**
	309	+ * is_syndicated: Tests whether the current post in a Loop context, or a post
	310	+ * given by ID number, was syndicated by FeedWordPress. Useful for templates
	311	+ * to determine whether or not to retrieve syndication-related meta-data in
	312	+ * displaying a post.
	313	+ *
	314	+ * @param int $id The post to check for syndicated status. Defaults to the current post in a Loop context.
	315	+ * @return bool TRUE if the post's meta-data indicates it was syndicated; FALSE otherwise
	316	+ */
	317	+function is_syndicated ($id = NULL) {
	318	+ return (strlen(get_syndication_feed_id($id)) > 0);
	319	+} /* function is_syndicated() */
394	320
395		-function get_syndication_source_link ($original = NULL, $id = NULL) {
396		- if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data();
397		- endif;
398		-
399		- if ($original) : $vals = get_post_custom_values('syndication_source_uri_original', $id);
400		- else : $vals = array();
401		- endif;
402		-
403		- if (count($vals) == 0) : $vals = get_post_custom_values('syndication_source_uri', $id);
404		- endif;
405		-
406		- if (count($vals) > 0) : $ret = $vals[0]; else : $ret = NULL; endif;
407		-
408		- return $ret;
409		-} /* function get_syndication_source_link() */
410		-
411		-function the_syndication_source_link ($original = NULL, $id = NULL) {
412		- echo get_syndication_source_link($original, $id);
413		-}
414		-
415	321	function feedwordpress_display_url ($url, $before = 60, $after = 0) {
416	322	$bits = parse_url($url);
417	323
418	324	// Strip out crufty subdomains
419		- $bits['host'] = preg_replace('/^www[0-9]*\./i', '', $bits['host']);
420		-
	325	+ if (isset($bits['host'])) :
	326	+ $bits['host'] = preg_replace('/^www[0-9]*\./i', '', $bits['host']);
	327	+ endif;
	328	+
421	329	// Reassemble bit-by-bit with minimum of crufty elements
422	330	$url = (isset($bits['user'])?$bits['user'].'@':'')
423	331	.(isset($bits['host'])?$bits['host']:'')
424	332	.(isset($bits['path'])?$bits['path']:'')
	333	+ .(isset($uri_bits['port'])?':'.$uri_bits['port']:'')
425	334	.(isset($bits['query'])?'?'.$bits['query']:'');
426	335
427	336	if (strlen($url) > ($before+$after)) :
428	337	$url = substr($url, 0, $before).'…'.substr($url, 0 - $after, $after);
		@@ -428,95 +337,85 @@
428	337	$url = substr($url, 0, $before).'…'.substr($url, 0 - $after, $after);
429	338	endif;
430	339
431	340	return $url;
432		-}
	341	+} /* feedwordpress_display_url () */
433	342
434		-function get_syndication_source ($original = NULL, $id = NULL) {
	343	+function get_syndication_source_property ($original, $id, $local, $remote = NULL) {
	344	+ $ret = NULL;
435	345	if (is_null($original)) :
436	346	$original = FeedWordPress::use_aggregator_source_data();
437	347	endif;
438		-
439		- if ($original) :
440		- $vals = get_post_custom_values('syndication_source_original', $id);
441		- else :
442		- $vals = array();
	348	+
	349	+ if (is_null($remote)) :
	350	+ $remote = $local . '_original';
443	351	endif;
444	352
445		- if (count($vals) == 0) :
446		- $vals = get_post_custom_values('syndication_source', $id);
	353	+ $vals = ($original ? get_post_custom_values($remote, $id) : array());
	354	+ if (count($vals) < 1) :
	355	+ $vals = get_post_custom_values($local, $id);
447	356	endif;
448	357
449	358	if (count($vals) > 0) :
450	359	$ret = $vals[0];
451		- else :
452		- $ret = NULL;
453	360	endif;
	361	+ return $ret;
	362	+} /* function get_syndication_source_property () */
454	363
455		- if (is_null($ret) or strlen(trim($ret)) == 0) :
456		- // Fall back to URL of blog
	364	+function the_syndication_source_link ($original = NULL, $id = NULL) { echo get_syndication_source_link($original, $id); }
	365	+function get_syndication_source_link ($original = NULL, $id = NULL) {
	366	+ return get_syndication_source_property($original, $id, 'syndication_source_uri');
	367	+} /* function get_syndication_source_link() */
	368	+
	369	+function the_syndication_source ($original = NULL, $id = NULL) { echo get_syndication_source($original, $id); }
	370	+function get_syndication_source ($original = NULL, $id = NULL) {
	371	+ $ret = get_syndication_source_property($original, $id, 'syndication_source');
	372	+ if (is_null($ret) or strlen(trim($ret)) == 0) : // Fall back to URL of blog
457	373	$ret = feedwordpress_display_url(get_syndication_source_link());
458	374	endif;
459		-
460	375	return $ret;
461	376	} /* function get_syndication_source() */
462	377
463		-function the_syndication_source ($original = NULL, $id = NULL) { echo get_syndication_source($original, $id); }
464		-
	378	+function the_syndication_feed ($original = NULL, $id = NULL) { echo get_syndication_feed($original, $id); }
465	379	function get_syndication_feed ($original = NULL, $id = NULL) {
466		- if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data();
467		- endif;
468		-
469		- if ($original) : $vals = get_post_custom_values('syndication_feed_original', $id);
470		- else : $vals = array();
471		- endif;
472		-
473		- if (count($vals) == 0) : $vals = get_post_custom_values('syndication_feed', $id);
474		- endif;
475		-
476		- if (count($vals) > 0) : $ret = $vals[0]; else : $ret = NULL; endif;
477		-
478		- return $ret;
	380	+ return get_syndication_source_property($original, $id, 'syndication_feed');
479	381	} /* function get_syndication_feed() */
480	382
481		-function the_syndication_feed ($original = NULL, $id = NULL) { echo get_syndication_feed($original, $id); }
482		-
	383	+function the_syndication_feed_guid ($original = NULL, $id = NULL) { echo get_syndication_feed_guid($original, $id); }
483	384	function get_syndication_feed_guid ($original = NULL, $id = NULL) {
484		- if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data();
	385	+ $ret = get_syndication_source_property($original, $id, 'syndication_source_id');
	386	+ if (is_null($ret) or strlen(trim($ret))==0) : // Fall back to URL of feed
	387	+ $ret = get_syndication_feed();
485	388	endif;
486		-
487		- if ($original) : $vals = get_post_custom_values('syndication_source_id_original', $id);
488		- else : $vals = array();
489		- endif;
490		-
491		- if (count($vals) == 0) : $vals = array(get_feed_meta('feed/id', $id));
492		- endif;
493		-
494		- if (count($vals) > 0) : $ret = $vals[0]; else : $ret = NULL; endif;
495		-
496	389	return $ret;
497	390	} /* function get_syndication_feed_guid () */
498	391
499		-function the_syndication_feed_guid ($original = NULL, $id = NULL) { echo get_syndication_feed_guid($original, $id); }
500		-
501	392	function get_syndication_feed_id ($id = NULL) { list($u) = get_post_custom_values('syndication_feed_id', $id); return $u; }
502	393	function the_syndication_feed_id ($id = NULL) { echo get_syndication_feed_id($id); }
503	394
504	395	$feedwordpress_linkcache = array (); // only load links from database once
	396	+function get_syndication_feed_object ($id = NULL) {
	397	+ global $feedwordpress_linkcache;
505	398
506		-function get_feed_meta ($key, $id = NULL) {
507		- global $wpdb, $feedwordpress_linkcache;
	399	+ $link = NULL;
	400	+
508	401	$feed_id = get_syndication_feed_id($id);
509		-
510		- $ret = NULL;
511	402	if (strlen($feed_id) > 0):
512	403	if (isset($feedwordpress_linkcache[$feed_id])) :
513	404	$link = $feedwordpress_linkcache[$feed_id];
514	405	else :
515		- $link =& new SyndicatedLink($feed_id);
	406	+ $link = new SyndicatedLink($feed_id);
516	407	$feedwordpress_linkcache[$feed_id] = $link;
517	408	endif;
	409	+ endif;
	410	+ return $link;
	411	+}
518	412
	413	+function get_feed_meta ($key, $id = NULL) {
	414	+ $ret = NULL;
	415	+
	416	+ $link = get_syndication_feed_object($id);
	417	+ if (is_object($link) and isset($link->settings[$key])) :
519	418	$ret = $link->settings[$key];
520	419	endif;
521	420	return $ret;
522	421	} /* get_feed_meta() */
		@@ -527,13 +426,55 @@
527	426	function the_syndication_permalink ($id = NULL) {
528	427	echo get_syndication_permalink($id);
529	428	}
530	429
	430	+/**
	431	+ * get_local_permalink: returns a string containing the internal permalink
	432	+ * for a post (whether syndicated or not) on your local WordPress installation.
	433	+ * This may be useful if you want permalinks to point to the original source of
	434	+ * an article for most purposes, but want to retrieve a URL for the local
	435	+ * representation of the post for one or two limited purposes (for example,
	436	+ * linking to a comments page on your local aggregator site).
	437	+ *
	438	+ * @param $id The numerical ID of the post to get the permalink for. If empty,
	439	+ * defaults to the current post in a Loop context.
	440	+ * @return string The URL of the local permalink for this post.
	441	+ *
	442	+ * @uses get_permalink()
	443	+ * @global $feedwordpress_the_original_permalink
	444	+ *
	445	+ * @since 2010.0217
	446	+ */
	447	+function get_local_permalink ($id = NULL) {
	448	+ global $feedwordpress_the_original_permalink;
	449	+
	450	+ // get permalink, and thus activate filter and force global to be filled
	451	+ // with original URL.
	452	+ $url = get_permalink($id);
	453	+ return $feedwordpress_the_original_permalink;
	454	+} /* get_local_permalink() */
	455	+
	456	+/**
	457	+ * the_original_permalink: displays the contents of get_original_permalink()
	458	+ *
	459	+ * @param $id The numerical ID of the post to get the permalink for. If empty,
	460	+ * defaults to the current post in a Loop context.
	461	+ *
	462	+ * @uses get_local_permalinks()
	463	+ * @uses apply_filters
	464	+ *
	465	+ * @since 2010.0217
	466	+ */
	467	+function the_local_permalink ($id = NULL) {
	468	+ print apply_filters('the_permalink', get_local_permalink($id));
	469	+} /* function the_local_permalink() */
	470	+
531	471	################################################################################
532	472	## FILTERS: syndication-aware handling of post data for templates and feeds ####
533	473	################################################################################
534	474
535	475	$feedwordpress_the_syndicated_content = NULL;
	476	+$feedwordpress_the_original_permalink = NULL;
536	477
537	478	function feedwordpress_preserve_syndicated_content ($text) {
538	479	global $feedwordpress_the_syndicated_content;
539	480
		@@ -584,37 +525,197 @@
584	525	<?php
585	526	endif;
586	527	}
587	528
588		-function syndication_permalink ($permalink = '') {
589		- if (get_option('feedwordpress_munge_permalink') != 'no'):
590		- $uri = get_syndication_permalink();
591		- return ((strlen($uri) > 0) ? $uri : $permalink);
592		- else:
593		- return $permalink;
	529	+/**
	530	+ * syndication_permalink: Allow WordPress to use the original remote URL of
	531	+ * syndicated posts as their permalink. Can be turned on or off by by setting in
	532	+ * Syndication => Posts & Links. Saves the old internal permalink in a global
	533	+ * variable for later use.
	534	+ *
	535	+ * @param string $permalink The internal permalink
	536	+ * @return string The new permalink. Same as the old if the post is not
	537	+ * syndicated, or if FWP is set to use internal permalinks, or if the post
	538	+ * was syndicated, but didn't have a proper permalink recorded.
	539	+ *
	540	+ * @uses SyndicatedLink::setting()
	541	+ * @uses get_syndication_permalink()
	542	+ * @uses get_syndication_feed_object()
	543	+ * @uses url_to_postid()
	544	+ * @global $id
	545	+ * @global $feedwordpress_the_original_permalink
	546	+ */
	547	+function syndication_permalink ($permalink = '', $post = null, $leavename = false) {
	548	+ global $id;
	549	+ global $feedwordpress_the_original_permalink;
	550	+
	551	+ // Save the local permalink in case we need to retrieve it later.
	552	+ $feedwordpress_the_original_permalink = $permalink;
	553	+
	554	+ if (is_object($post) and isset($post->ID) and !empty($post->ID)) :
	555	+ // Use the post ID we've been provided with.
	556	+ $postId = $post->ID;
	557	+ elseif (is_string($permalink) and strlen($permalink) > 0) :
	558	+ // Map this permalink to a post ID so we can get the correct
	559	+ // permalink even outside of the Post Loop. Props Björn.
	560	+ $postId = url_to_postid($permalink);
	561	+ else :
	562	+ // If the permalink string is empty but Post Loop context
	563	+ // provides an id.
	564	+ $postId = $id;
594	565	endif;
595		-} // function syndication_permalink ()
596	566
	567	+ $munge = false;
	568	+ $link = get_syndication_feed_object($postId);
	569	+ if (is_object($link)) :
	570	+ $munge = ($link->setting('munge permalink', 'munge_permalink', 'yes') != 'no');
	571	+ endif;
	572	+
	573	+ if ($munge):
	574	+ $uri = get_syndication_permalink($postId);
	575	+ $permalink = ((strlen($uri) > 0) ? $uri : $permalink);
	576	+ endif;
	577	+ return $permalink;
	578	+} /* function syndication_permalink () */
	579	+
	580	+/**
	581	+ * syndication_permalink_escaped: Escape XML special characters in syndicated
	582	+ * permalinks when used in feed contexts and HTML display contexts.
	583	+ *
	584	+ * @param string $permalink
	585	+ * @return string
	586	+ *
	587	+ * @uses is_syndicated()
	588	+ * @uses FeedWordPress::munge_permalinks()
	589	+ *
	590	+ */
	591	+function syndication_permalink_escaped ($permalink) {
	592	+ /* FIXME: This should review link settings not just global settings */
	593	+ if (is_syndicated() and FeedWordPress::munge_permalinks()) :
	594	+ // This is a foreign link; WordPress can't vouch for its not
	595	+ // having any entities that need to be &-escaped. So we'll do
	596	+ // it here.
	597	+ $permalink = esc_html($permalink);
	598	+ endif;
	599	+ return $permalink;
	600	+} /* function syndication_permalink_escaped() */
	601	+
	602	+/**
	603	+ * syndication_comments_feed_link: Escape XML special characters in comments
	604	+ * feed links
	605	+ *
	606	+ * @param string $link
	607	+ * @return string
	608	+ *
	609	+ * @uses is_syndicated()
	610	+ * @uses FeedWordPress::munge_permalinks()
	611	+ */
	612	+function syndication_comments_feed_link ($link) {
	613	+ global $feedwordpress_the_original_permalink, $id;
	614	+
	615	+ if (is_syndicated() and FeedWordPress::munge_permalinks()) :
	616	+ // If the source post provided a comment feed URL using
	617	+ // wfw:commentRss or atom:link/@rel="replies" we can make use of
	618	+ // that value here.
	619	+ $source = get_syndication_feed_object();
	620	+ $replacement = NULL;
	621	+ if ($source->setting('munge comments feed links', 'munge_comments_feed_links', 'yes') != 'no') :
	622	+ $commentFeeds = get_post_custom_values('wfw:commentRSS');
	623	+ if (
	624	+ is_array($commentFeeds)
	625	+ and (count($commentFeeds) > 0)
	626	+ and (strlen($commentFeeds[0]) > 0)
	627	+ ) :
	628	+ $replacement = $commentFeeds[0];
	629	+
	630	+ // This is a foreign link; WordPress can't vouch for its not
	631	+ // having any entities that need to be &-escaped. So we'll do it
	632	+ // here.
	633	+ $replacement = esc_html($replacement);
	634	+ endif;
	635	+ endif;
	636	+
	637	+ if (is_null($replacement)) :
	638	+ // Q: How can we get the proper feed format, since the
	639	+ // format is, stupidly, not passed to the filter?
	640	+ // A: Kludge kludge kludge kludge!
	641	+ $fancy_permalinks = ('' != get_option('permalink_structure'));
	642	+ if ($fancy_permalinks) :
	643	+ preg_match('\|/feed(/([^/]+))?/?$\|', $link, $ref);
	644	+
	645	+ $format = (isset($ref[2]) ? $ref[2] : '');
	646	+ if (strlen($format) == 0) : $format = get_default_feed(); endif;
	647	+
	648	+ $replacement = trailingslashit($feedwordpress_the_original_permalink) . 'feed';
	649	+ if ($format != get_default_feed()) :
	650	+ $replacement .= '/'.$format;
	651	+ endif;
	652	+ $replacement = user_trailingslashit($replacement, 'single_feed');
	653	+ else :
	654	+ // No fancy permalinks = no problem
	655	+ // WordPress doesn't call get_permalink() to
	656	+ // generate the comment feed URL, so the
	657	+ // comments feed link is never munged by FWP.
	658	+ endif;
	659	+ endif;
	660	+
	661	+ if (!is_null($replacement)) : $link = $replacement; endif;
	662	+ endif;
	663	+ return $link;
	664	+} /* function syndication_comments_feed_link() */
	665	+
597	666	################################################################################
598	667	## ADMIN MENU ADD-ONS: register Dashboard management pages #####################
599	668	################################################################################
600	669
601	670	function fwp_add_pages () {
602		- global $fwp_capability;
603		- global $fwp_path;
	671	+ $menu_cap = FeedWordPress::menu_cap();
	672	+ $settings_cap = FeedWordPress::menu_cap(/sub=/ true);
	673	+ $syndicationMenu = FeedWordPress::path('syndication.php');
	674	+
	675	+ add_menu_page(
	676	+ 'Syndicated Sites', 'Syndication',
	677	+ $menu_cap,
	678	+ $syndicationMenu,
	679	+ NULL,
	680	+ WP_PLUGIN_URL.'/'.FeedWordPress::path('feedwordpress-tiny.png')
	681	+ );
604	682
605		- $menu = array('Syndicated Sites', 'Syndication', $fwp_capability['manage_links'], $fwp_path.'/syndication.php', NULL);
606		- if (fwp_test_wp_version(FWP_SCHEMA_27)) :
607		- // add icon parameter
608		- $menu[] = WP_PLUGIN_URL.'/'.$fwp_path.'/feedwordpress-tiny.png';
609		- endif;
	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	+ );
610	688
611		- call_user_func_array('add_menu_page', $menu);
612		- add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Feeds & Updates', 'Feeds & Updates', $fwp_capability['manage_options'], $fwp_path.'/feeds-page.php');
613		- add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Posts & Links', 'Posts & Links', $fwp_capability['manage_options'], $fwp_path.'/posts-page.php');
614		- add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Authors', 'Authors', $fwp_capability['manage_options'], $fwp_path.'/authors-page.php');
615		- add_submenu_page($fwp_path.'/syndication.php', 'Categories'.FEEDWORDPRESS_AND_TAGS, 'Categories'.FEEDWORDPRESS_AND_TAGS, $fwp_capability['manage_options'], $fwp_path.'/categories-page.php');
616		- add_submenu_page($fwp_path.'/syndication.php', 'FeedWordPress Back End', 'Back End', $fwp_capability['manage_options'], $fwp_path.'/backend-page.php');
	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'.FEEDWORDPRESS_AND_TAGS, 'Categories'.FEEDWORDPRESS_AND_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	+ );
617	718	} /* function fwp_add_pages () */
618	719
619	720	function fwp_check_debug () {
620	721	// This is a horrible fucking kludge that I have to do because the
		@@ -637,97 +738,8 @@
637	738	<?php
638	739	endif;
639	740	} /* function fwp_check_debug () */
640	741
641		-define('EXPECTED_MAGPIE_VERSION', '2010.0122');
642		-function fwp_check_magpie () {
643		- if (isset($_REQUEST['feedwordpress_magpie_fix'])) :
644		- if ($_REQUEST['feedwordpress_magpie_fix']=='ignored') :
645		-?>
646		-<div class="updated fade">
647		-<p>O.K., we'll ignore the problem for now. FeedWordPress will not display any
648		-more error messages.</p>
649		-</div>
650		-<?php
651		- elseif ((bool) $_REQUEST['feedwordpress_magpie_fix']) :
652		-?>
653		-<div class="updated fade">
654		-<p>Congratulations! Your MagpieRSS has been successfully upgraded to the version
655		-shipped with FeedWordPress.</p>
656		-</div>
657		-<?php
658		- else :
659		- $source = dirname(__FILE__)."/MagpieRSS-upgrade/rss.php";
660		- $destination = ABSPATH . WPINC . '/rss.php';
661		- $cmd = "cp '".htmlspecialchars(addslashes($source))."' '".htmlspecialchars(addslashes($destination))."'";
662		- $cmd = wordwrap($cmd, /width=/ 75, /break=/ " \\\n\t");
663		-
664		-?>
665		-<div class="error">
666		-<p><strong>FeedWordPress was unable to automatically upgrade your copy of MagpieRSS.</strong></p>
667		-<p>It's likely that you need to change the file permissions on <code><?php print htmlspecialchars($source); ?></code>
668		-to allow FeedWordPress to overwrite it.</p>
669		-<p><strong>To perform the upgrade manually,</strong> you can
670		-use a SFTP or FTP client to upload a copy of <code>rss.php</code> from the
671		-<code>MagpieRSS-upgrades/</code> directory of your FeedWordPress archive so that
672		-it overwrites <code><?php print htmlspecialchars($destination); ?></code>. Or,
673		-if your web host provides shell access, you can issue the following command from
674		-a command prompt to perform the upgrade:</p>
675		-<pre>
676		-<samp>$</samp> <kbd><?php print $cmd; ?></kbd>
677		-</pre>
678		-<p><strong>If you've fixed the file permissions,</strong> you can try the
679		-automatic upgrade again.</p>
680		-
681		-<?php feedwordpress_upgrade_old_and_busted_buttons(); ?>
682		-</div>
683		-<?php
684		- endif;
685		- else :
686		- $magpie_version = FeedWordPress::magpie_version();
687		-
688		- $ignored = get_option('feedwordpress_magpie_ignored_upgrade_to');
689		- if (EXPECTED_MAGPIE_VERSION != $magpie_version and EXPECTED_MAGPIE_VERSION != $ignored) :
690		- if (current_user_can('edit_files')) :
691		- $youAre = 'you are';
692		- $itIsRecommendedThatYou = 'It is <strong>strongly recommended</strong> that you';
693		- else :
694		- $youAre = 'this site is';
695		- $itIsRecommendedThatYou = 'You may want to contact the administrator of the site; it is <strong>strongly recommended</strong> that they';
696		- endif;
697		- print '<div class="error">';
698		-?>
699		-<p style="font-style: italic"><strong>FeedWordPress has detected that <?php print $youAre; ?> currently using a version of
700		-MagpieRSS other than the upgraded version that ships with this version of FeedWordPress.</strong></p>
701		-<ul>
702		-<li><strong>Currently running:</strong> MagpieRSS <?php print $magpie_version; ?></li>
703		-<li><strong>Version included with FeedWordPress <?php print FEEDWORDPRESS_VERSION; ?>:</strong> MagpieRSS <?php print EXPECTED_MAGPIE_VERSION; ?></li>
704		-</ul>
705		-<p><?php print $itIsRecommendedThatYou; ?> install the upgraded
706		-version of MagpieRSS supplied with FeedWordPress. The version of
707		-MagpieRSS that ships with WordPress is very old and buggy, and
708		-encounters a number of errors when trying to parse modern Atom
709		-and RSS feeds.</p>
710		-<?php
711		- feedwordpress_upgrade_old_and_busted_buttons();
712		- print '</div>';
713		- endif;
714		- endif;
715		-}
716		-
717		-function feedwordpress_upgrade_old_and_busted_buttons() {
718		- if (current_user_can('edit_files')) :
719		-?>
720		-<form action="" method="post"><div>
721		-<?php FeedWordPressCompatibility::stamp_nonce('feedwordpress_fix_magpie'); ?>
722		-<input type="hidden" name="action" value="fix_magpie_version" />
723		-<input class="button-secondary" type="submit" name="ignore" value="<?php _e('Ignore this problem'); ?>" />
724		-<input class="button-primary" type="submit" name="upgrade" value="<?php _e('Upgrade'); ?>" />
725		-</div></form>
726		-<?php
727		- endif;
728		-}
729		-
730	742	################################################################################
731	743	## fwp_hold_pings() and fwp_release_pings(): Outbound XML-RPC ping reform ####
732	744	## ... 'coz it's rude to send 500 pings the first time your aggregator runs ####
733	745	################################################################################
		@@ -785,8 +797,11 @@
785	797	}
786	798
787	799	function feedwordpress_add_post_edit_controls () {
788	800	add_meta_box('feedwordpress-post-controls', __('Syndication'), 'feedwordpress_post_edit_controls', 'post', 'side', 'high');
	801	+ if (FeedWordPress::diagnostic_on('syndicated_posts:static_meta_data')) :
	802	+ $GLOBALS['inspectPostMeta'] = new InspectPostMeta;
	803	+ endif;
789	804	} // function FeedWordPress::postEditControls
790	805
791	806	function feedwordpress_post_edit_controls () {
792	807	global $post;
		@@ -796,10 +811,10 @@
796	811
797	812	if (is_syndicated($post->ID)) :
798	813	?>
799	814	<p>This is a syndicated post, which originally appeared at
800		- <cite><?php print wp_specialchars(get_syndication_source(NULL, $post->ID)); ?></cite>.
801		- <a href="<?php print wp_specialchars(get_syndication_permalink($post->ID)); ?>">View original post</a>.</p>
	815	+ <cite><?php print esc_html(get_syndication_source(NULL, $post->ID)); ?></cite>.
	816	+ <a href="<?php print esc_html(get_syndication_permalink($post->ID)); ?>">View original post</a>.</p>
802	817
803	818	<p><input type="hidden" name="feedwordpress_noncename" id="feedwordpress_noncename" value="<?php print wp_create_nonce(plugin_basename(__FILE__)); ?>" />
804	819	<label><input type="checkbox" name="freeze_updates" value="yes" <?php if ($frozen_post) : ?>checked="checked"<?php endif; ?> /> <strong>Manual editing.</strong>
805	820	If set, FeedWordPress will not overwrite the changes you make manually
		@@ -832,14 +847,16 @@
832	847	endif;
833	848
834	849	// OK, we're golden. Now let's save some data.
835	850	if (isset($_POST['freeze_updates'])) :
836		- update_post_meta($post_id, '_syndication_freeze_updates', $_POST['freeze_updates']);
	851	+ update_post_meta($post_id, '_syndication_freeze_updates', $_POST['freeze_updates']);
	852	+ $ret = $_POST['freeze_updates'];
837	853	else :
838	854	delete_post_meta($post_id, '_syndication_freeze_updates');
	855	+ $ret = NULL;
839	856	endif;
840	857
841		- return $_POST['freeze_updates'];
	858	+ return $ret;
842	859	} // function feedwordpress_save_edit_controls
843	860
844	861	################################################################################
845	862	## class FeedWordPress #########################################################
		@@ -880,15 +897,18 @@
880	897	);
881	898
882	899	var $feeds = NULL;
883	900
	901	+ var $httpauth = NULL;
884	902	# function FeedWordPress (): Contructor; retrieve a list of feeds
885	903	function FeedWordPress () {
886	904	$this->feeds = array ();
887	905	$links = FeedWordPress::syndicated_links();
888	906	if ($links): foreach ($links as $link):
889		- $this->feeds[] =& new SyndicatedLink($link);
	907	+ $this->feeds[] = new SyndicatedLink($link);
890	908	endforeach; endif;
	909	+
	910	+ $this->httpauth = new FeedWordPressHTTPAuthenticator;
891	911	} // FeedWordPress::FeedWordPress ()
892	912
893	913	# function update (): polls for updates on one or more Contributor feeds
894	914	#
		@@ -945,11 +965,18 @@
945	965	if (FeedWordPress::needs_upgrade()) : // Will make duplicate posts if we don't hold off
946	966	return NULL;
947	967	endif;
948	968
949		- if (!is_null($uri)) :
	969	+ if (!is_null($uri) and $uri != '*') :
950	970	$uri = trim($uri);
951	971	else : // Update all
	972	+ if ($this->update_hooked) :
	973	+ $diag = $this->update_hooked;
	974	+ else :
	975	+ $diag = 'Initiating a MANUAL check-in on the update schedule at '.date('r', time());
	976	+ endif;
	977	+ $this->diagnostic('update_schedule:check', $diag);
	978	+
952	979	update_option('feedwordpress_last_update_all', time());
953	980	endif;
954	981
955	982	do_action('feedwordpress_update', $uri);
		@@ -954,14 +981,9 @@
954	981
955	982	do_action('feedwordpress_update', $uri);
956	983
957	984	if (is_null($crash_ts)) :
958		- $crash_dt = (int) get_option('feedwordpress_update_time_limit');
959		- if ($crash_dt > 0) :
960		- $crash_ts = time() + $crash_dt;
961		- else :
962		- $crash_ts = NULL;
963		- endif;
	985	+ $crash_ts = $this->crash_ts();
964	986	endif;
965	987
966	988	// Randomize order for load balancing purposes
967	989	$feed_set = $this->feeds;
		@@ -966,15 +988,36 @@
966	988	// Randomize order for load balancing purposes
967	989	$feed_set = $this->feeds;
968	990	shuffle($feed_set);
969	991
	992	+ $updateWindow = (int) get_option('feedwordpress_update_window', DEFAULT_UPDATE_PERIOD) * 60 /* sec/min */;
	993	+ $interval = (int) get_option('feedwordpress_freshness', FEEDWORDPRESS_FRESHNESS_INTERVAL);
	994	+ $portion = max(
	995	+ (int) ceil(count($feed_set) / ($updateWindow / $interval)),
	996	+ 10
	997	+ );
	998	+
	999	+ $max_polls = apply_filters('feedwordpress_polls_per_update', get_option(
	1000	+ 'feedwordpress_polls_per_update', $portion
	1001	+ ), $uri);
	1002	+
	1003	+ $feed_set = apply_filters('feedwordpress_update_feeds', $feed_set, $uri);
	1004	+
970	1005	// Loop through and check for new posts
971		- $delta = NULL;
	1006	+ $delta = NULL; $remaining = $max_polls;
972	1007	foreach ($feed_set as $feed) :
973		- if (!is_null($crash_ts) and (time() > $crash_ts)) : // Check whether we've exceeded the time limit
	1008	+
	1009	+ // Has this process overstayed its welcome?
	1010	+ if (
	1011	+ // Over time limit?
	1012	+ (!is_null($crash_ts) and (time() > $crash_ts))
	1013	+
	1014	+ // Over feed count?
	1015	+ or ($remaining == 0)
	1016	+ ) :
974	1017	break;
975	1018	endif;
976		-
	1019	+
977	1020	$pinged_that = (is_null($uri) or ($uri=='*') or in_array($uri, array($feed->uri(), $feed->homepage())));
978	1021
979	1022	if (!is_null($uri)) : // A site-specific ping always updates
980	1023	$timely = true;
		@@ -981,20 +1024,24 @@
981	1024	else :
982	1025	$timely = $feed->stale();
983	1026	endif;
984	1027
985		- if ($pinged_that and is_null($delta)) : // If at least one feed was hit for updating...
	1028	+ if ($pinged_that and is_null($delta)) : // If at least one feed was hit for updating...
986	1029	$delta = array('new' => 0, 'updated' => 0); // ... don't return error condition
987	1030	endif;
988	1031
989	1032	if ($pinged_that and $timely) :
	1033	+ $remaining = $remaining - 1;
	1034	+
990	1035	do_action('feedwordpress_check_feed', $feed->settings);
991	1036	$start_ts = time();
992	1037	$added = $feed->poll($crash_ts);
993	1038	do_action('feedwordpress_check_feed_complete', $feed->settings, $added, time() - $start_ts);
994	1039
995		- if (isset($added['new'])) : $delta['new'] += $added['new']; endif;
996		- if (isset($added['updated'])) : $delta['updated'] += $added['updated']; endif;
	1040	+ if (is_array($added)) : // Success
	1041	+ if (isset($added['new'])) : $delta['new'] += $added['new']; endif;
	1042	+ if (isset($added['updated'])) : $delta['updated'] += $added['updated']; endif;
	1043	+ endif;
997	1044	endif;
998	1045	endforeach;
999	1046
1000	1047	do_action('feedwordpress_update_complete', $delta);
		@@ -1001,14 +1048,91 @@
1001	1048
1002	1049	return $delta;
1003	1050	}
1004	1051
	1052	+ function crash_ts ($default = NULL) {
	1053	+ $crash_dt = (int) get_option('feedwordpress_update_time_limit', 0);
	1054	+ if ($crash_dt > 0) :
	1055	+ $crash_ts = time() + $crash_dt;
	1056	+ else :
	1057	+ $crash_ts = $default;
	1058	+ endif;
	1059	+ return $crash_ts;
	1060	+ }
	1061	+
	1062	+ function secret_key () {
	1063	+ $secret = get_option('feedwordpress_secret_key', false);
	1064	+ if (!$secret) : // Generate random key.
	1065	+ $secret = substr(md5(uniqid(microtime())), 0, 6);
	1066	+ update_option('feedwordpress_secret_key', $secret);
	1067	+ endif;
	1068	+ return $secret;
	1069	+ }
	1070	+
	1071	+ function has_secret () {
	1072	+ return ($this->by_request('feedwordpress_key', $this->secret_key()));
	1073	+ }
	1074	+
	1075	+ // Utility function so I don't have to repeat myself w/ 1,000,003 isset()'s
	1076	+ function by_request ($param, $eq = NULL) {
	1077	+ $match = false;
	1078	+ if (isset($_REQUEST[$param])) :
	1079	+ $match = (is_null($eq) ? $_REQUEST[$param] : ($eq==$_REQUEST[$param]));
	1080	+ endif;
	1081	+ return $match;
	1082	+ }
	1083	+
	1084	+ var $update_hooked = NULL;
	1085	+ function automatic_update_hook ($params = array()) {
	1086	+ $params = wp_parse_args($params, array( // Defaults
	1087	+ 'setting only' => false,
	1088	+ ));
	1089	+ $hook = get_option('feedwordpress_automatic_updates', NULL);
	1090	+ $method = 'FeedWordPress option';
	1091	+
	1092	+ // Allow for forced behavior in testing.
	1093	+ if (
	1094	+ !$params['setting only']
	1095	+ and $this->has_secret()
	1096	+ and $this->by_request('automatic_update')
	1097	+ ) :
	1098	+ $hook = $_REQUEST['automatic_update'];
	1099	+ $method = 'URL parameter';
	1100	+ endif;
	1101	+
	1102	+ $exact = $hook; // Before munging
	1103	+
	1104	+ if (!!$hook) :
	1105	+ if ($hook != 'init') : // Constrain values.
	1106	+ $hook = 'shutdown';
	1107	+ endif;
	1108	+ endif;
	1109	+
	1110	+ if ($hook) :
	1111	+ $this->update_hooked = "Initiating an AUTOMATIC CHECK FOR UPDATES ON PAGE LOAD ".$hook." due to ".$method." = ".trim($this->val($exact));
	1112	+ endif;
	1113	+
	1114	+ return $hook;
	1115	+ }
	1116	+ function last_update_all () {
	1117	+ $last = get_option('feedwordpress_last_update_all');
	1118	+ if ($this->has_secret() and $this->by_request('automatic_update')) :
	1119	+ $last = 1; // A long, long time ago.
	1120	+ elseif ($this->has_secret() and $this->by_request('last_update_all')) :
	1121	+ $last = $_REQUEST['last_update_all'];
	1122	+ endif;
	1123	+ return $last;
	1124	+ }
	1125	+ function force_update_all () {
	1126	+ return ($this->has_secret() and $this->by_request('force_update_feeds'));
	1127	+ }
	1128	+
1005	1129	function stale () {
1006		- if (get_option('feedwordpress_automatic_updates')) :
	1130	+ if (!is_null($this->automatic_update_hook())) :
1007	1131	// Do our best to avoid possible simultaneous
1008	1132	// updates by getting up-to-the-minute settings.
1009	1133
1010		- $last = get_option('feedwordpress_last_update_all');
	1134	+ $last = $this->last_update_all();
1011	1135
1012	1136	// If we haven't updated all yet, give it a time window
1013	1137	if (false === $last) :
1014	1138	$ret = false;
		@@ -1019,13 +1143,13 @@
1019	1143	$freshness = get_option('feedwordpress_freshness');
1020	1144	if (false === $freshness) : // Use default
1021	1145	$freshness = FEEDWORDPRESS_FRESHNESS_INTERVAL;
1022	1146	endif;
1023		- $ret = ( (time() - $last) > $freshness);
1024		-
1025		- // This should never happen.
	1147	+ $ret = ( (time() - $last) > $freshness );
	1148	+
	1149	+ // This should never happen.
1026	1150	else :
1027		- FeedWordPress::critical_bug('FeedWordPress::stale::last', $last, __LINE__);
	1151	+ FeedWordPress::critical_bug('FeedWordPress::stale::last', $last, __LINE__, __FILE__);
1028	1152	endif;
1029	1153
1030	1154	else :
1031	1155	$ret = false;
		@@ -1031,69 +1155,203 @@
1031	1155	$ret = false;
1032	1156	endif;
1033	1157	return $ret;
1034	1158	} // FeedWordPress::stale()
	1159	+
	1160	+ function init () {
	1161	+ global $fwp_path;
	1162	+
	1163	+ // If this is a FeedWordPress admin page, queue up scripts for AJAX
	1164	+ // functions that FWP uses. If it is a display page or a non-FWP admin
	1165	+ // page, don't.
	1166	+ wp_register_style('feedwordpress-elements', WP_PLUGIN_URL.'/'.$fwp_path.'/feedwordpress-elements.css');
	1167	+ if (FeedWordPressSettingsUI::is_admin()) :
	1168	+ // For JavaScript that needs to be generated dynamically
	1169	+ add_action('admin_print_scripts', array('FeedWordPressSettingsUI', 'admin_scripts'));
	1170	+
	1171	+ // For CSS that needs to be generated dynamically.
	1172	+ add_action('admin_print_styles', array('FeedWordPressSettingsUI', 'admin_styles'));
	1173	+
	1174	+ wp_enqueue_style('dashboard');
	1175	+ wp_enqueue_style('feedwordpress-elements');
	1176	+
	1177	+ if (function_exists('wp_admin_css')) :
	1178	+ wp_admin_css('css/dashboard');
	1179	+ endif;
	1180	+ endif;
	1181	+
	1182	+ $this->clear_cache_magic_url();
	1183	+ $this->update_magic_url();
	1184	+ } /* FeedWordPress::init() */
1035	1185
1036		- function update_requested () {
	1186	+ function dashboard_setup () {
	1187	+ $see_it = FeedWordPress::menu_cap();
	1188	+
	1189	+ if (current_user_can($see_it)) :
	1190	+ // Get the stylesheet
	1191	+ wp_enqueue_style('feedwordpress-elements');
	1192	+
	1193	+ $widget_id = 'feedwordpress_dashboard';
	1194	+ $widget_name = __('Syndicated Sources');
	1195	+ $column = 'side';
	1196	+ $priority = 'core';
	1197	+
	1198	+ // I would love to use wp_add_dashboard_widget() here and save
	1199	+ // myself some trouble. But WP 3 does not yet have any way to
	1200	+ // push a dashboard widget onto the side, or to give it a default
	1201	+ // location.
	1202	+ add_meta_box(
	1203	+ /id=/ $widget_id,
	1204	+ /title=/ $widget_name,
	1205	+ /callback=/ array(&$this, 'dashboard'),
	1206	+ /page=/ 'dashboard',
	1207	+ /context=/ $column,
	1208	+ /priority=/ $priority
	1209	+ );
	1210	+ /control_callback= array(&$this, 'dashboard_control') /
	1211	+
	1212	+ // This is kind of rude, I know, but the dashboard widget isn't
	1213	+ // worth much if users don't know that it exists, and I don't
	1214	+ // know of any better way to reorder the boxen.
	1215	+ //
	1216	+ // Gleefully ripped off of codex.wordpress.org/Dashboard_Widgets_API
	1217	+
	1218	+ // Globalize the metaboxes array, this holds all the widgets for wp-admin
	1219	+ global $wp_meta_boxes;
	1220	+
	1221	+ // Get the regular dashboard widgets array
	1222	+ // (which has our new widget already but at the end)
	1223	+
	1224	+ $normal_dashboard = $wp_meta_boxes['dashboard'][$column][$priority];
	1225	+
	1226	+ // Backup and delete our new dashbaord widget from the end of the array
	1227	+ if (isset($normal_dashboard[$widget_id])) :
	1228	+ $backup = array();
	1229	+ $backup[$widget_id] = $normal_dashboard[$widget_id];
	1230	+ unset($normal_dashboard[$widget_id]);
	1231	+
	1232	+ // Merge the two arrays together so our widget is at the
	1233	+ // beginning
	1234	+ $sorted_dashboard = array_merge($backup, $normal_dashboard);
	1235	+
	1236	+ // Save the sorted array back into the original metaboxes
	1237	+ $wp_meta_boxes['dashboard'][$column][$priority] = $sorted_dashboard;
	1238	+ endif;
	1239	+ endif;
	1240	+ } /* FeedWordPress::dashboard_setup () */
	1241	+
	1242	+ function dashboard () {
	1243	+ $syndicationPage = new FeedWordPressSyndicationPage(dirname(__FILE__).'/syndication.php');
	1244	+ $syndicationPage->dashboard_box($syndicationPage);
	1245	+ } /* FeedWordPress::dashboard () */
	1246	+
	1247	+ function update_magic_url () {
	1248	+ global $wpdb;
	1249	+
	1250	+ // Explicit update request in the HTTP request (e.g. from a cron job)
	1251	+ if ($this->update_requested()) :
	1252	+ $this->update_hooked = "Initiating a CRON JOB CHECK-IN ON UPDATE SCHEDULE due to URL parameter = ".trim($this->val($_REQUEST['update_feedwordpress']));
	1253	+
	1254	+ $this->update($this->update_requested_url());
	1255	+
	1256	+ if (FEEDWORDPRESS_DEBUG and count($wpdb->queries) > 0) :
	1257	+ $mysqlTime = 0.0;
	1258	+ $byTime = array();
	1259	+ foreach ($wpdb->queries as $query) :
	1260	+ $time = $query[1] * 1000000.0;
	1261	+ $mysqlTime += $query[1];
	1262	+ if (!isset($byTime[$time])) : $byTime[$time] = array(); endif;
	1263	+ $byTime[$time][] = $query[0]. ' // STACK: ' . $query[2];
	1264	+ endforeach;
	1265	+ krsort($byTime);
	1266	+
	1267	+ foreach ($byTime as $time => $querySet) :
	1268	+ foreach ($querySet as $query) :
	1269	+ print "[".(sprintf('%4.4f', $time/1000.0)) . "ms] $query\n";
	1270	+ endforeach;
	1271	+ endforeach;
	1272	+ echo $this->log_prefix()."$wpdb->num_queries queries. $mysqlTime seconds in MySQL. Total of "; timer_stop(1); print " seconds.";
	1273	+ endif;
	1274	+
	1275	+ debug_out_feedwordpress_footer();
	1276	+
	1277	+ // Magic URL should return nothing but a 200 OK header packet
	1278	+ // when successful.
	1279	+ exit;
	1280	+ endif;
	1281	+ } /* FeedWordPress::magic_update_url () */
	1282	+
	1283	+ function clear_cache_magic_url () {
	1284	+ if ($this->clear_cache_requested()) :
	1285	+ $this->clear_cache();
	1286	+ endif;
	1287	+ } /* FeedWordPress::clear_cache_magic_url() */
	1288	+
	1289	+ function clear_cache_requested () {
1037	1290	return (
1038		- isset($_REQUEST['update_feedwordpress'])
1039		- and $_REQUEST['update_feedwordpress']
	1291	+ isset($_GET['clear_cache'])
	1292	+ and $_GET['clear_cache']
1040	1293	);
	1294	+ } /* FeedWordPress::clear_cache_requested() */
	1295	+
	1296	+ function update_requested () {
	1297	+ return FeedWordPress::by_request('update_feedwordpress');
1041	1298	} // FeedWordPress::update_requested()
1042	1299
1043	1300	function update_requested_url () {
1044		- $ret = null;
1045		-
1046		- if (($_REQUEST['update_feedwordpress']=='*')
1047		- or (preg_match('\|^http://.*\|i', $_REQUEST['update_feedwordpress']))) :
1048		- $ret = $_REQUEST['update_feedwordpress'];
1049		- endif;
	1301	+ $ret = null;
	1302	+
	1303	+ if (($_REQUEST['update_feedwordpress']=='*')
	1304	+ or (preg_match('\|^http://.*\|i', $_REQUEST['update_feedwordpress']))) :
	1305	+ $ret = $_REQUEST['update_feedwordpress'];
	1306	+ endif;
1050	1307
1051		- return $ret;
	1308	+ return $ret;
1052	1309	} // FeedWordPress::update_requested_url()
1053	1310
1054		- function syndicate_link ($name, $uri, $rss) {
	1311	+ function auto_update () {
	1312	+ if ($this->stale()) :
	1313	+ $this->update();
	1314	+ endif;
	1315	+ } /* FeedWordPress::auto_update () */
	1316	+
	1317	+ function find_link ($uri, $field = 'link_rss') {
1055	1318	global $wpdb;
1056	1319
	1320	+ $unslashed = untrailingslashit($uri);
	1321	+ $slashed = trailingslashit($uri);
	1322	+ $link_id = $wpdb->get_var($wpdb->prepare("
	1323	+ SELECT link_id FROM $wpdb->links WHERE $field IN ('%s', '%s')
	1324	+ LIMIT 1", $unslashed, $slashed
	1325	+ ));
	1326	+
	1327	+ return $link_id;
	1328	+ } /* FeedWordPress::find_link () */
	1329	+
	1330	+ function syndicate_link ($name, $uri, $rss) {
1057	1331	// Get the category ID#
1058	1332	$cat_id = FeedWordPress::link_category_id();
1059		-
	1333	+ if (!is_wp_error($cat_id)) :
	1334	+ $link_category = array($cat_id);
	1335	+ else :
	1336	+ $link_category = array();
	1337	+ endif;
	1338	+
1060	1339	// WordPress gets cranky if there's no homepage URI
1061		- if (!isset($uri) or strlen($uri)<1) : $uri = $rss; endif;
	1340	+ if (!is_string($uri) or strlen($uri)<1) : $uri = $rss; endif;
1062	1341
1063		- if (function_exists('wp_insert_link')) : // WordPress 2.x
1064		- if (FeedWordPressCompatibility::test_version(0, FWP_SCHEMA_21)) :
1065		- // Morons.
1066		- $name = $wpdb->escape($name);
1067		- $uri = $wpdb->escape($uri);
1068		- $rss = $wpdb->escape($rss);
1069		-
1070		- // Comes in as a single category
1071		- $linkCats = $cat_id;
1072		- else :
1073		- // Comes in as an array of categories
1074		- $linkCats = array($cat_id);
1075		- endif;
	1342	+ // Check if this feed URL is already being syndicated.
	1343	+ $link_id = wp_insert_link(array(
	1344	+ "link_id" => FeedWordPress::find_link($rss), // insert if nothing was found; else update
	1345	+ "link_rss" => $rss,
	1346	+ "link_name" => $name,
	1347	+ "link_url" => $uri,
	1348	+ "link_category" => $link_category,
	1349	+ "link_visible" => 'Y', // reactivate if inactivated
	1350	+ ));
1076	1351
1077		- $link_id = wp_insert_link(array(
1078		- "link_name" => $name,
1079		- "link_url" => $uri,
1080		- "link_category" => $linkCats,
1081		- "link_rss" => $rss
1082		- ));
1083		- else : // WordPress 1.5.x
1084		- $result = $wpdb->query("
1085		- INSERT INTO $wpdb->links
1086		- SET
1087		- link_name = '".$wpdb->escape($name)."',
1088		- link_url = '".$wpdb->escape($uri)."',
1089		- link_category = '".$wpdb->escape($cat_id)."',
1090		- link_rss = '".$wpdb->escape($rss)."'
1091		- ");
1092		- $link_id = $wpdb->insert_id;
1093		- endif;
1094	1352	return $link_id;
1095		- } // function FeedWordPress::syndicate_link()
	1353	+ } /* function FeedWordPress::syndicate_link() */
1096	1354
1097	1355	/static/ function syndicated_status ($what, $default) {
1098	1356	$ret = get_option("feedwordpress_syndicated_{$what}_status");
1099	1357	if (!$ret) :
		@@ -1101,28 +1359,16 @@
1101	1359	endif;
1102	1360	return $ret;
1103	1361	} /* FeedWordPress::syndicated_status() */
1104	1362
1105		- function on_unfamiliar ($what = 'author', $override = NULL) {
1106		- $set = array(
1107		- 'author' => array('create', 'default', 'filter'),
1108		- 'category' => array('create', 'tag', 'default', 'filter'),
1109		- );
	1363	+ function on_unfamiliar ($what = 'author') {
	1364	+ switch ($what) :
	1365	+ case 'category' : $suffix = ':category'; break;
	1366	+ case 'post_tag' : $suffix = ':post_tag'; break;
	1367	+ default: $suffix = '';
	1368	+ endswitch;
1110	1369
1111		- if (is_string($override)) :
1112		- $ret = strtolower($override);
1113		- else :
1114		- $ret = NULL;
1115		- endif;
1116		-
1117		- if (!is_numeric($override) and !in_array($ret, $set[$what])) :
1118		- $ret = get_option('feedwordpress_unfamiliar_'.$what);
1119		- if (!is_numeric($ret) and !in_array($ret, $set[$what])) :
1120		- $ret = 'create';
1121		- endif;
1122		- endif;
1123		-
1124		- return $ret;
	1370	+ return get_option('feedwordpress_unfamiliar_'.$what, 'create'.$suffix);
1125	1371	} // function FeedWordPress::on_unfamiliar()
1126	1372
1127	1373	function null_email_set () {
1128	1374	$base = get_option('feedwordpress_null_email_set');
		@@ -1148,14 +1394,28 @@
1148	1394	$ret = get_option('feedwordpress_use_aggregator_source_data');
1149	1395	return apply_filters('syndicated_post_use_aggregator_source_data', ($ret=='yes'));
1150	1396	}
1151	1397
1152		- function syndicated_links () {
	1398	+ /**
	1399	+ * FeedWordPress::munge_permalinks: check whether or not FeedWordPress
	1400	+ * should rewrite permalinks for syndicated items to reflect their
	1401	+ * original location.
	1402	+ *
	1403	+ * @return bool TRUE if FeedWordPress SHOULD rewrite permalinks; FALSE otherwise
	1404	+ */
	1405	+ /static/ function munge_permalinks () {
	1406	+ return (get_option('feedwordpress_munge_permalink', /default=/ 'yes') != 'no');
	1407	+ } /* FeedWordPress::munge_permalinks() */
	1408	+
	1409	+ function syndicated_links ($args = array()) {
1153	1410	$contributors = FeedWordPress::link_category_id();
1154		- if (function_exists('get_bookmarks')) :
1155		- $links = get_bookmarks(array("category" => $contributors));
1156		- else:
1157		- $links = get_linkobjects($contributors); // deprecated as of WP 2.1
	1411	+ if (!is_wp_error($contributors)) :
	1412	+ $links = get_bookmarks(array_merge(
	1413	+ array("category" => $contributors),
	1414	+ $args
	1415	+ ));
	1416	+ else :
	1417	+ $links = array();
1158	1418	endif;
1159	1419	return $links;
1160	1420	} // function FeedWordPress::syndicated_links()
1161	1421
		@@ -1181,11 +1441,12 @@
1181	1441	// If we could not find an appropriate link category,
1182	1442	// make a new one for ourselves.
1183	1443	if (!$cat_id) :
1184	1444	$cat_id = FeedWordPressCompatibility::insert_link_category(DEFAULT_SYNDICATION_CATEGORY);
1185		-
1186		- // Stamp it
1187		- update_option('feedwordpress_cat_id', $cat_id);
	1445	+ if (!is_wp_error($cat_id)) :
	1446	+ // Stamp it
	1447	+ update_option('feedwordpress_cat_id', $cat_id);
	1448	+ endif;
1188	1449	endif;
1189	1450
1190	1451	return $cat_id;
1191	1452	} // function FeedWordPress::link_category_id()
		@@ -1211,15 +1472,47 @@
1211	1472	update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
1212	1473	endif;
1213	1474	elseif ($fwp_db_version < 2009.0707) :
1214	1475	// We need to clear out any busted AJAX crap
1215		- if (fwp_test_wp_version(FWP_SCHEMA_HAS_USERMETA)) :
1216		- $wpdb->query("
1217		- DELETE FROM $wpdb->usermeta
1218		- WHERE LOCATE('feedwordpress', meta_key)
1219		- AND LOCATE('box', meta_key);
1220		- ");
	1476	+ $wpdb->query("
	1477	+ DELETE FROM $wpdb->usermeta
	1478	+ WHERE LOCATE('feedwordpress', meta_key)
	1479	+ AND LOCATE('box', meta_key);
	1480	+ ");
	1481	+
	1482	+ update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
	1483	+ elseif ($fwp_db_version < 2010.0814) :
	1484	+ // Change in terminology.
	1485	+ if (get_option('feedwordpress_unfamiliar_category', 'create')=='default') :
	1486	+ update_option('feedwordpress_unfamiliar_category', 'null');
1221	1487	endif;
	1488	+ foreach (FeedWordPress::syndicated_links() as $link) :
	1489	+ $sub = new SyndicatedLink($link);
	1490	+
	1491	+ $remap_uf = array(
	1492	+ 'default' => 'null',
	1493	+ 'filter' => 'null',
	1494	+ 'create' => 'create:category',
	1495	+ 'tag' => 'create:post_tag'
	1496	+ );
	1497	+ if (isset($sub->settings['unfamiliar category'])) :
	1498	+ if ($sub->settings['unfamiliar category']=='filter') :
	1499	+ $sub->settings['match/filter'] = array('category');
	1500	+ endif;
	1501	+ foreach ($remap_uf as $from => $to) :
	1502	+ if ($sub->settings['unfamiliar category']==$from) :
	1503	+ $sub->settings['unfamiliar category'] = $to;
	1504	+ endif;
	1505	+ endforeach;
	1506	+ endif;
	1507	+
	1508	+ if (isset($sub->settings['add global categories'])) :
	1509	+ $sub->settings['add/category'] = $sub->settings['add global categories'];
	1510	+ unset($sub->settings['add global categories']);
	1511	+ endif;
	1512	+
	1513	+ $sub->save_settings(/reload=/ true);
	1514	+ endforeach;
1222	1515	update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
1223	1516	else :
1224	1517	// No. Just brand it with the new version.
1225	1518	update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
		@@ -1233,58 +1526,14 @@
1233	1526
1234	1527	if (is_null($from) or $from <= 0.96) : $from = 0.96; endif;
1235	1528
1236	1529	switch ($from) :
1237		- case 0.96: // account for changes to syndication custom values and guid
1238		- echo "<p>Upgrading database from {$from} to ".FEEDWORDPRESS_VERSION."...</p>\n";
	1530	+ case 0.96:
	1531	+ // Dropping legacy upgrade code. If anyone is still
	1532	+ // using 0.96 and just now decided to upgrade, well, I'm
	1533	+ // sorry about that. You'll just have to cope with a few
	1534	+ // duplicate posts.
1239	1535
1240		- $cat_id = FeedWordPress::link_category_id();
1241		-
1242		- // Avoid duplicates
1243		- $wpdb->query("DELETE FROM `{$wpdb->postmeta}` WHERE meta_key = 'syndication_feed_id'");
1244		-
1245		- // Look up all the link IDs
1246		- $wpdb->query("
1247		- CREATE TEMPORARY TABLE tmp_custom_values
1248		- SELECT
1249		- NULL AS meta_id,
1250		- post_id,
1251		- 'syndication_feed_id' AS meta_key,
1252		- link_id AS meta_value
1253		- FROM `{$wpdb->postmeta}`, `{$wpdb->links}`
1254		- WHERE
1255		- meta_key='syndication_feed'
1256		- AND meta_value=link_rss
1257		- AND link_category = {$cat_id}
1258		- ");
1259		-
1260		- // Now attach them to their posts
1261		- $wpdb->query("INSERT INTO `{$wpdb->postmeta}` SELECT * FROM tmp_custom_values");
1262		-
1263		- // And clean up after ourselves.
1264		- $wpdb->query("DROP TABLE tmp_custom_values");
1265		-
1266		- // Now fix the guids to avoid duplicate posts
1267		- echo "<ul>";
1268		- foreach ($this->feeds as $syndicatedLink) :
1269		- $feed = $syndicatedLink->settings;
1270		- echo "<li>Fixing post meta-data for <cite>".$feed['link/name']."</cite> … "; flush();
1271		- $rss = @fetch_rss($feed['link/uri']);
1272		- if (is_array($rss->items)) :
1273		- foreach ($rss->items as $item) :
1274		- $post = new SyndicatedPost($item, $syndicatedLink);
1275		- $guid = $wpdb->escape($post->guid()); // new GUID algorithm
1276		- $link = $wpdb->escape($item['link']);
1277		-
1278		- $wpdb->query("
1279		- UPDATE `{$wpdb->posts}` SET guid='{$guid}' WHERE guid='{$link}'
1280		- ");
1281		- endforeach;
1282		- endif;
1283		- echo "<strong>complete.</strong></li>\n";
1284		- endforeach;
1285		- echo "</ul>\n";
1286		-
1287	1536	// Mark the upgrade as successful.
1288	1537	update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
1289	1538	endswitch;
1290	1539	echo "<p>Upgrade complete. FeedWordPress is now ready to use again.</p>";
		@@ -1289,8 +1538,27 @@
1289	1538	endswitch;
1290	1539	echo "<p>Upgrade complete. FeedWordPress is now ready to use again.</p>";
1291	1540	} /* FeedWordPress::upgrade_database() */
1292	1541
	1542	+ function has_guid_index () {
	1543	+ global $wpdb;
	1544	+
	1545	+ $found = false; // Guilty until proven innocent.
	1546	+
	1547	+ $results = $wpdb->get_results("
	1548	+ SHOW INDEXES FROM {$wpdb->posts}
	1549	+ ");
	1550	+ if ($results) :
	1551	+ foreach ($results as $index) :
	1552	+ if (isset($index->Column_name)
	1553	+ and ('guid' == $index->Column_name)) :
	1554	+ $found = true;
	1555	+ endif;
	1556	+ endforeach;
	1557	+ endif;
	1558	+ return $found;
	1559	+ } /* FeedWordPress::has_guid_index () */
	1560	+
1293	1561	function create_guid_index () {
1294	1562	global $wpdb;
1295	1563
1296	1564	$wpdb->query("
		@@ -1297,29 +1565,115 @@
1297	1565	CREATE INDEX {$wpdb->posts}_guid_idx ON {$wpdb->posts}(guid)
1298	1566	");
1299	1567	} /* FeedWordPress::create_guid_index () */
1300	1568
	1569	+ function remove_guid_index () {
	1570	+ global $wpdb;
	1571	+
	1572	+ $wpdb->query("
	1573	+ DROP INDEX {$wpdb->posts}_guid_idx ON {$wpdb->posts}
	1574	+ ");
	1575	+ }
	1576	+
	1577	+ /static/ function fetch_timeout () {
	1578	+ return apply_filters(
	1579	+ 'feedwordpress_fetch_timeout',
	1580	+ intval(get_option('feedwordpress_fetch_timeout', FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT))
	1581	+ );
	1582	+ }
	1583	+
	1584	+ /static/ function fetch ($url, $params = array()) {
	1585	+ $force_feed = true; // Default
	1586	+
	1587	+ // 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' =>
	1588	+ $timeout = FeedWordPress::fetch_timeout();
	1589	+
	1590	+ if (!is_array($params)) :
	1591	+ $force_feed = $params;
	1592	+ else : // Parameter array
	1593	+ $args = wp_parse_args(array(
	1594	+ 'force_feed' => $force_feed,
	1595	+ 'timeout' => $timeout
	1596	+ ), $params);
	1597	+
	1598	+ extract($args);
	1599	+ endif;
	1600	+ $timeout = intval($timeout);
	1601	+
	1602	+ $pie_class = apply_filters('feedwordpress_simplepie_class', 'SimplePie');
	1603	+ $cache_class = apply_filters('feedwordpress_cache_class', 'WP_Feed_Cache');
	1604	+ $file_class = apply_filters('feedwordpress_file_class', 'FeedWordPress_File');
	1605	+ $parser_class = apply_filters('feedwordpress_parser_class', 'FeedWordPress_Parser');
	1606	+
	1607	+ $sniffer_class = apply_filters('feedwordpress_sniffer_class', 'FeedWordPress_Content_Type_Sniffer');
	1608	+
	1609	+ $feed = new $pie_class;
	1610	+ $feed->set_feed_url($url);
	1611	+ $feed->set_cache_class($cache_class);
	1612	+ $feed->set_timeout($timeout);
	1613	+
	1614	+ $feed->set_content_type_sniffer_class($sniffer_class);
	1615	+ $feed->set_file_class($file_class);
	1616	+ $feed->set_parser_class($parser_class);
	1617	+ $feed->force_feed($force_feed);
	1618	+ $feed->set_cache_duration(FeedWordPress::cache_duration());
	1619	+ $feed->init();
	1620	+ $feed->handle_content_type();
	1621	+
	1622	+ if ($feed->error()) :
	1623	+ $ret = new WP_Error('simplepie-error', $feed->error());
	1624	+ else :
	1625	+ $ret = $feed;
	1626	+ endif;
	1627	+ return $ret;
	1628	+ } /* FeedWordPress::fetch () */
	1629	+
1301	1630	function clear_cache () {
1302	1631	global $wpdb;
1303	1632
1304		- // MagpieRSS stores its cached feeds in options table rows with
1305		- // name = `rss_{md5 of url}` and timestamps for cached feeds in
1306		- // table rows with name = `rss_{md5 of url}_ts`. The md5 is
1307		- // always 32 characters in length, so the total option_name is
1308		- // always over 32 characters.
1309		- $wpdb->query("
	1633	+ // Just in case, clear out any old MagpieRSS cache records.
	1634	+ $magpies = $wpdb->query("
1310	1635	DELETE FROM {$wpdb->options}
1311		- WHERE LOCATE('rss_', option_name) AND LENGTH(option_name) > 32
	1636	+ WHERE option_name LIKE 'rss_%' AND LENGTH(option_name) > 32
1312	1637	");
	1638	+
	1639	+ // The WordPress SimplePie module stores its cached feeds as
	1640	+ // transient records in the options table. The data itself is
	1641	+ // stored in `_transient_feed_{md5 of url}` and the last-modified
	1642	+ // timestamp in `_transient_feed_mod_{md5 of url}`. Timeouts for
	1643	+ // these records are stored in `_transient_timeout_feed_{md5}`.
	1644	+ // Since the md5 is always 32 characters in length, the
	1645	+ // option_name is always over 32 characters.
	1646	+ $simplepies = $wpdb->query("
	1647	+ DELETE FROM {$wpdb->options}
	1648	+ WHERE option_name LIKE '_transient%_feed_%' AND LENGTH(option_name) > 32
	1649	+ ");
	1650	+ $simplepies = (int) ($simplepies / 4); // Each transient has 4 rows: the data, the modified timestamp; and the timeouts for each
	1651	+
	1652	+ return ($magpies + $simplepies);
1313	1653	} /* FeedWordPress::clear_cache () */
1314	1654
1315		- function magpie_version () {
1316		- if (!defined('MAGPIE_VERSION')) : $magpie_version = $GLOBALS['wp_version'].'-default';
1317		- else : $magpie_version = MAGPIE_VERSION;
	1655	+ function cache_duration () {
	1656	+ $duration = NULL;
	1657	+ if (defined('FEEDWORDPRESS_CACHE_AGE')) :
	1658	+ $duration = FEEDWORDPRESS_CACHE_AGE;
1318	1659	endif;
1319		- return $magpie_version;
	1660	+ return $duration;
1320	1661	}
	1662	+ function cache_lifetime ($duration) {
	1663	+ // Check for explicit setting of a lifetime duration
	1664	+ if (defined('FEEDWORDPRESS_CACHE_LIFETIME')) :
	1665	+ $duration = FEEDWORDPRESS_CACHE_LIFETIME;
1321	1666
	1667	+ // Fall back to the cache freshness duration
	1668	+ elseif (defined('FEEDWORDPRESS_CACHE_AGE')) :
	1669	+ $duration = FEEDWORDPRESS_CACHE_AGE;
	1670	+ endif;
	1671	+
	1672	+ // Fall back to WordPress default
	1673	+ return $duration;
	1674	+ } /* FeedWordPress::cache_lifetime () */
	1675	+
1322	1676	# Utility functions for handling text settings
1323	1677	function negative ($f, $setting) {
1324	1678	$nego = array ('n', 'no', 'f', 'false');
1325	1679	return (isset($f[$setting]) and in_array(strtolower($f[$setting]), $nego));
		@@ -1329,67 +1683,287 @@
1329	1683	$affirmo = array ('y', 'yes', 't', 'true', 1);
1330	1684	return (isset($f[$setting]) and in_array(strtolower($f[$setting]), $affirmo));
1331	1685	}
1332	1686
1333		-
1334	1687	# Internal debugging functions
1335		- function critical_bug ($varname, $var, $line) {
	1688	+ function critical_bug ($varname, $var, $line, $file = NULL) {
1336	1689	global $wp_version;
1337		-
1338		- if (defined('MAGPIE_VERSION')) : $mv = MAGPIE_VERSION;
1339		- else : $mv = 'WordPress '.$wp_version.' default.';
	1690	+
	1691	+ if (!is_null($file)) :
	1692	+ $location = "line # ${line} of ".basename($file);
	1693	+ else :
	1694	+ $location = "line # ${line}";
1340	1695	endif;
1341		-
1342		- echo '<p>There may be a bug in FeedWordPress. Please <a href="'.FEEDWORDPRESS_AUTHOR_CONTACT.'">contact the author</a> and paste the following information into your e-mail:</p>';
1343		- echo "\n<plaintext>";
1344		- echo "Triggered at line # ".$line."\n";
1345		- echo "FeedWordPress version: ".FEEDWORDPRESS_VERSION."\n";
1346		- echo "MagpieRSS version: {$mv}\n";
1347		- echo "WordPress version: {$wp_version}\n";
1348		- echo "PHP version: ".phpversion()."\n";
1349		- echo "\n";
1350		- echo $varname.": "; var_dump($var); echo "\n";
	1696	+
	1697	+ 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>';
	1698	+ print "\n<plaintext>";
	1699	+ print "Triggered at ${location}\n";
	1700	+ print "FeedWordPress: ".FEEDWORDPRESS_VERSION."\n";
	1701	+ print "WordPress: {$wp_version}\n";
	1702	+ print "PHP: ".phpversion()."\n";
	1703	+ print "Error data: ";
	1704	+ print $varname.": "; var_dump($var); echo "\n";
1351	1705	die;
1352	1706	}
1353	1707
1354		- function noncritical_bug ($varname, $var, $line) {
	1708	+ function noncritical_bug ($varname, $var, $line, $file = NULL) {
1355	1709	if (FEEDWORDPRESS_DEBUG) : // halt only when we are doing debugging
1356		- FeedWordPress::critical_bug($varname, $var, $line);
	1710	+ FeedWordPress::critical_bug($varname, $var, $line, $file);
1357	1711	endif;
1358	1712	}
1359		-} // class FeedWordPress
	1713	+
	1714	+ function val ($v, $no_newlines = false) {
	1715	+ ob_start();
	1716	+ var_dump($v);
	1717	+ $out = ob_get_contents(); ob_end_clean();
	1718	+
	1719	+ if ($no_newlines) :
	1720	+ $out = preg_replace('/\s+/', " ", $out);
	1721	+ endif;
	1722	+ return $out;
	1723	+ } /* FeedWordPress::val () */
1360	1724
1361		-require_once(dirname(__FILE__) . '/syndicatedpost.class.php');
1362		-require_once(dirname(__FILE__) . '/syndicatedlink.class.php');
	1725	+ function diagnostic_on ($level) {
	1726	+ $show = get_option('feedwordpress_diagnostics_show', array());
	1727	+ return (in_array($level, $show));
	1728	+ } /* FeedWordPress::diagnostic_on () */
1363	1729
1364		-################################################################################
1365		-## XML-RPC HOOKS: accept XML-RPC update pings from Contributors ################
1366		-################################################################################
	1730	+ function diagnostic ($level, $out, $persist = NULL, $since = NULL, $mostRecent = NULL) {
	1731	+ global $feedwordpress_admin_footer;
1367	1732
1368		-function feedwordpress_xmlrpc_hook ($args = array ()) {
1369		- $args['weblogUpdates.ping'] = 'feedwordpress_pong';
1370		- return $args;
1371		-}
	1733	+ $output = get_option('feedwordpress_diagnostics_output', array());
	1734	+ $dlog = get_option('feedwordpress_diagnostics_log', array());
1372	1735
1373		-function feedwordpress_pong ($args) {
1374		- $feedwordpress =& new FeedWordPress;
1375		- $delta = @$feedwordpress->update($args[1]);
1376		- if (is_null($delta)):
1377		- return array('flerror' => true, 'message' => "Sorry. I don't syndicate <$args[1]>.");
1378		- else:
1379		- $mesg = array();
1380		- if (isset($delta['new'])) { $mesg[] = ' '.$delta['new'].' new posts were syndicated'; }
1381		- if (isset($delta['updated'])) { $mesg[] = ' '.$delta['updated'].' existing posts were updated'; }
	1736	+ $diagnostic_nesting = count(explode(":", $level));
1382	1737
1383		- return array('flerror' => false, 'message' => "Thanks for the ping.".implode(' and', $mesg));
1384		- endif;
1385		-}
	1738	+ if (FeedWordPress::diagnostic_on($level)) :
	1739	+ foreach ($output as $method) :
	1740	+ switch ($method) :
	1741	+ case 'echo' :
	1742	+ if (!FeedWordPress::update_requested()) :
	1743	+ echo "<div><pre><strong>Diag".str_repeat('====', $diagnostic_nesting-1).'\|</strong> '.$out."</pre></div>";
	1744	+ endif;
	1745	+ break;
	1746	+ case 'echo_in_cronjob' :
	1747	+ if (FeedWordPress::update_requested()) :
	1748	+ echo FeedWordPress::log_prefix()." ".$out."\n";
	1749	+ endif;
	1750	+ break;
	1751	+ case 'admin_footer' :
	1752	+ $feedwordpress_admin_footer[] = $out;
	1753	+ break;
	1754	+ case 'error_log' :
	1755	+ error_log(FeedWordPress::log_prefix().' '.$out);
	1756	+ break;
	1757	+ case 'email' :
	1758	+ if (is_null($persist)) :
	1759	+ $sect = 'occurrent';
	1760	+ $hook = (isset($dlog['mesg'][$sect]) ? count($dlog['mesg'][$sect]) : 0);
	1761	+ $line = array("Time" => time(), "Message" => $out);
	1762	+ else :
	1763	+ $sect = 'persistent';
	1764	+ $hook = md5($level."\n".$persist);
	1765	+ $line = array("Since" => $since, "Message" => $out, "Most Recent" => $mostRecent);
	1766	+ endif;
	1767	+
	1768	+ if (!isset($dlog['mesg'])) : $dlog['mesg'] = array(); endif;
	1769	+ if (!isset($dlog['mesg'][$sect])) : $dlog['mesg'][$sect] = array(); endif;
	1770	+
	1771	+ $dlog['mesg'][$sect][$hook] = $line;
	1772	+ endswitch;
	1773	+ endforeach;
	1774	+ endif;
	1775	+
	1776	+ update_option('feedwordpress_diagnostics_log', $dlog);
	1777	+ } /* FeedWordPress::diagnostic () */
	1778	+
	1779	+ function email_diagnostics_override () {
	1780	+ return ($this->has_secret() and isset($_REQUEST['feedwordpress_email_diagnostics']) and !!$_REQUEST['feedwordpress_email_diagnostics']);
	1781	+ }
	1782	+ function has_emailed_diagnostics ($dlog) {
	1783	+ $ret = false;
	1784	+ if ($this->email_diagnostics_override()
	1785	+ or (isset($dlog['schedule']) and isset($dlog['schedule']['last']))) :
	1786	+ $ret = true;
	1787	+ endif;
	1788	+ return $ret;
	1789	+ }
	1790	+ function ready_to_email_diagnostics ($dlog) {
	1791	+ $ret = false;
	1792	+ if ($this->email_diagnostics_override()
	1793	+ or (time() > ($dlog['schedule']['last'] + $dlog['schedule']['freq']))) :
	1794	+ $ret = true;
	1795	+ endif;
	1796	+ return $ret;
	1797	+ }
	1798	+
	1799	+ function email_diagnostic_log () {
	1800	+ $dlog = get_option('feedwordpress_diagnostics_log', array());
	1801	+
	1802	+ if ($this->has_emailed_diagnostics($dlog)) :
	1803	+ if ($this->ready_to_email_diagnostics($dlog)) :
	1804	+ // No news is good news; only send if
	1805	+ // there are some messages to send.
	1806	+ $body = NULL;
	1807	+ if (!isset($dlog['mesg'])) : $dlog['mesg'] = array(); endif;
	1808	+
	1809	+ foreach ($dlog['mesg'] as $sect => $mesgs) :
	1810	+ if (count($mesgs) > 0) :
	1811	+ if (is_null($body)) : $body = ''; endif;
	1812	+
	1813	+ $paradigm = reset($mesgs);
	1814	+ $body .= "<h2>".ucfirst($sect)." issues</h2>\n"
	1815	+ ."<table>\n"
	1816	+ ."<thead><tr>\n";
	1817	+ foreach ($paradigm as $col => $value) :
	1818	+ $body .= '<th scope="col">'.$col."</th>\n";
	1819	+ endforeach;
	1820	+ $body .= "</tr></thead>\n"
	1821	+ ."<tbody>\n";
	1822	+
	1823	+ foreach ($mesgs as $line) :
	1824	+ $body .= "<tr>\n";
	1825	+ foreach ($line as $col => $cell) :
	1826	+ if (is_numeric($cell)) :
	1827	+ $cell = date('j-M-y, h:i a', $cell);
	1828	+ endif;
	1829	+ $class = strtolower(preg_replace('/\s+/', '-', $col));
	1830	+ $body .= "<td class=\"$class\">${cell}</td>";
	1831	+ endforeach;
	1832	+ $body .= "</tr>\n";
	1833	+ endforeach;
	1834	+
	1835	+ $body .= "</tbody>\n</table>\n\n";
	1836	+ endif;
	1837	+ endforeach;
	1838	+
	1839	+ $body = apply_filters('feedwordpress_diagnostic_email_body', $body, $dlog);
	1840	+ if (!is_null($body)) :
	1841	+ $home = feedwordpress_display_url(get_bloginfo('url'));
	1842	+ $subj = apply_filters('feedwordpress_diagnostic_email_subject', $home . " syndication issues", $dlog);
	1843	+ $agent = 'FeedWordPress '.FEEDWORDPRESS_VERSION;
	1844	+ $body = <<<EOMAIL
	1845	+<html>
	1846	+<head>
	1847	+<title>$subj</title>
	1848	+<style type="text/css">
	1849	+ body { background-color: white; color: black; }
	1850	+ table { width: 100%; border: 1px solid black; }
	1851	+ table thead tr th { background-color: #ff7700; color: white; border-bottom: 1px solid black; }
	1852	+ table thead tr { border-bottom: 1px solid black; }
	1853	+ table tr { vertical-align: top; }
	1854	+ table .since { width: 20%; }
	1855	+ table .time { width: 20%; }
	1856	+ table .most-recently { width: 20%; }
	1857	+ table .message { width: auto; }
	1858	+</style>
	1859	+</head>
	1860	+<body>
	1861	+<h1>Syndication Issues encountered by $agent on $home</h1>
	1862	+$body
	1863	+</body>
	1864	+</html>
1386	1865
1387		-# The upgraded MagpieRSS also uses this class. So if we have it loaded
1388		-# in, don't load it again.
1389		-if (!class_exists('Relative_URI')) {
1390		- require_once(dirname(__FILE__) . '/relative_uri.class.php');
1391		-}
	1866	+EOMAIL;
	1867	+
	1868	+ $ded = get_option('feedwordpress_diagnostics_email_destination', 'admins');
	1869	+
	1870	+ // e-mail address
	1871	+ if (preg_match('/^mailto:(.*)$/', $ded, $ref)) :
	1872	+ $recipients = array($ref[1]);
	1873	+
	1874	+ // userid
	1875	+ elseif (preg_match('/^user:(.*)$/', $ded, $ref)) :
	1876	+ $userdata = get_userdata((int) $ref[1]);
	1877	+ $recipients = array($userdata->user_email);
	1878	+
	1879	+ // admins
	1880	+ else :
	1881	+ $recipients = FeedWordPressDiagnostic::admin_emails();
	1882	+ endif;
	1883	+
	1884	+ foreach ($recipients as $email) :
	1885	+ add_filter('wp_mail_content_type', array('FeedWordPress', 'allow_html_mail'));
	1886	+ wp_mail($email, $subj, $body);
	1887	+ remove_filter('wp_mail_content_type', array('FeedWordPress', 'allow_html_mail'));
	1888	+ endforeach;
	1889	+ endif;
	1890	+
	1891	+ // Clear the logs
	1892	+ $dlog['mesg']['persistent'] = array();
	1893	+ $dlog['mesg']['occurrent'] = array();
	1894	+
	1895	+ // Set schedule for next update
	1896	+ $dlog['schedule']['last'] = time();
	1897	+ endif;
	1898	+ else :
	1899	+ $dlog['schedule'] = array(
	1900	+ 'freq' => 24 /hr/ * 60 /min/ * 60 /s/,
	1901	+ 'last' => time(),
	1902	+ );
	1903	+ endif;
	1904	+
	1905	+ update_option('feedwordpress_diagnostics_log', $dlog);
	1906	+ } /* FeedWordPress::email_diagnostic_log () */
	1907	+
	1908	+ function allow_html_mail () {
	1909	+ return 'text/html';
	1910	+ } /* FeedWordPress::allow_html_mail () */
	1911	+
	1912	+ function admin_footer () {
	1913	+ global $feedwordpress_admin_footer;
	1914	+ foreach ($feedwordpress_admin_footer as $line) :
	1915	+ echo '<div><pre>'.$line.'</pre></div>';
	1916	+ endforeach;
	1917	+ } /* FeedWordPress::admin_footer () */
	1918	+
	1919	+ function log_prefix ($date = false) {
	1920	+ $home = get_bloginfo('url');
	1921	+ $prefix = '['.feedwordpress_display_url($home).'] [feedwordpress] ';
	1922	+ if ($date) :
	1923	+ $prefix = "[".date('Y-m-d H:i:s')."]".$prefix;
	1924	+ endif;
	1925	+ return $prefix;
	1926	+ } /* FeedWordPress::log_prefix () */
	1927	+
	1928	+ function menu_cap ($sub = false) {
	1929	+ if ($sub) :
	1930	+ $cap = apply_filters('feedwordpress_menu_settings_capacity', 'manage_options');
	1931	+ else :
	1932	+ $cap = apply_filters('feedwordpress_menu_main_capacity', 'manage_links');
	1933	+ endif;
	1934	+ return $cap;
	1935	+ } /* FeedWordPress::menu_cap () */
	1936	+
	1937	+ function path ($filename = '') {
	1938	+ global $fwp_path;
	1939	+
	1940	+ $path = $fwp_path;
	1941	+ if (strlen($filename) > 0) :
	1942	+ $path .= '/'.$filename;
	1943	+ endif;
	1944	+ return $path;
	1945	+ }
	1946	+
	1947	+ function param ($key, $type = 'REQUEST', $default = NULL) {
	1948	+ $where = '_'.strtoupper($type);
	1949	+ $ret = $default;
	1950	+ if (isset($GLOBALS[$where]) and is_array($GLOBALS[$where])) :
	1951	+ if (isset($GLOBALS[$where][$key])) :
	1952	+ $ret = $GLOBALS[$where][$key];
	1953	+ if (get_magic_quotes_gpc()) :
	1954	+ $ret = stripslashes_deep($ret);
	1955	+ endif;
	1956	+ endif;
	1957	+ endif;
	1958	+ return $ret;
	1959	+ }
	1960	+ function post ($key, $default = NULL) {
	1961	+ return FeedWordPress::param($key, 'POST');
	1962	+ }
	1963	+} // class FeedWordPress
	1964	+
	1965	+$feedwordpress_admin_footer = array();
1392	1966
1393	1967	// take your best guess at the realname and e-mail, given a string
1394	1968	define('FWP_REGEX_EMAIL_ADDY', '([^@"(<\s]+@[^"@(<\s]+\.[^"@(<\s]+)');
1395	1969	define('FWP_REGEX_EMAIL_NAME', '("([^"]*)"\|([^"<(]+\S))');