feedwordpress.php: 2008.1030 vs 0.992 · FeedWordPress

← All changes | feedwordpress.php +330 -1377 0.992 → 2008.1030 View file →

		@@ -2,13 +2,13 @@
2	2	/*
3	3	Plugin Name: FeedWordPress
4	4	Plugin URI: http://projects.radgeek.com/feedwordpress
5	5	Description: simple and flexible Atom/RSS syndication for WordPress
6		-Version: 0.992
	6	+Version: 2008.1030
7	7	Author: Charles Johnson
8	8	Author URI: http://radgeek.com/
9	9	License: GPL
10		-Last modified: 2008-01-04 18:03 PDT
	10	+Last modified: 2008-10-30 4:14pm PDT
11	11	*/
12	12
13	13	# This uses code derived from:
14	14	# - wp-rss-aggregate.php by Kellan Elliot-McCrea <kellan@protest.net>
		@@ -26,9 +26,9 @@
26	26	# <http://www.zyx.com/blog/xmlrpc.php>), or see `update-feeds.php`
27	27
28	28	# -- Don't change these unless you know what you're doing...
29	29
30		-define ('FEEDWORDPRESS_VERSION', '0.992');
	30	+define ('FEEDWORDPRESS_VERSION', '2008.1030');
31	31	define ('FEEDWORDPRESS_AUTHOR_CONTACT', 'http://radgeek.com/contact');
32	32	define ('DEFAULT_SYNDICATION_CATEGORY', 'Contributors');
33	33
34	34	define ('FEEDWORDPRESS_DEBUG', false);
		@@ -42,8 +42,10 @@
42	42
43	43	define ('FWP_SCHEMA_20', 3308); // Database schema # for WP 2.0
44	44	define ('FWP_SCHEMA_21', 4772); // Database schema # for WP 2.1
45	45	define ('FWP_SCHEMA_23', 5495); // Database schema # for WP 2.3
	46	+define ('FWP_SCHEMA_25', 7558); // Database schema # for WP 2.5
	47	+define ('FWP_SCHEMA_26', 8201); // Database schema # for WP 2.6
46	48
47	49	if (FEEDWORDPRESS_DEBUG) :
48	50	// Help us to pick out errors, if any.
49	51	ini_set('error_reporting', E_ALL & ~E_NOTICE);
		@@ -81,11 +83,9 @@
81	83	require_once (ABSPATH . 'wp-admin/admin-db.php'); // for wp_insert_category
82	84	endif;
83	85	endif;
84	86
85		-if (function_exists('wp_enqueue_script')) :
86		- wp_enqueue_script( 'ajaxcat' ); // Provides the handy-dandy new category text box
87		-endif;
	87	+require_once(dirname(__FILE__) . '/compatability.php'); // LEGACY API: Replicate or mock up functions for legacy support purposes
88	88
89	89	// Magic quotes are just about the stupidest thing ever.
90	90	if (is_array($_POST)) :
91	91	$fwp_post = stripslashes_deep($_POST);
		@@ -90,9 +90,45 @@
90	90	if (is_array($_POST)) :
91	91	$fwp_post = stripslashes_deep($_POST);
92	92	endif;
93	93
	94	+// Get the path relative to the plugins directory in which FWP is stored
	95	+preg_match (
	96	+ '\|/wp-content/plugins/(.+)$\|',
	97	+ dirname(__FILE__),
	98	+ $ref
	99	+);
94	100
	101	+if (isset($ref[1])) :
	102	+ $fwp_path = $ref[1];
	103	+else : // Something went wrong. Let's just guess.
	104	+ $fwp_path = 'feedwordpress';
	105	+endif;
	106	+
	107	+// If this is a FeedWordPress admin page, queue up scripts for AJAX functions that FWP uses
	108	+// If it is a display page or a non-FeedWordPress admin page, don't.
	109	+if (is_admin() and isset($_REQUEST['page']) and preg_match("\|^{$fwp_path}/\|", $_REQUEST['page'])) :
	110	+ if (function_exists('wp_enqueue_script')) :
	111	+ if (isset($wp_db_version) and $wp_db_version >= FWP_SCHEMA_25) :
	112	+ wp_enqueue_script('post'); // for magic tag and category boxes
	113	+ wp_enqueue_script('thickbox'); // for fold-up boxes
	114	+ wp_enqueue_script('admin-forms'); // for checkbox selection
	115	+ else :
	116	+ wp_enqueue_script( 'ajaxcat' ); // Provides the handy-dandy new category text box
	117	+ endif;
	118	+ endif;
	119	+ if (function_exists('wp_enqueue_style')) :
	120	+ if (fwp_test_wp_version(FWP_SCHEMA_25)) :
	121	+ wp_enqueue_style('dashboard');
	122	+ endif;
	123	+ endif;
	124	+ if (function_exists('wp_admin_css')) :
	125	+ if (fwp_test_wp_version(FWP_SCHEMA_25)) :
	126	+ wp_admin_css('css/dashboard');
	127	+ endif;
	128	+ endif;
	129	+endif;
	130	+
95	131	if (!FeedWordPress::needs_upgrade()) : // only work if the conditions are safe!
96	132
97	133	# Syndicated items are generally received in output-ready (X)HTML and
98	134	# should not be folded, crumpled, mutilated, or spindled by WordPress
		@@ -109,8 +145,10 @@
109	145
110	146	add_filter('the_content', 'feedwordpress_preserve_syndicated_content', -10000);
111	147	add_filter('the_content', 'feedwordpress_restore_syndicated_content', 10000);
112	148
	149	+ add_action('atom_entry', 'feedwordpress_item_feed_data');
	150	+
113	151	# Filter in original permalinks if the user wants that
114	152	add_filter('post_link', 'syndication_permalink', 1);
115	153
116	154	# WTF? By default, wp_insert_link runs incoming link_url and link_rss
		@@ -147,8 +185,12 @@
147	185	endif;
148	186
149	187	# Cron-less auto-update. Hooray!
150	188	add_action('init', 'feedwordpress_auto_update');
	189	+
	190	+ # Default sanitizers
	191	+ add_filter('syndicated_item_content', array('SyndicatedPost', 'sanitize_content'), 0, 2);
	192	+
151	193	else :
152	194	# Hook in the menus, which will just point to the upgrade interface
153	195	add_action('admin_menu', 'fwp_add_pages');
154	196	endif; // if (!FeedWordPress::needs_upgrade())
		@@ -201,70 +243,8 @@
