← All changes | feedwordpress.php +1131 -1505 trunk → 2012.1212 View file →

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