← All changes | feedwordpress.php +1425 -549 2009.1112 → 2011.0602 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: 2009.1112
	6	+Version: 2011.0602
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.0602
	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', '2009.1112');
	37	+define ('FEEDWORDPRESS_VERSION', '2011.0602');
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
		@@ -59,14 +70,15 @@
59	70	define ('FWP_SCHEMA_25', 7558); // Database schema # for WP 2.5
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
	74	+define ('FWP_SCHEMA_29', 12329); // Database schema # for WP 2.9
	75	+define ('FWP_SCHEMA_30', 12694); // Database schema # for WP 3.0
63	76
64	77	if (FEEDWORDPRESS_DEBUG) :
65	78	// Help us to pick out errors, if any.
66	79	ini_set('error_reporting', E_ALL & ~E_NOTICE);
67	80	ini_set('display_errors', true);
68		- define('MAGPIE_DEBUG', true);
69	81
70	82	// When testing we don't want cache issues to interfere. But this is
71	83	// a VERY BAD SETTING for a production server. Webmasters will eat your
72	84	// face for breakfast if you use it, and the baby Jesus will cry. So
		@@ -71,48 +83,55 @@
71	83	// a VERY BAD SETTING for a production server. Webmasters will eat your
72	84	// face for breakfast if you use it, and the baby Jesus will cry. So
73	85	// make sure FEEDWORDPRESS_DEBUG is FALSE for any site that will be
74	86	// used for more than testing purposes!
75		- define('MAGPIE_CACHE_AGE', 1);
	87	+ define('FEEDWORDPRESS_CACHE_AGE', 1);
	88	+ define('FEEDWORDPRESS_CACHE_LIFETIME', 1);
	89	+ define('FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT', 60);
76	90	else :
77		- define('MAGPIE_DEBUG', false);
78		-
79		- 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', 24*60*60);
	94	+ define('FEEDWORDPRESS_CACHE_AGE', 1*60);
	95	+ define('FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT', 20);
80	96	endif;
81	97
82		-// Note that the rss-functions.php that comes prepackaged with WordPress is
83		-// old & busted. For the new hotness, drop a copy of rss.php from
84		-// 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'));
85	100
86		-if (is_readable(ABSPATH . WPINC . '/rss.php')) :
87		- require_once (ABSPATH . WPINC . '/rss.php');
88		-else :
89		- 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');
90	105	endif;
	106	+require_once(ABSPATH . WPINC . '/class-feed.php');
91	107
92		-if (isset($wp_db_version)) :
93		- if ($wp_db_version >= FWP_SCHEMA_23) :
94		- require_once (ABSPATH . WPINC . '/registration.php'); // for wp_insert_user
95		- elseif ($wp_db_version >= FWP_SCHEMA_21) : // WordPress 2.1 and 2.2, but not 2.3
96		- require_once (ABSPATH . WPINC . '/registration.php'); // for wp_insert_user
97		- require_once (ABSPATH . 'wp-admin/admin-db.php'); // for wp_insert_category
98		- elseif ($wp_db_version >= FWP_SCHEMA_20) : // WordPress 2.0
99		- require_once (ABSPATH . WPINC . '/registration-functions.php'); // for wp_insert_user
100		- require_once (ABSPATH . 'wp-admin/admin-db.php'); // for wp_insert_category
101		- endif;
	108	+if (!function_exists('wp_insert_user')) :
	109	+ require_once (ABSPATH . WPINC . '/registration.php'); // for wp_insert_user
102	110	endif;
103	111
104		-require_once(dirname(__FILE__) . '/compatability.php'); // LEGACY API: Replicate or mock up functions for legacy support purposes
105		-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");
106	122
107	123	// Magic quotes are just about the stupidest thing ever.
108	124	if (is_array($_POST)) :
109		- $fwp_post = stripslashes_deep($_POST);
	125	+ $fwp_post = $_POST;
	126	+ if (get_magic_quotes_gpc()) :
	127	+ $fwp_post = stripslashes_deep($fwp_post);
	128	+ endif;
110	129	endif;
111	130
112	131	// Get the path relative to the plugins directory in which FWP is stored
113	132	preg_match (
114		- '|/wp-content/plugins/(.+)$|',
	133	+ '|'.preg_quote(WP_PLUGIN_DIR).'/(.+)$|',
115	134	dirname(__FILE__),
116	135	$ref
117	136	);
118	137
		@@ -123,27 +142,21 @@
123	142	endif;
124	143
125	144	// If this is a FeedWordPress admin page, queue up scripts for AJAX functions that FWP uses
126	145	// If it is a display page or a non-FeedWordPress admin page, don't.
127		-if (is_admin() and isset($_REQUEST['page']) and preg_match("|^{$fwp_path}/|", $_REQUEST['page'])) :
128		- if (function_exists('wp_enqueue_script')) :
129		- if (isset($wp_db_version) and $wp_db_version >= FWP_SCHEMA_25) :
130		- wp_enqueue_script('post'); // for magic tag and category boxes
131		- wp_enqueue_script('thickbox'); // for fold-up boxes
132		- wp_enqueue_script('admin-forms'); // for checkbox selection
133		- else :
134		- wp_enqueue_script( 'ajaxcat' ); // Provides the handy-dandy new category text box
135		- endif;
136		- endif;
137		- if (function_exists('wp_enqueue_style')) :
138		- if (fwp_test_wp_version(FWP_SCHEMA_25)) :
139		- wp_enqueue_style('dashboard');
140		- endif;
141		- endif;
	146	+wp_register_style('feedwordpress-elements', WP_PLUGIN_URL.'/'.$fwp_path.'/feedwordpress-elements.css');
	147	+if (FeedWordPressSettingsUI::is_admin()) :
	148	+ // For JavaScript that needs to be generated dynamically
	149	+ add_action('admin_print_scripts', array('FeedWordPressSettingsUI', 'admin_scripts'));
	150	+
	151	+ // For CSS that needs to be generated dynamically.
	152	+ add_action('admin_print_styles', array('FeedWordPressSettingsUI', 'admin_styles'));
	153	+
	154	+ wp_enqueue_style('dashboard');
	155	+ wp_enqueue_style('feedwordpress-elements');
	156	+
142	157	if (function_exists('wp_admin_css')) :
143		- if (fwp_test_wp_version(FWP_SCHEMA_25)) :
144		- wp_admin_css('css/dashboard');
145		- endif;
	158	+ wp_admin_css('css/dashboard');
146	159	endif;
147	160	endif;
148	161
149	162	if (!FeedWordPress::needs_upgrade()) : // only work if the conditions are safe!
		@@ -166,10 +179,17 @@
166	179
167	180	add_action('atom_entry', 'feedwordpress_item_feed_data');
168	181
169	182	# Filter in original permalinks if the user wants that
170		- add_filter('post_link', 'syndication_permalink', 1);
	183	+ add_filter('post_link', 'syndication_permalink', /*priority=*/ 1, /*arguments=*/ 3);
171	184
	185	+ # When foreign URLs are used for permalinks in feeds or display
	186	+ # contexts, they need to be escaped properly.
	187	+ add_filter('the_permalink', 'syndication_permalink_escaped');
	188	+ add_filter('the_permalink_rss', 'syndication_permalink_escaped');
	189	+
	190	+ add_filter('post_comments_feed_link', 'syndication_comments_feed_link');
	191	+
172	192	# WTF? By default, wp_insert_link runs incoming link_url and link_rss
173	193	# URIs through default filters that include `wp_kses()`. But `wp_kses()`
174	194	# just happens to escape any occurrence of & to &amp; -- which just
175	195	# happens to fuck up any URI with a & to separate GET parameters.
		@@ -178,14 +198,17 @@
178	198
179	199	# Admin menu
180	200	add_action('admin_menu', 'fwp_add_pages');
181	201	add_action('admin_notices', 'fwp_check_debug');
182		- add_action('admin_notices', 'fwp_check_magpie');
183		- add_action('init', 'feedwordpress_check_for_magpie_fix');
184	202
	203	+ add_action('admin_menu', 'feedwordpress_add_post_edit_controls');
	204	+ add_action('save_post', 'feedwordpress_save_post_edit_controls');
	205	+
	206	+ add_action('admin_footer', array('FeedWordPress', 'admin_footer'));
	207	+
185	208	# Inbound XML-RPC update methods
186		- add_filter('xmlrpc_methods', 'feedwordpress_xmlrpc_hook');
187		-
	209	+ $feedwordpressRPC = new FeedWordPressRPC;
	210	+
188	211	# Outbound XML-RPC ping reform
189	212	remove_action('publish_post', 'generic_ping'); // WP 1.5.x
190	213	remove_action('do_pings', 'do_all_pings', 10, 1); // WP 2.1, 2.2
191	214	remove_action('publish_post', '_publish_post_hook', 5, 1); // WP 2.3
		@@ -194,25 +217,14 @@
194	217	add_action('do_pings', 'fwp_do_pings', 10, 1);
195	218	add_action('feedwordpress_update', 'fwp_hold_pings');
196	219	add_action('feedwordpress_update_complete', 'fwp_release_pings');
197	220
198		- # Hook in logging functions only if the logging option is ON
199		- $update_logging = get_option('feedwordpress_update_logging');
200		- if ($update_logging == 'yes') :
201		- add_action('post_syndicated_item', 'log_feedwordpress_post', 100);
202		- add_action('update_syndicated_item', 'log_feedwordpress_update_post', 100);
203		- add_action('feedwordpress_update', 'log_feedwordpress_update_feeds', 100);
204		- add_action('feedwordpress_check_feed', 'log_feedwordpress_check_feed', 100);
205		- add_action('feedwordpress_update_complete', 'log_feedwordpress_update_complete', 100);
206		- endif;
	221	+ add_action('syndicated_feed_error', array('FeedWordPressDiagnostic', 'feed_error'), 100, 3);
	222	+
	223	+ add_action('wp_footer', 'debug_out_feedwordpress_footer', -100);
	224	+ add_action('admin_footer', 'debug_out_feedwordpress_footer', -100);
207	225
208		- if (FeedWordPress::update_requested() and FEEDWORDPRESS_DEBUG) :
209		- add_action('post_syndicated_item', 'debug_out_feedwordpress_post', 100);
210		- add_action('update_syndicated_item', 'debug_out_feedwordpress_update_post', 100);
211		- add_action('feedwordpress_update', 'debug_out_feedwordpress_update_feeds', 100);
212		- add_action('feedwordpress_check_feed', 'debug_out_feedwordpress_check_feed', 100);
213		- add_action('feedwordpress_update_complete', 'debug_out_feedwordpress_update_complete', 100);
214		- endif;
	226	+ $feedwordpress = new FeedWordPress;
215	227
216	228	# Cron-less auto-update. Hooray!
217	229	$autoUpdateHook = get_option('feedwordpress_automatic_updates');
218	230	if ($autoUpdateHook != 'init') :
		@@ -217,12 +229,13 @@
217	229	$autoUpdateHook = get_option('feedwordpress_automatic_updates');
218	230	if ($autoUpdateHook != 'init') :
219	231	$autoUpdateHook = 'shutdown';
220	232	endif;
221		- add_action($autoUpdateHook, 'feedwordpress_auto_update');
	233	+ add_action($autoUpdateHook, array(&$feedwordpress, 'auto_update'));
	234	+ add_action('init', array(&$feedwordpress, 'init'));
	235	+ add_action('shutdown', array(&$feedwordpress, 'email_diagnostic_log'));
	236	+ add_action('wp_dashboard_setup', array(&$feedwordpress, 'dashboard_setup'));
222	237
223		- add_action('init', 'feedwordpress_update_magic_url');
224		-
225	238	# Default sanitizers
226	239	add_filter('syndicated_item_content', array('SyndicatedPost', 'resolve_relative_uris'), 0, 2);
227	240	add_filter('syndicated_item_content', array('SyndicatedPost', 'sanitize_content'), 0, 2);
228	241
		@@ -230,166 +243,109 @@
