← All changes | feedwordpress.php +2059 -2130 2009.0618 → 2024.0511 View file →

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