← All changes | feedwordpress.php +1487 -2134 2008.1105 → 2011.0512 View file →

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