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