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