230	243	# Hook in the menus, which will just point to the upgrade interface
231	244	add_action('admin_menu', 'fwp_add_pages');
232	245	endif; // if (!FeedWordPress::needs_upgrade())
233	246
234		-function feedwordpress_check_for_magpie_fix () {
235		- if (isset($_POST['action']) and $_POST['action']=='fix_magpie_version') :
236		- FeedWordPressCompatibility::validate_http_request(/*action=*/ 'feedwordpress_fix_magpie', /*capability=*/ 'edit_files');
237		-
238		- $back_to = $_SERVER['REQUEST_URI'];
239		- if (isset($_POST['ignore'])) :
240		- // kill error message by telling it we ignored the upgrade request for this version
241		- update_option('feedwordpress_magpie_ignored_upgrade_to', EXPECTED_MAGPIE_VERSION);
242		- $ret = 'ignored';
243		- elseif (isset($_POST['upgrade'])) :
244		- $source = dirname(__FILE__)."/MagpieRSS-upgrade/rss.php";
245		- $destination = ABSPATH . WPINC . '/rss.php';
246		- $success = @copy($source, $destination);
247		-
248		- // Copy over rss-functions.php, too, to avoid collisions
249		- // on pre-lapsarian versions of WordPress.
250		- if ($success) :
251		- $source = dirname(__FILE__)."/MagpieRSS-upgrade/rss-functions.php";
252		- $destination = ABSPATH . WPINC . '/rss-functions.php';
253		- $success = @copy($source, $destination);
254		- endif;
255		- $ret = (int) $success;
256		- endif;
257		-
258		- if (strpos($back_to, '?')===false) : $sep = '?';
259		- else : $sep = '&';
260		- endif;
261		-
262		- header("Location: {$back_to}{$sep}feedwordpress_magpie_fix=".$ret);
263		- exit;
264		- endif;
265		-} /* feedwordpress_check_for_magpie_fix() */
266		-
267		-function feedwordpress_auto_update () {
268		- if (FeedWordPress::stale()) :
269		- $feedwordpress =& new FeedWordPress;
270		- $feedwordpress->update();
271		- endif;
272		-} /* feedwordpress_auto_update () */
273		-
274		-function feedwordpress_update_magic_url () {
275		- // Explicit update request in the HTTP request (e.g. from a cron job)
276		- if (FeedWordPress::update_requested()) :
277		- $feedwordpress =& new FeedWordPress;
278		- $feedwordpress->update(FeedWordPress::update_requested_url());
279		-
280		- // Magic URL should return nothing but a 200 OK header packet
281		- // when successful.
282		- exit;
283		- endif;
284		-} /* feedwordpress_magic_update_url () */
285		-
286	247	################################################################################
287	248	## LOGGING FUNCTIONS: log status updates to error_log if you want it ###########
288	249	################################################################################
289	250
290		-function log_feedwordpress_post ($id) {
291		- $post = wp_get_single_post($id);
292		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] posted "
293		- ."'{$post->post_title}' ({$post->post_date})");
294		-}
	251	+class FeedWordPressDiagnostic {
	252	+ function feed_error ($error, $old, $link) {
	253	+ $wpError = $error['object'];
	254	+ $url = $link->uri();
	255	+
	256	+ $mesgs = $wpError->get_error_messages();
	257	+ foreach ($mesgs as $mesg) :
	258	+ $mesg = esc_html($mesg);
	259	+ FeedWordPress::diagnostic(
	260	+ 'updated_feeds:errors',
	261	+ "Feed Error: [${url}] update returned error: $mesg"
	262	+ );
	263	+
	264	+ $hours = get_option('feedwordpress_diagnostics_persistent_errors_hours', 2);
	265	+ $span = ($error['ts'] - $error['since']);
295	266
296		-function log_feedwordpress_update_post ($id) {
297		- $post = wp_get_single_post($id);
298		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] updated "
299		- ."'{$post->post_title}' ({$post->post_date})"
300		- ." (as of {$post->post_modified})");
301		-}
	267	+ if ($span >= ($hours * 60 * 60)) :
	268	+ $since = date('r', $error['since']);
	269	+ $mostRecent = date('r', $error['ts']);
	270	+ FeedWordPress::diagnostic(
	271	+ 'updated_feeds:errors:persistent',
	272	+ "Feed Update Error: [${url}] returning errors"
	273	+ ." since ${since}:<br/><code>$mesg</code>",
	274	+ $url, $error['since'], $error['ts']
	275	+ );
	276	+ endif;
	277	+ endforeach;
	278	+ }
302	279
303		-function log_feedwordpress_update_feeds ($uri) {
304		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] update('$uri')");
305		-}
	280	+ function admin_emails ($id = '') {
	281	+ $users = get_users_of_blog($id);
	282	+ $recipients = array();
	283	+ foreach ($users as $user) :
	284	+ $user_id = (isset($user->user_id) ? $user->user_id : $user->ID);
	285	+ $dude = new WP_User($user_id);
	286	+ if ($dude->has_cap('administrator')) :
	287	+ if ($dude->user_email) :
	288	+ $recipients[] = $dude->user_email;
	289	+ endif;
	290	+ endif;
	291	+ endforeach;
	292	+ return $recipients;
	293	+ }
	294	+} /* class FeedWordPressDiagnostic */
306	295
307		-function log_feedwordpress_check_feed ($feed) {
308		- $uri = $feed['link/uri']; $name = $feed['link/name'];
309		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] Examining $name <$uri>");
	296	+function debug_out_human_readable_bytes ($quantity) {
	297	+ $quantity = (int) $quantity;
	298	+ $magnitude = 'B';
	299	+ $orders = array('KB', 'MB', 'GB', 'TB');
	300	+ while (($quantity > (1024*100)) and (count($orders) > 0)) :
	301	+ $quantity = floor($quantity / 1024);
	302	+ $magnitude = array_shift($orders);
	303	+ endwhile;
	304	+ return "${quantity} ${magnitude}";
310	305	}
311	306
312		-function log_feedwordpress_update_complete ($delta) {
313		- $mesg = array();
314		- if (isset($delta['new'])) $mesg[] = 'added '.$delta['new'].' new posts';
315		- if (isset($delta['updated'])) $mesg[] = 'updated '.$delta['updated'].' existing posts';
316		- if (empty($mesg)) $mesg[] = 'nothing changed';
	307	+function debug_out_feedwordpress_footer () {
	308	+ if (FeedWordPress::diagnostic_on('memory_usage')) :
	309	+ if (function_exists('memory_get_usage')) :
	310	+ FeedWordPress::diagnostic ('memory_usage', "Memory: Current usage: ".debug_out_human_readable_bytes(memory_get_usage()));
	311	+ endif;
	312	+ if (function_exists('memory_get_peak_usage')) :
	313	+ FeedWordPress::diagnostic ('memory_usage', "Memory: Peak usage: ".debug_out_human_readable_bytes(memory_get_peak_usage()));
	314	+ endif;
	315	+ endif;
	316	+} /* debug_out_feedwordpress_footer() */
317	317
318		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] "
319		- .(is_null($delta) ? "Error: I don't syndicate that URI"
320		- : implode(' and ', $mesg)));
321		-}
322		-
323		-function debug_out_feedwordpress_post ($id) {
324		- $post = wp_get_single_post($id);
325		- print ("[".date('Y-m-d H:i:s')."][feedwordpress] posted "
326		- ."'{$post->post_title}' ({$post->post_date})\n");
327		-}
328		-
329		-function debug_out_feedwordpress_update_post ($id) {
330		- $post = wp_get_single_post($id);
331		- print ("[".date('Y-m-d H:i:s')."][feedwordpress] updated "
332		- ."'{$post->post_title}' ({$post->post_date})"
333		- ." (as of {$post->post_modified})\n");
334		-}
335		-
336		-function debug_out_feedwordpress_update_feeds ($uri) {
337		- print ("[".date('Y-m-d H:i:s')."][feedwordpress] update('$uri')\n");
338		-}
339		-
340		-function debug_out_feedwordpress_check_feed ($feed) {
341		- $uri = $feed['link/uri']; $name = $feed['link/name'];
342		- print ("[".date('Y-m-d H:i:s')."][feedwordpress] Examining $name <$uri>\n");
343		-}
344		-
345		-function debug_out_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';
350		-
351		- print ("[".date('Y-m-d H:i:s')."][feedwordpress] "
352		- .(is_null($delta) ? "Error: I don't syndicate that URI"
353		- : implode(' and ', $mesg))."\n");
354		-}
355		-
356	318	################################################################################
357	319	## TEMPLATE API: functions to make your templates syndication-aware ############
358	320	################################################################################
359	321
360		-function is_syndicated ($id = NULL) { return (strlen(get_syndication_feed_id($id)) > 0); }
	322	+/**
	323	+ * is_syndicated: Tests whether the current post in a Loop context, or a post
	324	+ * given by ID number, was syndicated by FeedWordPress. Useful for templates
	325	+ * to determine whether or not to retrieve syndication-related meta-data in
	326	+ * displaying a post.
	327	+ *
	328	+ * @param int $id The post to check for syndicated status. Defaults to the current post in a Loop context.
	329	+ * @return bool TRUE if the post's meta-data indicates it was syndicated; FALSE otherwise
	330	+ */
	331	+function is_syndicated ($id = NULL) {
	332	+ return (strlen(get_syndication_feed_id($id)) > 0);
	333	+} /* function is_syndicated() */
361	334
362		-function get_syndication_source_link ($original = NULL, $id = NULL) {
363		- if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data();
364		- endif;
365		-
366		- if ($original) : $vals = get_post_custom_values('syndication_source_uri_original', $id);
367		- else : $vals = array();
368		- endif;
369		-
370		- if (count($vals) == 0) : $vals = get_post_custom_values('syndication_source_uri', $id);
371		- endif;
372		-
373		- if (count($vals) > 0) : $ret = $vals[0]; else : $ret = NULL; endif;
374		-
375		- return $ret;
376		-} /* function get_syndication_source_link() */
377		-
378		-function the_syndication_source_link ($original = NULL, $id = NULL) {
379		- echo get_syndication_source_link($original, $id);
380		-}
381		-
382	335	function feedwordpress_display_url ($url, $before = 60, $after = 0) {
383	336	$bits = parse_url($url);
384	337
385	338	// Strip out crufty subdomains
386		- $bits['host'] = preg_replace('/^www[0-9]*\./i', '', $bits['host']);
387		-
	339	+ if (isset($bits['host'])) :
	340	+ $bits['host'] = preg_replace('/^www[0-9]*\./i', '', $bits['host']);
	341	+ endif;
	342	+
388	343	// Reassemble bit-by-bit with minimum of crufty elements
389	344	$url = (isset($bits['user'])?$bits['user'].'@':'')
390	345	.(isset($bits['host'])?$bits['host']:'')
391	346	.(isset($bits['path'])?$bits['path']:'')
	347	+ .(isset($uri_bits['port'])?':'.$uri_bits['port']:'')
392	348	.(isset($bits['query'])?'?'.$bits['query']:'');
393	349
394	350	if (strlen($url) > ($before+$after)) :
395	351	$url = substr($url, 0, $before).'…'.substr($url, 0 - $after, $after);
		@@ -395,95 +351,85 @@
395	351	$url = substr($url, 0, $before).'…'.substr($url, 0 - $after, $after);
396	352	endif;
397	353
398	354	return $url;
399		-}
	355	+} /* feedwordpress_display_url () */
