feedwordpress.php: 2010.0528 vs 2008.1101 · FeedWordPress

← All changes | feedwordpress.php +799 -1941 2008.1101 → 2010.0528 View file →

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