feedwordpress.php: 0.992 vs 2009.0612 · FeedWordPress

← All changes | feedwordpress.php +1879 -910 2009.0612 → 0.992 View file →

		@@ -2,12 +2,13 @@
2	2	/*
3	3	Plugin Name: FeedWordPress
4	4	Plugin URI: http://projects.radgeek.com/feedwordpress
5	5	Description: simple and flexible Atom/RSS syndication for WordPress
6		-Version: 2009.0612
	6	+Version: 0.992
7	7	Author: Charles Johnson
8	8	Author URI: http://radgeek.com/
9	9	License: GPL
	10	+Last modified: 2008-01-04 18:03 PDT
10	11	*/
11	12
12	13	# This uses code derived from:
13	14	# - wp-rss-aggregate.php by Kellan Elliot-McCrea <kellan@protest.net>
		@@ -14,30 +15,24 @@
14	15	# - HTTP Navigator 2 by Keyvan Minoukadeh <keyvan@k1m.com>
15	16	# - Ultra-Liberal Feed Finder by Mark Pilgrim <mark@diveintomark.org>
16	17	# according to the terms of the GNU General Public License.
17	18	#
18		-# INSTALLATION: see readme.txt or <http://projects.radgeek.com/install>
	19	+# INSTALLATION: see README.text or <http://projects.radgeek.com/install>
19	20	#
20	21	# USAGE: once FeedWordPress is installed, you manage just about everything from
21		-# the WordPress Dashboard, under the Syndication menu. To ensure that fresh
22		-# content is added as it becomes available, you can convince your contributors
23		-# to put your XML-RPC URI (if WordPress is installed at
	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
24	25	# <http://www.zyx.com/blog>, XML-RPC requests should be sent to
25		-# <http://www.zyx.com/blog/xmlrpc.php>), or update manually under the
26		-# Syndication menu, or set up automatic updates under Syndication --> Settings,
27		-# or use a cron job.
	26	+# <http://www.zyx.com/blog/xmlrpc.php>), or see `update-feeds.php`
28	27
29	28	# -- Don't change these unless you know what you're doing...
30	29
31		-define ('FEEDWORDPRESS_VERSION', '2009.0612');
	30	+define ('FEEDWORDPRESS_VERSION', '0.992');
32	31	define ('FEEDWORDPRESS_AUTHOR_CONTACT', 'http://radgeek.com/contact');
33	32	define ('DEFAULT_SYNDICATION_CATEGORY', 'Contributors');
34	33
35		-$feedwordpress_debug = get_option('feedwordpress_debug');
36		-if (is_string($feedwordpress_debug)) :
37		- $feedwordpress_debug = ($feedwordpress_debug == 'yes');
38		-endif;
39		-define ('FEEDWORDPRESS_DEBUG', $feedwordpress_debug);
	34	+define ('FEEDWORDPRESS_DEBUG', false);
40	35
41	36	define ('FEEDWORDPRESS_CAT_SEPARATOR_PATTERN', '/[:\n]/');
42	37	define ('FEEDWORDPRESS_CAT_SEPARATOR', "\n");
43	38
		@@ -44,15 +39,11 @@
44	39	define ('FEEDVALIDATOR_URI', 'http://feedvalidator.org/check.cgi');
45	40
46	41	define ('FEEDWORDPRESS_FRESHNESS_INTERVAL', 10*60); // Every ten minutes
47	42
48		-define ('FWP_SCHEMA_HAS_USERMETA', 2966);
49	43	define ('FWP_SCHEMA_20', 3308); // Database schema # for WP 2.0
50	44	define ('FWP_SCHEMA_21', 4772); // Database schema # for WP 2.1
51	45	define ('FWP_SCHEMA_23', 5495); // Database schema # for WP 2.3
52		-define ('FWP_SCHEMA_25', 7558); // Database schema # for WP 2.5
53		-define ('FWP_SCHEMA_26', 8201); // Database schema # for WP 2.6
54		-define ('FWP_SCHEMA_27', 9872); // Database schema # for WP 2.7
55	46
56	47	if (FEEDWORDPRESS_DEBUG) :
57	48	// Help us to pick out errors, if any.
58	49	ini_set('error_reporting', E_ALL & ~E_NOTICE);
		@@ -90,10 +81,11 @@
90	81	require_once (ABSPATH . 'wp-admin/admin-db.php'); // for wp_insert_category
91	82	endif;
92	83	endif;
93	84
94		-require_once(dirname(__FILE__) . '/compatability.php'); // LEGACY API: Replicate or mock up functions for legacy support purposes
95		-require_once(dirname(__FILE__) . '/feedwordpresshtml.class.php');
	85	+if (function_exists('wp_enqueue_script')) :
	86	+ wp_enqueue_script( 'ajaxcat' ); // Provides the handy-dandy new category text box
	87	+endif;
96	88
97	89	// Magic quotes are just about the stupidest thing ever.
98	90	if (is_array($_POST)) :
99	91	$fwp_post = stripslashes_deep($_POST);
		@@ -98,45 +90,9 @@
98	90	if (is_array($_POST)) :
99	91	$fwp_post = stripslashes_deep($_POST);
100	92	endif;
101	93
102		-// Get the path relative to the plugins directory in which FWP is stored
103		-preg_match (
104		- '\|/wp-content/plugins/(.+)$\|',
105		- dirname(__FILE__),
106		- $ref
107		-);
108	94
109		-if (isset($ref[1])) :
110		- $fwp_path = $ref[1];
111		-else : // Something went wrong. Let's just guess.
112		- $fwp_path = 'feedwordpress';
113		-endif;
114		-
115		-// If this is a FeedWordPress admin page, queue up scripts for AJAX functions that FWP uses
116		-// If it is a display page or a non-FeedWordPress admin page, don't.
117		-if (is_admin() and isset($_REQUEST['page']) and preg_match("\|^{$fwp_path}/\|", $_REQUEST['page'])) :
118		- if (function_exists('wp_enqueue_script')) :
119		- if (isset($wp_db_version) and $wp_db_version >= FWP_SCHEMA_25) :
120		- wp_enqueue_script('post'); // for magic tag and category boxes
121		- wp_enqueue_script('thickbox'); // for fold-up boxes
122		- wp_enqueue_script('admin-forms'); // for checkbox selection
123		- else :
124		- wp_enqueue_script( 'ajaxcat' ); // Provides the handy-dandy new category text box
125		- endif;
126		- endif;
127		- if (function_exists('wp_enqueue_style')) :
128		- if (fwp_test_wp_version(FWP_SCHEMA_25)) :
129		- wp_enqueue_style('dashboard');
130		- endif;
131		- endif;
132		- if (function_exists('wp_admin_css')) :
133		- if (fwp_test_wp_version(FWP_SCHEMA_25)) :
134		- wp_admin_css('css/dashboard');
135		- endif;
136		- endif;
137		-endif;
138		-
139	95	if (!FeedWordPress::needs_upgrade()) : // only work if the conditions are safe!
140	96
141	97	# Syndicated items are generally received in output-ready (X)HTML and
142	98	# should not be folded, crumpled, mutilated, or spindled by WordPress
		@@ -153,10 +109,8 @@
153	109
154	110	add_filter('the_content', 'feedwordpress_preserve_syndicated_content', -10000);
155	111	add_filter('the_content', 'feedwordpress_restore_syndicated_content', 10000);
156	112
157		- add_action('atom_entry', 'feedwordpress_item_feed_data');
158		-
159	113	# Filter in original permalinks if the user wants that
160	114	add_filter('post_link', 'syndication_permalink', 1);
161	115
162	116	# WTF? By default, wp_insert_link runs incoming link_url and link_rss
		@@ -167,11 +121,9 @@
167	121	remove_filter('pre_link_url', 'wp_filter_kses');
168	122
169	123	# Admin menu
170	124	add_action('admin_menu', 'fwp_add_pages');
171		- add_action('admin_notices', 'fwp_check_debug');
172		- add_action('admin_notices', 'fwp_check_magpie');
173		-
	125	+
174	126	# Inbound XML-RPC update methods
175	127	add_filter('xmlrpc_methods', 'feedwordpress_xmlrpc_hook');
176	128
177	129	# Outbound XML-RPC ping reform
		@@ -195,44 +147,13 @@
195	147	endif;
196	148
197	149	# Cron-less auto-update. Hooray!
198	150	add_action('init', 'feedwordpress_auto_update');
199		- add_action('init', 'feedwordpress_check_for_magpie_fix');
200		-
201		- # Default sanitizers
202		- add_filter('syndicated_item_content', array('SyndicatedPost', 'resolve_relative_uris'), 0, 2);
203		- add_filter('syndicated_item_content', array('SyndicatedPost', 'sanitize_content'), 0, 2);
204		-
205	151	else :
206	152	# Hook in the menus, which will just point to the upgrade interface
207	153	add_action('admin_menu', 'fwp_add_pages');
208	154	endif; // if (!FeedWordPress::needs_upgrade())
209	155
210		-function feedwordpress_check_for_magpie_fix () {
211		- if (isset($_POST['action']) and $_POST['action']=='fix_magpie_version') :
212		- FeedWordPressCompatibility::validate_http_request(/action=/ 'feedwordpress_fix_magpie', /capability=/ 'edit_files');
213		-
214		- $back_to = $_SERVER['REQUEST_URI'];
215		- if (isset($_POST['ignore'])) :
216		- // kill error message by telling it to expect whatever we've got
217		- update_option('feedwordpress_expected_magpie', FeedWordPress::magpie_version());
218		- $ret = 'ignored';
219		- elseif (isset($_POST['upgrade'])) :
220		- $source = dirname(__FILE__)."/MagpieRSS-upgrade/rss.php";
221		- $destination = ABSPATH . WPINC . '/rss.php';
222		- $success = @copy($source, $destination);
223		- $ret = (int) $success;
224		- endif;
225		-
226		- if (strpos($back_to, '?')===false) : $sep = '?';
227		- else : $sep = '&';
228		- endif;
229		-
230		- header("Location: {$back_to}{$sep}feedwordpress_magpie_fix=".$ret);
231		- exit;
232		- endif;
233		-} /* feedwordpress_check_for_magpie_fix() */
234		-
235	156	function feedwordpress_auto_update () {
236	157	if (FeedWordPress::stale()) :
237	158	$feedwordpress =& new FeedWordPress;
238	159	$feedwordpress->update();
		@@ -280,85 +201,84 @@
280	201	: implode(' and ', $mesg)));
281	202	}
282	203
283	204	################################################################################
284		-## TEMPLATE API: functions to make your templates syndication-aware ############
	205	+## LEGACY API: Replicate or mock up functions for legacy support purposes ######