400	356
401		-function get_syndication_source ($original = NULL, $id = NULL) {
	357	+function get_syndication_source_property ($original, $id, $local, $remote = NULL) {
	358	+ $ret = NULL;
402	359	if (is_null($original)) :
403	360	$original = FeedWordPress::use_aggregator_source_data();
404	361	endif;
405		-
406		- if ($original) :
407		- $vals = get_post_custom_values('syndication_source_original', $id);
408		- else :
409		- $vals = array();
	362	+
	363	+ if (is_null($remote)) :
	364	+ $remote = $local . '_original';
410	365	endif;
411	366
412		- if (count($vals) == 0) :
413		- $vals = get_post_custom_values('syndication_source', $id);
	367	+ $vals = ($original ? get_post_custom_values($remote, $id) : array());
	368	+ if (count($vals) < 1) :
	369	+ $vals = get_post_custom_values($local, $id);
414	370	endif;
415	371
416	372	if (count($vals) > 0) :
417	373	$ret = $vals[0];
418		- else :
419		- $ret = NULL;
420	374	endif;
	375	+ return $ret;
	376	+} /* function get_syndication_source_property () */
421	377
422		- if (is_null($ret) or strlen(trim($ret)) == 0) :
423		- // Fall back to URL of blog
	378	+function the_syndication_source_link ($original = NULL, $id = NULL) { echo get_syndication_source_link($original, $id); }
	379	+function get_syndication_source_link ($original = NULL, $id = NULL) {
	380	+ return get_syndication_source_property($original, $id, 'syndication_source_uri');
	381	+} /* function get_syndication_source_link() */
	382	+
	383	+function the_syndication_source ($original = NULL, $id = NULL) { echo get_syndication_source($original, $id); }
	384	+function get_syndication_source ($original = NULL, $id = NULL) {
	385	+ $ret = get_syndication_source_property($original, $id, 'syndication_source');
	386	+ if (is_null($ret) or strlen(trim($ret)) == 0) : // Fall back to URL of blog
424	387	$ret = feedwordpress_display_url(get_syndication_source_link());
425	388	endif;
426		-
427	389	return $ret;
428	390	} /* function get_syndication_source() */
429	391
430		-function the_syndication_source ($original = NULL, $id = NULL) { echo get_syndication_source($original, $id); }
431		-
	392	+function the_syndication_feed ($original = NULL, $id = NULL) { echo get_syndication_feed($original, $id); }
432	393	function get_syndication_feed ($original = NULL, $id = NULL) {
433		- if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data();
434		- endif;
435		-
436		- if ($original) : $vals = get_post_custom_values('syndication_feed_original', $id);
437		- else : $vals = array();
438		- endif;
439		-
440		- if (count($vals) == 0) : $vals = get_post_custom_values('syndication_feed', $id);
441		- endif;
442		-
443		- if (count($vals) > 0) : $ret = $vals[0]; else : $ret = NULL; endif;
444		-
445		- return $ret;
	394	+ return get_syndication_source_property($original, $id, 'syndication_feed');
446	395	} /* function get_syndication_feed() */
447	396
448		-function the_syndication_feed ($original = NULL, $id = NULL) { echo get_syndication_feed($original, $id); }
449		-
	397	+function the_syndication_feed_guid ($original = NULL, $id = NULL) { echo get_syndication_feed_guid($original, $id); }
450	398	function get_syndication_feed_guid ($original = NULL, $id = NULL) {
451		- if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data();
	399	+ $ret = get_syndication_source_property($original, $id, 'syndication_source_id');
	400	+ if (is_null($ret) or strlen(trim($ret))==0) : // Fall back to URL of feed
	401	+ $ret = get_syndication_feed();
452	402	endif;
453		-
454		- if ($original) : $vals = get_post_custom_values('syndication_source_id_original', $id);
455		- else : $vals = array();
456		- endif;
457		-
458		- if (count($vals) == 0) : $vals = array(get_feed_meta('feed/id', $id));
459		- endif;
460		-
461		- if (count($vals) > 0) : $ret = $vals[0]; else : $ret = NULL; endif;
462		-
463	403	return $ret;
464	404	} /* function get_syndication_feed_guid () */
465	405
466		-function the_syndication_feed_guid ($original = NULL, $id = NULL) { echo get_syndication_feed_guid($original, $id); }
467		-
468	406	function get_syndication_feed_id ($id = NULL) { list($u) = get_post_custom_values('syndication_feed_id', $id); return $u; }
469	407	function the_syndication_feed_id ($id = NULL) { echo get_syndication_feed_id($id); }
470	408
471	409	$feedwordpress_linkcache = array (); // only load links from database once
	410	+function get_syndication_feed_object ($id = NULL) {
	411	+ global $feedwordpress_linkcache;
472	412
473		-function get_feed_meta ($key, $id = NULL) {
474		- global $wpdb, $feedwordpress_linkcache;
	413	+ $link = NULL;
	414	+
475	415	$feed_id = get_syndication_feed_id($id);
476		-
477		- $ret = NULL;
478	416	if (strlen($feed_id) > 0):
479	417	if (isset($feedwordpress_linkcache[$feed_id])) :
480	418	$link = $feedwordpress_linkcache[$feed_id];
481	419	else :
482		- $link =& new SyndicatedLink($feed_id);
	420	+ $link = new SyndicatedLink($feed_id);
483	421	$feedwordpress_linkcache[$feed_id] = $link;
484	422	endif;
	423	+ endif;
	424	+ return $link;
	425	+}
485	426
	427	+function get_feed_meta ($key, $id = NULL) {
	428	+ $ret = NULL;
	429	+
	430	+ $link = get_syndication_feed_object($id);
	431	+ if (is_object($link) and isset($link->settings[$key])) :
486	432	$ret = $link->settings[$key];
487	433	endif;
488	434	return $ret;
489	435	} /* get_feed_meta() */
		@@ -494,13 +440,55 @@
494	440	function the_syndication_permalink ($id = NULL) {
495	441	echo get_syndication_permalink($id);
496	442	}
497	443
	444	+/**
	445	+ * get_local_permalink: returns a string containing the internal permalink
	446	+ * for a post (whether syndicated or not) on your local WordPress installation.
	447	+ * This may be useful if you want permalinks to point to the original source of
	448	+ * an article for most purposes, but want to retrieve a URL for the local
	449	+ * representation of the post for one or two limited purposes (for example,
	450	+ * linking to a comments page on your local aggregator site).
	451	+ *
	452	+ * @param $id The numerical ID of the post to get the permalink for. If empty,
	453	+ * defaults to the current post in a Loop context.
	454	+ * @return string The URL of the local permalink for this post.
	455	+ *
	456	+ * @uses get_permalink()
	457	+ * @global $feedwordpress_the_original_permalink
	458	+ *
	459	+ * @since 2010.0217
	460	+ */
	461	+function get_local_permalink ($id = NULL) {
	462	+ global $feedwordpress_the_original_permalink;
	463	+
	464	+ // get permalink, and thus activate filter and force global to be filled
	465	+ // with original URL.
	466	+ $url = get_permalink($id);
	467	+ return $feedwordpress_the_original_permalink;
	468	+} /* get_local_permalink() */
	469	+
	470	+/**
	471	+ * the_original_permalink: displays the contents of get_original_permalink()
	472	+ *
	473	+ * @param $id The numerical ID of the post to get the permalink for. If empty,
	474	+ * defaults to the current post in a Loop context.
	475	+ *
	476	+ * @uses get_local_permalinks()
	477	+ * @uses apply_filters
	478	+ *
	479	+ * @since 2010.0217
	480	+ */
	481	+function the_local_permalink ($id = NULL) {
	482	+ print apply_filters('the_permalink', get_local_permalink($id));
	483	+} /* function the_local_permalink() */
	484	+
498	485	################################################################################
499	486	## FILTERS: syndication-aware handling of post data for templates and feeds ####
500	487	################################################################################
501	488
502	489	$feedwordpress_the_syndicated_content = NULL;
	490	+$feedwordpress_the_original_permalink = NULL;
503	491
504	492	function feedwordpress_preserve_syndicated_content ($text) {
505	493	global $feedwordpress_the_syndicated_content;
506	494
		@@ -551,37 +539,197 @@
551	539	<?php
552	540	endif;
553	541	}
554	542
555		-function syndication_permalink ($permalink = '') {
556		- if (get_option('feedwordpress_munge_permalink') != 'no'):
557		- $uri = get_syndication_permalink();
558		- return ((strlen($uri) > 0) ? $uri : $permalink);
559		- else:
560		- return $permalink;
	543	+/**
	544	+ * syndication_permalink: Allow WordPress to use the original remote URL of
	545	+ * syndicated posts as their permalink. Can be turned on or off by by setting in
	546	+ * Syndication => Posts & Links. Saves the old internal permalink in a global
	547	+ * variable for later use.
	548	+ *
	549	+ * @param string $permalink The internal permalink
	550	+ * @return string The new permalink. Same as the old if the post is not
	551	+ * syndicated, or if FWP is set to use internal permalinks, or if the post
	552	+ * was syndicated, but didn't have a proper permalink recorded.
	553	+ *
	554	+ * @uses SyndicatedLink::setting()
	555	+ * @uses get_syndication_permalink()
	556	+ * @uses get_syndication_feed_object()
	557	+ * @uses url_to_postid()
	558	+ * @global $id
	559	+ * @global $feedwordpress_the_original_permalink
	560	+ */
	561	+function syndication_permalink ($permalink = '', $post = null, $leavename = false) {
	562	+ global $id;
	563	+ global $feedwordpress_the_original_permalink;
	564	+
	565	+ // Save the local permalink in case we need to retrieve it later.
	566	+ $feedwordpress_the_original_permalink = $permalink;
	567	+
	568	+ if (is_object($post) and isset($post->ID) and !empty($post->ID)) :
	569	+ // Use the post ID we've been provided with.
	570	+ $postId = $post->ID;
	571	+ elseif (is_string($permalink) and strlen($permalink) > 0) :
	572	+ // Map this permalink to a post ID so we can get the correct
	573	+ // permalink even outside of the Post Loop. Props Björn.
	574	+ $postId = url_to_postid($permalink);
	575	+ else :
	576	+ // If the permalink string is empty but Post Loop context
	577	+ // provides an id.
	578	+ $postId = $id;
561	579	endif;
562		-} // function syndication_permalink ()
563	580
	581	+ $munge = false;
	582	+ $link = get_syndication_feed_object($postId);
	583	+ if (is_object($link)) :
	584	+ $munge = ($link->setting('munge permalink', 'munge_permalink', 'yes') != 'no');
	585	+ endif;
	586	+
	587	+ if ($munge):
	588	+ $uri = get_syndication_permalink($postId);
	589	+ $permalink = ((strlen($uri) > 0) ? $uri : $permalink);
	590	+ endif;
	591	+ return $permalink;
	592	+} /* function syndication_permalink () */
	593	+
	594	+/**
	595	+ * syndication_permalink_escaped: Escape XML special characters in syndicated
	596	+ * permalinks when used in feed contexts and HTML display contexts.
	597	+ *
	598	+ * @param string $permalink
	599	+ * @return string
	600	+ *
	601	+ * @uses is_syndicated()
	602	+ * @uses FeedWordPress::munge_permalinks()
	603	+ *
	604	+ */
	605	+function syndication_permalink_escaped ($permalink) {
	606	+ /* FIXME: This should review link settings not just global settings */
	607	+ if (is_syndicated() and FeedWordPress::munge_permalinks()) :
	608	+ // This is a foreign link; WordPress can't vouch for its not
	609	+ // having any entities that need to be &-escaped. So we'll do
	610	+ // it here.
	611	+ $permalink = esc_html($permalink);
	612	+ endif;
	613	+ return $permalink;
	614	+} /* function syndication_permalink_escaped() */
	615	+
	616	+/**
	617	+ * syndication_comments_feed_link: Escape XML special characters in comments
	618	+ * feed links
	619	+ *
	620	+ * @param string $link
	621	+ * @return string
	622	+ *
	623	+ * @uses is_syndicated()
	624	+ * @uses FeedWordPress::munge_permalinks()
	625	+ */
	626	+function syndication_comments_feed_link ($link) {
	627	+ global $feedwordpress_the_original_permalink, $id;
	628	+
	629	+ if (is_syndicated() and FeedWordPress::munge_permalinks()) :
	630	+ // If the source post provided a comment feed URL using
	631	+ // wfw:commentRss or atom:link/@rel="replies" we can make use of
	632	+ // that value here.
	633	+ $source = get_syndication_feed_object();
	634	+ $replacement = NULL;
	635	+ if ($source->setting('munge comments feed links', 'munge_comments_feed_links', 'yes') != 'no') :
	636	+ $commentFeeds = get_post_custom_values('wfw:commentRSS');
	637	+ if (
	638	+ is_array($commentFeeds)
	639	+ and (count($commentFeeds) > 0)
	640	+ and (strlen($commentFeeds[0]) > 0)
	641	+ ) :
	642	+ $replacement = $commentFeeds[0];
	643	+
	644	+ // This is a foreign link; WordPress can't vouch for its not
	645	+ // having any entities that need to be &-escaped. So we'll do it
	646	+ // here.
	647	+ $replacement = esc_html($replacement);
	648	+ endif;
	649	+ endif;
	650	+
	651	+ if (is_null($replacement)) :
	652	+ // Q: How can we get the proper feed format, since the
	653	+ // format is, stupidly, not passed to the filter?
	654	+ // A: Kludge kludge kludge kludge!
	655	+ $fancy_permalinks = ('' != get_option('permalink_structure'));
	656	+ if ($fancy_permalinks) :
	657	+ preg_match('|/feed(/([^/]+))?/?$|', $link, $ref);
	658	+
	659	+ $format = (isset($ref[2]) ? $ref[2] : '');
	660	+ if (strlen($format) == 0) : $format = get_default_feed(); endif;
	661	+
	662	+ $replacement = trailingslashit($feedwordpress_the_original_permalink) . 'feed';
	663	+ if ($format != get_default_feed()) :
	664	+ $replacement .= '/'.$format;
	665	+ endif;
	666	+ $replacement = user_trailingslashit($replacement, 'single_feed');
	667	+ else :
	668	+ // No fancy permalinks = no problem
	669	+ // WordPress doesn't call get_permalink() to
	670	+ // generate the comment feed URL, so the
	671	+ // comments feed link is never munged by FWP.
	672	+ endif;
	673	+ endif;
	674	+
	675	+ if (!is_null($replacement)) : $link = $replacement; endif;
	676	+ endif;
	677	+ return $link;
	678	+} /* function syndication_comments_feed_link() */
	679	+
564	680	################################################################################
565	681	## ADMIN MENU ADD-ONS: register Dashboard management pages #####################
566	682	################################################################################
567	683
568	684	function fwp_add_pages () {
569		- global $fwp_capability;
570		- global $fwp_path;
	685	+ $menu_cap = FeedWordPress::menu_cap();
	686	+ $settings_cap = FeedWordPress::menu_cap(/*sub=*/ true);
	687	+ $syndicationMenu = FeedWordPress::path('syndication.php');
	688	+
	689	+ add_menu_page(
	690	+ 'Syndicated Sites', 'Syndication',
	691	+ $menu_cap,
	692	+ $syndicationMenu,
	693	+ NULL,
	694	+ WP_PLUGIN_URL.'/'.FeedWordPress::path('feedwordpress-tiny.png')
	695	+ );
571	696
572		- $menu = array('Syndicated Sites', 'Syndication', $fwp_capability['manage_links'], $fwp_path.'/syndication.php', NULL);
573		- if (fwp_test_wp_version(FWP_SCHEMA_27)) :
574		- // add icon parameter
575		- $menu[] = WP_PLUGIN_URL.'/'.$fwp_path.'/feedwordpress-tiny.png';
576		- endif;
	697	+ do_action('feedwordpress_admin_menu_pre_feeds', $menu_cap, $settings_cap);
	698	+ add_submenu_page(
	699	+ $syndicationMenu, 'Syndicated Feeds & Updates', 'Feeds & Updates',
	700	+ $settings_cap, FeedWordPress::path('feeds-page.php')
	701	+ );
577	702
578		- call_user_func_array('add_menu_page', $menu);
579		- add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Feeds & Updates', 'Feeds & Updates', $fwp_capability['manage_options'], $fwp_path.'/feeds-page.php');
580		- add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Posts & Links', 'Posts & Links', $fwp_capability['manage_options'], $fwp_path.'/posts-page.php');
581		- add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Authors', 'Authors', $fwp_capability['manage_options'], $fwp_path.'/authors-page.php');
582		- add_submenu_page($fwp_path.'/syndication.php', 'Categories'.FEEDWORDPRESS_AND_TAGS, 'Categories'.FEEDWORDPRESS_AND_TAGS, $fwp_capability['manage_options'], $fwp_path.'/categories-page.php');
583		- add_submenu_page($fwp_path.'/syndication.php', 'FeedWordPress Back End', 'Back End', $fwp_capability['manage_options'], $fwp_path.'/backend-page.php');
	703	+ do_action('feedwordpress_admin_menu_pre_posts', $menu_cap, $settings_cap);
	704	+ add_submenu_page(
	705	+ $syndicationMenu, 'Syndicated Posts & Links', 'Posts & Links',
	706	+ $settings_cap, FeedWordPress::path('posts-page.php')
	707	+ );
	708	+
	709	+ do_action('feedwordpress_admin_menu_pre_authors', $menu_cap, $settings_cap);
	710	+ add_submenu_page(
	711	+ $syndicationMenu, 'Syndicated Authors', 'Authors',
	712	+ $settings_cap, FeedWordPress::path('authors-page.php')
	713	+ );
	714	+
	715	+ do_action('feedwordpress_admin_menu_pre_categories', $menu_cap, $settings_cap);
	716	+ add_submenu_page(
	717	+ $syndicationMenu, 'Categories'.FEEDWORDPRESS_AND_TAGS, 'Categories'.FEEDWORDPRESS_AND_TAGS,
	718	+ $settings_cap, FeedWordPress::path('categories-page.php')
	719	+ );
	720	+
	721	+ do_action('feedwordpress_admin_menu_pre_performance', $menu_cap, $settings_cap);
	722	+ add_submenu_page(
	723	+ $syndicationMenu, 'FeedWordPress Performance', 'Performance',
	724	+ $settings_cap, FeedWordPress::path('performance-page.php')
	725	+ );
	726	+
	727	+ do_action('feedwordpress_admin_menu_pre_diagnostics', $menu_cap, $settings_cap);
	728	+ add_submenu_page(
	729	+ $syndicationMenu, 'FeedWordPress Diagnostics', 'Diagnostics',
	730	+ $settings_cap, FeedWordPress::path('diagnostics-page.php')
	731	+ );
584	732	} /* function fwp_add_pages () */
585	733
586	734	function fwp_check_debug () {
587	735	// This is a horrible fucking kludge that I have to do because the
		@@ -604,97 +752,8 @@
604	752	<?php
605	753	endif;
606	754	} /* function fwp_check_debug () */
607	755
608		-define('EXPECTED_MAGPIE_VERSION', '2009.0725');
609		-function fwp_check_magpie () {
610		- if (isset($_REQUEST['feedwordpress_magpie_fix'])) :
611		- if ($_REQUEST['feedwordpress_magpie_fix']=='ignored') :
612		-?>
613		-<div class="updated fade">
614		-<p>O.K., we'll ignore the problem for now. FeedWordPress will not display any
615		-more error messages.</p>
616		-</div>
617		-<?php
618		- elseif ((bool) $_REQUEST['feedwordpress_magpie_fix']) :
619		-?>
620		-<div class="updated fade">
621		-<p>Congratulations! Your MagpieRSS has been successfully upgraded to the version
622		-shipped with FeedWordPress.</p>
623		-</div>
624		-<?php
625		- else :
626		- $source = dirname(__FILE__)."/MagpieRSS-upgrade/rss.php";
627		- $destination = ABSPATH . WPINC . '/rss.php';
628		- $cmd = "cp '".htmlspecialchars(addslashes($source))."' '".htmlspecialchars(addslashes($destination))."'";
629		- $cmd = wordwrap($cmd, /*width=*/ 75, /*break=*/ " \\\n\t");
630		-
631		-?>
632		-<div class="error">
633		-<p><strong>FeedWordPress was unable to automatically upgrade your copy of MagpieRSS.</strong></p>
634		-<p>It's likely that you need to change the file permissions on <code><?php print htmlspecialchars($source); ?></code>
635		-to allow FeedWordPress to overwrite it.</p>
636		-<p><strong>To perform the upgrade manually,</strong> you can
637		-use a SFTP or FTP client to upload a copy of <code>rss.php</code> from the
638		-<code>MagpieRSS-upgrades/</code> directory of your FeedWordPress archive so that
639		-it overwrites <code><?php print htmlspecialchars($destination); ?></code>. Or,
640		-if your web host provides shell access, you can issue the following command from
641		-a command prompt to perform the upgrade:</p>
642		-<pre>
643		-<samp>$</samp> <kbd><?php print $cmd; ?></kbd>
644		-</pre>
645		-<p><strong>If you've fixed the file permissions,</strong> you can try the
646		-automatic upgrade again.</p>
647		-
648		-<?php feedwordpress_upgrade_old_and_busted_buttons(); ?>
649		-</div>
650		-<?php
651		- endif;
652		- else :
653		- $magpie_version = FeedWordPress::magpie_version();
654		-
655		- $ignored = get_option('feedwordpress_magpie_ignored_upgrade_to');
656		- if (EXPECTED_MAGPIE_VERSION != $magpie_version and EXPECTED_MAGPIE_VERSION != $ignored) :
657		- if (current_user_can('edit_files')) :
658		- $youAre = 'you are';
659		- $itIsRecommendedThatYou = 'It is <strong>strongly recommended</strong> that you';
660		- else :
661		- $youAre = 'this site is';
662		- $itIsRecommendedThatYou = 'You may want to contact the administrator of the site; it is <strong>strongly recommended</strong> that they';
663		- endif;
664		- print '<div class="error">';
665		-?>
666		-<p style="font-style: italic"><strong>FeedWordPress has detected that <?php print $youAre; ?> currently using a version of
667		-MagpieRSS other than the upgraded version that ships with this version of FeedWordPress.</strong></p>
668		-<ul>
669		-<li><strong>Currently running:</strong> MagpieRSS <?php print $magpie_version; ?></li>
670		-<li><strong>Version included with FeedWordPress <?php print FEEDWORDPRESS_VERSION; ?>:</strong> MagpieRSS <?php print EXPECTED_MAGPIE_VERSION; ?></li>
671		-</ul>
672		-<p><?php print $itIsRecommendedThatYou; ?> install the upgraded
673		-version of MagpieRSS supplied with FeedWordPress. The version of
674		-MagpieRSS that ships with WordPress is very old and buggy, and
675		-encounters a number of errors when trying to parse modern Atom
676		-and RSS feeds.</p>
677		-<?php
678		- feedwordpress_upgrade_old_and_busted_buttons();
679		- print '</div>';
680		- endif;
681		- endif;
682		-}
683		-
684		-function feedwordpress_upgrade_old_and_busted_buttons() {
685		- if (current_user_can('edit_files')) :
686		-?>
687		-<form action="" method="post"><div>
688		-<?php FeedWordPressCompatibility::stamp_nonce('feedwordpress_fix_magpie'); ?>
689		-<input type="hidden" name="action" value="fix_magpie_version" />
690		-<input class="button-secondary" type="submit" name="ignore" value="<?php _e('Ignore this problem'); ?>" />
691		-<input class="button-primary" type="submit" name="upgrade" value="<?php _e('Upgrade'); ?>" />
692		-</div></form>
693		-<?php
694		- endif;
695		-}
696		-
697	756	################################################################################
698	757	## fwp_hold_pings() and fwp_release_pings(): Outbound XML-RPC ping reform ####
699	758	## ... 'coz it's rude to send 500 pings the first time your aggregator runs ####
700	759	################################################################################
		@@ -750,8 +809,70 @@
750	809	endif;
751	810	endif;
752	811	}
753	812
	813	+ function feedwordpress_add_post_edit_controls () {
	814	+ add_meta_box('feedwordpress-post-controls', __('Syndication'), 'feedwordpress_post_edit_controls', 'post', 'side', 'high');
	815	+ if (FeedWordPress::diagnostic_on('syndicated_posts:static_meta_data')) :
	816	+ $GLOBALS['inspectPostMeta'] = new InspectPostMeta;
	817	+ endif;
	818	+ } // function FeedWordPress::postEditControls
	819	+
	820	+ function feedwordpress_post_edit_controls () {
	821	+ global $post;
	822	+
	823	+ $frozen_values = get_post_custom_values('_syndication_freeze_updates', $post->ID);
	824	+ $frozen_post = (count($frozen_values) > 0 and 'yes' == $frozen_values[0]);
	825	+
	826	+ if (is_syndicated($post->ID)) :
	827	+ ?>
	828	+ <p>This is a syndicated post, which originally appeared at
	829	+ <cite><?php print esc_html(get_syndication_source(NULL, $post->ID)); ?></cite>.
	830	+ <a href="<?php print esc_html(get_syndication_permalink($post->ID)); ?>">View original post</a>.</p>
	831	+
	832	+ <p><input type="hidden" name="feedwordpress_noncename" id="feedwordpress_noncename" value="<?php print wp_create_nonce(plugin_basename(__FILE__)); ?>" />
	833	+ <label><input type="checkbox" name="freeze_updates" value="yes" <?php if ($frozen_post) : ?>checked="checked"<?php endif; ?> /> <strong>Manual editing.</strong>
	834	+ If set, FeedWordPress will not overwrite the changes you make manually
	835	+ to this post, if the syndicated content is updated on the
	836	+ feed.</label></p>
	837	+ <?php
	838	+ else :
	839	+ ?>
	840	+ <p>This post was created locally at this website.</p>
	841	+ <?php
	842	+ endif;
	843	+ } // function feedwordpress_post_edit_controls () */
	844	+
	845	+ function feedwordpress_save_post_edit_controls ( $post_id ) {
	846	+ global $post;
	847	+
	848	+ if (!isset($_POST['feedwordpress_noncename']) or !wp_verify_nonce($_POST['feedwordpress_noncename'], plugin_basename(__FILE__))) :
	849	+ return $post_id;
	850	+ endif;
	851	+
	852	+ // Verify if this is an auto save routine. If it is our form has
	853	+ // not been submitted, so we don't want to do anything.
	854	+ if ( defined('DOING_AUTOSAVE') and DOING_AUTOSAVE ) :
	855	+ return $post_id;
	856	+ endif;
	857	+
	858	+ // Check permissions
	859	+ if ( !current_user_can( 'edit_'.$_POST['post_type'], $post_id) ) :
	860	+ return $post_id;
	861	+ endif;
	862	+
	863	+ // OK, we're golden. Now let's save some data.
	864	+ if (isset($_POST['freeze_updates'])) :
	865	+ update_post_meta($post_id, '_syndication_freeze_updates', $_POST['freeze_updates']);
	866	+ $ret = $_POST['freeze_updates'];
	867	+ else :
	868	+ delete_post_meta($post_id, '_syndication_freeze_updates');
	869	+ $ret = NULL;
	870	+ endif;
	871	+
	872	+ return $ret;
	873	+ } // function feedwordpress_save_edit_controls
	874	+
754	875	################################################################################
755	876	## class FeedWordPress #########################################################
756	877	################################################################################
757	878
		@@ -795,9 +916,9 @@
795	916	function FeedWordPress () {
796	917	$this->feeds = array ();
797	918	$links = FeedWordPress::syndicated_links();
798	919	if ($links): foreach ($links as $link):
799		- $this->feeds[] =& new SyndicatedLink($link);
	920	+ $this->feeds[] = new SyndicatedLink($link);
800	921	endforeach; endif;
801	922	} // FeedWordPress::FeedWordPress ()
802	923
803	924	# function update (): polls for updates on one or more Contributor feeds
		@@ -855,9 +976,9 @@
855	976	if (FeedWordPress::needs_upgrade()) : // Will make duplicate posts if we don't hold off
856	977	return NULL;
857	978	endif;
858	979
859		- if (!is_null($uri)) :
	980	+ if (!is_null($uri) and $uri != '*') :
860	981	$uri = trim($uri);
861	982	else : // Update all
862	983	update_option('feedwordpress_last_update_all', time());
863	984	endif;
		@@ -864,20 +985,17 @@
864	985
865	986	do_action('feedwordpress_update', $uri);
866	987
867	988	if (is_null($crash_ts)) :
868		- $crash_dt = (int) get_option('feedwordpress_update_time_limit');
869		- if ($crash_dt > 0) :
870		- $crash_ts = time() + $crash_dt;
871		- else :
872		- $crash_ts = NULL;
873		- endif;
	989	+ $crash_ts = $this->crash_ts();
874	990	endif;
875		-
	991	+
876	992	// Randomize order for load balancing purposes
877	993	$feed_set = $this->feeds;
878	994	shuffle($feed_set);
879	995
	996	+ $feed_set = apply_filters('feedwordpress_update_feeds', $feed_set, $uri);
	997	+
880	998	// Loop through and check for new posts
881	999	$delta = NULL;
882	1000	foreach ($feed_set as $feed) :
883	1001	if (!is_null($crash_ts) and (time() > $crash_ts)) : // Check whether we've exceeded the time limit
		@@ -891,9 +1009,9 @@
891	1009	else :
892	1010	$timely = $feed->stale();
893	1011	endif;
894	1012
895		- if ($pinged_that and is_null($delta)) : // If at least one feed was hit for updating...
	1013	+ if ($pinged_that and is_null($delta)) : // If at least one feed was hit for updating...
896	1014	$delta = array('new' => 0, 'updated' => 0); // ... don't return error condition
897	1015	endif;
898	1016
899	1017	if ($pinged_that and $timely) :
		@@ -901,10 +1019,12 @@
901	1019	$start_ts = time();
902	1020	$added = $feed->poll($crash_ts);
903	1021	do_action('feedwordpress_check_feed_complete', $feed->settings, $added, time() - $start_ts);
904	1022
905		- if (isset($added['new'])) : $delta['new'] += $added['new']; endif;
906		- if (isset($added['updated'])) : $delta['updated'] += $added['updated']; endif;
	1023	+ if (is_array($added)) : // Success
	1024	+ if (isset($added['new'])) : $delta['new'] += $added['new']; endif;
	1025	+ if (isset($added['updated'])) : $delta['updated'] += $added['updated']; endif;
	1026	+ endif;
907	1027	endif;
908	1028	endforeach;
909	1029
910	1030	do_action('feedwordpress_update_complete', $delta);
		@@ -911,8 +1031,18 @@
911	1031
912	1032	return $delta;
913	1033	}
914	1034
	1035	+ function crash_ts ($default = NULL) {
	1036	+ $crash_dt = (int) get_option('feedwordpress_update_time_limit', 0);
	1037	+ if ($crash_dt > 0) :
	1038	+ $crash_ts = time() + $crash_dt;
	1039	+ else :
	1040	+ $crash_ts = $default;
	1041	+ endif;
	1042	+ return $crash_ts;
	1043	+ }
	1044	+