201	243	: implode(' and ', $mesg)));
202	244	}
203	245
204	246	################################################################################
205		-## LEGACY API: Replicate or mock up functions for legacy support purposes ######
206		-################################################################################
207		-
208		-if (!function_exists('get_option')) {
209		- function get_option ($option) {
210		- return get_settings($option);
211		- }
212		-}
213		-if (!function_exists('current_user_can')) {
214		- $legacy_capability_hack = true;
215		- function current_user_can ($task) {
216		- global $user_level;
217		-
218		- $can = false;
219		-
220		- // This is not a full replacement for current_user_can. It
221		- // is only for checking the capabilities we care about via the
222		- // WordPress 1.5 user levels.
223		- switch ($task) {
224		- case 'manage_options':
225		- $can = ($user_level >= 6);
226		- break;
227		- case 'manage_links':
228		- $can = ($user_level >= 5);
229		- break;
230		- } /* switch */
231		- return $can;
232		- }
233		-} else {
234		- $legacy_capability_hack = false;
235		-}
236		-if (!function_exists('sanitize_user')) {
237		- function sanitize_user ($text, $strict) {
238		- return $text; // Don't munge it if it wasn't munged going in...
239		- }
240		-}
241		-if (!function_exists('wp_insert_user')) {
242		- function wp_insert_user ($userdata) {
243		- #-- Help WordPress 1.5.x quack like a duck
244		- $login = $userdata['user_login'];
245		- $author = $userdata['display_name'];
246		- $nice_author = $userdata['user_nicename'];
247		- $email = $userdata['user_email'];
248		- $url = $userdata['user_url'];
249		-
250		- $wpdb->query (
251		- "INSERT INTO $wpdb->users
252		- SET
253		- ID='0',
254		- user_login='$login',
255		- user_firstname='$author',
256		- user_nickname='$author',
257		- user_nicename='$nice_author',
258		- user_description='$author',
259		- user_email='$email',
260		- user_url='$url'");
261		- $id = $wpdb->insert_id;
262		-
263		- return $id;
264		- }
265		-}
266		-################################################################################
267	247	## TEMPLATE API: functions to make your templates syndication-aware ############
268	248	################################################################################
269	249
270	250	function is_syndicated () { return (strlen(get_syndication_feed_id()) > 0); }
		@@ -316,9 +296,9 @@
316	296
317	297	function feedwordpress_preserve_syndicated_content ($text) {
318	298	global $feedwordpress_the_syndicated_content;
319	299
320		- if ( is_syndicated() ) :
	300	+ if ( is_syndicated() and get_option('feedwordpress_formatting_filters') != 'yes' ) :
321	301	$feedwordpress_the_syndicated_content = $text;
322	302	else :
323	303	$feedwordpress_the_syndicated_content = NULL;
324	304	endif;
		@@ -334,1261 +314,56 @@
334	314
335	315	return $text;
336	316	}
337	317
338		-function syndication_permalink ($permalink = '') {
339		- if (get_option('feedwordpress_munge_permalink') != 'no'):
340		- $uri = get_syndication_permalink();
341		- return ((strlen($uri) > 0) ? $uri : $permalink);
342		- else:
343		- return $permalink;
344		- endif;
345		-} // function syndication_permalink ()
346		-
347		-################################################################################
348		-## UPGRADE INTERFACE: Have users upgrade DB from older versions of FWP #########
349		-################################################################################
350		-
351		-function fwp_upgrade_page () {
352		- if (isset($GLOBALS['fwp_post']['action']) and $GLOBALS['fwp_post']['action']=='Upgrade') :
353		- $ver = get_option('feedwordpress_version');
354		- if (get_option('feedwordpress_version') != FEEDWORDPRESS_VERSION) :
355		- echo "<div class=\"wrap\">\n";
356		- echo "<h2>Upgrading FeedWordPress...</h2>";
357		-
358		- $feedwordpress =& new FeedWordPress;
359		- $feedwordpress->upgrade_database();
360		- echo "<p><strong>Done!</strong> Upgraded database to version ".FEEDWORDPRESS_VERSION.".</p>\n";
361		- echo "<form action=\"\" method=\"get\">\n";
362		- echo "<div class=\"submit\"><input type=\"hidden\" name=\"page\" value=\"".basename(__FILE__)."\" />";
363		- echo "<input type=\"submit\" value=\"Continue »\" /></form></div>\n";
364		- echo "</div>\n";
365		- return;
366		- else :
367		- echo "<div class=\"updated\"><p>Already at version ".FEEDWORDPRESS_VERSION."!</p></div>";
368		- endif;
369		- endif;
	318	+function feedwordpress_item_feed_data () {
	319	+ // In a post context....
	320	+ if (is_syndicated()) :
370	321	?>
371		-<div class="wrap">
372		-<h2>Upgrade FeedWordPress</h2>
373		-
374		-<p>It appears that you have installed FeedWordPress
375		-<?php echo FEEDWORDPRESS_VERSION; ?> as an upgrade to an existing installation of
376		-FeedWordPress. That's no problem, but you will need to take a minute out first
377		-to upgrade your database: some necessary changes in how the software keeps
378		-track of posts and feeds will cause problems such as duplicate posts and broken
379		-templates if we were to continue without the upgrade.</p>
380		-
381		-<p>Note that most of FeedWordPress's functionality is temporarily disabled
382		-until we have successfully completed the upgrade. Everything should begin
383		-working as normal again once the upgrade is complete. There's extraordinarily
384		-little chance of any damage as the result of the upgrade, but if you're paranoid
385		-like me you may want to back up your database before you proceed.</p>
386		-
387		-<p>This may take several minutes for a large installation.</p>
388		-
389		-<form action="" method="post">
390		-<div class="submit"><input type="submit" name="action" value="Upgrade" /></div>
391		-</form>
392		-</div>
	322	+<source>
	323	+ <title><?php the_syndication_source(); ?></title>
	324	+ <link rel="alternate" type="text/html" href="<?php the_syndication_source_link(); ?>" />
	325	+ <link rel="self" href="<?php the_syndication_feed(); ?>" />
393	326	<?php
394		-} // function fwp_upgrade_page ()
395		-
396		-################################################################################
397		-## ADMIN MENU ADD-ONS: implement Dashboard management pages ####################
398		-################################################################################
399		-
400		-function fwp_add_pages () {
401		- global $legacy_capability_hack;
402		-
403		- if ($legacy_capability_hack) :
404		- // old & busted: numeric user levels
405		- $manage_links = 5;
406		- $manage_options = 6;
407		- else :
408		- // new hotness: named capabilities
409		- $manage_links = 'manage_links';
410		- $manage_options = 'manage_options';
411		- endif;
412		-
413		- //add_submenu_page('plugins.php', 'Akismet Configuration', 'Akismet Configuration', 'manage_options', 'syndication-manage-page', 'fwp_syndication_manage_page');
414		- add_menu_page('Syndicated Sites', 'Syndication', $manage_links, 'feedwordpress/'.basename(__FILE__), 'fwp_syndication_manage_page');
415		- add_submenu_page('feedwordpress/'.basename(__FILE__), 'Syndication Options', 'Options', $manage_options, 'feedwordpress/syndication-options.php');
416		- add_options_page('Syndication Options', 'Syndication', $manage_options, 'feedwordpress/syndication-options.php');
417		-} // function fwp_add_pages () */
418		-
419		-function fwp_category_box ($checked, $object) {
420		- global $wp_db_version;
421		-
422		- if (isset($wp_db_version) and $wp_db_version >= FWP_SCHEMA_20) : // WordPress 2.x
	327	+ $id = get_feed_meta('feed/id');
	328	+ if (strlen($id) > 0) :
423	329	?>
424		- <div id="poststuff">
425		-
426		- <div id="moremeta">
427		- <div id="grabit" class="dbx-group">
428		- <fieldset id="categorydiv" class="dbx-box">
429		- <h3 class="dbx-handle"><?php _e('Categories') ?></h3>
430		- <div class="dbx-content">
431		- <p style="font-size:smaller;font-style:bold;margin:0">Place <?php print $object; ?> under...</p>
432		- <p id="jaxcat"></p>
433		- <ul id="categorychecklist"><?php write_nested_categories($checked); ?></ul></div>
434		- </fieldset>
435		- </div>
436		- </div>
437		- </div>
	330	+ <id><?php print $id; ?></id>
438	331	<?php
439		- else : // WordPress 1.5
440		-?>
441		- <fieldset id="categorydiv" style="width: 20%; margin-right: 2em">
442		- <legend><?php _e('Categories') ?></legend>
443		- <p style="font-size:smaller;font-style:bold;margin:0">Place <?php print $object; ?> under...</p>
444		- <div style="height: 20em"><?php write_nested_categories($checked); ?></div>
445		- </fieldset>
446		-<?php
447	332	endif;
448		-}
449		-
450		-function update_feeds_mention ($feed) {
451		- echo "<li>Updating <cite>".$feed['link/name']."</cite> from <<a href=\""
452		- .$feed['link/uri']."\">".$feed['link/uri']."</a>> ...</li>\n";
453		- flush();
454		-}
455		-
456		-function fwp_syndication_manage_page () {
457		- global $wpdb;
458		-
459		- if (FeedWordPress::needs_upgrade()) :
460		- fwp_upgrade_page();
461		- return;
462		- endif;
463		-
464		-?>
465		-<?php $cont = true;
466		-if (isset($_REQUEST['action'])):
467		- if ($_REQUEST['action'] == 'feedfinder') : $cont = fwp_feedfinder_page();
468		- elseif ($_REQUEST['action'] == 'switchfeed') : $cont = fwp_switchfeed_page();
469		- elseif ($_REQUEST['action'] == 'linkedit') : $cont = fwp_linkedit_page();
470		- elseif ($_REQUEST['action'] == 'Unsubscribe from Checked Links' or $_REQUEST['action'] == 'Unsubscribe') : $cont = fwp_multidelete_page();
471		- endif;
472		-endif;
473		-
474		-if ($cont):
475		-?>
	333	+ $updated = get_feed_meta('feed/updated');
	334	+ if (strlen($updated) > 0) : ?>
	335	+ <updated><?php print $updated; ?></updated>
476	336	<?php
477		- $links = FeedWordPress::syndicated_links();
478		-
479		- if (isset($_POST['update']) or isset($_POST['action']) or isset($_POST['update_uri'])) :
480		- $fwp_update_invoke = 'post';
481		- else :
482		- $fwp_update_invoke = 'get';
483	337	endif;
484		-
485		- $update_set = array();
486		- if (isset($_POST['link_ids']) and is_array($_POST['link_ids']) and ($_POST['action']=='Update Checked Links')) :
487		- $targets = $wpdb->get_results("
488		- SELECT * FROM $wpdb->links
489		- WHERE link_id IN (".implode(",",$_POST['link_ids']).")
490		- ");
491		- if (is_array($targets)) :
492		- foreach ($targets as $target) :
493		- $update_set[] = $target->link_rss;
494		- endforeach;
495		- else : // This should never happen
496		- FeedWordPress::critical_bug('fwp_syndication_manage_page::targets', $targets, __LINE__);
497		- endif;
498		- elseif (isset($_POST['update_uri'])) :
499		- $update_set[] = $_POST['update_uri'];
500		- endif;
501		-
502		- if ($fwp_update_invoke != 'get' and count($update_set) > 0) : // Only do things with side-effects for HTTP POST or command line
503		- $feedwordpress =& new FeedWordPress;
504		- add_action('feedwordpress_check_feed', 'update_feeds_mention');
505		-
506		- echo "<div class=\"updated\">\n";
507		- echo "<ul>\n";
508		- $tdelta = NULL;
509		- foreach ($update_set as $uri) :
510		- if ($uri == '*') : $uri = NULL; endif;
511		- $delta = $feedwordpress->update($uri);
512		- if (!is_null($delta)) :
513		- if (is_null($tdelta)) :
514		- $tdelta = $delta;
515		- else :
516		- $tdelta['new'] += $delta['new'];
517		- $tdelta['updated'] += $delta['updated'];
518		- endif;
519		- else :
520		- echo "<li><p><strong>Error:</strong> There was a problem updating <a href=\"$uri\">$uri</a></p></li>\n";
521		- endif;
522		- endforeach;
523		- echo "</ul>\n";
524		-
525		- if (!is_null($tdelta)) :
526		- $mesg = array();
527		- if (isset($delta['new'])) : $mesg[] = ' '.$tdelta['new'].' new posts were syndicated'; endif;
528		- if (isset($delta['updated'])) : $mesg[] = ' '.$tdelta['updated'].' existing posts were updated'; endif;
529		- echo "<p>Update complete.".implode(' and', $mesg)."</p>";
530		- echo "\n"; flush();
531		- endif;
532		- echo "</div> <!-- class=\"updated\" -->\n";
533		- endif;
534		-
535		- ?>
536		- <div class="wrap">
537		- <form action="" method="POST">
538		- <h2>Update feeds now</h2>
539		- <p>Check currently scheduled feeds for new and updated posts.</p>
540		-
541		-<?php if (!get_option('feedwordpress_automatic_updates')) : ?>
542		- <p><strong>Note:</strong> Automatic updates are currently turned
543		- <strong>off</strong>. New posts from your feeds will not be syndicated
544		- until you manually check for them here. You can turn on automatic
545		- updates under <a href="admin.php?page=feedwordpress/syndication-options.php">Syndication
546		- Options</a>.</p>
547		-<?php endif; ?>
548		-
549		-
550		- <div class="submit"><input type="hidden" name="update_uri" value="*" /><input type="submit" name="update" value="Update" /></div>
551		- </form>
552		- </div> <!-- class="wrap" -->
553		-
554		- <form action="admin.php?page=feedwordpress/<?php echo basename(__FILE__); ?>" method="post">
555		- <div class="wrap">
556		- <h2>Syndicated Sites</h2>
557		-<?php $alt_row = true;
558		- if ($links): ?>
559		-
560		-<table width="100%" cellpadding="3" cellspacing="3">
561		-<tr>
562		-<th width="20%"><?php _e('Name'); ?></th>
563		-<th width="40%"><?php _e('Feed'); ?></th>
564		-<th colspan="4"><?php _e('Action'); ?></th>
565		-</tr>
566		-
567		-<?php foreach ($links as $link):
568		- $alt_row = !$alt_row; ?>
569		-<tr<?php echo ($alt_row?' class="alternate"':''); ?>>
570		-<td><a href="<?php echo wp_specialchars($link->link_url, 'both'); ?>"><?php echo wp_specialchars($link->link_name, 'both'); ?></a></td>
571		-<?php
572		- if (strlen($link->link_rss) > 0):
573		- $caption='Switch Feed';
574		- $uri_bits = parse_url($link->link_rss);
575		- $uri_bits['host'] = preg_replace('/^www\./i', '', $uri_bits['host']);
576		- $display_uri =
577		- (isset($uri_bits['user'])?$uri_bits['user'].'@':'')
578		- .(isset($uri_bits['host'])?$uri_bits['host']:'')
579		- .(isset($uri_bits['port'])?':'.$uri_bits['port']:'')
580		- .(isset($uri_bits['path'])?$uri_bits['path']:'')
581		- .(isset($uri_bits['query'])?'?'.$uri_bits['query']:'');
582		- if (strlen($display_uri) > 32) : $display_uri = substr($display_uri, 0, 32).'…'; endif;
583	338	?>
584		- <td>
585		- <strong><a href="<?php echo wp_specialchars($link->link_rss, 'both'); ?>"><?php echo wp_specialchars($display_uri, 'both'); ?></a></strong></td>
	339	+</source>
586	340	<?php
587		- else:
588		- $caption='Find Feed';
589		-?>
590		- <td style="background-color:#FFFFD0"><p><strong>no
591		- feed assigned</strong></p></td>
592		-<?php
593		- endif;
594		-?>
595		- <td><a href="admin.php?page=feedwordpress/<?php echo basename(__FILE__); ?>&link_id=<?php echo $link->link_id; ?>&action=linkedit" class="edit"><?php _e('Edit')?></a></td>
596		- <td><a href="admin.php?page=feedwordpress/<?php echo basename(__FILE__); ?>&link_id=<?php echo $link->link_id; ?>&action=feedfinder" class="edit"><?php echo $caption; ?></a></td>
597		- <td><a href="admin.php?page=feedwordpress/<?php echo basename(__FILE__); ?>&link_id=<?php echo $link->link_id; ?>&action=Unsubscribe" class="delete"><?php _e('Unsubscribe'); ?></a></td>
598		- <td><input type="checkbox" name="link_ids[]" value="<?php echo $link->link_id; ?>" /></td>
599		-<?php
600		- echo "\n\t</tr>";
601		- endforeach;
602		- else:
603		-?>
604		-
605		-<p>There are no websites currently listed for syndication.</p>
606		-
607		-<?php endif; ?>
608		- </table>
609		-
610		- <br/><hr/>
611		- <div class="submit"><input type="submit" class="delete" name="action" value="Unsubscribe from Checked Links" />
612		- <input type="submit" name="action" value="Update Checked Links" /></div>
613		- </div> <!-- class="wrap" -->
614		- </form>
615		-
616		- <div class="wrap">
617		- <form action="admin.php?page=feedwordpress/<?php echo basename(__FILE__); ?>" method="post">
618		- <h2>Add a new syndicated site:</h2>
619		- <div>
620		- <label for="add-uri">Website or newsfeed:</label>
621		- <input type="text" name="lookup" id="add-uri" value="URI" size="64" />
622		- <input type="hidden" name="action" value="feedfinder" />
623		- </div>
624		- <div class="submit"><input type="submit" value="Syndicate »" /></div>
625		- </form>
626		- </div> <!-- class="wrap" -->
627		-<?php
628		-endif;
629		-}
630		-
631		-function fwp_feedfinder_page () {
632		- global $wpdb;
633		-
634		- $lookup = (isset($_REQUEST['lookup'])?$_REQUEST['lookup']:NULL);
635		-
636		- if (isset($_REQUEST['link_id']) and ($_REQUEST['link_id']!=0)):
637		- $link_id = $_REQUEST['link_id'];
638		- if (!is_numeric($link_id)) : FeedWordPress::critical_bug('fwp_feedfinder_page::link_id', $link_id, __LINE__); endif;
639		-
640		- $link = $wpdb->get_row("SELECT * FROM $wpdb->links WHERE link_id='".$wpdb->escape($link_id)."'");
641		- if (is_object($link)):
642		- if (is_null($lookup)) $lookup = $link->link_url;
643		- $name = wp_specialchars($link->link_name, 'both');
644		- else:
645		- die (__("Cheatin' uh ?"));
646		- endif;
647		- else:
648		- $name = "New Syndicated Feed";
649		- $link_id = 0;
650	341	endif;
651		-?>
652		- <div class="wrap">
653		- <h2>Feed Finder: <?php echo $name; ?></h2>
654		-<?php
655		- $f =& new FeedFinder($lookup);
656		- $feeds = $f->find();
657		- if (count($feeds) > 0):
658		- foreach ($feeds as $key => $f):
659		- $rss = fetch_rss($f);
660		- if ($rss):
661		- $feed_title = isset($rss->channel['title'])?$rss->channel['title']:$rss->channel['link'];
662		- $feed_link = isset($rss->channel['link'])?$rss->channel['link']:'';
663		-?>
664		- <form action="admin.php?page=feedwordpress/<?php echo basename(__FILE__); ?>" method="post">
665		- <fieldset style="clear: both">
666		- <legend><?php echo $rss->feed_type; ?> <?php echo $rss->feed_version; ?> feed</legend>
667		-
668		- <?php if ($link_id===0): ?>
669		- <input type="hidden" name="feed_title" value="<?php echo wp_specialchars($feed_title, 'both'); ?>" />
670		- <input type="hidden" name="feed_link" value="<?php echo wp_specialchars($feed_link, 'both'); ?>" />
671		- <?php endif; ?>
672		-
673		- <input type="hidden" name="link_id" value="<?php echo $link_id; ?>" />
674		- <input type="hidden" name="feed" value="<?php echo wp_specialchars($f, 'both'); ?>" />
675		- <input type="hidden" name="action" value="switchfeed" />
676		-
677		- <div>
678		- <div style="float:right; background-color:#D0D0D0; color: black; width:45%; font-size:70%; border-left: 1px dotted #A0A0A0; padding-left: 0.5em; margin-left: 1.0em">
679		-<?php if (count($rss->items) > 0): ?>
680		- <?php $item = $rss->items[0]; ?>
681		- <h3>Sample Item</h3>
682		- <ul>
683		- <li><strong>Title:</strong> <a href="<?php echo $item['link']; ?>"><?php echo $item['title']; ?></a></li>
684		- <li><strong>Date:</strong> <?php echo isset($item['date_timestamp']) ? date('d-M-y g:i:s a', $item['date_timestamp']) : 'unknown'; ?></li>
685		- </ul>
686		- <div class="entry">
687		- <?php echo (isset($item['content']['encoded'])?$item['content']['encoded']:$item['description']); ?>
688		- </div>
689		-<?php else: ?>
690		- <h3>No Items</h3>
691		- <p>FeedWordPress found no posts on this feed.</p>
692		-<?php endif; ?>
693		- </div>
694		-
695		- <div>
696		- <h3>Feed Information</h3>
697		- <ul>
698		- <li><strong>Website:</strong> <a href="<?php echo $feed_link; ?>"><?php echo is_null($feed_title)?'<em>Unknown</em>':$feed_title; ?></a></li>
699		- <li><strong>Feed URI:</strong> <a href="<?php echo wp_specialchars($f, 'both'); ?>"><?php echo wp_specialchars($f, 'both'); ?></a> (<a title="Check feed <<?php echo wp_specialchars($f, 'both'); ?>> for validity" href="http://feedvalidator.org/check.cgi?url=<?php echo urlencode($f); ?>">validate</a>)</li>
700		- <li><strong>Encoding:</strong> <?php echo isset($rss->encoding)?wp_specialchars($rss->encoding, 'both'):"<em>Unknown</em>"; ?></li>
701		- <li><strong>Description:</strong> <?php echo isset($rss->channel['description'])?wp_specialchars($rss->channel['description'], 'both'):"<em>Unknown</em>"; ?></li>
702		- </ul>
703		- <div class="submit"><input type="submit" name="Use" value="« Use this feed" /></div>
704		- <div class="submit"><input type="submit" name="Cancel" value="« Cancel" /></div>
705		- </div>
706		- </div>
707		- </fieldset>
708		- </form>
709		-<?php endif;
710		- endforeach;
711		- else:
712		- echo "<p><strong>no feed found</strong></p>";
713		- endif;
714		-?>
715		- </div>
716		-
717		- <form action="admin.php?page=feedwordpress/<?php echo basename(__FILE__); ?>" method="post">
718		- <div class="wrap">
719		- <h2>Use another feed</h2>
720		- <div><label>Feed:</label>
721		- <input type="text" name="lookup" value="URI" />
722		- <input type="hidden" name="link_id" value="<?php echo $link_id; ?>" />
723		- <input type="hidden" name="action" value="feedfinder" /></div>
724		- <div class="submit"><input type="submit" value="Use this feed »" /></div>
725		- </div>
726		- </form>
727		-<?php
728		- return false; // Don't continue
729	342	}
730	343
731		-function fwp_switchfeed_page () {
732		- global $wpdb, $wp_db_version;
733		-
734		- check_admin_referer();
735		- if (!isset($_REQUEST['Cancel'])):
736		- if (!current_user_can('manage_links')):
737		- die (__("Cheatin' uh ?"));
738		- elseif (isset($_REQUEST['link_id']) and ($_REQUEST['link_id']==0)):
739		- $link_id = FeedWordPress::syndicate_link($_REQUEST['feed_title'], $_REQUEST['feed_link'], $_REQUEST['feed']);
740		- if ($link_id): ?>
741		-<div class="updated"><p><a href="<?php echo $_REQUEST['feed_link']; ?>"><?php echo wp_specialchars($_REQUEST['feed_title'], 'both'); ?></a>
742		-has been added as a contributing site, using the newsfeed at <<a href="<?php echo $_REQUEST['feed']; ?>"><?php echo wp_specialchars($_REQUEST['feed'], 'both'); ?></a>>.</p></div>
743		-<?php else: ?>
744		-<div class="updated"><p>There was a problem adding the newsfeed. [SQL: <?php echo wp_specialchars(mysql_error(), 'both'); ?>]</p></div>
745		-<?php endif;
746		- elseif (isset($_REQUEST['link_id'])):
747		- // Update link_rss
748		- $result = $wpdb->query("
749		- UPDATE $wpdb->links
750		- SET
751		- link_rss = '".$wpdb->escape($_REQUEST['feed'])."'
752		- WHERE link_id = '".$wpdb->escape($_REQUEST['link_id'])."'
753		- ");
754		-
755		- if ($result):
756		- $result = $wpdb->get_row("
757		- SELECT link_name, link_url FROM $wpdb->links
758		- WHERE link_id = '".$wpdb->escape($_REQUEST['link_id'])."'
759		- ");
760		- ?>
761		-<div class="updated"><p>Feed for <a href="<?php echo $result->link_url; ?>"><?php echo wp_specialchars($result->link_name, 'both'); ?></a>
762		-updated to <<a href="<?php echo $_REQUEST['feed']; ?>"><?php echo wp_specialchars($_REQUEST['feed'], 'both'); ?></a>>.</p></div>
763		- <?php else: ?>
764		-<div class="updated"><p>Nothing was changed.</p></div>
765		- <?php endif;
766		- endif;
767		- endif;
768		- return true; // Continue
769		-}
770		-
771		-function fwp_linkedit_page () {
772		- global $wpdb;
773		-
774		- check_admin_referer(); // Make sure we arrived here from the Dashboard
775		-
776		- $special_settings = array ( /* Regular expression syntax is OK here */
777		- 'cats',
778		- 'cat_split',
779		- 'hardcode name',
780		- 'hardcode url',
781		- 'hardcode description',
782		- 'hardcode categories', /* Deprecated */
783		- 'post status',
784		- 'comment status',
785		- 'ping status',
786		- 'unfamiliar author',
787		- 'unfamliar categories',
788		- 'map authors',
789		- 'update/.*',
790		- 'feed/.*',
791		- 'link/.*',
792		- );
793		-
794		- if (!current_user_can('manage_links')) :
795		- die (__("Cheatin' uh ?"));
796		- elseif (isset($_REQUEST['feedfinder'])) :
797		- return fwp_feedfinder_page(); // re-route to Feed Finder page
798		- else :
799		- $link_id = (int) $_REQUEST['link_id'];
800		- $link =& new SyndicatedLink($link_id);
801		-
802		- if ($link->found()) :
803		- if (isset($GLOBALS['fwp_post']['save'])) :
804		- $alter = array ();
805		-
806		- $meta = $link->settings;
807		- //if (isset($meta['cats'])):
808		- // $meta['cats'] = preg_split(FEEDWORDPRESS_CAT_SEPARATOR_PATTERN, $meta['cats']);
809		- //endif;
810		-
811		- // custom feed settings first
812		- foreach ($GLOBALS['fwp_post']['notes'] as $mn) :
813		- $mn['key0'] = trim($mn['key0']);
814		- $mn['key1'] = trim($mn['key1']);
815		- if (preg_match("\007^(("
816		- .implode(')\|(',$special_settings)
817		- ."))$\007i",
818		- $mn['key1'])) :
819		- $mn['key1'] = 'user/'.$mn['key1'];
820		- endif;
821		-
822		- if (strlen($mn['key0']) > 0) :
823		- unset($meta[$mn['key0']]); // out with the old
824		- endif;
825		-
826		- if (($mn['action']=='update') and (strlen($mn['key1']) > 0)) :
827		- $meta[$mn['key1']] = $mn['value']; // in with the new
828		- endif;
829		- endforeach;
830		-
831		- // now stuff through the web form
832		- // hardcoded feed info
833		- if (isset($GLOBALS['fwp_post']['hardcode_name'])) :
834		- $meta['hardcode name'] = $GLOBALS['fwp_post']['hardcode_name'];
835		- if (FeedWordPress::affirmative($meta, 'hardcode name')) :
836		- $alter[] = "link_name = '".$wpdb->escape($GLOBALS['fwp_post']['name'])."'";
837		- endif;
838		- endif;
839		- if (isset($GLOBALS['fwp_post']['hardcode_description'])) :
840		- $meta['hardcode description'] = $GLOBALS['fwp_post']['hardcode_description'];
841		- if (FeedWordPress::affirmative($meta, 'hardcode description')) :
842		- $alter[] = "link_description = '".$wpdb->escape($GLOBALS['fwp_post']['description'])."'";
843		- endif;
844		- endif;
845		- if (isset($GLOBALS['fwp_post']['hardcode_url'])) :
846		- $meta['hardcode url'] = $GLOBALS['fwp_post']['hardcode_url'];
847		- if (FeedWordPress::affirmative($meta, 'hardcode url')) :
848		- $alter[] = "link_url = '".$wpdb->escape($GLOBALS['fwp_post']['linkurl'])."'";
849		- endif;
850		- endif;
851		-
852		- // Update scheduling
853		- if (isset($GLOBALS['fwp_post']['update_schedule'])) :
854		- $meta['update/hold'] = $GLOBALS['fwp_post']['update_schedule'];
855		- endif;
856		-
857		- // Categories
858		- if (isset($GLOBALS['fwp_post']['post_category'])) :
859		- $meta['cats'] = array();
860		- foreach ($GLOBALS['fwp_post']['post_category'] as $cat_id) :
861		- $meta['cats'][] = '{#'.$cat_id.'}';
862		- endforeach;
863		- else :
864		- unset($meta['cats']);
865		- endif;
866		-
867		- // Post status, comment status, ping status
868		- foreach (array('post', 'comment', 'ping') as $what) :
869		- $sfield = "feed_{$what}_status";
870		- if (isset($GLOBALS['fwp_post'][$sfield])) :
871		- if ($GLOBALS['fwp_post'][$sfield]=='site-default') :
872		- unset($meta["{$what} status"]);
873		- else :
874		- $meta["{$what} status"] = $GLOBALS['fwp_post'][$sfield];
875		- endif;
876		- endif;
877		- endforeach;
878		-
879		- // Unfamiliar author, unfamiliar categories
880		- foreach (array("author", "category") as $what) :
881		- $sfield = "unfamiliar_{$what}";
882		- if (isset($GLOBALS['fwp_post'][$sfield])) :
883		- if ('site-default'==$GLOBALS['fwp_post'][$sfield]) :
884		- unset($meta["unfamiliar {$what}"]);
885		- elseif ('newuser'==$GLOBALS['fwp_post'][$sfield]) :
886		- $newuser_name = trim($GLOBALS['fwp_post']["{$sfield}_newuser"]);
887		- if (strlen($newuser_name) > 0) :
888		- $userdata = array();
889		- $userdata['ID'] = NULL;
890		-
891		- $userdata['user_login'] = sanitize_user($newuser_name);
892		- $userdata['user_login'] = apply_filters('pre_user_login', $userdata['user_login']);
893		-
894		- $userdata['user_nicename'] = sanitize_title($newuser_name);
895		- $userdata['user_nicename'] = apply_filters('pre_user_nicename', $userdata['user_nicename']);
896		-
897		- $userdata['display_name'] = $wpdb->escape($newuser_name);
898		-
899		- $newuser_id = wp_insert_user($userdata);
900		- if (is_numeric($newuser_id)) :
901		- $meta["unfamiliar {$what}"] = $newuser_id;
902		- else :
903		- // TODO: Add some error detection and reporting
904		- endif;
905		- else :
906		- // TODO: Add some error reporting
907		- endif;
908		- else :
909		- $meta["unfamiliar {$what}"] = $GLOBALS['fwp_post'][$sfield];
910		- endif;
911		- endif;
912		- endforeach;
913		-
914		- // Handle author mapping rules
915		- if (isset($GLOBALS['fwp_post']['author_rules_name']) and isset($GLOBALS['fwp_post']['author_rules_action'])) :
916		- unset($meta['map authors']);
917		- foreach ($GLOBALS['fwp_post']['author_rules_name'] as $key => $name) :
918		- // Normalize for case and whitespace
919		- $name = strtolower(trim($name));
920		- $author_action = strtolower(trim($GLOBALS['fwp_post']['author_rules_action'][$key]));
921		-
922		- if (strlen($name) > 0) :
923		- if ('newuser' == $author_action) :
924		- $newuser_name = trim($GLOBALS['fwp_post']['author_rules_newuser'][$key]);
925		- if (strlen($newuser_name) > 0) :
926		- $userdata = array();
927		- $userdata['ID'] = NULL;
928		-
929		- $userdata['user_login'] = sanitize_user($newuser_name);
930		- $userdata['user_login'] = apply_filters('pre_user_login', $userdata['user_login']);
931		-
932		- $userdata['user_nicename'] = sanitize_title($newuser_name);
933		- $userdata['user_nicename'] = apply_filters('pre_user_nicename', $userdata['user_nicename']);
934		-
935		- $userdata['display_name'] = $wpdb->escape($newuser_name);
936		-
937		- $newuser_id = wp_insert_user($userdata);
938		- if (is_numeric($newuser_id)) :
939		- $meta['map authors']['name'][$name] = $newuser_id;
940		- else :
941		- // TODO: Add some error detection and reporting
942		- endif;
943		- else :
944		- // TODO: Add some error reporting
945		- endif;
946		- else :
947		- $meta['map authors']['name'][$name] = $author_action;
948		- endif;
949		- endif;
950		- endforeach;
951		- endif;
952		-
953		- if (isset($GLOBALS['fwp_post']['add_author_rule_name']) and isset($GLOBALS['fwp_post']['add_author_rule_action'])) :
954		- $name = strtolower(trim($GLOBALS['fwp_post']['add_author_rule_name']));
955		- $author_action = strtolower(trim($GLOBALS['fwp_post']['add_author_rule_action']));
956		- if (strlen($name) > 0) :
957		- if ('newuser' == $author_action) :
958		- $newuser_name = trim($GLOBALS['fwp_post']['add_author_rule_newuser']);
959		- if (strlen($newuser_name) > 0) :
960		- $userdata = array();
961		- $userdata['ID'] = NULL;
962		-
963		- $userdata['user_login'] = sanitize_user($newuser_name);
964		- $userdata['user_login'] = apply_filters('pre_user_login', $userdata['user_login']);
965		-
966		- $userdata['user_nicename'] = sanitize_title($newuser_name);
967		- $userdata['user_nicename'] = apply_filters('pre_user_nicename', $userdata['user_nicename']);
968		-
969		- $userdata['display_name'] = $wpdb->escape($newuser_name);
970		-
971		- $newuser_id = wp_insert_user($userdata);
972		- if (is_numeric($newuser_id)) :
973		- $meta['map authors']['name'][$name] = $newuser_id;
974		- else :
975		- // TODO: Add some error detection and reporting
976		- endif;
977		- else :
978		- // TODO: Add some error reporting
979		- endif;
980		- else :
981		- $meta['map authors']['name'][$name] = $author_action;
982		- endif;
983		- endif;
984		- endif;
985		-
986		- if (isset($GLOBALS['fwp_post']['cat_split'])) :
987		- if (strlen(trim($GLOBALS['fwp_post']['cat_split'])) > 0) :
988		- $meta['cat_split'] = trim($GLOBALS['fwp_post']['cat_split']);
989		- else :
990		- unset($meta['cat_split']);
991		- endif;
992		- endif;
993		-
994		- if (is_array($meta['cats'])) :
995		- $meta['cats'] = implode(FEEDWORDPRESS_CAT_SEPARATOR, $meta['cats']);
996		- endif;
997		-
998		- // Collapse the author mapping rule structure back into a flat string
999		- if (isset($meta['map authors'])) :
1000		- $ma = array();
1001		- foreach ($meta['map authors'] as $rule_type => $author_rules) :
1002		- foreach ($author_rules as $author_name => $author_action) :
1003		- $ma[] = $rule_type."\n".$author_name."\n".$author_action;
1004		- endforeach;
1005		- endforeach;
1006		- $meta['map authors'] = implode("\n\n", $ma);
1007		- endif;
1008		-
1009		- $notes = '';
1010		- foreach ($meta as $key => $value) :
1011		- $notes .= $key . ": ". addcslashes($value, "\0..\37".'\\') . "\n";
1012		- endforeach;
1013		- $alter[] = "link_notes = '".$wpdb->escape($notes)."'";
1014		-
1015		- $alter_set = implode(", ", $alter);
1016		-
1017		- // issue update query
1018		- $result = $wpdb->query("
1019		- UPDATE $wpdb->links
1020		- SET $alter_set
1021		- WHERE link_id='$link_id'
1022		- ");
1023		- $updated_link = true;
1024		-
1025		- // reload link information from DB
1026		- $link =& new SyndicatedLink($link_id);
1027		- else :
1028		- $updated_link = false;
1029		- endif;
1030		-
1031		- $db_link = $link->link;
1032		- $link_url = wp_specialchars($db_link->link_url, 1);
1033		- $link_name = wp_specialchars($db_link->link_name, 1);
1034		- $link_description = wp_specialchars($db_link->link_description, 'both');
1035		- $link_notes = wp_specialchars($db_link->link_notes, 'both');
1036		- $link_rss_uri = wp_specialchars($db_link->link_rss, 'both');
1037		-
1038		- $meta = $link->settings;
1039		- $post_status_global = get_option('feedwordpress_syndicated_post_status');
1040		- $comment_status_global = get_option('feedwordpress_syndicated_comment_status');
1041		- $ping_status_global = get_option('feedwordpress_syndicated_ping_status');
1042		-
1043		- $status['post'] = array('publish' => '', 'private' => '', 'draft' => '', 'site-default' => '');
1044		- $status['comment'] = array('open' => '', 'closed' => '', 'site-default' => '');
1045		- $status['ping'] = array('open' => '', 'closed' => '', 'site-default' => '');
1046		-
1047		- foreach (array('post', 'comment', 'ping') as $what) :
1048		- if (isset($meta["{$what} status"])) :
1049		- $status[$what][$meta["{$what} status"]] = ' checked="checked"';
1050		- else :
1051		- $status[$what]['site-default'] = ' checked="checked"';
1052		- endif;
1053		- endforeach;
1054		-
1055		- $unfamiliar['author'] = array ('create' => '','default' => '','filter' => '');
1056		- $unfamiliar['category'] = array ('create'=>'','default'=>'','filter'=>'');
1057		-
1058		- foreach (array('author', 'category') as $what) :
1059		- if (is_string($meta["unfamiliar {$what}"]) and
1060		- array_key_exists($meta["unfamiliar {$what}"], $unfamiliar[$what])) :
1061		- $key = $meta["unfamiliar {$what}"];
1062		- else:
1063		- $key = 'site-default';
1064		- endif;
1065		- $unfamiliar[$what][$key] = ' checked="checked"';
1066		- endforeach;
1067		-
1068		- $dogs = get_nested_categories(-1, 0);
1069		- if (is_array($meta['cats'])) :
1070		- $cats = array_map('strtolower',
1071		- array_map('trim',
1072		- $meta['cats']
1073		- ));
1074		- else:
1075		- $cats = array();
1076		- endif;
1077		-
1078		- foreach ($dogs as $tag => $dog) :
1079		- $found_by_name = in_array(strtolower(trim($dog['cat_name'])), $cats);
1080		-
1081		- if (isset($dog['cat_ID'])) : $dog['cat_id'] = $dog['cat_ID']; endif;
1082		- $found_by_id = in_array('{#'.trim($dog['cat_id']).'}', $cats);
1083		-
1084		- if ($found_by_name or $found_by_id) :
1085		- $dogs[$tag]['checked'] = true;
1086		- endif;
1087		- endforeach;
1088		- else :
1089		- die( __('Link not found.') );
1090		- endif;
1091		-
1092		- ?>
1093		-<script type="text/javascript">
1094		- function flip_hardcode (item) {
1095		- ed=document.getElementById('basics-'+item+'-edit');
1096		- view=document.getElementById('basics-'+item+'-view');
1097		-
1098		- o = document.getElementById('basics-hardcode-'+item);
1099		- if (o.value=='yes') { ed.style.display='inline'; view.style.display='none'; }
1100		- else { ed.style.display='none'; view.style.display='inline'; }
1101		- }
1102		- function flip_newuser (item) {
1103		- rollup=document.getElementById(item);
1104		- newuser=document.getElementById(item+'-newuser');
1105		- sitewide=document.getElementById(item+'-default');
1106		- if (rollup) {
1107		- if ('newuser'==rollup.value) {
1108		- if (newuser) newuser.style.display='block';
1109		- if (sitewide) sitewide.style.display='none';
1110		- } else if ('site-default'==rollup.value) {
1111		- if (newuser) newuser.style.display='none';
1112		- if (sitewide) sitewide.style.display='block';
1113		- } else {
1114		- if (newuser) newuser.style.display='none';
1115		- if (sitewide) sitewide.style.display='none';
1116		- }
1117		- }
1118		- }
1119		-</script>
1120		-
1121		-<?php if ($updated_link) : ?>
1122		-<div class="updated"><p>Syndicated feed settings updated.</p></div>
1123		-<?php endif; ?>
1124		-
1125		-<form action="admin.php?page=feedwordpress/<?php echo basename(__FILE__); ?>" method="post">
1126		-<div class="wrap">
1127		-<input type="hidden" name="link_id" value="<?php echo $link_id; ?>" />
1128		-<input type="hidden" name="action" value="linkedit" />
1129		-<input type="hidden" name="save" value="link" />
1130		-
1131		-<h2>Edit a syndicated feed:</h2>
1132		-<fieldset class="options"><legend>Basics</legend>
1133		-<table class="editform" width="100%" cellspacing="2" cellpadding="5">
1134		-<tr>
1135		-<th scope="row" width="20%"><?php _e('Feed URI:') ?></th>
1136		-<td width="60%"><a href="<?php echo wp_specialchars($link_rss_uri, 'both'); ?>"><?php echo $link_rss_uri; ?></a>
1137		-(<a href="<?php echo FEEDVALIDATOR_URI; ?>?url=<?php echo urlencode($link_rss_uri); ?>"
1138		-title="Check feed <<?php echo wp_specialchars($link_rss_uri, 'both'); ?>> for validity">validate</a>)
1139		-</td>
1140		-<td width="20%"><input type="submit" name="feedfinder" value="switch →" style="font-size:smaller" /></td>
1141		-</tr>
1142		-<tr>
1143		-<th scope="row" width="20%"><?php _e('Link Name:') ?></th>
1144		-<td width="60%"><input type="text" id="basics-name-edit" name="name"
1145		-value="<?php echo $link_name; ?>" style="width: 95%" />
1146		-<span id="basics-name-view"><strong><?php echo $link_name; ?></strong></span>
1147		-</td>
1148		-<td>
1149		-<select id="basics-hardcode-name" onchange="flip_hardcode('name')" name="hardcode_name">
1150		-<option value="no" <?php echo $link->hardcode('name')?'':'selected="selected"'; ?>>update automatically</option>
1151		-<option value="yes" <?php echo $link->hardcode('name')?'selected="selected"':''; ?>>edit manually</option>
1152		-</select>
1153		-</td>
1154		-</tr>
1155		-<tr>
1156		-<th scope="row" width="20%"><?php _e('Short description:') ?></th>
1157		-<td width="60%">
1158		-<input id="basics-description-edit" type="text" name="description" value="<?php echo $link_description; ?>" style="width: 95%" />
1159		-<span id="basics-description-view"><strong><?php echo $link_description; ?></strong></span>
1160		-</td>
1161		-<td>
1162		-<select id="basics-hardcode-description" onchange="flip_hardcode('description')"
1163		-name="hardcode_description">
1164		-<option value="no" <?php echo $link->hardcode('description')?'':'selected="selected"'; ?>>update automatically</option>
1165		-<option value="yes" <?php echo $link->hardcode('description')?'selected="selected"':''; ?>>edit manually</option>
1166		-</select></td>
1167		-</tr>
1168		-<tr>
1169		-<th width="20%" scope="row"><?php _e('Homepage:') ?></th>
1170		-<td width="60%">
1171		-<input id="basics-url-edit" type="text" name="linkurl" value="<?php echo $link_url; ?>" style="width: 95%;" />
1172		-<a id="basics-url-view" href="<?php echo $link_url; ?>"><?php echo $link_url; ?></a></td>
1173		-<td>
1174		-<select id="basics-hardcode-url" onchange="flip_hardcode('url')" name="hardcode_url">
1175		-<option value="no"<?php echo $link->hardcode('url')?'':' selected="selected"'; ?>>update automatically</option>
1176		-<option value="yes"<?php echo $link->hardcode('url')?' selected="selected"':''; ?>>edit manually</option>
1177		-</select></td></tr>
1178		-
1179		-<tr>
1180		-<th width="20%"><?php _e('Last update') ?>:</th>
1181		-<td colspan="2"><?php
1182		- if (isset($meta['update/last'])) :
1183		- echo strftime('%x %X', $meta['update/last'])." ";
1184		- else :
1185		- echo " none yet";
1186		- endif;
1187		-?></td></tr>
1188		-<tr><th width="20%">Next update:</th>
1189		-<td colspan="2"><?php
1190		- $holdem = (isset($meta['update/hold']) ? $meta['update/hold'] : 'scheduled');
1191		-?>
1192		-<select name="update_schedule">
1193		-<option value="scheduled"<?php echo ($holdem=='scheduled')?' selected="selected"':''; ?>>update on schedule <?php
1194		- echo " (";
1195		- if (isset($meta['update/ttl']) and is_numeric($meta['update/ttl'])) :
1196		- if (isset($meta['update/timed']) and $meta['update/timed']=='automatically') :
1197		- echo 'next: ';
1198		- $next = $meta['update/last'] + ((int) $meta['update/ttl'] * 60);
1199		- if (strftime('%x', time()) != strftime('%x', $next)) :
1200		- echo strftime('%x', $next)." ";
1201		- endif;
1202		- echo strftime('%X', $meta['update/last']+((int) $meta['update/ttl']*60));
1203		- else :
1204		- echo "every ".$meta['update/ttl']." minute".(($meta['update/ttl']!=1)?"s":"");
1205		- endif;
	344	+function syndication_permalink ($permalink = '') {
	345	+ if (get_option('feedwordpress_munge_permalink') != 'no'):
	346	+ $uri = get_syndication_permalink();
	347	+ return ((strlen($uri) > 0) ? $uri : $permalink);
1206	348	else:
1207		- echo "next scheduled update";
	349	+ return $permalink;
1208	350	endif;
1209		- echo ")";
1210		-?></option>
1211		-<option value="next"<?php echo ($holdem=='next')?' selected="selected"':''; ?>>update ASAP</option>
1212		-<option value="ping"<?php echo ($holdem=='ping')?' selected="selected"':''; ?>>update only when pinged</option>
1213		-</select></tr>
1214		-</table>
1215		-</fieldset>
	351	+} // function syndication_permalink ()
1216	352
1217		-<script type="text/javascript">
1218		-flip_hardcode('name');
1219		-flip_hardcode('description');
1220		-flip_hardcode('url');
1221		-</script>
	353	+################################################################################
	354	+## ADMIN MENU ADD-ONS: register Dashboard management pages #####################
	355	+################################################################################
1222	356
1223		-<p class="submit">
1224		-<input type="submit" name="submit" value="<?php _e('Save Changes »') ?>" />
1225		-</p>
	357	+function fwp_add_pages () {
	358	+ global $fwp_capability;
	359	+ global $fwp_path;
1226	360
1227		-<fieldset class="options">
1228		-<legend>Syndicated Posts</legend>
	361	+ add_menu_page('Syndicated Sites', 'Syndication', $fwp_capability['manage_links'], $fwp_path.'/syndication.php');
	362	+ add_submenu_page($fwp_path.'/syndication.php', 'Syndication Options', 'Options', $fwp_capability['manage_options'], $fwp_path.'/syndication-options.php');
	363	+ add_options_page('Syndication Options', 'Syndication', $fwp_capability['manage_options'], $fwp_path.'/syndication-options.php');
	364	+} // function fwp_add_pages () */
1229	365
1230		-<?php fwp_category_box($dogs, 'all syndicated posts from this feed'); ?>
1231		-
1232		-<table class="editform" width="75%" cellspacing="2" cellpadding="5">
1233		-<tr><th width="27%" scope="row" style="vertical-align:top">Publication:</th>
1234		-<td width="73%" style="vertical-align:top"><ul style="margin:0; list-style:none">
1235		-<li><label><input type="radio" name="feed_post_status" value="site-default"
1236		-<?php echo $status['post']['site-default']; ?> /> Use site-wide setting from <a href="admin.php?page=feedwordpress/syndication-options.php">Syndication Options</a>
1237		-(currently: <strong><?php echo ($post_status_global ? $post_status_global : 'publish'); ?></strong>)</label></li>
1238		-<li><label><input type="radio" name="feed_post_status" value="publish"
1239		-<?php echo $status['post']['publish']; ?> /> Publish posts from this feed immediately</label></li>
1240		-<li><label><input type="radio" name="feed_post_status" value="private"
1241		-<?php echo $status['post']['private']; ?> /> Hold posts from this feed as private posts</label></li>
1242		-<li><label><input type="radio" name="feed_post_status" value="draft"
1243		-<?php echo $status['post']['draft']; ?> /> Hold posts from this feed as drafts</label></li>
1244		-</ul></td>
1245		-</tr>
1246		-
1247		-<tr><th width="27%" scope="row" style="vertical-align:top">Comments:</th>
1248		-<td width="73%"><ul style="margin:0; list-style:none">
1249		-<li><label><input type="radio" name="feed_comment_status" value="site-default"
1250		-<?php echo $status['comment']['site-default']; ?> /> Use site-wide setting from <a href="admin.php?page=feedwordpress/syndication-options.php">Syndication Options</a>
1251		-(currently: <strong><?php echo ($comment_status_global ? $comment_status_global : 'closed'); ?>)</strong></label></li>
1252		-<li><label><input type="radio" name="feed_comment_status" value="open"
1253		-<?php echo $status['comment']['open']; ?> /> Allow comments on syndicated posts from this feed</label></li>
1254		-<li><label><input type="radio" name="feed_comment_status" value="closed"
1255		-<?php echo $status['comment']['closed']; ?> /> Don't allow comments on syndicated posts from this feed</label></li>
1256		-</ul></td>
1257		-</tr>
1258		-
1259		-<tr><th width="27%" scope="row" style="vertical-align:top">Trackback and Pingback:</th>
1260		-<td width="73%"><ul style="margin:0; list-style:none">
1261		-<li><label><input type="radio" name="feed_ping_status" value="site-default"
1262		-<?php echo $status['ping']['site-default']; ?> /> Use site-wide setting from <a href="admin.php?page=feedwordpress/syndication-options.php">Syndication Options</a>
1263		-(currently: <strong><?php echo ($ping_status_global ? $ping_status_global : 'closed'); ?>)</strong></label></li>
1264		-<li><label><input type="radio" name="feed_ping_status" value="open"
1265		-<?php echo $status['ping']['open']; ?> /> Accept pings on syndicated posts from this feed</label></li>
1266		-<li><label><input type="radio" name="feed_ping_status" value="closed"
1267		-<?php echo $status['ping']['closed']; ?> /> Don't accept pings on syndicated posts from this feed</label></li>
1268		-</ul></td>
1269		-</tr>
1270		-</table>
1271		-</fieldset>
1272		-
1273		-<p class="submit">
1274		-<input type="submit" name="submit" value="<?php _e('Save Changes »') ?>" />
1275		-</p>
1276		-
1277		-<fieldset class="options">
1278		-<legend>Syndicated Authors</legend>
1279		-<?php $authorlist = fwp_author_list(); ?>
1280		-
1281		-<table>
1282		-<tr><th colspan="3" style="text-align: left; padding-top: 1.0em; border-bottom: 1px dotted black;">For posts by specific authors. Blank out a name to delete the rule.</th></tr>
1283		-
1284		-<?php if (isset($meta['map authors'])) : $i=0; foreach ($meta['map authors'] as $author_rules) : foreach ($author_rules as $author_name => $author_action) : $i++; ?>
1285		-<tr>
1286		- <th style="text-align: left">Posts by <input type="text" name="author_rules_name[]" value="<?php echo htmlspecialchars($author_name); ?>" /></th>
1287		- <td>
1288		- <select id="author-rules-<?php echo $i; ?>" name="author_rules_action[]" onchange="flip_newuser('author-rules-<?php echo $i; ?>');">
1289		- <?php foreach ($authorlist as $local_author_id => $local_author_name) : ?>
1290		- <option value="<?php echo $local_author_id; ?>"<?php if ($local_author_id==$author_action) : echo ' selected="selected"'; endif; ?>>are assigned to <?php echo $local_author_name; ?></option>
1291		- <?php endforeach; ?>
1292		- <option value="newuser">will be assigned to a new user...</option>
1293		- <option value="filter"<?php if ('filter'==$author_action) : echo ' selected="selected"'; endif; ?>>get filtered out</option>
1294		- </select>
1295		- </td>
1296		- <td><div id="author-rules-<?php echo $i; ?>-newuser">named <input type="text" name="author_rules_newuser[]" value="" /></div></td>
1297		-</tr>
1298		-<?php endforeach; endforeach; endif; ?>
1299		-
1300		-<tr><th colspan="3" style="text-align: left; padding-top: 1.0em; border-bottom: 1px dotted black;">Fill in to set up a new rule:</th></tr>
1301		-
1302		-<tr>
1303		- <th style="text-align: left">Posts by <input type="text" name="add_author_rule_name" /></th>
1304		- <td>
1305		- <select id="add-author-rule" name="add_author_rule_action" onchange="flip_newuser('add-author-rule');">
1306		- <?php foreach ($authorlist as $author_id => $author_name) : ?>
1307		- <option value="<?php echo $author_id; ?>">are assigned to <?php echo $author_name; ?></option>
1308		- <?php endforeach; ?>
1309		- <option value="newuser">will be assigned to a new user...</option>
1310		- <option value="filter">get filtered out</option>
1311		- </select>
1312		- </td>
1313		- <td><div id="add-author-rule-newuser">named <input type="text" name="add_author_rule_newuser" value="" /></div></td>
1314		-</tr>
1315		-
1316		-<tr><th colspan="3" style="text-align: left; padding-top: 1.0em; border-bottom: 1px dotted black;">For posts by authors that haven't been syndicated before:</th></tr>
1317		-<tr>
1318		- <th style="text-align: left">Posts by new authors</th>
1319		- <td>
1320		- <select id="unfamiliar-author" name="unfamiliar_author" onchange="flip_newuser('unfamiliar-author');">
1321		- <option value="site-default"<?php if (!isset($meta['unfamiliar author'])) : ?>selected="selected"<?php endif; ?>>are handled using site-wide settings</option>
1322		- <option value="create"<?php if ('create'==$meta['unfamiliar author']) : ?>selected="selected"<?php endif; ?>>create a new author account</option>
1323		- <?php foreach ($authorlist as $author_id => $author_name) : ?>
1324		- <option value="<?php echo $author_id; ?>"<?php if ($author_id==$meta['unfamiliar author']) : ?>selected="selected"<?php endif; ?>>are assigned to <?php echo $author_name; ?></option>
1325		- <?php endforeach; ?>
1326		- <option value="newuser">will be assigned to a new user...</option>
1327		- <option value="filter"<?php if ('filter'==$meta['unfamiliar author']) : ?>selected="selected"<?php endif; ?>>get filtered out</option>
1328		- </select>
1329		- </td>
1330		- <td>
1331		- <div id="unfamiliar-author-default">Site-wide settings can be set in <a href="admin.php?page=feedwordpress/syndication-options.php">Syndication Options</a></div>
1332		- <div id="unfamiliar-author-newuser">named <input type="text" name="unfamiliar_author_newuser" value="" /></div>
1333		- </td>
1334		-</tr>
1335		-
1336		-</table>
1337		-</fieldset>
1338		-
1339		-<script>
1340		- flip_newuser('unfamiliar-author');
1341		-<?php for ($j=1; $j<=$i; $j++) : ?>
1342		- flip_newuser('author-rules-<?php echo $j; ?>');
1343		-<?php endfor; ?>
1344		- flip_newuser('add-author-rule');
1345		-</script>
1346		-
1347		-<p class="submit">
1348		-<input type="submit" name="submit" value="<?php _e('Save Changes »') ?>" />
1349		-</p>
1350		-
1351		-<fieldset>
1352		-<legend>Advanced Feed Options</legend>
1353		-<table class="editform" width="100%" cellspacing="2" cellpadding="5">
1354		-
1355		-<tr>
1356		-<th width="20%" scope="row" style="vertical-align:top">Unfamiliar categories:</th>
1357		-<td width="80%"><ul style="margin: 0; list-style:none">
1358		-<li><label><input type="radio" name="unfamiliar_category" value="site-default"<?php echo $unfamiliar['category']['site-default']; ?> /> use site-wide setting from <a href="admin.php?page=feedwordpress/syndication-options.php">Syndication Options</a>
1359		-(currently <strong><?php echo FeedWordPress::on_unfamiliar('category'); ?></strong>)</label></li>
1360		-<li><label><input type="radio" name="unfamiliar_category" value="create"<?php echo $unfamiliar['category']['create']; ?> /> create any categories the post is in</label></li>
1361		-<li><label><input type="radio" name="unfamiliar_category" value="default"<?php echo $unfamiliar['category']['default']; ?> /> don't create new categories</label></li>
1362		-<li><label><input type="radio" name="unfamiliar_category" value="filter"<?php echo $unfamiliar['category']['filter']; ?> /> don't create new categories and don't syndicate posts unless they match at least one familiar category</label></li>
1363		-</ul></td>
1364		-</tr>
1365		-
1366		-<tr>
1367		-<th width="20%" scope="row" style="vertical-align:top">Multiple categories:</th>
1368		-<td width="80%">
1369		-<input type="text" size="20" id="cat_split" name="cat_split" value="<?php if (isset($meta['cat_split'])) : echo htmlspecialchars($meta['cat_split']); endif; ?>" /><br/>
1370		-Enter a <a href="http://us.php.net/manual/en/reference.pcre.pattern.syntax.php">Perl-compatible regular expression</a> here if the feed provides multiple
1371		-categories in a single category element. The regular expression should match
1372		-the characters used to separate one category from the next. If the feed uses
1373		-spaces (like <a href="http://del.icio.us/">del.icio.us</a>), use the pattern "\s".
1374		-If the feed does not provide multiple categories in a single element, leave this
1375		-blank.</td>
1376		-</tr>
1377		-</table>
1378		-</fieldset>
1379		-
1380		-<p class="submit">
1381		-<input type="submit" name="submit" value="<?php _e('Save Changes »') ?>" />
1382		-</p>
1383		-
1384		-<fieldset id="postcustom">
1385		-<legend>Custom Settings (for use in templates)</legend>
1386		-<div id="postcustomstuff">
1387		-<table id="meta-list" cellpadding="3">
1388		- <tr>
1389		- <th>Key</th>
1390		- <th>Value</th>
1391		- <th>Action</th>
1392		- </tr>
1393		-
1394		-<?php
1395		- $i = 0;
1396		- foreach ($meta as $key => $value) :
1397		- if (!preg_match("\007^((".implode(')\|(', $special_settings)."))$\007i", $key)) :
1398		-?>
1399		- <tr style="vertical-align:top">
1400		- <th width="30%" scope="row"><input type="hidden" name="notes[<?php echo $i; ?>][key0]" value="<?php echo wp_specialchars($key, 'both'); ?>" />
1401		- <input id="notes-<?php echo $i; ?>-key" name="notes[<?php echo $i; ?>][key1]" value="<?php echo wp_specialchars($key, 'both'); ?>" /></th>
1402		- <td width="60%"><textarea rows="2" cols="40" id="notes-<?php echo $i; ?>-value" name="notes[<?php echo $i; ?>][value]"><?php echo wp_specialchars($value, 'both'); ?></textarea></td>
1403		- <td width="10%"><select name="notes[<?php echo $i; ?>][action]">
1404		- <option value="update">save changes</option>
1405		- <option value="delete">delete this setting</option>
1406		- </select></td>
1407		- </tr>
1408		-<?php
1409		- $i++;
1410		- endif;
1411		- endforeach;
1412		-?>
1413		- <tr>
1414		- <th scope="row"><input type="text" size="10" name="notes[<?php echo $i; ?>][key1]" value="" /></th>
1415		- <td><textarea name="notes[<?php echo $i; ?>][value]" rows="2" cols="40"></textarea></td>
1416		- <td><em>add new setting...</em><input type="hidden" name="notes[<?php echo $i; ?>][action]" value="update" /></td>
1417		- </tr>
1418		-</table>
1419		-</fieldset>
1420		-
1421		-<p class="submit">
1422		-<input type="submit" name="submit" value="<?php _e('Save Changes »') ?>" />
1423		-</p>
1424		-
1425		-</div>
1426		- <?php
1427		- endif;
1428		- return false; // Don't continue
1429		-}
1430		-
1431		-function fwp_author_list () {
1432		- global $wpdb;
1433		- $ret = array();
1434		- $users = $wpdb->get_results("SELECT * FROM $wpdb->users ORDER BY display_name");
1435		- if (is_array($users)) :
1436		- foreach ($users as $user) :
1437		- $id = (int) $user->ID;
1438		- $ret[$id] = $user->display_name;
1439		- endforeach;
1440		- endif;
1441		- return $ret;
1442		-}
1443		-
1444		-function fwp_multidelete_page () {
1445		- global $wpdb;
1446		-
1447		- check_admin_referer(); // Make sure the referers are kosher
1448		-
1449		- $link_ids = (isset($_REQUEST['link_ids']) ? $_REQUEST['link_ids'] : array());
1450		- if (isset($_REQUEST['link_id'])) : array_push($link_ids, $_REQUEST['link_id']); endif;
1451		-
1452		- if (!current_user_can('manage_links')):
1453		- die (__("Cheatin' uh ?"));
1454		- elseif (isset($GLOBALS['fwp_post']['confirm']) and $GLOBALS['fwp_post']['confirm']=='Delete'):
1455		- foreach ($GLOBALS['fwp_post']['link_action'] as $link_id => $what) :
1456		- $do_it[$what][] = $link_id;
1457		- endforeach;
1458		-
1459		- $alter = array();
1460		- if (count($do_it['hide']) > 0) :
1461		- $hidem = "(".implode(', ', $do_it['hide']).")";
1462		- $alter[] = "
1463		- UPDATE $wpdb->links
1464		- SET link_visible = 'N'
1465		- WHERE link_id IN {$hidem}
1466		- ";
1467		- endif;
1468		-
1469		- if (count($do_it['nuke']) > 0) :
1470		- $nukem = "(".implode(', ', $do_it['nuke']).")";
1471		-
1472		- // Make a list of the items syndicated from this feed...
1473		- $post_ids = $wpdb->get_col("
1474		- SELECT post_id FROM $wpdb->postmeta
1475		- WHERE meta_key = 'syndication_feed_id'
1476		- AND meta_value IN {$nukem}
1477		- ");
1478		-
1479		- // ... and kill them all
1480		- if (count($post_ids) > 0) :
1481		- foreach ($post_ids as $post_id) :
1482		- wp_delete_post($post_id);
1483		- endforeach;
1484		- endif;
1485		-
1486		- $alter[] = "
1487		- DELETE FROM $wpdb->links
1488		- WHERE link_id IN {$nukem}
1489		- ";
1490		- endif;
1491		-
1492		- if (count($do_it['delete']) > 0) :
1493		- $deletem = "(".implode(', ', $do_it['delete']).")";
1494		-
1495		- // Make the items syndicated from this feed appear to be locally-authored
1496		- $alter[] = "
1497		- DELETE FROM $wpdb->postmeta
1498		- WHERE meta_key = 'syndication_feed_id'
1499		- AND meta_value IN {$deletem}
1500		- ";
1501		-
1502		- // ... and delete the links themselves.
1503		- $alter[] = "
1504		- DELETE FROM $wpdb->links
1505		- WHERE link_id IN {$deletem}
1506		- ";
1507		- endif;
1508		-
1509		- $errs = array(); $success = array ();
1510		- foreach ($alter as $sql) :
1511		- $result = $wpdb->query($sql);
1512		- if (!$result):
1513		- $errs[] = mysql_error();
1514		- endif;
1515		- endforeach;
1516		-
1517		- if (count($alter) > 0) :
1518		- echo "<div class=\"updated\">\n";
1519		- if (count($errs) > 0) :
1520		- echo "There were some problems processing your ";
1521		- echo "unsubscribe request. [SQL: ".implode('; ', $errs)."]";
1522		- else :
1523		- echo "Your unsubscribe request(s) have been processed.";
1524		- endif;
1525		- echo "</div>\n";
1526		- endif;
1527		-
1528		- return true; // Continue on to Syndicated Sites listing
1529		- else :
1530		- $targets = $wpdb->get_results("
1531		- SELECT * FROM $wpdb->links
1532		- WHERE link_id IN (".implode(",",$link_ids).")
1533		- ");
1534		-?>
1535		-<form action="admin.php?page=feedwordpress/<?php echo basename(__FILE__); ?>" method="post">
1536		-<div class="wrap">
1537		-<input type="hidden" name="action" value="Unsubscribe" />
1538		-<input type="hidden" name="confirm" value="Delete" />
1539		-
1540		-<h2>Unsubscribe from Syndicated Links:</h2>
1541		-<?php foreach ($targets as $link) :
1542		- $link_url = wp_specialchars($link->link_url, 1);
1543		- $link_name = wp_specialchars($link->link_name, 1);
1544		- $link_description = wp_specialchars($link->link_description, 'both');
1545		- $link_rss = wp_specialchars($link->link_rss, 'both');
1546		-?>
1547		-<fieldset>
1548		-<legend><?php echo $link_name; ?></legend>
1549		-<table class="editform" width="100%" cellspacing="2" cellpadding="5">
1550		-<tr><th scope="row" width="20%"><?php _e('Feed URI:') ?></th>
1551		-<td width="80%"><a href="<?php echo $link_rss; ?>"><?php echo $link_rss; ?></a></td></tr>
1552		-<tr><th scope="row" width="20%"><?php _e('Short description:') ?></th>
1553		-<td width="80%"><?php echo $link_description; ?></span></td></tr>
1554		-<tr><th width="20%" scope="row"><?php _e('Homepage:') ?></th>
1555		-<td width="80%"><a href="<?php echo $link_url; ?>"><?php echo $link_url; ?></a></td></tr>
1556		-<tr style="vertical-align:top"><th width="20%" scope="row">Subscription <?php _e('Options') ?>:</th>
1557		-<td width="80%"><ul style="margin:0; padding: 0; list-style: none">
1558		-<li><input type="radio" id="hide-<?php echo $link->link_id; ?>"
1559		-name="link_action[<?php echo $link->link_id; ?>]" value="hide" />
1560		-<label for="hide-<?php echo $link->link_id; ?>">Turn off the subscription for this
1561		-syndicated link<br/><span style="font-size:smaller">(Keep the feed information
1562		-and all the posts from this feed in the database, but don't syndicate any
1563		-new posts from the feed.)</span></label></li>
1564		-<li><input type="radio" id="nuke-<?php echo $link->link_id; ?>"
1565		-name="link_action[<?php echo $link->link_id; ?>]" value="nuke" />
1566		-<label for="nuke-<?php echo $link->link_id; ?>">Delete this syndicated link and all the
1567		-posts that were syndicated from it</label></li>
1568		-<li><input type="radio" id="delete-<?php echo $link->link_id; ?>"
1569		-name="link_action[<?php echo $link->link_id; ?>]" value="delete" />
1570		-<label for="delete-<?php echo $link->link_id; ?>">Delete this syndicated link, but
1571		-<em>keep</em> posts that were syndicated from it (as if they were authored
1572		-locally).</label></li>
1573		-<li><input type="radio" id="nothing-<?php echo $link->link_id; ?>"
1574		-name="link_action[<?php echo $link->link_id; ?>]" value="nothing" />
1575		-<label for="nothing-<?php echo $link->link_id; ?>">Keep this feed as it is. I changed
1576		-my mind.</label></li>
1577		-</ul>
1578		-</table>
1579		-</fieldset>
1580		-<?php endforeach; ?>
1581		-
1582		-<div class="submit">
1583		-<input class="delete" type="submit" name="submit" value="<?php _e('Unsubscribe from selected feeds »') ?>" />
1584		-</div>
1585		-</div>
1586		-<?php
1587		- return false; // Don't continue on to Syndicated Sites listing
1588		- endif;
1589		-}
1590		-
1591	366	################################################################################
1592	367	## fwp_hold_pings() and fwp_release_pings(): Outbound XML-RPC ping reform ####
1593	368	## ... 'coz it's rude to send 500 pings the first time your aggregator runs ####
1594	369	################################################################################
		@@ -1852,17 +627,20 @@
1852	627	return $link_id;
1853	628	} // function FeedWordPress::syndicate_link()
1854	629
1855	630	function on_unfamiliar ($what = 'author', $override = NULL) {
1856		- $set = array('create', 'default', 'filter');
1857		-
	631	+ $set = array(
	632	+ 'author' => array('create', 'default', 'filter'),
	633	+ 'category' => array('create', 'tag', 'default', 'filter'),
	634	+ );
	635	+
1858	636	if (is_string($override)) :
1859	637	$ret = strtolower($override);
1860	638	endif;
1861	639
1862		- if (!is_numeric($override) and !in_array($ret, $set)) :
	640	+ if (!is_numeric($override) and !in_array($ret, $set[$what])) :
1863	641	$ret = get_option('feedwordpress_unfamiliar_'.$what);
1864		- if (!is_numeric($ret) and !in_array($ret, $set)) :
	642	+ if (!is_numeric($ret) and !in_array($ret, $set[$what])) :
1865	643	$ret = 'create';
1866	644	endif;
1867	645	endif;
1868	646
		@@ -2068,13 +846,8 @@
2068	846
2069	847	var $_freshness = null;
2070	848	var $_wp_id = null;
2071	849
2072		- var $strip_attrs = array (
2073		- array('[a-z]+', 'style'),
2074		- array('[a-z]+', 'target'),
2075		- );
2076		-
2077	850	function SyndicatedPost ($item, $link) {
2078	851	global $wpdb;
2079	852
2080	853	$this->link = $link;
		@@ -2105,14 +878,14 @@
2105	878	# That's deliberate. The escaping is done at the point
2106	879	# of insertion, not here, to avoid double-escaping and
2107	880	# to avoid screwing with syndicated_post filters
2108	881
2109		- $this->post['post_title'] = $this->item['title'];
	882	+ $this->post['post_title'] = apply_filters('syndicated_item_title', $this->item['title'], $this);
2110	883
2111		- // This just gives usan alphanumeric representation of
	884	+ // This just gives us an alphanumeric representation of
2112	885	// the author. We will look up (or create) the numeric
2113	886	// ID for the author in SyndicatedPost::add()
2114		- $this->post['named']['author'] = $this->author();
	887	+ $this->post['named']['author'] = apply_filters('syndicated_item_author', $this->author(), $this);
2115	888
2116	889	# Identify content and sanitize it.
2117	890	# ---------------------------------
2118	891	if (isset($this->item['xhtml']['body'])) :
		@@ -2123,24 +896,9 @@
2123	896	$content = $this->item['content']['encoded'];
2124	897	else:
2125	898	$content = $this->item['description'];
2126	899	endif;
2127		-
2128		- # FeedWordPress used to resolve URIs relative to the
2129		- # feed URI. It now relies on the xml:base support
2130		- # baked in to the MagpieRSS upgrade. So all we do here
2131		- # now is to sanitize problematic attributes.
2132		- #
2133		- # This kind of sucks. I intend to replace it with
2134		- # lib_filter sometime soon.
2135		- foreach ($this->strip_attrs as $pair):
2136		- list($tag,$attr) = $pair;
2137		- $content = preg_replace (
2138		- ":(<$tag [^>])($attr=(\"[^\">]\"\|[^>\\s]+))([^>]*>):i",
2139		- "\\1\\4",
2140		- $content
2141		- );
2142		- endforeach;
	900	+ $this->post['post_content'] = apply_filters('syndicated_item_content', $content, $this);
2143	901
2144	902	# Identify and sanitize excerpt
2145	903	$excerpt = NULL;
2146	904	if ( isset($this->item['description']) and $this->item['description'] ) :
		@@ -2150,11 +908,10 @@
2150	908	if (strlen($excerpt) > 255) :
2151	909	$excerpt = substr($excerpt,0,252).'...';
2152	910	endif;
2153	911	endif;
	912	+ $excerpt = apply_filters('syndicated_item_excerpt', $excerpt, $this);
2154	913
2155		- $this->post['post_content'] = $content;
2156		-
2157	914	if (!is_null($excerpt)):
2158	915	$this->post['post_excerpt'] = $excerpt;
2159	916	endif;
2160	917
		@@ -2162,11 +919,11 @@
2162	919	if (!$this->use_api('wp_insert_post')) :
2163	920	$this->post['post_name'] = sanitize_title($this->post['post_title']);
2164	921	endif;
2165	922
2166		- $this->post['epoch']['issued'] = $this->published();
2167		- $this->post['epoch']['created'] = $this->created();
2168		- $this->post['epoch']['modified'] = $this->updated();
	923	+ $this->post['epoch']['issued'] = apply_filters('syndicated_item_published', $this->published(), $this);
	924	+ $this->post['epoch']['created'] = apply_filters('syndicated_item_created', $this->created(), $this);
	925	+ $this->post['epoch']['modified'] = apply_filters('syndicated_item_updated', $this->updated(), $this);
2169	926
2170	927	// Dealing with timestamps in WordPress is so fucking fucked.
2171	928	$offset = (int) get_option('gmt_offset') * 60 * 60;
2172	929	$this->post['post_date'] = gmdate('Y-m-d H:i:s', $this->published() + $offset);
		@@ -2179,9 +936,9 @@
2179	936	$this->post['comment_status'] = $this->link->syndicated_status('comment', 'closed');
2180	937	$this->post['ping_status'] = $this->link->syndicated_status('ping', 'closed');
2181	938
2182	939	// Unique ID (hopefully a unique tag: URI); failing that, the permalink
2183		- $this->post['guid'] = $this->guid();
	940	+ $this->post['guid'] = apply_filters('syndicated_item_guid', $this->guid(), $this);
2184	941
2185	942	// RSS 2.0 / Atom 1.0 enclosure support
2186	943	if ( isset($this->item['enclosure#']) ) :
2187	944	for ($i = 1; $i <= $this->item['enclosure#']; $i++) :
		@@ -2186,28 +943,28 @@
2186	943	if ( isset($this->item['enclosure#']) ) :
2187	944	for ($i = 1; $i <= $this->item['enclosure#']; $i++) :
2188	945	$eid = (($i > 1) ? "#{$id}" : "");
2189	946	$this->post['meta']['enclosure'][] =
2190		- $this->item["enclosure{$eid}@url"]."\n".
2191		- $this->item["enclosure{$eid}@length"]."\n".
2192		- $this->item["enclosure{$eid}@type"];
	947	+ apply_filters('syndicated_item_enclosure_url', $this->item["enclosure{$eid}@url"], $this)."\n".
	948	+ apply_filters('syndicated_item_enclosure_length', $this->item["enclosure{$eid}@length"], $this)."\n".
	949	+ apply_filters('syndicated_item_enclosure_type', $this->item["enclosure{$eid}@type"], $this);
2193	950	endfor;
2194	951	endif;
2195	952
2196	953	// In case you want to point back to the blog this was syndicated from
2197	954	if (isset($this->feed->channel['title'])) :
2198		- $this->post['meta']['syndication_source'] = $this->feed->channel['title'];
	955	+ $this->post['meta']['syndication_source'] = apply_filters('syndicated_item_source_title', $this->feed->channel['title'], $this);
2199	956	endif;
2200	957	if (isset($this->feed->channel['link'])) :
2201		- $this->post['meta']['syndication_source_uri'] = $this->feed->channel['link'];
	958	+ $this->post['meta']['syndication_source_uri'] = apply_filters('syndicated_item_source_link', $this->feed->channel['link'], $this);
2202	959	endif;
2203	960
2204	961	// Store information on human-readable and machine-readable comment URIs
2205	962	if (isset($this->item['comments'])) :
2206		- $this->post['meta']['rss:comments'] = $this->item['comments'];
	963	+ $this->post['meta']['rss:comments'] = apply_filters('syndicated_item_comments', $this->item['comments']);
2207	964	endif;
2208	965	if (isset($this->item['wfw']['commentrss'])) :
2209		- $this->post['meta']['wfw:commentRSS'] = $this->item['wfw']['commentrss'];
	966	+ $this->post['meta']['wfw:commentRSS'] = apply_filters('syndicated_item_commentrss', $this->item['wfw']['commentrss']);
2210	967	endif;
2211	968
2212	969	// Store information to identify the feed that this came from
2213	970	$this->post['meta']['syndication_feed'] = $this->feedmeta['link/uri'];
		@@ -2213,13 +970,16 @@
2213	970	$this->post['meta']['syndication_feed'] = $this->feedmeta['link/uri'];
2214	971	$this->post['meta']['syndication_feed_id'] = $this->feedmeta['link/id'];
2215	972
2216	973	// In case you want to know the external permalink...
2217		- $this->post['meta']['syndication_permalink'] = $this->item['link'];
	974	+ $this->post['meta']['syndication_permalink'] = apply_filters('syndicated_item_link', $this->item['link']);
2218	975
	976	+ // Store a hash of the post content for checking whether something needs to be updated
	977	+ $this->post['meta']['syndication_item_hash'] = $this->update_hash();
	978	+
2219	979	// Feed-by-feed options for author and category creation
2220	980	$this->post['named']['unfamiliar']['author'] = $this->feedmeta['unfamiliar author'];
2221		- $this->post['named']['unfamiliar']['category'] = $this->feedmeta['unfamiliar categories'];
	981	+ $this->post['named']['unfamiliar']['category'] = $this->feedmeta['unfamiliar category'];
2222	982
2223	983	// Categories: start with default categories, if any
2224	984	$fc = get_option("feedwordpress_syndication_cats");
2225	985	if ($fc) :
		@@ -2246,8 +1006,22 @@
2246	1006	$this->post['named']['category'][] = $cat;
2247	1007	endif;
2248	1008	endfor;
2249	1009	endif;
	1010	+ $this->post['named']['category'] = apply_filters('syndicated_item_categories', $this->post['named']['category'], $this);
	1011	+
	1012	+ // Tags: start with default tags, if any
	1013	+ $ft = get_option("feedwordpress_syndication_tags");
	1014	+ if ($ft) :
	1015	+ $this->post['tags_input'] = explode('FEEDWORDPRESS_CAT_SEPARATOR', $ft);
	1016	+ else :
	1017	+ $this->post['tags_input'] = array();
	1018	+ endif;
	1019	+
	1020	+ if (is_array($this->feedmeta['tags'])) :
	1021	+ $this->post['tags_input'] = array_merge($this->post['tags_input'], $this->feedmeta['tags']);
	1022	+ endif;
	1023	+
2250	1024	endif;
2251	1025	} // SyndicatedPost::SyndicatedPost()
2252	1026
2253	1027	function filtered () {
		@@ -2268,18 +1042,35 @@
2268	1042	SELECT id, guid, post_modified_gmt
2269	1043	FROM $wpdb->posts WHERE guid='$guid'
2270	1044	");
2271	1045
2272		- preg_match('/([0-9]+)-([0-9]+)-([0-9]+) ([0-9]+):([0-9]+):([0-9]+)/', $result->post_modified_gmt, $backref);
2273		- $updated = gmmktime($backref[4], $backref[5], $backref[6], $backref[2], $backref[3], $backref[1]);
2274	1046	if (!$result) :
2275	1047	$this->_freshness = 2; // New content
2276		- elseif ($this->updated() > $updated) :
2277		- $this->_freshness = 1; // Updated content
2278		- $this->_wp_id = $result->id;
2279		- else :
2280		- $this->_freshness = 0; // Same old, same old
2281		- $this->_wp_id = $result->id;
	1048	+ else:
	1049	+ $stored_update_hashes = get_post_custom_values('syndication_item_hash', $result->id);
	1050	+ if (count($stored_update_hashes) > 0) :
	1051	+ $stored_update_hash = $stored_update_hashes[0];
	1052	+ $update_hash_changed = ($stored_update_hash != $this->update_hash());
	1053	+ else :
	1054	+ $update_hash_changed = false;
	1055	+ endif;
	1056	+
	1057	+ preg_match('/([0-9]+)-([0-9]+)-([0-9]+) ([0-9]+):([0-9]+):([0-9]+)/', $result->post_modified_gmt, $backref);
	1058	+
	1059	+ $last_rev_ts = gmmktime($backref[4], $backref[5], $backref[6], $backref[2], $backref[3], $backref[1]);
	1060	+ $updated_ts = $this->updated(/fallback=/ true, /default=/ NULL);
	1061	+ $updated = ((
	1062	+ !is_null($updated_ts)
	1063	+ and ($updated_ts > $last_rev_ts)
	1064	+ ) or $update_hash_changed);
	1065	+
	1066	+ if ($updated) :
	1067	+ $this->_freshness = 1; // Updated content
	1068	+ $this->_wp_id = $result->id;
	1069	+ else :
	1070	+ $this->_freshness = 0; // Same old, same old
	1071	+ $this->_wp_id = $result->id;
	1072	+ endif;
2282	1073	endif;
2283	1074	endif;
2284	1075	return $this->_freshness;
2285	1076	}
		@@ -2315,13 +1106,17 @@
2315	1106	endif;
2316	1107
2317	1108	if (!$this->filtered() and $freshness > 0) :
2318	1109	# -- Look up, or create, numeric ID for categories
2319		- $this->post['post_category'] = $this->category_ids (
	1110	+ list($pcats, $ptags) = $this->category_ids (
2320	1111	$this->post['named']['category'],
2321		- FeedWordPress::on_unfamiliar('category', $this->post['named']['unfamiliar']['category'])
	1112	+ FeedWordPress::on_unfamiliar('category', $this->post['named']['unfamiliar']['category']),
	1113	+ /tags_too=/ true
2322	1114	);
2323		-
	1115	+
	1116	+ $this->post['post_category'] = $pcats;
	1117	+ $this->post['tags_input'] = array_merge($this->post['tags_input'], $ptags);
	1118	+
2324	1119	if (is_null($this->post['post_category'])) :
2325	1120	// filter mode on, no matching categories; drop the post
2326	1121	$this->post = NULL;
2327	1122	else :
		@@ -2377,15 +1172,37 @@
2377	1172	$dbpost[$key] = $value;
2378	1173	endif;
2379	1174	endforeach;
2380	1175
	1176	+ if (strlen($dbpost['post_title'].$dbpost['post_content'].$dbpost['post_excerpt']) == 0) :
	1177	+ // FIXME: Option for filtering out empty posts
	1178	+ endif;
	1179	+ if (strlen($dbpost['post_title'])==0) :
	1180	+ $dbpost['post_title'] = $this->post['meta']['syndication_source']
	1181	+ .' '.gmdate('Y-m-d H:i:s', $this->published() + $offset);
	1182	+ // FIXME: Option for what to fill a blank title with...
	1183	+ endif;
	1184	+
2381	1185	if ($this->use_api('wp_insert_post')) :
2382	1186	$dbpost['post_pingback'] = false; // Tell WP 2.1 and 2.2 not to process for pingbacks
	1187	+
	1188	+ // This is a ridiculous fucking kludge necessitated by WordPress 2.6 munging authorship meta-data
	1189	+ add_action('_wp_put_post_revision', array($this, 'fix_revision_meta'));
	1190	+
	1191	+ // Kludge to prevent kses filters from stripping the
	1192	+ // content of posts when updating without a logged in
	1193	+ // user who has `unfiltered_html` capability.
	1194	+ add_filter('content_save_pre', array($this, 'avoid_kses_munge'), 11);
	1195	+
2383	1196	$this->_wp_id = wp_insert_post($dbpost);
2384		-
	1197	+
	1198	+ // Turn off ridiculous fucking kludges #1 and #2
	1199	+ remove_action('_wp_put_post_revision', array($this, 'fix_revision_meta'));
	1200	+ remove_filter('content_save_pre', array($this, 'avoid_kses_munge'), 11);
	1201	+
2385	1202	// This should never happen.
2386	1203	if (!is_numeric($this->_wp_id) or ($this->_wp_id == 0)) :
2387		- FeedWordPress::critical_bug('SyndicatedPost (_wp_id problem)', $this, __LINE__);
	1204	+ FeedWordPress::critical_bug('SyndicatedPost (_wp_id problem)', array("dbpost" => $dbpost, "this" => $this), __LINE__);
2388	1205	endif;
2389	1206
2390	1207	// Unfortunately, as of WordPress 2.3, wp_insert_post()
2391	1208	// still offers no way to use a guid of your choice,
		@@ -2428,9 +1245,9 @@
2428	1245	$this->_wp_id = $wpdb->insert_id;
2429	1246
2430	1247	// This should never happen.
2431	1248	if (!is_numeric($this->_wp_id) or ($this->_wp_id == 0)) :
2432		- FeedWordPress::critical_bug('SyndicatedPost::_wp_id', $this->_wp_id, __LINE__);
	1249	+ FeedWordPress::critical_bug('SyndicatedPost (_wp_id problem)', array("dbpost" => $dbpost, "this" => $this), __LINE__);
2433	1250	endif;
2434	1251
2435	1252	// WordPress 1.5.x - 2.0.x
2436	1253	wp_set_post_cats('1', $this->wp_id(), $this->post['post_category']);
		@@ -2459,13 +1276,26 @@
2459	1276	endforeach;
2460	1277
2461	1278	if ($this->use_api('wp_insert_post')) :
2462	1279	$dbpost['post_pingback'] = false; // Tell WP 2.1 and 2.2 not to process for pingbacks
	1280	+
	1281	+ // This is a ridiculous fucking kludge necessitated by WordPress 2.6 munging authorship meta-data
	1282	+ add_action('_wp_put_post_revision', array($this, 'fix_revision_meta'));
	1283	+
	1284	+ // Kludge to prevent kses filters from stripping the
	1285	+ // content of posts when updating without a logged in
	1286	+ // user who has `unfiltered_html` capability.
	1287	+ add_filter('content_save_pre', array($this, 'avoid_kses_munge'), 11);
	1288	+
2463	1289	$this->_wp_id = wp_insert_post($dbpost);
2464	1290
	1291	+ // Turn off ridiculous fucking kludges #1 and #2
	1292	+ remove_action('_wp_put_post_revision', array($this, 'fix_revision_meta'));
	1293	+ remove_filter('content_save_pre', array($this, 'avoid_kses_munge'), 11);
	1294	+
2465	1295	// This should never happen.
2466	1296	if (!is_numeric($this->_wp_id) or ($this->_wp_id == 0)) :
2467		- FeedWordPress::critical_bug('SyndicatedPost::_wp_id', $this->_wp_id, __LINE__);
	1297	+ FeedWordPress::critical_bug('SyndicatedPost (_wp_id problem)', array("dbpost" => $dbpost, "this" => $this), __LINE__);
2468	1298	endif;
2469	1299
2470	1300	// Unfortunately, as of WordPress 2.3, wp_insert_post()
2471	1301	// munges your post modified timestamp.
		@@ -2498,9 +1328,9 @@
2498	1328	elseif (function_exists('wp_set_post_cats')) :
2499	1329	wp_set_post_cats('1', $this->wp_id(), $this->post['post_category']);
2500	1330	// This should never happen.
2501	1331	else :
2502		- FeedWordPress::critical_bug('SyndicatedPost::insert_new::wp_version', $GLOBALS['wp_version'], __LINE__);
	1332	+ FeedWordPress::critical_bug('SyndicatedPost (_wp_id problem)', array("dbpost" => $dbpost, "this" => $this), __LINE__);
2503	1333	endif;
2504	1334
2505	1335	// Since we are not going through official channels, we need to
2506	1336	// manually tell WordPress that we've published a new post.
		@@ -2511,8 +1341,63 @@
2511	1341	do_action('edit_post', $this->post['ID']);
2512	1342	endif;
2513	1343	} /* SyndicatedPost::update_existing() */
2514	1344
	1345	+ /**
	1346	+ * SyndicatedPost::fix_revision_meta() - Fixes the way WP 2.6+ fucks up
	1347	+ * meta-data (authorship, etc.) when storing revisions of an updated
	1348	+ * syndicated post.
	1349	+ *
	1350	+ * In their infinite wisdom, the WordPress coders have made it completely
	1351	+ * impossible for a plugin that uses wp_insert_post() to set certain
	1352	+ * meta-data (such as the author) when you store an old revision of an
	1353	+ * updated post. Instead, it uses the WordPress defaults (= currently
	1354	+ * active user ID if the process is running with a user logged in, or
	1355	+ * = #0 if there is no user logged in). This results in bogus authorship
	1356	+ * data for revisions that are syndicated from off the feed, unless we
	1357	+ * use a ridiculous kludge like this to end-run the munging of meta-data
	1358	+ * by _wp_put_post_revision.
	1359	+ *
	1360	+ * @param int $revision_id The revision ID to fix up meta-data
	1361	+ */
	1362	+ function fix_revision_meta ($revision_id) {
	1363	+ global $wpdb;
	1364	+
	1365	+ $post_author = (int) $this->post['post_author'];
	1366	+
	1367	+ $revision_id = (int) $revision_id;
	1368	+ $wpdb->query("
	1369	+ UPDATE $wpdb->posts
	1370	+ SET post_author={$this->post['post_author']}
	1371	+ WHERE post_type = 'revision' AND ID='$revision_id'
	1372	+ ");
	1373	+ } /* SyndicatedPost::fix_revision_meta () */
	1374	+
	1375	+ /**
	1376	+ * SyndicatedPost::avoid_kses_munge() -- If FeedWordPress is processing
	1377	+ * an automatic update, that generally means that wp_insert_post() is
	1378	+ * being called under the user credentials of whoever is viewing the
	1379	+ * blog at the time -- usually meaning no user at all. But if WordPress
	1380	+ * gets a wp_insert_post() when current_user_can('unfiltered_html') is
	1381	+ * false, it will run the content of the post through a kses function
	1382	+ * that strips out lots of HTML tags -- notably <object> and some others.
	1383	+ * This causes problems for syndicating (for example) feeds that contain
	1384	+ * YouTube videos. It also produces an unexpected asymmetry between
	1385	+ * automatically-initiated updates and updates initiated manually from
	1386	+ * the WordPress Dashboard (which are usually initiated under the
	1387	+ * credentials of a logged-in admin, and so don't get run through the
	1388	+ * kses function). So, to avoid the whole mess, what we do here is
	1389	+ * just forcibly disable the kses munging for a single syndicated post,
	1390	+ * by restoring the contents of the `post_content` field.
	1391	+ *
	1392	+ * @param string $content The content of the post, after other filters have gotten to it
	1393	+ * @return string The original content of the post, before other filters had a chance to munge it.
	1394	+ */
	1395	+ function avoid_kses_munge ($content) {
	1396	+ global $wpdb;
	1397	+ return $wpdb->escape($this->post['post_content']);
	1398	+ }
	1399	+
2515	1400	// SyndicatedPost::add_rss_meta: adds interesting meta-data to each entry
2516	1401	// using the space for custom keys. The set of keys and values to add is
2517	1402	// specified by the keys and values of $post['meta']. This is used to
2518	1403	// store anything that the WordPress user might want to access from a
		@@ -2689,9 +1574,9 @@
2689	1574	return $id;
2690	1575	} // function SyndicatedPost::author_id ()
2691	1576
2692	1577	// look up (and create) category ids from a list of categories
2693		- function category_ids ($cats, $unfamiliar_category = 'create') {
	1578	+ function category_ids ($cats, $unfamiliar_category = 'create', $tags_too = false) {
2694	1579	global $wpdb;
2695	1580
2696	1581	// We need to normalize whitespace because (1) trailing
2697	1582	// whitespace can cause PHP and MySQL not to see eye to eye on
		@@ -2700,8 +1585,10 @@
2700	1585	// because I doubt most people want to make a semantic
2701	1586	// distinction between 'Computers' and 'Computers '
2702	1587	$cats = array_map('trim', $cats);
2703	1588
	1589	+ $tags = array();
	1590	+
2704	1591	$cat_ids = array ();
2705	1592	foreach ($cats as $cat_name) :
2706	1593	if (preg_match('/^{#([0-9]+)}$/', $cat_name, $backref)) :
2707	1594	$cat_id = (int) $backref[1];
		@@ -2729,8 +1616,10 @@
2729	1616	)) :
2730	1617	foreach ($results AS $term) :
2731	1618	$cat_ids[] = (int) $term->term_id;
2732	1619	endforeach;
	1620	+ elseif ('tag'==$unfamiliar_category) :
	1621	+ $tags[] = $cat_name;
2733	1622	elseif ('create'===$unfamiliar_category) :
2734	1623	$term = wp_insert_term($cat_name, 'category');
2735	1624	$cat_ids[] = $term['term_id'];
2736	1625	endif;
		@@ -2774,18 +1663,28 @@
2774	1663	$cat_ids = NULL; // Drop the post
2775	1664	else :
2776	1665	$cat_ids = array_unique($cat_ids);
2777	1666	endif;
2778		- return $cat_ids;
	1667	+
	1668	+ if ($tags_too) : $ret = array($cat_ids, $tags);
	1669	+ else : $ret = $cat_ids;
	1670	+ endif;
	1671	+
	1672	+ return $ret;
2779	1673	} // function SyndicatedPost::category_ids ()
2780	1674
2781	1675	function use_api ($tag) {
2782	1676	global $wp_db_version;
2783		- if ('wp_insert_post'==$tag) :
	1677	+ switch ($tag) :
	1678	+ case 'wp_insert_post':
2784	1679	// Before 2.2, wp_insert_post does too much of the wrong stuff to use it
2785	1680	// In 1.5 it was such a resource hog it would make PHP segfault on big updates
2786	1681	$ret = (isset($wp_db_version) and $wp_db_version > FWP_SCHEMA_21);
2787		- endif;
	1682	+ break;
	1683	+ case 'post_status_pending':
	1684	+ $ret = (isset($wp_db_version) and $wp_db_version > FWP_SCHEMA_23);
	1685	+ break;
	1686	+ endswitch;
2788	1687	return $ret;
2789	1688	} // function SyndicatedPost::use_api ()
2790	1689
2791	1690	#### EXTRACT DATA FROM FEED ITEM ####
		@@ -2823,14 +1722,18 @@
2823	1722	endif;
2824	1723
2825	1724	# If everything failed, then default to the current time.
2826	1725	if (is_null($epoch)) :
2827		- $epoch = time();
	1726	+ if (-1 == $default) :
	1727	+ $epoch = time();
	1728	+ else :
	1729	+ $epoch = $default;
	1730	+ endif;
2828	1731	endif;
2829	1732
2830	1733	return $epoch;
2831	1734	}
2832		- function updated ($fallback = true) {
	1735	+ function updated ($fallback = true, $default = -1) {
2833	1736	$epoch = null;
2834	1737
2835	1738	# As far as I know, only dcterms and Atom have reliable ways to
2836	1739	# specify when something was modified last. If neither is
		@@ -2843,19 +1746,27 @@
2843	1746	$epoch = @parse_w3cdtf($this->item['modified']);
2844	1747	elseif (isset($this->item['updated'])): // Atom 1.0
2845	1748	$epoch = @parse_w3cdtf($this->item['updated']);
2846	1749	elseif ($fallback) : // Fall back to issued / dc:date
2847		- $epoch = $this->published(/fallback=/ false);
	1750	+ $epoch = $this->published(/fallback=/ false, /default=/ $default);
2848	1751	endif;
2849	1752
2850	1753	# If everything failed, then default to the current time.
2851	1754	if (is_null($epoch)) :
2852		- $epoch = time();
	1755	+ if (-1 == $default) :
	1756	+ $epoch = time();
	1757	+ else :
	1758	+ $epoch = $default;
	1759	+ endif;
2853	1760	endif;
2854	1761
2855	1762	return $epoch;
2856	1763	}
2857	1764
	1765	+ function update_hash () {
	1766	+ return md5(serialize($this->item));
	1767	+ }
	1768	+
2858	1769	function guid () {
2859	1770	$guid = null;
2860	1771	if (isset($this->item['id'])): // Atom 0.3 / 1.0
2861	1772	$guid = $this->item['id'];
		@@ -2942,8 +1853,31 @@
2942	1853	endif;
2943	1854
2944	1855	return $author;
2945	1856	} // SyndicatedPost::author()
	1857	+
	1858	+ var $strip_attrs = array (
	1859	+ array('[a-z]+', 'style'),
	1860	+ array('[a-z]+', 'target'),
	1861	+ );
	1862	+ function sanitize_content ($content, $obj) {
	1863	+ # FeedWordPress used to resolve URIs relative to the
	1864	+ # feed URI. It now relies on the xml:base support
	1865	+ # baked in to the MagpieRSS upgrade. So all we do here
	1866	+ # now is to sanitize problematic attributes.
	1867	+ #
	1868	+ # This kind of sucks. I intend to replace it with
	1869	+ # lib_filter sometime soon.
	1870	+ foreach ($obj->strip_attrs as $pair):
	1871	+ list($tag,$attr) = $pair;
	1872	+ $content = preg_replace (
	1873	+ ":(<$tag [^>])($attr=(\"[^\">]\"\|[^>\\s]+))([^>]*>):i",
	1874	+ "\\1\\4",
	1875	+ $content
	1876	+ );
	1877	+ endforeach;
	1878	+ return $content;
	1879	+ }
2946	1880	} // class SyndicatedPost
2947	1881
2948	1882	# class SyndicatedLink: represents a syndication feed stored within the
2949	1883	# WordPress database
		@@ -3021,18 +1955,26 @@
3021	1955	$this->settings['link/uri'] = $this->link->link_rss;
3022	1956	$this->settings['link/name'] = $this->link->link_name;
3023	1957	$this->settings['link/id'] = $this->link->link_id;
3024	1958
3025		- // `hardcode categories` is deprecated in favor of `unfamiliar categories`
	1959	+ // `hardcode categories` and `unfamiliar categories` are deprecated in favor of `unfamiliar category`
3026	1960	if (
	1961	+ isset($this->settings['unfamiliar categories'])
	1962	+ and !isset($this->settings['unfamiliar category'])
	1963	+ ) :
	1964	+ $this->settings['unfamiliar category'] = $this->settings['unfamiliar categories'];
	1965	+ endif;
	1966	+ if (
3027	1967	FeedWordPress::affirmative($this->settings, 'hardcode categories')
3028		- and !isset($this->settings['unfamiliar categories'])
	1968	+ and !isset($this->settings['unfamiliar category'])
3029	1969	) :
3030		- $this->settings['unfamiliar categories'] = 'default';
	1970	+ $this->settings['unfamiliar category'] = 'default';
3031	1971	endif;
3032		-
	1972	+
3033	1973	// Set this up automagically for del.icio.us
3034		- if (!isset($this->settings['cat_split']) and false !== strpos($this->link->link_rss, 'del.icio.us')) :
	1974	+ $bits = parse_url($this->link->link_rss);
	1975	+ $tagspacers = array('del.icio.us', 'feeds.delicious.com');
	1976	+ if (!isset($this->settings['cat_split']) and in_array($bits['host'], $tagspacers)) :
3035	1977	$this->settings['cat_split'] = '\s'; // Whitespace separates multiple tags in del.icio.us RSS feeds
3036	1978	endif;
3037	1979
3038	1980	if (isset($this->settings['cats'])):
		@@ -3037,8 +1979,11 @@
3037	1979
3038	1980	if (isset($this->settings['cats'])):
3039	1981	$this->settings['cats'] = preg_split(FEEDWORDPRESS_CAT_SEPARATOR_PATTERN, $this->settings['cats']);
3040	1982	endif;
	1983	+ if (isset($this->settings['tags'])):
	1984	+ $this->settings['tags'] = preg_split(FEEDWORDPRESS_CAT_SEPARATOR_PATTERN, $this->settings['tags']);
	1985	+ endif;
3041	1986
3042	1987	if (isset($this->settings['map authors'])) :
3043	1988	$author_rules = explode("\n\n", $this->settings['map authors']);
3044	1989	$ma = array();
		@@ -3130,8 +2075,11 @@
3130	2075
3131	2076	if (is_array($to_notes['cats'])) :
3132	2077	$to_notes['cats'] = implode(FEEDWORDPRESS_CAT_SEPARATOR, $to_notes['cats']);
3133	2078	endif;
	2079	+ if (is_array($to_notes['tags'])) :
	2080	+ $to_notes['tags'] = implode(FEEDWORDPRESS_CAT_SEPARATOR, $to_notes['tags']);
	2081	+ endif;
3134	2082
3135	2083	if (isset($to_notes['map authors'])) :
3136	2084	$ma = array();
3137	2085	foreach ($to_notes['map authors'] as $rule_type => $author_rules) :
		@@ -3144,8 +2092,9 @@
3144	2092
3145	2093	unset($to_notes['link/id']); unset($to_notes['link/uri']);
3146	2094	unset($to_notes['link/name']);
3147	2095	unset($to_notes['hardcode categories']); // Deprecated
	2096	+ unset($to_notes['unfamiliar categories']); // Deprecated
3148	2097
3149	2098	$notes = '';
3150	2099	foreach ($to_notes as $key => $value) :
3151	2100	$notes .= $key . ": ". addcslashes($value, "\0..\37".'\\') . "\n";
		@@ -3177,8 +2126,11 @@
3177	2126
3178	2127	if (is_array($to_notes['cats'])) :
3179	2128	$to_notes['cats'] = implode(FEEDWORDPRESS_CAT_SEPARATOR, $to_notes['cats']);
3180	2129	endif;
	2130	+ if (is_array($to_notes['tags'])) :
	2131	+ $to_notes['tags'] = implode(FEEDWORDPRESS_CAT_SEPARATOR, $to_notes['tags']);
	2132	+ endif;
3181	2133
3182	2134	if (isset($to_notes['map authors'])) :
3183	2135	$ma = array();
3184	2136	foreach ($to_notes['map authors'] as $rule_type => $author_rules) :
		@@ -3191,8 +2143,9 @@
3191	2143
3192	2144	unset($to_notes['link/id']); unset($to_notes['link/uri']);
3193	2145	unset($to_notes['link/name']);
3194	2146	unset($to_notes['hardcode categories']); // Deprecated
	2147	+ unset($to_notes['unfamiliar categories']); // Deprecated
3195	2148
3196	2149	$notes = '';
3197	2150	foreach ($to_notes as $key => $value) :
3198	2151	$notes .= $key . ": ". addcslashes($value, "\0..\37".'\\') . "\n";
		@@ -3701,5 +2654,5 @@
3701	2654	$ret['name'] = NULL; $ret['email'] = NULL;
3702	2655	endif;
3703	2656	return $ret;
3704	2657	}
3705		-?>
	2658	+