← All changes | feedwordpress.php +1461 -1821 2009.0618 → 2011.0602 View file →

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