915	1045	function stale () {
916	1046	if (get_option('feedwordpress_automatic_updates')) :
917	1047	// Do our best to avoid possible simultaneous
918	1048	// updates by getting up-to-the-minute settings.
		@@ -933,9 +1063,9 @@
933	1063	$ret = ( (time() - $last) > $freshness);
934	1064
935	1065	// This should never happen.
936	1066	else :
937		- FeedWordPress::critical_bug('FeedWordPress::stale::last', $last, __LINE__);
	1067	+ FeedWordPress::critical_bug('FeedWordPress::stale::last', $last, __LINE__, __FILE__);
938	1068	endif;
939	1069
940	1070	else :
941	1071	$ret = false;
		@@ -941,9 +1071,122 @@
941	1071	$ret = false;
942	1072	endif;
943	1073	return $ret;
944	1074	} // FeedWordPress::stale()
	1075	+
	1076	+ function init () {
	1077	+ $this->clear_cache_magic_url();
	1078	+ $this->update_magic_url();
	1079	+ } /* FeedWordPress::init() */
945	1080
	1081	+ function dashboard_setup () {
	1082	+ $see_it = FeedWordPress::menu_cap();
	1083	+
	1084	+ if (current_user_can($see_it)) :
	1085	+ // Get the stylesheet
	1086	+ wp_enqueue_style('feedwordpress-elements');
	1087	+
	1088	+ $widget_id = 'feedwordpress_dashboard';
	1089	+ $widget_name = __('Syndicated Sources');
	1090	+ $column = 'side';
	1091	+ $priority = 'core';
	1092	+
	1093	+ // I would love to use wp_add_dashboard_widget() here and save
	1094	+ // myself some trouble. But WP 3 does not yet have any way to
	1095	+ // push a dashboard widget onto the side, or to give it a default
	1096	+ // location.
	1097	+ add_meta_box(
	1098	+ /*id=*/ $widget_id,
	1099	+ /*title=*/ $widget_name,
	1100	+ /*callback=*/ array(&$this, 'dashboard'),
	1101	+ /*page=*/ 'dashboard',
	1102	+ /*context=*/ $column,
	1103	+ /*priority=*/ $priority
	1104	+ );
	1105	+ /*control_callback= array(&$this, 'dashboard_control') */
	1106	+
	1107	+ // This is kind of rude, I know, but the dashboard widget isn't
	1108	+ // worth much if users don't know that it exists, and I don't
	1109	+ // know of any better way to reorder the boxen.
	1110	+ //
	1111	+ // Gleefully ripped off of codex.wordpress.org/Dashboard_Widgets_API
	1112	+
	1113	+ // Globalize the metaboxes array, this holds all the widgets for wp-admin
	1114	+ global $wp_meta_boxes;
	1115	+
	1116	+ // Get the regular dashboard widgets array
	1117	+ // (which has our new widget already but at the end)
	1118	+
	1119	+ $normal_dashboard = $wp_meta_boxes['dashboard'][$column][$priority];
	1120	+
	1121	+ // Backup and delete our new dashbaord widget from the end of the array
	1122	+ if (isset($normal_dashboard[$widget_id])) :
	1123	+ $backup = array();
	1124	+ $backup[$widget_id] = $normal_dashboard[$widget_id];
	1125	+ unset($normal_dashboard[$widget_id]);
	1126	+
	1127	+ // Merge the two arrays together so our widget is at the
	1128	+ // beginning
	1129	+ $sorted_dashboard = array_merge($backup, $normal_dashboard);
	1130	+
	1131	+ // Save the sorted array back into the original metaboxes
	1132	+ $wp_meta_boxes['dashboard'][$column][$priority] = $sorted_dashboard;
	1133	+ endif;
	1134	+ endif;
	1135	+ } /* FeedWordPress::dashboard_setup () */
	1136	+
	1137	+ function dashboard () {
	1138	+ $syndicationPage = new FeedWordPressSyndicationPage(dirname(__FILE__).'/syndication.php');
	1139	+ $syndicationPage->dashboard_box($syndicationPage);
	1140	+ } /* FeedWordPress::dashboard () */
	1141	+
	1142	+ function update_magic_url () {
	1143	+ global $wpdb;
	1144	+
	1145	+ // Explicit update request in the HTTP request (e.g. from a cron job)
	1146	+ if ($this->update_requested()) :
	1147	+ $this->update($this->update_requested_url());
	1148	+
	1149	+ if (FEEDWORDPRESS_DEBUG and count($wpdb->queries) > 0) :
	1150	+ $mysqlTime = 0.0;
	1151	+ $byTime = array();
	1152	+ foreach ($wpdb->queries as $query) :
	1153	+ $time = $query[1] * 1000000.0;
	1154	+ $mysqlTime += $query[1];
	1155	+ if (!isset($byTime[$time])) : $byTime[$time] = array(); endif;
	1156	+ $byTime[$time][] = $query[0]. ' // STACK: ' . $query[2];
	1157	+ endforeach;
	1158	+ krsort($byTime);
	1159	+
	1160	+ foreach ($byTime as $time => $querySet) :
	1161	+ foreach ($querySet as $query) :
	1162	+ print "[".(sprintf('%4.4f', $time/1000.0)) . "ms] $query\n";
	1163	+ endforeach;
	1164	+ endforeach;
	1165	+ echo $this->log_prefix()."$wpdb->num_queries queries. $mysqlTime seconds in MySQL. Total of "; timer_stop(1); print " seconds.";
	1166	+ endif;
	1167	+
	1168	+ debug_out_feedwordpress_footer();
	1169	+
	1170	+ // Magic URL should return nothing but a 200 OK header packet
	1171	+ // when successful.
	1172	+ exit;
	1173	+ endif;
	1174	+ } /* FeedWordPress::magic_update_url () */
	1175	+
	1176	+ function clear_cache_magic_url () {
	1177	+ if ($this->clear_cache_requested()) :
	1178	+ $this->clear_cache();
	1179	+ endif;
	1180	+ } /* FeedWordPress::clear_cache_magic_url() */
	1181	+
	1182	+ function clear_cache_requested () {
	1183	+ return (
	1184	+ isset($_GET['clear_cache'])
	1185	+ and $_GET['clear_cache']
	1186	+ );
	1187	+ } /* FeedWordPress::clear_cache_requested() */
	1188	+
