← All changes | feedwordpress.php +1529 -3254 0.993 → 2011.0211.2 View file →

		@@ -1,38 +1,60 @@
1	1	<?php
2	2	/*
3	3	Plugin Name: FeedWordPress
4		-Plugin URI: http://projects.radgeek.com/feedwordpress
	4	+Plugin URI: http://feedwordpress.radgeek.com/
5	5	Description: simple and flexible Atom/RSS syndication for WordPress
6		-Version: 0.993
	6	+Version: 2011.0211.2
7	7	Author: Charles Johnson
8	8	Author URI: http://radgeek.com/
9	9	License: GPL
10		-Last modified: 2008-05-08 4:48 PM PDT
11	10	*/
12	11
	12	+/**
	13	+ * @package FeedWordPress
	14	+ * @version 2011.0211.2
	15	+ */
	16	+
13	17	# This uses code derived from:
14	18	# - wp-rss-aggregate.php by Kellan Elliot-McCrea <kellan@protest.net>
15		-# - HTTP Navigator 2 by Keyvan Minoukadeh <keyvan@k1m.com>
	19	+# - MagpieRSS by Kellan Elliot-McCrea <kellan@protest.net>
16	20	# - Ultra-Liberal Feed Finder by Mark Pilgrim <mark@diveintomark.org>
	21	+# - WordPress Blog Tool and Publishing Platform <http://wordpress.org/>
17	22	# according to the terms of the GNU General Public License.
18	23	#
19		-# INSTALLATION: see README.text or <http://projects.radgeek.com/install>
	24	+# INSTALLATION: see readme.txt or <http://projects.radgeek.com/install>
20	25	#
21	26	# USAGE: once FeedWordPress is installed, you manage just about everything from
22		-# the WordPress Dashboard, under Options --> Syndication or Links --> Syndicated
23		-# To ensure that fresh content is added as it becomes available, get your
24		-# contributors to put your XML-RPC URI (if WordPress is installed at
	27	+# the WordPress Dashboard, under the Syndication menu. To ensure that fresh
	28	+# content is added as it becomes available, you can convince your contributors
	29	+# to put your XML-RPC URI (if WordPress is installed at
25	30	# <http://www.zyx.com/blog>, XML-RPC requests should be sent to
26		-# <http://www.zyx.com/blog/xmlrpc.php>), or see `update-feeds.php`
	31	+# <http://www.zyx.com/blog/xmlrpc.php>), or update manually under the
	32	+# Syndication menu, or set up automatic updates under Syndication --> Settings,
	33	+# or use a cron job.
27	34
28	35	# -- Don't change these unless you know what you're doing...
29	36
30		-define ('FEEDWORDPRESS_VERSION', '0.993');
	37	+define ('FEEDWORDPRESS_VERSION', '2011.0211.2');
31	38	define ('FEEDWORDPRESS_AUTHOR_CONTACT', 'http://radgeek.com/contact');
	39	+
	40	+if (!defined('FEEDWORDPRESS_BLEG')) :
	41	+ define ('FEEDWORDPRESS_BLEG', true);
	42	+endif;
	43	+
	44	+// Defaults
32	45	define ('DEFAULT_SYNDICATION_CATEGORY', 'Contributors');
	46	+define ('DEFAULT_UPDATE_PERIOD', 60); // value in minutes
33	47
34		-define ('FEEDWORDPRESS_DEBUG', false);
	48	+if (isset($_REQUEST['feedwordpress_debug'])) :
	49	+ $feedwordpress_debug = $_REQUEST['feedwordpress_debug'];
	50	+else :
	51	+ $feedwordpress_debug = get_option('feedwordpress_debug');
	52	+ if (is_string($feedwordpress_debug)) :
	53	+ $feedwordpress_debug = ($feedwordpress_debug == 'yes');
	54	+ endif;
	55	+endif;
	56	+define ('FEEDWORDPRESS_DEBUG', $feedwordpress_debug);
35	57
36	58	define ('FEEDWORDPRESS_CAT_SEPARATOR_PATTERN', '/[:\n]/');
37	59	define ('FEEDWORDPRESS_CAT_SEPARATOR', "\n");
38	60
		@@ -39,18 +61,24 @@
39	61	define ('FEEDVALIDATOR_URI', 'http://feedvalidator.org/check.cgi');
40	62
41	63	define ('FEEDWORDPRESS_FRESHNESS_INTERVAL', 10*60); // Every ten minutes
42	64
	65	+define ('FWP_SCHEMA_HAS_USERMETA', 2966);
	66	+define ('FWP_SCHEMA_USES_ARGS_TAXONOMY', 12694); // Revision # for using $args['taxonomy'] to get link categories
43	67	define ('FWP_SCHEMA_20', 3308); // Database schema # for WP 2.0
44	68	define ('FWP_SCHEMA_21', 4772); // Database schema # for WP 2.1
45	69	define ('FWP_SCHEMA_23', 5495); // Database schema # for WP 2.3
46	70	define ('FWP_SCHEMA_25', 7558); // Database schema # for WP 2.5
	71	+define ('FWP_SCHEMA_26', 8201); // Database schema # for WP 2.6
	72	+define ('FWP_SCHEMA_27', 9872); // Database schema # for WP 2.7
	73	+define ('FWP_SCHEMA_28', 11548); // Database schema # for WP 2.8
	74	+define ('FWP_SCHEMA_29', 12329); // Database schema # for WP 2.9
	75	+define ('FWP_SCHEMA_30', 12694); // Database schema # for WP 3.0
47	76
48	77	if (FEEDWORDPRESS_DEBUG) :
49	78	// Help us to pick out errors, if any.
50	79	ini_set('error_reporting', E_ALL & ~E_NOTICE);
51	80	ini_set('display_errors', true);
52		- define('MAGPIE_DEBUG', true);
53	81
54	82	// When testing we don't want cache issues to interfere. But this is
55	83	// a VERY BAD SETTING for a production server. Webmasters will eat your
56	84	// face for breakfast if you use it, and the baby Jesus will cry. So
		@@ -55,52 +83,53 @@
55	83	// a VERY BAD SETTING for a production server. Webmasters will eat your
56	84	// face for breakfast if you use it, and the baby Jesus will cry. So
57	85	// make sure FEEDWORDPRESS_DEBUG is FALSE for any site that will be
58	86	// used for more than testing purposes!
59		- define('MAGPIE_CACHE_AGE', 1);
	87	+ define('FEEDWORDPRESS_CACHE_AGE', 1);
	88	+ define('FEEDWORDPRESS_CACHE_LIFETIME', 1);
	89	+ define('FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT', 60);
60	90	else :
61		- define('MAGPIE_DEBUG', false);
	91	+ // Hold onto data all day for conditional GET purposes,
	92	+ // but consider it stale after 1 min (requiring a conditional GET)
	93	+ define('FEEDWORDPRESS_CACHE_LIFETIME', 24*60*60);
	94	+ define('FEEDWORDPRESS_CACHE_AGE', 1*60);
	95	+ define('FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT', 20);
62	96	endif;
63	97
64		-// Note that the rss-functions.php that comes prepackaged with WordPress is
65		-// old & busted. For the new hotness, drop a copy of rss.php from
66		-// 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'));
67	100
68		-if (is_readable(ABSPATH . WPINC . '/rss.php')) :
69		- require_once (ABSPATH . WPINC . '/rss.php');
70		-else :
71		- 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');
72	105	endif;
	106	+require_once(ABSPATH . WPINC . '/class-feed.php');
73	107
74		-if (isset($wp_db_version)) :
75		- if ($wp_db_version >= FWP_SCHEMA_23) :
76		- require_once (ABSPATH . WPINC . '/registration.php'); // for wp_insert_user
77		- elseif ($wp_db_version >= FWP_SCHEMA_21) : // WordPress 2.1 and 2.2, but not 2.3
78		- require_once (ABSPATH . WPINC . '/registration.php'); // for wp_insert_user
79		- require_once (ABSPATH . 'wp-admin/admin-db.php'); // for wp_insert_category
80		- elseif ($wp_db_version >= FWP_SCHEMA_20) : // WordPress 2.0
81		- require_once (ABSPATH . WPINC . '/registration-functions.php'); // for wp_insert_user
82		- require_once (ABSPATH . 'wp-admin/admin-db.php'); // for wp_insert_category
83		- endif;
	108	+if (!function_exists('wp_insert_user')) :
	109	+ require_once (ABSPATH . WPINC . '/registration.php'); // for wp_insert_user
84	110	endif;
85	111
86		-if (function_exists('wp_enqueue_script')) :
87		- if (isset($wp_db_version) and $wp_db_version >= FWP_SCHEMA_25) :
88		- wp_enqueue_script('post');
89		- wp_enqueue_script('thickbox');
90		- else :
91		- wp_enqueue_script( 'ajaxcat' ); // Provides the handy-dandy new category text box
92		- endif;
93		-endif;
	112	+require_once(dirname(__FILE__) . '/admin-ui.php');
	113	+require_once(dirname(__FILE__) . '/feedwordpresssyndicationpage.class.php');
	114	+require_once(dirname(__FILE__) . '/compatability.php'); // LEGACY API: Replicate or mock up functions for legacy support purposes
94	115
	116	+require_once(dirname(__FILE__) . '/syndicatedpost.class.php');
	117	+require_once(dirname(__FILE__) . '/syndicatedlink.class.php');
	118	+require_once(dirname(__FILE__) . '/feedwordpresshtml.class.php');
	119	+require_once(dirname(__FILE__) . '/feedwordpress-content-type-sniffer.class.php');
	120	+
95	121	// Magic quotes are just about the stupidest thing ever.
96	122	if (is_array($_POST)) :
97		- $fwp_post = stripslashes_deep($_POST);
	123	+ $fwp_post = $_POST;
	124	+ if (get_magic_quotes_gpc()) :
	125	+ $fwp_post = stripslashes_deep($fwp_post);
	126	+ endif;
98	127	endif;
99	128
100	129	// Get the path relative to the plugins directory in which FWP is stored
101	130	preg_match (
102		- '|/wp-content/plugins/(.+)$|',
	131	+ '|'.preg_quote(WP_PLUGIN_DIR).'/(.+)$|',
103	132	dirname(__FILE__),
104	133	$ref
105	134	);
106	135
		@@ -109,8 +138,26 @@
109	138	else : // Something went wrong. Let's just guess.
110	139	$fwp_path = 'feedwordpress';
111	140	endif;
112	141
	142	+// If this is a FeedWordPress admin page, queue up scripts for AJAX functions that FWP uses
	143	+// If it is a display page or a non-FeedWordPress admin page, don't.
	144	+wp_register_style('feedwordpress-elements', WP_PLUGIN_URL.'/'.$fwp_path.'/feedwordpress-elements.css');
	145	+if (FeedWordPressSettingsUI::is_admin()) :
	146	+ // For JavaScript that needs to be generated dynamically
	147	+ add_action('admin_print_scripts', array('FeedWordPressSettingsUI', 'admin_scripts'));
	148	+
	149	+ // For CSS that needs to be generated dynamically.
	150	+ add_action('admin_print_styles', array('FeedWordPressSettingsUI', 'admin_styles'));
	151	+
	152	+ wp_enqueue_style('dashboard');
	153	+ wp_enqueue_style('feedwordpress-elements');
	154	+
	155	+ if (function_exists('wp_admin_css')) :
	156	+ wp_admin_css('css/dashboard');
	157	+ endif;
	158	+endif;
	159	+
113	160	if (!FeedWordPress::needs_upgrade()) : // only work if the conditions are safe!
114	161
115	162	# Syndicated items are generally received in output-ready (X)HTML and
116	163	# should not be folded, crumpled, mutilated, or spindled by WordPress
		@@ -127,11 +174,20 @@
127	174
128	175	add_filter('the_content', 'feedwordpress_preserve_syndicated_content', -10000);
129	176	add_filter('the_content', 'feedwordpress_restore_syndicated_content', 10000);
130	177
	178	+ add_action('atom_entry', 'feedwordpress_item_feed_data');
	179	+
131	180	# Filter in original permalinks if the user wants that
132		- add_filter('post_link', 'syndication_permalink', 1);
	181	+ add_filter('post_link', 'syndication_permalink', /*priority=*/ 1, /*arguments=*/ 3);
133	182
	183	+ # When foreign URLs are used for permalinks in feeds or display
	184	+ # contexts, they need to be escaped properly.
	185	+ add_filter('the_permalink', 'syndication_permalink_escaped');
	186	+ add_filter('the_permalink_rss', 'syndication_permalink_escaped');
	187	+
	188	+ add_filter('post_comments_feed_link', 'syndication_comments_feed_link');
	189	+
134	190	# WTF? By default, wp_insert_link runs incoming link_url and link_rss
135	191	# URIs through default filters that include `wp_kses()`. But `wp_kses()`
136	192	# just happens to escape any occurrence of & to &amp; -- which just
137	193	# happens to fuck up any URI with a & to separate GET parameters.
		@@ -139,12 +195,18 @@
139	195	remove_filter('pre_link_url', 'wp_filter_kses');
140	196
141	197	# Admin menu
142	198	add_action('admin_menu', 'fwp_add_pages');
	199	+ add_action('admin_notices', 'fwp_check_debug');
	200	+
	201	+ add_action('admin_menu', 'feedwordpress_add_post_edit_controls');
	202	+ add_action('save_post', 'feedwordpress_save_post_edit_controls');
	203	+
	204	+ add_action('admin_footer', array('FeedWordPress', 'admin_footer'));
143	205
144	206	# Inbound XML-RPC update methods
145		- add_filter('xmlrpc_methods', 'feedwordpress_xmlrpc_hook');
146		-
	207	+ $feedwordpressRPC = new FeedWordPressRPC;
	208	+
147	209	# Outbound XML-RPC ping reform
148	210	remove_action('publish_post', 'generic_ping'); // WP 1.5.x
149	211	remove_action('do_pings', 'do_all_pings', 10, 1); // WP 2.1, 2.2
150	212	remove_action('publish_post', '_publish_post_hook', 5, 1); // WP 2.3
		@@ -153,22 +215,27 @@
153	215	add_action('do_pings', 'fwp_do_pings', 10, 1);
154	216	add_action('feedwordpress_update', 'fwp_hold_pings');
155	217	add_action('feedwordpress_update_complete', 'fwp_release_pings');
156	218
157		- # Hook in logging functions only if the logging option is ON
158		- $update_logging = get_option('feedwordpress_update_logging');
159		- if ($update_logging == 'yes') :
160		- add_action('post_syndicated_item', 'log_feedwordpress_post', 100);
161		- add_action('update_syndicated_item', 'log_feedwordpress_update_post', 100);
162		- add_action('feedwordpress_update', 'log_feedwordpress_update_feeds', 100);
163		- add_action('feedwordpress_check_feed', 'log_feedwordpress_check_feed', 100);
164		- add_action('feedwordpress_update_complete', 'log_feedwordpress_update_complete', 100);
	219	+ add_action('syndicated_feed_error', array('FeedWordPressDiagnostic', 'feed_error'), 100, 3);
	220	+
	221	+ add_action('wp_footer', 'debug_out_feedwordpress_footer', -100);
	222	+ add_action('admin_footer', 'debug_out_feedwordpress_footer', -100);
	223	+
	224	+ $feedwordpress = new FeedWordPress;
	225	+
	226	+ # Cron-less auto-update. Hooray!
	227	+ $autoUpdateHook = get_option('feedwordpress_automatic_updates');
	228	+ if ($autoUpdateHook != 'init') :
	229	+ $autoUpdateHook = 'shutdown';
165	230	endif;
166		-
167		- # Cron-less auto-update. Hooray!
168		- add_action('init', 'feedwordpress_auto_update');
169		-
	231	+ add_action($autoUpdateHook, array(&$feedwordpress, 'auto_update'));
	232	+ add_action('init', array(&$feedwordpress, 'init'));
	233	+ add_action('shutdown', array(&$feedwordpress, 'email_diagnostic_log'));
	234	+ add_action('wp_dashboard_setup', array(&$feedwordpress, 'dashboard_setup'));
	235	+
170	236	# Default sanitizers
	237	+ add_filter('syndicated_item_content', array('SyndicatedPost', 'resolve_relative_uris'), 0, 2);
171	238	add_filter('syndicated_item_content', array('SyndicatedPost', 'sanitize_content'), 0, 2);
172	239
173	240	else :
174	241	# Hook in the menus, which will just point to the upgrade interface
		@@ -174,191 +241,261 @@
174	241	# Hook in the menus, which will just point to the upgrade interface
175	242	add_action('admin_menu', 'fwp_add_pages');
176	243	endif; // if (!FeedWordPress::needs_upgrade())
177	244
178		-function feedwordpress_auto_update () {
179		- if (FeedWordPress::stale()) :
180		- $feedwordpress =& new FeedWordPress;
181		- $feedwordpress->update();
182		- endif;
183		-
184		- if (FeedWordPress::update_requested()) :
185		- exit;
186		- endif;
187		-} /* feedwordpress_auto_update () */
188		-
189	245	################################################################################
190	246	## LOGGING FUNCTIONS: log status updates to error_log if you want it ###########
191	247	################################################################################
192	248
193		-function log_feedwordpress_post ($id) {
194		- $post = wp_get_single_post($id);
195		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] posted "
196		- ."'{$post->post_title}' ({$post->post_date})");
197		-}
	249	+class FeedWordPressDiagnostic {
	250	+ function feed_error ($error, $old, $link) {
	251	+ $wpError = $error['object'];
	252	+ $url = $link->uri();
	253	+
	254	+ $mesgs = $wpError->get_error_messages();
	255	+ foreach ($mesgs as $mesg) :
	256	+ $mesg = esc_html($mesg);
	257	+ FeedWordPress::diagnostic(
	258	+ 'updated_feeds:errors',
	259	+ "Feed Error: [${url}] update returned error: $mesg"
	260	+ );
	261	+
	262	+ $hours = get_option('feedwordpress_diagnostics_persistent_errors_hours', 2);
	263	+ $span = ($error['ts'] - $error['since']);
198	264
199		-function log_feedwordpress_update_post ($id) {
200		- $post = wp_get_single_post($id);
201		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] updated "
202		- ."'{$post->post_title}' ({$post->post_date})"
203		- ." (as of {$post->post_modified})");
204		-}
	265	+ if ($span >= ($hours * 60 * 60)) :
	266	+ $since = date('r', $error['since']);
	267	+ $mostRecent = date('r', $error['ts']);
	268	+ FeedWordPress::diagnostic(
	269	+ 'updated_feeds:errors:persistent',
	270	+ "Feed Update Error: [${url}] returning errors"
	271	+ ." since ${since}:<br/><code>$mesg</code>",
	272	+ $url, $error['since'], $error['ts']
	273	+ );
	274	+ endif;
	275	+ endforeach;
	276	+ }
205	277
206		-function log_feedwordpress_update_feeds ($uri) {
207		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] update('$uri')");
208		-}
	278	+ function admin_emails ($id = '') {
	279	+ $users = get_users_of_blog($id);
	280	+ $recipients = array();
	281	+ foreach ($users as $user) :
	282	+ $user_id = (isset($user->user_id) ? $user->user_id : $user->ID);
	283	+ $dude = new WP_User($user_id);
	284	+ if ($dude->has_cap('administrator')) :
	285	+ if ($dude->user_email) :
	286	+ $recipients[] = $dude->user_email;
	287	+ endif;
	288	+ endif;
	289	+ endforeach;
	290	+ return $recipients;
	291	+ }
	292	+} /* class FeedWordPressDiagnostic */
209	293
210		-function log_feedwordpress_check_feed ($feed) {
211		- $uri = $feed['link/uri']; $name = $feed['link/name'];
212		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] Examining $name <$uri>");
	294	+function debug_out_human_readable_bytes ($quantity) {
	295	+ $quantity = (int) $quantity;
	296	+ $magnitude = 'B';
	297	+ $orders = array('KB', 'MB', 'GB', 'TB');
	298	+ while (($quantity > (1024*100)) and (count($orders) > 0)) :
	299	+ $quantity = floor($quantity / 1024);
	300	+ $magnitude = array_shift($orders);
	301	+ endwhile;
	302	+ return "${quantity} ${magnitude}";
213	303	}
214	304
215		-function log_feedwordpress_update_complete ($delta) {
216		- $mesg = array();
217		- if (isset($delta['new'])) $mesg[] = 'added '.$delta['new'].' new posts';
218		- if (isset($delta['updated'])) $mesg[] = 'updated '.$delta['updated'].' existing posts';
219		- if (empty($mesg)) $mesg[] = 'nothing changed';
	305	+function debug_out_feedwordpress_footer () {
	306	+ if (FeedWordPress::diagnostic_on('memory_usage')) :
	307	+ if (function_exists('memory_get_usage')) :
	308	+ FeedWordPress::diagnostic ('memory_usage', "Memory: Current usage: ".debug_out_human_readable_bytes(memory_get_usage()));
	309	+ endif;
	310	+ if (function_exists('memory_get_peak_usage')) :
	311	+ FeedWordPress::diagnostic ('memory_usage', "Memory: Peak usage: ".debug_out_human_readable_bytes(memory_get_peak_usage()));
	312	+ endif;
	313	+ endif;
	314	+} /* debug_out_feedwordpress_footer() */
220	315
221		- error_log("[".date('Y-m-d H:i:s')."][feedwordpress] "
222		- .(is_null($delta) ? "Error: I don't syndicate that URI"
223		- : implode(' and ', $mesg)));
224		-}
225		-
226	316	################################################################################
227		-## LEGACY API: Replicate or mock up functions for legacy support purposes ######
	317	+## TEMPLATE API: functions to make your templates syndication-aware ############