285	206	################################################################################
286	207
287		-function is_syndicated () { return (strlen(get_syndication_feed_id()) > 0); }
	208	+if (!function_exists('get_option')) {
	209	+ function get_option ($option) {
	210	+ return get_settings($option);
	211	+ }
	212	+}
	213	+if (!function_exists('current_user_can')) {
	214	+ $legacy_capability_hack = true;
	215	+ function current_user_can ($task) {
	216	+ global $user_level;
288	217
289		-function get_syndication_source_link ($original = NULL) {
290		- if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data();
291		- endif;
	218	+ $can = false;
292	219
293		- if ($original) : $vals = get_post_custom_values('syndication_source_uri_original');
294		- else : $vals = array();
295		- endif;
296		-
297		- if (count($vals) == 0) : $vals = get_post_custom_values('syndication_source_uri');
298		- endif;
299		-
300		- if (count($vals) > 0) : $ret = $vals[0]; else : $ret = NULL; endif;
	220	+ // This is not a full replacement for current_user_can. It
	221	+ // is only for checking the capabilities we care about via the
	222	+ // WordPress 1.5 user levels.
	223	+ switch ($task) {
	224	+ case 'manage_options':
	225	+ $can = ($user_level >= 6);
	226	+ break;
	227	+ case 'manage_links':
	228	+ $can = ($user_level >= 5);
	229	+ break;
	230	+ } /* switch */
	231	+ return $can;
	232	+ }
	233	+} else {
	234	+ $legacy_capability_hack = false;
	235	+}
	236	+if (!function_exists('sanitize_user')) {
	237	+ function sanitize_user ($text, $strict) {
	238	+ return $text; // Don't munge it if it wasn't munged going in...
	239	+ }
	240	+}
	241	+if (!function_exists('wp_insert_user')) {
	242	+ function wp_insert_user ($userdata) {
	243	+ #-- Help WordPress 1.5.x quack like a duck
	244	+ $login = $userdata['user_login'];
	245	+ $author = $userdata['display_name'];
	246	+ $nice_author = $userdata['user_nicename'];
	247	+ $email = $userdata['user_email'];
	248	+ $url = $userdata['user_url'];
301	249
302		- return $ret;
303		-} /* function get_syndication_source_link() */
	250	+ $wpdb->query (
	251	+ "INSERT INTO $wpdb->users
	252	+ SET
	253	+ ID='0',
	254	+ user_login='$login',
	255	+ user_firstname='$author',
	256	+ user_nickname='$author',
	257	+ user_nicename='$nice_author',
	258	+ user_description='$author',
	259	+ user_email='$email',
	260	+ user_url='$url'");
	261	+ $id = $wpdb->insert_id;
	262	+
	263	+ return $id;
	264	+ }
	265	+}
	266	+################################################################################
	267	+## TEMPLATE API: functions to make your templates syndication-aware ############
	268	+################################################################################
304	269
305		-function the_syndication_source_link ($original = NULL) { echo get_syndication_source_link($original); }
	270	+function is_syndicated () { return (strlen(get_syndication_feed_id()) > 0); }
306	271
307		-function get_syndication_source ($original = NULL) {
308		- if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data();
309		- endif;
	272	+function the_syndication_source_link () { echo get_syndication_source_link(); }
	273	+function get_syndication_source_link () { list($n) = get_post_custom_values('syndication_source_uri'); return $n; }
310	274
311		- if ($original) : $vals = get_post_custom_values('syndication_source_original');
312		- else : $vals = array();
313		- endif;
314		-
315		- if (count($vals) == 0) : $vals = get_post_custom_values('syndication_source');
316		- endif;
317		-
318		- if (count($vals) > 0) : $ret = $vals[0]; else : $ret = NULL; endif;
	275	+function get_syndication_source () { list($n) = get_post_custom_values('syndication_source'); return $n; }
	276	+function the_syndication_source () { echo get_syndication_source(); }
319	277
320		- return $ret;
321		-} /* function get_syndication_source() */
	278	+function get_syndication_feed () { list($u) = get_post_custom_values('syndication_feed'); return $u; }
	279	+function the_syndication_feed () { echo get_syndication_feed (); }
322	280
323		-function the_syndication_source ($original = NULL) { echo get_syndication_source($original); }
324		-
325		-function get_syndication_feed ($original = NULL) {
326		- if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data();
327		- endif;
328		-
329		- if ($original) : $vals = get_post_custom_values('syndication_feed_original');
330		- else : $vals = array();
331		- endif;
332		-
333		- if (count($vals) == 0) : $vals = get_post_custom_values('syndication_feed');
334		- endif;
335		-
336		- if (count($vals) > 0) : $ret = $vals[0]; else : $ret = NULL; endif;
337		-
338		- return $ret;
339		-} /* function get_syndication_feed() */
340		-
341		-function the_syndication_feed ($original = NULL) { echo get_syndication_feed ($original); }
342		-
343		-function get_syndication_feed_guid ($original = NULL) {
344		- if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data();
345		- endif;
346		-
347		- if ($original) : $vals = get_post_custom_values('syndication_source_id_original');
348		- else : $vals = array();
349		- endif;
350		-
351		- if (count($vals) == 0) : $vals = array(get_feed_meta('feed/id'));
352		- endif;
353		-
354		- if (count($vals) > 0) : $ret = $vals[0]; else : $ret = NULL; endif;
355		-
356		- return $ret;
357		-} /* function get_syndication_feed_guid () */
358		-
359		-function the_syndication_feed_guid ($original = NULL) { echo get_syndication_feed_guid($original); }
360		-
361	281	function get_syndication_feed_id () { list($u) = get_post_custom_values('syndication_feed_id'); return $u; }
362	282	function the_syndication_feed_id () { echo get_syndication_feed_id(); }
363	283
364	284	$feedwordpress_linkcache = array (); // only load links from database once
		@@ -396,13 +316,9 @@
396	316
397	317	function feedwordpress_preserve_syndicated_content ($text) {
398	318	global $feedwordpress_the_syndicated_content;
399	319
400		- $globalExpose = (get_option('feedwordpress_formatting_filters') == 'yes');
401		- $localExpose = get_post_custom_values('_feedwordpress_formatting_filters');
402		- $expose = ($globalExpose or ((count($localExpose) > 0) and $localExpose[0]));
403		-
404		- if ( is_syndicated() and !$expose ) :
	320	+ if ( is_syndicated() ) :
405	321	$feedwordpress_the_syndicated_content = $text;
406	322	else :
407	323	$feedwordpress_the_syndicated_content = NULL;
408	324	endif;
		@@ -418,34 +334,8 @@
418	334
419	335	return $text;
420	336	}
421	337
422		-function feedwordpress_item_feed_data () {
423		- // In a post context....
424		- if (is_syndicated()) :
425		-?>
426		-<source>
427		- <title><?php the_syndication_source(); ?></title>
428		- <link rel="alternate" type="text/html" href="<?php the_syndication_source_link(); ?>" />
429		- <link rel="self" href="<?php the_syndication_feed(); ?>" />
430		-<?php
431		- $id = get_syndication_feed_guid();
432		- if (strlen($id) > 0) :
433		-?>
434		- <id><?php print $id; ?></id>
435		-<?php
436		- endif;
437		- $updated = get_feed_meta('feed/updated');
438		- if (strlen($updated) > 0) : ?>
439		- <updated><?php print $updated; ?></updated>
440		-<?php
441		- endif;
442		-?>
443		-</source>
444		-<?php
445		- endif;
446		-}
447		-
448	338	function syndication_permalink ($permalink = '') {
449	339	if (get_option('feedwordpress_munge_permalink') != 'no'):
450	340	$uri = get_syndication_permalink();
451	341	return ((strlen($uri) > 0) ? $uri : $permalink);
		@@ -454,150 +344,1248 @@
454	344	endif;
455	345	} // function syndication_permalink ()
456	346
457	347	################################################################################
458		-## ADMIN MENU ADD-ONS: register Dashboard management pages #####################
	348	+## UPGRADE INTERFACE: Have users upgrade DB from older versions of FWP #########
459	349	################################################################################
460	350
	351	+function fwp_upgrade_page () {
	352	+ if (isset($GLOBALS['fwp_post']['action']) and $GLOBALS['fwp_post']['action']=='Upgrade') :
	353	+ $ver = get_option('feedwordpress_version');
	354	+ if (get_option('feedwordpress_version') != FEEDWORDPRESS_VERSION) :
	355	+ echo "<div class=\"wrap\">\n";
	356	+ echo "<h2>Upgrading FeedWordPress...</h2>";
	357	+
	358	+ $feedwordpress =& new FeedWordPress;
	359	+ $feedwordpress->upgrade_database();
	360	+ echo "<p><strong>Done!</strong> Upgraded database to version ".FEEDWORDPRESS_VERSION.".</p>\n";
	361	+ echo "<form action=\"\" method=\"get\">\n";
	362	+ echo "<div class=\"submit\"><input type=\"hidden\" name=\"page\" value=\"".basename(__FILE__)."\" />";
	363	+ echo "<input type=\"submit\" value=\"Continue »\" /></form></div>\n";
	364	+ echo "</div>\n";
	365	+ return;
	366	+ else :
	367	+ echo "<div class=\"updated\"><p>Already at version ".FEEDWORDPRESS_VERSION."!</p></div>";
	368	+ endif;
	369	+ endif;
	370	+?>
	371	+<div class="wrap">
	372	+<h2>Upgrade FeedWordPress</h2>
	373	+
	374	+<p>It appears that you have installed FeedWordPress
	375	+<?php echo FEEDWORDPRESS_VERSION; ?> as an upgrade to an existing installation of
	376	+FeedWordPress. That's no problem, but you will need to take a minute out first
	377	+to upgrade your database: some necessary changes in how the software keeps
	378	+track of posts and feeds will cause problems such as duplicate posts and broken
	379	+templates if we were to continue without the upgrade.</p>
	380	+
	381	+<p>Note that most of FeedWordPress's functionality is temporarily disabled
	382	+until we have successfully completed the upgrade. Everything should begin
	383	+working as normal again once the upgrade is complete. There's extraordinarily
	384	+little chance of any damage as the result of the upgrade, but if you're paranoid
	385	+like me you may want to back up your database before you proceed.</p>
	386	+
	387	+<p>This may take several minutes for a large installation.</p>
	388	+
	389	+<form action="" method="post">
	390	+<div class="submit"><input type="submit" name="action" value="Upgrade" /></div>
	391	+</form>
	392	+</div>
	393	+<?php
	394	+} // function fwp_upgrade_page ()
	395	+
	396	+################################################################################
	397	+## ADMIN MENU ADD-ONS: implement Dashboard management pages ####################
	398	+################################################################################
	399	+
461	400	function fwp_add_pages () {
462		- global $fwp_capability;
463		- global $fwp_path;
	401	+ global $legacy_capability_hack;
464	402
465		- $menu = array('Syndicated Sites', 'Syndication', $fwp_capability['manage_links'], $fwp_path.'/syndication.php', NULL);
466		- if (fwp_test_wp_version(FWP_SCHEMA_27)) :
467		- // add icon parameter
468		- $menu[] = WP_PLUGIN_URL.'/'.$fwp_path.'/feedwordpress-tiny.png';
	403	+ if ($legacy_capability_hack) :
	404	+ // old & busted: numeric user levels
	405	+ $manage_links = 5;
	406	+ $manage_options = 6;
	407	+ else :
	408	+ // new hotness: named capabilities
	409	+ $manage_links = 'manage_links';
	410	+ $manage_options = 'manage_options';
469	411	endif;
470	412
471		- if (fwp_test_wp_version(FWP_SCHEMA_26)) :
472		- $options = __('Settings');
473		- $longoptions = __('Syndication Settings');
474		- else :
475		- $options = __('Options');
476		- $longoptions = __('Syndication Options');
	413	+ //add_submenu_page('plugins.php', 'Akismet Configuration', 'Akismet Configuration', 'manage_options', 'syndication-manage-page', 'fwp_syndication_manage_page');
	414	+ add_menu_page('Syndicated Sites', 'Syndication', $manage_links, 'feedwordpress/'.basename(__FILE__), 'fwp_syndication_manage_page');
	415	+ add_submenu_page('feedwordpress/'.basename(__FILE__), 'Syndication Options', 'Options', $manage_options, 'feedwordpress/syndication-options.php');
	416	+ add_options_page('Syndication Options', 'Syndication', $manage_options, 'feedwordpress/syndication-options.php');
	417	+} // function fwp_add_pages () */
	418	+
	419	+function fwp_category_box ($checked, $object) {
	420	+ global $wp_db_version;
	421	+
	422	+ if (isset($wp_db_version) and $wp_db_version >= FWP_SCHEMA_20) : // WordPress 2.x
	423	+?>
	424	+ <div id="poststuff">
	425	+
	426	+ <div id="moremeta">
	427	+ <div id="grabit" class="dbx-group">
	428	+ <fieldset id="categorydiv" class="dbx-box">
	429	+ <h3 class="dbx-handle"><?php _e('Categories') ?></h3>
	430	+ <div class="dbx-content">
	431	+ <p style="font-size:smaller;font-style:bold;margin:0">Place <?php print $object; ?> under...</p>
	432	+ <p id="jaxcat"></p>
	433	+ <ul id="categorychecklist"><?php write_nested_categories($checked); ?></ul></div>
	434	+ </fieldset>
	435	+ </div>
	436	+ </div>
	437	+ </div>
	438	+<?php
	439	+ else : // WordPress 1.5
	440	+?>
	441	+ <fieldset id="categorydiv" style="width: 20%; margin-right: 2em">
	442	+ <legend><?php _e('Categories') ?></legend>
	443	+ <p style="font-size:smaller;font-style:bold;margin:0">Place <?php print $object; ?> under...</p>
	444	+ <div style="height: 20em"><?php write_nested_categories($checked); ?></div>
	445	+ </fieldset>
	446	+<?php
477	447	endif;
	448	+}
478	449
479		- call_user_func_array('add_menu_page', $menu);
480		- add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Posts', 'Posts', $fwp_capability['manage_options'], $fwp_path.'/posts-page.php');
481		- add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Authors', 'Authors', $fwp_capability['manage_options'], $fwp_path.'/authors-page.php');
482		- add_submenu_page($fwp_path.'/syndication.php', 'Categories & Tags', 'Categories & Tags', $fwp_capability['manage_options'], $fwp_path.'/categories-page.php');
483		- add_submenu_page($fwp_path.'/syndication.php', $longoptions, $options, $fwp_capability['manage_options'], $fwp_path.'/syndication-options.php');
	450	+function update_feeds_mention ($feed) {
	451	+ echo "<li>Updating <cite>".$feed['link/name']."</cite> from <<a href=\""
	452	+ .$feed['link/uri']."\">".$feed['link/uri']."</a>> ...</li>\n";
	453	+ flush();
	454	+}
484	455
485		- add_options_page($longoptions, 'Syndication', $fwp_capability['manage_options'], $fwp_path.'/syndication-options.php');
486		-} /* function fwp_add_pages () */
	456	+function fwp_syndication_manage_page () {
	457	+ global $wpdb;
487	458
488		-function fwp_check_debug () {
489		- // This is a horrible fucking kludge that I have to do because the
490		- // admin notice code is triggered before the code that updates the
491		- // setting.
492		- if (isset($_POST['feedwordpress_debug'])) :
493		- $feedwordpress_debug = $_POST['feedwordpress_debug'];
494		- else :
495		- $feedwordpress_debug = get_option('feedwordpress_debug');
	459	+ if (FeedWordPress::needs_upgrade()) :
	460	+ fwp_upgrade_page();
	461	+ return;
496	462	endif;
497		- if ($feedwordpress_debug==='yes') :
	463	+
498	464	?>
499		- <div class="error">
500		-<p><strong>FeedWordPress warning.</strong> Debugging mode is <strong>ON</strong>.
501		-While it remains on, FeedWordPress displays many diagnostic error messages,
502		-warnings, and notices that are ordinarily suppressed, and also turns off all
503		-caching of feeds. Use with caution: this setting is absolutely inappropriate
504		-for a production server.</p>
505		- </div>
	465	+<?php $cont = true;
	466	+if (isset($_REQUEST['action'])):
	467	+ if ($_REQUEST['action'] == 'feedfinder') : $cont = fwp_feedfinder_page();
	468	+ elseif ($_REQUEST['action'] == 'switchfeed') : $cont = fwp_switchfeed_page();
	469	+ elseif ($_REQUEST['action'] == 'linkedit') : $cont = fwp_linkedit_page();
	470	+ elseif ($_REQUEST['action'] == 'Unsubscribe from Checked Links' or $_REQUEST['action'] == 'Unsubscribe') : $cont = fwp_multidelete_page();
	471	+ endif;
	472	+endif;
	473	+
	474	+if ($cont):
	475	+?>
506	476	<?php
	477	+ $links = FeedWordPress::syndicated_links();
	478	+
	479	+ if (isset($_POST['update']) or isset($_POST['action']) or isset($_POST['update_uri'])) :
	480	+ $fwp_update_invoke = 'post';
	481	+ else :
	482	+ $fwp_update_invoke = 'get';
507	483	endif;
508		-} /* function fwp_check_debug () */
509	484
510		-define('DEFAULT_EXPECTED_MAGPIE_VERSION', '0.85');
511		-function fwp_check_magpie () {
512		- if (isset($_REQUEST['feedwordpress_magpie_fix'])) :
513		- if ($_REQUEST['feedwordpress_magpie_fix']=='ignored') :
	485	+ $update_set = array();
	486	+ if (isset($_POST['link_ids']) and is_array($_POST['link_ids']) and ($_POST['action']=='Update Checked Links')) :
	487	+ $targets = $wpdb->get_results("
	488	+ SELECT * FROM $wpdb->links
	489	+ WHERE link_id IN (".implode(",",$_POST['link_ids']).")
	490	+ ");
	491	+ if (is_array($targets)) :
	492	+ foreach ($targets as $target) :
	493	+ $update_set[] = $target->link_rss;
	494	+ endforeach;
	495	+ else : // This should never happen
	496	+ FeedWordPress::critical_bug('fwp_syndication_manage_page::targets', $targets, __LINE__);
	497	+ endif;
	498	+ elseif (isset($_POST['update_uri'])) :
	499	+ $update_set[] = $_POST['update_uri'];
	500	+ endif;
	501	+
	502	+ if ($fwp_update_invoke != 'get' and count($update_set) > 0) : // Only do things with side-effects for HTTP POST or command line
	503	+ $feedwordpress =& new FeedWordPress;
	504	+ add_action('feedwordpress_check_feed', 'update_feeds_mention');
	505	+
	506	+ echo "<div class=\"updated\">\n";
	507	+ echo "<ul>\n";
	508	+ $tdelta = NULL;
	509	+ foreach ($update_set as $uri) :
	510	+ if ($uri == '*') : $uri = NULL; endif;
	511	+ $delta = $feedwordpress->update($uri);
	512	+ if (!is_null($delta)) :
	513	+ if (is_null($tdelta)) :
	514	+ $tdelta = $delta;
	515	+ else :
	516	+ $tdelta['new'] += $delta['new'];
	517	+ $tdelta['updated'] += $delta['updated'];
	518	+ endif;
	519	+ else :
	520	+ echo "<li><p><strong>Error:</strong> There was a problem updating <a href=\"$uri\">$uri</a></p></li>\n";
	521	+ endif;
	522	+ endforeach;
	523	+ echo "</ul>\n";
	524	+
	525	+ if (!is_null($tdelta)) :
	526	+ $mesg = array();
	527	+ if (isset($delta['new'])) : $mesg[] = ' '.$tdelta['new'].' new posts were syndicated'; endif;
	528	+ if (isset($delta['updated'])) : $mesg[] = ' '.$tdelta['updated'].' existing posts were updated'; endif;
	529	+ echo "<p>Update complete.".implode(' and', $mesg)."</p>";
	530	+ echo "\n"; flush();
	531	+ endif;
	532	+ echo "</div> <!-- class=\"updated\" -->\n";
	533	+ endif;
	534	+
	535	+ ?>
	536	+ <div class="wrap">
	537	+ <form action="" method="POST">
	538	+ <h2>Update feeds now</h2>
	539	+ <p>Check currently scheduled feeds for new and updated posts.</p>
	540	+
	541	+<?php if (!get_option('feedwordpress_automatic_updates')) : ?>
	542	+ <p><strong>Note:</strong> Automatic updates are currently turned
	543	+ <strong>off</strong>. New posts from your feeds will not be syndicated
	544	+ until you manually check for them here. You can turn on automatic
	545	+ updates under <a href="admin.php?page=feedwordpress/syndication-options.php">Syndication
	546	+ Options</a>.</p>
	547	+<?php endif; ?>
	548	+
	549	+
	550	+ <div class="submit"><input type="hidden" name="update_uri" value="*" /><input type="submit" name="update" value="Update" /></div>
	551	+ </form>
	552	+ </div> <!-- class="wrap" -->
	553	+
	554	+ <form action="admin.php?page=feedwordpress/<?php echo basename(__FILE__); ?>" method="post">
	555	+ <div class="wrap">
	556	+ <h2>Syndicated Sites</h2>
	557	+<?php $alt_row = true;
	558	+ if ($links): ?>
	559	+
	560	+<table width="100%" cellpadding="3" cellspacing="3">
	561	+<tr>
	562	+<th width="20%"><?php _e('Name'); ?></th>
	563	+<th width="40%"><?php _e('Feed'); ?></th>
	564	+<th colspan="4"><?php _e('Action'); ?></th>
	565	+</tr>
	566	+
	567	+<?php foreach ($links as $link):
	568	+ $alt_row = !$alt_row; ?>
	569	+<tr<?php echo ($alt_row?' class="alternate"':''); ?>>
	570	+<td><a href="<?php echo wp_specialchars($link->link_url, 'both'); ?>"><?php echo wp_specialchars($link->link_name, 'both'); ?></a></td>
	571	+<?php
	572	+ if (strlen($link->link_rss) > 0):
	573	+ $caption='Switch Feed';
	574	+ $uri_bits = parse_url($link->link_rss);
	575	+ $uri_bits['host'] = preg_replace('/^www\./i', '', $uri_bits['host']);
	576	+ $display_uri =
	577	+ (isset($uri_bits['user'])?$uri_bits['user'].'@':'')
	578	+ .(isset($uri_bits['host'])?$uri_bits['host']:'')
	579	+ .(isset($uri_bits['port'])?':'.$uri_bits['port']:'')
	580	+ .(isset($uri_bits['path'])?$uri_bits['path']:'')
	581	+ .(isset($uri_bits['query'])?'?'.$uri_bits['query']:'');
	582	+ if (strlen($display_uri) > 32) : $display_uri = substr($display_uri, 0, 32).'…'; endif;
514	583	?>
515		-<div class="updated fade">
516		-<p>O.K., we'll ignore the problem for now. FeedWordPress will not display any
517		-more error messages.</p>
518		-</div>
	584	+ <td>
	585	+ <strong><a href="<?php echo wp_specialchars($link->link_rss, 'both'); ?>"><?php echo wp_specialchars($display_uri, 'both'); ?></a></strong></td>
519	586	<?php
520		- elseif ((bool) $_REQUEST['feedwordpress_magpie_fix']) :
	587	+ else:
	588	+ $caption='Find Feed';
521	589	?>
522		-<div class="updated fade">
523		-<p>Congratulations! Your MagpieRSS has been successfully upgraded to the version
524		-shipped with FeedWordPress.</p>
525		-</div>
	590	+ <td style="background-color:#FFFFD0"><p><strong>no
	591	+ feed assigned</strong></p></td>
526	592	<?php
527		- else :
528		- $source = dirname(__FILE__)."/MagpieRSS-upgrade/rss.php";
529		- $destination = ABSPATH . WPINC . '/rss.php';
530		- $cmd = "cp '".htmlspecialchars(addslashes($source))."' '".htmlspecialchars(addslashes($destination))."'";
531		- $cmd = wordwrap($cmd, /width=/ 75, /break=/ " \\\n\t");
	593	+ endif;
	594	+?>
	595	+ <td><a href="admin.php?page=feedwordpress/<?php echo basename(__FILE__); ?>&link_id=<?php echo $link->link_id; ?>&action=linkedit" class="edit"><?php _e('Edit')?></a></td>
	596	+ <td><a href="admin.php?page=feedwordpress/<?php echo basename(__FILE__); ?>&link_id=<?php echo $link->link_id; ?>&action=feedfinder" class="edit"><?php echo $caption; ?></a></td>
	597	+ <td><a href="admin.php?page=feedwordpress/<?php echo basename(__FILE__); ?>&link_id=<?php echo $link->link_id; ?>&action=Unsubscribe" class="delete"><?php _e('Unsubscribe'); ?></a></td>
	598	+ <td><input type="checkbox" name="link_ids[]" value="<?php echo $link->link_id; ?>" /></td>
	599	+<?php
	600	+ echo "\n\t</tr>";
	601	+ endforeach;
	602	+ else:
	603	+?>
532	604
	605	+<p>There are no websites currently listed for syndication.</p>
	606	+
	607	+<?php endif; ?>
	608	+ </table>
	609	+
	610	+ <br/><hr/>
	611	+ <div class="submit"><input type="submit" class="delete" name="action" value="Unsubscribe from Checked Links" />
	612	+ <input type="submit" name="action" value="Update Checked Links" /></div>
	613	+ </div> <!-- class="wrap" -->
	614	+ </form>
	615	+
	616	+ <div class="wrap">
	617	+ <form action="admin.php?page=feedwordpress/<?php echo basename(__FILE__); ?>" method="post">
	618	+ <h2>Add a new syndicated site:</h2>
	619	+ <div>
	620	+ <label for="add-uri">Website or newsfeed:</label>
	621	+ <input type="text" name="lookup" id="add-uri" value="URI" size="64" />
	622	+ <input type="hidden" name="action" value="feedfinder" />
	623	+ </div>
	624	+ <div class="submit"><input type="submit" value="Syndicate »" /></div>
	625	+ </form>
	626	+ </div> <!-- class="wrap" -->
	627	+<?php
	628	+endif;
	629	+}
	630	+
	631	+function fwp_feedfinder_page () {
	632	+ global $wpdb;
	633	+
	634	+ $lookup = (isset($_REQUEST['lookup'])?$_REQUEST['lookup']:NULL);
	635	+
	636	+ if (isset($_REQUEST['link_id']) and ($_REQUEST['link_id']!=0)):
	637	+ $link_id = $_REQUEST['link_id'];
	638	+ if (!is_numeric($link_id)) : FeedWordPress::critical_bug('fwp_feedfinder_page::link_id', $link_id, __LINE__); endif;
	639	+
	640	+ $link = $wpdb->get_row("SELECT * FROM $wpdb->links WHERE link_id='".$wpdb->escape($link_id)."'");
	641	+ if (is_object($link)):
	642	+ if (is_null($lookup)) $lookup = $link->link_url;
	643	+ $name = wp_specialchars($link->link_name, 'both');
	644	+ else:
	645	+ die (__("Cheatin' uh ?"));
	646	+ endif;
	647	+ else:
	648	+ $name = "New Syndicated Feed";
	649	+ $link_id = 0;
	650	+ endif;
533	651	?>
534		-<div class="error">
535		-<p><strong>FeedWordPress was unable to automatically upgrade your copy of MagpieRSS.</strong></p>
536		-<p>It's likely that you need to change the file permissions on <code><?php print htmlspecialchars($source); ?></code>
537		-to allow FeedWordPress to overwrite it.</p>
538		-<p><strong>To perform the upgrade manually,</strong> you can
539		-use a SFTP or FTP client to upload a copy of <code>rss.php</code> from the
540		-<code>MagpieRSS-upgrades/</code> directory of your FeedWordPress archive so that
541		-it overwrites <code><?php print htmlspecialchars($destination); ?></code>. Or,
542		-if your web host provides shell access, you can issue the following command from
543		-a command prompt to perform the upgrade:</p>
544		-<pre>
545		-<samp>$</samp> <kbd><?php print $cmd; ?></kbd>
546		-</pre>
547		-<p><strong>If you've fixed the file permissions,</strong> you can try the
548		-automatic upgrade again.</p>
	652	+ <div class="wrap">
	653	+ <h2>Feed Finder: <?php echo $name; ?></h2>
	654	+<?php
	655	+ $f =& new FeedFinder($lookup);
	656	+ $feeds = $f->find();
	657	+ if (count($feeds) > 0):
	658	+ foreach ($feeds as $key => $f):
	659	+ $rss = fetch_rss($f);
	660	+ if ($rss):
	661	+ $feed_title = isset($rss->channel['title'])?$rss->channel['title']:$rss->channel['link'];
	662	+ $feed_link = isset($rss->channel['link'])?$rss->channel['link']:'';
	663	+?>
	664	+ <form action="admin.php?page=feedwordpress/<?php echo basename(__FILE__); ?>" method="post">
	665	+ <fieldset style="clear: both">
	666	+ <legend><?php echo $rss->feed_type; ?> <?php echo $rss->feed_version; ?> feed</legend>
549	667
550		-<?php feedwordpress_upgrade_old_and_busted_buttons(); ?>
551		-</div>
	668	+ <?php if ($link_id===0): ?>
	669	+ <input type="hidden" name="feed_title" value="<?php echo wp_specialchars($feed_title, 'both'); ?>" />
	670	+ <input type="hidden" name="feed_link" value="<?php echo wp_specialchars($feed_link, 'both'); ?>" />
	671	+ <?php endif; ?>
	672	+
	673	+ <input type="hidden" name="link_id" value="<?php echo $link_id; ?>" />
	674	+ <input type="hidden" name="feed" value="<?php echo wp_specialchars($f, 'both'); ?>" />
	675	+ <input type="hidden" name="action" value="switchfeed" />
	676	+
	677	+ <div>
	678	+ <div style="float:right; background-color:#D0D0D0; color: black; width:45%; font-size:70%; border-left: 1px dotted #A0A0A0; padding-left: 0.5em; margin-left: 1.0em">
	679	+<?php if (count($rss->items) > 0): ?>
	680	+ <?php $item = $rss->items[0]; ?>
	681	+ <h3>Sample Item</h3>
	682	+ <ul>
	683	+ <li><strong>Title:</strong> <a href="<?php echo $item['link']; ?>"><?php echo $item['title']; ?></a></li>
	684	+ <li><strong>Date:</strong> <?php echo isset($item['date_timestamp']) ? date('d-M-y g:i:s a', $item['date_timestamp']) : 'unknown'; ?></li>
	685	+ </ul>
	686	+ <div class="entry">
	687	+ <?php echo (isset($item['content']['encoded'])?$item['content']['encoded']:$item['description']); ?>
	688	+ </div>
	689	+<?php else: ?>
	690	+ <h3>No Items</h3>
	691	+ <p>FeedWordPress found no posts on this feed.</p>
	692	+<?php endif; ?>
	693	+ </div>
	694	+
	695	+ <div>
	696	+ <h3>Feed Information</h3>
	697	+ <ul>
	698	+ <li><strong>Website:</strong> <a href="<?php echo $feed_link; ?>"><?php echo is_null($feed_title)?'<em>Unknown</em>':$feed_title; ?></a></li>
	699	+ <li><strong>Feed URI:</strong> <a href="<?php echo wp_specialchars($f, 'both'); ?>"><?php echo wp_specialchars($f, 'both'); ?></a> (<a title="Check feed <<?php echo wp_specialchars($f, 'both'); ?>> for validity" href="http://feedvalidator.org/check.cgi?url=<?php echo urlencode($f); ?>">validate</a>)</li>
	700	+ <li><strong>Encoding:</strong> <?php echo isset($rss->encoding)?wp_specialchars($rss->encoding, 'both'):"<em>Unknown</em>"; ?></li>
	701	+ <li><strong>Description:</strong> <?php echo isset($rss->channel['description'])?wp_specialchars($rss->channel['description'], 'both'):"<em>Unknown</em>"; ?></li>
	702	+ </ul>
	703	+ <div class="submit"><input type="submit" name="Use" value="« Use this feed" /></div>
	704	+ <div class="submit"><input type="submit" name="Cancel" value="« Cancel" /></div>
	705	+ </div>
	706	+ </div>
	707	+ </fieldset>
	708	+ </form>
	709	+<?php endif;
	710	+ endforeach;
	711	+ else:
	712	+ echo "<p><strong>no feed found</strong></p>";
	713	+ endif;
	714	+?>
	715	+ </div>
	716	+
	717	+ <form action="admin.php?page=feedwordpress/<?php echo basename(__FILE__); ?>" method="post">
	718	+ <div class="wrap">
	719	+ <h2>Use another feed</h2>
	720	+ <div><label>Feed:</label>
	721	+ <input type="text" name="lookup" value="URI" />
	722	+ <input type="hidden" name="link_id" value="<?php echo $link_id; ?>" />
	723	+ <input type="hidden" name="action" value="feedfinder" /></div>
	724	+ <div class="submit"><input type="submit" value="Use this feed »" /></div>
	725	+ </div>
	726	+ </form>
552	727	<?php
	728	+ return false; // Don't continue
	729	+}
	730	+
	731	+function fwp_switchfeed_page () {
	732	+ global $wpdb, $wp_db_version;
	733	+
	734	+ check_admin_referer();
	735	+ if (!isset($_REQUEST['Cancel'])):
	736	+ if (!current_user_can('manage_links')):
	737	+ die (__("Cheatin' uh ?"));
	738	+ elseif (isset($_REQUEST['link_id']) and ($_REQUEST['link_id']==0)):
	739	+ $link_id = FeedWordPress::syndicate_link($_REQUEST['feed_title'], $_REQUEST['feed_link'], $_REQUEST['feed']);
	740	+ if ($link_id): ?>
	741	+<div class="updated"><p><a href="<?php echo $_REQUEST['feed_link']; ?>"><?php echo wp_specialchars($_REQUEST['feed_title'], 'both'); ?></a>
	742	+has been added as a contributing site, using the newsfeed at <<a href="<?php echo $_REQUEST['feed']; ?>"><?php echo wp_specialchars($_REQUEST['feed'], 'both'); ?></a>>.</p></div>
	743	+<?php else: ?>
	744	+<div class="updated"><p>There was a problem adding the newsfeed. [SQL: <?php echo wp_specialchars(mysql_error(), 'both'); ?>]</p></div>
	745	+<?php endif;
	746	+ elseif (isset($_REQUEST['link_id'])):
	747	+ // Update link_rss
	748	+ $result = $wpdb->query("
	749	+ UPDATE $wpdb->links
	750	+ SET
	751	+ link_rss = '".$wpdb->escape($_REQUEST['feed'])."'
	752	+ WHERE link_id = '".$wpdb->escape($_REQUEST['link_id'])."'
	753	+ ");
	754	+
	755	+ if ($result):
	756	+ $result = $wpdb->get_row("
	757	+ SELECT link_name, link_url FROM $wpdb->links
	758	+ WHERE link_id = '".$wpdb->escape($_REQUEST['link_id'])."'
	759	+ ");
	760	+ ?>
	761	+<div class="updated"><p>Feed for <a href="<?php echo $result->link_url; ?>"><?php echo wp_specialchars($result->link_name, 'both'); ?></a>
	762	+updated to <<a href="<?php echo $_REQUEST['feed']; ?>"><?php echo wp_specialchars($_REQUEST['feed'], 'both'); ?></a>>.</p></div>
	763	+ <?php else: ?>
	764	+<div class="updated"><p>Nothing was changed.</p></div>
	765	+ <?php endif;
553	766	endif;
	767	+ endif;
	768	+ return true; // Continue
	769	+}
	770	+
	771	+function fwp_linkedit_page () {
	772	+ global $wpdb;
	773	+
	774	+ check_admin_referer(); // Make sure we arrived here from the Dashboard
	775	+
	776	+ $special_settings = array ( /* Regular expression syntax is OK here */
	777	+ 'cats',
	778	+ 'cat_split',
	779	+ 'hardcode name',
	780	+ 'hardcode url',
	781	+ 'hardcode description',
	782	+ 'hardcode categories', /* Deprecated */
	783	+ 'post status',
	784	+ 'comment status',
	785	+ 'ping status',
	786	+ 'unfamiliar author',
	787	+ 'unfamliar categories',
	788	+ 'map authors',
	789	+ 'update/.*',
	790	+ 'feed/.*',
	791	+ 'link/.*',
	792	+ );
	793	+
	794	+ if (!current_user_can('manage_links')) :
	795	+ die (__("Cheatin' uh ?"));
	796	+ elseif (isset($_REQUEST['feedfinder'])) :
	797	+ return fwp_feedfinder_page(); // re-route to Feed Finder page
554	798	else :
555		- $magpie_version = FeedWordPress::magpie_version();
	799	+ $link_id = (int) $_REQUEST['link_id'];
	800	+ $link =& new SyndicatedLink($link_id);
	801	+
	802	+ if ($link->found()) :
	803	+ if (isset($GLOBALS['fwp_post']['save'])) :
	804	+ $alter = array ();
	805	+
	806	+ $meta = $link->settings;
	807	+ //if (isset($meta['cats'])):
	808	+ // $meta['cats'] = preg_split(FEEDWORDPRESS_CAT_SEPARATOR_PATTERN, $meta['cats']);
	809	+ //endif;
	810	+
	811	+ // custom feed settings first
	812	+ foreach ($GLOBALS['fwp_post']['notes'] as $mn) :
	813	+ $mn['key0'] = trim($mn['key0']);
	814	+ $mn['key1'] = trim($mn['key1']);
	815	+ if (preg_match("\007^(("
	816	+ .implode(')\|(',$special_settings)
	817	+ ."))$\007i",
	818	+ $mn['key1'])) :
	819	+ $mn['key1'] = 'user/'.$mn['key1'];
	820	+ endif;
	821	+
	822	+ if (strlen($mn['key0']) > 0) :
	823	+ unset($meta[$mn['key0']]); // out with the old
	824	+ endif;
	825	+
	826	+ if (($mn['action']=='update') and (strlen($mn['key1']) > 0)) :
	827	+ $meta[$mn['key1']] = $mn['value']; // in with the new
	828	+ endif;
	829	+ endforeach;
	830	+
	831	+ // now stuff through the web form
	832	+ // hardcoded feed info
	833	+ if (isset($GLOBALS['fwp_post']['hardcode_name'])) :
	834	+ $meta['hardcode name'] = $GLOBALS['fwp_post']['hardcode_name'];
	835	+ if (FeedWordPress::affirmative($meta, 'hardcode name')) :
	836	+ $alter[] = "link_name = '".$wpdb->escape($GLOBALS['fwp_post']['name'])."'";
	837	+ endif;
	838	+ endif;
	839	+ if (isset($GLOBALS['fwp_post']['hardcode_description'])) :
	840	+ $meta['hardcode description'] = $GLOBALS['fwp_post']['hardcode_description'];
	841	+ if (FeedWordPress::affirmative($meta, 'hardcode description')) :
	842	+ $alter[] = "link_description = '".$wpdb->escape($GLOBALS['fwp_post']['description'])."'";
	843	+ endif;
	844	+ endif;
	845	+ if (isset($GLOBALS['fwp_post']['hardcode_url'])) :
	846	+ $meta['hardcode url'] = $GLOBALS['fwp_post']['hardcode_url'];
	847	+ if (FeedWordPress::affirmative($meta, 'hardcode url')) :
	848	+ $alter[] = "link_url = '".$wpdb->escape($GLOBALS['fwp_post']['linkurl'])."'";
	849	+ endif;
	850	+ endif;
	851	+
	852	+ // Update scheduling
	853	+ if (isset($GLOBALS['fwp_post']['update_schedule'])) :
	854	+ $meta['update/hold'] = $GLOBALS['fwp_post']['update_schedule'];
	855	+ endif;
	856	+
	857	+ // Categories
	858	+ if (isset($GLOBALS['fwp_post']['post_category'])) :
	859	+ $meta['cats'] = array();
	860	+ foreach ($GLOBALS['fwp_post']['post_category'] as $cat_id) :
	861	+ $meta['cats'][] = '{#'.$cat_id.'}';
	862	+ endforeach;
	863	+ else :
	864	+ unset($meta['cats']);
	865	+ endif;
	866	+
	867	+ // Post status, comment status, ping status
	868	+ foreach (array('post', 'comment', 'ping') as $what) :
	869	+ $sfield = "feed_{$what}_status";
	870	+ if (isset($GLOBALS['fwp_post'][$sfield])) :
	871	+ if ($GLOBALS['fwp_post'][$sfield]=='site-default') :
	872	+ unset($meta["{$what} status"]);
	873	+ else :
	874	+ $meta["{$what} status"] = $GLOBALS['fwp_post'][$sfield];
	875	+ endif;
	876	+ endif;
	877	+ endforeach;
	878	+
	879	+ // Unfamiliar author, unfamiliar categories
	880	+ foreach (array("author", "category") as $what) :
	881	+ $sfield = "unfamiliar_{$what}";
	882	+ if (isset($GLOBALS['fwp_post'][$sfield])) :
	883	+ if ('site-default'==$GLOBALS['fwp_post'][$sfield]) :
	884	+ unset($meta["unfamiliar {$what}"]);
	885	+ elseif ('newuser'==$GLOBALS['fwp_post'][$sfield]) :
	886	+ $newuser_name = trim($GLOBALS['fwp_post']["{$sfield}_newuser"]);
	887	+ if (strlen($newuser_name) > 0) :
	888	+ $userdata = array();
	889	+ $userdata['ID'] = NULL;
	890	+
	891	+ $userdata['user_login'] = sanitize_user($newuser_name);
	892	+ $userdata['user_login'] = apply_filters('pre_user_login', $userdata['user_login']);
	893	+
	894	+ $userdata['user_nicename'] = sanitize_title($newuser_name);
	895	+ $userdata['user_nicename'] = apply_filters('pre_user_nicename', $userdata['user_nicename']);
	896	+
	897	+ $userdata['display_name'] = $wpdb->escape($newuser_name);
	898	+
	899	+ $newuser_id = wp_insert_user($userdata);
	900	+ if (is_numeric($newuser_id)) :
	901	+ $meta["unfamiliar {$what}"] = $newuser_id;
	902	+ else :
	903	+ // TODO: Add some error detection and reporting
	904	+ endif;
	905	+ else :
	906	+ // TODO: Add some error reporting
	907	+ endif;
	908	+ else :
	909	+ $meta["unfamiliar {$what}"] = $GLOBALS['fwp_post'][$sfield];
	910	+ endif;
	911	+ endif;
	912	+ endforeach;
	913	+
	914	+ // Handle author mapping rules
	915	+ if (isset($GLOBALS['fwp_post']['author_rules_name']) and isset($GLOBALS['fwp_post']['author_rules_action'])) :
	916	+ unset($meta['map authors']);
	917	+ foreach ($GLOBALS['fwp_post']['author_rules_name'] as $key => $name) :
	918	+ // Normalize for case and whitespace
	919	+ $name = strtolower(trim($name));
	920	+ $author_action = strtolower(trim($GLOBALS['fwp_post']['author_rules_action'][$key]));
	921	+
	922	+ if (strlen($name) > 0) :
	923	+ if ('newuser' == $author_action) :
	924	+ $newuser_name = trim($GLOBALS['fwp_post']['author_rules_newuser'][$key]);
	925	+ if (strlen($newuser_name) > 0) :
	926	+ $userdata = array();
	927	+ $userdata['ID'] = NULL;
	928	+
	929	+ $userdata['user_login'] = sanitize_user($newuser_name);
	930	+ $userdata['user_login'] = apply_filters('pre_user_login', $userdata['user_login']);
	931	+
	932	+ $userdata['user_nicename'] = sanitize_title($newuser_name);
	933	+ $userdata['user_nicename'] = apply_filters('pre_user_nicename', $userdata['user_nicename']);
	934	+
	935	+ $userdata['display_name'] = $wpdb->escape($newuser_name);
556	936
557		- $exp = get_option('feedwordpress_expected_magpie');
558		- if ($exp) : $expected = array($exp, DEFAULT_EXPECTED_MAGPIE_VERSION);
559		- else : $expected = array(DEFAULT_EXPECTED_MAGPIE_VERSION);
	937	+ $newuser_id = wp_insert_user($userdata);
	938	+ if (is_numeric($newuser_id)) :
	939	+ $meta['map authors']['name'][$name] = $newuser_id;
	940	+ else :
	941	+ // TODO: Add some error detection and reporting
	942	+ endif;
	943	+ else :
	944	+ // TODO: Add some error reporting
	945	+ endif;
	946	+ else :
	947	+ $meta['map authors']['name'][$name] = $author_action;
	948	+ endif;
	949	+ endif;
	950	+ endforeach;
	951	+ endif;
	952	+
	953	+ if (isset($GLOBALS['fwp_post']['add_author_rule_name']) and isset($GLOBALS['fwp_post']['add_author_rule_action'])) :
	954	+ $name = strtolower(trim($GLOBALS['fwp_post']['add_author_rule_name']));
	955	+ $author_action = strtolower(trim($GLOBALS['fwp_post']['add_author_rule_action']));
	956	+ if (strlen($name) > 0) :
	957	+ if ('newuser' == $author_action) :
	958	+ $newuser_name = trim($GLOBALS['fwp_post']['add_author_rule_newuser']);
	959	+ if (strlen($newuser_name) > 0) :
	960	+ $userdata = array();
	961	+ $userdata['ID'] = NULL;
	962	+
	963	+ $userdata['user_login'] = sanitize_user($newuser_name);
	964	+ $userdata['user_login'] = apply_filters('pre_user_login', $userdata['user_login']);
	965	+
	966	+ $userdata['user_nicename'] = sanitize_title($newuser_name);
	967	+ $userdata['user_nicename'] = apply_filters('pre_user_nicename', $userdata['user_nicename']);
	968	+
	969	+ $userdata['display_name'] = $wpdb->escape($newuser_name);
	970	+
	971	+ $newuser_id = wp_insert_user($userdata);
	972	+ if (is_numeric($newuser_id)) :
	973	+ $meta['map authors']['name'][$name] = $newuser_id;
	974	+ else :
	975	+ // TODO: Add some error detection and reporting
	976	+ endif;
	977	+ else :
	978	+ // TODO: Add some error reporting
	979	+ endif;
	980	+ else :
	981	+ $meta['map authors']['name'][$name] = $author_action;
	982	+ endif;
	983	+ endif;
	984	+ endif;
	985	+
	986	+ if (isset($GLOBALS['fwp_post']['cat_split'])) :
	987	+ if (strlen(trim($GLOBALS['fwp_post']['cat_split'])) > 0) :
	988	+ $meta['cat_split'] = trim($GLOBALS['fwp_post']['cat_split']);
	989	+ else :
	990	+ unset($meta['cat_split']);
	991	+ endif;
	992	+ endif;
	993	+
	994	+ if (is_array($meta['cats'])) :
	995	+ $meta['cats'] = implode(FEEDWORDPRESS_CAT_SEPARATOR, $meta['cats']);
	996	+ endif;
	997	+
	998	+ // Collapse the author mapping rule structure back into a flat string
	999	+ if (isset($meta['map authors'])) :
	1000	+ $ma = array();
	1001	+ foreach ($meta['map authors'] as $rule_type => $author_rules) :
	1002	+ foreach ($author_rules as $author_name => $author_action) :
	1003	+ $ma[] = $rule_type."\n".$author_name."\n".$author_action;
	1004	+ endforeach;
	1005	+ endforeach;
	1006	+ $meta['map authors'] = implode("\n\n", $ma);
	1007	+ endif;
	1008	+
	1009	+ $notes = '';
	1010	+ foreach ($meta as $key => $value) :
	1011	+ $notes .= $key . ": ". addcslashes($value, "\0..\37".'\\') . "\n";
	1012	+ endforeach;
	1013	+ $alter[] = "link_notes = '".$wpdb->escape($notes)."'";
	1014	+
	1015	+ $alter_set = implode(", ", $alter);
	1016	+
	1017	+ // issue update query
	1018	+ $result = $wpdb->query("
	1019	+ UPDATE $wpdb->links
	1020	+ SET $alter_set
	1021	+ WHERE link_id='$link_id'
	1022	+ ");
	1023	+ $updated_link = true;
	1024	+
	1025	+ // reload link information from DB
	1026	+ $link =& new SyndicatedLink($link_id);
	1027	+ else :
	1028	+ $updated_link = false;
	1029	+ endif;
	1030	+
	1031	+ $db_link = $link->link;
	1032	+ $link_url = wp_specialchars($db_link->link_url, 1);
	1033	+ $link_name = wp_specialchars($db_link->link_name, 1);
	1034	+ $link_description = wp_specialchars($db_link->link_description, 'both');
	1035	+ $link_notes = wp_specialchars($db_link->link_notes, 'both');
	1036	+ $link_rss_uri = wp_specialchars($db_link->link_rss, 'both');
	1037	+
	1038	+ $meta = $link->settings;
	1039	+ $post_status_global = get_option('feedwordpress_syndicated_post_status');
	1040	+ $comment_status_global = get_option('feedwordpress_syndicated_comment_status');
	1041	+ $ping_status_global = get_option('feedwordpress_syndicated_ping_status');
	1042	+
	1043	+ $status['post'] = array('publish' => '', 'private' => '', 'draft' => '', 'site-default' => '');
	1044	+ $status['comment'] = array('open' => '', 'closed' => '', 'site-default' => '');
	1045	+ $status['ping'] = array('open' => '', 'closed' => '', 'site-default' => '');
	1046	+
	1047	+ foreach (array('post', 'comment', 'ping') as $what) :
	1048	+ if (isset($meta["{$what} status"])) :
	1049	+ $status[$what][$meta["{$what} status"]] = ' checked="checked"';
	1050	+ else :
	1051	+ $status[$what]['site-default'] = ' checked="checked"';
	1052	+ endif;
	1053	+ endforeach;
	1054	+
	1055	+ $unfamiliar['author'] = array ('create' => '','default' => '','filter' => '');
	1056	+ $unfamiliar['category'] = array ('create'=>'','default'=>'','filter'=>'');
	1057	+
	1058	+ foreach (array('author', 'category') as $what) :
	1059	+ if (is_string($meta["unfamiliar {$what}"]) and
	1060	+ array_key_exists($meta["unfamiliar {$what}"], $unfamiliar[$what])) :
	1061	+ $key = $meta["unfamiliar {$what}"];
	1062	+ else:
	1063	+ $key = 'site-default';
	1064	+ endif;
	1065	+ $unfamiliar[$what][$key] = ' checked="checked"';
	1066	+ endforeach;
	1067	+
	1068	+ $dogs = get_nested_categories(-1, 0);
	1069	+ if (is_array($meta['cats'])) :
	1070	+ $cats = array_map('strtolower',
	1071	+ array_map('trim',
	1072	+ $meta['cats']
	1073	+ ));
	1074	+ else:
	1075	+ $cats = array();
	1076	+ endif;
	1077	+
	1078	+ foreach ($dogs as $tag => $dog) :
	1079	+ $found_by_name = in_array(strtolower(trim($dog['cat_name'])), $cats);
	1080	+
	1081	+ if (isset($dog['cat_ID'])) : $dog['cat_id'] = $dog['cat_ID']; endif;
	1082	+ $found_by_id = in_array('{#'.trim($dog['cat_id']).'}', $cats);
	1083	+
	1084	+ if ($found_by_name or $found_by_id) :
	1085	+ $dogs[$tag]['checked'] = true;
	1086	+ endif;
	1087	+ endforeach;
	1088	+ else :
	1089	+ die( __('Link not found.') );
560	1090	endif;
561	1091
562		- if (in_array($magpie_version, $expected)) :
563		- if ($magpie_version != $exp) :
564		- update_option('feedwordpress_expected_magpie', $magpie_version);
	1092	+ ?>
	1093	+<script type="text/javascript">
	1094	+ function flip_hardcode (item) {
	1095	+ ed=document.getElementById('basics-'+item+'-edit');
	1096	+ view=document.getElementById('basics-'+item+'-view');
	1097	+
	1098	+ o = document.getElementById('basics-hardcode-'+item);
	1099	+ if (o.value=='yes') { ed.style.display='inline'; view.style.display='none'; }
	1100	+ else { ed.style.display='none'; view.style.display='inline'; }
	1101	+ }
	1102	+ function flip_newuser (item) {
	1103	+ rollup=document.getElementById(item);
	1104	+ newuser=document.getElementById(item+'-newuser');
	1105	+ sitewide=document.getElementById(item+'-default');
	1106	+ if (rollup) {
	1107	+ if ('newuser'==rollup.value) {
	1108	+ if (newuser) newuser.style.display='block';
	1109	+ if (sitewide) sitewide.style.display='none';
	1110	+ } else if ('site-default'==rollup.value) {
	1111	+ if (newuser) newuser.style.display='none';
	1112	+ if (sitewide) sitewide.style.display='block';
	1113	+ } else {
	1114	+ if (newuser) newuser.style.display='none';
	1115	+ if (sitewide) sitewide.style.display='none';
	1116	+ }
	1117	+ }
	1118	+ }
	1119	+</script>
	1120	+
	1121	+<?php if ($updated_link) : ?>
	1122	+<div class="updated"><p>Syndicated feed settings updated.</p></div>
	1123	+<?php endif; ?>
	1124	+
	1125	+<form action="admin.php?page=feedwordpress/<?php echo basename(__FILE__); ?>" method="post">
	1126	+<div class="wrap">
	1127	+<input type="hidden" name="link_id" value="<?php echo $link_id; ?>" />
	1128	+<input type="hidden" name="action" value="linkedit" />
	1129	+<input type="hidden" name="save" value="link" />
	1130	+
	1131	+<h2>Edit a syndicated feed:</h2>
	1132	+<fieldset class="options"><legend>Basics</legend>
	1133	+<table class="editform" width="100%" cellspacing="2" cellpadding="5">
	1134	+<tr>
	1135	+<th scope="row" width="20%"><?php _e('Feed URI:') ?></th>
	1136	+<td width="60%"><a href="<?php echo wp_specialchars($link_rss_uri, 'both'); ?>"><?php echo $link_rss_uri; ?></a>
	1137	+(<a href="<?php echo FEEDVALIDATOR_URI; ?>?url=<?php echo urlencode($link_rss_uri); ?>"
	1138	+title="Check feed <<?php echo wp_specialchars($link_rss_uri, 'both'); ?>> for validity">validate</a>)
	1139	+</td>
	1140	+<td width="20%"><input type="submit" name="feedfinder" value="switch →" style="font-size:smaller" /></td>
	1141	+</tr>
	1142	+<tr>
	1143	+<th scope="row" width="20%"><?php _e('Link Name:') ?></th>
	1144	+<td width="60%"><input type="text" id="basics-name-edit" name="name"
	1145	+value="<?php echo $link_name; ?>" style="width: 95%" />
	1146	+<span id="basics-name-view"><strong><?php echo $link_name; ?></strong></span>
	1147	+</td>
	1148	+<td>
	1149	+<select id="basics-hardcode-name" onchange="flip_hardcode('name')" name="hardcode_name">
	1150	+<option value="no" <?php echo $link->hardcode('name')?'':'selected="selected"'; ?>>update automatically</option>
	1151	+<option value="yes" <?php echo $link->hardcode('name')?'selected="selected"':''; ?>>edit manually</option>
	1152	+</select>
	1153	+</td>
	1154	+</tr>
	1155	+<tr>
	1156	+<th scope="row" width="20%"><?php _e('Short description:') ?></th>
	1157	+<td width="60%">
	1158	+<input id="basics-description-edit" type="text" name="description" value="<?php echo $link_description; ?>" style="width: 95%" />
	1159	+<span id="basics-description-view"><strong><?php echo $link_description; ?></strong></span>
	1160	+</td>
	1161	+<td>
	1162	+<select id="basics-hardcode-description" onchange="flip_hardcode('description')"
	1163	+name="hardcode_description">
	1164	+<option value="no" <?php echo $link->hardcode('description')?'':'selected="selected"'; ?>>update automatically</option>
	1165	+<option value="yes" <?php echo $link->hardcode('description')?'selected="selected"':''; ?>>edit manually</option>
	1166	+</select></td>
	1167	+</tr>
	1168	+<tr>
	1169	+<th width="20%" scope="row"><?php _e('Homepage:') ?></th>
	1170	+<td width="60%">
	1171	+<input id="basics-url-edit" type="text" name="linkurl" value="<?php echo $link_url; ?>" style="width: 95%;" />
	1172	+<a id="basics-url-view" href="<?php echo $link_url; ?>"><?php echo $link_url; ?></a></td>
	1173	+<td>
	1174	+<select id="basics-hardcode-url" onchange="flip_hardcode('url')" name="hardcode_url">
	1175	+<option value="no"<?php echo $link->hardcode('url')?'':' selected="selected"'; ?>>update automatically</option>
	1176	+<option value="yes"<?php echo $link->hardcode('url')?' selected="selected"':''; ?>>edit manually</option>
	1177	+</select></td></tr>
	1178	+
	1179	+<tr>
	1180	+<th width="20%"><?php _e('Last update') ?>:</th>
	1181	+<td colspan="2"><?php
	1182	+ if (isset($meta['update/last'])) :
	1183	+ echo strftime('%x %X', $meta['update/last'])." ";
	1184	+ else :
	1185	+ echo " none yet";
	1186	+ endif;
	1187	+?></td></tr>
	1188	+<tr><th width="20%">Next update:</th>
	1189	+<td colspan="2"><?php
	1190	+ $holdem = (isset($meta['update/hold']) ? $meta['update/hold'] : 'scheduled');
	1191	+?>
	1192	+<select name="update_schedule">
	1193	+<option value="scheduled"<?php echo ($holdem=='scheduled')?' selected="selected"':''; ?>>update on schedule <?php
	1194	+ echo " (";
	1195	+ if (isset($meta['update/ttl']) and is_numeric($meta['update/ttl'])) :
	1196	+ if (isset($meta['update/timed']) and $meta['update/timed']=='automatically') :
	1197	+ echo 'next: ';
	1198	+ $next = $meta['update/last'] + ((int) $meta['update/ttl'] * 60);
	1199	+ if (strftime('%x', time()) != strftime('%x', $next)) :
	1200	+ echo strftime('%x', $next)." ";
565	1201	endif;
	1202	+ echo strftime('%X', $meta['update/last']+((int) $meta['update/ttl']*60));
566	1203	else :
567		- if (current_user_can('edit_files')) :
568		- $youAre = 'you are';
569		- $itIsRecommendedThatYou = 'It is <strong>strongly recommended</strong> that you';
570		- else :
571		- $youAre = 'this site is';
572		- $itIsRecommendedThatYou = 'You may want to contact the administrator of the site; it is <strong>strongly recommended</strong> that they';
573		- endif;
574		- print '<div class="error">';
	1204	+ echo "every ".$meta['update/ttl']." minute".(($meta['update/ttl']!=1)?"s":"");
	1205	+ endif;
	1206	+ else:
	1207	+ echo "next scheduled update";
	1208	+ endif;
	1209	+ echo ")";
	1210	+?></option>
	1211	+<option value="next"<?php echo ($holdem=='next')?' selected="selected"':''; ?>>update ASAP</option>
	1212	+<option value="ping"<?php echo ($holdem=='ping')?' selected="selected"':''; ?>>update only when pinged</option>
	1213	+</select></tr>
	1214	+</table>
	1215	+</fieldset>
	1216	+
	1217	+<script type="text/javascript">
	1218	+flip_hardcode('name');
	1219	+flip_hardcode('description');
	1220	+flip_hardcode('url');
	1221	+</script>
	1222	+
	1223	+<p class="submit">
	1224	+<input type="submit" name="submit" value="<?php _e('Save Changes »') ?>" />
	1225	+</p>
	1226	+
	1227	+<fieldset class="options">
	1228	+<legend>Syndicated Posts</legend>
	1229	+
	1230	+<?php fwp_category_box($dogs, 'all syndicated posts from this feed'); ?>
	1231	+
	1232	+<table class="editform" width="75%" cellspacing="2" cellpadding="5">
	1233	+<tr><th width="27%" scope="row" style="vertical-align:top">Publication:</th>
	1234	+<td width="73%" style="vertical-align:top"><ul style="margin:0; list-style:none">
	1235	+<li><label><input type="radio" name="feed_post_status" value="site-default"
	1236	+<?php echo $status['post']['site-default']; ?> /> Use site-wide setting from <a href="admin.php?page=feedwordpress/syndication-options.php">Syndication Options</a>
	1237	+(currently: <strong><?php echo ($post_status_global ? $post_status_global : 'publish'); ?></strong>)</label></li>
	1238	+<li><label><input type="radio" name="feed_post_status" value="publish"
	1239	+<?php echo $status['post']['publish']; ?> /> Publish posts from this feed immediately</label></li>
	1240	+<li><label><input type="radio" name="feed_post_status" value="private"
	1241	+<?php echo $status['post']['private']; ?> /> Hold posts from this feed as private posts</label></li>
	1242	+<li><label><input type="radio" name="feed_post_status" value="draft"
	1243	+<?php echo $status['post']['draft']; ?> /> Hold posts from this feed as drafts</label></li>
	1244	+</ul></td>
	1245	+</tr>
	1246	+
	1247	+<tr><th width="27%" scope="row" style="vertical-align:top">Comments:</th>
	1248	+<td width="73%"><ul style="margin:0; list-style:none">
	1249	+<li><label><input type="radio" name="feed_comment_status" value="site-default"
	1250	+<?php echo $status['comment']['site-default']; ?> /> Use site-wide setting from <a href="admin.php?page=feedwordpress/syndication-options.php">Syndication Options</a>
	1251	+(currently: <strong><?php echo ($comment_status_global ? $comment_status_global : 'closed'); ?>)</strong></label></li>
	1252	+<li><label><input type="radio" name="feed_comment_status" value="open"
	1253	+<?php echo $status['comment']['open']; ?> /> Allow comments on syndicated posts from this feed</label></li>
	1254	+<li><label><input type="radio" name="feed_comment_status" value="closed"
	1255	+<?php echo $status['comment']['closed']; ?> /> Don't allow comments on syndicated posts from this feed</label></li>
	1256	+</ul></td>
	1257	+</tr>
	1258	+
	1259	+<tr><th width="27%" scope="row" style="vertical-align:top">Trackback and Pingback:</th>
	1260	+<td width="73%"><ul style="margin:0; list-style:none">
	1261	+<li><label><input type="radio" name="feed_ping_status" value="site-default"
	1262	+<?php echo $status['ping']['site-default']; ?> /> Use site-wide setting from <a href="admin.php?page=feedwordpress/syndication-options.php">Syndication Options</a>
	1263	+(currently: <strong><?php echo ($ping_status_global ? $ping_status_global : 'closed'); ?>)</strong></label></li>
	1264	+<li><label><input type="radio" name="feed_ping_status" value="open"
	1265	+<?php echo $status['ping']['open']; ?> /> Accept pings on syndicated posts from this feed</label></li>
	1266	+<li><label><input type="radio" name="feed_ping_status" value="closed"
	1267	+<?php echo $status['ping']['closed']; ?> /> Don't accept pings on syndicated posts from this feed</label></li>
	1268	+</ul></td>
	1269	+</tr>
	1270	+</table>
	1271	+</fieldset>
	1272	+
	1273	+<p class="submit">
	1274	+<input type="submit" name="submit" value="<?php _e('Save Changes »') ?>" />
	1275	+</p>
	1276	+
	1277	+<fieldset class="options">
	1278	+<legend>Syndicated Authors</legend>
	1279	+<?php $authorlist = fwp_author_list(); ?>
	1280	+
	1281	+<table>
	1282	+<tr><th colspan="3" style="text-align: left; padding-top: 1.0em; border-bottom: 1px dotted black;">For posts by specific authors. Blank out a name to delete the rule.</th></tr>
	1283	+
	1284	+<?php if (isset($meta['map authors'])) : $i=0; foreach ($meta['map authors'] as $author_rules) : foreach ($author_rules as $author_name => $author_action) : $i++; ?>
	1285	+<tr>
	1286	+ <th style="text-align: left">Posts by <input type="text" name="author_rules_name[]" value="<?php echo htmlspecialchars($author_name); ?>" /></th>
	1287	+ <td>
	1288	+ <select id="author-rules-<?php echo $i; ?>" name="author_rules_action[]" onchange="flip_newuser('author-rules-<?php echo $i; ?>');">
	1289	+ <?php foreach ($authorlist as $local_author_id => $local_author_name) : ?>
	1290	+ <option value="<?php echo $local_author_id; ?>"<?php if ($local_author_id==$author_action) : echo ' selected="selected"'; endif; ?>>are assigned to <?php echo $local_author_name; ?></option>
	1291	+ <?php endforeach; ?>
	1292	+ <option value="newuser">will be assigned to a new user...</option>
	1293	+ <option value="filter"<?php if ('filter'==$author_action) : echo ' selected="selected"'; endif; ?>>get filtered out</option>
	1294	+ </select>
	1295	+ </td>
	1296	+ <td><div id="author-rules-<?php echo $i; ?>-newuser">named <input type="text" name="author_rules_newuser[]" value="" /></div></td>
	1297	+</tr>
	1298	+<?php endforeach; endforeach; endif; ?>
	1299	+
	1300	+<tr><th colspan="3" style="text-align: left; padding-top: 1.0em; border-bottom: 1px dotted black;">Fill in to set up a new rule:</th></tr>
	1301	+
	1302	+<tr>
	1303	+ <th style="text-align: left">Posts by <input type="text" name="add_author_rule_name" /></th>
	1304	+ <td>
	1305	+ <select id="add-author-rule" name="add_author_rule_action" onchange="flip_newuser('add-author-rule');">
	1306	+ <?php foreach ($authorlist as $author_id => $author_name) : ?>
	1307	+ <option value="<?php echo $author_id; ?>">are assigned to <?php echo $author_name; ?></option>
	1308	+ <?php endforeach; ?>
	1309	+ <option value="newuser">will be assigned to a new user...</option>
	1310	+ <option value="filter">get filtered out</option>
	1311	+ </select>
	1312	+ </td>
	1313	+ <td><div id="add-author-rule-newuser">named <input type="text" name="add_author_rule_newuser" value="" /></div></td>
	1314	+</tr>
	1315	+
	1316	+<tr><th colspan="3" style="text-align: left; padding-top: 1.0em; border-bottom: 1px dotted black;">For posts by authors that haven't been syndicated before:</th></tr>
	1317	+<tr>
	1318	+ <th style="text-align: left">Posts by new authors</th>
	1319	+ <td>
	1320	+ <select id="unfamiliar-author" name="unfamiliar_author" onchange="flip_newuser('unfamiliar-author');">
	1321	+ <option value="site-default"<?php if (!isset($meta['unfamiliar author'])) : ?>selected="selected"<?php endif; ?>>are handled using site-wide settings</option>
	1322	+ <option value="create"<?php if ('create'==$meta['unfamiliar author']) : ?>selected="selected"<?php endif; ?>>create a new author account</option>
	1323	+ <?php foreach ($authorlist as $author_id => $author_name) : ?>
	1324	+ <option value="<?php echo $author_id; ?>"<?php if ($author_id==$meta['unfamiliar author']) : ?>selected="selected"<?php endif; ?>>are assigned to <?php echo $author_name; ?></option>
	1325	+ <?php endforeach; ?>
	1326	+ <option value="newuser">will be assigned to a new user...</option>
	1327	+ <option value="filter"<?php if ('filter'==$meta['unfamiliar author']) : ?>selected="selected"<?php endif; ?>>get filtered out</option>
	1328	+ </select>
	1329	+ </td>
	1330	+ <td>
	1331	+ <div id="unfamiliar-author-default">Site-wide settings can be set in <a href="admin.php?page=feedwordpress/syndication-options.php">Syndication Options</a></div>
	1332	+ <div id="unfamiliar-author-newuser">named <input type="text" name="unfamiliar_author_newuser" value="" /></div>
	1333	+ </td>
	1334	+</tr>
	1335	+
	1336	+</table>
	1337	+</fieldset>
	1338	+
	1339	+<script>
	1340	+ flip_newuser('unfamiliar-author');
	1341	+<?php for ($j=1; $j<=$i; $j++) : ?>
	1342	+ flip_newuser('author-rules-<?php echo $j; ?>');
	1343	+<?php endfor; ?>
	1344	+ flip_newuser('add-author-rule');
	1345	+</script>
	1346	+
	1347	+<p class="submit">
	1348	+<input type="submit" name="submit" value="<?php _e('Save Changes »') ?>" />
	1349	+</p>
	1350	+
	1351	+<fieldset>
	1352	+<legend>Advanced Feed Options</legend>
	1353	+<table class="editform" width="100%" cellspacing="2" cellpadding="5">
	1354	+
	1355	+<tr>
	1356	+<th width="20%" scope="row" style="vertical-align:top">Unfamiliar categories:</th>
	1357	+<td width="80%"><ul style="margin: 0; list-style:none">
	1358	+<li><label><input type="radio" name="unfamiliar_category" value="site-default"<?php echo $unfamiliar['category']['site-default']; ?> /> use site-wide setting from <a href="admin.php?page=feedwordpress/syndication-options.php">Syndication Options</a>
	1359	+(currently <strong><?php echo FeedWordPress::on_unfamiliar('category'); ?></strong>)</label></li>
	1360	+<li><label><input type="radio" name="unfamiliar_category" value="create"<?php echo $unfamiliar['category']['create']; ?> /> create any categories the post is in</label></li>
	1361	+<li><label><input type="radio" name="unfamiliar_category" value="default"<?php echo $unfamiliar['category']['default']; ?> /> don't create new categories</label></li>
	1362	+<li><label><input type="radio" name="unfamiliar_category" value="filter"<?php echo $unfamiliar['category']['filter']; ?> /> don't create new categories and don't syndicate posts unless they match at least one familiar category</label></li>
	1363	+</ul></td>
	1364	+</tr>
	1365	+
	1366	+<tr>
	1367	+<th width="20%" scope="row" style="vertical-align:top">Multiple categories:</th>
	1368	+<td width="80%">
	1369	+<input type="text" size="20" id="cat_split" name="cat_split" value="<?php if (isset($meta['cat_split'])) : echo htmlspecialchars($meta['cat_split']); endif; ?>" /><br/>
	1370	+Enter a <a href="http://us.php.net/manual/en/reference.pcre.pattern.syntax.php">Perl-compatible regular expression</a> here if the feed provides multiple
	1371	+categories in a single category element. The regular expression should match
	1372	+the characters used to separate one category from the next. If the feed uses
	1373	+spaces (like <a href="http://del.icio.us/">del.icio.us</a>), use the pattern "\s".
	1374	+If the feed does not provide multiple categories in a single element, leave this
	1375	+blank.</td>
	1376	+</tr>
	1377	+</table>
	1378	+</fieldset>
	1379	+
	1380	+<p class="submit">
	1381	+<input type="submit" name="submit" value="<?php _e('Save Changes »') ?>" />
	1382	+</p>
	1383	+
	1384	+<fieldset id="postcustom">
	1385	+<legend>Custom Settings (for use in templates)</legend>
	1386	+<div id="postcustomstuff">
	1387	+<table id="meta-list" cellpadding="3">
	1388	+ <tr>
	1389	+ <th>Key</th>
	1390	+ <th>Value</th>
	1391	+ <th>Action</th>
	1392	+ </tr>
	1393	+
	1394	+<?php
	1395	+ $i = 0;
	1396	+ foreach ($meta as $key => $value) :
	1397	+ if (!preg_match("\007^((".implode(')\|(', $special_settings)."))$\007i", $key)) :
575	1398	?>
576		-<p style="font-style: italic"><strong>FeedWordPress has detected that <?php print $youAre; ?> currently using a version of
577		-MagpieRSS other than the upgraded version that ships with FeedWordPress.</strong></p>
578		-<p><?php print $itIsRecommendedThatYou; ?> install the upgraded
579		-version of MagpieRSS supplied with FeedWordPress. The version of
580		-MagpieRSS that ships with WordPress is very old and buggy, and
581		-encounters a number of errors when trying to parse modern Atom
582		-and RSS feeds.</p>
	1399	+ <tr style="vertical-align:top">
	1400	+ <th width="30%" scope="row"><input type="hidden" name="notes[<?php echo $i; ?>][key0]" value="<?php echo wp_specialchars($key, 'both'); ?>" />
	1401	+ <input id="notes-<?php echo $i; ?>-key" name="notes[<?php echo $i; ?>][key1]" value="<?php echo wp_specialchars($key, 'both'); ?>" /></th>
	1402	+ <td width="60%"><textarea rows="2" cols="40" id="notes-<?php echo $i; ?>-value" name="notes[<?php echo $i; ?>][value]"><?php echo wp_specialchars($value, 'both'); ?></textarea></td>
	1403	+ <td width="10%"><select name="notes[<?php echo $i; ?>][action]">
	1404	+ <option value="update">save changes</option>
	1405	+ <option value="delete">delete this setting</option>
	1406	+ </select></td>
	1407	+ </tr>
583	1408	<?php
584		- feedwordpress_upgrade_old_and_busted_buttons();
585		- print '</div>';
	1409	+ $i++;
586	1410	endif;
	1411	+ endforeach;
	1412	+?>
	1413	+ <tr>
	1414	+ <th scope="row"><input type="text" size="10" name="notes[<?php echo $i; ?>][key1]" value="" /></th>
	1415	+ <td><textarea name="notes[<?php echo $i; ?>][value]" rows="2" cols="40"></textarea></td>
	1416	+ <td><em>add new setting...</em><input type="hidden" name="notes[<?php echo $i; ?>][action]" value="update" /></td>
	1417	+ </tr>
	1418	+</table>
	1419	+</fieldset>
	1420	+
	1421	+<p class="submit">
	1422	+<input type="submit" name="submit" value="<?php _e('Save Changes »') ?>" />
	1423	+</p>
	1424	+
	1425	+</div>
	1426	+ <?php
587	1427	endif;
	1428	+ return false; // Don't continue
588	1429	}
589	1430
590		-function feedwordpress_upgrade_old_and_busted_buttons() {
591		- if (current_user_can('edit_files')) :
	1431	+function fwp_author_list () {
	1432	+ global $wpdb;
	1433	+ $ret = array();
	1434	+ $users = $wpdb->get_results("SELECT * FROM $wpdb->users ORDER BY display_name");
	1435	+ if (is_array($users)) :
	1436	+ foreach ($users as $user) :
	1437	+ $id = (int) $user->ID;
	1438	+ $ret[$id] = $user->display_name;
	1439	+ endforeach;
	1440	+ endif;
	1441	+ return $ret;
	1442	+}
	1443	+
	1444	+function fwp_multidelete_page () {
	1445	+ global $wpdb;
	1446	+
	1447	+ check_admin_referer(); // Make sure the referers are kosher
	1448	+
	1449	+ $link_ids = (isset($_REQUEST['link_ids']) ? $_REQUEST['link_ids'] : array());
	1450	+ if (isset($_REQUEST['link_id'])) : array_push($link_ids, $_REQUEST['link_id']); endif;
	1451	+
	1452	+ if (!current_user_can('manage_links')):
	1453	+ die (__("Cheatin' uh ?"));
	1454	+ elseif (isset($GLOBALS['fwp_post']['confirm']) and $GLOBALS['fwp_post']['confirm']=='Delete'):
	1455	+ foreach ($GLOBALS['fwp_post']['link_action'] as $link_id => $what) :
	1456	+ $do_it[$what][] = $link_id;
	1457	+ endforeach;
	1458	+
	1459	+ $alter = array();
	1460	+ if (count($do_it['hide']) > 0) :
	1461	+ $hidem = "(".implode(', ', $do_it['hide']).")";
	1462	+ $alter[] = "
	1463	+ UPDATE $wpdb->links
	1464	+ SET link_visible = 'N'
	1465	+ WHERE link_id IN {$hidem}
	1466	+ ";
	1467	+ endif;
	1468	+
	1469	+ if (count($do_it['nuke']) > 0) :
	1470	+ $nukem = "(".implode(', ', $do_it['nuke']).")";
	1471	+
	1472	+ // Make a list of the items syndicated from this feed...
	1473	+ $post_ids = $wpdb->get_col("
	1474	+ SELECT post_id FROM $wpdb->postmeta
	1475	+ WHERE meta_key = 'syndication_feed_id'
	1476	+ AND meta_value IN {$nukem}
	1477	+ ");
	1478	+
	1479	+ // ... and kill them all
	1480	+ if (count($post_ids) > 0) :
	1481	+ foreach ($post_ids as $post_id) :
	1482	+ wp_delete_post($post_id);
	1483	+ endforeach;
	1484	+ endif;
	1485	+
	1486	+ $alter[] = "
	1487	+ DELETE FROM $wpdb->links
	1488	+ WHERE link_id IN {$nukem}
	1489	+ ";
	1490	+ endif;
	1491	+
	1492	+ if (count($do_it['delete']) > 0) :
	1493	+ $deletem = "(".implode(', ', $do_it['delete']).")";
	1494	+
	1495	+ // Make the items syndicated from this feed appear to be locally-authored
	1496	+ $alter[] = "
	1497	+ DELETE FROM $wpdb->postmeta
	1498	+ WHERE meta_key = 'syndication_feed_id'
	1499	+ AND meta_value IN {$deletem}
	1500	+ ";
	1501	+
	1502	+ // ... and delete the links themselves.
	1503	+ $alter[] = "
	1504	+ DELETE FROM $wpdb->links
	1505	+ WHERE link_id IN {$deletem}
	1506	+ ";
	1507	+ endif;
	1508	+
	1509	+ $errs = array(); $success = array ();
	1510	+ foreach ($alter as $sql) :
	1511	+ $result = $wpdb->query($sql);
	1512	+ if (!$result):
	1513	+ $errs[] = mysql_error();
	1514	+ endif;
	1515	+ endforeach;
	1516	+
	1517	+ if (count($alter) > 0) :
	1518	+ echo "<div class=\"updated\">\n";
	1519	+ if (count($errs) > 0) :
	1520	+ echo "There were some problems processing your ";
	1521	+ echo "unsubscribe request. [SQL: ".implode('; ', $errs)."]";
	1522	+ else :
	1523	+ echo "Your unsubscribe request(s) have been processed.";
	1524	+ endif;
	1525	+ echo "</div>\n";
	1526	+ endif;
	1527	+
	1528	+ return true; // Continue on to Syndicated Sites listing
	1529	+ else :
	1530	+ $targets = $wpdb->get_results("
	1531	+ SELECT * FROM $wpdb->links
	1532	+ WHERE link_id IN (".implode(",",$link_ids).")
	1533	+ ");
592	1534	?>
593		-<form action="" method="post"><div>
594		-<?php FeedWordPressCompatibility::stamp_nonce('feedwordpress_fix_magpie'); ?>
595		-<input type="hidden" name="action" value="fix_magpie_version" />
596		-<input class="button-secondary" type="submit" name="ignore" value="<?php _e('Ignore this problem'); ?>" />
597		-<input class="button-primary" type="submit" name="upgrade" value="<?php _e('Upgrade'); ?>" />
598		-</div></form>
	1535	+<form action="admin.php?page=feedwordpress/<?php echo basename(__FILE__); ?>" method="post">
	1536	+<div class="wrap">
	1537	+<input type="hidden" name="action" value="Unsubscribe" />
	1538	+<input type="hidden" name="confirm" value="Delete" />
	1539	+
	1540	+<h2>Unsubscribe from Syndicated Links:</h2>
	1541	+<?php foreach ($targets as $link) :
	1542	+ $link_url = wp_specialchars($link->link_url, 1);
	1543	+ $link_name = wp_specialchars($link->link_name, 1);
	1544	+ $link_description = wp_specialchars($link->link_description, 'both');
	1545	+ $link_rss = wp_specialchars($link->link_rss, 'both');
	1546	+?>
	1547	+<fieldset>
	1548	+<legend><?php echo $link_name; ?></legend>
	1549	+<table class="editform" width="100%" cellspacing="2" cellpadding="5">
	1550	+<tr><th scope="row" width="20%"><?php _e('Feed URI:') ?></th>
	1551	+<td width="80%"><a href="<?php echo $link_rss; ?>"><?php echo $link_rss; ?></a></td></tr>
	1552	+<tr><th scope="row" width="20%"><?php _e('Short description:') ?></th>
	1553	+<td width="80%"><?php echo $link_description; ?></span></td></tr>
	1554	+<tr><th width="20%" scope="row"><?php _e('Homepage:') ?></th>
	1555	+<td width="80%"><a href="<?php echo $link_url; ?>"><?php echo $link_url; ?></a></td></tr>
	1556	+<tr style="vertical-align:top"><th width="20%" scope="row">Subscription <?php _e('Options') ?>:</th>
	1557	+<td width="80%"><ul style="margin:0; padding: 0; list-style: none">
	1558	+<li><input type="radio" id="hide-<?php echo $link->link_id; ?>"
	1559	+name="link_action[<?php echo $link->link_id; ?>]" value="hide" />
	1560	+<label for="hide-<?php echo $link->link_id; ?>">Turn off the subscription for this
	1561	+syndicated link<br/><span style="font-size:smaller">(Keep the feed information
	1562	+and all the posts from this feed in the database, but don't syndicate any
	1563	+new posts from the feed.)</span></label></li>
	1564	+<li><input type="radio" id="nuke-<?php echo $link->link_id; ?>"
	1565	+name="link_action[<?php echo $link->link_id; ?>]" value="nuke" />
	1566	+<label for="nuke-<?php echo $link->link_id; ?>">Delete this syndicated link and all the
	1567	+posts that were syndicated from it</label></li>
	1568	+<li><input type="radio" id="delete-<?php echo $link->link_id; ?>"
	1569	+name="link_action[<?php echo $link->link_id; ?>]" value="delete" />
	1570	+<label for="delete-<?php echo $link->link_id; ?>">Delete this syndicated link, but
	1571	+<em>keep</em> posts that were syndicated from it (as if they were authored
	1572	+locally).</label></li>
	1573	+<li><input type="radio" id="nothing-<?php echo $link->link_id; ?>"
	1574	+name="link_action[<?php echo $link->link_id; ?>]" value="nothing" />
	1575	+<label for="nothing-<?php echo $link->link_id; ?>">Keep this feed as it is. I changed
	1576	+my mind.</label></li>
	1577	+</ul>
	1578	+</table>
	1579	+</fieldset>
	1580	+<?php endforeach; ?>
	1581	+
	1582	+<div class="submit">
	1583	+<input class="delete" type="submit" name="submit" value="<?php _e('Unsubscribe from selected feeds »') ?>" />
	1584	+</div>
	1585	+</div>
599	1586	<?php
	1587	+ return false; // Don't continue on to Syndicated Sites listing
600	1588	endif;
601	1589	}
602	1590
603	1591	################################################################################
		@@ -754,9 +1742,9 @@
754	1742	#
755	1743	# * Updates to existing posts since the last poll are mirrored in the
756	1744	# WordPress store.
757	1745	#
758		- function update ($uri = null, $crash_ts = null) {
	1746	+ function update ($uri = null) {
759	1747	global $wpdb;
760	1748
761	1749	if (FeedWordPress::needs_upgrade()) : // Will make duplicate posts if we don't hold off
762	1750	return NULL;
		@@ -769,28 +1757,11 @@
769	1757	endif;
770	1758
771	1759	do_action('feedwordpress_update', $uri);
772	1760
773		- if (is_null($crash_ts)) :
774		- $crash_dt = (int) get_option('feedwordpress_update_time_limit');
775		- if ($crash_dt > 0) :
776		- $crash_ts = time() + $crash_dt;
777		- else :
778		- $crash_ts = NULL;
779		- endif;
780		- endif;
781		-
782		- // Randomize order for load balancing purposes
783		- $feed_set = $this->feeds;
784		- shuffle($feed_set);
785		-
786	1761	// Loop through and check for new posts
787	1762	$delta = NULL;
788		- foreach ($feed_set as $feed) :
789		- if (!is_null($crash_ts) and (time() > $crash_ts)) : // Check whether we've exceeded the time limit
790		- break;
791		- endif;
792		-
	1763	+ foreach ($this->feeds as $feed) :
793	1764	$pinged_that = (is_null($uri) or in_array($uri, array($feed->uri(), $feed->homepage())));
794	1765
795	1766	if (!is_null($uri)) : // A site-specific ping always updates
796	1767	$timely = true;
		@@ -803,12 +1774,9 @@
803	1774	endif;
804	1775
805	1776	if ($pinged_that and $timely) :
806	1777	do_action('feedwordpress_check_feed', $feed->settings);
807		- $start_ts = time();
808		- $added = $feed->poll($crash_ts);
809		- do_action('feedwordpress_check_feed_complete', $feed->settings, $added, time() - $start_ts);
810		-
	1778	+ $added = $feed->poll();
811	1779	if (isset($added['new'])) : $delta['new'] += $added['new']; endif;
812	1780	if (isset($added['updated'])) : $delta['updated'] += $added['updated']; endif;
813	1781	endif;
814	1782	endforeach;
		@@ -866,9 +1834,9 @@
866	1834	if (function_exists('wp_insert_link')) { // WordPress 2.x
867	1835	$link_id = wp_insert_link(array(
868	1836	"link_name" => $name,
869	1837	"link_url" => $uri,
870		- "link_category" => (fwp_test_wp_version(0, FWP_SCHEMA_21) ? $cat_id : array($cat_id)),
	1838	+ "link_category" => array($cat_id),
871	1839	"link_rss" => $rss
872	1840	));
873	1841	} else { // WordPress 1.5.x
874	1842	$result = $wpdb->query("
		@@ -884,20 +1852,17 @@
884	1852	return $link_id;
885	1853	} // function FeedWordPress::syndicate_link()
886	1854
887	1855	function on_unfamiliar ($what = 'author', $override = NULL) {
888		- $set = array(
889		- 'author' => array('create', 'default', 'filter'),
890		- 'category' => array('create', 'tag', 'default', 'filter'),
891		- );
892		-
	1856	+ $set = array('create', 'default', 'filter');
	1857	+
893	1858	if (is_string($override)) :
894	1859	$ret = strtolower($override);
895	1860	endif;
896	1861
897		- if (!is_numeric($override) and !in_array($ret, $set[$what])) :
	1862	+ if (!is_numeric($override) and !in_array($ret, $set)) :
898	1863	$ret = get_option('feedwordpress_unfamiliar_'.$what);
899		- if (!is_numeric($ret) and !in_array($ret, $set[$what])) :
	1864	+ if (!is_numeric($ret) and !in_array($ret, $set)) :
900	1865	$ret = 'create';
901	1866	endif;
902	1867	endif;
903	1868
		@@ -903,33 +1868,8 @@
903	1868
904	1869	return $ret;
905	1870	} // function FeedWordPress::on_unfamiliar()
906	1871
907		- function null_email_set () {
908		- $base = get_option('feedwordpress_null_email_set');
909		-
910		- if ($base===false) :
911		- $ret = array('noreply@blogger.com'); // default
912		- else :
913		- $ret = array_map('strtolower',
914		- array_map('trim', explode("\n", $base)));
915		- endif;
916		- $ret = apply_filters('syndicated_item_author_null_email_set', $ret);
917		- return $ret;
918		-
919		- } /* FeedWordPress::null_email_set () */
920		-
921		- function is_null_email ($email) {
922		- $ret = in_array(strtolower(trim($email)), FeedWordPress::null_email_set());
923		- $ret = apply_filters('syndicated_item_author_is_null_email', $ret, $email);
924		- return $ret;
925		- } /* FeedWordPress::is_null_email () */
926		-
927		- function use_aggregator_source_data () {
928		- $ret = get_option('feedwordpress_use_aggregator_source_data');
929		- return apply_filters('syndicated_post_use_aggregator_source_data', ($ret=='yes'));
930		- }
931		-
932	1872	function syndicated_links () {
933	1873	$contributors = FeedWordPress::link_category_id();
934	1874	if (function_exists('get_bookmarks')) :
935	1875	$links = get_bookmarks(array("category" => $contributors));
		@@ -954,12 +1894,12 @@
954	1894	// WordPress 2.3 introduces a new taxonomy/term API
955	1895	if (function_exists('is_term')) :
956	1896	$cat_id = is_term($cat, 'link_category');
957	1897	// WordPress 2.1 and 2.2 use a common table for both link and post categories
958		- elseif (fwp_test_wp_version(FWP_SCHEMA_21, FWP_SCHEMA_23)) :
	1898	+ elseif (isset($wp_db_version) and ($wp_db_version >= FWP_SCHEMA_21 and $wp_db_version < FWP_SCHEMA_23) ) :
959	1899	$cat_id = $wpdb->get_var("SELECT cat_id FROM {$wpdb->categories} WHERE cat_name='$cat'");
960	1900	// WordPress 1.5 and 2.0.x have a separate table for link categories
961		- elseif (fwp_test_wp_version(0, FWP_SCHEMA_21)):
	1901	+ elseif (!isset($wp_db_version) or $wp_db_version < FWP_SCHEMA_21) :
962	1902	$cat_id = $wpdb->get_var("SELECT cat_id FROM {$wpdb->linkcategories} WHERE cat_name='$cat'");
963	1903	// This should never happen.
964	1904	else :
965	1905	FeedWordPress::critical_bug('FeedWordPress::link_category_id::wp_db_version', $wp_db_version, __LINE__);
		@@ -972,12 +1912,12 @@
972	1912	if (function_exists('wp_insert_term')) :
973	1913	$term = wp_insert_term($cat, 'link_category');
974	1914	$cat_id = $term['term_id'];
975	1915	// WordPress 2.1, 2.2 category API. By the way, why the fuck is this API function only available in a wp-admin module?
976		- elseif (function_exists('wp_insert_category') and !fwp_test_wp_version(FWP_SCHEMA_20, FWP_SCHEMA_21)) :
	1916	+ elseif (function_exists('wp_insert_category')) :
977	1917	$cat_id = wp_insert_category(array('cat_name' => $cat));
978	1918	// WordPress 1.5 and 2.0.x
979		- elseif (fwp_test_wp_version(0, FWP_SCHEMA_21)) :
	1919	+ elseif (!isset($wp_db_version) or $wp_db_version < FWP_SCHEMA_21) :
980	1920	$result = $wpdb->query("
981	1921	INSERT INTO $wpdb->linkcategories
982	1922	SET
983	1923	cat_id = 0,
		@@ -1087,23 +2027,8 @@
1087	2027	endswitch;
1088	2028	echo "<p>Upgrade complete. FeedWordPress is now ready to use again.</p>";
1089	2029	} /* FeedWordPress::upgrade_database() */
1090	2030
1091		- function create_guid_index () {
1092		- global $wpdb;
1093		-
1094		- $wpdb->query("
1095		- CREATE INDEX {$wpdb->posts}_guid_idx ON {$wpdb->posts}(guid)
1096		- ");
1097		- } /* FeedWordPress::create_guid_index () */
1098		-
1099		- function magpie_version () {
1100		- if (!defined('MAGPIE_VERSION')) : $magpie_version = $GLOBALS['wp_version'].'-default';
1101		- else : $magpie_version = MAGPIE_VERSION;
1102		- endif;
1103		- return $magpie_version;
1104		- }
1105		-
1106	2031	# Utility functions for handling text settings
1107	2032	function negative ($f, $setting) {
1108	2033	$nego = array ('n', 'no', 'f', 'false');
1109	2034	return (isset($f[$setting]) and in_array(strtolower($f[$setting]), $nego));
		@@ -1118,29 +2043,18 @@
1118	2043	# Internal debugging functions
1119	2044	function critical_bug ($varname, $var, $line) {
1120	2045	global $wp_version;
1121	2046
1122		- if (defined('MAGPIE_VERSION')) : $mv = MAGPIE_VERSION;
1123		- else : $mv = 'WordPress '.$wp_version.' default.';
1124		- endif;
1125		-
1126	2047	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>';
1127	2048	echo "\n<plaintext>";
1128	2049	echo "Triggered at line # ".$line."\n";
1129	2050	echo "FeedWordPress version: ".FEEDWORDPRESS_VERSION."\n";
1130		- echo "MagpieRSS version: {$mv}\n";
1131		- echo "WordPress version: {$wp_version}\n";
	2051	+ echo "WordPress version: $wp_version\n";
1132	2052	echo "PHP version: ".phpversion()."\n";
1133	2053	echo "\n";
1134	2054	echo $varname.": "; var_dump($var); echo "\n";
1135	2055	die;
1136	2056	}
1137		-
1138		- function noncritical_bug ($varname, $var, $line) {
1139		- if (FEEDWORDPRESS_DEBUG) : // halt only when we are doing debugging
1140		- FeedWordPress::critical_bug($varname, $var, $line);
1141		- endif;
1142		- }
1143	2057	} // class FeedWordPress
1144	2058
1145	2059	class SyndicatedPost {
1146	2060	var $item = null;
		@@ -1149,12 +2063,18 @@
1149	2063	var $feed = null;
1150	2064	var $feedmeta = null;
1151	2065
1152	2066	var $post = array ();
	2067	+ var $_base = null;
1153	2068
1154	2069	var $_freshness = null;
1155	2070	var $_wp_id = null;
1156	2071
	2072	+ var $strip_attrs = array (
	2073	+ array('[a-z]+', 'style'),
	2074	+ array('[a-z]+', 'target'),
	2075	+ );
	2076	+
1157	2077	function SyndicatedPost ($item, $link) {
1158	2078	global $wpdb;
1159	2079
1160	2080	$this->link = $link;
		@@ -1185,20 +2105,18 @@
1185	2105	# That's deliberate. The escaping is done at the point
1186	2106	# of insertion, not here, to avoid double-escaping and
1187	2107	# to avoid screwing with syndicated_post filters
1188	2108
1189		- $this->post['post_title'] = apply_filters('syndicated_item_title', $this->item['title'], $this);
	2109	+ $this->post['post_title'] = $this->item['title'];
1190	2110
1191		- // This just gives us an alphanumeric representation of
	2111	+ // This just gives usan alphanumeric representation of
1192	2112	// the author. We will look up (or create) the numeric
1193	2113	// ID for the author in SyndicatedPost::add()
1194		- $this->post['named']['author'] = apply_filters('syndicated_item_author', $this->author(), $this);
	2114	+ $this->post['named']['author'] = $this->author();
1195	2115
1196	2116	# Identify content and sanitize it.
1197	2117	# ---------------------------------
1198		- if (isset($this->item['atom_content'])) :
1199		- $content = $this->item['atom_content'];
1200		- elseif (isset($this->item['xhtml']['body'])) :
	2118	+ if (isset($this->item['xhtml']['body'])) :
1201	2119	$content = $this->item['xhtml']['body'];
1202	2120	elseif (isset($this->item['xhtml']['div'])) :
1203	2121	$content = $this->item['xhtml']['div'];
1204	2122	elseif (isset($this->item['content']['encoded']) and $this->item['content']['encoded']):
		@@ -1205,9 +2123,24 @@
1205	2123	$content = $this->item['content']['encoded'];
1206	2124	else:
1207	2125	$content = $this->item['description'];
1208	2126	endif;
1209		- $this->post['post_content'] = apply_filters('syndicated_item_content', $content, $this);
	2127	+
	2128	+ # FeedWordPress used to resolve URIs relative to the
	2129	+ # feed URI. It now relies on the xml:base support
	2130	+ # baked in to the MagpieRSS upgrade. So all we do here
	2131	+ # now is to sanitize problematic attributes.
	2132	+ #
	2133	+ # This kind of sucks. I intend to replace it with
	2134	+ # lib_filter sometime soon.
	2135	+ foreach ($this->strip_attrs as $pair):
	2136	+ list($tag,$attr) = $pair;
	2137	+ $content = preg_replace (
	2138	+ ":(<$tag [^>])($attr=(\"[^\">]\"\|[^>\\s]+))([^>]*>):i",
	2139	+ "\\1\\4",
	2140	+ $content
	2141	+ );
	2142	+ endforeach;
1210	2143
1211	2144	# Identify and sanitize excerpt
1212	2145	$excerpt = NULL;
1213	2146	if ( isset($this->item['description']) and $this->item['description'] ) :
		@@ -1217,10 +2150,11 @@
1217	2150	if (strlen($excerpt) > 255) :
1218	2151	$excerpt = substr($excerpt,0,252).'...';
1219	2152	endif;
1220	2153	endif;
1221		- $excerpt = apply_filters('syndicated_item_excerpt', $excerpt, $this);
1222	2154
	2155	+ $this->post['post_content'] = $content;
	2156	+
1223	2157	if (!is_null($excerpt)):
1224	2158	$this->post['post_excerpt'] = $excerpt;
1225	2159	endif;
1226	2160
		@@ -1228,11 +2162,11 @@
1228	2162	if (!$this->use_api('wp_insert_post')) :
1229	2163	$this->post['post_name'] = sanitize_title($this->post['post_title']);
1230	2164	endif;
1231	2165
1232		- $this->post['epoch']['issued'] = apply_filters('syndicated_item_published', $this->published(), $this);
1233		- $this->post['epoch']['created'] = apply_filters('syndicated_item_created', $this->created(), $this);
1234		- $this->post['epoch']['modified'] = apply_filters('syndicated_item_updated', $this->updated(), $this);
	2166	+ $this->post['epoch']['issued'] = $this->published();
	2167	+ $this->post['epoch']['created'] = $this->created();
	2168	+ $this->post['epoch']['modified'] = $this->updated();
1235	2169
1236	2170	// Dealing with timestamps in WordPress is so fucking fucked.
1237	2171	$offset = (int) get_option('gmt_offset') * 60 * 60;
1238	2172	$this->post['post_date'] = gmdate('Y-m-d H:i:s', $this->published() + $offset);
		@@ -1245,67 +2179,35 @@
1245	2179	$this->post['comment_status'] = $this->link->syndicated_status('comment', 'closed');
1246	2180	$this->post['ping_status'] = $this->link->syndicated_status('ping', 'closed');
1247	2181
1248	2182	// Unique ID (hopefully a unique tag: URI); failing that, the permalink
1249		- $this->post['guid'] = apply_filters('syndicated_item_guid', $this->guid(), $this);
	2183	+ $this->post['guid'] = $this->guid();
1250	2184
1251		- // User-supplied custom settings to apply to each post. Do first so that FWP-generated custom settings will overwrite if necessary; thus preventing any munging
1252		- $default_custom_settings = get_option('feedwordpress_custom_settings');
1253		- if ($default_custom_settings) :
1254		- $default_custom_settings = unserialize($default_custom_settings);
1255		- endif;
1256		- if (!is_array($default_custom_settings)) :
1257		- $default_custom_settings = array();
1258		- endif;
1259		-
1260		- $custom_settings = $this->link->settings['postmeta'];
1261		- if ($custom_settings) :
1262		- $custom_settings = unserialize($custom_settings);
1263		- endif;
1264		- if (!is_array($custom_settings)) :
1265		- $custom_settings = array();
1266		- endif;
1267		- $this->post['meta'] = array_merge($default_custom_settings, $custom_settings);
1268		-
1269	2185	// RSS 2.0 / Atom 1.0 enclosure support
1270	2186	if ( isset($this->item['enclosure#']) ) :
1271	2187	for ($i = 1; $i <= $this->item['enclosure#']; $i++) :
1272	2188	$eid = (($i > 1) ? "#{$id}" : "");
1273	2189	$this->post['meta']['enclosure'][] =
1274		- apply_filters('syndicated_item_enclosure_url', $this->item["enclosure{$eid}@url"], $this)."\n".
1275		- apply_filters('syndicated_item_enclosure_length', $this->item["enclosure{$eid}@length"], $this)."\n".
1276		- apply_filters('syndicated_item_enclosure_type', $this->item["enclosure{$eid}@type"], $this);
	2190	+ $this->item["enclosure{$eid}@url"]."\n".
	2191	+ $this->item["enclosure{$eid}@length"]."\n".
	2192	+ $this->item["enclosure{$eid}@type"];
1277	2193	endfor;
1278	2194	endif;
1279	2195
1280	2196	// In case you want to point back to the blog this was syndicated from
1281	2197	if (isset($this->feed->channel['title'])) :
1282		- $this->post['meta']['syndication_source'] = apply_filters('syndicated_item_source_title', $this->feed->channel['title'], $this);
	2198	+ $this->post['meta']['syndication_source'] = $this->feed->channel['title'];
1283	2199	endif;
1284		-
1285	2200	if (isset($this->feed->channel['link'])) :
1286		- $this->post['meta']['syndication_source_uri'] = apply_filters('syndicated_item_source_link', $this->feed->channel['link'], $this);
	2201	+ $this->post['meta']['syndication_source_uri'] = $this->feed->channel['link'];
1287	2202	endif;
1288	2203
1289		- // Make use of atom:source data, if present in an aggregated feed
1290		- if (isset($this->item['source_title'])) :
1291		- $this->post['meta']['syndication_source_original'] = $this->item['source_title'];
1292		- endif;
1293		-
1294		- if (isset($this->item['source_link'])) :
1295		- $this->post['meta']['syndication_source_uri_original'] = $this->item['source_link'];
1296		- endif;
1297		-
1298		- if (isset($this->item['source_id'])) :
1299		- $this->post['meta']['syndication_source_id_original'] = $this->item['source_id'];
1300		- endif;
1301		-
1302	2204	// Store information on human-readable and machine-readable comment URIs
1303	2205	if (isset($this->item['comments'])) :
1304		- $this->post['meta']['rss:comments'] = apply_filters('syndicated_item_comments', $this->item['comments']);
	2206	+ $this->post['meta']['rss:comments'] = $this->item['comments'];
1305	2207	endif;
1306	2208	if (isset($this->item['wfw']['commentrss'])) :
1307		- $this->post['meta']['wfw:commentRSS'] = apply_filters('syndicated_item_commentrss', $this->item['wfw']['commentrss']);
	2209	+ $this->post['meta']['wfw:commentRSS'] = $this->item['wfw']['commentrss'];
1308	2210	endif;
1309	2211
1310	2212	// Store information to identify the feed that this came from
1311	2213	$this->post['meta']['syndication_feed'] = $this->feedmeta['link/uri'];
		@@ -1310,21 +2212,14 @@
1310	2212	// Store information to identify the feed that this came from
1311	2213	$this->post['meta']['syndication_feed'] = $this->feedmeta['link/uri'];
1312	2214	$this->post['meta']['syndication_feed_id'] = $this->feedmeta['link/id'];
1313	2215
1314		- if (isset($this->item['source_link_self'])) :
1315		- $this->post['meta']['syndication_feed_original'] = $this->item['source_link_self'];
1316		- endif;
1317		-
1318	2216	// In case you want to know the external permalink...
1319		- $this->post['meta']['syndication_permalink'] = apply_filters('syndicated_item_link', $this->item['link']);
	2217	+ $this->post['meta']['syndication_permalink'] = $this->item['link'];
1320	2218
1321		- // Store a hash of the post content for checking whether something needs to be updated
1322		- $this->post['meta']['syndication_item_hash'] = $this->update_hash();
1323		-
1324	2219	// Feed-by-feed options for author and category creation
1325	2220	$this->post['named']['unfamiliar']['author'] = $this->feedmeta['unfamiliar author'];
1326		- $this->post['named']['unfamiliar']['category'] = $this->feedmeta['unfamiliar category'];
	2221	+ $this->post['named']['unfamiliar']['category'] = $this->feedmeta['unfamiliar categories'];
1327	2222
1328	2223	// Categories: start with default categories, if any
1329	2224	$fc = get_option("feedwordpress_syndication_cats");
1330	2225	if ($fc) :
		@@ -1351,22 +2246,8 @@
1351	2246	$this->post['named']['category'][] = $cat;
1352	2247	endif;
1353	2248	endfor;
1354	2249	endif;
1355		- $this->post['named']['category'] = apply_filters('syndicated_item_categories', $this->post['named']['category'], $this);
1356		-
1357		- // Tags: start with default tags, if any
1358		- $ft = get_option("feedwordpress_syndication_tags");
1359		- if ($ft) :
1360		- $this->post['tags_input'] = explode(FEEDWORDPRESS_CAT_SEPARATOR, $ft);
1361		- else :
1362		- $this->post['tags_input'] = array();
1363		- endif;
1364		-
1365		- if (is_array($this->feedmeta['tags'])) :
1366		- $this->post['tags_input'] = array_merge($this->post['tags_input'], $this->feedmeta['tags']);
1367		- endif;
1368		-
1369	2250	endif;
1370	2251	} // SyndicatedPost::SyndicatedPost()
1371	2252
1372	2253	function filtered () {
		@@ -1387,35 +2268,18 @@
1387	2268	SELECT id, guid, post_modified_gmt
1388	2269	FROM $wpdb->posts WHERE guid='$guid'
1389	2270	");
1390	2271
	2272	+ preg_match('/([0-9]+)-([0-9]+)-([0-9]+) ([0-9]+):([0-9]+):([0-9]+)/', $result->post_modified_gmt, $backref);
	2273	+ $updated = gmmktime($backref[4], $backref[5], $backref[6], $backref[2], $backref[3], $backref[1]);
1391	2274	if (!$result) :
1392	2275	$this->_freshness = 2; // New content
1393		- else:
1394		- $stored_update_hashes = get_post_custom_values('syndication_item_hash', $result->id);
1395		- if (count($stored_update_hashes) > 0) :
1396		- $stored_update_hash = $stored_update_hashes[0];
1397		- $update_hash_changed = ($stored_update_hash != $this->update_hash());
1398		- else :
1399		- $update_hash_changed = false;
1400		- endif;
1401		-
1402		- preg_match('/([0-9]+)-([0-9]+)-([0-9]+) ([0-9]+):([0-9]+):([0-9]+)/', $result->post_modified_gmt, $backref);
1403		-
1404		- $last_rev_ts = gmmktime($backref[4], $backref[5], $backref[6], $backref[2], $backref[3], $backref[1]);
1405		- $updated_ts = $this->updated(/fallback=/ true, /default=/ NULL);
1406		- $updated = ((
1407		- !is_null($updated_ts)
1408		- and ($updated_ts > $last_rev_ts)
1409		- ) or $update_hash_changed);
1410		-
1411		- if ($updated) :
1412		- $this->_freshness = 1; // Updated content
1413		- $this->_wp_id = $result->id;
1414		- else :
1415		- $this->_freshness = 0; // Same old, same old
1416		- $this->_wp_id = $result->id;
1417		- endif;
	2276	+ elseif ($this->updated() > $updated) :
	2277	+ $this->_freshness = 1; // Updated content
	2278	+ $this->_wp_id = $result->id;
	2279	+ else :
	2280	+ $this->_freshness = 0; // Same old, same old
	2281	+ $this->_wp_id = $result->id;
1418	2282	endif;
1419	2283	endif;
1420	2284	return $this->_freshness;
1421	2285	}
		@@ -1451,17 +2315,13 @@
1451	2315	endif;
1452	2316
1453	2317	if (!$this->filtered() and $freshness > 0) :
1454	2318	# -- Look up, or create, numeric ID for categories
1455		- list($pcats, $ptags) = $this->category_ids (
	2319	+ $this->post['post_category'] = $this->category_ids (
1456	2320	$this->post['named']['category'],
1457		- FeedWordPress::on_unfamiliar('category', $this->post['named']['unfamiliar']['category']),
1458		- /tags_too=/ true
	2321	+ FeedWordPress::on_unfamiliar('category', $this->post['named']['unfamiliar']['category'])
1459	2322	);
1460		-
1461		- $this->post['post_category'] = $pcats;
1462		- $this->post['tags_input'] = array_merge($this->post['tags_input'], $ptags);
1463		-
	2323	+
1464	2324	if (is_null($this->post['post_category'])) :
1465	2325	// filter mode on, no matching categories; drop the post
1466	2326	$this->post = NULL;
1467	2327	else :
		@@ -1507,278 +2367,152 @@
1507	2367	} // function SyndicatedPost::store ()
1508	2368
1509	2369	function insert_new () {
1510	2370	global $wpdb, $wp_db_version;
	2371	+
	2372	+ // Why the fuck doesn't wp_insert_post already do this?
	2373	+ foreach ($this->post as $key => $value) :
	2374	+ if (is_string($value)) :
	2375	+ $dbpost[$key] = $wpdb->escape($value);
	2376	+ else :
	2377	+ $dbpost[$key] = $value;
	2378	+ endif;
	2379	+ endforeach;
1511	2380
1512		- $dbpost = $this->normalize_post(/new=/ true);
1513		- if (!is_null($dbpost)) :
1514		- if ($this->use_api('wp_insert_post')) :
1515		- $dbpost['post_pingback'] = false; // Tell WP 2.1 and 2.2 not to process for pingbacks
	2381	+ if ($this->use_api('wp_insert_post')) :
	2382	+ $dbpost['post_pingback'] = false; // Tell WP 2.1 and 2.2 not to process for pingbacks
	2383	+ $this->_wp_id = wp_insert_post($dbpost);
	2384	+
	2385	+ // This should never happen.
	2386	+ if (!is_numeric($this->_wp_id) or ($this->_wp_id == 0)) :
	2387	+ FeedWordPress::critical_bug('SyndicatedPost (_wp_id problem)', $this, __LINE__);
	2388	+ endif;
1516	2389
1517		- // This is a ridiculous fucking kludge necessitated by WordPress 2.6 munging authorship meta-data
1518		- add_action('_wp_put_post_revision', array($this, 'fix_revision_meta'));
1519		-
1520		- // Kludge to prevent kses filters from stripping the
1521		- // content of posts when updating without a logged in
1522		- // user who has `unfiltered_html` capability.
1523		- add_filter('content_save_pre', array($this, 'avoid_kses_munge'), 11);
1524		-
1525		- $this->_wp_id = wp_insert_post($dbpost);
1526		-
1527		- // Turn off ridiculous fucking kludges #1 and #2
1528		- remove_action('_wp_put_post_revision', array($this, 'fix_revision_meta'));
1529		- remove_filter('content_save_pre', array($this, 'avoid_kses_munge'), 11);
1530		-
1531		- $this->validate_post_id($dbpost, array(__CLASS__, __FUNCTION__));
1532		-
1533		- // Unfortunately, as of WordPress 2.3, wp_insert_post()
1534		- // still offers no way to use a guid of your choice,
1535		- // and munges your post modified timestamp, too.
1536		- $result = $wpdb->query("
1537		- UPDATE $wpdb->posts
1538		- SET
1539		- guid='{$dbpost['guid']}',
1540		- post_modified='{$dbpost['post_modified']}',
1541		- post_modified_gmt='{$dbpost['post_modified_gmt']}'
1542		- WHERE ID='{$this->_wp_id}'
1543		- ");
1544		- else :
1545		- # The right way to do this is the above. But, alas,
1546		- # in earlier versions of WordPress, wp_insert_post has
1547		- # too much behavior (mainly related to pings) that can't
1548		- # be overridden. In WordPress 1.5, it's enough of a
1549		- # resource hog to make PHP segfault after inserting
1550		- # 50-100 posts. This can get pretty annoying, especially
1551		- # if you are trying to update your feeds for the first
1552		- # time.
1553		-
1554		- $result = $wpdb->query("
1555		- INSERT INTO $wpdb->posts
	2390	+ // Unfortunately, as of WordPress 2.3, wp_insert_post()
	2391	+ // still offers no way to use a guid of your choice,
	2392	+ // and munges your post modified timestamp, too.
	2393	+ $result = $wpdb->query("
	2394	+ UPDATE $wpdb->posts
1556	2395	SET
1557		- guid = '{$dbpost['guid']}',
1558		- post_author = '{$dbpost['post_author']}',
1559		- post_date = '{$dbpost['post_date']}',
1560		- post_date_gmt = '{$dbpost['post_date_gmt']}',
1561		- post_content = '{$dbpost['post_content']}',"
1562		- .(isset($dbpost['post_excerpt']) ? "post_excerpt = '{$dbpost['post_excerpt']}'," : "")."
1563		- post_title = '{$dbpost['post_title']}',
1564		- post_name = '{$dbpost['post_name']}',
1565		- post_modified = '{$dbpost['post_modified']}',
1566		- post_modified_gmt = '{$dbpost['post_modified_gmt']}',
1567		- comment_status = '{$dbpost['comment_status']}',
1568		- ping_status = '{$dbpost['ping_status']}',
1569		- post_status = '{$dbpost['post_status']}'
1570		- ");
1571		- $this->_wp_id = $wpdb->insert_id;
1572		-
1573		- $this->validate_post_id($dbpost, array(__CLASS__, __FUNCTION__));
1574		-
1575		- // WordPress 1.5.x - 2.0.x
1576		- wp_set_post_cats('1', $this->wp_id(), $this->post['post_category']);
1577		-
1578		- // Since we are not going through official channels, we need to
1579		- // manually tell WordPress that we've published a new post.
1580		- // We need to make sure to do this in order for FeedWordPress
1581		- // to play well with the staticize-reloaded plugin (something
1582		- // that a large aggregator website is going to want to be
1583		- // able to use).
1584		- do_action('publish_post', $this->_wp_id);
1585		- endif;
1586		- endif;
1587		- } /* SyndicatedPost::insert_new() */
	2396	+ guid='{$dbpost['guid']}',
	2397	+ post_modified='{$dbpost['post_modified']}',
	2398	+ post_modified_gmt='{$dbpost['post_modified_gmt']}'
	2399	+ WHERE ID='{$this->_wp_id}'
	2400	+ ");
	2401	+ else :
	2402	+ # The right way to do this is the above. But, alas,
	2403	+ # in earlier versions of WordPress, wp_insert_post has
	2404	+ # too much behavior (mainly related to pings) that can't
	2405	+ # be overridden. In WordPress 1.5, it's enough of a
	2406	+ # resource hog to make PHP segfault after inserting
	2407	+ # 50-100 posts. This can get pretty annoying, especially
	2408	+ # if you are trying to update your feeds for the first
	2409	+ # time.
1588	2410
1589		- function update_existing () {
1590		- global $wpdb;
	2411	+ $result = $wpdb->query("
	2412	+ INSERT INTO $wpdb->posts
	2413	+ SET
	2414	+ guid = '{$dbpost['guid']}',
	2415	+ post_author = '{$dbpost['post_author']}',
	2416	+ post_date = '{$dbpost['post_date']}',
	2417	+ post_date_gmt = '{$dbpost['post_date_gmt']}',
	2418	+ post_content = '{$dbpost['post_content']}',"
	2419	+ .(isset($dbpost['post_excerpt']) ? "post_excerpt = '{$dbpost['post_excerpt']}'," : "")."
	2420	+ post_title = '{$dbpost['post_title']}',
	2421	+ post_name = '{$dbpost['post_name']}',
	2422	+ post_modified = '{$dbpost['post_modified']}',
	2423	+ post_modified_gmt = '{$dbpost['post_modified_gmt']}',
	2424	+ comment_status = '{$dbpost['comment_status']}',
	2425	+ ping_status = '{$dbpost['ping_status']}',
	2426	+ post_status = '{$dbpost['post_status']}'
	2427	+ ");
	2428	+ $this->_wp_id = $wpdb->insert_id;
1591	2429
1592		- // Why the fuck doesn't wp_insert_post already do this?
1593		- $dbpost = $this->normalize_post(/new=/ false);
1594		- if (!is_null($dbpost)) :
1595		- if ($this->use_api('wp_insert_post')) :
1596		- $dbpost['post_pingback'] = false; // Tell WP 2.1 and 2.2 not to process for pingbacks
1597		-
1598		- // This is a ridiculous fucking kludge necessitated by WordPress 2.6 munging authorship meta-data
1599		- add_action('_wp_put_post_revision', array($this, 'fix_revision_meta'));
1600		-
1601		- // Kludge to prevent kses filters from stripping the
1602		- // content of posts when updating without a logged in
1603		- // user who has `unfiltered_html` capability.
1604		- add_filter('content_save_pre', array($this, 'avoid_kses_munge'), 11);
	2430	+ // This should never happen.
	2431	+ if (!is_numeric($this->_wp_id) or ($this->_wp_id == 0)) :
	2432	+ FeedWordPress::critical_bug('SyndicatedPost::_wp_id', $this->_wp_id, __LINE__);
	2433	+ endif;
1605	2434
1606		- // Don't munge status fields that the user may have reset manually
1607		- if (function_exists('get_post_field')) :
1608		- $doNotMunge = array('post_status', 'comment_status', 'ping_status');
1609		- foreach ($doNotMunge as $field) :
1610		- $dbpost[$field] = get_post_field($field, $this->wp_id());
1611		- endforeach;
1612		- endif;
1613		-
1614		- $this->_wp_id = wp_insert_post($dbpost);
	2435	+ // WordPress 1.5.x - 2.0.x
	2436	+ wp_set_post_cats('1', $this->wp_id(), $this->post['post_category']);
1615	2437
1616		- // Turn off ridiculous fucking kludges #1 and #2
1617		- remove_action('_wp_put_post_revision', array($this, 'fix_revision_meta'));
1618		- remove_filter('content_save_pre', array($this, 'avoid_kses_munge'), 11);
1619		-
1620		- $this->validate_post_id($dbpost, array(__CLASS__, __FUNCTION__));
1621		-
1622		- // Unfortunately, as of WordPress 2.3, wp_insert_post()
1623		- // munges your post modified timestamp.
1624		- $result = $wpdb->query("
1625		- UPDATE $wpdb->posts
1626		- SET
1627		- post_modified='{$dbpost['post_modified']}',
1628		- post_modified_gmt='{$dbpost['post_modified_gmt']}'
1629		- WHERE ID='{$this->_wp_id}'
1630		- ");
1631		- else :
1632		-
1633		- $result = $wpdb->query("
1634		- UPDATE $wpdb->posts
1635		- SET
1636		- post_author = '{$dbpost['post_author']}',
1637		- post_content = '{$dbpost['post_content']}',"
1638		- .(isset($dbpost['post_excerpt']) ? "post_excerpt = '{$dbpost['post_excerpt']}'," : "")."
1639		- post_title = '{$dbpost['post_title']}',
1640		- post_name = '{$dbpost['post_name']}',
1641		- post_modified = '{$dbpost['post_modified']}',
1642		- post_modified_gmt = '{$dbpost['post_modified_gmt']}'
1643		- WHERE guid='{$dbpost['guid']}'
1644		- ");
1645		-
1646		- // WordPress 2.1.x and up
1647		- if (function_exists('wp_set_post_categories')) :
1648		- wp_set_post_categories($this->wp_id(), $this->post['post_category']);
1649		- // WordPress 1.5.x - 2.0.x
1650		- elseif (function_exists('wp_set_post_cats')) :
1651		- wp_set_post_cats('1', $this->wp_id(), $this->post['post_category']);
1652		- // This should never happen.
1653		- else :
1654		- FeedWordPress::critical_bug(__CLASS__.'::'.__FUNCTION.'(): no post categorizing function', array("dbpost" => $dbpost, "this" => $this), __LINE__);
1655		- endif;
1656		-
1657		- // Since we are not going through official channels, we need to
1658		- // manually tell WordPress that we've published a new post.
1659		- // We need to make sure to do this in order for FeedWordPress
1660		- // to play well with the staticize-reloaded plugin (something
1661		- // that a large aggregator website is going to want to be
1662		- // able to use).
1663		- do_action('edit_post', $this->post['ID']);
1664		- endif;
	2438	+ // Since we are not going through official channels, we need to
	2439	+ // manually tell WordPress that we've published a new post.
	2440	+ // We need to make sure to do this in order for FeedWordPress
	2441	+ // to play well with the staticize-reloaded plugin (something
	2442	+ // that a large aggregator website is going to want to be
	2443	+ // able to use).
	2444	+ do_action('publish_post', $this->_wp_id);
1665	2445	endif;
1666		- } /* SyndicatedPost::update_existing() */
	2446	+ } /* SyndicatedPost::insert_new() */
1667	2447
1668		- /**
1669		- * SyndicatedPost::normalize_post()
1670		- *
1671		- * @param bool $new If true, this post is to be inserted anew. If false, it is an update of an existing post.
1672		- * @return array A normalized representation of the post ready to be inserted into the database or sent to the WordPress API functions
1673		- */
1674		- function normalize_post ($new = true) {
	2448	+ function update_existing () {
1675	2449	global $wpdb;
1676	2450
1677		- $out = array();
1678		-
1679	2451	// Why the fuck doesn't wp_insert_post already do this?
	2452	+ $dbpost = array();
1680	2453	foreach ($this->post as $key => $value) :
1681	2454	if (is_string($value)) :
1682		- $out[$key] = $wpdb->escape($value);
	2455	+ $dbpost[$key] = $wpdb->escape($value);
1683	2456	else :
1684		- $out[$key] = $value;
	2457	+ $dbpost[$key] = $value;
1685	2458	endif;
1686	2459	endforeach;
1687	2460
1688		- if (strlen($out['post_title'].$out['post_content'].$out['post_excerpt']) == 0) :
1689		- // FIXME: Option for filtering out empty posts
1690		- endif;
1691		- if (strlen($out['post_title'])==0) :
1692		- $offset = (int) get_option('gmt_offset') * 60 * 60;
1693		- $out['post_title'] =
1694		- $this->post['meta']['syndication_source']
1695		- .' '.gmdate('Y-m-d H:i:s', $this->published() + $offset);
1696		- // FIXME: Option for what to fill a blank title with...
1697		- endif;
	2461	+ if ($this->use_api('wp_insert_post')) :
	2462	+ $dbpost['post_pingback'] = false; // Tell WP 2.1 and 2.2 not to process for pingbacks
	2463	+ $this->_wp_id = wp_insert_post($dbpost);
1698	2464
1699		- return $out;
1700		- }
	2465	+ // This should never happen.
	2466	+ if (!is_numeric($this->_wp_id) or ($this->_wp_id == 0)) :
	2467	+ FeedWordPress::critical_bug('SyndicatedPost::_wp_id', $this->_wp_id, __LINE__);
	2468	+ endif;
1701	2469
1702		- /**
1703		- * SyndicatedPost::validate_post_id()
1704		- *
1705		- * @param array $dbpost An array representing the post we attempted to insert or update
1706		- * @param mixed $ns A string or array representing the namespace (class, method) whence this method was called.
1707		- */
1708		- function validate_post_id ($dbpost, $ns) {
1709		- if (is_array($ns)) : $ns = implode('::', $ns);
1710		- else : $ns = (string) $ns; endif;
1711		-
1712		- // This should never happen.
1713		- if (!is_numeric($this->_wp_id) or ($this->_wp_id == 0)) :
1714		- FeedWordPress::critical_bug(
1715		- /name=/ $ns.'::_wp_id',
1716		- /var =/ array(
1717		- "\$this->_wp_id" => $this->_wp_id,
1718		- "\$dbpost" => $dbpost,
1719		- "\$this" => $this
1720		- ),
1721		- /line # =/ __LINE__
1722		- );
	2470	+ // Unfortunately, as of WordPress 2.3, wp_insert_post()
	2471	+ // munges your post modified timestamp.
	2472	+ $result = $wpdb->query("
	2473	+ UPDATE $wpdb->posts
	2474	+ SET
	2475	+ post_modified='{$dbpost['post_modified']}',
	2476	+ post_modified_gmt='{$dbpost['post_modified_gmt']}'
	2477	+ WHERE ID='{$this->_wp_id}'
	2478	+ ");
	2479	+ else :
	2480	+
	2481	+ $result = $wpdb->query("
	2482	+ UPDATE $wpdb->posts
	2483	+ SET
	2484	+ post_author = '{$dbpost['post_author']}',
	2485	+ post_content = '{$dbpost['post_content']}',"
	2486	+ .(isset($dbpost['post_excerpt']) ? "post_excerpt = '{$dbpost['post_excerpt']}'," : "")."
	2487	+ post_title = '{$dbpost['post_title']}',
	2488	+ post_name = '{$dbpost['post_name']}',
	2489	+ post_modified = '{$dbpost['post_modified']}',
	2490	+ post_modified_gmt = '{$dbpost['post_modified_gmt']}'
	2491	+ WHERE guid='{$dbpost['guid']}'
	2492	+ ");
	2493	+
	2494	+ // WordPress 2.1.x and up
	2495	+ if (function_exists('wp_set_post_categories')) :
	2496	+ wp_set_post_categories($this->wp_id(), $this->post['post_category']);
	2497	+ // WordPress 1.5.x - 2.0.x
	2498	+ elseif (function_exists('wp_set_post_cats')) :
	2499	+ wp_set_post_cats('1', $this->wp_id(), $this->post['post_category']);
	2500	+ // This should never happen.
	2501	+ else :
	2502	+ FeedWordPress::critical_bug('SyndicatedPost::insert_new::wp_version', $GLOBALS['wp_version'], __LINE__);
	2503	+ endif;
	2504	+
	2505	+ // Since we are not going through official channels, we need to
	2506	+ // manually tell WordPress that we've published a new post.
	2507	+ // We need to make sure to do this in order for FeedWordPress
	2508	+ // to play well with the staticize-reloaded plugin (something
	2509	+ // that a large aggregator website is going to want to be
	2510	+ // able to use).
	2511	+ do_action('edit_post', $this->post['ID']);
1723	2512	endif;
1724		- } /* SyndicatedPost::validate_post_id() */
1725		-
1726		- /**
1727		- * SyndicatedPost::fix_revision_meta() - Fixes the way WP 2.6+ fucks up
1728		- * meta-data (authorship, etc.) when storing revisions of an updated
1729		- * syndicated post.
1730		- *
1731		- * In their infinite wisdom, the WordPress coders have made it completely
1732		- * impossible for a plugin that uses wp_insert_post() to set certain
1733		- * meta-data (such as the author) when you store an old revision of an
1734		- * updated post. Instead, it uses the WordPress defaults (= currently
1735		- * active user ID if the process is running with a user logged in, or
1736		- * = #0 if there is no user logged in). This results in bogus authorship
1737		- * data for revisions that are syndicated from off the feed, unless we
1738		- * use a ridiculous kludge like this to end-run the munging of meta-data
1739		- * by _wp_put_post_revision.
1740		- *
1741		- * @param int $revision_id The revision ID to fix up meta-data
1742		- */
1743		- function fix_revision_meta ($revision_id) {
1744		- global $wpdb;
1745		-
1746		- $post_author = (int) $this->post['post_author'];
1747		-
1748		- $revision_id = (int) $revision_id;
1749		- $wpdb->query("
1750		- UPDATE $wpdb->posts
1751		- SET post_author={$this->post['post_author']}
1752		- WHERE post_type = 'revision' AND ID='$revision_id'
1753		- ");
1754		- } /* SyndicatedPost::fix_revision_meta () */
	2513	+ } /* SyndicatedPost::update_existing() */
1755	2514
1756		- /**
1757		- * SyndicatedPost::avoid_kses_munge() -- If FeedWordPress is processing
1758		- * an automatic update, that generally means that wp_insert_post() is
1759		- * being called under the user credentials of whoever is viewing the
1760		- * blog at the time -- usually meaning no user at all. But if WordPress
1761		- * gets a wp_insert_post() when current_user_can('unfiltered_html') is
1762		- * false, it will run the content of the post through a kses function
1763		- * that strips out lots of HTML tags -- notably <object> and some others.
1764		- * This causes problems for syndicating (for example) feeds that contain
1765		- * YouTube videos. It also produces an unexpected asymmetry between
1766		- * automatically-initiated updates and updates initiated manually from
1767		- * the WordPress Dashboard (which are usually initiated under the
1768		- * credentials of a logged-in admin, and so don't get run through the
1769		- * kses function). So, to avoid the whole mess, what we do here is
1770		- * just forcibly disable the kses munging for a single syndicated post,
1771		- * by restoring the contents of the `post_content` field.
1772		- *
1773		- * @param string $content The content of the post, after other filters have gotten to it
1774		- * @return string The original content of the post, before other filters had a chance to munge it.
1775		- */
1776		- function avoid_kses_munge ($content) {
1777		- global $wpdb;
1778		- return $wpdb->escape($this->post['post_content']);
1779		- }
1780		-
1781	2515	// SyndicatedPost::add_rss_meta: adds interesting meta-data to each entry
1782	2516	// using the space for custom keys. The set of keys and values to add is
1783	2517	// specified by the keys and values of $post['meta']. This is used to
1784	2518	// store anything that the WordPress user might want to access from a
		@@ -1830,9 +2564,9 @@
1830	2564
1831	2565	// SyndicatedPost::author_id (): get the ID for an author name from
1832	2566	// the feed. Create the author if necessary.
1833	2567	function author_id ($unfamiliar_author = 'create') {
1834		- global $wpdb;
	2568	+ global $wpdb, $wp_db_version; // test for WordPress 2.0 database schema
1835	2569
1836	2570	$a = $this->author();
1837	2571	$author = $a['name'];
1838	2572	$email = $a['email'];
		@@ -1837,15 +2571,8 @@
1837	2571	$author = $a['name'];
1838	2572	$email = $a['email'];
1839	2573	$url = $a['uri'];
1840	2574
1841		- $match_author_by_email = !('yes' == get_option("feedwordpress_do_not_match_author_by_email"));
1842		- if ($match_author_by_email and !FeedWordPress::is_null_email($email)) :
1843		- $test_email = $email;
1844		- else :
1845		- $test_email = NULL;
1846		- endif;
1847		-
1848	2575	// Never can be too careful...
1849	2576	$login = sanitize_user($author, /strict=/ true);
1850	2577	$login = apply_filters('pre_user_login', $login);
1851	2578
		@@ -1854,9 +2581,8 @@
1854	2581
1855	2582	$reg_author = $wpdb->escape(preg_quote($author));
1856	2583	$author = $wpdb->escape($author);
1857	2584	$email = $wpdb->escape($email);
1858		- $test_email = $wpdb->escape($test_email);
1859	2585	$url = $wpdb->escape($url);
1860	2586
1861	2587	// Check for an existing author rule....
1862	2588	if (isset($this->link->settings['map authors']['name'][strtolower(trim($author))])) :
		@@ -1875,10 +2601,34 @@
1875	2601
1876	2602	else :
1877	2603	// Check the database for an existing author record that might fit
1878	2604
	2605	+ #-- WordPress 1.5.x
	2606	+ if (!isset($wp_db_version)) :
	2607	+ $id = $wpdb->get_var(
	2608	+ "SELECT ID from $wpdb->users
	2609	+ WHERE
	2610	+ TRIM(LCASE(user_login)) = TRIM(LCASE('$login')) OR
	2611	+ (
	2612	+ LENGTH(TRIM(LCASE(user_email))) > 0
	2613	+ AND TRIM(LCASE(user_email)) = TRIM(LCASE('$email'))
	2614	+ ) OR
	2615	+ TRIM(LCASE(user_firstname)) = TRIM(LCASE('$author')) OR
	2616	+ TRIM(LCASE(user_nickname)) = TRIM(LCASE('$author')) OR
	2617	+ TRIM(LCASE(user_nicename)) = TRIM(LCASE('$nice_author')) OR
	2618	+ TRIM(LCASE(user_description)) = TRIM(LCASE('$author')) OR
	2619	+ (
	2620	+ LOWER(user_description)
	2621	+ RLIKE CONCAT(
	2622	+ '(^\|\\n)a\\.?k\\.?a\\.?( \|\\t):?( \|\\t)',
	2623	+ LCASE('$reg_author'),
	2624	+ '( \|\\t\|\\r)*(\\n\|\$)'
	2625	+ )
	2626	+ )
	2627	+ ");
	2628	+
1879	2629	#-- WordPress 2.0+
1880		- if (fwp_test_wp_version(FWP_SCHEMA_HAS_USERMETA)) :
	2630	+ elseif ($wp_db_version >= 2966) :
1881	2631
1882	2632	// First try the user core data table.
1883	2633	$id = $wpdb->get_var(
1884	2634	"SELECT ID FROM $wpdb->users
		@@ -1885,9 +2635,9 @@
1885	2635	WHERE
1886	2636	TRIM(LCASE(user_login)) = TRIM(LCASE('$login'))
1887	2637	OR (
1888	2638	LENGTH(TRIM(LCASE(user_email))) > 0
1889		- AND TRIM(LCASE(user_email)) = TRIM(LCASE('$test_email'))
	2639	+ AND TRIM(LCASE(user_email)) = TRIM(LCASE('$email'))
1890	2640	)
1891	2641	OR TRIM(LCASE(user_nicename)) = TRIM(LCASE('$nice_author'))
1892	2642	");
1893	2643
		@@ -1907,33 +2657,8 @@
1907	2657	)
1908	2658	)
1909	2659	");
1910	2660	endif;
1911		-
1912		- #-- WordPress 1.5.x
1913		- else :
1914		- $id = $wpdb->get_var(
1915		- "SELECT ID from $wpdb->users
1916		- WHERE
1917		- TRIM(LCASE(user_login)) = TRIM(LCASE('$login')) OR
1918		- (
1919		- LENGTH(TRIM(LCASE(user_email))) > 0
1920		- AND TRIM(LCASE(user_email)) = TRIM(LCASE('$test_email'))
1921		- ) OR
1922		- TRIM(LCASE(user_firstname)) = TRIM(LCASE('$author')) OR
1923		- TRIM(LCASE(user_nickname)) = TRIM(LCASE('$author')) OR
1924		- TRIM(LCASE(user_nicename)) = TRIM(LCASE('$nice_author')) OR
1925		- TRIM(LCASE(user_description)) = TRIM(LCASE('$author')) OR
1926		- (
1927		- LOWER(user_description)
1928		- RLIKE CONCAT(
1929		- '(^\|\\n)a\\.?k\\.?a\\.?( \|\\t):?( \|\\t)',
1930		- LCASE('$reg_author'),
1931		- '( \|\\t\|\\r)*(\\n\|\$)'
1932		- )
1933		- )
1934		- ");
1935		-
1936	2661	endif;
1937	2662
1938	2663	// ... if you don't find one, then do what you need to do
1939	2664	if (is_null($id)) :
		@@ -1964,9 +2689,9 @@
1964	2689	return $id;
1965	2690	} // function SyndicatedPost::author_id ()
1966	2691
1967	2692	// look up (and create) category ids from a list of categories
1968		- function category_ids ($cats, $unfamiliar_category = 'create', $tags_too = false) {
	2693	+ function category_ids ($cats, $unfamiliar_category = 'create') {
1969	2694	global $wpdb;
1970	2695
1971	2696	// We need to normalize whitespace because (1) trailing
1972	2697	// whitespace can cause PHP and MySQL not to see eye to eye on
		@@ -1975,10 +2700,8 @@
1975	2700	// because I doubt most people want to make a semantic
1976	2701	// distinction between 'Computers' and 'Computers '
1977	2702	$cats = array_map('trim', $cats);
1978	2703
1979		- $tags = array();
1980		-
1981	2704	$cat_ids = array ();
1982	2705	foreach ($cats as $cat_name) :
1983	2706	if (preg_match('/^{#([0-9]+)}$/', $cat_name, $backref)) :
1984	2707	$cat_id = (int) $backref[1];
		@@ -1986,9 +2709,9 @@
1986	2709	$cat_ids[] = $cat_id;
1987	2710	elseif (get_category($cat_id)) :
1988	2711	$cat_ids[] = $cat_id;
1989	2712	endif;
1990		- elseif (strlen($cat_name) > 0) :
	2713	+ else :
1991	2714	$esc = $wpdb->escape($cat_name);
1992	2715	$resc = $wpdb->escape(preg_quote($cat_name));
1993	2716
1994	2717	// WordPress 2.3+
		@@ -2006,17 +2729,11 @@
2006	2729	)) :
2007	2730	foreach ($results AS $term) :
2008	2731	$cat_ids[] = (int) $term->term_id;
2009	2732	endforeach;
2010		- elseif ('tag'==$unfamiliar_category) :
2011		- $tags[] = $cat_name;
2012	2733	elseif ('create'===$unfamiliar_category) :
2013	2734	$term = wp_insert_term($cat_name, 'category');
2014		- if (is_wp_error($term)) :
2015		- FeedWordPress::noncritical_bug('term insertion problem', array('cat_name' => $cat_name, 'term' => $term, 'this' => $this), __LINE__);
2016		- else :
2017		- $cat_ids[] = $term['term_id'];
2018		- endif;
	2735	+ $cat_ids[] = $term['term_id'];
2019	2736	endif;
2020	2737
2021	2738	// WordPress 1.5.x - 2.2.x
2022	2739	else :
		@@ -2057,28 +2774,18 @@
2057	2774	$cat_ids = NULL; // Drop the post
2058	2775	else :
2059	2776	$cat_ids = array_unique($cat_ids);
2060	2777	endif;
2061		-
2062		- if ($tags_too) : $ret = array($cat_ids, $tags);
2063		- else : $ret = $cat_ids;
2064		- endif;
2065		-
2066		- return $ret;
	2778	+ return $cat_ids;
2067	2779	} // function SyndicatedPost::category_ids ()
2068	2780
2069	2781	function use_api ($tag) {
2070	2782	global $wp_db_version;
2071		- switch ($tag) :
2072		- case 'wp_insert_post':
	2783	+ if ('wp_insert_post'==$tag) :
2073	2784	// Before 2.2, wp_insert_post does too much of the wrong stuff to use it
2074	2785	// In 1.5 it was such a resource hog it would make PHP segfault on big updates
2075	2786	$ret = (isset($wp_db_version) and $wp_db_version > FWP_SCHEMA_21);
2076		- break;
2077		- case 'post_status_pending':
2078		- $ret = (isset($wp_db_version) and $wp_db_version > FWP_SCHEMA_23);
2079		- break;
2080		- endswitch;
	2787	+ endif;
2081	2788	return $ret;
2082	2789	} // function SyndicatedPost::use_api ()
2083	2790
2084	2791	#### EXTRACT DATA FROM FEED ITEM ####
		@@ -2116,18 +2823,14 @@
2116	2823	endif;
2117	2824
2118	2825	# If everything failed, then default to the current time.
2119	2826	if (is_null($epoch)) :
2120		- if (-1 == $default) :
2121		- $epoch = time();
2122		- else :
2123		- $epoch = $default;
2124		- endif;
	2827	+ $epoch = time();
2125	2828	endif;
2126	2829
2127	2830	return $epoch;
2128	2831	}
2129		- function updated ($fallback = true, $default = -1) {
	2832	+ function updated ($fallback = true) {
2130	2833	$epoch = null;
2131	2834
2132	2835	# As far as I know, only dcterms and Atom have reliable ways to
2133	2836	# specify when something was modified last. If neither is
		@@ -2140,27 +2843,19 @@
2140	2843	$epoch = @parse_w3cdtf($this->item['modified']);
2141	2844	elseif (isset($this->item['updated'])): // Atom 1.0
2142	2845	$epoch = @parse_w3cdtf($this->item['updated']);
2143	2846	elseif ($fallback) : // Fall back to issued / dc:date
2144		- $epoch = $this->published(/fallback=/ false, /default=/ $default);
	2847	+ $epoch = $this->published(/fallback=/ false);
2145	2848	endif;
2146	2849
2147	2850	# If everything failed, then default to the current time.
2148	2851	if (is_null($epoch)) :
2149		- if (-1 == $default) :
2150		- $epoch = time();
2151		- else :
2152		- $epoch = $default;
2153		- endif;
	2852	+ $epoch = time();
2154	2853	endif;
2155	2854
2156	2855	return $epoch;
2157	2856	}
2158	2857
2159		- function update_hash () {
2160		- return md5(serialize($this->item));
2161		- }
2162		-
2163	2858	function guid () {
2164	2859	$guid = null;
2165	2860	if (isset($this->item['id'])): // Atom 0.3 / 1.0
2166	2861	$guid = $this->item['id'];
		@@ -2247,97 +2942,380 @@
2247	2942	endif;
2248	2943
2249	2944	return $author;
2250	2945	} // SyndicatedPost::author()
	2946	+} // class SyndicatedPost
	2947	+
	2948	+# class SyndicatedLink: represents a syndication feed stored within the
	2949	+# WordPress database
	2950	+#
	2951	+# To keep things compact and editable from within WordPress, we use all the
	2952	+# links under a particular category in the WordPress "Blogroll" for the list of
	2953	+# feeds to syndicate. "Contributors" is the category used by default; you can
	2954	+# configure that under Options --> Syndication.
	2955	+#
	2956	+# Fields used are:
	2957	+#
	2958	+# * link_rss: the URI of the Atom/RSS feed to syndicate
	2959	+#
	2960	+# * link_notes: user-configurable options, with keys and values
	2961	+# like so:
	2962	+#
	2963	+# key: value
	2964	+# cats: computers\nweb
	2965	+# feed/key: value
	2966	+#
	2967	+# Keys that start with "feed/" are gleaned from the data supplied
	2968	+# by the feed itself, and will be overwritten with each update.
	2969	+#
	2970	+# Values have linebreak characters escaped with C-style
	2971	+# backslashes (so, for example, a newline becomes "\n").
	2972	+#
	2973	+# The value of `cats` is used as a newline-separated list of
	2974	+# default categories for any post coming from a particular feed.
	2975	+# (In the example above, any posts from this feed will be placed
	2976	+# in the "computers" and "web" categories--in addition to any
	2977	+# categories that may already be applied to the posts.)
	2978	+#
	2979	+# Values of keys in link_notes are accessible from templates using
	2980	+# the function `get_feed_meta($key)` if this plugin is activated.
	2981	+
	2982	+class SyndicatedLink {
	2983	+ var $id = null;
	2984	+ var $link = null;
	2985	+ var $settings = array ();
	2986	+ var $magpie = null;
	2987	+
	2988	+ function SyndicatedLink ($link) {
	2989	+ global $wpdb;
	2990	+
	2991	+ if (is_object($link)) :
	2992	+ $this->link = $link;
	2993	+ $this->id = $link->link_id;
	2994	+ else :
	2995	+ $this->id = $link;
	2996	+ if (function_exists('get_bookmark')) : // WP 2.1+
	2997	+ $this->link = get_bookmark($link);
	2998	+ else :
	2999	+ $this->link = $wpdb->get_row("
	3000	+ SELECT * FROM $wpdb->links
	3001	+ WHERE (link_id = '".$wpdb->escape($link)."')"
	3002	+ );
	3003	+ endif;
	3004	+ endif;
	3005	+
	3006	+ if (strlen($this->link->link_rss) > 0) :
	3007	+ // Read off feed settings from link_notes
	3008	+ $notes = explode("\n", $this->link->link_notes);
	3009	+ foreach ($notes as $note):
	3010	+ list($key, $value) = explode(": ", $note, 2);
2251	3011
2252		- var $uri_attrs = array (
2253		- array('a', 'href'),
2254		- array('applet', 'codebase'),
2255		- array('area', 'href'),
2256		- array('blockquote', 'cite'),
2257		- array('body', 'background'),
2258		- array('del', 'cite'),
2259		- array('form', 'action'),
2260		- array('frame', 'longdesc'),
2261		- array('frame', 'src'),
2262		- array('iframe', 'longdesc'),
2263		- array('iframe', 'src'),
2264		- array('head', 'profile'),
2265		- array('img', 'longdesc'),
2266		- array('img', 'src'),
2267		- array('img', 'usemap'),
2268		- array('input', 'src'),
2269		- array('input', 'usemap'),
2270		- array('ins', 'cite'),
2271		- array('link', 'href'),
2272		- array('object', 'classid'),
2273		- array('object', 'codebase'),
2274		- array('object', 'data'),
2275		- array('object', 'usemap'),
2276		- array('q', 'cite'),
2277		- array('script', 'src')
2278		- ); /* var SyndicatedPost::$uri_attrs */
	3012	+ if (strlen($key) > 0) :
	3013	+ // Unescape and trim() off the whitespace.
	3014	+ // Thanks to Ray Lischner for pointing out the
	3015	+ // need to trim off whitespace.
	3016	+ $this->settings[$key] = stripcslashes (trim($value));
	3017	+ endif;
	3018	+ endforeach;
2279	3019
2280		- var $_base = null;
	3020	+ // "Magic" feed settings
	3021	+ $this->settings['link/uri'] = $this->link->link_rss;
	3022	+ $this->settings['link/name'] = $this->link->link_name;
	3023	+ $this->settings['link/id'] = $this->link->link_id;
	3024	+
	3025	+ // `hardcode categories` is deprecated in favor of `unfamiliar categories`
	3026	+ if (
	3027	+ FeedWordPress::affirmative($this->settings, 'hardcode categories')
	3028	+ and !isset($this->settings['unfamiliar categories'])
	3029	+ ) :
	3030	+ $this->settings['unfamiliar categories'] = 'default';
	3031	+ endif;
	3032	+
	3033	+ // Set this up automagically for del.icio.us
	3034	+ if (!isset($this->settings['cat_split']) and false !== strpos($this->link->link_rss, 'del.icio.us')) :
	3035	+ $this->settings['cat_split'] = '\s'; // Whitespace separates multiple tags in del.icio.us RSS feeds
	3036	+ endif;
2281	3037
2282		- function resolve_single_relative_uri ($refs) {
2283		- $tag = FeedWordPressHTML::attributeMatch($refs);
2284		- $url = Relative_URI::resolve($tag['value'], $this->_base);
2285		- return $tag['prefix'] . $url . $tag['suffix'];
2286		- } /* function SyndicatedPost::resolve_single_relative_uri() */
	3038	+ if (isset($this->settings['cats'])):
	3039	+ $this->settings['cats'] = preg_split(FEEDWORDPRESS_CAT_SEPARATOR_PATTERN, $this->settings['cats']);
	3040	+ endif;
	3041	+
	3042	+ if (isset($this->settings['map authors'])) :
	3043	+ $author_rules = explode("\n\n", $this->settings['map authors']);
	3044	+ $ma = array();
	3045	+ foreach ($author_rules as $rule) :
	3046	+ list($rule_type, $author_name, $author_action) = explode("\n", $rule);
	3047	+
	3048	+ // Normalize for case and whitespace
	3049	+ $rule_type = strtolower(trim($rule_type));
	3050	+ $author_name = strtolower(trim($author_name));
	3051	+ $author_action = strtolower(trim($author_action));
	3052	+
	3053	+ $ma[$rule_type][$author_name] = $author_action;
	3054	+ endforeach;
	3055	+ $this->settings['map authors'] = $ma;
	3056	+ endif;
	3057	+ endif;
	3058	+ } // SyndicatedLink::SyndicatedLink ()
	3059	+
	3060	+ function found () {
	3061	+ return is_object($this->link);
	3062	+ }
2287	3063
2288		- function resolve_relative_uris ($content, $obj) {
2289		- # The MagpieRSS upgrade has some `xml:base` support baked in.
2290		- # However, sometimes people do silly things, like putting
2291		- # relative URIs out on a production RSS 2.0 feed or other feeds
2292		- # with no good support for `xml:base`. So we'll do our best to
2293		- # try to catch any remaining relative URIs and resolve them as
2294		- # best we can.
2295		- $obj->_base = $obj->item['link']; // Reset the base for resolving relative URIs
	3064	+ function stale () {
	3065	+ $stale = true;
	3066	+ if (isset($this->settings['update/hold']) and ($this->settings['update/hold']=='ping')) :
	3067	+ $stale = false; // don't update on any timed updates; pings only
	3068	+ elseif (isset($this->settings['update/hold']) and ($this->settings['update/hold']=='next')) :
	3069	+ $stale = true; // update on the next timed update
	3070	+ elseif (!isset($this->settings['update/ttl']) or !isset($this->settings['update/last'])) :
	3071	+ $stale = true; // initial update
	3072	+ else :
	3073	+ $after = ((int) $this->settings['update/last'])
	3074	+ +((int) $this->settings['update/ttl'] * 60);
	3075	+ $stale = (time() >= $after);
	3076	+ endif;
	3077	+ return $stale;
	3078	+ }
2296	3079
2297		- foreach ($obj->uri_attrs as $pair) :
2298		- list($tag, $attr) = $pair;
2299		- $pattern = FeedWordPressHTML::attributeRegex($tag, $attr);
2300		- $content = preg_replace_callback (
2301		- $pattern,
2302		- array(&$obj, 'resolve_single_relative_uri'),
2303		- $content
2304		- );
2305		- endforeach;
	3080	+ function poll () {
	3081	+ global $wpdb;
2306	3082
2307		- return $content;
2308		- } /* function SyndicatedPost::resolve_relative_uris () */
	3083	+ $this->magpie = fetch_rss($this->link->link_rss);
	3084	+ $new_count = NULL;
2309	3085
2310		- var $strip_attrs = array (
2311		- array('[a-z]+', 'target'),
2312		-// array('[a-z]+', 'style'),
2313		-// array('[a-z]+', 'on[a-z]+'),
2314		- );
	3086	+ if (is_object($this->magpie)) :
	3087	+ $new_count = array('new' => 0, 'updated' => 0);
2315	3088
2316		- function strip_attribute_from_tag ($refs) {
2317		- $tag = FeedWordPressHTML::attributeMatch($refs);
2318		- return $tag['before_attribute'].$tag['after_attribute'];
	3089	+ # -- Update Link metadata live from feed
	3090	+ $channel = $this->magpie->channel;
	3091	+
	3092	+ if (!isset($channel['id'])) :
	3093	+ $channel['id'] = $this->link->link_rss;
	3094	+ endif;
	3095	+
	3096	+ $update = array();
	3097	+ if (!$this->hardcode('url') and isset($channel['link'])) :
	3098	+ $update[] = "link_url = '".$wpdb->escape($channel['link'])."'";
	3099	+ endif;
	3100	+
	3101	+ if (!$this->hardcode('name') and isset($channel['title'])) :
	3102	+ $update[] = "link_name = '".$wpdb->escape($channel['title'])."'";
	3103	+ endif;
	3104	+
	3105	+ if (!$this->hardcode('description')) :
	3106	+ if (isset($channel['tagline'])) :
	3107	+ $update[] = "link_description = '".$wpdb->escape($channel['tagline'])."'";
	3108	+ elseif (isset($channel['description'])) :
	3109	+ $update[] = "link_description = '".$wpdb->escape($channel['description'])."'";
	3110	+ endif;
	3111	+ endif;
	3112	+
	3113	+ $this->settings = array_merge($this->settings, $this->flatten_array($channel));
	3114	+
	3115	+ $this->settings['update/last'] = time(); $ttl = $this->ttl();
	3116	+ if (!is_null($ttl)) :
	3117	+ $this->settings['update/ttl'] = $ttl;
	3118	+ $this->settings['update/timed'] = 'feed';
	3119	+ else :
	3120	+ $this->settings['update/ttl'] = rand(30, 120); // spread over time interval for staggered updates
	3121	+ $this->settings['update/timed'] = 'automatically';
	3122	+ endif;
	3123	+
	3124	+ if (!isset($this->settings['update/hold']) or $this->settings['update/hold']!='ping') :
	3125	+ $this->settings['update/hold'] = 'scheduled';
	3126	+ endif;
	3127	+
	3128	+ // Copy back without a few things that we don't want to save in the notes
	3129	+ $to_notes = $this->settings;
	3130	+
	3131	+ if (is_array($to_notes['cats'])) :
	3132	+ $to_notes['cats'] = implode(FEEDWORDPRESS_CAT_SEPARATOR, $to_notes['cats']);
	3133	+ endif;
	3134	+
	3135	+ if (isset($to_notes['map authors'])) :
	3136	+ $ma = array();
	3137	+ foreach ($to_notes['map authors'] as $rule_type => $author_rules) :
	3138	+ foreach ($author_rules as $author_name => $author_action) :
	3139	+ $ma[] = $rule_type."\n".$author_name."\n".$author_action;
	3140	+ endforeach;
	3141	+ endforeach;
	3142	+ $to_notes['map authors'] = implode("\n\n", $ma);
	3143	+ endif;
	3144	+
	3145	+ unset($to_notes['link/id']); unset($to_notes['link/uri']);
	3146	+ unset($to_notes['link/name']);
	3147	+ unset($to_notes['hardcode categories']); // Deprecated
	3148	+
	3149	+ $notes = '';
	3150	+ foreach ($to_notes as $key => $value) :
	3151	+ $notes .= $key . ": ". addcslashes($value, "\0..\37".'\\') . "\n";
	3152	+ endforeach;
	3153	+ $update[] = "link_notes = '".$wpdb->escape($notes)."'";
	3154	+
	3155	+ $update_set = implode(',', $update);
	3156	+
	3157	+ // Update the properties of the link from the feed information
	3158	+ $result = $wpdb->query("
	3159	+ UPDATE $wpdb->links
	3160	+ SET $update_set
	3161	+ WHERE link_id='$this->id'
	3162	+ ");
	3163	+
	3164	+ # -- Add new posts from feed and update any updated posts
	3165	+ if (is_array($this->magpie->items)) :
	3166	+ foreach ($this->magpie->items as $item) :
	3167	+ $post =& new SyndicatedPost($item, $this);
	3168	+ if (!$post->filtered()) :
	3169	+ $new = $post->store();
	3170	+ if ( $new !== false ) $new_count[$new]++;
	3171	+ endif;
	3172	+ endforeach;
	3173	+ endif;
	3174	+
	3175	+ // Copy back any changes to feed settings made in the course of updating (e.g. new author rules)
	3176	+ $to_notes = $this->settings;
	3177	+
	3178	+ if (is_array($to_notes['cats'])) :
	3179	+ $to_notes['cats'] = implode(FEEDWORDPRESS_CAT_SEPARATOR, $to_notes['cats']);
	3180	+ endif;
	3181	+
	3182	+ if (isset($to_notes['map authors'])) :
	3183	+ $ma = array();
	3184	+ foreach ($to_notes['map authors'] as $rule_type => $author_rules) :
	3185	+ foreach ($author_rules as $author_name => $author_action) :
	3186	+ $ma[] = $rule_type."\n".$author_name."\n".$author_action;
	3187	+ endforeach;
	3188	+ endforeach;
	3189	+ $to_notes['map authors'] = implode("\n\n", $ma);
	3190	+ endif;
	3191	+
	3192	+ unset($to_notes['link/id']); unset($to_notes['link/uri']);
	3193	+ unset($to_notes['link/name']);
	3194	+ unset($to_notes['hardcode categories']); // Deprecated
	3195	+
	3196	+ $notes = '';
	3197	+ foreach ($to_notes as $key => $value) :
	3198	+ $notes .= $key . ": ". addcslashes($value, "\0..\37".'\\') . "\n";
	3199	+ endforeach;
	3200	+
	3201	+ $update_set = "link_notes = '".$wpdb->escape($notes)."'";
	3202	+
	3203	+ // Update the properties of the link from the feed information
	3204	+ $result = $wpdb->query("
	3205	+ UPDATE $wpdb->links
	3206	+ SET $update_set
	3207	+ WHERE link_id='$this->id'
	3208	+ ");
	3209	+ endif;
	3210	+ return $new_count;
	3211	+ } /* SyndicatedLink::poll() */
	3212	+
	3213	+ function uri () {
	3214	+ return (is_object($this->link) ? $this->link->link_rss : NULL);
2319	3215	}
	3216	+ function homepage () {
	3217	+ return (isset($this->settings['feed/link']) ? $this->settings['feed/link'] : NULL);
	3218	+ }
2320	3219
2321		- function sanitize_content ($content, $obj) {
2322		- # This kind of sucks. I intend to replace it with
2323		- # lib_filter sometime soon.
2324		- foreach ($obj->strip_attrs as $pair):
2325		- list($tag,$attr) = $pair;
2326		- $pattern = FeedWordPressHTML::attributeRegex($tag, $attr);
	3220	+ function ttl () {
	3221	+ if (is_object($this->magpie)) :
	3222	+ $channel = $this->magpie->channel;
	3223	+ else :
	3224	+ $channel = array();
	3225	+ endif;
2327	3226
2328		- $content = preg_replace_callback (
2329		- $pattern,
2330		- array(&$obj, 'strip_attribute_from_tag'),
2331		- $content
	3227	+ if (isset($channel['ttl'])) :
	3228	+ // "ttl stands for time to live. It's a number of
	3229	+ // minutes that indicates how long a channel can be
	3230	+ // cached before refreshing from the source."
	3231	+ // <http://blogs.law.harvard.edu/tech/rss#ltttlgtSubelementOfLtchannelgt>
	3232	+ $ret = $channel['ttl'];
	3233	+ elseif (isset($channel['sy']['updatefrequency']) or isset($channel['sy']['updateperiod'])) :
	3234	+ $period_minutes = array (
	3235	+ 'hourly' => 60, /* minutes in an hour */
	3236	+ 'daily' => 1440, /* minutes in a day */
	3237	+ 'weekly' => 10080, /* minutes in a week */
	3238	+ 'monthly' => 43200, /* minutes in a month */
	3239	+ 'yearly' => 525600, /* minutes in a year */
2332	3240	);
2333		- endforeach;
2334		- return $content;
2335		- }
2336		-} // class SyndicatedPost
2337	3241
2338		-require_once(dirname(__FILE__) . '/syndicatedlink.class.php');
	3242	+ // "sy:updatePeriod: Describes the period over which the
	3243	+ // channel format is updated. Acceptable values are:
	3244	+ // hourly, daily, weekly, monthly, yearly. If omitted,
	3245	+ // daily is assumed." <http://web.resource.org/rss/1.0/modules/syndication/>
	3246	+ if (isset($channel['sy']['updateperiod'])) : $period = $channel['sy']['updateperiod'];
	3247	+ else : $period = 'daily';
	3248	+ endif;
	3249	+
	3250	+ // "sy:updateFrequency: Used to describe the frequency
	3251	+ // of updates in relation to the update period. A
	3252	+ // positive integer indicates how many times in that
	3253	+ // period the channel is updated. ... If omitted a value
	3254	+ // of 1 is assumed." <http://web.resource.org/rss/1.0/modules/syndication/>
	3255	+ if (isset($channel['sy']['updatefrequency'])) : $freq = (int) $channel['sy']['updatefrequency'];
	3256	+ else : $freq = 1;
	3257	+ endif;
	3258	+
	3259	+ $ret = (int) ($period_minutes[$period] / $freq);
	3260	+ else :
	3261	+ $ret = NULL;
	3262	+ endif;
	3263	+ return $ret;
	3264	+ } /* SyndicatedLink::ttl() */
2339	3265
	3266	+ // SyndicatedLink::flatten_array (): flatten an array. Useful for
	3267	+ // hierarchical and namespaced elements.
	3268	+ //
	3269	+ // Given an array which may contain array or object elements in it,
	3270	+ // return a "flattened" array: a one-dimensional array of scalars
	3271	+ // containing each of the scalar elements contained within the array
	3272	+ // structure. Thus, for example, if $a['b']['c']['d'] == 'e', then the
	3273	+ // returned array for FeedWordPress::flatten_array($a) will contain a key
	3274	+ // $a['feed/b/c/d'] with value 'e'.
	3275	+ function flatten_array ($arr, $prefix = 'feed/', $separator = '/') {
	3276	+ $ret = array ();
	3277	+ if (is_array($arr)) :
	3278	+ foreach ($arr as $key => $value) :
	3279	+ if (is_scalar($value)) :
	3280	+ $ret[$prefix.$key] = $value;
	3281	+ else :
	3282	+ $ret = array_merge($ret, $this->flatten_array($value, $prefix.$key.$separator, $separator));
	3283	+ endif;
	3284	+ endforeach;
	3285	+ endif;
	3286	+ return $ret;
	3287	+ } // function SyndicatedLink::flatten_array ()
	3288	+
	3289	+ function hardcode ($what) {
	3290	+ $default = get_option("feedwordpress_hardcode_$what");
	3291	+ if ( $default === 'yes' ) :
	3292	+ // If the default is to hardcode, then we want the
	3293	+ // negation of negative(): TRUE by default and FALSE if
	3294	+ // the setting is explicitly "no"
	3295	+ $ret = !FeedWordPress::negative($this->settings, "hardcode $what");
	3296	+ else :
	3297	+ // If the default is NOT to hardcode, then we want
	3298	+ // affirmative(): FALSE by default and TRUE if the
	3299	+ // setting is explicitly "yes"
	3300	+ $ret = FeedWordPress::affirmative($this->settings, "hardcode $what");
	3301	+ endif;
	3302	+ return $ret;
	3303	+ } // function SyndicatedLink::hardcode ()
	3304	+
	3305	+ function syndicated_status ($what, $default) {
	3306	+ global $wpdb;
	3307	+
	3308	+ $ret = get_option("feedwordpress_syndicated_{$what}_status");
	3309	+ if ( isset($this->settings["$what status"]) ) :
	3310	+ $ret = $this->settings["$what status"];
	3311	+ elseif (!$ret) :
	3312	+ $ret = $default;
	3313	+ endif;
	3314	+ return $wpdb->escape(trim(strtolower($ret)));
	3315	+ } // function SyndicatedLink:syndicated_status ()
	3316	+} // class SyndicatedLink
	3317	+
2340	3318	################################################################################
2341	3319	## XML-RPC HOOKS: accept XML-RPC update pings from Contributors ################
2342	3320	################################################################################
2343	3321
		@@ -2370,9 +3348,8 @@
2370	3348
2371	3349	var $verify = FALSE;
2372	3350
2373	3351	var $_data = NULL;
2374		- var $_error = NULL;
2375	3352	var $_head = NULL;
2376	3353
2377	3354	# -- Recognition patterns
2378	3355	var $_feed_types = array(
		@@ -2406,12 +3383,8 @@
2406	3383
2407	3384	// If all that failed, look harder
2408	3385	if (count($href) == 0) $href = $this->_a_href_feeds(FALSE);
2409	3386
2410		- // Our search may turn up duplicate URIs. We only need to do any given URI once.
2411		- // Props to Camilo <http://projects.radgeek.com/2008/12/14/feedwordpress-20081214/#comment-20090122160414>
2412		- $href = array_unique($href);
2413		-
2414	3387	// Verify feeds and resolve relative URIs
2415	3388	foreach ($href as $u) {
2416	3389	$the_uri = Relative_URI::resolve($u, $this->uri);
2417	3390	if ($this->verify) {
		@@ -2431,12 +3404,8 @@
2431	3404	$this->_get($uri);
2432	3405	return $this->_data;
2433	3406	}
2434	3407
2435		- function error () {
2436		- return $this->_error;
2437		- }
2438		-
2439	3408	function is_feed ($uri = NULL) {
2440	3409	$data = $this->data($uri);
2441	3410
2442	3411	return (
		@@ -2455,23 +3424,23 @@
2455	3424	if ($uri) $this->uri = $uri;
2456	3425
2457	3426	// Is the result not yet cached?
2458	3427	if ($this->_cache_uri !== $this->uri) :
2459		- $headers['Connection'] = 'close';
2460		- $headers['Accept'] = 'application/atom+xml application/rdf+xml application/rss+xml application/xml text/html /';
2461		- $headers['User-Agent'] = 'feedfinder/1.2 (compatible; PHP FeedFinder) +http://projects.radgeek.com/feedwordpress';
	3428	+ // Snoopy is an HTTP client in PHP
	3429	+ $client = new Snoopy();
	3430	+
	3431	+ // Prepare headers and internal settings
	3432	+ $client->rawheaders['Connection'] = 'close';
	3433	+ $client->accept = 'application/atom+xml application/rdf+xml application/rss+xml application/xml text/html /';
	3434	+ $client->agent = 'feedfinder/1.2 (compatible; PHP FeedFinder) +http://projects.radgeek.com/feedwordpress';
	3435	+ $client->read_timeout = 25;
	3436	+
	3437	+ // Fetch the HTML or feed
	3438	+ @$client->fetch($this->uri);
	3439	+ $this->_data = $client->results;
2462	3440
2463		- // Use function provided by MagpieRSS package
2464		- $client = _fetch_remote_file($this->uri, $headers);
2465		- if (isset($client->error)) :
2466		- $this->_error = $client->error;
2467		- else :
2468		- $this->_error = NULL;
2469		- endif;
2470		- $this->_data = $client->results;
2471		-
2472		- // Kilroy was here
2473		- $this->_cache_uri = $this->uri;
	3441	+ // Kilroy was here
	3442	+ $this->_cache_uri = $this->uri;
2474	3443	endif;
2475	3444	} /* FeedFinder::_get () */
2476	3445
2477	3446	function _link_rel_feeds () {
		@@ -2732,5 +3701,5 @@
2732	3701	$ret['name'] = NULL; $ret['email'] = NULL;
2733	3702	endif;
2734	3703	return $ret;
2735	3704	}
2736		-
	3705	+?>