946	1189	function update_requested () {
947	1190	return (
948	1191	isset($_REQUEST['update_feedwordpress'])
949	1192	and $_REQUEST['update_feedwordpress']
		@@ -950,60 +1193,61 @@
950	1193	);
951	1194	} // FeedWordPress::update_requested()
952	1195
953	1196	function update_requested_url () {
954		- $ret = null;
955		-
956		- if (($_REQUEST['update_feedwordpress']=='*')
957		- or (preg_match('|^http://.*|i', $_REQUEST['update_feedwordpress']))) :
958		- $ret = $_REQUEST['update_feedwordpress'];
959		- endif;
	1197	+ $ret = null;
	1198	+
	1199	+ if (($_REQUEST['update_feedwordpress']=='*')
	1200	+ or (preg_match('|^http://.*|i', $_REQUEST['update_feedwordpress']))) :
	1201	+ $ret = $_REQUEST['update_feedwordpress'];
	1202	+ endif;
960	1203
961		- return $ret;
	1204	+ return $ret;
962	1205	} // FeedWordPress::update_requested_url()
963	1206
964		- function syndicate_link ($name, $uri, $rss) {
	1207	+ function auto_update () {
	1208	+ if ($this->stale()) :
	1209	+ $this->update();
	1210	+ endif;
	1211	+ } /* FeedWordPress::auto_update () */
	1212	+
	1213	+ function find_link ($uri, $field = 'link_rss') {
965	1214	global $wpdb;
966	1215
	1216	+ $unslashed = untrailingslashit($uri);
	1217	+ $slashed = trailingslashit($uri);
	1218	+ $link_id = $wpdb->get_var($wpdb->prepare("
	1219	+ SELECT link_id FROM $wpdb->links WHERE $field IN ('%s', '%s')
	1220	+ LIMIT 1", $unslashed, $slashed
	1221	+ ));
	1222	+
	1223	+ return $link_id;
	1224	+ } /* FeedWordPress::find_link () */
	1225	+
	1226	+ function syndicate_link ($name, $uri, $rss) {
967	1227	// Get the category ID#
968	1228	$cat_id = FeedWordPress::link_category_id();
969		-
	1229	+ if (!is_wp_error($cat_id)) :
	1230	+ $link_category = array($cat_id);
	1231	+ else :
	1232	+ $link_category = array();
	1233	+ endif;
	1234	+
970	1235	// WordPress gets cranky if there's no homepage URI
971		- if (!isset($uri) or strlen($uri)<1) : $uri = $rss; endif;
	1236	+ if (!is_string($uri) or strlen($uri)<1) : $uri = $rss; endif;
972	1237
973		- if (function_exists('wp_insert_link')) : // WordPress 2.x
974		- if (FeedWordPressCompatibility::test_version(0, FWP_SCHEMA_21)) :
975		- // Morons.
976		- $name = $wpdb->escape($name);
977		- $uri = $wpdb->escape($uri);
978		- $rss = $wpdb->escape($rss);
979		-
980		- // Comes in as a single category
981		- $linkCats = $cat_id;
982		- else :
983		- // Comes in as an array of categories
984		- $linkCats = array($cat_id);
985		- endif;
	1238	+ // Check if this feed URL is already being syndicated.
	1239	+ $link_id = wp_insert_link(array(
	1240	+ "link_id" => FeedWordPress::find_link($rss), // insert if nothing was found; else update
	1241	+ "link_rss" => $rss,
	1242	+ "link_name" => $name,
	1243	+ "link_url" => $uri,
	1244	+ "link_category" => $link_category,
	1245	+ "link_visible" => 'Y', // reactivate if inactivated
	1246	+ ));
986	1247
987		- $link_id = wp_insert_link(array(
988		- "link_name" => $name,
989		- "link_url" => $uri,
990		- "link_category" => $linkCats,
991		- "link_rss" => $rss
992		- ));
993		- else : // WordPress 1.5.x
994		- $result = $wpdb->query("
995		- INSERT INTO $wpdb->links
996		- SET
997		- link_name = '".$wpdb->escape($name)."',
998		- link_url = '".$wpdb->escape($uri)."',
999		- link_category = '".$wpdb->escape($cat_id)."',
1000		- link_rss = '".$wpdb->escape($rss)."'
1001		- ");
1002		- $link_id = $wpdb->insert_id;
1003		- endif;
1004	1248	return $link_id;
1005		- } // function FeedWordPress::syndicate_link()
	1249	+ } /* function FeedWordPress::syndicate_link() */
1006	1250
1007	1251	/*static*/ function syndicated_status ($what, $default) {
1008	1252	$ret = get_option("feedwordpress_syndicated_{$what}_status");
1009	1253	if (!$ret) :
		@@ -1011,26 +1255,16 @@
1011	1255	endif;
1012	1256	return $ret;
1013	1257	} /* FeedWordPress::syndicated_status() */
1014	1258
1015		- function on_unfamiliar ($what = 'author', $override = NULL) {
1016		- $set = array(
1017		- 'author' => array('create', 'default', 'filter'),
1018		- 'category' => array('create', 'tag', 'default', 'filter'),
1019		- );
	1259	+ function on_unfamiliar ($what = 'author') {
	1260	+ switch ($what) :
	1261	+ case 'category' : $suffix = ':category'; break;
	1262	+ case 'post_tag' : $suffix = ':post_tag'; break;
	1263	+ default: $suffix = '';
	1264	+ endswitch;
1020	1265
1021		- if (is_string($override)) :
1022		- $ret = strtolower($override);
1023		- endif;
1024		-
1025		- if (!is_numeric($override) and !in_array($ret, $set[$what])) :
1026		- $ret = get_option('feedwordpress_unfamiliar_'.$what);
1027		- if (!is_numeric($ret) and !in_array($ret, $set[$what])) :
1028		- $ret = 'create';
1029		- endif;
1030		- endif;
1031		-
1032		- return $ret;
	1266	+ return get_option('feedwordpress_unfamiliar_'.$what, 'create'.$suffix);
1033	1267	} // function FeedWordPress::on_unfamiliar()
1034	1268
1035	1269	function null_email_set () {
1036	1270	$base = get_option('feedwordpress_null_email_set');
		@@ -1056,14 +1290,28 @@
1056	1290	$ret = get_option('feedwordpress_use_aggregator_source_data');
1057	1291	return apply_filters('syndicated_post_use_aggregator_source_data', ($ret=='yes'));
1058	1292	}
1059	1293
1060		- function syndicated_links () {
	1294	+ /**
	1295	+ * FeedWordPress::munge_permalinks: check whether or not FeedWordPress
	1296	+ * should rewrite permalinks for syndicated items to reflect their
	1297	+ * original location.
	1298	+ *
	1299	+ * @return bool TRUE if FeedWordPress SHOULD rewrite permalinks; FALSE otherwise
	1300	+ */
	1301	+ /*static*/ function munge_permalinks () {
	1302	+ return (get_option('feedwordpress_munge_permalink', /*default=*/ 'yes') != 'no');
	1303	+ } /* FeedWordPress::munge_permalinks() */
	1304	+
	1305	+ function syndicated_links ($args = array()) {
1061	1306	$contributors = FeedWordPress::link_category_id();
1062		- if (function_exists('get_bookmarks')) :
1063		- $links = get_bookmarks(array("category" => $contributors));
1064		- else:
1065		- $links = get_linkobjects($contributors); // deprecated as of WP 2.1
	1307	+ if (!is_wp_error($contributors)) :
	1308	+ $links = get_bookmarks(array_merge(
	1309	+ array("category" => $contributors),
	1310	+ $args
	1311	+ ));
	1312	+ else :
	1313	+ $links = array();
1066	1314	endif;
1067	1315	return $links;
1068	1316	} // function FeedWordPress::syndicated_links()
1069	1317
		@@ -1089,11 +1337,12 @@
1089	1337	// If we could not find an appropriate link category,
1090	1338	// make a new one for ourselves.
1091	1339	if (!$cat_id) :
1092	1340	$cat_id = FeedWordPressCompatibility::insert_link_category(DEFAULT_SYNDICATION_CATEGORY);
1093		-
1094		- // Stamp it
1095		- update_option('feedwordpress_cat_id', $cat_id);
	1341	+ if (!is_wp_error($cat_id)) :
	1342	+ // Stamp it
	1343	+ update_option('feedwordpress_cat_id', $cat_id);
	1344	+ endif;
1096	1345	endif;
1097	1346
1098	1347	return $cat_id;
1099	1348	} // function FeedWordPress::link_category_id()
		@@ -1119,15 +1368,47 @@
1119	1368	update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
1120	1369	endif;
1121	1370	elseif ($fwp_db_version < 2009.0707) :
1122	1371	// We need to clear out any busted AJAX crap
1123		- if (fwp_test_wp_version(FWP_SCHEMA_HAS_USERMETA)) :
1124		- $wpdb->query("
1125		- DELETE FROM $wpdb->usermeta
1126		- WHERE LOCATE('feedwordpress', meta_key)
1127		- AND LOCATE('box', meta_key);
1128		- ");
	1372	+ $wpdb->query("
	1373	+ DELETE FROM $wpdb->usermeta
	1374	+ WHERE LOCATE('feedwordpress', meta_key)
	1375	+ AND LOCATE('box', meta_key);
	1376	+ ");
	1377	+
	1378	+ update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
	1379	+ elseif ($fwp_db_version < 2010.0814) :
	1380	+ // Change in terminology.
	1381	+ if (get_option('feedwordpress_unfamiliar_category', 'create')=='default') :
	1382	+ update_option('feedwordpress_unfamiliar_category', 'null');
1129	1383	endif;
	1384	+ foreach (FeedWordPress::syndicated_links() as $link) :
	1385	+ $sub = new SyndicatedLink($link);
	1386	+
	1387	+ $remap_uf = array(
	1388	+ 'default' => 'null',
	1389	+ 'filter' => 'null',
	1390	+ 'create' => 'create:category',
	1391	+ 'tag' => 'create:post_tag'
	1392	+ );
	1393	+ if (isset($sub->settings['unfamiliar category'])) :
	1394	+ if ($sub->settings['unfamiliar category']=='filter') :
	1395	+ $sub->settings['match/filter'] = array('category');
	1396	+ endif;
	1397	+ foreach ($remap_uf as $from => $to) :
	1398	+ if ($sub->settings['unfamiliar category']==$from) :
	1399	+ $sub->settings['unfamiliar category'] = $to;
	1400	+ endif;
	1401	+ endforeach;
	1402	+ endif;
	1403	+
	1404	+ if (isset($sub->settings['add global categories'])) :
	1405	+ $sub->settings['add/category'] = $sub->settings['add global categories'];
	1406	+ unset($sub->settings['add global categories']);
	1407	+ endif;
	1408	+
	1409	+ $sub->save_settings(/*reload=*/ true);
	1410	+ endforeach;
1130	1411	update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
1131	1412	else :
1132	1413	// No. Just brand it with the new version.
1133	1414	update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
		@@ -1141,58 +1422,14 @@
1141	1422
1142	1423	if (is_null($from) or $from <= 0.96) : $from = 0.96; endif;
1143	1424
1144	1425	switch ($from) :
1145		- case 0.96: // account for changes to syndication custom values and guid
1146		- echo "<p>Upgrading database from {$from} to ".FEEDWORDPRESS_VERSION."...</p>\n";
	1426	+ case 0.96:
	1427	+ // Dropping legacy upgrade code. If anyone is still
	1428	+ // using 0.96 and just now decided to upgrade, well, I'm
	1429	+ // sorry about that. You'll just have to cope with a few
	1430	+ // duplicate posts.
1147	1431
1148		- $cat_id = FeedWordPress::link_category_id();
1149		-
1150		- // Avoid duplicates
1151		- $wpdb->query("DELETE FROM `{$wpdb->postmeta}` WHERE meta_key = 'syndication_feed_id'");
1152		-
1153		- // Look up all the link IDs
1154		- $wpdb->query("
1155		- CREATE TEMPORARY TABLE tmp_custom_values
1156		- SELECT
1157		- NULL AS meta_id,
1158		- post_id,
1159		- 'syndication_feed_id' AS meta_key,
1160		- link_id AS meta_value
1161		- FROM `{$wpdb->postmeta}`, `{$wpdb->links}`
1162		- WHERE
1163		- meta_key='syndication_feed'
1164		- AND meta_value=link_rss
1165		- AND link_category = {$cat_id}
1166		- ");
1167		-
1168		- // Now attach them to their posts
1169		- $wpdb->query("INSERT INTO `{$wpdb->postmeta}` SELECT * FROM tmp_custom_values");
1170		-
1171		- // And clean up after ourselves.
1172		- $wpdb->query("DROP TABLE tmp_custom_values");
1173		-
1174		- // Now fix the guids to avoid duplicate posts
1175		- echo "<ul>";
1176		- foreach ($this->feeds as $syndicatedLink) :
1177		- $feed = $syndicatedLink->settings;
1178		- echo "<li>Fixing post meta-data for <cite>".$feed['link/name']."</cite> &#8230; "; flush();
1179		- $rss = @fetch_rss($feed['link/uri']);
1180		- if (is_array($rss->items)) :
1181		- foreach ($rss->items as $item) :
1182		- $post = new SyndicatedPost($item, $syndicatedLink);
1183		- $guid = $wpdb->escape($post->guid()); // new GUID algorithm
1184		- $link = $wpdb->escape($item['link']);
1185		-
1186		- $wpdb->query("
1187		- UPDATE `{$wpdb->posts}` SET guid='{$guid}' WHERE guid='{$link}'
1188		- ");
1189		- endforeach;
1190		- endif;
1191		- echo "<strong>complete.</strong></li>\n";
1192		- endforeach;
1193		- echo "</ul>\n";
1194		-
1195	1432	// Mark the upgrade as successful.
1196	1433	update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
1197	1434	endswitch;
1198	1435	echo "<p>Upgrade complete. FeedWordPress is now ready to use again.</p>";
		@@ -1197,8 +1434,27 @@
1197	1434	endswitch;
1198	1435	echo "<p>Upgrade complete. FeedWordPress is now ready to use again.</p>";
1199	1436	} /* FeedWordPress::upgrade_database() */
1200	1437
	1438	+ function has_guid_index () {
	1439	+ global $wpdb;
	1440	+
	1441	+ $found = false; // Guilty until proven innocent.
	1442	+
	1443	+ $results = $wpdb->get_results("
	1444	+ SHOW INDEXES FROM {$wpdb->posts}
	1445	+ ");
	1446	+ if ($results) :
	1447	+ foreach ($results as $index) :
	1448	+ if (isset($index->Column_name)
	1449	+ and ('guid' == $index->Column_name)) :
	1450	+ $found = true;
	1451	+ endif;
	1452	+ endforeach;
	1453	+ endif;
	1454	+ return $found;
	1455	+ } /* FeedWordPress::has_guid_index () */
	1456	+
1201	1457	function create_guid_index () {
1202	1458	global $wpdb;
1203	1459
1204	1460	$wpdb->query("
		@@ -1205,29 +1461,116 @@
1205	1461	CREATE INDEX {$wpdb->posts}_guid_idx ON {$wpdb->posts}(guid)
1206	1462	");
1207	1463	} /* FeedWordPress::create_guid_index () */
1208	1464
	1465	+ function remove_guid_index () {
	1466	+ global $wpdb;
	1467	+
	1468	+ $wpdb->query("
	1469	+ DROP INDEX {$wpdb->posts}_guid_idx ON {$wpdb->posts}
	1470	+ ");
	1471	+ }
	1472	+
	1473	+ /*static*/ function fetch_timeout () {
	1474	+ return apply_filters(
	1475	+ 'feedwordpress_fetch_timeout',
	1476	+ intval(get_option('feedwordpress_fetch_timeout', FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT))
	1477	+ );
	1478	+ }
	1479	+
	1480	+ /*static*/ function fetch ($url, $params = array()) {
	1481	+ $force_feed = true; // Default
	1482	+
	1483	+ // 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' =>
	1484	+ $timeout = FeedWordPress::fetch_timeout();
	1485	+
	1486	+ if (!is_array($params)) :
	1487	+ $force_feed = $params;
	1488	+ else : // Parameter array
	1489	+ $args = shortcode_atts(array(
	1490	+ 'force_feed' => $force_feed,
	1491	+ 'timeout' => $timeout
	1492	+ ), $params);
	1493	+
	1494	+ extract($args);
	1495	+ endif;
	1496	+ $timeout = intval($timeout);
	1497	+
	1498	+ $pie_class = apply_filters('feedwordpress_simplepie_class', 'SimplePie');
	1499	+ $cache_class = apply_filters('feedwordpress_cache_class', 'WP_Feed_Cache');
	1500	+ $file_class = apply_filters('feedwordpress_file_class', 'FeedWordPress_File');
	1501	+ $parser_class = apply_filters('feedwordpress_parser_class', 'FeedWordPress_Parser');
	1502	+
	1503	+ $sniffer_class = apply_filters('feedwordpress_sniffer_class', 'FeedWordPress_Content_Type_Sniffer');
	1504	+
	1505	+ $feed = new $pie_class;
	1506	+ $feed->set_feed_url($url);
	1507	+ $feed->set_cache_class($cache_class);
	1508	+ $feed->set_timeout($timeout);
	1509	+
	1510	+ //$feed->set_file_class('WP_SimplePie_File');
	1511	+ $feed->set_content_type_sniffer_class($sniffer_class);
	1512	+ $feed->set_file_class($file_class);
	1513	+ $feed->set_parser_class($parser_class);
	1514	+ $feed->force_feed($force_feed);
	1515	+ $feed->set_cache_duration(FeedWordPress::cache_duration());
	1516	+ $feed->init();
	1517	+ $feed->handle_content_type();
	1518	+
	1519	+ if ($feed->error()) :
	1520	+ $ret = new WP_Error('simplepie-error', $feed->error());
	1521	+ else :
	1522	+ $ret = $feed;
	1523	+ endif;
	1524	+ return $ret;
	1525	+ } /* FeedWordPress::fetch () */
	1526	+
1209	1527	function clear_cache () {
1210	1528	global $wpdb;
1211	1529
1212		- // MagpieRSS stores its cached feeds in options table rows with
1213		- // name = `rss_{md5 of url}` and timestamps for cached feeds in
1214		- // table rows with name = `rss_{md5 of url}_ts`. The md5 is
1215		- // always 32 characters in length, so the total option_name is
1216		- // always over 32 characters.
1217		- $wpdb->query("
	1530	+ // Just in case, clear out any old MagpieRSS cache records.
	1531	+ $magpies = $wpdb->query("
1218	1532	DELETE FROM {$wpdb->options}
1219		- WHERE LOCATE('rss_', option_name) AND LENGTH(option_name) > 32
	1533	+ WHERE option_name LIKE 'rss_%' AND LENGTH(option_name) > 32
1220	1534	");
	1535	+
	1536	+ // The WordPress SimplePie module stores its cached feeds as
	1537	+ // transient records in the options table. The data itself is
	1538	+ // stored in `_transient_feed_{md5 of url}` and the last-modified
	1539	+ // timestamp in `_transient_feed_mod_{md5 of url}`. Timeouts for
	1540	+ // these records are stored in `_transient_timeout_feed_{md5}`.
	1541	+ // Since the md5 is always 32 characters in length, the
	1542	+ // option_name is always over 32 characters.
	1543	+ $simplepies = $wpdb->query("
	1544	+ DELETE FROM {$wpdb->options}
	1545	+ WHERE option_name LIKE '_transient%_feed_%' AND LENGTH(option_name) > 32
	1546	+ ");
	1547	+ $simplepies = (int) ($simplepies / 4); // Each transient has 4 rows: the data, the modified timestamp; and the timeouts for each
	1548	+
	1549	+ return ($magpies + $simplepies);
1221	1550	} /* FeedWordPress::clear_cache () */
1222	1551
1223		- function magpie_version () {
1224		- if (!defined('MAGPIE_VERSION')) : $magpie_version = $GLOBALS['wp_version'].'-default';
1225		- else : $magpie_version = MAGPIE_VERSION;
	1552	+ function cache_duration () {
	1553	+ $duration = NULL;
	1554	+ if (defined('FEEDWORDPRESS_CACHE_AGE')) :
	1555	+ $duration = FEEDWORDPRESS_CACHE_AGE;
1226	1556	endif;
1227		- return $magpie_version;
	1557	+ return $duration;
1228	1558	}
	1559	+ function cache_lifetime ($duration) {
	1560	+ // Check for explicit setting of a lifetime duration
	1561	+ if (defined('FEEDWORDPRESS_CACHE_LIFETIME')) :
	1562	+ $duration = FEEDWORDPRESS_CACHE_LIFETIME;
1229	1563
	1564	+ // Fall back to the cache freshness duration
	1565	+ elseif (defined('FEEDWORDPRESS_CACHE_AGE')) :
	1566	+ $duration = FEEDWORDPRESS_CACHE_AGE;
	1567	+ endif;
	1568	+
	1569	+ // Fall back to WordPress default
	1570	+ return $duration;
	1571	+ } /* FeedWordPress::cache_lifetime () */
	1572	+
1230	1573	# Utility functions for handling text settings
1231	1574	function negative ($f, $setting) {
1232	1575	$nego = array ('n', 'no', 'f', 'false');
1233	1576	return (isset($f[$setting]) and in_array(strtolower($f[$setting]), $nego));
		@@ -1237,67 +1580,600 @@
1237	1580	$affirmo = array ('y', 'yes', 't', 'true', 1);
1238	1581	return (isset($f[$setting]) and in_array(strtolower($f[$setting]), $affirmo));
1239	1582	}
1240	1583
1241		-
1242	1584	# Internal debugging functions
1243		- function critical_bug ($varname, $var, $line) {
	1585	+ function critical_bug ($varname, $var, $line, $file = NULL) {
1244	1586	global $wp_version;
	1587	+
	1588	+ if (!is_null($file)) :
	1589	+ $location = "line # ${line} of ".basename($file);
	1590	+ else :
	1591	+ $location = "line # ${line}";
	1592	+ endif;
	1593	+
	1594	+ 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>';
	1595	+ print "\n<plaintext>";
	1596	+ print "Triggered at ${location}\n";
	1597	+ print "FeedWordPress: ".FEEDWORDPRESS_VERSION."\n";
	1598	+ print "WordPress: {$wp_version}\n";
	1599	+ print "PHP: ".phpversion()."\n";
	1600	+ print "Error data: ";
	1601	+ print $varname.": "; var_dump($var); echo "\n";
	1602	+ die;
	1603	+ }
	1604	+
	1605	+ function noncritical_bug ($varname, $var, $line, $file = NULL) {
	1606	+ if (FEEDWORDPRESS_DEBUG) : // halt only when we are doing debugging
	1607	+ FeedWordPress::critical_bug($varname, $var, $line, $file);
	1608	+ endif;
	1609	+ }
	1610	+
	1611	+ function val ($v, $no_newlines = false) {
	1612	+ ob_start();
	1613	+ var_dump($v);
	1614	+ $out = ob_get_contents(); ob_end_clean();
	1615	+
	1616	+ if ($no_newlines) :
	1617	+ $out = preg_replace('/\s+/', " ", $out);
	1618	+ endif;
	1619	+ return $out;
	1620	+ } /* FeedWordPress::val () */
1245	1621
1246		- if (defined('MAGPIE_VERSION')) : $mv = MAGPIE_VERSION;
1247		- else : $mv = 'WordPress '.$wp_version.' default.';
	1622	+ function diagnostic_on ($level) {
	1623	+ $show = get_option('feedwordpress_diagnostics_show', array());
	1624	+ return (in_array($level, $show));
	1625	+ } /* FeedWordPress::diagnostic_on () */
	1626	+
	1627	+ function diagnostic ($level, $out, $persist = NULL, $since = NULL, $mostRecent = NULL) {
	1628	+ global $feedwordpress_admin_footer;
	1629	+
	1630	+ $output = get_option('feedwordpress_diagnostics_output', array());
	1631	+ $dlog = get_option('feedwordpress_diagnostics_log', array());
	1632	+
	1633	+ $diagnostic_nesting = count(explode(":", $level));
	1634	+
	1635	+ if (FeedWordPress::diagnostic_on($level)) :
	1636	+ foreach ($output as $method) :
	1637	+ switch ($method) :
	1638	+ case 'echo' :
	1639	+ if (!FeedWordPress::update_requested()) :
	1640	+ echo "<div><pre><strong>Diag".str_repeat('====', $diagnostic_nesting-1).'|</strong> '.$out."</pre></div>";
	1641	+ endif;
	1642	+ break;
	1643	+ case 'echo_in_cronjob' :
	1644	+ if (FeedWordPress::update_requested()) :
	1645	+ echo FeedWordPress::log_prefix()." ".$out."\n";
	1646	+ endif;
	1647	+ break;
	1648	+ case 'admin_footer' :
	1649	+ $feedwordpress_admin_footer[] = $out;
	1650	+ break;
	1651	+ case 'error_log' :
	1652	+ error_log(FeedWordPress::log_prefix().' '.$out);
	1653	+ break;
	1654	+ case 'email' :
	1655	+ if (is_null($persist)) :
	1656	+ $sect = 'occurrent';
	1657	+ $hook = (isset($dlog['mesg'][$sect]) ? count($dlog['mesg'][$sect]) : 0);
	1658	+ $line = array("Time" => time(), "Message" => $out);
	1659	+ else :
	1660	+ $sect = 'persistent';
	1661	+ $hook = md5($level."\n".$persist);
	1662	+ $line = array("Since" => $since, "Message" => $out, "Most Recent" => $mostRecent);
	1663	+ endif;
	1664	+
	1665	+ if (!isset($dlog['mesg'])) : $dlog['mesg'] = array(); endif;
	1666	+ if (!isset($dlog['mesg'][$sect])) : $dlog['mesg'][$sect] = array(); endif;
	1667	+
	1668	+ $dlog['mesg'][$sect][$hook] = $line;
	1669	+ endswitch;
	1670	+ endforeach;
1248	1671	endif;
	1672	+
	1673	+ update_option('feedwordpress_diagnostics_log', $dlog);
	1674	+ } /* FeedWordPress::diagnostic () */
	1675	+
	1676	+ function email_diagnostic_log () {
	1677	+ $dlog = get_option('feedwordpress_diagnostics_log', array());
	1678	+
	1679	+ if (isset($dlog['schedule']) and isset($dlog['schedule']['last'])) :
	1680	+ if (time() > ($dlog['schedule']['last'] + $dlog['schedule']['freq'])) :
	1681	+ // No news is good news; only send if
	1682	+ // there are some messages to send.
	1683	+ $body = NULL;
	1684	+ foreach ($dlog['mesg'] as $sect => $mesgs) :
	1685	+ if (count($mesgs) > 0) :
	1686	+ if (is_null($body)) : $body = ''; endif;
	1687	+
	1688	+ $paradigm = reset($mesgs);
	1689	+ $body .= "<h2>".ucfirst($sect)." issues</h2>\n"
	1690	+ ."<table>\n"
	1691	+ ."<thead><tr>\n";
	1692	+ foreach ($paradigm as $col => $value) :
	1693	+ $body .= '<th scope="col">'.$col."</th>\n";
	1694	+ endforeach;
	1695	+ $body .= "</tr></thead>\n"
	1696	+ ."<tbody>\n";
	1697	+
	1698	+ foreach ($mesgs as $line) :
	1699	+ $body .= "<tr>\n";
	1700	+ foreach ($line as $col => $cell) :
	1701	+ if (is_numeric($cell)) :
	1702	+ $cell = date('j-M-y, h:i a', $cell);
	1703	+ endif;
	1704	+ $class = strtolower(preg_replace('/\s+/', '-', $col));
	1705	+ $body .= "<td class=\"$class\">${cell}</td>";
	1706	+ endforeach;
	1707	+ $body .= "</tr>\n";
	1708	+ endforeach;
	1709	+
	1710	+ $body .= "</tbody>\n</table>\n\n";
	1711	+ endif;
	1712	+ endforeach;
	1713	+
	1714	+ if (!is_null($body)) :
	1715	+ $home = feedwordpress_display_url(get_bloginfo('url'));
	1716	+ $subj = $home . " syndication issues for ".date('j-M-y', time());
	1717	+ $agent = 'FeedWordPress '.FEEDWORDPRESS_VERSION;
	1718	+ $body = <<<EOMAIL
	1719	+<html>
	1720	+<head>
	1721	+<title>$subj</title>
	1722	+<style type="text/css">
	1723	+ body { background-color: white; color: black; }
	1724	+ table { width: 100%; border: 1px solid black; }
	1725	+ table thead tr th { background-color: #ff7700; color: white; border-bottom: 1px solid black; }
	1726	+ table thead tr { border-bottom: 1px solid black; }
	1727	+ table tr { vertical-align: top; }
	1728	+ table .since { width: 20%; }
	1729	+ table .time { width: 20%; }
	1730	+ table .most-recently { width: 20%; }
	1731	+ table .message { width: auto; }
	1732	+</style>
	1733	+</head>
	1734	+<body>
	1735	+<h1>Syndication Issues encountered by $agent on $home</h1>
	1736	+$body
	1737	+</body>
	1738	+</html>
1249	1739
1250		- 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>';
1251		- echo "\n<plaintext>";
1252		- echo "Triggered at line # ".$line."\n";
1253		- echo "FeedWordPress version: ".FEEDWORDPRESS_VERSION."\n";
1254		- echo "MagpieRSS version: {$mv}\n";
1255		- echo "WordPress version: {$wp_version}\n";
1256		- echo "PHP version: ".phpversion()."\n";
1257		- echo "\n";
1258		- echo $varname.": "; var_dump($var); echo "\n";
1259		- die;
	1740	+EOMAIL;
	1741	+
	1742	+ $ded = get_option('feedwordpress_diagnostics_email_destination', 'admins');
	1743	+
	1744	+ // e-mail address
	1745	+ if (preg_match('/^mailto:(.*)$/', $ded, $ref)) :
	1746	+ $recipients = array($ref[1]);
	1747	+
	1748	+ // userid
	1749	+ elseif (preg_match('/^user:(.*)$/', $ded, $ref)) :
	1750	+ $userdata = get_userdata((int) $ref[1]);
	1751	+ $recipients = array($userdata->user_email);
	1752	+
	1753	+ // admins
	1754	+ else :
	1755	+ $recipients = FeedWordPressDiagnostic::admin_emails();
	1756	+ endif;
	1757	+
	1758	+ foreach ($recipients as $email) :
	1759	+ add_filter('wp_mail_content_type', array('FeedWordPress', 'allow_html_mail'));
	1760	+ wp_mail($email, $subj, $body);
	1761	+ remove_filter('wp_mail_content_type', array('FeedWordPress', 'allow_html_mail'));
	1762	+ endforeach;
	1763	+ endif;
	1764	+
	1765	+ // Clear the logs
	1766	+ $dlog['mesg']['persistent'] = array();
	1767	+ $dlog['mesg']['occurrent'] = array();
	1768	+
	1769	+ // Set schedule for next update
	1770	+ $dlog['schedule']['last'] = time();
	1771	+ endif;
	1772	+ else :
	1773	+ $dlog['schedule'] = array(
	1774	+ 'freq' => 24 /*hr*/ * 60 /*min*/ * 60 /*s*/,
	1775	+ 'last' => time(),
	1776	+ );
	1777	+ endif;
	1778	+
	1779	+ update_option('feedwordpress_diagnostics_log', $dlog);
	1780	+ } /* FeedWordPress::email_diagnostic_log () */
	1781	+
	1782	+ function allow_html_mail () {
	1783	+ return 'text/html';
	1784	+ } /* FeedWordPress::allow_html_mail () */
	1785	+
	1786	+ function admin_footer () {
	1787	+ global $feedwordpress_admin_footer;
	1788	+ foreach ($feedwordpress_admin_footer as $line) :
	1789	+ echo '<div><pre>'.$line.'</pre></div>';
	1790	+ endforeach;
	1791	+ } /* FeedWordPress::admin_footer () */
	1792	+
	1793	+ function log_prefix ($date = false) {
	1794	+ $home = get_bloginfo('url');
	1795	+ $prefix = '['.feedwordpress_display_url($home).'] [feedwordpress] ';
	1796	+ if ($date) :
	1797	+ $prefix = "[".date('Y-m-d H:i:s')."]".$prefix;
	1798	+ endif;
	1799	+ return $prefix;
	1800	+ } /* FeedWordPress::log_prefix () */
	1801	+
	1802	+ function menu_cap ($sub = false) {
	1803	+ if ($sub) :
	1804	+ $cap = apply_filters('feedwordpress_menu_settings_capacity', 'manage_options');
	1805	+ else :
	1806	+ $cap = apply_filters('feedwordpress_menu_main_capacity', 'manage_links');
	1807	+ endif;
	1808	+ return $cap;
	1809	+ } /* FeedWordPress::menu_cap () */
	1810	+
	1811	+ function path ($filename = '') {
	1812	+ global $fwp_path;
	1813	+
	1814	+ $path = $fwp_path;
	1815	+ if (strlen($filename) > 0) :
	1816	+ $path .= '/'.$filename;
	1817	+ endif;
	1818	+ return $path;
1260	1819	}
1261	1820
1262		- function noncritical_bug ($varname, $var, $line) {
1263		- if (FEEDWORDPRESS_DEBUG) : // halt only when we are doing debugging
1264		- FeedWordPress::critical_bug($varname, $var, $line);
	1821	+ function param ($key, $type = 'REQUEST', $default = NULL) {
	1822	+ $where = '_'.strtoupper($type);
	1823	+ $ret = $default;
	1824	+ if (isset($GLOBALS[$where]) and is_array($GLOBALS[$where])) :
	1825	+ if (isset($GLOBALS[$where][$key])) :
	1826	+ $ret = $GLOBALS[$where][$key];
	1827	+ if (get_magic_quotes_gpc()) :
	1828	+ $ret = stripslashes_deep($ret);
	1829	+ endif;
	1830	+ endif;
1265	1831	endif;
	1832	+ return $ret;
1266	1833	}
	1834	+ function post ($key, $default = NULL) {
	1835	+ return FeedWordPress::param($key, 'POST');
	1836	+ }
1267	1837	} // class FeedWordPress
1268	1838
1269		-require_once(dirname(__FILE__) . '/syndicatedpost.class.php');
1270		-require_once(dirname(__FILE__) . '/syndicatedlink.class.php');
	1839	+class FeedWordPress_File extends WP_SimplePie_File {
	1840	+ function FeedWordPress_File ($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false) {
	1841	+ WP_SimplePie_File::WP_SimplePie_File($url, $timeout, $redirects, $headers, $useragent, $force_fsockopen);
1271	1842
	1843	+ // SimplePie makes a strongly typed check against integers with
	1844	+ // this, but WordPress puts a string in. Which causes caching
	1845	+ // to break and fall on its ass when SimplePie is getting a 304,
	1846	+ // but doesn't realize it because this member is "304" instead.
	1847	+ $this->status_code = (int) $this->status_code;
	1848	+ }
	1849	+} /* class FeedWordPress_File () */
	1850	+
	1851	+class FeedWordPress_Parser extends SimplePie_Parser {
	1852	+ function parse (&$data, $encoding) {
	1853	+ // Use UTF-8 if we get passed US-ASCII, as every US-ASCII character is a UTF-8 character
	1854	+ if (strtoupper($encoding) === 'US-ASCII')
	1855	+ {
	1856	+ $this->encoding = 'UTF-8';
	1857	+ }
	1858	+ else
	1859	+ {
	1860	+ $this->encoding = $encoding;
	1861	+ }
	1862	+
	1863	+ // Strip BOM:
	1864	+ // UTF-32 Big Endian BOM
	1865	+ if (substr($data, 0, 4) === "\x00\x00\xFE\xFF")
	1866	+ {
	1867	+ $data = substr($data, 4);
	1868	+ }
	1869	+ // UTF-32 Little Endian BOM
	1870	+ elseif (substr($data, 0, 4) === "\xFF\xFE\x00\x00")
	1871	+ {
	1872	+ $data = substr($data, 4);
	1873	+ }
	1874	+ // UTF-16 Big Endian BOM
	1875	+ elseif (substr($data, 0, 2) === "\xFE\xFF")
	1876	+ {
	1877	+ $data = substr($data, 2);
	1878	+ }
	1879	+ // UTF-16 Little Endian BOM
	1880	+ elseif (substr($data, 0, 2) === "\xFF\xFE")
	1881	+ {
	1882	+ $data = substr($data, 2);
	1883	+ }
	1884	+ // UTF-8 BOM
	1885	+ elseif (substr($data, 0, 3) === "\xEF\xBB\xBF")
	1886	+ {
	1887	+ $data = substr($data, 3);
	1888	+ }
	1889	+
	1890	+ if (substr($data, 0, 5) === '<?xml' && strspn(substr($data, 5, 1), "\x09\x0A\x0D\x20") && ($pos = strpos($data, '?>')) !== false)
	1891	+ {
	1892	+ $declaration =& new SimplePie_XML_Declaration_Parser(substr($data, 5, $pos - 5));
	1893	+ if ($declaration->parse())
	1894	+ {
	1895	+ $data = substr($data, $pos + 2);
	1896	+ $data = '<?xml version="' . $declaration->version . '" encoding="' . $encoding . '" standalone="' . (($declaration->standalone) ? 'yes' : 'no') . '"?>' . $data;
	1897	+ }
	1898	+ else
	1899	+ {
	1900	+ $this->error_string = 'SimplePie bug! Please report this!';
	1901	+ return false;
	1902	+ }
	1903	+ }
	1904	+
	1905	+ $return = true;
	1906	+
	1907	+ static $xml_is_sane = null;
	1908	+ if ($xml_is_sane === null)
	1909	+ {
	1910	+ $parser_check = xml_parser_create();
	1911	+ xml_parse_into_struct($parser_check, '<foo>&amp;</foo>', $values);
	1912	+ xml_parser_free($parser_check);
	1913	+ $xml_is_sane = isset($values[0]['value']);
	1914	+ }
	1915	+
	1916	+ // Create the parser
	1917	+ if ($xml_is_sane)
	1918	+ {
	1919	+ $xml = xml_parser_create_ns($this->encoding, $this->separator);
	1920	+ xml_parser_set_option($xml, XML_OPTION_SKIP_WHITE, 1);
	1921	+ xml_parser_set_option($xml, XML_OPTION_CASE_FOLDING, 0);
	1922	+ xml_set_object($xml, $this);
	1923	+ xml_set_character_data_handler($xml, 'cdata');
	1924	+ xml_set_element_handler($xml, 'tag_open', 'tag_close');
	1925	+ xml_set_start_namespace_decl_handler($xml, 'start_xmlns');
	1926	+
	1927	+ // Parse!
	1928	+ if (!xml_parse($xml, $data, true))
	1929	+ {
	1930	+ $this->error_code = xml_get_error_code($xml);
	1931	+ $this->error_string = xml_error_string($this->error_code);
	1932	+ $return = false;
	1933	+ }
	1934	+
	1935	+ $this->current_line = xml_get_current_line_number($xml);
	1936	+ $this->current_column = xml_get_current_column_number($xml);
	1937	+ $this->current_byte = xml_get_current_byte_index($xml);
	1938	+ xml_parser_free($xml);
	1939	+
	1940	+ return $return;
	1941	+ }
	1942	+ else
	1943	+ {
	1944	+ libxml_clear_errors();
	1945	+ $xml =& new XMLReader();
	1946	+ $xml->xml($data);
	1947	+ while (@$xml->read())
	1948	+ {
	1949	+ switch ($xml->nodeType)
	1950	+ {
	1951	+
	1952	+ case constant('XMLReader::END_ELEMENT'):
	1953	+ if ($xml->namespaceURI !== '')
	1954	+ {
	1955	+ $tagName = "{$xml->namespaceURI}{$this->separator}{$xml->localName}";
	1956	+ }
	1957	+ else
	1958	+ {
	1959	+ $tagName = $xml->localName;
	1960	+ }
	1961	+ $this->tag_close(null, $tagName);
	1962	+ break;
	1963	+ case constant('XMLReader::ELEMENT'):
	1964	+ $empty = $xml->isEmptyElement;
	1965	+ if ($xml->namespaceURI !== '')
	1966	+ {
	1967	+ $tagName = "{$xml->namespaceURI}{$this->separator}{$xml->localName}";
	1968	+ }
	1969	+ else
	1970	+ {
	1971	+ $tagName = $xml->localName;
	1972	+ }
	1973	+ $attributes = array();
	1974	+ while ($xml->moveToNextAttribute())
	1975	+ {
	1976	+ if ($xml->namespaceURI !== '')
	1977	+ {
	1978	+ $attrName = "{$xml->namespaceURI}{$this->separator}{$xml->localName}";
	1979	+ }
	1980	+ else
	1981	+ {
	1982	+ $attrName = $xml->localName;
	1983	+ }
	1984	+ $attributes[$attrName] = $xml->value;
	1985	+ }
	1986	+
	1987	+ foreach ($attributes as $attr => $value) :
	1988	+ list($ns, $local) = $this->split_ns($attr);
	1989	+ if ($ns=='http://www.w3.org/2000/xmlns/') :
	1990	+ if ('xmlns' == $local) : $local = false; endif;
	1991	+ $this->start_xmlns(null, $local, $value);
	1992	+ endif;
	1993	+ endforeach;
	1994	+
	1995	+ $this->tag_open(null, $tagName, $attributes);
	1996	+ if ($empty)
	1997	+ {
	1998	+ $this->tag_close(null, $tagName);
	1999	+ }
	2000	+ break;
	2001	+ case constant('XMLReader::TEXT'):
	2002	+
	2003	+ case constant('XMLReader::CDATA'):
	2004	+ $this->cdata(null, $xml->value);
	2005	+ break;
	2006	+ }
	2007	+ }
	2008	+ if ($error = libxml_get_last_error())
	2009	+ {
	2010	+ $this->error_code = $error->code;
	2011	+ $this->error_string = $error->message;
	2012	+ $this->current_line = $error->line;
	2013	+ $this->current_column = $error->column;
	2014	+ return false;
	2015	+ }
	2016	+ else
	2017	+ {
	2018	+ return true;
	2019	+ }
	2020	+ }
	2021	+ } /* FeedWordPress_Parser::parse() */
	2022	+
	2023	+ var $xmlns_stack = array();
	2024	+ var $xmlns_current = array();
	2025	+ function tag_open ($parser, $tag, $attributes) {
	2026	+ $ret = parent::tag_open($parser, $tag, $attributes);
	2027	+ if ($this->current_xhtml_construct < 0) :
	2028	+ $this->data['xmlns'] = $this->xmlns_current;
	2029	+ $this->xmlns_stack[] = $this->xmlns_current;
	2030	+ endif;
	2031	+ return $ret;
	2032	+ }
	2033	+
	2034	+ function tag_close($parser, $tag) {
	2035	+ if ($this->current_xhtml_construct < 0) :
	2036	+ $this->xmlns_current = array_pop($this->xmlns_stack);
	2037	+ endif;
	2038	+ $ret = parent::tag_close($parser, $tag);
	2039	+ return $ret;
	2040	+ }
	2041	+
	2042	+ function start_xmlns ($parser, $prefix, $uri) {
	2043	+ if (!$prefix) :
	2044	+ $prefix = '';
	2045	+ endif;
	2046	+ if ($this->current_xhtml_construct < 0) :
	2047	+ $this->xmlns_current[$prefix] = $uri;
	2048	+ endif;
	2049	+ return true;
	2050	+ } /* FeedWordPress_Parser::start_xmlns() */
	2051	+}
	2052	+
	2053	+$feedwordpress_admin_footer = array();
	2054	+
1272	2055	################################################################################
1273	2056	## XML-RPC HOOKS: accept XML-RPC update pings from Contributors ################
1274	2057	################################################################################
1275	2058
1276		-function feedwordpress_xmlrpc_hook ($args = array ()) {
1277		- $args['weblogUpdates.ping'] = 'feedwordpress_pong';
1278		- return $args;
1279		-}
	2059	+class FeedWordPressRPC {
	2060	+ function FeedWordPressRPC () {
	2061	+ add_filter('xmlrpc_methods', array(&$this, 'xmlrpc_methods'));
	2062	+ }
	2063	+
	2064	+ function xmlrpc_methods ($args = array()) {
	2065	+ $args['weblogUpdates.ping'] = array(&$this, 'ping');
	2066	+ $args['feedwordpress.subscribe'] = array(&$this, 'subscribe');
	2067	+ $args['feedwordpress.deactivate'] = array(&$this, 'deactivate');
	2068	+ $args['feedwordpress.delete'] = array(&$this, 'delete');
	2069	+ $args['feedwordpress.nuke'] = array(&$this, 'nuke');
	2070	+ return $args;
	2071	+ }
	2072	+
	2073	+ function ping ($args) {
	2074	+ global $feedwordpress;
	2075	+
	2076	+ $delta = @$feedwordpress->update($args[1]);
	2077	+ if (is_null($delta)):
	2078	+ return array('flerror' => true, 'message' => "Sorry. I don't syndicate <$args[1]>.");
	2079	+ else:
	2080	+ $mesg = array();
	2081	+ if (isset($delta['new'])) { $mesg[] = ' '.$delta['new'].' new posts were syndicated'; }
	2082	+ if (isset($delta['updated'])) { $mesg[] = ' '.$delta['updated'].' existing posts were updated'; }
	2083	+
	2084	+ return array('flerror' => false, 'message' => "Thanks for the ping.".implode(' and', $mesg));
	2085	+ endif;
	2086	+ }
	2087	+
	2088	+ function validate (&$args) {
	2089	+ global $wp_xmlrpc_server;
1280	2090
1281		-function feedwordpress_pong ($args) {
1282		- $feedwordpress =& new FeedWordPress;
1283		- $delta = @$feedwordpress->update($args[1]);
1284		- if (is_null($delta)):
1285		- return array('flerror' => true, 'message' => "Sorry. I don't syndicate <$args[1]>.");
1286		- else:
1287		- $mesg = array();
1288		- if (isset($delta['new'])) { $mesg[] = ' '.$delta['new'].' new posts were syndicated'; }
1289		- if (isset($delta['updated'])) { $mesg[] = ' '.$delta['updated'].' existing posts were updated'; }
	2091	+ // First two params are username/password
	2092	+ $username = $wp_xmlrpc_server->escape(array_shift($args));
	2093	+ $password = $wp_xmlrpc_server->escape(array_shift($args));
1290	2094
1291		- return array('flerror' => false, 'message' => "Thanks for the ping.".implode(' and', $mesg));
1292		- endif;
1293		-}
	2095	+ $ret = array();
	2096	+ if ( !$user = $wp_xmlrpc_server->login($username, $password) ) :
	2097	+ $ret = $wp_xmlrpc_server->error;
	2098	+ elseif (!current_user_can('manage_links')) :
	2099	+ $ret = new IXR_Error(401, 'Sorry, you cannot change the subscription list.');
	2100	+ endif;
	2101	+ return $ret;
	2102	+ }
1294	2103
1295		-# The upgraded MagpieRSS also uses this class. So if we have it loaded
1296		-# in, don't load it again.
1297		-if (!class_exists('Relative_URI')) {
1298		- require_once(dirname(__FILE__) . '/relative_uri.class.php');
1299		-}
	2104	+ function subscribe ($args) {
	2105	+ $ret = $this->validate($args);
	2106	+ if (is_array($ret)) : // Success
	2107	+ // The remaining params are feed URLs
	2108	+ foreach ($args as $arg) :
	2109	+ $finder = new FeedFinder($arg, /*verify=*/ false, /*fallbacks=*/ 1);
	2110	+ $feeds = array_values(array_unique($finder->find()));
	2111	+
	2112	+ if (count($feeds) > 0) :
	2113	+ $link_id = FeedWordPress::syndicate_link(
	2114	+ /*title=*/ feedwordpress_display_url($feeds[0]),
	2115	+ /*homepage=*/ $feeds[0],
	2116	+ /*feed=*/ $feeds[0]
	2117	+ );
	2118	+ $ret[] = array(
	2119	+ 'added',
	2120	+ $feeds[0],
	2121	+ $arg,
	2122	+ );
	2123	+ else :
	2124	+ $ret[] = array(
	2125	+ 'error',
	2126	+ $arg
	2127	+ );
	2128	+ endif;
	2129	+ endforeach;
	2130	+ endif;
	2131	+ return $ret;
	2132	+ } /* FeedWordPressRPC::subscribe () */
	2133	+
	2134	+ function unsubscribe ($method, $args) {
	2135	+ $ret = $this->validate($args);
	2136	+ if (is_array($ret)) : // Success
	2137	+ // The remaining params are feed URLs
	2138	+ foreach ($args as $arg) :
	2139	+ $link_id = FeedWordPress::find_link($arg);
	2140	+
	2141	+ if (!$link_id) :
	2142	+ $link_id = FeedWordPress::find_link($arg, 'link_url');
	2143	+ endif;
	2144	+
	2145	+ if ($link_id) :
	2146	+ $link = new SyndicatedLink($link_id);
	2147	+
	2148	+ $link->{$method}();
	2149	+ $ret[] = array(
	2150	+ 'deactivated',
	2151	+ $arg,
	2152	+ );
	2153	+ else :
	2154	+ $ret[] = array(
	2155	+ 'error',
	2156	+ $arg,
	2157	+ );
	2158	+ endif;
	2159	+ endforeach;
	2160	+ endif;
	2161	+ return $ret;
	2162	+ } /* FeedWordPress::unsubscribe () */
	2163	+
	2164	+ function deactivate ($args) {
	2165	+ return $this->unsubscribe('deactivate', $args);
	2166	+ } /* FeedWordPressRPC::deactivate () */
	2167	+
	2168	+ function delete ($args) {
	2169	+ return $this->unsubscribe('delete', $args);
	2170	+ } /* FeedWordPressRPC::delete () */
	2171	+
	2172	+ function nuke ($args) {
	2173	+ return $this->unsubscribe('nuke', $args);
	2174	+ } /* FeedWordPressRPC::nuke () */
	2175	+} /* class FeedWordPressRPC */
1300	2176
1301	2177	// take your best guess at the realname and e-mail, given a string
1302	2178	define('FWP_REGEX_EMAIL_ADDY', '([^@"(<\s]+@[^"@(<\s]+\.[^"@(<\s]+)');
1303	2179	define('FWP_REGEX_EMAIL_NAME', '("([^"]*)"|([^"<(]+\S))');