228	318	################################################################################
229	319
230		-if (!function_exists('get_option')) {
231		- function get_option ($option) {
232		- return get_settings($option);
233		- }
234		-}
235		-if (!function_exists('current_user_can')) {
236		- $legacy_capability_hack = true;
237		- function current_user_can ($task) {
238		- global $user_level;
	320	+/**
	321	+ * is_syndicated: Tests whether the current post in a Loop context, or a post
	322	+ * given by ID number, was syndicated by FeedWordPress. Useful for templates
	323	+ * to determine whether or not to retrieve syndication-related meta-data in
	324	+ * displaying a post.
	325	+ *
	326	+ * @param int $id The post to check for syndicated status. Defaults to the current post in a Loop context.
	327	+ * @return bool TRUE if the post's meta-data indicates it was syndicated; FALSE otherwise
	328	+ */
	329	+function is_syndicated ($id = NULL) {
	330	+ return (strlen(get_syndication_feed_id($id)) > 0);
	331	+} /* function is_syndicated() */
239	332
240		- $can = false;
	333	+function feedwordpress_display_url ($url, $before = 60, $after = 0) {
	334	+ $bits = parse_url($url);
	335	+
	336	+ // Strip out crufty subdomains
	337	+ if (isset($bits['host'])) :
	338	+ $bits['host'] = preg_replace('/^www[0-9]*\./i', '', $bits['host']);
	339	+ endif;
	340	+
	341	+ // Reassemble bit-by-bit with minimum of crufty elements
	342	+ $url = (isset($bits['user'])?$bits['user'].'@':'')
	343	+ .(isset($bits['host'])?$bits['host']:'')
	344	+ .(isset($bits['path'])?$bits['path']:'')
	345	+ .(isset($uri_bits['port'])?':'.$uri_bits['port']:'')
	346	+ .(isset($bits['query'])?'?'.$bits['query']:'');
241	347
242		- // This is **not** a full replacement for current_user_can. It
243		- // is only for checking the capabilities we care about via the
244		- // WordPress 1.5 user levels.
245		- switch ($task) {
246		- case 'manage_options':
247		- $can = ($user_level >= 6);
248		- break;
249		- case 'manage_links':
250		- $can = ($user_level >= 5);
251		- break;
252		- } /* switch */
253		- return $can;
254		- }
255		-} else {
256		- $legacy_capability_hack = false;
257		-}
258		-if (!function_exists('sanitize_user')) {
259		- function sanitize_user ($text, $strict) {
260		- return $text; // Don't munge it if it wasn't munged going in...
261		- }
262		-}
263		-if (!function_exists('wp_insert_user')) {
264		- function wp_insert_user ($userdata) {
265		- #-- Help WordPress 1.5.x quack like a duck
266		- $login = $userdata['user_login'];
267		- $author = $userdata['display_name'];
268		- $nice_author = $userdata['user_nicename'];
269		- $email = $userdata['user_email'];
270		- $url = $userdata['user_url'];
	348	+ if (strlen($url) > ($before+$after)) :
	349	+ $url = substr($url, 0, $before).'…'.substr($url, 0 - $after, $after);
	350	+ endif;
271	351
272		- $wpdb->query (
273		- "INSERT INTO $wpdb->users
274		- SET
275		- ID='0',
276		- user_login='$login',
277		- user_firstname='$author',
278		- user_nickname='$author',
279		- user_nicename='$nice_author',
280		- user_description='$author',
281		- user_email='$email',
282		- user_url='$url'");
283		- $id = $wpdb->insert_id;
284		-
285		- return $id;
286		- }
287		-}
	352	+ return $url;
	353	+} /* feedwordpress_display_url () */
288	354
289		-function fwp_category_checklist ($post_id = 0, $descendents_and_self = 0, $selected_cats = false) {
290		- if (function_exists('wp_category_checklist')) :
291		- wp_category_checklist($post_id, $descendents_and_self, $selected_cats);
292		- else :
293		- global $checked_categories;
294		-
295		- // selected_cats is an array of integer cat_IDs / term_ids for
296		- // the categories that should be checked
297		- $cats = array();
298		- if ($post_id) : $cats = wp_get_post_categories($post_id);
299		- else : $cats = $selected_cats;
300		- endif;
301		-
302		- $checked_categories = $cats;
303		- dropdown_categories();
	355	+function get_syndication_source_property ($original, $id, $local, $remote = NULL) {
	356	+ $ret = NULL;
	357	+ if (is_null($original)) :
	358	+ $original = FeedWordPress::use_aggregator_source_data();
304	359	endif;
305		-}
306		-################################################################################
307		-## TEMPLATE API: functions to make your templates syndication-aware ############
308		-################################################################################
	360	+
	361	+ if (is_null($remote)) :
	362	+ $remote = $local . '_original';
	363	+ endif;
	364	+
	365	+ $vals = ($original ? get_post_custom_values($remote, $id) : array());
	366	+ if (count($vals) < 1) :
	367	+ $vals = get_post_custom_values($local, $id);
	368	+ endif;
	369	+
	370	+ if (count($vals) > 0) :
	371	+ $ret = $vals[0];
	372	+ endif;
	373	+ return $ret;
	374	+} /* function get_syndication_source_property () */
309	375
310		-function is_syndicated () { return (strlen(get_syndication_feed_id()) > 0); }
	376	+function the_syndication_source_link ($original = NULL, $id = NULL) { echo get_syndication_source_link($original, $id); }
	377	+function get_syndication_source_link ($original = NULL, $id = NULL) {
	378	+ return get_syndication_source_property($original, $id, 'syndication_source_uri');
	379	+} /* function get_syndication_source_link() */
311	380
312		-function the_syndication_source_link () { echo get_syndication_source_link(); }
313		-function get_syndication_source_link () { list($n) = get_post_custom_values('syndication_source_uri'); return $n; }
	381	+function the_syndication_source ($original = NULL, $id = NULL) { echo get_syndication_source($original, $id); }
	382	+function get_syndication_source ($original = NULL, $id = NULL) {
	383	+ $ret = get_syndication_source_property($original, $id, 'syndication_source');
	384	+ if (is_null($ret) or strlen(trim($ret)) == 0) : // Fall back to URL of blog
	385	+ $ret = feedwordpress_display_url(get_syndication_source_link());
	386	+ endif;
	387	+ return $ret;
	388	+} /* function get_syndication_source() */
314	389
315		-function get_syndication_source () { list($n) = get_post_custom_values('syndication_source'); return $n; }
316		-function the_syndication_source () { echo get_syndication_source(); }
	390	+function the_syndication_feed ($original = NULL, $id = NULL) { echo get_syndication_feed($original, $id); }
	391	+function get_syndication_feed ($original = NULL, $id = NULL) {
	392	+ return get_syndication_source_property($original, $id, 'syndication_feed');
	393	+} /* function get_syndication_feed() */
317	394
318		-function get_syndication_feed () { list($u) = get_post_custom_values('syndication_feed'); return $u; }
319		-function the_syndication_feed () { echo get_syndication_feed (); }
	395	+function the_syndication_feed_guid ($original = NULL, $id = NULL) { echo get_syndication_feed_guid($original, $id); }
	396	+function get_syndication_feed_guid ($original = NULL, $id = NULL) {
	397	+ $ret = get_syndication_source_property($original, $id, 'syndication_source_id');
	398	+ if (is_null($ret) or strlen(trim($ret))==0) : // Fall back to URL of feed
	399	+ $ret = get_syndication_feed();
	400	+ endif;
	401	+ return $ret;
	402	+} /* function get_syndication_feed_guid () */
320	403
321		-function get_syndication_feed_id () { list($u) = get_post_custom_values('syndication_feed_id'); return $u; }
322		-function the_syndication_feed_id () { echo get_syndication_feed_id(); }
	404	+function get_syndication_feed_id ($id = NULL) { list($u) = get_post_custom_values('syndication_feed_id', $id); return $u; }
	405	+function the_syndication_feed_id ($id = NULL) { echo get_syndication_feed_id($id); }
323	406
324	407	$feedwordpress_linkcache = array (); // only load links from database once
	408	+function get_syndication_feed_object ($id = NULL) {
	409	+ global $feedwordpress_linkcache;
325	410
326		-function get_feed_meta ($key) {
327		- global $wpdb, $feedwordpress_linkcache;
328		- $feed_id = get_syndication_feed_id();
	411	+ $link = NULL;
329	412
330		- $ret = NULL;
	413	+ $feed_id = get_syndication_feed_id($id);
331	414	if (strlen($feed_id) > 0):
332	415	if (isset($feedwordpress_linkcache[$feed_id])) :
333	416	$link = $feedwordpress_linkcache[$feed_id];
334	417	else :
335		- $link =& new SyndicatedLink($feed_id);
	418	+ $link = new SyndicatedLink($feed_id);
336	419	$feedwordpress_linkcache[$feed_id] = $link;
337	420	endif;
	421	+ endif;
	422	+ return $link;
	423	+}
338	424
	425	+function get_feed_meta ($key, $id = NULL) {
	426	+ $ret = NULL;
	427	+
	428	+ $link = get_syndication_feed_object($id);
	429	+ if (is_object($link) and isset($link->settings[$key])) :
339	430	$ret = $link->settings[$key];
340	431	endif;
341	432	return $ret;
342	433	} /* get_feed_meta() */
343	434
344		-function get_syndication_permalink () {
345		- list($u) = get_post_custom_values('syndication_permalink'); return $u;
	435	+function get_syndication_permalink ($id = NULL) {
	436	+ list($u) = get_post_custom_values('syndication_permalink', $id); return $u;
346	437	}
347		-function the_syndication_permalink () {
348		- echo get_syndication_permalink();
	438	+function the_syndication_permalink ($id = NULL) {
	439	+ echo get_syndication_permalink($id);
349	440	}
350	441
	442	+/**
	443	+ * get_local_permalink: returns a string containing the internal permalink
	444	+ * for a post (whether syndicated or not) on your local WordPress installation.
	445	+ * This may be useful if you want permalinks to point to the original source of
	446	+ * an article for most purposes, but want to retrieve a URL for the local
	447	+ * representation of the post for one or two limited purposes (for example,
	448	+ * linking to a comments page on your local aggregator site).
	449	+ *
	450	+ * @param $id The numerical ID of the post to get the permalink for. If empty,
	451	+ * defaults to the current post in a Loop context.
	452	+ * @return string The URL of the local permalink for this post.
	453	+ *
	454	+ * @uses get_permalink()
	455	+ * @global $feedwordpress_the_original_permalink
	456	+ *
	457	+ * @since 2010.0217
	458	+ */
	459	+function get_local_permalink ($id = NULL) {
	460	+ global $feedwordpress_the_original_permalink;
	461	+
	462	+ // get permalink, and thus activate filter and force global to be filled
	463	+ // with original URL.
	464	+ $url = get_permalink($id);
	465	+ return $feedwordpress_the_original_permalink;
	466	+} /* get_local_permalink() */
	467	+
	468	+/**
	469	+ * the_original_permalink: displays the contents of get_original_permalink()
	470	+ *
	471	+ * @param $id The numerical ID of the post to get the permalink for. If empty,
	472	+ * defaults to the current post in a Loop context.
	473	+ *
	474	+ * @uses get_local_permalinks()
	475	+ * @uses apply_filters
	476	+ *
	477	+ * @since 2010.0217
	478	+ */
	479	+function the_local_permalink ($id = NULL) {
	480	+ print apply_filters('the_permalink', get_local_permalink($id));
	481	+} /* function the_local_permalink() */
	482	+
351	483	################################################################################
352	484	## FILTERS: syndication-aware handling of post data for templates and feeds ####
353	485	################################################################################
354	486
355	487	$feedwordpress_the_syndicated_content = NULL;
	488	+$feedwordpress_the_original_permalink = NULL;
356	489
357	490	function feedwordpress_preserve_syndicated_content ($text) {
358	491	global $feedwordpress_the_syndicated_content;
359	492
360		- if ( is_syndicated() ) :
	493	+ $globalExpose = (get_option('feedwordpress_formatting_filters') == 'yes');
	494	+ $localExpose = get_post_custom_values('_feedwordpress_formatting_filters');
	495	+ $expose = ($globalExpose or ((count($localExpose) > 0) and $localExpose[0]));
	496	+
	497	+ if ( is_syndicated() and !$expose ) :
361	498	$feedwordpress_the_syndicated_content = $text;
362	499	else :
363	500	$feedwordpress_the_syndicated_content = NULL;
364	501	endif;
		@@ -374,1381 +511,246 @@
374	511
375	512	return $text;
376	513	}
377	514
378		-function syndication_permalink ($permalink = '') {
379		- if (get_option('feedwordpress_munge_permalink') != 'no'):
380		- $uri = get_syndication_permalink();
381		- return ((strlen($uri) > 0) ? $uri : $permalink);
382		- else:
383		- return $permalink;
384		- endif;
385		-} // function syndication_permalink ()
386		-
387		-################################################################################
388		-## UPGRADE INTERFACE: Have users upgrade DB from older versions of FWP #########
389		-################################################################################
390		-
391		-function fwp_upgrade_page () {
392		- if (isset($GLOBALS['fwp_post']['action']) and $GLOBALS['fwp_post']['action']=='Upgrade') :
393		- $ver = get_option('feedwordpress_version');
394		- if (get_option('feedwordpress_version') != FEEDWORDPRESS_VERSION) :
395		- echo "<div class=\"wrap\">\n";
396		- echo "<h2>Upgrading FeedWordPress...</h2>";
397		-
398		- $feedwordpress =& new FeedWordPress;
399		- $feedwordpress->upgrade_database();
400		- echo "<p><strong>Done!</strong> Upgraded database to version ".FEEDWORDPRESS_VERSION.".</p>\n";
401		- echo "<form action=\"\" method=\"get\">\n";
402		- echo "<div class=\"submit\"><input type=\"hidden\" name=\"page\" value=\"".basename(__FILE__)."\" />";
403		- echo "<input type=\"submit\" value=\"Continue &raquo;\" /></form></div>\n";
404		- echo "</div>\n";
405		- return;
406		- else :
407		- echo "<div class=\"updated\"><p>Already at version ".FEEDWORDPRESS_VERSION."!</p></div>";
408		- endif;
409		- endif;
	515	+function feedwordpress_item_feed_data () {
	516	+ // In a post context....
	517	+ if (is_syndicated()) :
410	518	?>
411		-<div class="wrap">
412		-<h2>Upgrade FeedWordPress</h2>
413		-
414		-<p>It appears that you have installed FeedWordPress
415		-<?php echo FEEDWORDPRESS_VERSION; ?> as an upgrade to an existing installation of
416		-FeedWordPress. That's no problem, but you will need to take a minute out first
417		-to upgrade your database: some necessary changes in how the software keeps
418		-track of posts and feeds will cause problems such as duplicate posts and broken
419		-templates if we were to continue without the upgrade.</p>
420		-
421		-<p>Note that most of FeedWordPress's functionality is temporarily disabled
422		-until we have successfully completed the upgrade. Everything should begin
423		-working as normal again once the upgrade is complete. There's extraordinarily
424		-little chance of any damage as the result of the upgrade, but if you're paranoid
425		-like me you may want to back up your database before you proceed.</p>
426		-
427		-<p>This may take several minutes for a large installation.</p>
428		-
429		-<form action="" method="post">
430		-<div class="submit"><input type="submit" name="action" value="Upgrade" /></div>
431		-</form>
432		-</div>
	519	+<source>
	520	+ <title><?php print htmlspecialchars(get_syndication_source()); ?></title>
	521	+ <link rel="alternate" type="text/html" href="<?php print htmlspecialchars(get_syndication_source_link()); ?>" />
	522	+ <link rel="self" href="<?php print htmlspecialchars(get_syndication_feed()); ?>" />
433	523	<?php
434		-} // function fwp_upgrade_page ()
435		-
436		-################################################################################
437		-## ADMIN MENU ADD-ONS: implement Dashboard management pages ####################
438		-################################################################################
439		-
440		-function fwp_add_pages () {
441		- global $legacy_capability_hack;
442		- global $fwp_path;
443		-
444		- if ($legacy_capability_hack) :
445		- // old & busted: numeric user levels
446		- $manage_links = 5;
447		- $manage_options = 6;
448		- else :
449		- // new hotness: named capabilities
450		- $manage_links = 'manage_links';
451		- $manage_options = 'manage_options';
452		- endif;
453		-
454		- //add_submenu_page('plugins.php', 'Akismet Configuration', 'Akismet Configuration', 'manage_options', 'syndication-manage-page', 'fwp_syndication_manage_page');
455		- add_menu_page('Syndicated Sites', 'Syndication', $manage_links, $fwp_path.'/'.basename(__FILE__), 'fwp_syndication_manage_page');
456		- add_submenu_page($fwp_path.'/'.basename(__FILE__), 'Syndication Options', 'Options', $manage_options, $fwp_path.'/syndication-options.php');
457		- add_options_page('Syndication Options', 'Syndication', $manage_options, $fwp_path.'/syndication-options.php');
458		-} // function fwp_add_pages () */
459		-
460		-function fwp_linkedit_single_submit ($status = NULL) {
461		- global $wp_db_version;
462		- if (isset($wp_db_version) and $wp_db_version >= FWP_SCHEMA_25) :
	524	+ $id = get_syndication_feed_guid();
	525	+ if (strlen($id) > 0) :
463	526	?>
464		-<div class="submitbox" id="submitlink">
465		-<div id="previewview"></div>
466		-<div class="inside">
467		-<?php if (!is_null($status)) : ?>
468		- <p><strong>Publication</strong></p>
469		- <p>When a new post is syndicated from this feed...</p>
470		- <select name="feed_post_status">
471		- <option value="site-default" <?php echo $status['post']['site-default']; ?>> Use
472		- Syndication Options setting</option>
473		- <option value="publish" <?php echo $status['post']['publish']; ?>>Publish it immediately</option>
474		-
475		- <?php if (SyndicatedPost::use_api('post_status_pending')) : ?>
476		- <option value="pending" <?php echo $status['post']['pending']; ?>>Hold it Pending Review</option>
477		- <?php endif; ?>
478		-
479		- <option value="draft" <?php echo $status['post']['draft']; ?>>Save it as a draft</option>
480		- <option value="private" <?php echo $status['post']['private']; ?>>Keep it private</option>
481		- </select>
482		-<?php endif; ?>
483		-</div>
484		-
485		-<p class="submit">
486		-<input type="submit" name="submit" value="<?php _e('Save') ?>" />
487		-</p>
488		-</div>
	527	+ <id><?php print htmlspecialchars($id); ?></id>
489	528	<?php
490	529	endif;
491		-}
492		-
493		-function fwp_linkedit_periodic_submit ($caption = NULL) {
494		- global $wp_db_version;
495		- if (!(isset($wp_db_version) and $wp_db_version >= FWP_SCHEMA_25)) :
496		- if (is_null($caption)) : $caption = __('Save Changes &raquo;'); endif;
497		-?>
498		-<p class="submit">
499		-<input type="submit" name="submit" value="<?php print $caption; ?>" />
500		-</p>
	530	+ $updated = get_feed_meta('feed/updated');
	531	+ if (strlen($updated) > 0) : ?>
	532	+ <updated><?php print $updated; ?></updated>
501	533	<?php
502	534	endif;
503		-}
504		-
505		-function fwp_option_box_opener ($legend, $id, $class = "stuffbox") {
506		- global $wp_db_version;
507		- if (isset($wp_db_version) and $wp_db_version >= FWP_SCHEMA_25) :
508	535	?>
509		-<div id="<?php print $id; ?>" class="<?php print $class; ?>">
510		-<h3><?php print htmlspecialchars($legend); ?></h3>
511		-<div class="inside">
	536	+</source>
512	537	<?php
513		- else :
514		-?>
515		-<fieldset class="options"><legend><?php print htmlspecialchars($legend); ?></legend>
516		-<?php
517	538	endif;
518	539	}
519	540
520		-function fwp_option_box_closer () {
521		- global $wp_db_version;
522		- if (isset($wp_db_version) and $wp_db_version >= FWP_SCHEMA_25) :
523		-?>
524		- </div> <!-- class="inside" -->
525		- </div> <!-- class="stuffbox" -->
526		-<?php
527		- else :
528		-?>
529		-</fieldset>
530		-<?php
531		- endif;
532		-}
	541	+/**
	542	+ * syndication_permalink: Allow WordPress to use the original remote URL of
	543	+ * syndicated posts as their permalink. Can be turned on or off by by setting in
	544	+ * Syndication => Posts & Links. Saves the old internal permalink in a global
	545	+ * variable for later use.
	546	+ *
	547	+ * @param string $permalink The internal permalink
	548	+ * @return string The new permalink. Same as the old if the post is not
	549	+ * syndicated, or if FWP is set to use internal permalinks, or if the post
	550	+ * was syndicated, but didn't have a proper permalink recorded.
	551	+ *
	552	+ * @uses SyndicatedLink::setting()
	553	+ * @uses get_syndication_permalink()
	554	+ * @uses get_syndication_feed_object()
	555	+ * @uses url_to_postid()
	556	+ * @global $id
	557	+ * @global $feedwordpress_the_original_permalink
	558	+ */
	559	+function syndication_permalink ($permalink = '', $post = null, $leavename = false) {
	560	+ global $id;
	561	+ global $feedwordpress_the_original_permalink;
	562	+
	563	+ // Save the local permalink in case we need to retrieve it later.
	564	+ $feedwordpress_the_original_permalink = $permalink;
533	565
534		-function fwp_tags_box ($tags) {
535		- if (!is_array($tags)) : $tags = array(); endif;
536		-?>
537		-<div id="tagsdiv" class="postbox">
538		- <h3><?php _e('Tags') ?></h3>
539		- <p style="font-size:smaller;font-style:bold;margin:0">Place <?php print $object; ?> under...</p>
540		- <div class="inside">
541		- <p id="jaxtag"><input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo implode(",", $tags); ?>" /></p>
542		- <div id="tagchecklist"></div>
543		- </div>
544		-</div>
545		-<?php
546		-}
547		-
548		-function fwp_category_box ($checked, $object, $tags = array()) {
549		- global $wp_db_version;
550		-
551		- if (isset($wp_db_version) and $wp_db_version >= FWP_SCHEMA_25) : // WordPress 2.5.x
552		-?>
553		-<div id="category-adder" class="wp-hidden-children">
554		- <h4><a id="category-add-toggle" href="#category-add" class="hide-if-no-js" tabindex="3"><?php _e( '+ Add New Category' ); ?></a></h4>
555		- <p id="category-add" class="wp-hidden-child">
556		- <input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" tabindex="3" />
557		- <?php wp_dropdown_categories( array( 'hide_empty' => 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('Parent category'), 'tab_index' => 3 ) ); ?>
558		- <input type="button" id="category-add-sumbit" class="add:categorychecklist:category-add button" value="<?php _e( 'Add' ); ?>" tabindex="3" />
559		- <?php wp_nonce_field( 'add-category', '_ajax_nonce', false ); ?>
560		- <span id="category-ajax-response"></span>
561		- </p>
562		-</div>
563		-
564		-<ul id="category-tabs">
565		- <li class="ui-tabs-selected"><a href="#categories-all" tabindex="3"><?php _e( 'All posts' ); ?></a>
566		- <p style="font-size:smaller;font-style:bold;margin:0">Give <?php print $object; ?> these categories</p>
567		-</li>
568		-</ul>
569		-
570		-<div id="categories-all" class="ui-tabs-panel">
571		- <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
572		- <?php fwp_category_checklist(NULL, false, $checked) ?>
573		- </ul>
574		-</div>
575		-<?php
576		- elseif (isset($wp_db_version) and $wp_db_version >= FWP_SCHEMA_20) : // WordPress 2.x
577		-?>
578		- <div id="moremeta">
579		- <div id="grabit" class="dbx-group">
580		- <fieldset id="categorydiv" class="dbx-box">
581		- <h3 class="dbx-handle"><?php _e('Categories') ?></h3>
582		- <div class="dbx-content">
583		- <p style="font-size:smaller;font-style:bold;margin:0">Place <?php print $object; ?> under...</p>
584		- <p id="jaxcat"></p>
585		- <ul id="categorychecklist"><?php fwp_category_checklist(NULL, false, $checked); ?></ul></div>
586		- </fieldset>
587		- </div>
588		- </div>
589		-<?php
590		- else : // WordPress 1.5
591		-?>
592		- <fieldset id="categorydiv" style="width: 20%; margin-right: 2em">
593		- <legend><?php _e('Categories') ?></legend>
594		- <p style="font-size:smaller;font-style:bold;margin:0">Place <?php print $object; ?> under...</p>
595		- <div style="height: 20em"><?php fwp_category_checklist(NULL, false, $checked); ?></div>
596		- </fieldset>
597		-<?php
598		- endif;
599		-}
600		-
601		-function update_feeds_mention ($feed) {
602		- echo "<li>Updating <cite>".$feed['link/name']."</cite> from &lt;<a href=\""
603		- .$feed['link/uri']."\">".$feed['link/uri']."</a>&gt; ...</li>\n";
604		- flush();
605		-}
606		-
607		-function fwp_syndication_manage_page () {
608		- global $wpdb;
609		-
610		- if (FeedWordPress::needs_upgrade()) :
611		- fwp_upgrade_page();
612		- return;
613		- endif;
614		-
615		-?>
616		-<?php $cont = true;
617		-if (isset($_REQUEST['action'])):
618		- if ($_REQUEST['action'] == 'feedfinder') : $cont = fwp_feedfinder_page();
619		- elseif ($_REQUEST['action'] == 'switchfeed') : $cont = fwp_switchfeed_page();
620		- elseif ($_REQUEST['action'] == 'linkedit') : $cont = fwp_linkedit_page();
621		- elseif ($_REQUEST['action'] == 'Unsubscribe from Checked Links' or $_REQUEST['action'] == 'Unsubscribe') : $cont = fwp_multidelete_page();
622		- endif;
623		-endif;
624		-
625		-if ($cont):
626		-?>
627		-<?php
628		- $links = FeedWordPress::syndicated_links();
629		-
630		- if (isset($_POST['update']) or isset($_POST['action']) or isset($_POST['update_uri'])) :
631		- $fwp_update_invoke = 'post';
	566	+ if (is_object($post) and isset($post->ID) and !empty($post->ID)) :
	567	+ // Use the post ID we've been provided with.
	568	+ $postId = $post->ID;
	569	+ elseif (is_string($permalink) and strlen($permalink) > 0) :
	570	+ // Map this permalink to a post ID so we can get the correct
	571	+ // permalink even outside of the Post Loop. Props Björn.
	572	+ $postId = url_to_postid($permalink);
632	573	else :
633		- $fwp_update_invoke = 'get';
	574	+ // If the permalink string is empty but Post Loop context
	575	+ // provides an id.
	576	+ $postId = $id;
634	577	endif;
635	578
636		- $update_set = array();
637		- if (isset($_POST['link_ids']) and is_array($_POST['link_ids']) and ($_POST['action']=='Update Checked Links')) :
638		- $targets = $wpdb->get_results("
639		- SELECT * FROM $wpdb->links
640		- WHERE link_id IN (".implode(",",$_POST['link_ids']).")
641		- ");
642		- if (is_array($targets)) :
643		- foreach ($targets as $target) :
644		- $update_set[] = $target->link_rss;
645		- endforeach;
646		- else : // This should never happen
647		- FeedWordPress::critical_bug('fwp_syndication_manage_page::targets', $targets, __LINE__);
648		- endif;
649		- elseif (isset($_POST['update_uri'])) :
650		- $update_set[] = $_POST['update_uri'];
	579	+ $munge = false;
	580	+ $link = get_syndication_feed_object($postId);
	581	+ if (is_object($link)) :
	582	+ $munge = ($link->setting('munge permalink', 'munge_permalink', 'yes') != 'no');
651	583	endif;
652	584
653		- if ($fwp_update_invoke != 'get' and count($update_set) > 0) : // Only do things with side-effects for HTTP POST or command line
654		- $feedwordpress =& new FeedWordPress;
655		- add_action('feedwordpress_check_feed', 'update_feeds_mention');
656		-
657		- echo "<div class=\"updated\">\n";
658		- echo "<ul>\n";
659		- $tdelta = NULL;
660		- foreach ($update_set as $uri) :
661		- if ($uri == '*') : $uri = NULL; endif;
662		- $delta = $feedwordpress->update($uri);
663		- if (!is_null($delta)) :
664		- if (is_null($tdelta)) :
665		- $tdelta = $delta;
666		- else :
667		- $tdelta['new'] += $delta['new'];
668		- $tdelta['updated'] += $delta['updated'];
669		- endif;
670		- else :
671		- echo "<li><p><strong>Error:</strong> There was a problem updating <a href=\"$uri\">$uri</a></p></li>\n";
672		- endif;
673		- endforeach;
674		- echo "</ul>\n";
675		-
676		- if (!is_null($tdelta)) :
677		- $mesg = array();
678		- if (isset($delta['new'])) : $mesg[] = ' '.$tdelta['new'].' new posts were syndicated'; endif;
679		- if (isset($delta['updated'])) : $mesg[] = ' '.$tdelta['updated'].' existing posts were updated'; endif;
680		- echo "<p>Update complete.".implode(' and', $mesg)."</p>";
681		- echo "\n"; flush();
682		- endif;
683		- echo "</div> <!-- class=\"updated\" -->\n";
	585	+ if ($munge):
	586	+ $uri = get_syndication_permalink($postId);
	587	+ $permalink = ((strlen($uri) > 0) ? $uri : $permalink);
684	588	endif;
	589	+ return $permalink;
	590	+} /* function syndication_permalink () */
685	591
686		- ?>
687		- <div class="wrap">
688		- <form action="" method="POST">
689		- <h2>Update feeds now</h2>
690		- <p>Check currently scheduled feeds for new and updated posts.</p>
691		-
692		-<?php if (!get_option('feedwordpress_automatic_updates')) : ?>
693		- <p><strong>Note:</strong> Automatic updates are currently turned
694		- <strong>off</strong>. New posts from your feeds will not be syndicated
695		- until you manually check for them here. You can turn on automatic
696		- updates under <a href="admin.php?page=<?php print $GLOBALS['fwp_path']; ?>/syndication-options.php">Syndication
697		- Options</a>.</p>
698		-<?php endif; ?>
699		-
700		-
701		- <div class="submit"><input type="hidden" name="update_uri" value="*" /><input type="submit" name="update" value="Update" /></div>
702		- </form>
703		- </div> <!-- class="wrap" -->
704		-
705		- <form action="admin.php?page=<?php print $GLOBALS['fwp_path']; ?>/<?php echo basename(__FILE__); ?>" method="post">
706		- <div class="wrap">
707		- <h2>Syndicated Sites</h2>
708		-<?php $alt_row = true;
709		- if ($links): ?>
710		-
711		-<table width="100%" cellpadding="3" cellspacing="3">
712		-<tr>
713		-<th width="20%"><?php _e('Name'); ?></th>
714		-<th width="40%"><?php _e('Feed'); ?></th>
715		-<th colspan="4"><?php _e('Action'); ?></th>
716		-</tr>
717		-
718		-<?php foreach ($links as $link):
719		- $alt_row = !$alt_row; ?>
720		-<tr<?php echo ($alt_row?' class="alternate"':''); ?>>
721		-<td><a href="<?php echo wp_specialchars($link->link_url, 'both'); ?>"><?php echo wp_specialchars($link->link_name, 'both'); ?></a></td>
722		-<?php
723		- if (strlen($link->link_rss) > 0):
724		- $caption='Switch Feed';
725		- $uri_bits = parse_url($link->link_rss);
726		- $uri_bits['host'] = preg_replace('/^www\./i', '', $uri_bits['host']);
727		- $display_uri =
728		- (isset($uri_bits['user'])?$uri_bits['user'].'@':'')
729		- .(isset($uri_bits['host'])?$uri_bits['host']:'')
730		- .(isset($uri_bits['port'])?':'.$uri_bits['port']:'')
731		- .(isset($uri_bits['path'])?$uri_bits['path']:'')
732		- .(isset($uri_bits['query'])?'?'.$uri_bits['query']:'');
733		- if (strlen($display_uri) > 32) : $display_uri = substr($display_uri, 0, 32).'&#8230;'; endif;
734		-?>
735		- <td>
736		- <strong><a href="<?php echo wp_specialchars($link->link_rss, 'both'); ?>"><?php echo wp_specialchars($display_uri, 'both'); ?></a></strong></td>
737		-<?php
738		- else:
739		- $caption='Find Feed';
740		-?>
741		- <td style="background-color:#FFFFD0"><p><strong>no
742		- feed assigned</strong></p></td>
743		-<?php
744		- endif;
745		-?>
746		- <td><a href="admin.php?page=<?php print $GLOBALS['fwp_path'] ?>/<?php echo basename(__FILE__); ?>&amp;link_id=<?php echo $link->link_id; ?>&amp;action=linkedit" class="edit"><?php _e('Edit')?></a></td>
747		- <td><a href="admin.php?page=<?php print $GLOBALS['fwp_path'] ?>/<?php echo basename(__FILE__); ?>&amp;link_id=<?php echo $link->link_id; ?>&amp;action=feedfinder" class="edit"><?php echo $caption; ?></a></td>
748		- <td><a href="admin.php?page=<?php print $GLOBALS['fwp_path'] ?>/<?php echo basename(__FILE__); ?>&amp;link_id=<?php echo $link->link_id; ?>&amp;action=Unsubscribe" class="delete"><?php _e('Unsubscribe'); ?></a></td>
749		- <td><input type="checkbox" name="link_ids[]" value="<?php echo $link->link_id; ?>" /></td>
750		-<?php
751		- echo "\n\t</tr>";
752		- endforeach;
753		- else:
754		-?>
755		-
756		-<p>There are no websites currently listed for syndication.</p>
757		-
758		-<?php endif; ?>
759		- </table>
760		-
761		- <br/><hr/>
762		- <div class="submit"><input type="submit" class="delete" name="action" value="Unsubscribe from Checked Links" />
763		- <input type="submit" name="action" value="Update Checked Links" /></div>
764		- </div> <!-- class="wrap" -->
765		- </form>
766		-
767		- <div class="wrap">
768		- <form action="admin.php?page=<?php print $GLOBALS['fwp_path'] ?>/<?php echo basename(__FILE__); ?>" method="post">
769		- <h2>Add a new syndicated site:</h2>
770		- <div>
771		- <label for="add-uri">Website or newsfeed:</label>
772		- <input type="text" name="lookup" id="add-uri" value="URI" size="64" />
773		- <input type="hidden" name="action" value="feedfinder" />
774		- </div>
775		- <div class="submit"><input type="submit" value="Syndicate &raquo;" /></div>
776		- </form>
777		- </div> <!-- class="wrap" -->
778		-<?php
779		-endif;
780		-}
781		-
782		-function fwp_feedfinder_page () {
783		- global $wpdb;
784		-
785		- $lookup = (isset($_REQUEST['lookup'])?$_REQUEST['lookup']:NULL);
786		-
787		- if (isset($_REQUEST['link_id']) and ($_REQUEST['link_id']!=0)):
788		- $link_id = $_REQUEST['link_id'];
789		- if (!is_numeric($link_id)) : FeedWordPress::critical_bug('fwp_feedfinder_page::link_id', $link_id, __LINE__); endif;
790		-
791		- $link = $wpdb->get_row("SELECT * FROM $wpdb->links WHERE link_id='".$wpdb->escape($link_id)."'");
792		- if (is_object($link)):
793		- if (is_null($lookup)) $lookup = $link->link_url;
794		- $name = wp_specialchars($link->link_name, 'both');
795		- else:
796		- die (__("Cheatin' uh ?"));
797		- endif;
798		- else:
799		- $name = "New Syndicated Feed";
800		- $link_id = 0;
	592	+/**
	593	+ * syndication_permalink_escaped: Escape XML special characters in syndicated
	594	+ * permalinks when used in feed contexts and HTML display contexts.
	595	+ *
	596	+ * @param string $permalink
	597	+ * @return string
	598	+ *
	599	+ * @uses is_syndicated()
	600	+ * @uses FeedWordPress::munge_permalinks()
	601	+ *
	602	+ */
	603	+function syndication_permalink_escaped ($permalink) {
	604	+ /* FIXME: This should review link settings not just global settings */
	605	+ if (is_syndicated() and FeedWordPress::munge_permalinks()) :
	606	+ // This is a foreign link; WordPress can't vouch for its not
	607	+ // having any entities that need to be &-escaped. So we'll do
	608	+ // it here.
	609	+ $permalink = esc_html($permalink);
801	610	endif;
802		-?>
803		- <div class="wrap">
804		- <h2>Feed Finder: <?php echo $name; ?></h2>
805		-<?php
806		- $f =& new FeedFinder($lookup);
807		- $feeds = $f->find();
808		- if (count($feeds) > 0):
809		- foreach ($feeds as $key => $f):
810		- $rss = fetch_rss($f);
811		- if ($rss):
812		- $feed_title = isset($rss->channel['title'])?$rss->channel['title']:$rss->channel['link'];
813		- $feed_link = isset($rss->channel['link'])?$rss->channel['link']:'';
814		-?>
815		- <form action="admin.php?page=<?php print $GLOBALS['fwp_path'] ?>/<?php echo basename(__FILE__); ?>" method="post">
816		- <fieldset style="clear: both">
817		- <legend><?php echo $rss->feed_type; ?> <?php echo $rss->feed_version; ?> feed</legend>
	611	+ return $permalink;
	612	+} /* function syndication_permalink_escaped() */
818	613
819		- <?php if ($link_id===0): ?>
820		- <input type="hidden" name="feed_title" value="<?php echo wp_specialchars($feed_title, 'both'); ?>" />
821		- <input type="hidden" name="feed_link" value="<?php echo wp_specialchars($feed_link, 'both'); ?>" />
822		- <?php endif; ?>
	614	+/**
	615	+ * syndication_comments_feed_link: Escape XML special characters in comments
	616	+ * feed links
	617	+ *
	618	+ * @param string $link
	619	+ * @return string
	620	+ *
	621	+ * @uses is_syndicated()
	622	+ * @uses FeedWordPress::munge_permalinks()
	623	+ */
	624	+function syndication_comments_feed_link ($link) {
	625	+ global $feedwordpress_the_original_permalink, $id;
823	626
824		- <input type="hidden" name="link_id" value="<?php echo $link_id; ?>" />
825		- <input type="hidden" name="feed" value="<?php echo wp_specialchars($f, 'both'); ?>" />
826		- <input type="hidden" name="action" value="switchfeed" />
827		-
828		- <div>
829		- <div style="float:right; background-color:#D0D0D0; color: black; width:45%; font-size:70%; border-left: 1px dotted #A0A0A0; padding-left: 0.5em; margin-left: 1.0em">
830		-<?php if (count($rss->items) > 0): ?>
831		- <?php $item = $rss->items[0]; ?>
832		- <h3>Sample Item</h3>
833		- <ul>
834		- <li><strong>Title:</strong> <a href="<?php echo $item['link']; ?>"><?php echo $item['title']; ?></a></li>
835		- <li><strong>Date:</strong> <?php echo isset($item['date_timestamp']) ? date('d-M-y g:i:s a', $item['date_timestamp']) : 'unknown'; ?></li>
836		- </ul>
837		- <div class="entry">
838		- <?php echo (isset($item['content']['encoded'])?$item['content']['encoded']:$item['description']); ?>
839		- </div>
840		-<?php else: ?>
841		- <h3>No Items</h3>
842		- <p>FeedWordPress found no posts on this feed.</p>
843		-<?php endif; ?>
844		- </div>
845		-
846		- <div>
847		- <h3>Feed Information</h3>
848		- <ul>
849		- <li><strong>Website:</strong> <a href="<?php echo $feed_link; ?>"><?php echo is_null($feed_title)?'<em>Unknown</em>':$feed_title; ?></a></li>
850		- <li><strong>Feed URI:</strong> <a href="<?php echo wp_specialchars($f, 'both'); ?>"><?php echo wp_specialchars($f, 'both'); ?></a> (<a title="Check feed &lt;<?php echo wp_specialchars($f, 'both'); ?>&gt; for validity" href="http://feedvalidator.org/check.cgi?url=<?php echo urlencode($f); ?>">validate</a>)</li>
851		- <li><strong>Encoding:</strong> <?php echo isset($rss->encoding)?wp_specialchars($rss->encoding, 'both'):"<em>Unknown</em>"; ?></li>
852		- <li><strong>Description:</strong> <?php echo isset($rss->channel['description'])?wp_specialchars($rss->channel['description'], 'both'):"<em>Unknown</em>"; ?></li>
853		- </ul>
854		- <div class="submit"><input type="submit" name="Use" value="&laquo; Use this feed" /></div>
855		- <div class="submit"><input type="submit" name="Cancel" value="&laquo; Cancel" /></div>
856		- </div>
857		- </div>
858		- </fieldset>
859		- </form>
860		-<?php endif;
861		- endforeach;
862		- else:
863		- echo "<p><strong>no feed found</strong></p>";
864		- endif;
865		-?>
866		- </div>
867		-
868		- <form action="admin.php?page=<?php print $GLOBALS['fwp_path'] ?>/<?php echo basename(__FILE__); ?>" method="post">
869		- <div class="wrap">
870		- <h2>Use another feed</h2>
871		- <div><label>Feed:</label>
872		- <input type="text" name="lookup" value="URI" />
873		- <input type="hidden" name="link_id" value="<?php echo $link_id; ?>" />
874		- <input type="hidden" name="action" value="feedfinder" /></div>
875		- <div class="submit"><input type="submit" value="Use this feed &raquo;" /></div>
876		- </div>
877		- </form>
878		-<?php
879		- return false; // Don't continue
880		-}
881		-
882		-function fwp_switchfeed_page () {
883		- global $wpdb, $wp_db_version;
884		-
885		- check_admin_referer();
886		- if (!isset($_REQUEST['Cancel'])):
887		- if (!current_user_can('manage_links')):
888		- die (__("Cheatin' uh ?"));
889		- elseif (isset($_REQUEST['link_id']) and ($_REQUEST['link_id']==0)):
890		- $link_id = FeedWordPress::syndicate_link($_REQUEST['feed_title'], $_REQUEST['feed_link'], $_REQUEST['feed']);
891		- if ($link_id): ?>
892		-<div class="updated"><p><a href="<?php echo $_REQUEST['feed_link']; ?>"><?php echo wp_specialchars($_REQUEST['feed_title'], 'both'); ?></a>
893		-has been added as a contributing site, using the newsfeed at &lt;<a href="<?php echo $_REQUEST['feed']; ?>"><?php echo wp_specialchars($_REQUEST['feed'], 'both'); ?></a>&gt;.</p></div>
894		-<?php else: ?>
895		-<div class="updated"><p>There was a problem adding the newsfeed. [SQL: <?php echo wp_specialchars(mysql_error(), 'both'); ?>]</p></div>
896		-<?php endif;
897		- elseif (isset($_REQUEST['link_id'])):
898		- // Update link_rss
899		- $result = $wpdb->query("
900		- UPDATE $wpdb->links
901		- SET
902		- link_rss = '".$wpdb->escape($_REQUEST['feed'])."'
903		- WHERE link_id = '".$wpdb->escape($_REQUEST['link_id'])."'
904		- ");
905		-
906		- if ($result):
907		- $result = $wpdb->get_row("
908		- SELECT link_name, link_url FROM $wpdb->links
909		- WHERE link_id = '".$wpdb->escape($_REQUEST['link_id'])."'
910		- ");
911		- ?>
912		-<div class="updated"><p>Feed for <a href="<?php echo $result->link_url; ?>"><?php echo wp_specialchars($result->link_name, 'both'); ?></a>
913		-updated to &lt;<a href="<?php echo $_REQUEST['feed']; ?>"><?php echo wp_specialchars($_REQUEST['feed'], 'both'); ?></a>&gt;.</p></div>
914		- <?php else: ?>
915		-<div class="updated"><p>Nothing was changed.</p></div>
916		- <?php endif;
917		- endif;
918		- endif;
919		- return true; // Continue
920		-}
921		-
922		-function fwp_linkedit_page () {
923		- global $wpdb, $wp_db_version;
924		-
925		- check_admin_referer(); // Make sure we arrived here from the Dashboard
926		-
927		- $special_settings = array ( /* Regular expression syntax is OK here */
928		- 'cats',
929		- 'cat_split',
930		- 'hardcode name',
931		- 'hardcode url',
932		- 'hardcode description',
933		- 'hardcode categories', /* Deprecated */
934		- 'post status',
935		- 'comment status',
936		- 'ping status',
937		- 'unfamiliar author',
938		- 'unfamliar categories', /* Deprecated */
939		- 'unfamiliar category',
940		- 'map authors',
941		- 'tags',
942		- 'update/.*',
943		- 'feed/.*',
944		- 'link/.*',
945		- );
946		-
947		- if (!current_user_can('manage_links')) :
948		- die (__("Cheatin' uh ?"));
949		- elseif (isset($_REQUEST['feedfinder'])) :
950		- return fwp_feedfinder_page(); // re-route to Feed Finder page
951		- else :
952		- $link_id = (int) $_REQUEST['link_id'];
953		- $link =& new SyndicatedLink($link_id);
954		-
955		- if ($link->found()) :
956		- if (isset($GLOBALS['fwp_post']['save'])) :
957		- $alter = array ();
	627	+ if (is_syndicated() and FeedWordPress::munge_permalinks()) :
	628	+ // If the source post provided a comment feed URL using
	629	+ // wfw:commentRss or atom:link/@rel="replies" we can make use of
	630	+ // that value here.
	631	+ $source = get_syndication_feed_object();
	632	+ $replacement = NULL;
	633	+ if ($source->setting('munge comments feed links', 'munge_comments_feed_links', 'yes') != 'no') :
	634	+ $commentFeeds = get_post_custom_values('wfw:commentRSS');
	635	+ if (
	636	+ is_array($commentFeeds)
	637	+ and (count($commentFeeds) > 0)
	638	+ and (strlen($commentFeeds[0]) > 0)
	639	+ ) :
	640	+ $replacement = $commentFeeds[0];
958	641
959		- $meta = $link->settings;
960		- //if (isset($meta['cats'])):
961		- // $meta['cats'] = preg_split(FEEDWORDPRESS_CAT_SEPARATOR_PATTERN, $meta['cats']);
962		- //endif;
963		-
964		- // custom feed settings first
965		- foreach ($GLOBALS['fwp_post']['notes'] as $mn) :
966		- $mn['key0'] = trim($mn['key0']);
967		- $mn['key1'] = trim($mn['key1']);
968		- if (preg_match("\007^(("
969		- .implode(')|(',$special_settings)
970		- ."))$\007i",
971		- $mn['key1'])) :
972		- $mn['key1'] = 'user/'.$mn['key1'];
973		- endif;
974		-
975		- if (strlen($mn['key0']) > 0) :
976		- unset($meta[$mn['key0']]); // out with the old
977		- endif;
978		-
979		- if (($mn['action']=='update') and (strlen($mn['key1']) > 0)) :
980		- $meta[$mn['key1']] = $mn['value']; // in with the new
981		- endif;
982		- endforeach;
983		-
984		- // now stuff through the web form
985		- // hardcoded feed info
986		- if (isset($GLOBALS['fwp_post']['hardcode_name'])) :
987		- $meta['hardcode name'] = $GLOBALS['fwp_post']['hardcode_name'];
988		- if (FeedWordPress::affirmative($meta, 'hardcode name')) :
989		- $alter[] = "link_name = '".$wpdb->escape($GLOBALS['fwp_post']['name'])."'";
990		- endif;
991		- endif;
992		- if (isset($GLOBALS['fwp_post']['hardcode_description'])) :
993		- $meta['hardcode description'] = $GLOBALS['fwp_post']['hardcode_description'];
994		- if (FeedWordPress::affirmative($meta, 'hardcode description')) :
995		- $alter[] = "link_description = '".$wpdb->escape($GLOBALS['fwp_post']['description'])."'";
996		- endif;
997		- endif;
998		- if (isset($GLOBALS['fwp_post']['hardcode_url'])) :
999		- $meta['hardcode url'] = $GLOBALS['fwp_post']['hardcode_url'];
1000		- if (FeedWordPress::affirmative($meta, 'hardcode url')) :
1001		- $alter[] = "link_url = '".$wpdb->escape($GLOBALS['fwp_post']['linkurl'])."'";
1002		- endif;
1003		- endif;
1004		-
1005		- // Update scheduling
1006		- if (isset($GLOBALS['fwp_post']['update_schedule'])) :
1007		- $meta['update/hold'] = $GLOBALS['fwp_post']['update_schedule'];
1008		- endif;
1009		-
1010		- // Categories
1011		- if (isset($GLOBALS['fwp_post']['post_category'])) :
1012		- $meta['cats'] = array();
1013		- foreach ($GLOBALS['fwp_post']['post_category'] as $cat_id) :
1014		- $meta['cats'][] = '{#'.$cat_id.'}';
1015		- endforeach;
1016		- else :
1017		- unset($meta['cats']);
1018		- endif;
1019		-
1020		- // Tags
1021		- if (isset($GLOBALS['fwp_post']['tags_input'])) :
1022		- $meta['tags'] = array();
1023		- foreach (explode(',', $GLOBALS['fwp_post']['tags_input']) as $tag) :
1024		- $meta['tags'][] = trim($tag);
1025		- endforeach;
1026		- endif;
1027		-
1028		- // Post status, comment status, ping status
1029		- foreach (array('post', 'comment', 'ping') as $what) :
1030		- $sfield = "feed_{$what}_status";
1031		- if (isset($GLOBALS['fwp_post'][$sfield])) :
1032		- if ($GLOBALS['fwp_post'][$sfield]=='site-default') :
1033		- unset($meta["{$what} status"]);
1034		- else :
1035		- $meta["{$what} status"] = $GLOBALS['fwp_post'][$sfield];
1036		- endif;
1037		- endif;
1038		- endforeach;
1039		-
1040		- // Unfamiliar author, unfamiliar categories
1041		- foreach (array("author", "category") as $what) :
1042		- $sfield = "unfamiliar_{$what}";
1043		- if (isset($GLOBALS['fwp_post'][$sfield])) :
1044		- if ('site-default'==$GLOBALS['fwp_post'][$sfield]) :
1045		- unset($meta["unfamiliar {$what}"]);
1046		- elseif ('newuser'==$GLOBALS['fwp_post'][$sfield]) :
1047		- $newuser_name = trim($GLOBALS['fwp_post']["{$sfield}_newuser"]);
1048		- if (strlen($newuser_name) > 0) :
1049		- $userdata = array();
1050		- $userdata['ID'] = NULL;
1051		-
1052		- $userdata['user_login'] = sanitize_user($newuser_name);
1053		- $userdata['user_login'] = apply_filters('pre_user_login', $userdata['user_login']);
1054		-
1055		- $userdata['user_nicename'] = sanitize_title($newuser_name);
1056		- $userdata['user_nicename'] = apply_filters('pre_user_nicename', $userdata['user_nicename']);
1057		-
1058		- $userdata['display_name'] = $wpdb->escape($newuser_name);
1059		-
1060		- $newuser_id = wp_insert_user($userdata);
1061		- if (is_numeric($newuser_id)) :
1062		- $meta["unfamiliar {$what}"] = $newuser_id;
1063		- else :
1064		- // TODO: Add some error detection and reporting
1065		- endif;
1066		- else :
1067		- // TODO: Add some error reporting
1068		- endif;
1069		- else :
1070		- $meta["unfamiliar {$what}"] = $GLOBALS['fwp_post'][$sfield];
1071		- endif;
1072		- endif;
1073		- endforeach;
1074		-
1075		- // Handle author mapping rules
1076		- if (isset($GLOBALS['fwp_post']['author_rules_name']) and isset($GLOBALS['fwp_post']['author_rules_action'])) :
1077		- unset($meta['map authors']);
1078		- foreach ($GLOBALS['fwp_post']['author_rules_name'] as $key => $name) :
1079		- // Normalize for case and whitespace
1080		- $name = strtolower(trim($name));
1081		- $author_action = strtolower(trim($GLOBALS['fwp_post']['author_rules_action'][$key]));
1082		-
1083		- if (strlen($name) > 0) :
1084		- if ('newuser' == $author_action) :
1085		- $newuser_name = trim($GLOBALS['fwp_post']['author_rules_newuser'][$key]);
1086		- if (strlen($newuser_name) > 0) :
1087		- $userdata = array();
1088		- $userdata['ID'] = NULL;
1089		-
1090		- $userdata['user_login'] = sanitize_user($newuser_name);
1091		- $userdata['user_login'] = apply_filters('pre_user_login', $userdata['user_login']);
1092		-
1093		- $userdata['user_nicename'] = sanitize_title($newuser_name);
1094		- $userdata['user_nicename'] = apply_filters('pre_user_nicename', $userdata['user_nicename']);
1095		-
1096		- $userdata['display_name'] = $wpdb->escape($newuser_name);
1097		-
1098		- $newuser_id = wp_insert_user($userdata);
1099		- if (is_numeric($newuser_id)) :
1100		- $meta['map authors']['name'][$name] = $newuser_id;
1101		- else :
1102		- // TODO: Add some error detection and reporting
1103		- endif;
1104		- else :
1105		- // TODO: Add some error reporting
1106		- endif;
1107		- else :
1108		- $meta['map authors']['name'][$name] = $author_action;
1109		- endif;
1110		- endif;
1111		- endforeach;
1112		- endif;
1113		-
1114		- if (isset($GLOBALS['fwp_post']['add_author_rule_name']) and isset($GLOBALS['fwp_post']['add_author_rule_action'])) :
1115		- $name = strtolower(trim($GLOBALS['fwp_post']['add_author_rule_name']));
1116		- $author_action = strtolower(trim($GLOBALS['fwp_post']['add_author_rule_action']));
1117		- if (strlen($name) > 0) :
1118		- if ('newuser' == $author_action) :
1119		- $newuser_name = trim($GLOBALS['fwp_post']['add_author_rule_newuser']);
1120		- if (strlen($newuser_name) > 0) :
1121		- $userdata = array();
1122		- $userdata['ID'] = NULL;
1123		-
1124		- $userdata['user_login'] = sanitize_user($newuser_name);
1125		- $userdata['user_login'] = apply_filters('pre_user_login', $userdata['user_login']);
1126		-
1127		- $userdata['user_nicename'] = sanitize_title($newuser_name);
1128		- $userdata['user_nicename'] = apply_filters('pre_user_nicename', $userdata['user_nicename']);
1129		-
1130		- $userdata['display_name'] = $wpdb->escape($newuser_name);
1131		-
1132		- $newuser_id = wp_insert_user($userdata);
1133		- if (is_numeric($newuser_id)) :
1134		- $meta['map authors']['name'][$name] = $newuser_id;
1135		- else :
1136		- // TODO: Add some error detection and reporting
1137		- endif;
1138		- else :
1139		- // TODO: Add some error reporting
1140		- endif;
1141		- else :
1142		- $meta['map authors']['name'][$name] = $author_action;
1143		- endif;
1144		- endif;
1145		- endif;
1146		-
1147		- if (isset($GLOBALS['fwp_post']['cat_split'])) :
1148		- if (strlen(trim($GLOBALS['fwp_post']['cat_split'])) > 0) :
1149		- $meta['cat_split'] = trim($GLOBALS['fwp_post']['cat_split']);
1150		- else :
1151		- unset($meta['cat_split']);
1152		- endif;
1153		- endif;
1154		-
1155		- if (is_array($meta['cats'])) :
1156		- $meta['cats'] = implode(FEEDWORDPRESS_CAT_SEPARATOR, $meta['cats']);
1157		- endif;
1158		- if (is_array($meta['tags'])) :
1159		- $meta['tags'] = implode(FEEDWORDPRESS_CAT_SEPARATOR, $meta['tags']);
1160		- endif;
1161		-
1162		- // Collapse the author mapping rule structure back into a flat string
1163		- if (isset($meta['map authors'])) :
1164		- $ma = array();
1165		- foreach ($meta['map authors'] as $rule_type => $author_rules) :
1166		- foreach ($author_rules as $author_name => $author_action) :
1167		- $ma[] = $rule_type."\n".$author_name."\n".$author_action;
1168		- endforeach;
1169		- endforeach;
1170		- $meta['map authors'] = implode("\n\n", $ma);
1171		- endif;
1172		-
1173		- $notes = '';
1174		- foreach ($meta as $key => $value) :
1175		- $notes .= $key . ": ". addcslashes($value, "\0..\37".'\\') . "\n";
1176		- endforeach;
1177		- $alter[] = "link_notes = '".$wpdb->escape($notes)."'";
1178		-
1179		- $alter_set = implode(", ", $alter);
1180		-
1181		- // issue update query
1182		- $result = $wpdb->query("
1183		- UPDATE $wpdb->links
1184		- SET $alter_set
1185		- WHERE link_id='$link_id'
1186		- ");
1187		- $updated_link = true;
1188		-
1189		- // reload link information from DB
1190		- $link =& new SyndicatedLink($link_id);
1191		- else :
1192		- $updated_link = false;
	642	+ // This is a foreign link; WordPress can't vouch for its not
	643	+ // having any entities that need to be &-escaped. So we'll do it
	644	+ // here.
	645	+ $replacement = esc_html($replacement);
1193	646	endif;
1194		-
1195		- $db_link = $link->link;
1196		- $link_url = wp_specialchars($db_link->link_url, 1);
1197		- $link_name = wp_specialchars($db_link->link_name, 1);
1198		- $link_description = wp_specialchars($db_link->link_description, 'both');
1199		- $link_notes = wp_specialchars($db_link->link_notes, 'both');
1200		- $link_rss_uri = wp_specialchars($db_link->link_rss, 'both');
1201		-
1202		- $meta = $link->settings;
1203		- $post_status_global = get_option('feedwordpress_syndicated_post_status');
1204		- $comment_status_global = get_option('feedwordpress_syndicated_comment_status');
1205		- $ping_status_global = get_option('feedwordpress_syndicated_ping_status');
1206		-
1207		- $status['post'] = array('publish' => '', 'private' => '', 'draft' => '', 'site-default' => '');
1208		- if (SyndicatedPost::use_api('post_status_pending')) :
1209		- $status['post']['pending'] = '';
1210		- endif;
1211		-
1212		- $status['comment'] = array('open' => '', 'closed' => '', 'site-default' => '');
1213		- $status['ping'] = array('open' => '', 'closed' => '', 'site-default' => '');
1214		-
1215		- foreach (array('post', 'comment', 'ping') as $what) :
1216		- if (isset($meta["{$what} status"])) :
1217		- $status[$what][$meta["{$what} status"]] = ' checked="checked"';
1218		- else :
1219		- $status[$what]['site-default'] = ' checked="checked"';
1220		- endif;
1221		- endforeach;
1222		-
1223		- $unfamiliar['author'] = array ('create' => '','default' => '','filter' => '');
1224		- $unfamiliar['category'] = array ('create'=>'','default'=>'','filter'=>'');
1225		-
1226		- foreach (array('author', 'category') as $what) :
1227		- if (is_string($meta["unfamiliar {$what}"]) and
1228		- array_key_exists($meta["unfamiliar {$what}"], $unfamiliar[$what])) :
1229		- $key = $meta["unfamiliar {$what}"];
1230		- else:
1231		- $key = 'site-default';
1232		- endif;
1233		- $unfamiliar[$what][$key] = ' checked="checked"';
1234		- endforeach;
1235		-
1236		- if (is_array($meta['cats'])) : $cats = $meta['cats'];
1237		- else : $cats = array();
1238		- endif;
1239		-
1240		- $dogs = SyndicatedPost::category_ids($cats, /*unfamiliar=*/ NULL);
1241		- else :
1242		- die( __('Link not found.') );
1243	647	endif;
1244		-
1245		- ?>
1246		-<script type="text/javascript">
1247		- function flip_hardcode (item) {
1248		- ed=document.getElementById('basics-'+item+'-edit');
1249		- view=document.getElementById('basics-'+item+'-view');
1250	648
1251		- o = document.getElementById('basics-hardcode-'+item);
1252		- if (o.value=='yes') { ed.style.display='inline'; view.style.display='none'; }
1253		- else { ed.style.display='none'; view.style.display='inline'; }
1254		- }
1255		- function flip_newuser (item) {
1256		- rollup=document.getElementById(item);
1257		- newuser=document.getElementById(item+'-newuser');
1258		- sitewide=document.getElementById(item+'-default');
1259		- if (rollup) {
1260		- if ('newuser'==rollup.value) {
1261		- if (newuser) newuser.style.display='block';
1262		- if (sitewide) sitewide.style.display='none';
1263		- } else if ('site-default'==rollup.value) {
1264		- if (newuser) newuser.style.display='none';
1265		- if (sitewide) sitewide.style.display='block';
1266		- } else {
1267		- if (newuser) newuser.style.display='none';
1268		- if (sitewide) sitewide.style.display='none';
1269		- }
1270		- }
1271		- }
1272		-</script>
	649	+ if (is_null($replacement)) :
	650	+ // Q: How can we get the proper feed format, since the
	651	+ // format is, stupidly, not passed to the filter?
	652	+ // A: Kludge kludge kludge kludge!
	653	+ $fancy_permalinks = ('' != get_option('permalink_structure'));
	654	+ if ($fancy_permalinks) :
	655	+ preg_match('|/feed(/([^/]+))?/?$|', $link, $ref);
1273	656
1274		-<?php if ($updated_link) : ?>
1275		-<div class="updated"><p>Syndicated feed settings updated.</p></div>
1276		-<?php endif; ?>
	657	+ $format = (isset($ref[2]) ? $ref[2] : '');
	658	+ if (strlen($format) == 0) : $format = get_default_feed(); endif;
1277	659
1278		-<form action="admin.php?page=<?php print $GLOBALS['fwp_path'] ?>/<?php echo basename(__FILE__); ?>" method="post">
1279		-<div class="wrap">
1280		-<input type="hidden" name="link_id" value="<?php echo $link_id; ?>" />
1281		-<input type="hidden" name="action" value="linkedit" />
1282		-<input type="hidden" name="save" value="link" />
1283		-
1284		-<h2>Edit a syndicated feed:</h2>
1285		-<div id="poststuff">
1286		-<?php fwp_linkedit_single_submit($status); ?>
1287		-
1288		-<div id="post-body">
1289		-<?php fwp_option_box_opener('Feed Information', 'feedinformationdiv'); ?>
1290		- <table class="editform" width="100%" cellspacing="2" cellpadding="5">
1291		- <tr>
1292		- <th scope="row" width="20%"><?php _e('Feed URI:') ?></th>
1293		- <td width="60%"><a href="<?php echo wp_specialchars($link_rss_uri, 'both'); ?>"><?php echo $link_rss_uri; ?></a>
1294		- (<a href="<?php echo FEEDVALIDATOR_URI; ?>?url=<?php echo urlencode($link_rss_uri); ?>"
1295		- title="Check feed &lt;<?php echo wp_specialchars($link_rss_uri, 'both'); ?>&gt; for validity">validate</a>)
1296		- </td>
1297		- <td width="20%"><input type="submit" name="feedfinder" value="switch &rarr;" style="font-size:smaller" /></td>
1298		- </tr>
1299		- <tr>
1300		- <th scope="row" width="20%"><?php _e('Link Name:') ?></th>
1301		- <td width="60%"><input type="text" id="basics-name-edit" name="name"
1302		- value="<?php echo $link_name; ?>" style="width: 95%" />
1303		- <span id="basics-name-view"><strong><?php echo $link_name; ?></strong></span>
1304		- </td>
1305		- <td>
1306		- <select id="basics-hardcode-name" onchange="flip_hardcode('name')" name="hardcode_name">
1307		- <option value="no" <?php echo $link->hardcode('name')?'':'selected="selected"'; ?>>update automatically</option>
1308		- <option value="yes" <?php echo $link->hardcode('name')?'selected="selected"':''; ?>>edit manually</option>
1309		- </select>
1310		- </td>
1311		- </tr>
1312		- <tr>
1313		- <th scope="row" width="20%"><?php _e('Short description:') ?></th>
1314		- <td width="60%">
1315		- <input id="basics-description-edit" type="text" name="description" value="<?php echo $link_description; ?>" style="width: 95%" />
1316		- <span id="basics-description-view"><strong><?php echo $link_description; ?></strong></span>
1317		- </td>
1318		- <td>
1319		- <select id="basics-hardcode-description" onchange="flip_hardcode('description')"
1320		- name="hardcode_description">
1321		- <option value="no" <?php echo $link->hardcode('description')?'':'selected="selected"'; ?>>update automatically</option>
1322		- <option value="yes" <?php echo $link->hardcode('description')?'selected="selected"':''; ?>>edit manually</option>
1323		- </select></td>
1324		- </tr>
1325		- <tr>
1326		- <th width="20%" scope="row"><?php _e('Homepage:') ?></th>
1327		- <td width="60%">
1328		- <input id="basics-url-edit" type="text" name="linkurl" value="<?php echo $link_url; ?>" style="width: 95%;" />
1329		- <a id="basics-url-view" href="<?php echo $link_url; ?>"><?php echo $link_url; ?></a></td>
1330		- <td>
1331		- <select id="basics-hardcode-url" onchange="flip_hardcode('url')" name="hardcode_url">
1332		- <option value="no"<?php echo $link->hardcode('url')?'':' selected="selected"'; ?>>update automatically</option>
1333		- <option value="yes"<?php echo $link->hardcode('url')?' selected="selected"':''; ?>>edit manually</option>
1334		- </select></td></tr>
1335		-
1336		- <tr>
1337		- <th width="20%"><?php _e('Last update') ?>:</th>
1338		- <td colspan="2"><?php
1339		- if (isset($meta['update/last'])) :
1340		- echo strftime('%x %X', $meta['update/last'])." ";
1341		- else :
1342		- echo " none yet";
1343		- endif;
1344		- ?></td></tr>
1345		- <tr><th width="20%">Next update:</th>
1346		- <td colspan="2"><?php
1347		- $holdem = (isset($meta['update/hold']) ? $meta['update/hold'] : 'scheduled');
1348		- ?>
1349		- <select name="update_schedule">
1350		- <option value="scheduled"<?php echo ($holdem=='scheduled')?' selected="selected"':''; ?>>update on schedule <?php
1351		- echo " (";
1352		- if (isset($meta['update/ttl']) and is_numeric($meta['update/ttl'])) :
1353		- if (isset($meta['update/timed']) and $meta['update/timed']=='automatically') :
1354		- echo 'next: ';
1355		- $next = $meta['update/last'] + ((int) $meta['update/ttl'] * 60);
1356		- if (strftime('%x', time()) != strftime('%x', $next)) :
1357		- echo strftime('%x', $next)." ";
	660	+ $replacement = trailingslashit($feedwordpress_the_original_permalink) . 'feed';
	661	+ if ($format != get_default_feed()) :
	662	+ $replacement .= '/'.$format;
1358	663	endif;
1359		- echo strftime('%X', $meta['update/last']+((int) $meta['update/ttl']*60));
	664	+ $replacement = user_trailingslashit($replacement, 'single_feed');
1360	665	else :
1361		- echo "every ".$meta['update/ttl']." minute".(($meta['update/ttl']!=1)?"s":"");
	666	+ // No fancy permalinks = no problem
	667	+ // WordPress doesn't call get_permalink() to
	668	+ // generate the comment feed URL, so the
	669	+ // comments feed link is never munged by FWP.
1362	670	endif;
1363		- else:
1364		- echo "next scheduled update";
1365	671	endif;
1366		- echo ")";
1367		- ?></option>
1368		- <option value="next"<?php echo ($holdem=='next')?' selected="selected"':''; ?>>update ASAP</option>
1369		- <option value="ping"<?php echo ($holdem=='ping')?' selected="selected"':''; ?>>update only when pinged</option>
1370		- </select></tr>
1371		- </table>
1372		-<?php fwp_option_box_closer(); ?>
	672	+
	673	+ if (!is_null($replacement)) : $link = $replacement; endif;
	674	+ endif;
	675	+ return $link;
	676	+} /* function syndication_comments_feed_link() */
1373	677
1374		-<script type="text/javascript">
1375		-flip_hardcode('name');
1376		-flip_hardcode('description');
1377		-flip_hardcode('url');
1378		-</script>
	678	+################################################################################
	679	+## ADMIN MENU ADD-ONS: register Dashboard management pages #####################
	680	+################################################################################
1379	681
1380		-<?php fwp_linkedit_periodic_submit(); ?>
1381		-
1382		-<?php
1383		-if (!(isset($wp_db_version) and $wp_db_version >= FWP_SCHEMA_25)) :
1384		- fwp_option_box_opener('Syndicated Posts', 'syndicatedpostsdiv', 'postbox');
1385		-?>
1386		-<table class="editform" width="75%" cellspacing="2" cellpadding="5">
1387		-<tr><th width="27%" scope="row" style="vertical-align:top">Publication:</th>
1388		-<td width="73%" style="vertical-align:top"><ul style="margin:0; list-style:none">
1389		-<li><label><input type="radio" name="feed_post_status" value="site-default"
1390		-<?php echo $status['post']['site-default']; ?> /> Use site-wide setting from <a href="admin.php?page=<?php print $GLOBALS['fwp_path'] ?>/syndication-options.php">Syndication Options</a>
1391		-(currently: <strong><?php echo ($post_status_global ? $post_status_global : 'publish'); ?></strong>)</label></li>
1392		-<li><label><input type="radio" name="feed_post_status" value="publish"
1393		-<?php echo $status['post']['publish']; ?> /> Publish posts from this feed immediately</label></li>
1394		-
1395		-<?php if (SyndicatedPost::use_api('post_status_pending')) : ?>
1396		-<li><label><input type="radio" name="feed_post_status" value="pending"
1397		-<?php echo $status['post']['pending']; ?>/> Hold posts from this feed for review; mark as Pending</label></li>
1398		-<?php endif; ?>
1399		-
1400		-<li><label><input type="radio" name="feed_post_status" value="draft"
1401		-<?php echo $status['post']['draft']; ?> /> Save posts from this feed as drafts</label></li>
1402		-<li><label><input type="radio" name="feed_post_status" value="private"
1403		-<?php echo $status['post']['private']; ?> /> Save posts from this feed as private posts</label></li>
1404		-</ul></td>
1405		-</tr>
1406		-</table>
1407		-<?php
1408		- fwp_option_box_closer();
1409		- fwp_linkedit_periodic_submit();
1410		-endif;
1411		-
1412		- fwp_option_box_opener(__('Categories'), 'categorydiv', 'postbox');
1413		- fwp_category_box($dogs, 'all syndicated posts from this feed');
1414		-?>
1415		-<table>
1416		-<tr>
1417		-<th width="20%" scope="row" style="vertical-align:top">Unfamiliar categories:</th>
1418		-<td width="80%"><ul style="margin: 0; list-style:none">
1419		-<li><label><input type="radio" name="unfamiliar_category" value="site-default"<?php echo $unfamiliar['category']['site-default']; ?> /> use site-wide setting from <a href="admin.php?page=<?php print $GLOBALS['fwp_path'] ?>/syndication-options.php">Syndication Options</a>
1420		-(currently <strong><?php echo FeedWordPress::on_unfamiliar('category'); ?></strong>)</label></li>
1421		-<li><label><input type="radio" name="unfamiliar_category" value="create"<?php echo $unfamiliar['category']['create']; ?> /> create any categories the post is in</label></li>
1422		-<li><label><input type="radio" name="unfamiliar_category" value="default"<?php echo $unfamiliar['category']['default']; ?> /> don't create new categories</label></li>
1423		-<li><label><input type="radio" name="unfamiliar_category" value="filter"<?php echo $unfamiliar['category']['filter']; ?> /> don't create new categories and don't syndicate posts unless they match at least one familiar category</label></li>
1424		-</ul></td>
1425		-</tr>
1426		-
1427		-<tr>
1428		-<th width="20%" scope="row" style="vertical-align:top">Multiple categories:</th>
1429		-<td width="80%">
1430		-<input type="text" size="20" id="cat_split" name="cat_split" value="<?php if (isset($meta['cat_split'])) : echo htmlspecialchars($meta['cat_split']); endif; ?>" /><br/>
1431		-Enter a <a href="http://us.php.net/manual/en/reference.pcre.pattern.syntax.php">Perl-compatible regular expression</a> here if the feed provides multiple
1432		-categories in a single category element. The regular expression should match
1433		-the characters used to separate one category from the next. If the feed uses
1434		-spaces (like <a href="http://del.icio.us/">del.icio.us</a>), use the pattern "\s".
1435		-If the feed does not provide multiple categories in a single element, leave this
1436		-blank.</td>
1437		-</tr>
1438		-</table>
1439		-<?php
1440		- fwp_option_box_closer();
1441		- fwp_linkedit_periodic_submit();
	682	+function fwp_add_pages () {
	683	+ $menu_cap = FeedWordPress::menu_cap();
	684	+ $settings_cap = FeedWordPress::menu_cap(/*sub=*/ true);
	685	+ $syndicationMenu = FeedWordPress::path('syndication.php');
1442	686
1443		-if (isset($wp_db_version) and $wp_db_version >= FWP_SCHEMA_25) :
1444		- fwp_tags_box($meta['tags']);
1445		- fwp_linkedit_periodic_submit();
1446		-endif; ?>
	687	+ add_menu_page(
	688	+ 'Syndicated Sites', 'Syndication',
	689	+ $menu_cap,
	690	+ $syndicationMenu,
	691	+ NULL,
	692	+ WP_PLUGIN_URL.'/'.FeedWordPress::path('feedwordpress-tiny.png')
	693	+ );
1447	694
1448		-<?php fwp_option_box_opener('Syndicated Authors', 'authordiv', 'postbox'); ?>
1449		-<?php $authorlist = fwp_author_list(); ?>
1450		-<table>
1451		-<tr><th colspan="3" style="text-align: left; padding-top: 1.0em; border-bottom: 1px dotted black;">For posts by authors that haven't been syndicated before:</th></tr>
1452		-<tr>
1453		- <th style="text-align: left">Posts by new authors</th>
1454		- <td>
1455		- <select id="unfamiliar-author" name="unfamiliar_author" onchange="flip_newuser('unfamiliar-author');">
1456		- <option value="site-default"<?php if (!isset($meta['unfamiliar author'])) : ?>selected="selected"<?php endif; ?>>are handled using site-wide settings</option>
1457		- <option value="create"<?php if ('create'==$meta['unfamiliar author']) : ?>selected="selected"<?php endif; ?>>create a new author account</option>
1458		- <?php foreach ($authorlist as $author_id => $author_name) : ?>
1459		- <option value="<?php echo $author_id; ?>"<?php if ($author_id==$meta['unfamiliar author']) : ?>selected="selected"<?php endif; ?>>are assigned to <?php echo $author_name; ?></option>
1460		- <?php endforeach; ?>
1461		- <option value="newuser">will be assigned to a new user...</option>
1462		- <option value="filter"<?php if ('filter'==$meta['unfamiliar author']) : ?>selected="selected"<?php endif; ?>>get filtered out</option>
1463		- </select>
1464		- </td>
1465		- <td>
1466		- <div id="unfamiliar-author-default">Site-wide settings can be set in <a href="admin.php?page=<?php print $GLOBALS['fwp_path'] ?>/syndication-options.php">Syndication Options</a></div>
1467		- <div id="unfamiliar-author-newuser">named <input type="text" name="unfamiliar_author_newuser" value="" /></div>
1468		- </td>
1469		-</tr>
	695	+ do_action('feedwordpress_admin_menu_pre_feeds', $menu_cap, $settings_cap);
	696	+ add_submenu_page(
	697	+ $syndicationMenu, 'Syndicated Feeds & Updates', 'Feeds & Updates',
	698	+ $settings_cap, FeedWordPress::path('feeds-page.php')
	699	+ );
1470	700
1471		-<tr><th colspan="3" style="text-align: left; padding-top: 1.0em; border-bottom: 1px dotted black;">For posts by specific authors. Blank out a name to delete the rule.</th></tr>
	701	+ do_action('feedwordpress_admin_menu_pre_posts', $menu_cap, $settings_cap);
	702	+ add_submenu_page(
	703	+ $syndicationMenu, 'Syndicated Posts & Links', 'Posts & Links',
	704	+ $settings_cap, FeedWordPress::path('posts-page.php')
	705	+ );
1472	706
1473		-<?php if (isset($meta['map authors'])) : $i=0; foreach ($meta['map authors'] as $author_rules) : foreach ($author_rules as $author_name => $author_action) : $i++; ?>
1474		-<tr>
1475		- <th style="text-align: left">Posts by <input type="text" name="author_rules_name[]" value="<?php echo htmlspecialchars($author_name); ?>" /></th>
1476		- <td>
1477		- <select id="author-rules-<?php echo $i; ?>" name="author_rules_action[]" onchange="flip_newuser('author-rules-<?php echo $i; ?>');">
1478		- <?php foreach ($authorlist as $local_author_id => $local_author_name) : ?>
1479		- <option value="<?php echo $local_author_id; ?>"<?php if ($local_author_id==$author_action) : echo ' selected="selected"'; endif; ?>>are assigned to <?php echo $local_author_name; ?></option>
1480		- <?php endforeach; ?>
1481		- <option value="newuser">will be assigned to a new user...</option>
1482		- <option value="filter"<?php if ('filter'==$author_action) : echo ' selected="selected"'; endif; ?>>get filtered out</option>
1483		- </select>
1484		- </td>
1485		- <td><div id="author-rules-<?php echo $i; ?>-newuser">named <input type="text" name="author_rules_newuser[]" value="" /></div></td>
1486		-</tr>
1487		-<?php endforeach; endforeach; endif; ?>
	707	+ do_action('feedwordpress_admin_menu_pre_authors', $menu_cap, $settings_cap);
	708	+ add_submenu_page(
	709	+ $syndicationMenu, 'Syndicated Authors', 'Authors',
	710	+ $settings_cap, FeedWordPress::path('authors-page.php')
	711	+ );
1488	712
1489		-<tr><th colspan="3" style="text-align: left; padding-top: 1.0em; border-bottom: 1px dotted black;">Fill in to set up a new rule:</th></tr>
	713	+ do_action('feedwordpress_admin_menu_pre_categories', $menu_cap, $settings_cap);
	714	+ add_submenu_page(
	715	+ $syndicationMenu, 'Categories'.FEEDWORDPRESS_AND_TAGS, 'Categories'.FEEDWORDPRESS_AND_TAGS,
	716	+ $settings_cap, FeedWordPress::path('categories-page.php')
	717	+ );
1490	718
1491		-<tr>
1492		- <th style="text-align: left">Posts by <input type="text" name="add_author_rule_name" /></th>
1493		- <td>
1494		- <select id="add-author-rule" name="add_author_rule_action" onchange="flip_newuser('add-author-rule');">
1495		- <?php foreach ($authorlist as $author_id => $author_name) : ?>
1496		- <option value="<?php echo $author_id; ?>">are assigned to <?php echo $author_name; ?></option>
1497		- <?php endforeach; ?>
1498		- <option value="newuser">will be assigned to a new user...</option>
1499		- <option value="filter">get filtered out</option>
1500		- </select>
1501		- </td>
1502		- <td><div id="add-author-rule-newuser">named <input type="text" name="add_author_rule_newuser" value="" /></div></td>
1503		-</tr>
	719	+ do_action('feedwordpress_admin_menu_pre_performance', $menu_cap, $settings_cap);
	720	+ add_submenu_page(
	721	+ $syndicationMenu, 'FeedWordPress Performance', 'Performance',
	722	+ $settings_cap, FeedWordPress::path('performance-page.php')
	723	+ );
1504	724
1505		-</table>
1506		-<?php fwp_option_box_closer(); ?>
	725	+ do_action('feedwordpress_admin_menu_pre_diagnostics', $menu_cap, $settings_cap);
	726	+ add_submenu_page(
	727	+ $syndicationMenu, 'FeedWordPress Diagnostics', 'Diagnostics',
	728	+ $settings_cap, FeedWordPress::path('diagnostics-page.php')
	729	+ );
	730	+} /* function fwp_add_pages () */
1507	731
1508		-<script>
1509		- flip_newuser('unfamiliar-author');
1510		-<?php for ($j=1; $j<=$i; $j++) : ?>
1511		- flip_newuser('author-rules-<?php echo $j; ?>');
1512		-<?php endfor; ?>
1513		- flip_newuser('add-author-rule');
1514		-</script>
1515		-
1516		-<?php
1517		- fwp_linkedit_periodic_submit();
1518		- fwp_option_box_opener('Comments & Pings', 'commentstatusdiv', 'postbox');
1519		-?>
1520		-<table class="editform" width="75%" cellspacing="2" cellpadding="5">
1521		-<tr><th width="27%" scope="row" style="vertical-align:top"><?php print __('Comments'); ?>:</th>
1522		-<td width="73%"><ul style="margin:0; list-style:none">
1523		-<li><label><input type="radio" name="feed_comment_status" value="site-default"
1524		-<?php echo $status['comment']['site-default']; ?> /> Use site-wide setting from <a href="admin.php?page=<?php print $GLOBALS['fwp_path'] ?>/syndication-options.php">Syndication Options</a>
1525		-(currently: <strong><?php echo ($comment_status_global ? $comment_status_global : 'closed'); ?>)</strong></label></li>
1526		-<li><label><input type="radio" name="feed_comment_status" value="open"
1527		-<?php echo $status['comment']['open']; ?> /> Allow comments on syndicated posts from this feed</label></li>
1528		-<li><label><input type="radio" name="feed_comment_status" value="closed"
1529		-<?php echo $status['comment']['closed']; ?> /> Don't allow comments on syndicated posts from this feed</label></li>
1530		-</ul></td></tr>
1531		-
1532		-<tr><th width="27%" scope="row" style="vertical-align:top"><?php print __('Pings'); ?>:</th>
1533		-<td width="73%"><ul style="margin:0; list-style:none">
1534		-<li><label><input type="radio" name="feed_ping_status" value="site-default"
1535		-<?php echo $status['ping']['site-default']; ?> /> Use site-wide setting from <a href="admin.php?page=<?php print $GLOBALS['fwp_path'] ?>/syndication-options.php">Syndication Options</a>
1536		-(currently: <strong><?php echo ($ping_status_global ? $ping_status_global : 'closed'); ?>)</strong></label></li>
1537		-<li><label><input type="radio" name="feed_ping_status" value="open"
1538		-<?php echo $status['ping']['open']; ?> /> Accept pings on syndicated posts from this feed</label></li>
1539		-<li><label><input type="radio" name="feed_ping_status" value="closed"
1540		-<?php echo $status['ping']['closed']; ?> /> Don't accept pings on syndicated posts from this feed</label></li>
1541		-</ul></td></tr>
1542		-
1543		-</table>
1544		-<?php fwp_option_box_closer(); ?>
1545		-<?php fwp_linkedit_periodic_submit(); ?>
1546		-
1547		-<?php fwp_option_box_opener('Custom Settings (for use in templates)', 'postcustom', 'postbox'); ?>
1548		-<div id="postcustomstuff">
1549		-<table id="meta-list" cellpadding="3">
1550		- <tr>
1551		- <th>Key</th>
1552		- <th>Value</th>
1553		- <th>Action</th>
1554		- </tr>
1555		-
1556		-<?php
1557		- $i = 0;
1558		- foreach ($meta as $key => $value) :
1559		- if (!preg_match("\007^((".implode(')|(', $special_settings)."))$\007i", $key)) :
1560		-?>
1561		- <tr style="vertical-align:top">
1562		- <th width="30%" scope="row"><input type="hidden" name="notes[<?php echo $i; ?>][key0]" value="<?php echo wp_specialchars($key, 'both'); ?>" />
1563		- <input id="notes-<?php echo $i; ?>-key" name="notes[<?php echo $i; ?>][key1]" value="<?php echo wp_specialchars($key, 'both'); ?>" /></th>
1564		- <td width="60%"><textarea rows="2" cols="40" id="notes-<?php echo $i; ?>-value" name="notes[<?php echo $i; ?>][value]"><?php echo wp_specialchars($value, 'both'); ?></textarea></td>
1565		- <td width="10%"><select name="notes[<?php echo $i; ?>][action]">
1566		- <option value="update">save changes</option>
1567		- <option value="delete">delete this setting</option>
1568		- </select></td>
1569		- </tr>
1570		-<?php
1571		- $i++;
1572		- endif;
1573		- endforeach;
1574		-?>
1575		- <tr>
1576		- <th scope="row"><input type="text" size="10" name="notes[<?php echo $i; ?>][key1]" value="" /></th>
1577		- <td><textarea name="notes[<?php echo $i; ?>][value]" rows="2" cols="40"></textarea></td>
1578		- <td><em>add new setting...</em><input type="hidden" name="notes[<?php echo $i; ?>][action]" value="update" /></td>
1579		- </tr>
1580		-</table>
1581		-<?php fwp_option_box_closer(); ?>
1582		-
1583		-<?php fwp_linkedit_periodic_submit(); ?>
1584		-</div> <!-- id="post-body" -->
1585		-</div> <!-- id="poststuff" -->
1586		-</div>
1587		- <?php
	732	+function fwp_check_debug () {
	733	+ // This is a horrible fucking kludge that I have to do because the
	734	+ // admin notice code is triggered before the code that updates the
	735	+ // setting.
	736	+ if (isset($_POST['feedwordpress_debug'])) :
	737	+ $feedwordpress_debug = $_POST['feedwordpress_debug'];
	738	+ else :
	739	+ $feedwordpress_debug = get_option('feedwordpress_debug');
1588	740	endif;
1589		- return false; // Don't continue
1590		-}
1591		-
1592		-function fwp_author_list () {
1593		- global $wpdb;
1594		- $ret = array();
1595		- $users = $wpdb->get_results("SELECT * FROM $wpdb->users ORDER BY display_name");
1596		- if (is_array($users)) :
1597		- foreach ($users as $user) :
1598		- $id = (int) $user->ID;
1599		- $ret[$id] = $user->display_name;
1600		- endforeach;
1601		- endif;
1602		- return $ret;
1603		-}
1604		-
1605		-function fwp_multidelete_page () {
1606		- global $wpdb;
1607		-
1608		- check_admin_referer(); // Make sure the referers are kosher
1609		-
1610		- $link_ids = (isset($_REQUEST['link_ids']) ? $_REQUEST['link_ids'] : array());
1611		- if (isset($_REQUEST['link_id'])) : array_push($link_ids, $_REQUEST['link_id']); endif;
1612		-
1613		- if (!current_user_can('manage_links')):
1614		- die (__("Cheatin' uh ?"));
1615		- elseif (isset($GLOBALS['fwp_post']['confirm']) and $GLOBALS['fwp_post']['confirm']=='Delete'):
1616		- foreach ($GLOBALS['fwp_post']['link_action'] as $link_id => $what) :
1617		- $do_it[$what][] = $link_id;
1618		- endforeach;
1619		-
1620		- $alter = array();
1621		- if (count($do_it['hide']) > 0) :
1622		- $hidem = "(".implode(', ', $do_it['hide']).")";
1623		- $alter[] = "
1624		- UPDATE $wpdb->links
1625		- SET link_visible = 'N'
1626		- WHERE link_id IN {$hidem}
1627		- ";
1628		- endif;
1629		-
1630		- if (count($do_it['nuke']) > 0) :
1631		- $nukem = "(".implode(', ', $do_it['nuke']).")";
1632		-
1633		- // Make a list of the items syndicated from this feed...
1634		- $post_ids = $wpdb->get_col("
1635		- SELECT post_id FROM $wpdb->postmeta
1636		- WHERE meta_key = 'syndication_feed_id'
1637		- AND meta_value IN {$nukem}
1638		- ");
1639		-
1640		- // ... and kill them all
1641		- if (count($post_ids) > 0) :
1642		- foreach ($post_ids as $post_id) :
1643		- wp_delete_post($post_id);
1644		- endforeach;
1645		- endif;
1646		-
1647		- $alter[] = "
1648		- DELETE FROM $wpdb->links
1649		- WHERE link_id IN {$nukem}
1650		- ";
1651		- endif;
1652		-
1653		- if (count($do_it['delete']) > 0) :
1654		- $deletem = "(".implode(', ', $do_it['delete']).")";
1655		-
1656		- // Make the items syndicated from this feed appear to be locally-authored
1657		- $alter[] = "
1658		- DELETE FROM $wpdb->postmeta
1659		- WHERE meta_key = 'syndication_feed_id'
1660		- AND meta_value IN {$deletem}
1661		- ";
1662		-
1663		- // ... and delete the links themselves.
1664		- $alter[] = "
1665		- DELETE FROM $wpdb->links
1666		- WHERE link_id IN {$deletem}
1667		- ";
1668		- endif;
1669		-
1670		- $errs = array(); $success = array ();
1671		- foreach ($alter as $sql) :
1672		- $result = $wpdb->query($sql);
1673		- if (!$result):
1674		- $errs[] = mysql_error();
1675		- endif;
1676		- endforeach;
1677		-
1678		- if (count($alter) > 0) :
1679		- echo "<div class=\"updated\">\n";
1680		- if (count($errs) > 0) :
1681		- echo "There were some problems processing your ";
1682		- echo "unsubscribe request. [SQL: ".implode('; ', $errs)."]";
1683		- else :
1684		- echo "Your unsubscribe request(s) have been processed.";
1685		- endif;
1686		- echo "</div>\n";
1687		- endif;
1688		-
1689		- return true; // Continue on to Syndicated Sites listing
1690		- else :
1691		- $targets = $wpdb->get_results("
1692		- SELECT * FROM $wpdb->links
1693		- WHERE link_id IN (".implode(",",$link_ids).")
1694		- ");
	741	+ if ($feedwordpress_debug==='yes') :
1695	742	?>
1696		-<form action="admin.php?page=<?php print $GLOBALS['fwp_path'] ?>/<?php echo basename(__FILE__); ?>" method="post">
1697		-<div class="wrap">
1698		-<input type="hidden" name="action" value="Unsubscribe" />
1699		-<input type="hidden" name="confirm" value="Delete" />
1700		-
1701		-<h2>Unsubscribe from Syndicated Links:</h2>
1702		-<?php foreach ($targets as $link) :
1703		- $link_url = wp_specialchars($link->link_url, 1);
1704		- $link_name = wp_specialchars($link->link_name, 1);
1705		- $link_description = wp_specialchars($link->link_description, 'both');
1706		- $link_rss = wp_specialchars($link->link_rss, 'both');
1707		-?>
1708		-<fieldset>
1709		-<legend><?php echo $link_name; ?></legend>
1710		-<table class="editform" width="100%" cellspacing="2" cellpadding="5">
1711		-<tr><th scope="row" width="20%"><?php _e('Feed URI:') ?></th>
1712		-<td width="80%"><a href="<?php echo $link_rss; ?>"><?php echo $link_rss; ?></a></td></tr>
1713		-<tr><th scope="row" width="20%"><?php _e('Short description:') ?></th>
1714		-<td width="80%"><?php echo $link_description; ?></span></td></tr>
1715		-<tr><th width="20%" scope="row"><?php _e('Homepage:') ?></th>
1716		-<td width="80%"><a href="<?php echo $link_url; ?>"><?php echo $link_url; ?></a></td></tr>
1717		-<tr style="vertical-align:top"><th width="20%" scope="row">Subscription <?php _e('Options') ?>:</th>
1718		-<td width="80%"><ul style="margin:0; padding: 0; list-style: none">
1719		-<li><input type="radio" id="hide-<?php echo $link->link_id; ?>"
1720		-name="link_action[<?php echo $link->link_id; ?>]" value="hide" />
1721		-<label for="hide-<?php echo $link->link_id; ?>">Turn off the subscription for this
1722		-syndicated link<br/><span style="font-size:smaller">(Keep the feed information
1723		-and all the posts from this feed in the database, but don't syndicate any
1724		-new posts from the feed.)</span></label></li>
1725		-<li><input type="radio" id="nuke-<?php echo $link->link_id; ?>"
1726		-name="link_action[<?php echo $link->link_id; ?>]" value="nuke" />
1727		-<label for="nuke-<?php echo $link->link_id; ?>">Delete this syndicated link and all the
1728		-posts that were syndicated from it</label></li>
1729		-<li><input type="radio" id="delete-<?php echo $link->link_id; ?>"
1730		-name="link_action[<?php echo $link->link_id; ?>]" value="delete" />
1731		-<label for="delete-<?php echo $link->link_id; ?>">Delete this syndicated link, but
1732		-<em>keep</em> posts that were syndicated from it (as if they were authored
1733		-locally).</label></li>
1734		-<li><input type="radio" id="nothing-<?php echo $link->link_id; ?>"
1735		-name="link_action[<?php echo $link->link_id; ?>]" value="nothing" />
1736		-<label for="nothing-<?php echo $link->link_id; ?>">Keep this feed as it is. I changed
1737		-my mind.</label></li>
1738		-</ul>
1739		-</table>
1740		-</fieldset>
1741		-<?php endforeach; ?>
1742		-
1743		-<div class="submit">
1744		-<input class="delete" type="submit" name="submit" value="<?php _e('Unsubscribe from selected feeds &raquo;') ?>" />
1745		-</div>
1746		-</div>
	743	+ <div class="error">
	744	+<p><strong>FeedWordPress warning.</strong> Debugging mode is <strong>ON</strong>.
	745	+While it remains on, FeedWordPress displays many diagnostic error messages,
	746	+warnings, and notices that are ordinarily suppressed, and also turns off all
	747	+caching of feeds. Use with caution: this setting is absolutely inappropriate
	748	+for a production server.</p>
	749	+ </div>
1747	750	<?php
1748		- return false; // Don't continue on to Syndicated Sites listing
1749	751	endif;
1750		-}
	752	+} /* function fwp_check_debug () */
1751	753
1752	754	################################################################################
1753	755	## fwp_hold_pings() and fwp_release_pings(): Outbound XML-RPC ping reform ####
1754	756	## ... 'coz it's rude to send 500 pings the first time your aggregator runs ####
		@@ -1805,8 +807,67 @@
1805	807	endif;
1806	808	endif;
1807	809	}
1808	810
	811	+ function feedwordpress_add_post_edit_controls () {
	812	+ add_meta_box('feedwordpress-post-controls', __('Syndication'), 'feedwordpress_post_edit_controls', 'post', 'side', 'high');
	813	+ } // function FeedWordPress::postEditControls
	814	+
	815	+ function feedwordpress_post_edit_controls () {
	816	+ global $post;
	817	+
	818	+ $frozen_values = get_post_custom_values('_syndication_freeze_updates', $post->ID);
	819	+ $frozen_post = (count($frozen_values) > 0 and 'yes' == $frozen_values[0]);
	820	+
	821	+ if (is_syndicated($post->ID)) :
	822	+ ?>
	823	+ <p>This is a syndicated post, which originally appeared at
	824	+ <cite><?php print esc_html(get_syndication_source(NULL, $post->ID)); ?></cite>.
	825	+ <a href="<?php print esc_html(get_syndication_permalink($post->ID)); ?>">View original post</a>.</p>
	826	+
	827	+ <p><input type="hidden" name="feedwordpress_noncename" id="feedwordpress_noncename" value="<?php print wp_create_nonce(plugin_basename(__FILE__)); ?>" />
	828	+ <label><input type="checkbox" name="freeze_updates" value="yes" <?php if ($frozen_post) : ?>checked="checked"<?php endif; ?> /> <strong>Manual editing.</strong>
	829	+ If set, FeedWordPress will not overwrite the changes you make manually
	830	+ to this post, if the syndicated content is updated on the
	831	+ feed.</label></p>
	832	+ <?php
	833	+ else :
	834	+ ?>
	835	+ <p>This post was created locally at this website.</p>
	836	+ <?php
	837	+ endif;
	838	+ } // function feedwordpress_post_edit_controls () */
	839	+
	840	+ function feedwordpress_save_post_edit_controls ( $post_id ) {
	841	+ global $post;
	842	+
	843	+ if (!isset($_POST['feedwordpress_noncename']) or !wp_verify_nonce($_POST['feedwordpress_noncename'], plugin_basename(__FILE__))) :
	844	+ return $post_id;
	845	+ endif;
	846	+
	847	+ // Verify if this is an auto save routine. If it is our form has
	848	+ // not been submitted, so we don't want to do anything.
	849	+ if ( defined('DOING_AUTOSAVE') and DOING_AUTOSAVE ) :
	850	+ return $post_id;
	851	+ endif;
	852	+
	853	+ // Check permissions
	854	+ if ( !current_user_can( 'edit_'.$_POST['post_type'], $post_id) ) :
	855	+ return $post_id;
	856	+ endif;
	857	+
	858	+ // OK, we're golden. Now let's save some data.
	859	+ if (isset($_POST['freeze_updates'])) :
	860	+ update_post_meta($post_id, '_syndication_freeze_updates', $_POST['freeze_updates']);
	861	+ $ret = $_POST['freeze_updates'];
	862	+ else :
	863	+ delete_post_meta($post_id, '_syndication_freeze_updates');
	864	+ $ret = NULL;
	865	+ endif;
	866	+
	867	+ return $ret;
	868	+ } // function feedwordpress_save_edit_controls
	869	+
1809	870	################################################################################
1810	871	## class FeedWordPress #########################################################
1811	872	################################################################################
1812	873
		@@ -1850,9 +911,9 @@
1850	911	function FeedWordPress () {
1851	912	$this->feeds = array ();
1852	913	$links = FeedWordPress::syndicated_links();
1853	914	if ($links): foreach ($links as $link):
1854		- $this->feeds[] =& new SyndicatedLink($link);
	915	+ $this->feeds[] = new SyndicatedLink($link);
1855	916	endforeach; endif;
1856	917	} // FeedWordPress::FeedWordPress ()
1857	918
1858	919	# function update (): polls for updates on one or more Contributor feeds
		@@ -1903,9 +964,9 @@
1903	964	#
1904	965	# * Updates to existing posts since the last poll are mirrored in the
1905	966	# WordPress store.
1906	967	#
1907		- function update ($uri = null) {
	968	+ function update ($uri = null, $crash_ts = null) {
1908	969	global $wpdb;
1909	970
1910	971	if (FeedWordPress::needs_upgrade()) : // Will make duplicate posts if we don't hold off
1911	972	return NULL;
		@@ -1910,9 +971,9 @@
1910	971	if (FeedWordPress::needs_upgrade()) : // Will make duplicate posts if we don't hold off
1911	972	return NULL;
1912	973	endif;
1913	974
1914		- if (!is_null($uri)) :
	975	+ if (!is_null($uri) and $uri != '*') :
1915	976	$uri = trim($uri);
1916	977	else : // Update all
1917	978	update_option('feedwordpress_last_update_all', time());
1918	979	endif;
		@@ -1918,13 +979,27 @@
1918	979	endif;
1919	980
1920	981	do_action('feedwordpress_update', $uri);
1921	982
	983	+ if (is_null($crash_ts)) :
	984	+ $crash_ts = $this->crash_ts();
	985	+ endif;
	986	+
	987	+ // Randomize order for load balancing purposes
	988	+ $feed_set = $this->feeds;
	989	+ shuffle($feed_set);
	990	+
	991	+ $feed_set = apply_filters('feedwordpress_update_feeds', $feed_set, $uri);
	992	+
1922	993	// Loop through and check for new posts
1923	994	$delta = NULL;
1924		- foreach ($this->feeds as $feed) :
1925		- $pinged_that = (is_null($uri) or in_array($uri, array($feed->uri(), $feed->homepage())));
	995	+ foreach ($feed_set as $feed) :
	996	+ if (!is_null($crash_ts) and (time() > $crash_ts)) : // Check whether we've exceeded the time limit
	997	+ break;
	998	+ endif;
1926	999
	1000	+ $pinged_that = (is_null($uri) or ($uri=='*') or in_array($uri, array($feed->uri(), $feed->homepage())));
	1001	+
1927	1002	if (!is_null($uri)) : // A site-specific ping always updates
1928	1003	$timely = true;
1929	1004	else :
1930	1005	$timely = $feed->stale();
		@@ -1929,17 +1004,22 @@
1929	1004	else :
1930	1005	$timely = $feed->stale();
1931	1006	endif;
1932	1007
1933		- if ($pinged_that and is_null($delta)) : // If at least one feed was hit for updating...
	1008	+ if ($pinged_that and is_null($delta)) : // If at least one feed was hit for updating...
1934	1009	$delta = array('new' => 0, 'updated' => 0); // ... don't return error condition
1935	1010	endif;
1936	1011
1937	1012	if ($pinged_that and $timely) :
1938	1013	do_action('feedwordpress_check_feed', $feed->settings);
1939		- $added = $feed->poll();
1940		- if (isset($added['new'])) : $delta['new'] += $added['new']; endif;
1941		- if (isset($added['updated'])) : $delta['updated'] += $added['updated']; endif;
	1014	+ $start_ts = time();
	1015	+ $added = $feed->poll($crash_ts);
	1016	+ do_action('feedwordpress_check_feed_complete', $feed->settings, $added, time() - $start_ts);
	1017	+
	1018	+ if (is_array($added)) : // Success
	1019	+ if (isset($added['new'])) : $delta['new'] += $added['new']; endif;
	1020	+ if (isset($added['updated'])) : $delta['updated'] += $added['updated']; endif;
	1021	+ endif;
1942	1022	endif;
1943	1023	endforeach;
1944	1024
1945	1025	do_action('feedwordpress_update_complete', $delta);
		@@ -1946,10 +1026,23 @@
1946	1026
1947	1027	return $delta;
1948	1028	}
1949	1029
	1030	+ function crash_ts ($default = NULL) {
	1031	+ $crash_dt = (int) get_option('feedwordpress_update_time_limit', 0);
	1032	+ if ($crash_dt > 0) :
	1033	+ $crash_ts = time() + $crash_dt;
	1034	+ else :
	1035	+ $crash_ts = $default;
	1036	+ endif;
	1037	+ return $crash_ts;
	1038	+ }
	1039	+
1950	1040	function stale () {
1951	1041	if (get_option('feedwordpress_automatic_updates')) :
	1042	+ // Do our best to avoid possible simultaneous
	1043	+ // updates by getting up-to-the-minute settings.
	1044	+
1952	1045	$last = get_option('feedwordpress_last_update_all');
1953	1046
1954	1047	// If we haven't updated all yet, give it a time window
1955	1048	if (false === $last) :
		@@ -1968,75 +1061,252 @@
1968	1061	else :
1969	1062	FeedWordPress::critical_bug('FeedWordPress::stale::last', $last, __LINE__);
1970	1063	endif;
1971	1064
1972		- // Explicit request for an update (e.g. from a cron job).
1973		- elseif (FeedWordPress::update_requested()) :
1974		- $ret = true;
1975		-
1976	1065	else :
1977	1066	$ret = false;
1978	1067	endif;
1979	1068	return $ret;
1980	1069	} // FeedWordPress::stale()
	1070	+
	1071	+ function init () {
	1072	+ $this->clear_cache_magic_url();
	1073	+ $this->update_magic_url();
	1074	+ } /* FeedWordPress::init() */
1981	1075
	1076	+ function dashboard_setup () {
	1077	+ $see_it = FeedWordPress::menu_cap();
	1078	+
	1079	+ if (current_user_can($see_it)) :
	1080	+ // Get the stylesheet
	1081	+ wp_enqueue_style('feedwordpress-elements');
	1082	+
	1083	+ $widget_id = 'feedwordpress_dashboard';
	1084	+ $widget_name = __('Syndicated Sources');
	1085	+ $column = 'side';
	1086	+ $priority = 'core';
	1087	+
	1088	+ // I would love to use wp_add_dashboard_widget() here and save
	1089	+ // myself some trouble. But WP 3 does not yet have any way to
	1090	+ // push a dashboard widget onto the side, or to give it a default
	1091	+ // location.
	1092	+ add_meta_box(
	1093	+ /*id=*/ $widget_id,
	1094	+ /*title=*/ $widget_name,
	1095	+ /*callback=*/ array(&$this, 'dashboard'),
	1096	+ /*page=*/ 'dashboard',
	1097	+ /*context=*/ $column,
	1098	+ /*priority=*/ $priority
	1099	+ );
	1100	+ /*control_callback= array(&$this, 'dashboard_control') */
	1101	+
	1102	+ // This is kind of rude, I know, but the dashboard widget isn't
	1103	+ // worth much if users don't know that it exists, and I don't
	1104	+ // know of any better way to reorder the boxen.
	1105	+ //
	1106	+ // Gleefully ripped off of codex.wordpress.org/Dashboard_Widgets_API
	1107	+
	1108	+ // Globalize the metaboxes array, this holds all the widgets for wp-admin
	1109	+ global $wp_meta_boxes;
	1110	+
	1111	+ // Get the regular dashboard widgets array
	1112	+ // (which has our new widget already but at the end)
	1113	+
	1114	+ $normal_dashboard = $wp_meta_boxes['dashboard'][$column][$priority];
	1115	+
	1116	+ // Backup and delete our new dashbaord widget from the end of the array
	1117	+ if (isset($normal_dashboard[$widget_id])) :
	1118	+ $backup = array();
	1119	+ $backup[$widget_id] = $normal_dashboard[$widget_id];
	1120	+ unset($normal_dashboard[$widget_id]);
	1121	+
	1122	+ // Merge the two arrays together so our widget is at the
	1123	+ // beginning
	1124	+ $sorted_dashboard = array_merge($backup, $normal_dashboard);
	1125	+
	1126	+ // Save the sorted array back into the original metaboxes
	1127	+ $wp_meta_boxes['dashboard'][$column][$priority] = $sorted_dashboard;
	1128	+ endif;
	1129	+ endif;
	1130	+ } /* FeedWordPress::dashboard_setup () */
	1131	+
	1132	+ function dashboard () {
	1133	+ $syndicationPage = new FeedWordPressSyndicationPage(dirname(__FILE__).'/syndication.php');
	1134	+ $syndicationPage->dashboard_box($syndicationPage);
	1135	+ } /* FeedWordPress::dashboard () */
	1136	+
	1137	+ function update_magic_url () {
	1138	+ global $wpdb;
	1139	+
	1140	+ // Explicit update request in the HTTP request (e.g. from a cron job)
	1141	+ if ($this->update_requested()) :
	1142	+ $this->update($this->update_requested_url());
	1143	+
	1144	+ if (FEEDWORDPRESS_DEBUG and count($wpdb->queries) > 0) :
	1145	+ $mysqlTime = 0.0;
	1146	+ $byTime = array();
	1147	+ foreach ($wpdb->queries as $query) :
	1148	+ $time = $query[1] * 1000000.0;
	1149	+ $mysqlTime += $query[1];
	1150	+ if (!isset($byTime[$time])) : $byTime[$time] = array(); endif;
	1151	+ $byTime[$time][] = $query[0]. ' // STACK: ' . $query[2];
	1152	+ endforeach;
	1153	+ krsort($byTime);
	1154	+
	1155	+ foreach ($byTime as $time => $querySet) :
	1156	+ foreach ($querySet as $query) :
	1157	+ print "[".(sprintf('%4.4f', $time/1000.0)) . "ms] $query\n";
	1158	+ endforeach;
	1159	+ endforeach;
	1160	+ echo $this->log_prefix()."$wpdb->num_queries queries. $mysqlTime seconds in MySQL. Total of "; timer_stop(1); print " seconds.";
	1161	+ endif;
	1162	+
	1163	+ debug_out_feedwordpress_footer();
	1164	+
	1165	+ // Magic URL should return nothing but a 200 OK header packet
	1166	+ // when successful.
	1167	+ exit;
	1168	+ endif;
	1169	+ } /* FeedWordPress::magic_update_url () */
	1170	+
	1171	+ function clear_cache_magic_url () {
	1172	+ if ($this->clear_cache_requested()) :
	1173	+ $this->clear_cache();
	1174	+ endif;
	1175	+ } /* FeedWordPress::clear_cache_magic_url() */
	1176	+
	1177	+ function clear_cache_requested () {
	1178	+ return (
	1179	+ isset($_GET['clear_cache'])
	1180	+ and $_GET['clear_cache']
	1181	+ );
	1182	+ } /* FeedWordPress::clear_cache_requested() */
	1183	+
1982	1184	function update_requested () {
1983		- return (isset($_REQUEST['update_feedwordpress']) and $_REQUEST['update_feedwordpress']);
	1185	+ return (
	1186	+ isset($_REQUEST['update_feedwordpress'])
	1187	+ and $_REQUEST['update_feedwordpress']
	1188	+ );
1984	1189	} // FeedWordPress::update_requested()
1985	1190
1986		- function syndicate_link ($name, $uri, $rss) {
	1191	+ function update_requested_url () {
	1192	+ $ret = null;
	1193	+
	1194	+ if (($_REQUEST['update_feedwordpress']=='*')
	1195	+ or (preg_match('|^http://.*|i', $_REQUEST['update_feedwordpress']))) :
	1196	+ $ret = $_REQUEST['update_feedwordpress'];
	1197	+ endif;
	1198	+
	1199	+ return $ret;
	1200	+ } // FeedWordPress::update_requested_url()
	1201	+
	1202	+ function auto_update () {
	1203	+ if ($this->stale()) :
	1204	+ $this->update();
	1205	+ endif;
	1206	+ } /* FeedWordPress::auto_update () */
	1207	+
	1208	+ function find_link ($uri, $field = 'link_rss') {
1987	1209	global $wpdb;
1988	1210
	1211	+ $unslashed = untrailingslashit($uri);
	1212	+ $slashed = trailingslashit($uri);
	1213	+ $link_id = $wpdb->get_var($wpdb->prepare("
	1214	+ SELECT link_id FROM $wpdb->links WHERE $field IN ('%s', '%s')
	1215	+ LIMIT 1", $unslashed, $slashed
	1216	+ ));
	1217	+
	1218	+ return $link_id;
	1219	+ } /* FeedWordPress::find_link () */
	1220	+
	1221	+ function syndicate_link ($name, $uri, $rss) {
1989	1222	// Get the category ID#
1990	1223	$cat_id = FeedWordPress::link_category_id();
1991		-
	1224	+ if (!is_wp_error($cat_id)) :
	1225	+ $link_category = array($cat_id);
	1226	+ else :
	1227	+ $link_category = array();
	1228	+ endif;
	1229	+
1992	1230	// WordPress gets cranky if there's no homepage URI
1993		- if (!isset($uri) or strlen($uri)<1) : $uri = $rss; endif;
	1231	+ if (!is_string($uri) or strlen($uri)<1) : $uri = $rss; endif;
1994	1232
1995		- if (function_exists('wp_insert_link')) { // WordPress 2.x
1996		- $link_id = wp_insert_link(array(
1997		- "link_name" => $name,
1998		- "link_url" => $uri,
1999		- "link_category" => array($cat_id),
2000		- "link_rss" => $rss
2001		- ));
2002		- } else { // WordPress 1.5.x
2003		- $result = $wpdb->query("
2004		- INSERT INTO $wpdb->links
2005		- SET
2006		- link_name = '".$wpdb->escape($name)."',
2007		- link_url = '".$wpdb->escape($uri)."',
2008		- link_category = '".$wpdb->escape($cat_id)."',
2009		- link_rss = '".$wpdb->escape($rss)."'
2010		- ");
2011		- $link_id = $wpdb->insert_id;
2012		- } // if
	1233	+ // Check if this feed URL is already being syndicated.
	1234	+ $link_id = wp_insert_link(array(
	1235	+ "link_id" => FeedWordPress::find_link($rss), // insert if nothing was found; else update
	1236	+ "link_rss" => $rss,
	1237	+ "link_name" => $name,
	1238	+ "link_url" => $uri,
	1239	+ "link_category" => $link_category,
	1240	+ "link_visible" => 'Y', // reactivate if inactivated
	1241	+ ));
	1242	+
2013	1243	return $link_id;
2014		- } // function FeedWordPress::syndicate_link()
	1244	+ } /* function FeedWordPress::syndicate_link() */
2015	1245
2016		- function on_unfamiliar ($what = 'author', $override = NULL) {
2017		- $set = array('create', 'default', 'filter');
	1246	+ /*static*/ function syndicated_status ($what, $default) {
	1247	+ $ret = get_option("feedwordpress_syndicated_{$what}_status");
	1248	+ if (!$ret) :
	1249	+ $ret = $default;
	1250	+ endif;
	1251	+ return $ret;
	1252	+ } /* FeedWordPress::syndicated_status() */
2018	1253
2019		- if (is_string($override)) :
2020		- $ret = strtolower($override);
	1254	+ function on_unfamiliar ($what = 'author') {
	1255	+ switch ($what) :
	1256	+ case 'category' : $suffix = ':category'; break;
	1257	+ case 'post_tag' : $suffix = ':post_tag'; break;
	1258	+ default: $suffix = '';
	1259	+ endswitch;
	1260	+
	1261	+ return get_option('feedwordpress_unfamiliar_'.$what, 'create'.$suffix);
	1262	+ } // function FeedWordPress::on_unfamiliar()
	1263	+
	1264	+ function null_email_set () {
	1265	+ $base = get_option('feedwordpress_null_email_set');
	1266	+
	1267	+ if ($base===false) :
	1268	+ $ret = array('noreply@blogger.com'); // default
	1269	+ else :
	1270	+ $ret = array_map('strtolower',
	1271	+ array_map('trim', explode("\n", $base)));
2021	1272	endif;
	1273	+ $ret = apply_filters('syndicated_item_author_null_email_set', $ret);
	1274	+ return $ret;
2022	1275
2023		- if (!is_numeric($override) and !in_array($ret, $set)) :
2024		- $ret = get_option('feedwordpress_unfamiliar_'.$what);
2025		- if (!is_numeric($ret) and !in_array($ret, $set)) :
2026		- $ret = 'create';
2027		- endif;
2028		- endif;
	1276	+ } /* FeedWordPress::null_email_set () */
2029	1277
	1278	+ function is_null_email ($email) {
	1279	+ $ret = in_array(strtolower(trim($email)), FeedWordPress::null_email_set());
	1280	+ $ret = apply_filters('syndicated_item_author_is_null_email', $ret, $email);
2030	1281	return $ret;
2031		- } // function FeedWordPress::on_unfamiliar()
	1282	+ } /* FeedWordPress::is_null_email () */
2032	1283
2033		- function syndicated_links () {
	1284	+ function use_aggregator_source_data () {
	1285	+ $ret = get_option('feedwordpress_use_aggregator_source_data');
	1286	+ return apply_filters('syndicated_post_use_aggregator_source_data', ($ret=='yes'));
	1287	+ }
	1288	+
	1289	+ /**
	1290	+ * FeedWordPress::munge_permalinks: check whether or not FeedWordPress
	1291	+ * should rewrite permalinks for syndicated items to reflect their
	1292	+ * original location.
	1293	+ *
	1294	+ * @return bool TRUE if FeedWordPress SHOULD rewrite permalinks; FALSE otherwise
	1295	+ */
	1296	+ /*static*/ function munge_permalinks () {
	1297	+ return (get_option('feedwordpress_munge_permalink', /*default=*/ 'yes') != 'no');
	1298	+ } /* FeedWordPress::munge_permalinks() */
	1299	+
	1300	+ function syndicated_links ($args = array()) {
2034	1301	$contributors = FeedWordPress::link_category_id();
2035		- if (function_exists('get_bookmarks')) :
2036		- $links = get_bookmarks(array("category" => $contributors));
2037		- else:
2038		- $links = get_linkobjects($contributors); // deprecated as of WP 2.1
	1302	+ if (!is_wp_error($contributors)) :
	1303	+ $links = get_bookmarks(array_merge(
	1304	+ array("category" => $contributors),
	1305	+ $args
	1306	+ ));
	1307	+ else :
	1308	+ $links = array();
2039	1309	endif;
2040	1310	return $links;
2041	1311	} // function FeedWordPress::syndicated_links()
2042	1312
		@@ -2044,61 +1314,32 @@
2044	1314	global $wpdb, $wp_db_version;
2045	1315
2046	1316	$cat_id = get_option('feedwordpress_cat_id');
2047	1317
2048		- // If we don't yet *have* the category, we'll have to create it
2049		- if ($cat_id === false) :
2050		- $cat = $wpdb->escape(DEFAULT_SYNDICATION_CATEGORY);
2051		-
2052		- // Look for something with the right name...
2053		- // -----------------------------------------
	1318	+ // If we don't yet have the category ID stored, search by name
	1319	+ if (!$cat_id) :
	1320	+ $cat_id = FeedWordPressCompatibility::link_category_id(DEFAULT_SYNDICATION_CATEGORY);
2054	1321
2055		- // WordPress 2.3 introduces a new taxonomy/term API
2056		- if (function_exists('is_term')) :
2057		- $cat_id = is_term($cat, 'link_category');
2058		- // WordPress 2.1 and 2.2 use a common table for both link and post categories
2059		- elseif (isset($wp_db_version) and ($wp_db_version >= FWP_SCHEMA_21 and $wp_db_version < FWP_SCHEMA_23) ) :
2060		- $cat_id = $wpdb->get_var("SELECT cat_id FROM {$wpdb->categories} WHERE cat_name='$cat'");
2061		- // WordPress 1.5 and 2.0.x have a separate table for link categories
2062		- elseif (!isset($wp_db_version) or $wp_db_version < FWP_SCHEMA_21) :
2063		- $cat_id = $wpdb->get_var("SELECT cat_id FROM {$wpdb->linkcategories} WHERE cat_name='$cat'");
2064		- // This should never happen.
2065		- else :
2066		- FeedWordPress::critical_bug('FeedWordPress::link_category_id::wp_db_version', $wp_db_version, __LINE__);
	1322	+ if ($cat_id) :
	1323	+ // We found it; let's stamp it.
	1324	+ update_option('feedwordpress_cat_id', $cat_id);
2067	1325	endif;
2068	1326
2069		- // If you still can't find anything, make it for yourself.
2070		- // -------------------------------------------------------
2071		- if (!$cat_id) :
2072		- // WordPress 2.3+ term/taxonomy API
2073		- if (function_exists('wp_insert_term')) :
2074		- $term = wp_insert_term($cat, 'link_category');
2075		- $cat_id = $term['term_id'];
2076		- // WordPress 2.1, 2.2 category API. By the way, why the fuck is this API function only available in a wp-admin module?
2077		- elseif (function_exists('wp_insert_category')) :
2078		- $cat_id = wp_insert_category(array('cat_name' => $cat));
2079		- // WordPress 1.5 and 2.0.x
2080		- elseif (!isset($wp_db_version) or $wp_db_version < FWP_SCHEMA_21) :
2081		- $result = $wpdb->query("
2082		- INSERT INTO $wpdb->linkcategories
2083		- SET
2084		- cat_id = 0,
2085		- cat_name='$cat',
2086		- show_images='N',
2087		- show_description='N',
2088		- show_rating='N',
2089		- show_updated='N',
2090		- sort_order='name'
2091		- ");
2092		- $cat_id = $wpdb->insert_id;
2093		- // This should never happen.
2094		- else :
2095		- FeedWordPress::critical_bug('FeedWordPress::link_category_id::wp_db_version', $wp_db_version, __LINE__);
2096		- endif;
	1327	+ // If we *do* have the category ID stored, verify that it exists
	1328	+ else :
	1329	+ $cat_id = FeedWordPressCompatibility::link_category_id((int) $cat_id, 'cat_id');
	1330	+ endif;
	1331	+
	1332	+ // If we could not find an appropriate link category,
	1333	+ // make a new one for ourselves.
	1334	+ if (!$cat_id) :
	1335	+ $cat_id = FeedWordPressCompatibility::insert_link_category(DEFAULT_SYNDICATION_CATEGORY);
	1336	+ if (!is_wp_error($cat_id)) :
	1337	+ // Stamp it
	1338	+ update_option('feedwordpress_cat_id', $cat_id);
2097	1339	endif;
	1340	+ endif;
2098	1341
2099		- update_option('feedwordpress_cat_id', $cat_id);
2100		- endif;
2101	1342	return $cat_id;
2102	1343	} // function FeedWordPress::link_category_id()
2103	1344
2104	1345	# Upgrades and maintenance...
		@@ -2108,12 +1349,9 @@
2108	1349	$ret = false; // innocent until proven guilty
2109	1350	if (!$fwp_db_version or $fwp_db_version < FEEDWORDPRESS_VERSION) :
2110	1351	// This is an older version or a fresh install. Does it
2111	1352	// require a database upgrade or database initialization?
2112		- if ($fwp_db_version > 0.96) :
2113		- // No. Just brand it with the new version.
2114		- update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
2115		- else :
	1353	+ if ($fwp_db_version <= 0.96) :
2116	1354	// Yes. Check to see whether this is a fresh install or an upgrade.
2117	1355	$syn = $wpdb->get_col("
2118	1356	SELECT post_id
2119	1357	FROM $wpdb->postmeta
		@@ -2123,8 +1361,53 @@
2123	1361	$ret = true;
2124	1362	else : // fresh install; brand it as ours
2125	1363	update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
2126	1364	endif;
	1365	+ elseif ($fwp_db_version < 2009.0707) :
	1366	+ // We need to clear out any busted AJAX crap
	1367	+ $wpdb->query("
	1368	+ DELETE FROM $wpdb->usermeta
	1369	+ WHERE LOCATE('feedwordpress', meta_key)
	1370	+ AND LOCATE('box', meta_key);
	1371	+ ");
	1372	+
	1373	+ update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
	1374	+ elseif ($fwp_db_version < 2010.0814) :
	1375	+ // Change in terminology.
	1376	+ if (get_option('feedwordpress_unfamiliar_category', 'create')=='default') :
	1377	+ update_option('feedwordpress_unfamiliar_category', 'null');
	1378	+ endif;
	1379	+ foreach (FeedWordPress::syndicated_links() as $link) :
	1380	+ $sub = new SyndicatedLink($link);
	1381	+
	1382	+ $remap_uf = array(
	1383	+ 'default' => 'null',
	1384	+ 'filter' => 'null',
	1385	+ 'create' => 'create:category',
	1386	+ 'tag' => 'create:post_tag'
	1387	+ );
	1388	+ if (isset($sub->settings['unfamiliar category'])) :
	1389	+ if ($sub->settings['unfamiliar category']=='filter') :
	1390	+ $sub->settings['match/filter'] = array('category');
	1391	+ endif;
	1392	+ foreach ($remap_uf as $from => $to) :
	1393	+ if ($sub->settings['unfamiliar category']==$from) :
	1394	+ $sub->settings['unfamiliar category'] = $to;
	1395	+ endif;
	1396	+ endforeach;
	1397	+ endif;
	1398	+
	1399	+ if (isset($sub->settings['add global categories'])) :
	1400	+ $sub->settings['add/category'] = $sub->settings['add global categories'];
	1401	+ unset($sub->settings['add global categories']);
	1402	+ endif;
	1403	+
	1404	+ $sub->save_settings(/*reload=*/ true);
	1405	+ endforeach;
	1406	+ update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
	1407	+ else :
	1408	+ // No. Just brand it with the new version.
	1409	+ update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
2127	1410	endif;
2128	1411	endif;
2129	1412	return $ret;
2130	1413	}
		@@ -2134,56 +1417,14 @@
2134	1417
2135	1418	if (is_null($from) or $from <= 0.96) : $from = 0.96; endif;
2136	1419
2137	1420	switch ($from) :
2138		- case 0.96: // account for changes to syndication custom values and guid
2139		- echo "<p>Upgrading database from {$from} to ".FEEDWORDPRESS_VERSION."...</p>\n";
	1421	+ case 0.96:
	1422	+ // Dropping legacy upgrade code. If anyone is still
	1423	+ // using 0.96 and just now decided to upgrade, well, I'm
	1424	+ // sorry about that. You'll just have to cope with a few
	1425	+ // duplicate posts.
2140	1426
2141		- $cat_id = FeedWordPress::link_category_id();
2142		-
2143		- // Avoid duplicates
2144		- $wpdb->query("DELETE FROM `{$wpdb->postmeta}` WHERE meta_key = 'syndication_feed_id'");
2145		-
2146		- // Look up all the link IDs
2147		- $wpdb->query("
2148		- CREATE TEMPORARY TABLE tmp_custom_values
2149		- SELECT
2150		- NULL AS meta_id,
2151		- post_id,
2152		- 'syndication_feed_id' AS meta_key,
2153		- link_id AS meta_value
2154		- FROM `{$wpdb->postmeta}`, `{$wpdb->links}`
2155		- WHERE
2156		- meta_key='syndication_feed'
2157		- AND meta_value=link_rss
2158		- AND link_category = {$cat_id}
2159		- ");
2160		-
2161		- // Now attach them to their posts
2162		- $wpdb->query("INSERT INTO `{$wpdb->postmeta}` SELECT * FROM tmp_custom_values");
2163		-
2164		- // And clean up after ourselves.
2165		- $wpdb->query("DROP TABLE tmp_custom_values");
2166		-
2167		- // Now fix the guids to avoid duplicate posts
2168		- echo "<ul>";
2169		- foreach ($this->feeds as $feed) :
2170		- echo "<li>Fixing post meta-data for <cite>".$feed['link/name']."</cite> &#8230; "; flush();
2171		- $rss = @fetch_rss($feed['link/uri']);
2172		- if (is_array($rss->items)) :
2173		- foreach ($rss->items as $item) :
2174		- $guid = $wpdb->escape(FeedWordPress::guid($item, $feed)); // new GUID algorithm
2175		- $link = $wpdb->escape($item['link']);
2176		-
2177		- $wpdb->query("
2178		- UPDATE `{$wpdb->posts}` SET guid='{$guid}' WHERE guid='{$link}'
2179		- ");
2180		- endforeach;
2181		- endif;
2182		- echo "<strong>complete.</strong></li>\n";
2183		- endforeach;
2184		- echo "</ul>\n";
2185		-
2186	1427	// Mark the upgrade as successful.
2187	1428	update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
2188	1429	endswitch;
2189	1430	echo "<p>Upgrade complete. FeedWordPress is now ready to use again.</p>";
		@@ -2188,1704 +1429,738 @@
2188	1429	endswitch;
2189	1430	echo "<p>Upgrade complete. FeedWordPress is now ready to use again.</p>";
2190	1431	} /* FeedWordPress::upgrade_database() */
2191	1432
2192		- # Utility functions for handling text settings
2193		- function negative ($f, $setting) {
2194		- $nego = array ('n', 'no', 'f', 'false');
2195		- return (isset($f[$setting]) and in_array(strtolower($f[$setting]), $nego));
2196		- }
2197		-
2198		- function affirmative ($f, $setting) {
2199		- $affirmo = array ('y', 'yes', 't', 'true', 1);
2200		- return (isset($f[$setting]) and in_array(strtolower($f[$setting]), $affirmo));
2201		- }
2202		-
2203		-
2204		- # Internal debugging functions
2205		- function critical_bug ($varname, $var, $line) {
2206		- global $wp_version;
2207		-
2208		- 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>';
2209		- echo "\n<plaintext>";
2210		- echo "Triggered at line # ".$line."\n";
2211		- echo "FeedWordPress version: ".FEEDWORDPRESS_VERSION."\n";
2212		- echo "WordPress version: $wp_version\n";
2213		- echo "PHP version: ".phpversion()."\n";
2214		- echo "\n";
2215		- echo $varname.": "; var_dump($var); echo "\n";
2216		- die;
2217		- }
2218		-} // class FeedWordPress
2219		-
2220		-class SyndicatedPost {
2221		- var $item = null;
2222		-
2223		- var $link = null;
2224		- var $feed = null;
2225		- var $feedmeta = null;
2226		-
2227		- var $post = array ();
2228		- var $_base = null;
2229		-
2230		- var $_freshness = null;
2231		- var $_wp_id = null;
2232		-
2233		- function SyndicatedPost ($item, $link) {
	1433	+ function has_guid_index () {
2234	1434	global $wpdb;
	1435	+
	1436	+ $found = false; // Guilty until proven innocent.
2235	1437
2236		- $this->link = $link;
2237		- $feedmeta = $link->settings;
2238		- $feed = $link->magpie;
2239		-
2240		- # This is ugly as all hell. I'd like to use apply_filters()'s
2241		- # alleged support for a variable argument count, but this seems
2242		- # to have been broken in WordPress 1.5. It'll be fixed somehow
2243		- # in WP 1.5.1, but I'm aiming at WP 1.5 compatibility across
2244		- # the board here.
2245		- #
2246		- # Cf.: <http://mosquito.wordpress.org/view.php?id=901>
2247		- global $fwp_channel, $fwp_feedmeta;
2248		- $fwp_channel = $feed; $fwp_feedmeta = $feedmeta;
2249		-
2250		- $this->feed = $feed;
2251		- $this->feedmeta = $feedmeta;
2252		-
2253		- $this->item = $item;
2254		- $this->item = apply_filters('syndicated_item', $this->item, $this);
2255		-
2256		- # Filters can halt further processing by returning NULL
2257		- if (is_null($this->item)) :
2258		- $this->post = NULL;
2259		- else :
2260		- # Note that nothing is run through $wpdb->escape() here.
2261		- # That's deliberate. The escaping is done at the point
2262		- # of insertion, not here, to avoid double-escaping and
2263		- # to avoid screwing with syndicated_post filters
2264		-
2265		- $this->post['post_title'] = apply_filters('syndicated_item_title', $this->item['title'], $this);
2266		-
2267		- // This just gives us an alphanumeric representation of
2268		- // the author. We will look up (or create) the numeric
2269		- // ID for the author in SyndicatedPost::add()
2270		- $this->post['named']['author'] = apply_filters('syndicated_item_author', $this->author(), $this);
2271		-
2272		- # Identify content and sanitize it.
2273		- # ---------------------------------
2274		- if (isset($this->item['xhtml']['body'])) :
2275		- $content = $this->item['xhtml']['body'];
2276		- elseif (isset($this->item['xhtml']['div'])) :
2277		- $content = $this->item['xhtml']['div'];
2278		- elseif (isset($this->item['content']['encoded']) and $this->item['content']['encoded']):
2279		- $content = $this->item['content']['encoded'];
2280		- else:
2281		- $content = $this->item['description'];
2282		- endif;
2283		- $this->post['post_content'] = apply_filters('syndicated_item_content', $content, $this);
2284		-
2285		- # Identify and sanitize excerpt
2286		- $excerpt = NULL;
2287		- if ( isset($this->item['description']) and $this->item['description'] ) :
2288		- $excerpt = $this->item['description'];
2289		- elseif ( isset($content) and $content ) :
2290		- $excerpt = strip_tags($content);
2291		- if (strlen($excerpt) > 255) :
2292		- $excerpt = substr($excerpt,0,252).'...';
	1438	+ $results = $wpdb->get_results("
	1439	+ SHOW INDEXES FROM {$wpdb->posts}
	1440	+ ");
	1441	+ if ($results) :
	1442	+ foreach ($results as $index) :
	1443	+ if (isset($index->Column_name)
	1444	+ and ('guid' == $index->Column_name)) :
	1445	+ $found = true;
2293	1446	endif;
2294		- endif;
2295		- $excerpt = apply_filters('syndicated_item_excerpt', $excerpt, $this);
2296		-
2297		- if (!is_null($excerpt)):
2298		- $this->post['post_excerpt'] = $excerpt;
2299		- endif;
2300		-
2301		- // This is unnecessary if we use wp_insert_post
2302		- if (!$this->use_api('wp_insert_post')) :
2303		- $this->post['post_name'] = sanitize_title($this->post['post_title']);
2304		- endif;
2305		-
2306		- $this->post['epoch']['issued'] = apply_filters('syndicated_item_published', $this->published(), $this);
2307		- $this->post['epoch']['created'] = apply_filters('syndicated_item_created', $this->created(), $this);
2308		- $this->post['epoch']['modified'] = apply_filters('syndicated_item_updated', $this->updated(), $this);
2309		-
2310		- // Dealing with timestamps in WordPress is so fucking fucked.
2311		- $offset = (int) get_option('gmt_offset') * 60 * 60;
2312		- $this->post['post_date'] = gmdate('Y-m-d H:i:s', $this->published() + $offset);
2313		- $this->post['post_modified'] = gmdate('Y-m-d H:i:s', $this->updated() + $offset);
2314		- $this->post['post_date_gmt'] = gmdate('Y-m-d H:i:s', $this->published());
2315		- $this->post['post_modified_gmt'] = gmdate('Y-m-d H:i:s', $this->updated());
2316		-
2317		- // Use feed-level preferences or the global default.
2318		- $this->post['post_status'] = $this->link->syndicated_status('post', 'publish');
2319		- $this->post['comment_status'] = $this->link->syndicated_status('comment', 'closed');
2320		- $this->post['ping_status'] = $this->link->syndicated_status('ping', 'closed');
2321		-
2322		- // Unique ID (hopefully a unique tag: URI); failing that, the permalink
2323		- $this->post['guid'] = apply_filters('syndicated_item_guid', $this->guid(), $this);
2324		-
2325		- // RSS 2.0 / Atom 1.0 enclosure support
2326		- if ( isset($this->item['enclosure#']) ) :
2327		- for ($i = 1; $i <= $this->item['enclosure#']; $i++) :
2328		- $eid = (($i > 1) ? "#{$id}" : "");
2329		- $this->post['meta']['enclosure'][] =
2330		- apply_filters('syndicated_item_enclosure_url', $this->item["enclosure{$eid}@url"], $this)."\n".
2331		- apply_filters('syndicated_item_enclosure_length', $this->item["enclosure{$eid}@length"], $this)."\n".
2332		- apply_filters('syndicated_item_enclosure_type', $this->item["enclosure{$eid}@type"], $this);
2333		- endfor;
2334		- endif;
2335		-
2336		- // In case you want to point back to the blog this was syndicated from
2337		- if (isset($this->feed->channel['title'])) :
2338		- $this->post['meta']['syndication_source'] = apply_filters('syndicated_item_source_title', $this->feed->channel['title'], $this);
2339		- endif;
2340		- if (isset($this->feed->channel['link'])) :
2341		- $this->post['meta']['syndication_source_uri'] = apply_filters('syndicated_item_source_link', $this->feed->channel['link'], $this);
2342		- endif;
2343		-
2344		- // Store information on human-readable and machine-readable comment URIs
2345		- if (isset($this->item['comments'])) :
2346		- $this->post['meta']['rss:comments'] = apply_filters('syndicated_item_comments', $this->item['comments']);
2347		- endif;
2348		- if (isset($this->item['wfw']['commentrss'])) :
2349		- $this->post['meta']['wfw:commentRSS'] = apply_filters('syndicated_item_commentrss', $this->item['wfw']['commentrss']);
2350		- endif;
2351		-
2352		- // Store information to identify the feed that this came from
2353		- $this->post['meta']['syndication_feed'] = $this->feedmeta['link/uri'];
2354		- $this->post['meta']['syndication_feed_id'] = $this->feedmeta['link/id'];
2355		-
2356		- // In case you want to know the external permalink...
2357		- $this->post['meta']['syndication_permalink'] = apply_filters('syndicated_item_link', $this->item['link']);
2358		-
2359		- // Feed-by-feed options for author and category creation
2360		- $this->post['named']['unfamiliar']['author'] = $this->feedmeta['unfamiliar author'];
2361		- $this->post['named']['unfamiliar']['category'] = $this->feedmeta['unfamiliar category'];
2362		-
2363		- // Categories: start with default categories, if any
2364		- $fc = get_option("feedwordpress_syndication_cats");
2365		- if ($fc) :
2366		- $this->post['named']['preset/category'] = explode("\n", $fc);
2367		- else :
2368		- $this->post['named']['preset/category'] = array();
2369		- endif;
2370		-
2371		- if (is_array($this->feedmeta['cats'])) :
2372		- $this->post['named']['preset/category'] = array_merge($this->post['named']['preset/category'], $this->feedmeta['cats']);
2373		- endif;
2374		-
2375		- // Now add categories from the post, if we have 'em
2376		- $this->post['named']['category'] = array();
2377		- if ( isset($this->item['category#']) ) :
2378		- for ($i = 1; $i <= $this->item['category#']; $i++) :
2379		- $cat_idx = (($i > 1) ? "#{$i}" : "");
2380		- $cat = $this->item["category{$cat_idx}"];
2381		-
2382		- if ( isset($this->feedmeta['cat_split']) and strlen($this->feedmeta['cat_split']) > 0) :
2383		- $pcre = "\007".$this->feedmeta['cat_split']."\007";
2384		- $this->post['named']['category'] = array_merge($this->post['named']['category'], preg_split($pcre, $cat, -1 /*=no limit*/, PREG_SPLIT_NO_EMPTY));
2385		- else :
2386		- $this->post['named']['category'][] = $cat;
2387		- endif;
2388		- endfor;
2389		- endif;
2390		- $this->post['named']['category'] = apply_filters('syndicated_item_categories', $this->post['named']['category'], $this);
2391		-
2392		- // Tags: start with default tags, if any
2393		- $ft = get_option("feedwordpress_syndication_tags");
2394		- if ($ft) :
2395		- $this->post['tags_input'] = explode('FEEDWORDPRESS_CAT_SEPARATOR', $ft);
2396		- else :
2397		- $this->post['tags_input'] = array();
2398		- endif;
2399		-
2400		- if (is_array($this->feedmeta['tags'])) :
2401		- $this->post['tags_input'] = array_merge($this->post['tags_input'], $this->feedmeta['tags']);
2402		- endif;
	1447	+ endforeach;
2403	1448	endif;
2404		- } // SyndicatedPost::SyndicatedPost()
2405		-
2406		- function filtered () {
2407		- return is_null($this->post);
2408		- }
2409		-
2410		- function freshness () {
	1449	+ return $found;
	1450	+ } /* FeedWordPress::has_guid_index () */
	1451	+
	1452	+ function create_guid_index () {
2411	1453	global $wpdb;
2412		-
2413		- if ($this->filtered()) : // This should never happen.
2414		- FeedWordPress::critical_bug('SyndicatedPost', $this, __LINE__);
2415		- endif;
2416	1454
2417		- if (is_null($this->_freshness)) :
2418		- $guid = $wpdb->escape($this->guid());
2419		-
2420		- $result = $wpdb->get_row("
2421		- SELECT id, guid, post_modified_gmt
2422		- FROM $wpdb->posts WHERE guid='$guid'
2423		- ");
2424		-
2425		- preg_match('/([0-9]+)-([0-9]+)-([0-9]+) ([0-9]+):([0-9]+):([0-9]+)/', $result->post_modified_gmt, $backref);
2426		- $updated = gmmktime($backref[4], $backref[5], $backref[6], $backref[2], $backref[3], $backref[1]);
2427		- if (!$result) :
2428		- $this->_freshness = 2; // New content
2429		- elseif ($this->updated() > $updated) :
2430		- $this->_freshness = 1; // Updated content
2431		- $this->_wp_id = $result->id;
2432		- else :
2433		- $this->_freshness = 0; // Same old, same old
2434		- $this->_wp_id = $result->id;
2435		- endif;
2436		- endif;
2437		- return $this->_freshness;
	1455	+ $wpdb->query("
	1456	+ CREATE INDEX {$wpdb->posts}_guid_idx ON {$wpdb->posts}(guid)
	1457	+ ");
	1458	+ } /* FeedWordPress::create_guid_index () */
	1459	+
	1460	+ function remove_guid_index () {
	1461	+ global $wpdb;
	1462	+
	1463	+ $wpdb->query("
	1464	+ DROP INDEX {$wpdb->posts}_guid_idx ON {$wpdb->posts}
	1465	+ ");
2438	1466	}
2439	1467
2440		- function wp_id () {
2441		- if ($this->filtered()) : // This should never happen.
2442		- FeedWordPress::critical_bug('SyndicatedPost', $this, __LINE__);
2443		- endif;
2444		-
2445		- if (is_null($this->_wp_id) and is_null($this->_freshness)) :
2446		- $fresh = $this->freshness(); // sets WP DB id in the process
2447		- endif;
2448		- return $this->_wp_id;
	1468	+ /*static*/ function fetch_timeout () {
	1469	+ return apply_filters(
	1470	+ 'feedwordpress_fetch_timeout',
	1471	+ intval(get_option('feedwordpress_fetch_timeout', FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT))
	1472	+ );
2449	1473	}
	1474	+
	1475	+ /*static*/ function fetch ($url, $params = array()) {
	1476	+ $force_feed = true; // Default
2450	1477
2451		- function store () {
2452		- global $wpdb;
2453		-
2454		- if ($this->filtered()) : // This should never happen.
2455		- FeedWordPress::critical_bug('SyndicatedPost', $this, __LINE__);
	1478	+ // Allow user to change default feed-fetch timeout with a global setting. Props Erigami Scholey-Fuller <http://www.piepalace.ca/blog/2010/11/feedwordpress-broke-my-heart.html> 'timeout' =>
	1479	+ $timeout = FeedWordPress::fetch_timeout();
	1480	+
	1481	+ if (!is_array($params)) :
	1482	+ $force_feed = $params;
	1483	+ else : // Parameter array
	1484	+ $args = shortcode_atts(array(
	1485	+ 'force_feed' => $force_feed,
	1486	+ 'timeout' => $timeout
	1487	+ ), $params);
	1488	+
	1489	+ extract($args);
2456	1490	endif;
	1491	+ $timeout = intval($timeout);
2457	1492
2458		- $freshness = $this->freshness();
2459		- if ($freshness > 0) :
2460		- # -- Look up, or create, numeric ID for author
2461		- $this->post['post_author'] = $this->author_id (
2462		- FeedWordPress::on_unfamiliar('author', $this->post['named']['unfamiliar']['author'])
2463		- );
	1493	+ $pie_class = apply_filters('feedwordpress_simplepie_class', 'SimplePie');
	1494	+ $cache_class = apply_filters('feedwordpress_cache_class', 'WP_Feed_Cache');
	1495	+ $file_class = apply_filters('feedwordpress_file_class', 'FeedWordPress_File');
	1496	+ $parser_class = apply_filters('feedwordpress_parser_class', 'FeedWordPress_Parser');
2464	1497
2465		- if (is_null($this->post['post_author'])) :
2466		- $this->post = NULL;
2467		- endif;
2468		- endif;
2469		-
2470		- if (!$this->filtered() and $freshness > 0) :
2471		- # -- Look up, or create, numeric ID for categories
2472		- $this->post['post_category'] = $this->category_ids (
2473		- $this->post['named']['category'],
2474		- FeedWordPress::on_unfamiliar('category', $this->post['named']['unfamiliar']['category'])
2475		- );
2476		-
2477		- if (is_null($this->post['post_category'])) :
2478		- // filter mode on, no matching categories; drop the post
2479		- $this->post = NULL;
2480		- else :
2481		- // filter mode off or at least one match; now add on the feed and global presets
2482		- $this->post['post_category'] = array_merge (
2483		- $this->post['post_category'],
2484		- $this->category_ids (
2485		- $this->post['named']['preset/category'],
2486		- 'default'
2487		- )
2488		- );
	1498	+ $sniffer_class = apply_filters('feedwordpress_sniffer_class', 'FeedWordPress_Content_Type_Sniffer');
2489	1499
2490		- if (count($this->post['post_category']) < 1) :
2491		- $this->post['post_category'][] = 1; // Default to category 1 ("Uncategorized" / "General") if nothing else
2492		- endif;
2493		- endif;
2494		- endif;
	1500	+ $feed = new $pie_class;
	1501	+ $feed->set_feed_url($url);
	1502	+ $feed->set_cache_class($cache_class);
	1503	+ $feed->set_timeout($timeout);
2495	1504
2496		- if (!$this->filtered() and $freshness > 0) :
2497		- unset($this->post['named']);
2498		- $this->post = apply_filters('syndicated_post', $this->post, $this);
2499		- endif;
	1505	+ //$feed->set_file_class('WP_SimplePie_File');
	1506	+ $feed->set_content_type_sniffer_class($sniffer_class);
	1507	+ $feed->set_file_class($file_class);
	1508	+ $feed->set_parser_class($parser_class);
	1509	+ $feed->force_feed($force_feed);
	1510	+ $feed->set_cache_duration(FeedWordPress::cache_duration());
	1511	+ $feed->init();
	1512	+ $feed->handle_content_type();
2500	1513
2501		- if (!$this->filtered() and $freshness == 2) :
2502		- // The item has not yet been added. So let's add it.
2503		- $this->insert_new();
2504		- $this->add_rss_meta();
2505		- do_action('post_syndicated_item', $this->wp_id());
2506		-
2507		- $ret = 'new';
2508		- elseif (!$this->filtered() and $freshness == 1) :
2509		- $this->post['ID'] = $this->wp_id();
2510		- $this->update_existing();
2511		- $this->add_rss_meta();
2512		- do_action('update_syndicated_item', $this->wp_id());
2513		-
2514		- $ret = 'updated';
	1514	+ if ($feed->error()) :
	1515	+ $ret = new WP_Error('simplepie-error', $feed->error());
2515	1516	else :
2516		- $ret = false;
	1517	+ $ret = $feed;
2517	1518	endif;
2518		-
2519	1519	return $ret;
2520		- } // function SyndicatedPost::store ()
	1520	+ } /* FeedWordPress::fetch () */
2521	1521
2522		- function insert_new () {
2523		- global $wpdb, $wp_db_version;
	1522	+ function clear_cache () {
	1523	+ global $wpdb;
2524	1524
2525		- // Why the fuck doesn't wp_insert_post already do this?
2526		- foreach ($this->post as $key => $value) :
2527		- if (is_string($value)) :
2528		- $dbpost[$key] = $wpdb->escape($value);
2529		- else :
2530		- $dbpost[$key] = $value;
2531		- endif;
2532		- endforeach;
	1525	+ // Just in case, clear out any old MagpieRSS cache records.
	1526	+ $magpies = $wpdb->query("
	1527	+ DELETE FROM {$wpdb->options}
	1528	+ WHERE option_name LIKE 'rss_%' AND LENGTH(option_name) > 32
	1529	+ ");
2533	1530
2534		- if (strlen($dbpost['post_title'].$dbpost['post_content'].$dbpost['post_excerpt']) == 0) :
2535		- // FIXME: Option for filtering out empty posts
2536		- endif;
2537		- if (strlen($dbpost['post_title'])==0) :
2538		- $dbpost['post_title'] = $this->post['meta']['syndication_source']
2539		- .' '.gmdate('Y-m-d H:i:s', $this->published() + $offset);
2540		- // FIXME: Option for what to fill a blank title with...
2541		- endif;
	1531	+ // The WordPress SimplePie module stores its cached feeds as
	1532	+ // transient records in the options table. The data itself is
	1533	+ // stored in `_transient_feed_{md5 of url}` and the last-modified
	1534	+ // timestamp in `_transient_feed_mod_{md5 of url}`. Timeouts for
	1535	+ // these records are stored in `_transient_timeout_feed_{md5}`.
	1536	+ // Since the md5 is always 32 characters in length, the
	1537	+ // option_name is always over 32 characters.
	1538	+ $simplepies = $wpdb->query("
	1539	+ DELETE FROM {$wpdb->options}
	1540	+ WHERE option_name LIKE '_transient%_feed_%' AND LENGTH(option_name) > 32
	1541	+ ");
	1542	+ $simplepies = (int) ($simplepies / 4); // Each transient has 4 rows: the data, the modified timestamp; and the timeouts for each
2542	1543
2543		- if ($this->use_api('wp_insert_post')) :
2544		- $dbpost['post_pingback'] = false; // Tell WP 2.1 and 2.2 not to process for pingbacks
2545		- $this->_wp_id = wp_insert_post($dbpost);
2546		-
2547		- // This should never happen.
2548		- if (!is_numeric($this->_wp_id) or ($this->_wp_id == 0)) :
2549		- FeedWordPress::critical_bug('SyndicatedPost (_wp_id problem)', array($dbpost, $this), __LINE__);
2550		- endif;
2551		-
2552		- // Unfortunately, as of WordPress 2.3, wp_insert_post()
2553		- // *still* offers no way to use a guid of your choice,
2554		- // and munges your post modified timestamp, too.
2555		- $result = $wpdb->query("
2556		- UPDATE $wpdb->posts
2557		- SET
2558		- guid='{$dbpost['guid']}',
2559		- post_modified='{$dbpost['post_modified']}',
2560		- post_modified_gmt='{$dbpost['post_modified_gmt']}'
2561		- WHERE ID='{$this->_wp_id}'
2562		- ");
2563		- else :
2564		- # The right way to do this is the above. But, alas,
2565		- # in earlier versions of WordPress, wp_insert_post has
2566		- # too much behavior (mainly related to pings) that can't
2567		- # be overridden. In WordPress 1.5, it's enough of a
2568		- # resource hog to make PHP segfault after inserting
2569		- # 50-100 posts. This can get pretty annoying, especially
2570		- # if you are trying to update your feeds for the first
2571		- # time.
	1544	+ return ($magpies + $simplepies);
	1545	+ } /* FeedWordPress::clear_cache () */
2572	1546
2573		- $result = $wpdb->query("
2574		- INSERT INTO $wpdb->posts
2575		- SET
2576		- guid = '{$dbpost['guid']}',
2577		- post_author = '{$dbpost['post_author']}',
2578		- post_date = '{$dbpost['post_date']}',
2579		- post_date_gmt = '{$dbpost['post_date_gmt']}',
2580		- post_content = '{$dbpost['post_content']}',"
2581		- .(isset($dbpost['post_excerpt']) ? "post_excerpt = '{$dbpost['post_excerpt']}'," : "")."
2582		- post_title = '{$dbpost['post_title']}',
2583		- post_name = '{$dbpost['post_name']}',
2584		- post_modified = '{$dbpost['post_modified']}',
2585		- post_modified_gmt = '{$dbpost['post_modified_gmt']}',
2586		- comment_status = '{$dbpost['comment_status']}',
2587		- ping_status = '{$dbpost['ping_status']}',
2588		- post_status = '{$dbpost['post_status']}'
2589		- ");
2590		- $this->_wp_id = $wpdb->insert_id;
	1547	+ function cache_duration () {
	1548	+ $duration = NULL;
	1549	+ if (defined('FEEDWORDPRESS_CACHE_AGE')) :
	1550	+ $duration = FEEDWORDPRESS_CACHE_AGE;
	1551	+ endif;
	1552	+ return $duration;
	1553	+ }
	1554	+ function cache_lifetime ($duration) {
	1555	+ // Check for explicit setting of a lifetime duration
	1556	+ if (defined('FEEDWORDPRESS_CACHE_LIFETIME')) :
	1557	+ $duration = FEEDWORDPRESS_CACHE_LIFETIME;
2591	1558
2592		- // This should never happen.
2593		- if (!is_numeric($this->_wp_id) or ($this->_wp_id == 0)) :
2594		- FeedWordPress::critical_bug('SyndicatedPost::_wp_id', $this->_wp_id, __LINE__);
2595		- endif;
2596		-
2597		- // WordPress 1.5.x - 2.0.x
2598		- wp_set_post_cats('1', $this->wp_id(), $this->post['post_category']);
2599		-
2600		- // Since we are not going through official channels, we need to
2601		- // manually tell WordPress that we've published a new post.
2602		- // We need to make sure to do this in order for FeedWordPress
2603		- // to play well with the staticize-reloaded plugin (something
2604		- // that a large aggregator website is going to *want* to be
2605		- // able to use).
2606		- do_action('publish_post', $this->_wp_id);
	1559	+ // Fall back to the cache freshness duration
	1560	+ elseif (defined('FEEDWORDPRESS_CACHE_AGE')) :
	1561	+ $duration = FEEDWORDPRESS_CACHE_AGE;
2607	1562	endif;
2608		- } /* SyndicatedPost::insert_new() */
	1563	+
	1564	+ // Fall back to WordPress default
	1565	+ return $duration;
	1566	+ } /* FeedWordPress::cache_lifetime () */
2609	1567
2610		- function update_existing () {
2611		- global $wpdb;
	1568	+ # Utility functions for handling text settings
	1569	+ function negative ($f, $setting) {
	1570	+ $nego = array ('n', 'no', 'f', 'false');
	1571	+ return (isset($f[$setting]) and in_array(strtolower($f[$setting]), $nego));
	1572	+ }
2612	1573
2613		- // Why the fuck doesn't wp_insert_post already do this?
2614		- $dbpost = array();
2615		- foreach ($this->post as $key => $value) :
2616		- if (is_string($value)) :
2617		- $dbpost[$key] = $wpdb->escape($value);
2618		- else :
2619		- $dbpost[$key] = $value;
2620		- endif;
2621		- endforeach;
	1574	+ function affirmative ($f, $setting) {
	1575	+ $affirmo = array ('y', 'yes', 't', 'true', 1);
	1576	+ return (isset($f[$setting]) and in_array(strtolower($f[$setting]), $affirmo));
	1577	+ }
2622	1578
2623		- if ($this->use_api('wp_insert_post')) :
2624		- $dbpost['post_pingback'] = false; // Tell WP 2.1 and 2.2 not to process for pingbacks
2625		- $this->_wp_id = wp_insert_post($dbpost);
	1579	+ # Internal debugging functions
	1580	+ function critical_bug ($varname, $var, $line) {
	1581	+ global $wp_version;
2626	1582
2627		- // This should never happen.
2628		- if (!is_numeric($this->_wp_id) or ($this->_wp_id == 0)) :
2629		- FeedWordPress::critical_bug('SyndicatedPost::_wp_id', $this->_wp_id, __LINE__);
2630		- endif;
2631		-
2632		- // Unfortunately, as of WordPress 2.3, wp_insert_post()
2633		- // munges your post modified timestamp.
2634		- $result = $wpdb->query("
2635		- UPDATE $wpdb->posts
2636		- SET
2637		- post_modified='{$dbpost['post_modified']}',
2638		- post_modified_gmt='{$dbpost['post_modified_gmt']}'
2639		- WHERE ID='{$this->_wp_id}'
2640		- ");
2641		- else :
2642		-
2643		- $result = $wpdb->query("
2644		- UPDATE $wpdb->posts
2645		- SET
2646		- post_author = '{$dbpost['post_author']}',
2647		- post_content = '{$dbpost['post_content']}',"
2648		- .(isset($dbpost['post_excerpt']) ? "post_excerpt = '{$dbpost['post_excerpt']}'," : "")."
2649		- post_title = '{$dbpost['post_title']}',
2650		- post_name = '{$dbpost['post_name']}',
2651		- post_modified = '{$dbpost['post_modified']}',
2652		- post_modified_gmt = '{$dbpost['post_modified_gmt']}'
2653		- WHERE guid='{$dbpost['guid']}'
2654		- ");
	1583	+ 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>';
	1584	+ echo "\n<plaintext>";
	1585	+ echo "Triggered at line # ".$line."\n";
	1586	+ echo "FeedWordPress version: ".FEEDWORDPRESS_VERSION."\n";
	1587	+ echo "WordPress version: {$wp_version}\n";
	1588	+ echo "PHP version: ".phpversion()."\n";
	1589	+ echo "\n";
	1590	+ echo $varname.": "; var_dump($var); echo "\n";
	1591	+ die;
	1592	+ }
2655	1593
2656		- // WordPress 2.1.x and up
2657		- if (function_exists('wp_set_post_categories')) :
2658		- wp_set_post_categories($this->wp_id(), $this->post['post_category']);
2659		- // WordPress 1.5.x - 2.0.x
2660		- elseif (function_exists('wp_set_post_cats')) :
2661		- wp_set_post_cats('1', $this->wp_id(), $this->post['post_category']);
2662		- // This should never happen.
2663		- else :
2664		- FeedWordPress::critical_bug('SyndicatedPost::insert_new::wp_version', $GLOBALS['wp_version'], __LINE__);
2665		- endif;
	1594	+ function noncritical_bug ($varname, $var, $line) {
	1595	+ if (FEEDWORDPRESS_DEBUG) : // halt only when we are doing debugging
	1596	+ FeedWordPress::critical_bug($varname, $var, $line);
	1597	+ endif;
	1598	+ }
2666	1599
2667		- // Since we are not going through official channels, we need to
2668		- // manually tell WordPress that we've published a new post.
2669		- // We need to make sure to do this in order for FeedWordPress
2670		- // to play well with the staticize-reloaded plugin (something
2671		- // that a large aggregator website is going to *want* to be
2672		- // able to use).
2673		- do_action('edit_post', $this->post['ID']);
	1600	+ function val ($v, $no_newlines = false) {
	1601	+ ob_start();
	1602	+ var_dump($v);
	1603	+ $out = ob_get_contents(); ob_end_clean();
	1604	+
	1605	+ if ($no_newlines) :
	1606	+ $out = preg_replace('/\s+/', " ", $out);
2674	1607	endif;
2675		- } /* SyndicatedPost::update_existing() */
	1608	+ return $out;
	1609	+ } /* FeedWordPress::val () */
2676	1610
2677		- // SyndicatedPost::add_rss_meta: adds interesting meta-data to each entry
2678		- // using the space for custom keys. The set of keys and values to add is
2679		- // specified by the keys and values of $post['meta']. This is used to
2680		- // store anything that the WordPress user might want to access from a
2681		- // template concerning the post's original source that isn't provided
2682		- // for by standard WP meta-data (i.e., any interesting data about the
2683		- // syndicated post other than author, title, timestamp, categories, and
2684		- // guid). It's also used to hook into WordPress's support for
2685		- // enclosures.
2686		- function add_rss_meta () {
2687		- global $wpdb;
2688		- if ( is_array($this->post) and isset($this->post['meta']) and is_array($this->post['meta']) ) :
2689		- $postId = $this->wp_id();
2690		-
2691		- // Aggregated posts should NOT send out pingbacks.
2692		- // WordPress 2.1-2.2 claim you can tell them not to
2693		- // using $post_pingback, but they don't listen, so we
2694		- // make sure here.
2695		- $result = $wpdb->query("
2696		- DELETE FROM $wpdb->postmeta
2697		- WHERE post_id='$postId' AND meta_key='_pingme'
2698		- ");
	1611	+ function diagnostic_on ($level) {
	1612	+ $show = get_option('feedwordpress_diagnostics_show', array());
	1613	+ return (in_array($level, $show));
	1614	+ } /* FeedWordPress::diagnostic_on () */
2699	1615
2700		- foreach ( $this->post['meta'] as $key => $values ) :
	1616	+ function diagnostic ($level, $out, $persist = NULL, $since = NULL, $mostRecent = NULL) {
	1617	+ global $feedwordpress_admin_footer;
2701	1618
2702		- $key = $wpdb->escape($key);
	1619	+ $output = get_option('feedwordpress_diagnostics_output', array());
	1620	+ $dlog = get_option('feedwordpress_diagnostics_log', array());
2703	1621
2704		- // If this is an update, clear out the old
2705		- // values to avoid duplication.
2706		- $result = $wpdb->query("
2707		- DELETE FROM $wpdb->postmeta
2708		- WHERE post_id='$postId' AND meta_key='$key'
2709		- ");
	1622	+ $diagnostic_nesting = count(explode(":", $level));
2710	1623
2711		- // Allow for either a single value or an array
2712		- if (!is_array($values)) $values = array($values);
2713		- foreach ( $values as $value ) :
2714		- $value = $wpdb->escape($value);
2715		- $result = $wpdb->query("
2716		- INSERT INTO $wpdb->postmeta
2717		- SET
2718		- post_id='$postId',
2719		- meta_key='$key',
2720		- meta_value='$value'
2721		- ");
2722		- endforeach;
	1624	+ if (FeedWordPress::diagnostic_on($level)) :
	1625	+ foreach ($output as $method) :
	1626	+ switch ($method) :
	1627	+ case 'echo' :
	1628	+ echo "<div><pre><strong>Diag".str_repeat('====', $diagnostic_nesting-1).'|</strong> '.$out."</pre></div>";
	1629	+ break;
	1630	+ case 'echo_in_cronjob' :
	1631	+ if (FeedWordPress::update_requested()) :
	1632	+ echo FeedWordPress::log_prefix()." ".$out."\n";
	1633	+ endif;
	1634	+ break;
	1635	+ case 'admin_footer' :
	1636	+ $feedwordpress_admin_footer[] = $out;
	1637	+ break;
	1638	+ case 'error_log' :
	1639	+ error_log(FeedWordPress::log_prefix().' '.$out);
	1640	+ break;
	1641	+ case 'email' :
	1642	+ if (is_null($persist)) :
	1643	+ $sect = 'occurrent';
	1644	+ $hook = (isset($dlog['mesg'][$sect]) ? count($dlog['mesg'][$sect]) : 0);
	1645	+ $line = array("Time" => time(), "Message" => $out);
	1646	+ else :
	1647	+ $sect = 'persistent';
	1648	+ $hook = md5($level."\n".$persist);
	1649	+ $line = array("Since" => $since, "Message" => $out, "Most Recent" => $mostRecent);
	1650	+ endif;
	1651	+
	1652	+ if (!isset($dlog['mesg'])) : $dlog['mesg'] = array(); endif;
	1653	+ if (!isset($dlog['mesg'][$sect])) : $dlog['mesg'][$sect] = array(); endif;
	1654	+
	1655	+ $dlog['mesg'][$sect][$hook] = $line;
	1656	+ endswitch;
2723	1657	endforeach;
2724	1658	endif;
2725		- } /* SyndicatedPost::add_rss_meta () */
2726		-
2727		- // SyndicatedPost::author_id (): get the ID for an author name from
2728		- // the feed. Create the author if necessary.
2729		- function author_id ($unfamiliar_author = 'create') {
2730		- global $wpdb, $wp_db_version; // test for WordPress 2.0 database schema
2731		-
2732		- $a = $this->author();
2733		- $author = $a['name'];
2734		- $email = $a['email'];
2735		- $url = $a['uri'];
2736		-
2737		- // Never can be too careful...
2738		- $login = sanitize_user($author, /*strict=*/ true);
2739		- $login = apply_filters('pre_user_login', $login);
2740		-
2741		- $nice_author = sanitize_title($author);
2742		- $nice_author = apply_filters('pre_user_nicename', $nice_author);
2743		-
2744		- $reg_author = $wpdb->escape(preg_quote($author));
2745		- $author = $wpdb->escape($author);
2746		- $email = $wpdb->escape($email);
2747		- $url = $wpdb->escape($url);
2748		-
2749		- // Check for an existing author rule....
2750		- if (isset($this->link->settings['map authors']['name'][strtolower(trim($author))])) :
2751		- $author_rule = $this->link->settings['map authors']['name'][strtolower(trim($author))];
2752		- else :
2753		- $author_rule = NULL;
2754		- endif;
2755		-
2756		- // User name is mapped to a particular author. If that author ID exists, use it.
2757		- if (is_numeric($author_rule) and get_userdata((int) $author_rule)) :
2758		- $id = (int) $author_rule;
2759		-
2760		- // User name is filtered out
2761		- elseif ('filter' == $author_rule) :
2762		- $id = NULL;
2763	1659
2764		- else :
2765		- // Check the database for an existing author record that might fit
2766		-
2767		- #-- WordPress 1.5.x
2768		- if (!isset($wp_db_version)) :
2769		- $id = $wpdb->get_var(
2770		- "SELECT ID from $wpdb->users
2771		- WHERE
2772		- TRIM(LCASE(user_login)) = TRIM(LCASE('$login')) OR
2773		- (
2774		- LENGTH(TRIM(LCASE(user_email))) > 0
2775		- AND TRIM(LCASE(user_email)) = TRIM(LCASE('$email'))
2776		- ) OR
2777		- TRIM(LCASE(user_firstname)) = TRIM(LCASE('$author')) OR
2778		- TRIM(LCASE(user_nickname)) = TRIM(LCASE('$author')) OR
2779		- TRIM(LCASE(user_nicename)) = TRIM(LCASE('$nice_author')) OR
2780		- TRIM(LCASE(user_description)) = TRIM(LCASE('$author')) OR
2781		- (
2782		- LOWER(user_description)
2783		- RLIKE CONCAT(
2784		- '(^|\\n)a\\.?k\\.?a\\.?( |\\t)*:?( |\\t)*',
2785		- LCASE('$reg_author'),
2786		- '( |\\t|\\r)*(\\n|\$)'
2787		- )
2788		- )
2789		- ");
2790		-
2791		- #-- WordPress 2.0+
2792		- elseif ($wp_db_version >= 2966) :
2793		-
2794		- // First try the user core data table.
2795		- $id = $wpdb->get_var(
2796		- "SELECT ID FROM $wpdb->users
2797		- WHERE
2798		- TRIM(LCASE(user_login)) = TRIM(LCASE('$login'))
2799		- OR (
2800		- LENGTH(TRIM(LCASE(user_email))) > 0
2801		- AND TRIM(LCASE(user_email)) = TRIM(LCASE('$email'))
2802		- )
2803		- OR TRIM(LCASE(user_nicename)) = TRIM(LCASE('$nice_author'))
2804		- ");
	1660	+ update_option('feedwordpress_diagnostics_log', $dlog);
	1661	+ } /* FeedWordPress::diagnostic () */
2805	1662
2806		- // If that fails, look for aliases in the user meta data table
2807		- if (is_null($id)) :
2808		- $id = $wpdb->get_var(
2809		- "SELECT user_id FROM $wpdb->usermeta
2810		- WHERE
2811		- (meta_key = 'description' AND TRIM(LCASE(meta_value)) = TRIM(LCASE('$author')))
2812		- OR (
2813		- meta_key = 'description'
2814		- AND TRIM(LCASE(meta_value))
2815		- RLIKE CONCAT(
2816		- '(^|\\n)a\\.?k\\.?a\\.?( |\\t)*:?( |\\t)*',
2817		- TRIM(LCASE('$reg_author')),
2818		- '( |\\t|\\r)*(\\n|\$)'
2819		- )
2820		- )
2821		- ");
2822		- endif;
2823		- endif;
	1663	+ function email_diagnostic_log () {
	1664	+ $dlog = get_option('feedwordpress_diagnostics_log', array());
	1665	+
	1666	+ if (isset($dlog['schedule']) and isset($dlog['schedule']['last'])) :
	1667	+ if (time() > ($dlog['schedule']['last'] + $dlog['schedule']['freq'])) :
	1668	+ // No news is good news; only send if
	1669	+ // there are some messages to send.
	1670	+ $body = NULL;
	1671	+ foreach ($dlog['mesg'] as $sect => $mesgs) :
	1672	+ if (count($mesgs) > 0) :
	1673	+ if (is_null($body)) : $body = ''; endif;
	1674	+
	1675	+ $paradigm = reset($mesgs);
	1676	+ $body .= "<h2>".ucfirst($sect)." issues</h2>\n"
	1677	+ ."<table>\n"
	1678	+ ."<thead><tr>\n";
	1679	+ foreach ($paradigm as $col => $value) :
	1680	+ $body .= '<th scope="col">'.$col."</th>\n";
	1681	+ endforeach;
	1682	+ $body .= "</tr></thead>\n"
	1683	+ ."<tbody>\n";
	1684	+
	1685	+ foreach ($mesgs as $line) :
	1686	+ $body .= "<tr>\n";
	1687	+ foreach ($line as $col => $cell) :
	1688	+ if (is_numeric($cell)) :
	1689	+ $cell = date('j-M-y, h:i a', $cell);
	1690	+ endif;
	1691	+ $class = strtolower(preg_replace('/\s+/', '-', $col));
	1692	+ $body .= "<td class=\"$class\">${cell}</td>";
	1693	+ endforeach;
	1694	+ $body .= "</tr>\n";
	1695	+ endforeach;
	1696	+
	1697	+ $body .= "</tbody>\n</table>\n\n";
	1698	+ endif;
	1699	+ endforeach;
	1700	+
	1701	+ if (!is_null($body)) :
	1702	+ $home = feedwordpress_display_url(get_bloginfo('url'));
	1703	+ $subj = $home . " syndication issues for ".date('j-M-y', time());
	1704	+ $agent = 'FeedWordPress '.FEEDWORDPRESS_VERSION;
	1705	+ $body = <<<EOMAIL
	1706	+<html>
	1707	+<head>
	1708	+<title>$subj</title>
	1709	+<style type="text/css">
	1710	+ body { background-color: white; color: black; }
	1711	+ table { width: 100%; border: 1px solid black; }
	1712	+ table thead tr th { background-color: #ff7700; color: white; border-bottom: 1px solid black; }
	1713	+ table thead tr { border-bottom: 1px solid black; }
	1714	+ table tr { vertical-align: top; }
	1715	+ table .since { width: 20%; }
	1716	+ table .time { width: 20%; }
	1717	+ table .most-recently { width: 20%; }
	1718	+ table .message { width: auto; }
	1719	+</style>
	1720	+</head>
	1721	+<body>
	1722	+<h1>Syndication Issues encountered by $agent on $home</h1>
	1723	+$body
	1724	+</body>
	1725	+</html>
2824	1726
2825		- // ... if you don't find one, then do what you need to do
2826		- if (is_null($id)) :
2827		- if ($unfamiliar_author === 'create') :
2828		- $userdata = array();
	1727	+EOMAIL;
2829	1728
2830		- #-- user table data
2831		- $userdata['ID'] = NULL; // new user
2832		- $userdata['user_login'] = $login;
2833		- $userdata['user_nicename'] = $nice_author;
2834		- $userdata['user_pass'] = substr(md5(uniqid(microtime())), 0, 6); // just something random to lock it up
2835		- $userdata['user_email'] = $email;
2836		- $userdata['user_url'] = $url;
2837		- $userdata['display_name'] = $author;
2838		-
2839		- $id = wp_insert_user($userdata);
2840		- elseif (is_numeric($unfamiliar_author) and get_userdata((int) $unfamiliar_author)) :
2841		- $id = (int) $unfamiliar_author;
2842		- elseif ($unfamiliar_author === 'default') :
2843		- $id = 1;
2844		- endif;
2845		- endif;
2846		- endif;
	1729	+ $ded = get_option('feedwordpress_diagnostics_email_destination', 'admins');
2847	1730
2848		- if ($id) :
2849		- $this->link->settings['map authors']['name'][strtolower(trim($author))] = $id;
2850		- endif;
2851		- return $id;
2852		- } // function SyndicatedPost::author_id ()
	1731	+ // e-mail address
	1732	+ if (preg_match('/^mailto:(.*)$/', $ded, $ref)) :
	1733	+ $recipients = array($ref[1]);
	1734	+
	1735	+ // userid
	1736	+ elseif (preg_match('/^user:(.*)$/', $ded, $ref)) :
	1737	+ $userdata = get_userdata((int) $ref[1]);
	1738	+ $recipients = array($userdata->user_email);
	1739	+
	1740	+ // admins
	1741	+ else :
	1742	+ $recipients = FeedWordPressDiagnostic::admin_emails();
	1743	+ endif;
2853	1744
2854		- // look up (and create) category ids from a list of categories
2855		- function category_ids ($cats, $unfamiliar_category = 'create') {
2856		- global $wpdb;
2857		-
2858		- // We need to normalize whitespace because (1) trailing
2859		- // whitespace can cause PHP and MySQL not to see eye to eye on
2860		- // VARCHAR comparisons for some versions of MySQL (cf.
2861		- // <http://dev.mysql.com/doc/mysql/en/char.html>), and (2)
2862		- // because I doubt most people want to make a semantic
2863		- // distinction between 'Computers' and 'Computers '
2864		- $cats = array_map('trim', $cats);
2865		-
2866		- $cat_ids = array ();
2867		- foreach ($cats as $cat_name) :
2868		- if (preg_match('/^{#([0-9]+)}$/', $cat_name, $backref)) :
2869		- $cat_id = (int) $backref[1];
2870		- if (function_exists('is_term') and is_term($cat_id, 'category')) :
2871		- $cat_ids[] = $cat_id;
2872		- elseif (get_category($cat_id)) :
2873		- $cat_ids[] = $cat_id;
	1745	+ foreach ($recipients as $email) :
	1746	+ add_filter('wp_mail_content_type', array('FeedWordPress', 'allow_html_mail'));
	1747	+ wp_mail($email, $subj, $body);
	1748	+ remove_filter('wp_mail_content_type', array('FeedWordPress', 'allow_html_mail'));
	1749	+ endforeach;
2874	1750	endif;
2875		- else :
2876		- $esc = $wpdb->escape($cat_name);
2877		- $resc = $wpdb->escape(preg_quote($cat_name));
2878	1751
2879		- // WordPress 2.3+
2880		- if (function_exists('is_term')) :
2881		- $cat_id = is_term($cat_name, 'category');
2882		- if ($cat_id) :
2883		- $cat_ids[] = $cat_id['term_id'];
2884		- // There must be a better way to do this...
2885		- elseif ($results = $wpdb->get_results(
2886		- "SELECT term_id
2887		- FROM $wpdb->term_taxonomy
2888		- WHERE
2889		- LOWER(description) RLIKE
2890		- CONCAT('(^|\\n)a\\.?k\\.?a\\.?( |\\t)*:?( |\\t)*', LOWER('{$resc}'), '( |\\t|\\r)*(\\n|\$)')"
2891		- )) :
2892		- foreach ($results AS $term) :
2893		- $cat_ids[] = (int) $term->term_id;
2894		- endforeach;
2895		- elseif ('create'===$unfamiliar_category) :
2896		- $term = wp_insert_term($cat_name, 'category');
2897		- $cat_ids[] = $term['term_id'];
2898		- endif;
	1752	+ // Clear the logs
	1753	+ $dlog['mesg']['persistent'] = array();
	1754	+ $dlog['mesg']['occurrent'] = array();
2899	1755
2900		- // WordPress 1.5.x - 2.2.x
2901		- else :
2902		- $results = $wpdb->get_results(
2903		- "SELECT cat_ID
2904		- FROM $wpdb->categories
2905		- WHERE
2906		- (LOWER(cat_name) = LOWER('$esc'))
2907		- OR (LOWER(category_description)
2908		- RLIKE CONCAT('(^|\\n)a\\.?k\\.?a\\.?( |\\t)*:?( |\\t)*', LOWER('{$resc}'), '( |\\t|\\r)*(\\n|\$)'))
2909		- ");
2910		- if ($results) :
2911		- foreach ($results as $term) :
2912		- $cat_ids[] = (int) $term->cat_ID;
2913		- endforeach;
2914		- elseif ('create'===$unfamiliar_category) :
2915		- if (function_exists('wp_insert_category')) :
2916		- $cat_id = wp_insert_category(array('cat_name' => $cat_name));
2917		- // And into the database we go.
2918		- else :
2919		- $nice_kitty = sanitize_title($cat_name);
2920		- $wpdb->query(sprintf("
2921		- INSERT INTO $wpdb->categories
2922		- SET
2923		- cat_name='%s',
2924		- category_nicename='%s'
2925		- ", $wpdb->escape($cat_name), $nice_kitty
2926		- ));
2927		- $cat_id = $wpdb->insert_id;
2928		- endif;
2929		- $cat_ids[] = $cat_id;
2930		- endif;
2931		- endif;
	1756	+ // Set schedule for next update
	1757	+ $dlog['schedule']['last'] = time();
2932	1758	endif;
2933		- endforeach;
2934		-
2935		- if ((count($cat_ids) == 0) and ($unfamiliar_category === 'filter')) :
2936		- $cat_ids = NULL; // Drop the post
2937	1759	else :
2938		- $cat_ids = array_unique($cat_ids);
	1760	+ $dlog['schedule'] = array(
	1761	+ 'freq' => 24 /*hr*/ * 60 /*min*/ * 60 /*s*/,
	1762	+ 'last' => time(),
	1763	+ );
2939	1764	endif;
2940		- return $cat_ids;
2941		- } // function SyndicatedPost::category_ids ()
2942		-
2943		- function use_api ($tag) {
2944		- global $wp_db_version;
2945		- switch ($tag) :
2946		- case 'wp_insert_post':
2947		- // Before 2.2, wp_insert_post does too much of the wrong stuff to use it
2948		- // In 1.5 it was such a resource hog it would make PHP segfault on big updates
2949		- $ret = (isset($wp_db_version) and $wp_db_version > FWP_SCHEMA_21);
2950		- break;
2951		- case 'post_status_pending':
2952		- $ret = (isset($wp_db_version) and $wp_db_version > FWP_SCHEMA_23);
2953		- break;
2954		- endswitch;
2955		- return $ret;
2956		- } // function SyndicatedPost::use_api ()
2957		-
2958		- #### EXTRACT DATA FROM FEED ITEM ####
2959		-
2960		- function created () {
2961		- $epoch = null;
2962		- if (isset($this->item['dc']['created'])) :
2963		- $epoch = @parse_w3cdtf($this->item['dc']['created']);
2964		- elseif (isset($this->item['dcterms']['created'])) :
2965		- $epoch = @parse_w3cdtf($this->item['dcterms']['created']);
2966		- elseif (isset($this->item['created'])): // Atom 0.3
2967		- $epoch = @parse_w3cdtf($this->item['created']);
2968		- endif;
2969		- return $epoch;
2970		- }
2971		- function published ($fallback = true) {
2972		- $epoch = null;
2973		-
2974		- # RSS is a fucking mess. Figure out whether we have a date in
2975		- # <dc:date>, <issued>, <pubDate>, etc., and get it into Unix
2976		- # epoch format for reformatting. If we can't find anything,
2977		- # we'll use the last-updated time.
2978		- if (isset($this->item['dc']['date'])): // Dublin Core
2979		- $epoch = @parse_w3cdtf($this->item['dc']['date']);
2980		- elseif (isset($this->item['dcterms']['issued'])) : // Dublin Core extensions
2981		- $epoch = @parse_w3cdtf($this->item['dcterms']['issued']);
2982		- elseif (isset($this->item['published'])) : // Atom 1.0
2983		- $epoch = @parse_w3cdtf($this->item['published']);
2984		- elseif (isset($this->item['issued'])): // Atom 0.3
2985		- $epoch = @parse_w3cdtf($this->item['issued']);
2986		- elseif (isset($this->item['pubdate'])): // RSS 2.0
2987		- $epoch = strtotime($this->item['pubdate']);
2988		- elseif ($fallback) : // Fall back to <updated> / <modified> if present
2989		- $epoch = $this->updated(/*fallback=*/ false);
2990		- endif;
2991	1765
2992		- # If everything failed, then default to the current time.
2993		- if (is_null($epoch)) :
2994		- $epoch = time();
2995		- endif;
2996		-
2997		- return $epoch;
2998		- }
2999		- function updated ($fallback = true) {
3000		- $epoch = null;
	1766	+ update_option('feedwordpress_diagnostics_log', $dlog);
	1767	+ } /* FeedWordPress::email_diagnostic_log () */
	1768	+
	1769	+ function allow_html_mail () {
	1770	+ return 'text/html';
	1771	+ } /* FeedWordPress::allow_html_mail () */
3001	1772
3002		- # As far as I know, only dcterms and Atom have reliable ways to
3003		- # specify when something was *modified* last. If neither is
3004		- # available, then we'll try to get the time of publication.
3005		- if (isset($this->item['dc']['modified'])) : // Not really correct
3006		- $epoch = @parse_w3cdtf($this->item['dc']['modified']);
3007		- elseif (isset($this->item['dcterms']['modified'])) : // Dublin Core extensions
3008		- $epoch = @parse_w3cdtf($this->item['dcterms']['modified']);
3009		- elseif (isset($this->item['modified'])): // Atom 0.3
3010		- $epoch = @parse_w3cdtf($this->item['modified']);
3011		- elseif (isset($this->item['updated'])): // Atom 1.0
3012		- $epoch = @parse_w3cdtf($this->item['updated']);
3013		- elseif ($fallback) : // Fall back to issued / dc:date
3014		- $epoch = $this->published(/*fallback=*/ false);
	1773	+ function admin_footer () {
	1774	+ global $feedwordpress_admin_footer;
	1775	+ foreach ($feedwordpress_admin_footer as $line) :
	1776	+ echo '<div><pre>'.$line.'</pre></div>';
	1777	+ endforeach;
	1778	+ } /* FeedWordPress::admin_footer () */
	1779	+
	1780	+ function log_prefix ($date = false) {
	1781	+ $home = get_bloginfo('url');
	1782	+ $prefix = '['.feedwordpress_display_url($home).'] [feedwordpress] ';
	1783	+ if ($date) :
	1784	+ $prefix = "[".date('Y-m-d H:i:s')."]".$prefix;
3015	1785	endif;
3016		-
3017		- # If everything failed, then default to the current time.
3018		- if (is_null($epoch)) :
3019		- $epoch = time();
3020		- endif;
3021		-
3022		- return $epoch;
3023		- }
3024		-
3025		- function guid () {
3026		- $guid = null;
3027		- if (isset($this->item['id'])): // Atom 0.3 / 1.0
3028		- $guid = $this->item['id'];
3029		- elseif (isset($this->item['atom']['id'])) : // Namespaced Atom
3030		- $guid = $this->item['atom']['id'];
3031		- elseif (isset($this->item['guid'])) : // RSS 2.0
3032		- $guid = $this->item['guid'];
3033		- elseif (isset($this->item['dc']['identifier'])) :// yeah, right
3034		- $guid = $this->item['dc']['identifier'];
	1786	+ return $prefix;
	1787	+ } /* FeedWordPress::log_prefix () */
	1788	+
	1789	+ function menu_cap ($sub = false) {
	1790	+ if ($sub) :
	1791	+ $cap = apply_filters('feedwordpress_menu_settings_capacity', 'manage_options');
3035	1792	else :
3036		- // The feed does not seem to have provided us with a
3037		- // unique identifier, so we'll have to cobble together
3038		- // a tag: URI that might work for us. The base of the
3039		- // URI will be the host name of the feed source ...
3040		- $bits = parse_url($this->feedmeta['link/uri']);
3041		- $guid = 'tag:'.$bits['host'];
3042		-
3043		- // If we have a date of creation, then we can use that
3044		- // to uniquely identify the item. (On the other hand, if
3045		- // the feed producer was consicentious enough to
3046		- // generate dates of creation, she probably also was
3047		- // conscientious enough to generate unique identifiers.)
3048		- if (!is_null($this->created())) :
3049		- $guid .= '://post.'.date('YmdHis', $this->created());
3050		-
3051		- // Otherwise, use both the URI of the item, *and* the
3052		- // item's title. We have to use both because titles are
3053		- // often not unique, and sometimes links aren't unique
3054		- // either (e.g. Bitch (S)HITLIST, Mozilla Dot Org news,
3055		- // some podcasts). But it's rare to have *both* the same
3056		- // title *and* the same link for two different items. So
3057		- // this is about the best we can do.
3058		- else :
3059		- $guid .= '://'.md5($this->item['link'].'/'.$this->item['title']);
3060		- endif;
	1793	+ $cap = apply_filters('feedwordpress_menu_main_capacity', 'manage_links');
3061	1794	endif;
3062		- return $guid;
3063		- }
	1795	+ return $cap;
	1796	+ } /* FeedWordPress::menu_cap () */
3064	1797
3065		- function author () {
3066		- $author = array ();
	1798	+ function path ($filename = '') {
	1799	+ global $fwp_path;
3067	1800
3068		- if (isset($this->item['author_name'])):
3069		- $author['name'] = $this->item['author_name'];
3070		- elseif (isset($this->item['dc']['creator'])):
3071		- $author['name'] = $this->item['dc']['creator'];
3072		- elseif (isset($this->item['dc']['contributor'])):
3073		- $author['name'] = $this->item['dc']['contributor'];
3074		- elseif (isset($this->feed->channel['dc']['creator'])) :
3075		- $author['name'] = $this->feed->channel['dc']['creator'];
3076		- elseif (isset($this->feed->channel['dc']['contributor'])) :
3077		- $author['name'] = $this->feed->channel['dc']['contributor'];
3078		- elseif (isset($this->feed->channel['author_name'])) :
3079		- $author['name'] = $this->feed->channel['author_name'];
3080		- elseif ($this->feed->is_rss() and isset($this->item['author'])) :
3081		- // The author element in RSS is allegedly an
3082		- // e-mail address, but lots of people don't use
3083		- // it that way. So let's make of it what we can.
3084		- $author = parse_email_with_realname($this->item['author']);
3085		-
3086		- if (!isset($author['name'])) :
3087		- if (isset($author['email'])) :
3088		- $author['name'] = $author['email'];
3089		- else :
3090		- $author['name'] = $this->feed->channel['title'];
3091		- endif;
3092		- endif;
3093		- else :
3094		- $author['name'] = $this->feed->channel['title'];
	1801	+ $path = $fwp_path;
	1802	+ if (strlen($filename) > 0) :
	1803	+ $path .= '/'.$filename;
3095	1804	endif;
3096		-
3097		- if (isset($this->item['author_email'])):
3098		- $author['email'] = $this->item['author_email'];
3099		- elseif (isset($this->feed->channel['author_email'])) :
3100		- $author['email'] = $this->feed->channel['author_email'];
3101		- endif;
3102		-
3103		- if (isset($this->item['author_url'])):
3104		- $author['uri'] = $this->item['author_url'];
3105		- elseif (isset($this->feed->channel['author_url'])) :
3106		- $author['uri'] = $this->item['author_url'];
3107		- else:
3108		- $author['uri'] = $this->feed->channel['link'];
3109		- endif;
3110		-
3111		- return $author;
3112		- } // SyndicatedPost::author()
3113		-
3114		- var $strip_attrs = array (
3115		- array('[a-z]+', 'style'),
3116		- array('[a-z]+', 'target'),
3117		- );
3118		- function sanitize_content ($content, $obj) {
3119		- # FeedWordPress used to resolve URIs relative to the
3120		- # feed URI. It now relies on the xml:base support
3121		- # baked in to the MagpieRSS upgrade. So all we do here
3122		- # now is to sanitize problematic attributes.
3123		- #
3124		- # This kind of sucks. I intend to replace it with
3125		- # lib_filter sometime soon.
3126		- foreach ($obj->strip_attrs as $pair):
3127		- list($tag,$attr) = $pair;
3128		- $content = preg_replace (
3129		- ":(<$tag [^>]*)($attr=(\"[^\">]*\"|[^>\\s]+))([^>]*>):i",
3130		- "\\1\\4",
3131		- $content
3132		- );
3133		- endforeach;
3134		- return $content;
	1805	+ return $path;
3135	1806	}
3136		-} // class SyndicatedPost
3137		-
3138		-# class SyndicatedLink: represents a syndication feed stored within the
3139		-# WordPress database
3140		-#
3141		-# To keep things compact and editable from within WordPress, we use all the
3142		-# links under a particular category in the WordPress "Blogroll" for the list of
3143		-# feeds to syndicate. "Contributors" is the category used by default; you can
3144		-# configure that under Options --> Syndication.
3145		-#
3146		-# Fields used are:
3147		-#
3148		-# * link_rss: the URI of the Atom/RSS feed to syndicate
3149		-#
3150		-# * link_notes: user-configurable options, with keys and values
3151		-# like so:
3152		-#
3153		-# key: value
3154		-# cats: computers\nweb
3155		-# feed/key: value
3156		-#
3157		-# Keys that start with "feed/" are gleaned from the data supplied
3158		-# by the feed itself, and will be overwritten with each update.
3159		-#
3160		-# Values have linebreak characters escaped with C-style
3161		-# backslashes (so, for example, a newline becomes "\n").
3162		-#
3163		-# The value of `cats` is used as a newline-separated list of
3164		-# default categories for any post coming from a particular feed.
3165		-# (In the example above, any posts from this feed will be placed
3166		-# in the "computers" and "web" categories--*in addition to* any
3167		-# categories that may already be applied to the posts.)
3168		-#
3169		-# Values of keys in link_notes are accessible from templates using
3170		-# the function `get_feed_meta($key)` if this plugin is activated.
3171		-
3172		-class SyndicatedLink {
3173		- var $id = null;
3174		- var $link = null;
3175		- var $settings = array ();
3176		- var $magpie = null;
3177		-
3178		- function SyndicatedLink ($link) {
3179		- global $wpdb;
3180		-
3181		- if (is_object($link)) :
3182		- $this->link = $link;
3183		- $this->id = $link->link_id;
3184		- else :
3185		- $this->id = $link;
3186		- if (function_exists('get_bookmark')) : // WP 2.1+
3187		- $this->link = get_bookmark($link);
3188		- else :
3189		- $this->link = $wpdb->get_row("
3190		- SELECT * FROM $wpdb->links
3191		- WHERE (link_id = '".$wpdb->escape($link)."')"
3192		- );
3193		- endif;
3194		- endif;
3195		-
3196		- if (strlen($this->link->link_rss) > 0) :
3197		- // Read off feed settings from link_notes
3198		- $notes = explode("\n", $this->link->link_notes);
3199		- foreach ($notes as $note):
3200		- list($key, $value) = explode(": ", $note, 2);
3201	1807
3202		- if (strlen($key) > 0) :
3203		- // Unescape and trim() off the whitespace.
3204		- // Thanks to Ray Lischner for pointing out the
3205		- // need to trim off whitespace.
3206		- $this->settings[$key] = stripcslashes (trim($value));
	1808	+ function param ($key, $type = 'REQUEST', $default = NULL) {
	1809	+ $where = '_'.strtoupper($type);
	1810	+ $ret = $default;
	1811	+ if (isset($GLOBALS[$where]) and is_array($GLOBALS[$where])) :
	1812	+ if (isset($GLOBALS[$where][$key])) :
	1813	+ $ret = $GLOBALS[$where][$key];
	1814	+ if (get_magic_quotes_gpc()) :
	1815	+ $ret = stripslashes_deep($ret);
3207	1816	endif;
3208		- endforeach;
3209		-
3210		- // "Magic" feed settings
3211		- $this->settings['link/uri'] = $this->link->link_rss;
3212		- $this->settings['link/name'] = $this->link->link_name;
3213		- $this->settings['link/id'] = $this->link->link_id;
3214		-
3215		- // `hardcode categories` and `unfamiliar categories` are deprecated in favor of `unfamiliar category`
3216		- if (
3217		- isset($this->settings['unfamiliar categories'])
3218		- and !isset($this->settings['unfamiliar category'])
3219		- ) :
3220		- $this->settings['unfamiliar category'] = $this->settings['unfamiliar categories'];
3221	1817	endif;
3222		- if (
3223		- FeedWordPress::affirmative($this->settings, 'hardcode categories')
3224		- and !isset($this->settings['unfamiliar category'])
3225		- ) :
3226		- $this->settings['unfamiliar category'] = 'default';
3227		- endif;
3228		-
3229		- // Set this up automagically for del.icio.us
3230		- $bits = parse_url($this->link->link_rss);
3231		- $tagspacers = array('del.icio.us', 'feeds.delicious.com');
3232		- if (!isset($this->settings['cat_split']) and in_array($bits['host'], $tagspacers)) :
3233		- $this->settings['cat_split'] = '\s'; // Whitespace separates multiple tags in del.icio.us RSS feeds
3234		- endif;
3235		-
3236		- if (isset($this->settings['cats'])):
3237		- $this->settings['cats'] = preg_split(FEEDWORDPRESS_CAT_SEPARATOR_PATTERN, $this->settings['cats']);
3238		- endif;
3239		- if (isset($this->settings['tags'])):
3240		- $this->settings['tags'] = preg_split(FEEDWORDPRESS_CAT_SEPARATOR_PATTERN, $this->settings['tags']);
3241		- endif;
3242		-
3243		- if (isset($this->settings['map authors'])) :
3244		- $author_rules = explode("\n\n", $this->settings['map authors']);
3245		- $ma = array();
3246		- foreach ($author_rules as $rule) :
3247		- list($rule_type, $author_name, $author_action) = explode("\n", $rule);
3248		-
3249		- // Normalize for case and whitespace
3250		- $rule_type = strtolower(trim($rule_type));
3251		- $author_name = strtolower(trim($author_name));
3252		- $author_action = strtolower(trim($author_action));
3253		-
3254		- $ma[$rule_type][$author_name] = $author_action;
3255		- endforeach;
3256		- $this->settings['map authors'] = $ma;
3257		- endif;
3258	1818	endif;
3259		- } // SyndicatedLink::SyndicatedLink ()
3260		-
3261		- function found () {
3262		- return is_object($this->link);
	1819	+ return $ret;
3263	1820	}
3264		-
3265		- function stale () {
3266		- $stale = true;
3267		- if (isset($this->settings['update/hold']) and ($this->settings['update/hold']=='ping')) :
3268		- $stale = false; // don't update on any timed updates; pings only
3269		- elseif (isset($this->settings['update/hold']) and ($this->settings['update/hold']=='next')) :
3270		- $stale = true; // update on the next timed update
3271		- elseif (!isset($this->settings['update/ttl']) or !isset($this->settings['update/last'])) :
3272		- $stale = true; // initial update
3273		- else :
3274		- $after = ((int) $this->settings['update/last'])
3275		- +((int) $this->settings['update/ttl'] * 60);
3276		- $stale = (time() >= $after);
3277		- endif;
3278		- return $stale;
	1821	+ function post ($key, $default = NULL) {
	1822	+ return FeedWordPress::param($key, 'POST');
3279	1823	}
	1824	+} // class FeedWordPress
3280	1825
3281		- function poll () {
3282		- global $wpdb;
	1826	+class FeedWordPress_File extends WP_SimplePie_File {
	1827	+ function FeedWordPress_File ($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false) {
	1828	+ WP_SimplePie_File::WP_SimplePie_File($url, $timeout, $redirects, $headers, $useragent, $force_fsockopen);
3283	1829
3284		- $this->magpie = fetch_rss($this->link->link_rss);
3285		- $new_count = NULL;
	1830	+ // SimplePie makes a strongly typed check against integers with
	1831	+ // this, but WordPress puts a string in. Which causes caching
	1832	+ // to break and fall on its ass when SimplePie is getting a 304,
	1833	+ // but doesn't realize it because this member is "304" instead.
	1834	+ $this->status_code = (int) $this->status_code;
	1835	+ }
	1836	+} /* class FeedWordPress_File () */
3286	1837
3287		- if (is_object($this->magpie)) :
3288		- $new_count = array('new' => 0, 'updated' => 0);
	1838	+class FeedWordPress_Parser extends SimplePie_Parser {
	1839	+ function parse (&$data, $encoding) {
	1840	+ // Use UTF-8 if we get passed US-ASCII, as every US-ASCII character is a UTF-8 character
	1841	+ if (strtoupper($encoding) === 'US-ASCII')
	1842	+ {
	1843	+ $this->encoding = 'UTF-8';
	1844	+ }
	1845	+ else
	1846	+ {
	1847	+ $this->encoding = $encoding;
	1848	+ }
3289	1849
3290		- # -- Update Link metadata live from feed
3291		- $channel = $this->magpie->channel;
	1850	+ // Strip BOM:
	1851	+ // UTF-32 Big Endian BOM
	1852	+ if (substr($data, 0, 4) === "\x00\x00\xFE\xFF")
	1853	+ {
	1854	+ $data = substr($data, 4);
	1855	+ }
	1856	+ // UTF-32 Little Endian BOM
	1857	+ elseif (substr($data, 0, 4) === "\xFF\xFE\x00\x00")
	1858	+ {
	1859	+ $data = substr($data, 4);
	1860	+ }
	1861	+ // UTF-16 Big Endian BOM
	1862	+ elseif (substr($data, 0, 2) === "\xFE\xFF")
	1863	+ {
	1864	+ $data = substr($data, 2);
	1865	+ }
	1866	+ // UTF-16 Little Endian BOM
	1867	+ elseif (substr($data, 0, 2) === "\xFF\xFE")
	1868	+ {
	1869	+ $data = substr($data, 2);
	1870	+ }
	1871	+ // UTF-8 BOM
	1872	+ elseif (substr($data, 0, 3) === "\xEF\xBB\xBF")
	1873	+ {
	1874	+ $data = substr($data, 3);
	1875	+ }
3292	1876
3293		- if (!isset($channel['id'])) :
3294		- $channel['id'] = $this->link->link_rss;
3295		- endif;
3296		-
3297		- $update = array();
3298		- if (!$this->hardcode('url') and isset($channel['link'])) :
3299		- $update[] = "link_url = '".$wpdb->escape($channel['link'])."'";
3300		- endif;
3301		-
3302		- if (!$this->hardcode('name') and isset($channel['title'])) :
3303		- $update[] = "link_name = '".$wpdb->escape($channel['title'])."'";
3304		- endif;
3305		-
3306		- if (!$this->hardcode('description')) :
3307		- if (isset($channel['tagline'])) :
3308		- $update[] = "link_description = '".$wpdb->escape($channel['tagline'])."'";
3309		- elseif (isset($channel['description'])) :
3310		- $update[] = "link_description = '".$wpdb->escape($channel['description'])."'";
3311		- endif;
3312		- endif;
3313		-
3314		- $this->settings = array_merge($this->settings, $this->flatten_array($channel));
	1877	+ if (substr($data, 0, 5) === '<?xml' && strspn(substr($data, 5, 1), "\x09\x0A\x0D\x20") && ($pos = strpos($data, '?>')) !== false)
	1878	+ {
	1879	+ $declaration =& new SimplePie_XML_Declaration_Parser(substr($data, 5, $pos - 5));
	1880	+ if ($declaration->parse())
	1881	+ {
	1882	+ $data = substr($data, $pos + 2);
	1883	+ $data = '<?xml version="' . $declaration->version . '" encoding="' . $encoding . '" standalone="' . (($declaration->standalone) ? 'yes' : 'no') . '"?>' . $data;
	1884	+ }
	1885	+ else
	1886	+ {
	1887	+ $this->error_string = 'SimplePie bug! Please report this!';
	1888	+ return false;
	1889	+ }
	1890	+ }
3315	1891
3316		- $this->settings['update/last'] = time(); $ttl = $this->ttl();
3317		- if (!is_null($ttl)) :
3318		- $this->settings['update/ttl'] = $ttl;
3319		- $this->settings['update/timed'] = 'feed';
3320		- else :
3321		- $this->settings['update/ttl'] = rand(30, 120); // spread over time interval for staggered updates
3322		- $this->settings['update/timed'] = 'automatically';
3323		- endif;
3324		-
3325		- if (!isset($this->settings['update/hold']) or $this->settings['update/hold']!='ping') :
3326		- $this->settings['update/hold'] = 'scheduled';
3327		- endif;
3328		-
3329		- // Copy back without a few things that we don't want to save in the notes
3330		- $to_notes = $this->settings;
	1892	+ $return = true;
3331	1893
3332		- if (is_array($to_notes['cats'])) :
3333		- $to_notes['cats'] = implode(FEEDWORDPRESS_CAT_SEPARATOR, $to_notes['cats']);
3334		- endif;
3335		- if (is_array($to_notes['tags'])) :
3336		- $to_notes['tags'] = implode(FEEDWORDPRESS_CAT_SEPARATOR, $to_notes['tags']);
3337		- endif;
	1894	+ static $xml_is_sane = null;
	1895	+ if ($xml_is_sane === null)
	1896	+ {
	1897	+ $parser_check = xml_parser_create();
	1898	+ xml_parse_into_struct($parser_check, '<foo>&amp;</foo>', $values);
	1899	+ xml_parser_free($parser_check);
	1900	+ $xml_is_sane = isset($values[0]['value']);
	1901	+ }
3338	1902
3339		- if (isset($to_notes['map authors'])) :
3340		- $ma = array();
3341		- foreach ($to_notes['map authors'] as $rule_type => $author_rules) :
3342		- foreach ($author_rules as $author_name => $author_action) :
3343		- $ma[] = $rule_type."\n".$author_name."\n".$author_action;
3344		- endforeach;
3345		- endforeach;
3346		- $to_notes['map authors'] = implode("\n\n", $ma);
3347		- endif;
	1903	+ // Create the parser
	1904	+ if ($xml_is_sane)
	1905	+ {
	1906	+ $xml = xml_parser_create_ns($this->encoding, $this->separator);
	1907	+ xml_parser_set_option($xml, XML_OPTION_SKIP_WHITE, 1);
	1908	+ xml_parser_set_option($xml, XML_OPTION_CASE_FOLDING, 0);
	1909	+ xml_set_object($xml, $this);
	1910	+ xml_set_character_data_handler($xml, 'cdata');
	1911	+ xml_set_element_handler($xml, 'tag_open', 'tag_close');
	1912	+ xml_set_start_namespace_decl_handler($xml, 'start_xmlns');
3348	1913
3349		- unset($to_notes['link/id']); unset($to_notes['link/uri']);
3350		- unset($to_notes['link/name']);
3351		- unset($to_notes['hardcode categories']); // Deprecated
3352		- unset($to_notes['unfamiliar categories']); // Deprecated
3353		-
3354		- $notes = '';
3355		- foreach ($to_notes as $key => $value) :
3356		- $notes .= $key . ": ". addcslashes($value, "\0..\37".'\\') . "\n";
3357		- endforeach;
3358		- $update[] = "link_notes = '".$wpdb->escape($notes)."'";
3359		-
3360		- $update_set = implode(',', $update);
3361		-
3362		- // Update the properties of the link from the feed information
3363		- $result = $wpdb->query("
3364		- UPDATE $wpdb->links
3365		- SET $update_set
3366		- WHERE link_id='$this->id'
3367		- ");
	1914	+ // Parse!
	1915	+ if (!xml_parse($xml, $data, true))
	1916	+ {
	1917	+ $this->error_code = xml_get_error_code($xml);
	1918	+ $this->error_string = xml_error_string($this->error_code);
	1919	+ $return = false;
	1920	+ }
3368	1921
3369		- # -- Add new posts from feed and update any updated posts
3370		- if (is_array($this->magpie->items)) :
3371		- foreach ($this->magpie->items as $item) :
3372		- $post =& new SyndicatedPost($item, $this);
3373		- if (!$post->filtered()) :
3374		- $new = $post->store();
3375		- if ( $new !== false ) $new_count[$new]++;
3376		- endif;
3377		- endforeach;
3378		- endif;
3379		-
3380		- // Copy back any changes to feed settings made in the course of updating (e.g. new author rules)
3381		- $to_notes = $this->settings;
	1922	+ $this->current_line = xml_get_current_line_number($xml);
	1923	+ $this->current_column = xml_get_current_column_number($xml);
	1924	+ $this->current_byte = xml_get_current_byte_index($xml);
	1925	+ xml_parser_free($xml);
3382	1926
3383		- if (is_array($to_notes['cats'])) :
3384		- $to_notes['cats'] = implode(FEEDWORDPRESS_CAT_SEPARATOR, $to_notes['cats']);
3385		- endif;
3386		- if (is_array($to_notes['tags'])) :
3387		- $to_notes['tags'] = implode(FEEDWORDPRESS_CAT_SEPARATOR, $to_notes['tags']);
3388		- endif;
	1927	+ return $return;
	1928	+ }
	1929	+ else
	1930	+ {
	1931	+ libxml_clear_errors();
	1932	+ $xml =& new XMLReader();
	1933	+ $xml->xml($data);
	1934	+ while (@$xml->read())
	1935	+ {
	1936	+ switch ($xml->nodeType)
	1937	+ {
3389	1938
3390		- if (isset($to_notes['map authors'])) :
3391		- $ma = array();
3392		- foreach ($to_notes['map authors'] as $rule_type => $author_rules) :
3393		- foreach ($author_rules as $author_name => $author_action) :
3394		- $ma[] = $rule_type."\n".$author_name."\n".$author_action;
3395		- endforeach;
3396		- endforeach;
3397		- $to_notes['map authors'] = implode("\n\n", $ma);
3398		- endif;
	1939	+ case constant('XMLReader::END_ELEMENT'):
	1940	+ if ($xml->namespaceURI !== '')
	1941	+ {
	1942	+ $tagName = "{$xml->namespaceURI}{$this->separator}{$xml->localName}";
	1943	+ }
	1944	+ else
	1945	+ {
	1946	+ $tagName = $xml->localName;
	1947	+ }
	1948	+ $this->tag_close(null, $tagName);
	1949	+ break;
	1950	+ case constant('XMLReader::ELEMENT'):
	1951	+ $empty = $xml->isEmptyElement;
	1952	+ if ($xml->namespaceURI !== '')
	1953	+ {
	1954	+ $tagName = "{$xml->namespaceURI}{$this->separator}{$xml->localName}";
	1955	+ }
	1956	+ else
	1957	+ {
	1958	+ $tagName = $xml->localName;
	1959	+ }
	1960	+ $attributes = array();
	1961	+ while ($xml->moveToNextAttribute())
	1962	+ {
	1963	+ if ($xml->namespaceURI !== '')
	1964	+ {
	1965	+ $attrName = "{$xml->namespaceURI}{$this->separator}{$xml->localName}";
	1966	+ }
	1967	+ else
	1968	+ {
	1969	+ $attrName = $xml->localName;
	1970	+ }
	1971	+ $attributes[$attrName] = $xml->value;
	1972	+ }
	1973	+
	1974	+ foreach ($attributes as $attr => $value) :
	1975	+ list($ns, $local) = $this->split_ns($attr);
	1976	+ if ($ns=='http://www.w3.org/2000/xmlns/') :
	1977	+ if ('xmlns' == $local) : $local = false; endif;
	1978	+ $this->start_xmlns(null, $local, $value);
	1979	+ endif;
	1980	+ endforeach;
	1981	+
	1982	+ $this->tag_open(null, $tagName, $attributes);
	1983	+ if ($empty)
	1984	+ {
	1985	+ $this->tag_close(null, $tagName);
	1986	+ }
	1987	+ break;
	1988	+ case constant('XMLReader::TEXT'):
3399	1989
3400		- unset($to_notes['link/id']); unset($to_notes['link/uri']);
3401		- unset($to_notes['link/name']);
3402		- unset($to_notes['hardcode categories']); // Deprecated
3403		- unset($to_notes['unfamiliar categories']); // Deprecated
	1990	+ case constant('XMLReader::CDATA'):
	1991	+ $this->cdata(null, $xml->value);
	1992	+ break;
	1993	+ }
	1994	+ }
	1995	+ if ($error = libxml_get_last_error())
	1996	+ {
	1997	+ $this->error_code = $error->code;
	1998	+ $this->error_string = $error->message;
	1999	+ $this->current_line = $error->line;
	2000	+ $this->current_column = $error->column;
	2001	+ return false;
	2002	+ }
	2003	+ else
	2004	+ {
	2005	+ return true;
	2006	+ }
	2007	+ }
	2008	+ } /* FeedWordPress_Parser::parse() */
3404	2009
3405		- $notes = '';
3406		- foreach ($to_notes as $key => $value) :
3407		- $notes .= $key . ": ". addcslashes($value, "\0..\37".'\\') . "\n";
3408		- endforeach;
3409		-
3410		- $update_set = "link_notes = '".$wpdb->escape($notes)."'";
3411		-
3412		- // Update the properties of the link from the feed information
3413		- $result = $wpdb->query("
3414		- UPDATE $wpdb->links
3415		- SET $update_set
3416		- WHERE link_id='$this->id'
3417		- ");
	2010	+ var $xmlns_stack = array();
	2011	+ var $xmlns_current = array();
	2012	+ function tag_open ($parser, $tag, $attributes) {
	2013	+ $ret = parent::tag_open($parser, $tag, $attributes);
	2014	+ if ($this->current_xhtml_construct < 0) :
	2015	+ $this->data['xmlns'] = $this->xmlns_current;
	2016	+ $this->xmlns_stack[] = $this->xmlns_current;
3418	2017	endif;
3419		- return $new_count;
3420		- } /* SyndicatedLink::poll() */
	2018	+ return $ret;
	2019	+ }
3421	2020
3422		- function uri () {
3423		- return (is_object($this->link) ? $this->link->link_rss : NULL);
3424		- }
3425		- function homepage () {
3426		- return (isset($this->settings['feed/link']) ? $this->settings['feed/link'] : NULL);
3427		- }
3428		-
3429		- function ttl () {
3430		- if (is_object($this->magpie)) :
3431		- $channel = $this->magpie->channel;
3432		- else :
3433		- $channel = array();
	2021	+ function tag_close($parser, $tag) {
	2022	+ if ($this->current_xhtml_construct < 0) :
	2023	+ $this->xmlns_current = array_pop($this->xmlns_stack);
3434	2024	endif;
3435		-
3436		- if (isset($channel['ttl'])) :
3437		- // "ttl stands for time to live. It's a number of
3438		- // minutes that indicates how long a channel can be
3439		- // cached before refreshing from the source."
3440		- // <http://blogs.law.harvard.edu/tech/rss#ltttlgtSubelementOfLtchannelgt>
3441		- $ret = $channel['ttl'];
3442		- elseif (isset($channel['sy']['updatefrequency']) or isset($channel['sy']['updateperiod'])) :
3443		- $period_minutes = array (
3444		- 'hourly' => 60, /* minutes in an hour */
3445		- 'daily' => 1440, /* minutes in a day */
3446		- 'weekly' => 10080, /* minutes in a week */
3447		- 'monthly' => 43200, /* minutes in a month */
3448		- 'yearly' => 525600, /* minutes in a year */
3449		- );
3450		-
3451		- // "sy:updatePeriod: Describes the period over which the
3452		- // channel format is updated. Acceptable values are:
3453		- // hourly, daily, weekly, monthly, yearly. If omitted,
3454		- // daily is assumed." <http://web.resource.org/rss/1.0/modules/syndication/>
3455		- if (isset($channel['sy']['updateperiod'])) : $period = $channel['sy']['updateperiod'];
3456		- else : $period = 'daily';
3457		- endif;
3458		-
3459		- // "sy:updateFrequency: Used to describe the frequency
3460		- // of updates in relation to the update period. A
3461		- // positive integer indicates how many times in that
3462		- // period the channel is updated. ... If omitted a value
3463		- // of 1 is assumed." <http://web.resource.org/rss/1.0/modules/syndication/>
3464		- if (isset($channel['sy']['updatefrequency'])) : $freq = (int) $channel['sy']['updatefrequency'];
3465		- else : $freq = 1;
3466		- endif;
3467		-
3468		- $ret = (int) ($period_minutes[$period] / $freq);
3469		- else :
3470		- $ret = NULL;
3471		- endif;
	2025	+ $ret = parent::tag_close($parser, $tag);
3472	2026	return $ret;
3473		- } /* SyndicatedLink::ttl() */
3474		-
3475		- // SyndicatedLink::flatten_array (): flatten an array. Useful for
3476		- // hierarchical and namespaced elements.
3477		- //
3478		- // Given an array which may contain array or object elements in it,
3479		- // return a "flattened" array: a one-dimensional array of scalars
3480		- // containing each of the scalar elements contained within the array
3481		- // structure. Thus, for example, if $a['b']['c']['d'] == 'e', then the
3482		- // returned array for FeedWordPress::flatten_array($a) will contain a key
3483		- // $a['feed/b/c/d'] with value 'e'.
3484		- function flatten_array ($arr, $prefix = 'feed/', $separator = '/') {
3485		- $ret = array ();
3486		- if (is_array($arr)) :
3487		- foreach ($arr as $key => $value) :
3488		- if (is_scalar($value)) :
3489		- $ret[$prefix.$key] = $value;
3490		- else :
3491		- $ret = array_merge($ret, $this->flatten_array($value, $prefix.$key.$separator, $separator));
3492		- endif;
3493		- endforeach;
	2027	+ }
	2028	+
	2029	+ function start_xmlns ($parser, $prefix, $uri) {
	2030	+ if (!$prefix) :
	2031	+ $prefix = '';
3494	2032	endif;
3495		- return $ret;
3496		- } // function SyndicatedLink::flatten_array ()
3497		-
3498		- function hardcode ($what) {
3499		- $default = get_option("feedwordpress_hardcode_$what");
3500		- if ( $default === 'yes' ) :
3501		- // If the default is to hardcode, then we want the
3502		- // negation of negative(): TRUE by default and FALSE if
3503		- // the setting is explicitly "no"
3504		- $ret = !FeedWordPress::negative($this->settings, "hardcode $what");
3505		- else :
3506		- // If the default is NOT to hardcode, then we want
3507		- // affirmative(): FALSE by default and TRUE if the
3508		- // setting is explicitly "yes"
3509		- $ret = FeedWordPress::affirmative($this->settings, "hardcode $what");
	2033	+ if ($this->current_xhtml_construct < 0) :
	2034	+ $this->xmlns_current[$prefix] = $uri;
3510	2035	endif;
3511		- return $ret;
3512		- } // function SyndicatedLink::hardcode ()
	2036	+ return true;
	2037	+ } /* FeedWordPress_Parser::start_xmlns() */
	2038	+}
3513	2039
3514		- function syndicated_status ($what, $default) {
3515		- global $wpdb;
	2040	+$feedwordpress_admin_footer = array();
3516	2041
3517		- $ret = get_option("feedwordpress_syndicated_{$what}_status");
3518		- if ( isset($this->settings["$what status"]) ) :
3519		- $ret = $this->settings["$what status"];
3520		- elseif (!$ret) :
3521		- $ret = $default;
3522		- endif;
3523		- return $wpdb->escape(trim(strtolower($ret)));
3524		- } // function SyndicatedLink:syndicated_status ()
3525		-} // class SyndicatedLink
3526		-
3527	2042	################################################################################
3528	2043	## XML-RPC HOOKS: accept XML-RPC update pings from Contributors ################
3529	2044	################################################################################
3530	2045
3531		-function feedwordpress_xmlrpc_hook ($args = array ()) {
3532		- $args['weblogUpdates.ping'] = 'feedwordpress_pong';
3533		- return $args;
3534		-}
3535		-
3536		-function feedwordpress_pong ($args) {
3537		- $feedwordpress =& new FeedWordPress;
3538		- $delta = @$feedwordpress->update($args[1]);
3539		- if (is_null($delta)):
3540		- return array('flerror' => true, 'message' => "Sorry. I don't syndicate <$args[1]>.");
3541		- else:
3542		- $mesg = array();
3543		- if (isset($delta['new'])) { $mesg[] = ' '.$delta['new'].' new posts were syndicated'; }
3544		- if (isset($delta['updated'])) { $mesg[] = ' '.$delta['updated'].' existing posts were updated'; }
3545		-
3546		- return array('flerror' => false, 'message' => "Thanks for the ping.".implode(' and', $mesg));
3547		- endif;
3548		-}
3549		-
3550		-################################################################################
3551		-## class FeedFinder: find likely feeds using autodetection and/or guesswork ####
3552		-################################################################################
3553		-
3554		-class FeedFinder {
3555		- var $uri = NULL;
3556		- var $_cache_uri = NULL;
	2046	+class FeedWordPressRPC {
	2047	+ function FeedWordPressRPC () {
	2048	+ add_filter('xmlrpc_methods', array(&$this, 'xmlrpc_methods'));
	2049	+ }
3557	2050
3558		- var $verify = FALSE;
	2051	+ function xmlrpc_methods ($args = array()) {
	2052	+ $args['weblogUpdates.ping'] = array(&$this, 'ping');
	2053	+ $args['feedwordpress.subscribe'] = array(&$this, 'subscribe');
	2054	+ $args['feedwordpress.deactivate'] = array(&$this, 'deactivate');
	2055	+ $args['feedwordpress.delete'] = array(&$this, 'delete');
	2056	+ $args['feedwordpress.nuke'] = array(&$this, 'nuke');
	2057	+ return $args;
	2058	+ }
3559	2059
3560		- var $_data = NULL;
3561		- var $_head = NULL;
3562		-
3563		- # -- Recognition patterns
3564		- var $_feed_types = array(
3565		- 'application/rss+xml',
3566		- 'text/xml',
3567		- 'application/atom+xml',
3568		- 'application/x.atom+xml',
3569		- 'application/x-atom+xml'
3570		- );
3571		- var $_feed_markers = array('\\<feed', '\\<rss', 'xmlns="http://purl.org/rss/1.0');
3572		- var $_html_markers = array('\\<html');
3573		- var $_obvious_feed_url = array('[./]rss', '[./]rdf', '[./]atom', '[./]feed', '\.xml');
3574		- var $_maybe_feed_url = array ('rss', 'rdf', 'atom', 'feed', 'xml');
3575		-
3576		- function FeedFinder ($uri = NULL, $verify = TRUE) {
3577		- $this->uri = $uri; $this->verify = $verify;
3578		- } /* FeedFinder::FeedFinder () */
3579		-
3580		- function find ($uri = NULL) {
3581		- $ret = array ();
3582		- if (!is_null($this->data($uri))) {
3583		- if ($this->is_feed($uri)) {
3584		- $ret = array($this->uri);
3585		- } else {
3586		- // Assume that we have HTML or XHTML (even if we don't, who's it gonna hurt?)
3587		- // Autodiscovery is the preferred method
3588		- $href = $this->_link_rel_feeds();
3589		-
3590		- // ... but we'll also take the little orange buttons
3591		- $href = array_merge($href, $this->_a_href_feeds(TRUE));
3592		-
3593		- // If all that failed, look harder
3594		- if (count($href) == 0) $href = $this->_a_href_feeds(FALSE);
3595		-
3596		- // Verify feeds and resolve relative URIs
3597		- foreach ($href as $u) {
3598		- $the_uri = Relative_URI::resolve($u, $this->uri);
3599		- if ($this->verify) {
3600		- $feed =& new FeedFinder($the_uri);
3601		- if ($feed->is_feed()) $ret[] = $the_uri;
3602		- $feed = NULL;
3603		- } else {
3604		- $ret[] = $the_uri;
3605		- }
3606		- } /* foreach */
3607		- } /* if */
3608		- } /* if */
3609		- return array_unique($ret);
3610		- } /* FeedFinder::find () */
3611		-
3612		- function data ($uri = NULL) {
3613		- $this->_get($uri);
3614		- return $this->_data;
3615		- }
3616		-
3617		- function is_feed ($uri = NULL) {
3618		- $data = $this->data($uri);
3619		-
3620		- return (
3621		- preg_match (
3622		- "\007(".implode('|',$this->_feed_markers).")\007i",
3623		- $data
3624		- ) and !preg_match (
3625		- "\007(".implode('|',$this->_html_markers).")\007i",
3626		- $data
3627		- )
3628		- );
3629		- } /* FeedFinder::is_feed () */
3630		-
3631		- # --- Private methods ---
3632		- function _get ($uri = NULL) {
3633		- if ($uri) $this->uri = $uri;
3634		-
3635		- // Is the result not yet cached?
3636		- if ($this->_cache_uri !== $this->uri) :
3637		- // Snoopy is an HTTP client in PHP
3638		- $client = new Snoopy();
3639		-
3640		- // Prepare headers and internal settings
3641		- $client->rawheaders['Connection'] = 'close';
3642		- $client->accept = 'application/atom+xml application/rdf+xml application/rss+xml application/xml text/html */*';
3643		- $client->agent = 'feedfinder/1.2 (compatible; PHP FeedFinder) +http://projects.radgeek.com/feedwordpress';
3644		- $client->read_timeout = 25;
3645		-
3646		- // Fetch the HTML or feed
3647		- @$client->fetch($this->uri);
3648		- $this->_data = $client->results;
3649		-
3650		- // Kilroy was here
3651		- $this->_cache_uri = $this->uri;
	2060	+ function ping ($args) {
	2061	+ global $feedwordpress;
	2062	+
	2063	+ $delta = @$feedwordpress->update($args[1]);
	2064	+ if (is_null($delta)):
	2065	+ return array('flerror' => true, 'message' => "Sorry. I don't syndicate <$args[1]>.");
	2066	+ else:
	2067	+ $mesg = array();
	2068	+ if (isset($delta['new'])) { $mesg[] = ' '.$delta['new'].' new posts were syndicated'; }
	2069	+ if (isset($delta['updated'])) { $mesg[] = ' '.$delta['updated'].' existing posts were updated'; }
	2070	+
	2071	+ return array('flerror' => false, 'message' => "Thanks for the ping.".implode(' and', $mesg));
3652	2072	endif;
3653		- } /* FeedFinder::_get () */
3654		-
3655		- function _link_rel_feeds () {
3656		- $links = $this->_tags('link');
3657		- $link_count = count($links);
3658		-
3659		- // now figure out which one points to the RSS file
3660		- $href = array ();
3661		- for ($n=0; $n<$link_count; $n++) {
3662		- if (strtolower($links[$n]['rel']) == 'alternate') {
3663		- if (in_array(strtolower($links[$n]['type']), $this->_feed_types)) {
3664		- $href[] = $links[$n]['href'];
3665		- } /* if */
3666		- } /* if */
3667		- } /* for */
3668		- return $href;
3669	2073	}
	2074	+
	2075	+ function validate (&$args) {
	2076	+ global $wp_xmlrpc_server;
3670	2077
3671		- function _a_href_feeds ($obvious = TRUE) {
3672		- $pattern = ($obvious ? $this->_obvious_feed_url : $this->_maybe_feed_url);
	2078	+ // First two params are username/password
	2079	+ $username = $wp_xmlrpc_server->escape(array_shift($args));
	2080	+ $password = $wp_xmlrpc_server->escape(array_shift($args));
3673	2081
3674		- $links = $this->_tags('a');
3675		- $link_count = count($links);
3676		-
3677		- // now figure out which one points to the RSS file
3678		- $href = array ();
3679		- for ($n=0; $n<$link_count; $n++) {
3680		- if (preg_match("\007(".implode('|',$pattern).")\007i", $links[$n]['href'])) {
3681		- $href[] = $links[$n]['href'];
3682		- } /* if */
3683		- } /* for */
3684		- return $href;
3685		- }
3686		-
3687		- function _tags ($tag) {
3688		- $html = $this->data();
3689		-
3690		- // search through the HTML, save all <link> tags
3691		- // and store each link's attributes in an associative array
3692		- preg_match_all('/<'.$tag.'\s+(.*?)\s*\/?>/si', $html, $matches);
3693		- $links = $matches[1];
3694	2082	$ret = array();
3695		- $link_count = count($links);
3696		- for ($n=0; $n<$link_count; $n++) {
3697		- $attributes = preg_split('/\s+/s', $links[$n]);
3698		- foreach($attributes as $attribute) {
3699		- $att = preg_split('/\s*=\s*/s', $attribute, 2);
3700		- if (isset($att[1])) {
3701		- $att[1] = preg_replace('/([\'"]?)(.*)\1/', '$2', $att[1]);
3702		- $final_link[strtolower($att[0])] = $att[1];
3703		- } /* if */
3704		- } /* foreach */
3705		- $ret[$n] = $final_link;
3706		- } /* for */
	2083	+ if ( !$user = $wp_xmlrpc_server->login($username, $password) ) :
	2084	+ $ret = $wp_xmlrpc_server->error;
	2085	+ elseif (!current_user_can('manage_links')) :
	2086	+ $ret = new IXR_Error(401, 'Sorry, you cannot change the subscription list.');
	2087	+ endif;
3707	2088	return $ret;
3708	2089	}
3709		-} /* class FeedFinder */
3710	2090
3711		-# Relative URI static class: PHP class for resolving relative URLs
3712		-#
3713		-# This class is derived (under the terms of the GPL) from URL Class 0.3 by
3714		-# Keyvan Minoukadeh <keyvan@k1m.com>, which is great but more than we need
3715		-# for FeedWordPress's purposes. The class has been stripped down to a single
3716		-# public method: Relative_URI::resolve($url, $base), which resolves the URI in
3717		-# $url relative to the URI in $base
3718		-#
3719		-# The upgraded MagpieRSS also uses this class. So if we have it loaded
3720		-# in, don't load it again.
3721		-if (!class_exists('Relative_URI')) {
3722		-
3723		- class Relative_URI
3724		- {
3725		- // Resolve relative URI in $url against the base URI in $base. If $base
3726		- // is not supplied, then we use the REQUEST_URI of this script.
3727		- //
3728		- // I'm hoping this method reflects RFC 2396 Section 5.2
3729		- function resolve ($url, $base = NULL)
3730		- {
3731		- if (is_null($base)):
3732		- $base = 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
3733		- endif;
	2091	+ function subscribe ($args) {
	2092	+ $ret = $this->validate($args);
	2093	+ if (is_array($ret)) : // Success
	2094	+ // The remaining params are feed URLs
	2095	+ foreach ($args as $arg) :
	2096	+ $finder = new FeedFinder($arg, /*verify=*/ false, /*fallbacks=*/ 1);
	2097	+ $feeds = array_values(array_unique($finder->find()));
	2098	+
	2099	+ if (count($feeds) > 0) :
	2100	+ $link_id = FeedWordPress::syndicate_link(
	2101	+ /*title=*/ feedwordpress_display_url($feeds[0]),
	2102	+ /*homepage=*/ $feeds[0],
	2103	+ /*feed=*/ $feeds[0]
	2104	+ );
	2105	+ $ret[] = array(
	2106	+ 'added',
	2107	+ $feeds[0],
	2108	+ $arg,
	2109	+ );
	2110	+ else :
	2111	+ $ret[] = array(
	2112	+ 'error',
	2113	+ $arg
	2114	+ );
	2115	+ endif;
	2116	+ endforeach;
	2117	+ endif;
	2118	+ return $ret;
	2119	+ } /* FeedWordPressRPC::subscribe () */
3734	2120
3735		- $base = Relative_URI::_encode(trim($base));
3736		- $uri_parts = Relative_URI::_parse_url($base);
3737		-
3738		- $url = Relative_URI::_encode(trim($url));
3739		- $parts = Relative_URI::_parse_url($url);
3740		-
3741		- $uri_parts['fragment'] = (isset($parts['fragment']) ? $parts['fragment'] : null);
3742		- $uri_parts['query'] = (isset($parts['query']) ? $parts['query'] : null);
3743		-
3744		- // if path is empty, and scheme, host, and query are undefined,
3745		- // the URL is referring the base URL
3746		-
3747		- if (($parts['path'] == '') && !isset($parts['scheme']) && !isset($parts['host']) && !isset($parts['query'])) {
3748		- // If the URI is empty or only a fragment, return the base URI
3749		- return $base . (isset($parts['fragment']) ? '#'.$parts['fragment'] : '');
3750		- } elseif (isset($parts['scheme'])) {
3751		- // If the scheme is set, then the URI is absolute.
3752		- return $url;
3753		- } elseif (isset($parts['host'])) {
3754		- $uri_parts['host'] = $parts['host'];
3755		- $uri_parts['path'] = $parts['path'];
3756		- } else {
3757		- // We have a relative path but not a host.
3758		-
3759		- // start ugly fix:
3760		- // prepend slash to path if base host is set, base path is not set, and url path is not absolute
3761		- if ($uri_parts['host'] && ($uri_parts['path'] == '')
3762		- && (strlen($parts['path']) > 0)
3763		- && (substr($parts['path'], 0, 1) != '/')) {
3764		- $parts['path'] = '/'.$parts['path'];
3765		- } // end ugly fix
	2121	+ function unsubscribe ($method, $args) {
	2122	+ $ret = $this->validate($args);
	2123	+ if (is_array($ret)) : // Success
	2124	+ // The remaining params are feed URLs
	2125	+ foreach ($args as $arg) :
	2126	+ $link_id = FeedWordPress::find_link($arg);
3766	2127
3767		- if (substr($parts['path'], 0, 1) == '/') {
3768		- $uri_parts['path'] = $parts['path'];
3769		- } else {
3770		- // copy base path excluding any characters after the last (right-most) slash character
3771		- $buffer = substr($uri_parts['path'], 0, (int)strrpos($uri_parts['path'], '/')+1);
3772		- // append relative path
3773		- $buffer .= $parts['path'];
3774		- // remove "./" where "." is a complete path segment.
3775		- $buffer = str_replace('/./', '/', $buffer);
3776		- if (substr($buffer, 0, 2) == './') {
3777		- $buffer = substr($buffer, 2);
3778		- }
3779		- // if buffer ends with "." as a complete path segment, remove it
3780		- if (substr($buffer, -2) == '/.') {
3781		- $buffer = substr($buffer, 0, -1);
3782		- }
3783		- // remove "<segment>/../" where <segment> is a complete path segment not equal to ".."
3784		- $search_finished = false;
3785		- $segment = explode('/', $buffer);
3786		- while (!$search_finished) {
3787		- for ($x=0; $x+1 < count($segment);) {
3788		- if (($segment[$x] != '') && ($segment[$x] != '..') && ($segment[$x+1] == '..')) {
3789		- if ($x+2 == count($segment)) $segment[] = '';
3790		- unset($segment[$x], $segment[$x+1]);
3791		- $segment = array_values($segment);
3792		- continue 2;
3793		- } else {
3794		- $x++;
3795		- }
3796		- }
3797		- $search_finished = true;
3798		- }
3799		- $buffer = (count($segment) == 1) ? '/' : implode('/', $segment);
3800		- $uri_parts['path'] = $buffer;
	2128	+ if (!$link_id) :
	2129	+ $link_id = FeedWordPress::find_link($arg, 'link_url');
	2130	+ endif;
	2131	+
	2132	+ if ($link_id) :
	2133	+ $link = new SyndicatedLink($link_id);
	2134	+
	2135	+ $link->{$method}();
	2136	+ $ret[] = array(
	2137	+ 'deactivated',
	2138	+ $arg,
	2139	+ );
	2140	+ else :
	2141	+ $ret[] = array(
	2142	+ 'error',
	2143	+ $arg,
	2144	+ );
	2145	+ endif;
	2146	+ endforeach;
	2147	+ endif;
	2148	+ return $ret;
	2149	+ } /* FeedWordPress::unsubscribe () */
3801	2150
3802		- }
3803		- }
	2151	+ function deactivate ($args) {
	2152	+ return $this->unsubscribe('deactivate', $args);
	2153	+ } /* FeedWordPressRPC::deactivate () */
3804	2154
3805		- // If we've gotten to this point, we can try to put the pieces
3806		- // back together.
3807		- $ret = '';
3808		- if (isset($uri_parts['scheme'])) $ret .= $uri_parts['scheme'].':';
3809		- if (isset($uri_parts['user'])) {
3810		- $ret .= $uri_parts['user'];
3811		- if (isset($uri_parts['pass'])) $ret .= ':'.$uri_parts['parts'];
3812		- $ret .= '@';
3813		- }
3814		- if (isset($uri_parts['host'])) {
3815		- $ret .= '//'.$uri_parts['host'];
3816		- if (isset($uri_parts['port'])) $ret .= ':'.$uri_parts['port'];
3817		- }
3818		- $ret .= $uri_parts['path'];
3819		- if (isset($uri_parts['query'])) $ret .= '?'.$uri_parts['query'];
3820		- if (isset($uri_parts['fragment'])) $ret .= '#'.$uri_parts['fragment'];
	2155	+ function delete ($args) {
	2156	+ return $this->unsubscribe('delete', $args);
	2157	+ } /* FeedWordPressRPC::delete () */
3821	2158
3822		- return $ret;
3823		- }
3824		-
3825		- /**
3826		- * Parse URL
3827		- *
3828		- * Regular expression grabbed from RFC 2396 Appendix B.
3829		- * This is a replacement for PHPs builtin parse_url().
3830		- * @param string $url
3831		- * @access private
3832		- * @return array
3833		- */
3834		- function _parse_url($url)
3835		- {
3836		- // I'm using this pattern instead of parse_url() as there's a few strings where parse_url()
3837		- // generates a warning.
3838		- if (preg_match('!^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?!', $url, $match)) {
3839		- $parts = array();
3840		- if ($match[1] != '') $parts['scheme'] = $match[2];
3841		- if ($match[3] != '') $parts['auth'] = $match[4];
3842		- // parse auth
3843		- if (isset($parts['auth'])) {
3844		- // store user info
3845		- if (($at_pos = strpos($parts['auth'], '@')) !== false) {
3846		- $userinfo = explode(':', substr($parts['auth'], 0, $at_pos), 2);
3847		- $parts['user'] = $userinfo[0];
3848		- if (isset($userinfo[1])) $parts['pass'] = $userinfo[1];
3849		- $parts['auth'] = substr($parts['auth'], $at_pos+1);
3850		- }
3851		- // get port number
3852		- if ($port_pos = strrpos($parts['auth'], ':')) {
3853		- $parts['host'] = substr($parts['auth'], 0, $port_pos);
3854		- $parts['port'] = (int)substr($parts['auth'], $port_pos+1);
3855		- if ($parts['port'] < 1) $parts['port'] = null;
3856		- } else {
3857		- $parts['host'] = $parts['auth'];
3858		- }
3859		- }
3860		- unset($parts['auth']);
3861		- $parts['path'] = $match[5];
3862		- if (isset($match[6]) && ($match[6] != '')) $parts['query'] = $match[7];
3863		- if (isset($match[8]) && ($match[8] != '')) $parts['fragment'] = $match[9];
3864		- return $parts;
3865		- }
3866		- // shouldn't reach here
3867		- return array('path'=>'');
3868		- }
3869		-
3870		- function _encode($string)
3871		- {
3872		- static $replace = array();
3873		- if (!count($replace)) {
3874		- $find = array(32, 34, 60, 62, 123, 124, 125, 91, 92, 93, 94, 96, 127);
3875		- $find = array_merge(range(0, 31), $find);
3876		- $find = array_map('chr', $find);
3877		- foreach ($find as $char) {
3878		- $replace[$char] = '%'.bin2hex($char);
3879		- }
3880		- }
3881		- // escape control characters and a few other characters
3882		- $encoded = strtr($string, $replace);
3883		- // remove any character outside the hex range: 21 - 7E (see www.asciitable.com)
3884		- return preg_replace('/[^\x21-\x7e]/', '', $encoded);
3885		- }
3886		- } // class Relative_URI
3887		-}
	2159	+ function nuke ($args) {
	2160	+ return $this->unsubscribe('nuke', $args);
	2161	+ } /* FeedWordPressRPC::nuke () */
	2162	+} /* class FeedWordPressRPC */
3888	2163
3889	2164	// take your best guess at the realname and e-mail, given a string
3890	2165	define('FWP_REGEX_EMAIL_ADDY', '([^@"(<\s]+@[^"@(<\s]+\.[^"@(<\s]+)');
3891	2166	define('FWP_REGEX_EMAIL_NAME', '("([^"]*)"|([^"<(]+\S))');
		@@ -3910,5 +2185,5 @@
3910	2185	$ret['name'] = NULL; $ret['email'] = NULL;
3911	2186	endif;
3912	2187	return $ret;
3913	2188	}
3914		-?>
	2189	+