← All changes | feedwordpress.php +2130 -2068 trunk → 2009.0613 View file →

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