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