PluginProbe
FeedWordPress / 2010.0602
FeedWordPress v2010.0602
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 +691 -330 2009.0707 → 2010.0602 View file →
@@ -1,15 +1,20 @@
1 1 <?php
2 2 /*
3 3 Plugin Name: FeedWordPress
4 -Plugin URI: http://projects.radgeek.com/feedwordpress
4 +Plugin URI: http://feedwordpress.radgeek.com/
5 5 Description: simple and flexible Atom/RSS syndication for WordPress
6 -Version: 2009.0707
6 +Version: 2010.0602
7 7 Author: Charles Johnson
8 8 Author URI: http://radgeek.com/
9 9 License: GPL
10 10 */
11 11
12 +/**
13 + * @package FeedWordPress
14 + * @version 2010.0602
15 + */
16 +
12 17 # This uses code derived from:
13 18 # - wp-rss-aggregate.php by Kellan Elliot-McCrea <kellan@protest.net>
14 19 # - HTTP Navigator 2 by Keyvan Minoukadeh <keyvan@k1m.com>
15 20 # - Ultra-Liberal Feed Finder by Mark Pilgrim <mark@diveintomark.org>
@@ -27,15 +32,22 @@
27 32 # or use a cron job.
28 33
29 34 # -- Don't change these unless you know what you're doing...
30 35
31 -define ('FEEDWORDPRESS_VERSION', '2009.0707');
36 +define ('FEEDWORDPRESS_VERSION', '2010.0602');
32 37 define ('FEEDWORDPRESS_AUTHOR_CONTACT', 'http://radgeek.com/contact');
38 +
39 +// Defaults
33 40 define ('DEFAULT_SYNDICATION_CATEGORY', 'Contributors');
41 +define ('DEFAULT_UPDATE_PERIOD', 60); // value in minutes
34 42
35 -$feedwordpress_debug = get_option('feedwordpress_debug');
36 -if (is_string($feedwordpress_debug)) :
37 - $feedwordpress_debug = ($feedwordpress_debug == 'yes');
43 +if (isset($_REQUEST['feedwordpress_debug'])) :
44 + $feedwordpress_debug = $_REQUEST['feedwordpress_debug'];
45 +else :
46 + $feedwordpress_debug = get_option('feedwordpress_debug');
47 + if (is_string($feedwordpress_debug)) :
48 + $feedwordpress_debug = ($feedwordpress_debug == 'yes');
49 + endif;
38 50 endif;
39 51 define ('FEEDWORDPRESS_DEBUG', $feedwordpress_debug);
40 52
41 53 define ('FEEDWORDPRESS_CAT_SEPARATOR_PATTERN', '/[:\n]/');
@@ -45,8 +57,9 @@
45 57
46 58 define ('FEEDWORDPRESS_FRESHNESS_INTERVAL', 10*60); // Every ten minutes
47 59
48 60 define ('FWP_SCHEMA_HAS_USERMETA', 2966);
61 +define ('FWP_SCHEMA_USES_ARGS_TAXONOMY', 12694); // Revision # for using $args['taxonomy'] to get link categories
49 62 define ('FWP_SCHEMA_20', 3308); // Database schema # for WP 2.0
50 63 define ('FWP_SCHEMA_21', 4772); // Database schema # for WP 2.1
51 64 define ('FWP_SCHEMA_23', 5495); // Database schema # for WP 2.3
52 65 define ('FWP_SCHEMA_25', 7558); // Database schema # for WP 2.5
@@ -52,14 +65,15 @@
52 65 define ('FWP_SCHEMA_25', 7558); // Database schema # for WP 2.5
53 66 define ('FWP_SCHEMA_26', 8201); // Database schema # for WP 2.6
54 67 define ('FWP_SCHEMA_27', 9872); // Database schema # for WP 2.7
55 68 define ('FWP_SCHEMA_28', 11548); // Database schema # for WP 2.8
69 +define ('FWP_SCHEMA_29', 12329); // Database schema # for WP 2.9
70 +define ('FWP_SCHEMA_30', 12694); // Database schema # for WP 3.0
56 71
57 72 if (FEEDWORDPRESS_DEBUG) :
58 73 // Help us to pick out errors, if any.
59 74 ini_set('error_reporting', E_ALL & ~E_NOTICE);
60 75 ini_set('display_errors', true);
61 - define('MAGPIE_DEBUG', true);
62 76
63 77 // When testing we don't want cache issues to interfere. But this is
64 78 // a VERY BAD SETTING for a production server. Webmasters will eat your
65 79 // face for breakfast if you use it, and the baby Jesus will cry. So
@@ -64,22 +78,25 @@
64 78 // a VERY BAD SETTING for a production server. Webmasters will eat your
65 79 // face for breakfast if you use it, and the baby Jesus will cry. So
66 80 // make sure FEEDWORDPRESS_DEBUG is FALSE for any site that will be
67 81 // used for more than testing purposes!
68 - define('MAGPIE_CACHE_AGE', 1);
82 + define('FEEDWORDPRESS_CACHE_AGE', 1);
83 + define('FEEDWORDPRESS_CACHE_LIFETIME', 1);
84 + define('FEEDWORDPRESS_FETCH_TIME_OUT', 60);
69 85 else :
70 - define('MAGPIE_DEBUG', false);
86 + // Hold onto data all day for conditional GET purposes,
87 + // but consider it stale after 1 min (requiring a conditional GET)
88 + define('FEEDWORDPRESS_CACHE_LIFETIME', 24*60*60);
89 + define('FEEDWORDPRESS_CACHE_AGE', 1*60);
90 + define('FEEDWORDPRESS_FETCH_TIME_OUT', 10);
71 91 endif;
72 92
73 -// Note that the rss-functions.php that comes prepackaged with WordPress is
74 -// old & busted. For the new hotness, drop a copy of rss.php from
75 -// this archive into wp-includes/rss.php
93 +// Use our the cache settings that we want.
94 +add_filter('wp_feed_cache_transient_lifetime', array('FeedWordPress', 'cache_lifetime'));
76 95
77 -if (is_readable(ABSPATH . WPINC . '/rss.php')) :
78 - require_once (ABSPATH . WPINC . '/rss.php');
79 -else :
80 - require_once (ABSPATH . WPINC . '/rss-functions.php');
81 -endif;
96 +// Ensure that we have SimplePie loaded up and ready to go.
97 +// We no longer need a MagpieRSS upgrade module. Hallelujah!
98 +require_once(ABSPATH . WPINC . '/feed.php');
82 99
83 100 if (isset($wp_db_version)) :
84 101 if ($wp_db_version >= FWP_SCHEMA_23) :
85 102 require_once (ABSPATH . WPINC . '/registration.php'); // for wp_insert_user
@@ -91,10 +108,12 @@
91 108 require_once (ABSPATH . 'wp-admin/admin-db.php'); // for wp_insert_category
92 109 endif;
93 110 endif;
94 111
112 +require_once (ABSPATH . WPINC . '/class-feed.php');
95 113 require_once(dirname(__FILE__) . '/compatability.php'); // LEGACY API: Replicate or mock up functions for legacy support purposes
96 114 require_once(dirname(__FILE__) . '/feedwordpresshtml.class.php');
115 +require_once(dirname(__FILE__) . '/feedwordpress-content-type-sniffer.class.php');
97 116
98 117 // Magic quotes are just about the stupidest thing ever.
99 118 if (is_array($_POST)) :
100 119 $fwp_post = stripslashes_deep($_POST);
@@ -112,25 +131,31 @@
112 131 else : // Something went wrong. Let's just guess.
113 132 $fwp_path = 'feedwordpress';
114 133 endif;
115 134
135 +function feedwordpress_admin_scripts () {
136 + global $fwp_path;
137 +
138 + wp_enqueue_script('post'); // for magic tag and category boxes
139 + if (!FeedWordPressCompatibility::test_version(FWP_SCHEMA_29)) : // < 2.9
140 + wp_enqueue_script('thickbox'); // for fold-up boxes
141 + endif;
142 + wp_enqueue_script('admin-forms'); // for checkbox selection
143 +
144 + wp_register_script('feedwordpress-elements', WP_PLUGIN_URL.'/'.$fwp_path.'/feedwordpress-elements.js');
145 + wp_enqueue_script('feedwordpress-elements');
146 +}
147 +
116 148 // If this is a FeedWordPress admin page, queue up scripts for AJAX functions that FWP uses
117 149 // If it is a display page or a non-FeedWordPress admin page, don't.
118 150 if (is_admin() and isset($_REQUEST['page']) and preg_match("|^{$fwp_path}/|", $_REQUEST['page'])) :
119 - if (function_exists('wp_enqueue_script')) :
120 - if (isset($wp_db_version) and $wp_db_version >= FWP_SCHEMA_25) :
121 - wp_enqueue_script('post'); // for magic tag and category boxes
122 - wp_enqueue_script('thickbox'); // for fold-up boxes
123 - wp_enqueue_script('admin-forms'); // for checkbox selection
124 - else :
125 - wp_enqueue_script( 'ajaxcat' ); // Provides the handy-dandy new category text box
126 - endif;
127 - endif;
128 - if (function_exists('wp_enqueue_style')) :
129 - if (fwp_test_wp_version(FWP_SCHEMA_25)) :
130 - wp_enqueue_style('dashboard');
131 - endif;
132 - endif;
151 + add_action('admin_print_scripts', 'feedwordpress_admin_scripts');
152 +
153 + wp_register_style('feedwordpress-elements', WP_PLUGIN_URL.'/'.$fwp_path.'/feedwordpress-elements.css');
154 +
155 + wp_enqueue_style('dashboard');
156 + wp_enqueue_style('feedwordpress-elements');
157 +
133 158 if (function_exists('wp_admin_css')) :
134 159 if (fwp_test_wp_version(FWP_SCHEMA_25)) :
135 160 wp_admin_css('css/dashboard');
136 161 endif;
@@ -159,8 +184,15 @@
159 184
160 185 # Filter in original permalinks if the user wants that
161 186 add_filter('post_link', 'syndication_permalink', 1);
162 187
188 + # When foreign URLs are used for permalinks in feeds or display
189 + # contexts, they need to be escaped properly.
190 + add_filter('the_permalink', 'syndication_permalink_escaped');
191 + add_filter('the_permalink_rss', 'syndication_permalink_escaped');
192 +
193 + add_filter('post_comments_feed_link', 'syndication_comments_feed_link');
194 +
163 195 # WTF? By default, wp_insert_link runs incoming link_url and link_rss
164 196 # URIs through default filters that include `wp_kses()`. But `wp_kses()`
165 197 # just happens to escape any occurrence of & to &amp; -- which just
166 198 # happens to fuck up any URI with a & to separate GET parameters.
@@ -169,10 +201,14 @@
169 201
170 202 # Admin menu
171 203 add_action('admin_menu', 'fwp_add_pages');
172 204 add_action('admin_notices', 'fwp_check_debug');
173 - add_action('admin_notices', 'fwp_check_magpie');
174 205
206 + add_action('admin_menu', 'feedwordpress_add_post_edit_controls');
207 + add_action('save_post', 'feedwordpress_save_post_edit_controls');
208 +
209 + add_action('admin_footer', array('FeedWordPress', 'admin_footer'));
210 +
175 211 # Inbound XML-RPC update methods
176 212 add_filter('xmlrpc_methods', 'feedwordpress_xmlrpc_hook');
177 213
178 214 # Outbound XML-RPC ping reform
@@ -193,13 +229,30 @@
193 229 add_action('feedwordpress_update', 'log_feedwordpress_update_feeds', 100);
194 230 add_action('feedwordpress_check_feed', 'log_feedwordpress_check_feed', 100);
195 231 add_action('feedwordpress_update_complete', 'log_feedwordpress_update_complete', 100);
196 232 endif;
197 -
233 +
234 + if (FeedWordPress::update_requested()) :
235 + if (FEEDWORDPRESS_DEBUG) :
236 + add_action('post_syndicated_item', 'debug_out_feedwordpress_post', 100);
237 + add_action('update_syndicated_item', 'debug_out_feedwordpress_update_post', 100);
238 + add_action('feedwordpress_update', 'debug_out_feedwordpress_update_feeds', 100);
239 + add_action('feedwordpress_check_feed', 'debug_out_feedwordpress_check_feed', 100);
240 + add_action('feedwordpress_update_complete', 'debug_out_feedwordpress_update_complete', 100);
241 + endif;
242 +
243 + add_action('feedwordpress_check_feed_complete', 'debug_out_feedwordpress_feed_error', 100, 3);
244 + endif;
245 +
198 246 # Cron-less auto-update. Hooray!
199 - add_action('init', 'feedwordpress_auto_update');
200 - add_action('init', 'feedwordpress_check_for_magpie_fix');
201 -
247 + $autoUpdateHook = get_option('feedwordpress_automatic_updates');
248 + if ($autoUpdateHook != 'init') :
249 + $autoUpdateHook = 'shutdown';
250 + endif;
251 + add_action($autoUpdateHook, 'feedwordpress_auto_update');
252 +
253 + add_action('init', 'feedwordpress_update_magic_url');
254 +
202 255 # Default sanitizers
203 256 add_filter('syndicated_item_content', array('SyndicatedPost', 'resolve_relative_uris'), 0, 2);
204 257 add_filter('syndicated_item_content', array('SyndicatedPost', 'sanitize_content'), 0, 2);
205 258
@@ -207,43 +260,48 @@
207 260 # Hook in the menus, which will just point to the upgrade interface
208 261 add_action('admin_menu', 'fwp_add_pages');
209 262 endif; // if (!FeedWordPress::needs_upgrade())
210 263
211 -function feedwordpress_check_for_magpie_fix () {
212 - if (isset($_POST['action']) and $_POST['action']=='fix_magpie_version') :
213 - FeedWordPressCompatibility::validate_http_request(/*action=*/ 'feedwordpress_fix_magpie', /*capability=*/ 'edit_files');
264 +function feedwordpress_auto_update () {
265 + if (FeedWordPress::stale()) :
266 + $feedwordpress = new FeedWordPress;
267 + $feedwordpress->update();
268 + endif;
269 +} /* feedwordpress_auto_update () */
214 270
215 - $back_to = $_SERVER['REQUEST_URI'];
216 - if (isset($_POST['ignore'])) :
217 - // kill error message by telling it we ignored the upgrade request for this version
218 - update_option('feedwordpress_magpie_ignored_upgrade_to', EXPECTED_MAGPIE_VERSION);
219 - $ret = 'ignored';
220 - elseif (isset($_POST['upgrade'])) :
221 - $source = dirname(__FILE__)."/MagpieRSS-upgrade/rss.php";
222 - $destination = ABSPATH . WPINC . '/rss.php';
223 - $success = @copy($source, $destination);
224 - $ret = (int) $success;
225 - endif;
271 +function feedwordpress_update_magic_url () {
272 + global $wpdb;
226 273
227 - if (strpos($back_to, '?')===false) : $sep = '?';
228 - else : $sep = '&';
274 + // Explicit update request in the HTTP request (e.g. from a cron job)
275 + if (FeedWordPress::update_requested()) :
276 + $feedwordpress = new FeedWordPress;
277 + $feedwordpress->update(FeedWordPress::update_requested_url());
278 +
279 + if (FEEDWORDPRESS_DEBUG and count($wpdb->queries) > 0) :
280 + $mysqlTime = 0.0;
281 + $byTime = array();
282 + foreach ($wpdb->queries as $query) :
283 + $time = $query[1] * 1000000.0;
284 + $mysqlTime += $query[1];
285 + if (!isset($byTime[$time])) : $byTime[$time] = array(); endif;
286 + $byTime[$time][] = $query[0]. ' // STACK: ' . $query[2];
287 + endforeach;
288 + krsort($byTime);
289 +
290 + foreach ($byTime as $time => $querySet) :
291 + foreach ($querySet as $query) :
292 + print "[".(sprintf('%4.4f', $time/1000.0)) . "ms] $query\n";
293 + endforeach;
294 + endforeach;
295 + echo "[feedwordpress] $wpdb->num_queries queries. $mysqlTime seconds in MySQL. Total of "; timer_stop(1); print " seconds.";
229 296 endif;
230 297
231 - header("Location: {$back_to}{$sep}feedwordpress_magpie_fix=".$ret);
232 - exit;
233 - endif;
234 -} /* feedwordpress_check_for_magpie_fix() */
235 298
236 -function feedwordpress_auto_update () {
237 - if (FeedWordPress::stale()) :
238 - $feedwordpress =& new FeedWordPress;
239 - $feedwordpress->update();
240 - endif;
241 -
242 - if (FeedWordPress::update_requested()) :
299 + // Magic URL should return nothing but a 200 OK header packet
300 + // when successful.
243 301 exit;
244 302 endif;
245 -} /* feedwordpress_auto_update () */
303 +} /* feedwordpress_magic_update_url () */
246 304
247 305 ################################################################################
248 306 ## LOGGING FUNCTIONS: log status updates to error_log if you want it ###########
249 307 ################################################################################
@@ -280,23 +338,76 @@
280 338 .(is_null($delta) ? "Error: I don't syndicate that URI"
281 339 : implode(' and ', $mesg)));
282 340 }
283 341
342 +function debug_out_feedwordpress_post ($id) {
343 + $post = wp_get_single_post($id);
344 + print ("[".date('Y-m-d H:i:s')."][feedwordpress] posted "
345 + ."'{$post->post_title}' ({$post->post_date})\n");
346 +}
347 +
348 +function debug_out_feedwordpress_update_post ($id) {
349 + $post = wp_get_single_post($id);
350 + print ("[".date('Y-m-d H:i:s')."][feedwordpress] updated "
351 + ."'{$post->post_title}' ({$post->post_date})"
352 + ." (as of {$post->post_modified})\n");
353 +}
354 +
355 +function debug_out_feedwordpress_update_feeds ($uri) {
356 + print ("[".date('Y-m-d H:i:s')."][feedwordpress] update('$uri')\n");
357 +}
358 +
359 +function debug_out_feedwordpress_check_feed ($feed) {
360 + $uri = $feed['link/uri']; $name = $feed['link/name'];
361 + print ("[".date('Y-m-d H:i:s')."][feedwordpress] Examining $name <$uri>\n");
362 +}
363 +
364 +function debug_out_feedwordpress_update_complete ($delta) {
365 + $mesg = array();
366 + if (isset($delta['new'])) $mesg[] = 'added '.$delta['new'].' new posts';
367 + if (isset($delta['updated'])) $mesg[] = 'updated '.$delta['updated'].' existing posts';
368 + if (empty($mesg)) $mesg[] = 'nothing changed';
369 +
370 + print ("[".date('Y-m-d H:i:s')."][feedwordpress] "
371 + .(is_null($delta) ? "Error: I don't syndicate that URI"
372 + : implode(' and ', $mesg))."\n");
373 +}
374 +
375 +function debug_out_feedwordpress_feed_error ($feed, $added, $dt) {
376 + if (is_wp_error($added)) :
377 + $mesgs = $added->get_error_messages();
378 + foreach ($mesgs as $mesg) :
379 + echo "[feedwordpress] Error updating [{$feed['link/uri']}]: $mesg\n";
380 + endforeach;
381 + endif;
382 +}
383 +
284 384 ################################################################################
285 385 ## TEMPLATE API: functions to make your templates syndication-aware ############
286 386 ################################################################################
287 387
288 -function is_syndicated () { return (strlen(get_syndication_feed_id()) > 0); }
388 +/**
389 + * is_syndicated: Tests whether the current post in a Loop context, or a post
390 + * given by ID number, was syndicated by FeedWordPress. Useful for templates
391 + * to determine whether or not to retrieve syndication-related meta-data in
392 + * displaying a post.
393 + *
394 + * @param int $id The post to check for syndicated status. Defaults to the current post in a Loop context.
395 + * @return bool TRUE if the post's meta-data indicates it was syndicated; FALSE otherwise
396 + */
397 +function is_syndicated ($id = NULL) {
398 + return (strlen(get_syndication_feed_id($id)) > 0);
399 +} /* function is_syndicated() */
289 400
290 -function get_syndication_source_link ($original = NULL) {
401 +function get_syndication_source_link ($original = NULL, $id = NULL) {
291 402 if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data();
292 403 endif;
293 404
294 - if ($original) : $vals = get_post_custom_values('syndication_source_uri_original');
405 + if ($original) : $vals = get_post_custom_values('syndication_source_uri_original', $id);
295 406 else : $vals = array();
296 407 endif;
297 408
298 - if (count($vals) == 0) : $vals = get_post_custom_values('syndication_source_uri');
409 + if (count($vals) == 0) : $vals = get_post_custom_values('syndication_source_uri', $id);
299 410 endif;
300 411
301 412 if (count($vals) > 0) : $ret = $vals[0]; else : $ret = NULL; endif;
302 413
@@ -302,37 +413,72 @@
302 413
303 414 return $ret;
304 415 } /* function get_syndication_source_link() */
305 416
306 -function the_syndication_source_link ($original = NULL) { echo get_syndication_source_link($original); }
417 +function the_syndication_source_link ($original = NULL, $id = NULL) {
418 + echo get_syndication_source_link($original, $id);
419 +}
307 420
308 -function get_syndication_source ($original = NULL) {
309 - if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data();
421 +function feedwordpress_display_url ($url, $before = 60, $after = 0) {
422 + $bits = parse_url($url);
423 +
424 + // Strip out crufty subdomains
425 + $bits['host'] = preg_replace('/^www[0-9]*\./i', '', $bits['host']);
426 +
427 + // Reassemble bit-by-bit with minimum of crufty elements
428 + $url = (isset($bits['user'])?$bits['user'].'@':'')
429 + .(isset($bits['host'])?$bits['host']:'')
430 + .(isset($bits['path'])?$bits['path']:'')
431 + .(isset($uri_bits['port'])?':'.$uri_bits['port']:'')
432 + .(isset($bits['query'])?'?'.$bits['query']:'');
433 +
434 + if (strlen($url) > ($before+$after)) :
435 + $url = substr($url, 0, $before).'…'.substr($url, 0 - $after, $after);
310 436 endif;
311 437
312 - if ($original) : $vals = get_post_custom_values('syndication_source_original');
313 - else : $vals = array();
438 + return $url;
439 +}
440 +
441 +function get_syndication_source ($original = NULL, $id = NULL) {
442 + if (is_null($original)) :
443 + $original = FeedWordPress::use_aggregator_source_data();
314 444 endif;
445 +
446 + if ($original) :
447 + $vals = get_post_custom_values('syndication_source_original', $id);
448 + else :
449 + $vals = array();
450 + endif;
315 451
316 - if (count($vals) == 0) : $vals = get_post_custom_values('syndication_source');
452 + if (count($vals) == 0) :
453 + $vals = get_post_custom_values('syndication_source', $id);
317 454 endif;
318 455
319 - if (count($vals) > 0) : $ret = $vals[0]; else : $ret = NULL; endif;
456 + if (count($vals) > 0) :
457 + $ret = $vals[0];
458 + else :
459 + $ret = NULL;
460 + endif;
320 461
462 + if (is_null($ret) or strlen(trim($ret)) == 0) :
463 + // Fall back to URL of blog
464 + $ret = feedwordpress_display_url(get_syndication_source_link());
465 + endif;
466 +
321 467 return $ret;
322 468 } /* function get_syndication_source() */
323 469
324 -function the_syndication_source ($original = NULL) { echo get_syndication_source($original); }
470 +function the_syndication_source ($original = NULL, $id = NULL) { echo get_syndication_source($original, $id); }
325 471
326 -function get_syndication_feed ($original = NULL) {
472 +function get_syndication_feed ($original = NULL, $id = NULL) {
327 473 if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data();
328 474 endif;
329 475
330 - if ($original) : $vals = get_post_custom_values('syndication_feed_original');
476 + if ($original) : $vals = get_post_custom_values('syndication_feed_original', $id);
331 477 else : $vals = array();
332 478 endif;
333 -
334 - if (count($vals) == 0) : $vals = get_post_custom_values('syndication_feed');
479 +
480 + if (count($vals) == 0) : $vals = get_post_custom_values('syndication_feed', $id);
335 481 endif;
336 482
337 483 if (count($vals) > 0) : $ret = $vals[0]; else : $ret = NULL; endif;
338 484
@@ -338,19 +484,19 @@
338 484
339 485 return $ret;
340 486 } /* function get_syndication_feed() */
341 487
342 -function the_syndication_feed ($original = NULL) { echo get_syndication_feed ($original); }
488 +function the_syndication_feed ($original = NULL, $id = NULL) { echo get_syndication_feed($original, $id); }
343 489
344 -function get_syndication_feed_guid ($original = NULL) {
490 +function get_syndication_feed_guid ($original = NULL, $id = NULL) {
345 491 if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data();
346 492 endif;
347 493
348 - if ($original) : $vals = get_post_custom_values('syndication_source_id_original');
494 + if ($original) : $vals = get_post_custom_values('syndication_source_id_original', $id);
349 495 else : $vals = array();
350 496 endif;
351 497
352 - if (count($vals) == 0) : $vals = array(get_feed_meta('feed/id'));
498 + if (count($vals) == 0) : $vals = array(get_feed_meta('feed/id', $id));
353 499 endif;
354 500
355 501 if (count($vals) > 0) : $ret = $vals[0]; else : $ret = NULL; endif;
356 502
@@ -356,45 +502,95 @@
356 502
357 503 return $ret;
358 504 } /* function get_syndication_feed_guid () */
359 505
360 -function the_syndication_feed_guid ($original = NULL) { echo get_syndication_feed_guid($original); }
506 +function the_syndication_feed_guid ($original = NULL, $id = NULL) { echo get_syndication_feed_guid($original, $id); }
361 507
362 -function get_syndication_feed_id () { list($u) = get_post_custom_values('syndication_feed_id'); return $u; }
363 -function the_syndication_feed_id () { echo get_syndication_feed_id(); }
508 +function get_syndication_feed_id ($id = NULL) { list($u) = get_post_custom_values('syndication_feed_id', $id); return $u; }
509 +function the_syndication_feed_id ($id = NULL) { echo get_syndication_feed_id($id); }
364 510
365 511 $feedwordpress_linkcache = array (); // only load links from database once
512 +function get_syndication_feed_object ($id = NULL) {
513 + global $feedwordpress_linkcache;
366 514
367 -function get_feed_meta ($key) {
368 - global $wpdb, $feedwordpress_linkcache;
369 - $feed_id = get_syndication_feed_id();
515 + $link = NULL;
370 516
371 - $ret = NULL;
517 + $feed_id = get_syndication_feed_id($id);
372 518 if (strlen($feed_id) > 0):
373 519 if (isset($feedwordpress_linkcache[$feed_id])) :
374 520 $link = $feedwordpress_linkcache[$feed_id];
375 521 else :
376 - $link =& new SyndicatedLink($feed_id);
522 + $link = new SyndicatedLink($feed_id);
377 523 $feedwordpress_linkcache[$feed_id] = $link;
378 524 endif;
525 + endif;
526 + return $link;
527 +}
379 528
529 +function get_feed_meta ($key, $id = NULL) {
530 + $ret = NULL;
531 +
532 + $link = get_syndication_feed_object($id);
533 + if (is_object($link) and isset($link->settings[$key])) :
380 534 $ret = $link->settings[$key];
381 535 endif;
382 536 return $ret;
383 537 } /* get_feed_meta() */
384 538
385 -function get_syndication_permalink () {
386 - list($u) = get_post_custom_values('syndication_permalink'); return $u;
539 +function get_syndication_permalink ($id = NULL) {
540 + list($u) = get_post_custom_values('syndication_permalink', $id); return $u;
387 541 }
388 -function the_syndication_permalink () {
389 - echo get_syndication_permalink();
542 +function the_syndication_permalink ($id = NULL) {
543 + echo get_syndication_permalink($id);
390 544 }
391 545
546 +/**
547 + * get_local_permalink: returns a string containing the internal permalink
548 + * for a post (whether syndicated or not) on your local WordPress installation.
549 + * This may be useful if you want permalinks to point to the original source of
550 + * an article for most purposes, but want to retrieve a URL for the local
551 + * representation of the post for one or two limited purposes (for example,
552 + * linking to a comments page on your local aggregator site).
553 + *
554 + * @param $id The numerical ID of the post to get the permalink for. If empty,
555 + * defaults to the current post in a Loop context.
556 + * @return string The URL of the local permalink for this post.
557 + *
558 + * @uses get_permalink()
559 + * @global $feedwordpress_the_original_permalink
560 + *
561 + * @since 2010.0217
562 + */
563 +function get_local_permalink ($id = NULL) {
564 + global $feedwordpress_the_original_permalink;
565 +
566 + // get permalink, and thus activate filter and force global to be filled
567 + // with original URL.
568 + $url = get_permalink($id);
569 + return $feedwordpress_the_original_permalink;
570 +} /* get_local_permalink() */
571 +
572 +/**
573 + * the_original_permalink: displays the contents of get_original_permalink()
574 + *
575 + * @param $id The numerical ID of the post to get the permalink for. If empty,
576 + * defaults to the current post in a Loop context.
577 + *
578 + * @uses get_local_permalinks()
579 + * @uses apply_filters
580 + *
581 + * @since 2010.0217
582 + */
583 +function the_local_permalink ($id = NULL) {
584 + print apply_filters('the_permalink', get_local_permalink($id));
585 +} /* function the_local_permalink() */
586 +
392 587 ################################################################################
393 588 ## FILTERS: syndication-aware handling of post data for templates and feeds ####
394 589 ################################################################################
395 590
396 591 $feedwordpress_the_syndicated_content = NULL;
592 +$feedwordpress_the_original_permalink = NULL;
397 593
398 594 function feedwordpress_preserve_syndicated_content ($text) {
399 595 global $feedwordpress_the_syndicated_content;
400 596
@@ -424,16 +620,16 @@
424 620 // In a post context....
425 621 if (is_syndicated()) :
426 622 ?>
427 623 <source>
428 - <title><?php the_syndication_source(); ?></title>
429 - <link rel="alternate" type="text/html" href="<?php the_syndication_source_link(); ?>" />
430 - <link rel="self" href="<?php the_syndication_feed(); ?>" />
624 + <title><?php print htmlspecialchars(get_syndication_source()); ?></title>
625 + <link rel="alternate" type="text/html" href="<?php print htmlspecialchars(get_syndication_source_link()); ?>" />
626 + <link rel="self" href="<?php print htmlspecialchars(get_syndication_feed()); ?>" />
431 627 <?php
432 628 $id = get_syndication_feed_guid();
433 629 if (strlen($id) > 0) :
434 630 ?>
435 - <id><?php print $id; ?></id>
631 + <id><?php print htmlspecialchars($id); ?></id>
436 632 <?php
437 633 endif;
438 634 $updated = get_feed_meta('feed/updated');
439 635 if (strlen($updated) > 0) : ?>
@@ -445,17 +641,131 @@
445 641 <?php
446 642 endif;
447 643 }
448 644
645 +/**
646 + * syndication_permalink: Allow WordPress to use the original remote URL of
647 + * syndicated posts as their permalink. Can be turned on or off by by setting in
648 + * Syndication => Posts & Links. Saves the old internal permalink in a global
649 + * variable for later use.
650 + *
651 + * @param string $permalink The internal permalink
652 + * @return string The new permalink. Same as the old if the post is not
653 + * syndicated, or if FWP is set to use internal permalinks, or if the post
654 + * was syndicated, but didn't have a proper permalink recorded.
655 + *
656 + * @uses FeedWordPress::munge_permalinks()
657 + * @uses get_syndication_permalink()
658 + * @global $feedwordpress_the_original_permalink
659 + */
449 660 function syndication_permalink ($permalink = '') {
450 - if (get_option('feedwordpress_munge_permalink') != 'no'):
451 - $uri = get_syndication_permalink();
452 - return ((strlen($uri) > 0) ? $uri : $permalink);
453 - else:
454 - return $permalink;
661 + global $feedwordpress_the_original_permalink;
662 +
663 + // Save the local permalink in case we need to retrieve it later.
664 + $feedwordpress_the_original_permalink = $permalink;
665 +
666 + // Map this permalink to a post ID so we can get the correct permalink
667 + // even outside of the Post Loop. Props Björn.
668 + $id = url_to_postid($permalink);
669 +
670 + $munge = false;
671 + $link = get_syndication_feed_object($id);
672 + if (is_object($link)) :
673 + $munge = ($link->setting('munge permalink', 'munge_permalink', 'yes') != 'no');
455 674 endif;
456 -} // function syndication_permalink ()
457 675
676 + if ($munge):
677 + $uri = get_syndication_permalink($id);
678 + $permalink = ((strlen($uri) > 0) ? $uri : $permalink);
679 + endif;
680 + return $permalink;
681 +} /* function syndication_permalink () */
682 +
683 +/**
684 + * syndication_permalink_escaped: Escape XML special characters in syndicated
685 + * permalinks when used in feed contexts and HTML display contexts.
686 + *
687 + * @param string $permalink
688 + * @return string
689 + *
690 + * @uses is_syndicated()
691 + * @uses FeedWordPress::munge_permalinks()
692 + *
693 + */
694 +function syndication_permalink_escaped ($permalink) {
695 + if (is_syndicated() and FeedWordPress::munge_permalinks()) :
696 + // This is a foreign link; WordPress can't vouch for its not
697 + // having any entities that need to be &-escaped. So we'll do
698 + // it here.
699 + $permalink = esc_html($permalink);
700 + endif;
701 + return $permalink;
702 +} /* function syndication_permalink_escaped() */
703 +
704 +/**
705 + * syndication_comments_feed_link: Escape XML special characters in comments
706 + * feed links
707 + *
708 + * @param string $link
709 + * @return string
710 + *
711 + * @uses is_syndicated()
712 + * @uses FeedWordPress::munge_permalinks()
713 + */
714 +function syndication_comments_feed_link ($link) {
715 + global $feedwordpress_the_original_permalink, $id;
716 +
717 + if (is_syndicated() and FeedWordPress::munge_permalinks()) :
718 + // If the source post provided a comment feed URL using
719 + // wfw:commentRss or atom:link/@rel="replies" we can make use of
720 + // that value here.
721 + $source = get_syndication_feed_object();
722 + $replacement = NULL;
723 + if ($source->setting('munge comments feed links', 'munge_comments_feed_links', 'yes') != 'no') :
724 + $commentFeeds = get_post_custom_values('wfw:commentRSS');
725 + if (
726 + is_array($commentFeeds)
727 + and (count($commentFeeds) > 0)
728 + and (strlen($commentFeeds[0]) > 0)
729 + ) :
730 + $replacement = $commentFeeds[0];
731 +
732 + // This is a foreign link; WordPress can't vouch for its not
733 + // having any entities that need to be &-escaped. So we'll do it
734 + // here.
735 + $replacement = esc_html($replacement);
736 + endif;
737 + endif;
738 +
739 + if (is_null($replacement)) :
740 + // Q: How can we get the proper feed format, since the
741 + // format is, stupidly, not passed to the filter?
742 + // A: Kludge kludge kludge kludge!
743 + $fancy_permalinks = ('' != get_option('permalink_structure'));
744 + if ($fancy_permalinks) :
745 + preg_match('|/feed(/([^/]+))?/?$|', $link, $ref);
746 +
747 + $format = (isset($ref[2]) ? $ref[2] : '');
748 + if (strlen($format) == 0) : $format = get_default_feed(); endif;
749 +
750 + $replacement = trailingslashit($feedwordpress_the_original_permalink) . 'feed';
751 + if ($format != get_default_feed()) :
752 + $replacement .= '/'.$format;
753 + endif;
754 + $replacement = user_trailingslashit($replacement, 'single_feed');
755 + else :
756 + // No fancy permalinks = no problem
757 + // WordPress doesn't call get_permalink() to
758 + // generate the comment feed URL, so the
759 + // comments feed link is never munged by FWP.
760 + endif;
761 + endif;
762 +
763 + if (!is_null($replacement)) : $link = $replacement; endif;
764 + endif;
765 + return $link;
766 +} /* function syndication_comments_feed_link() */
767 +
458 768 ################################################################################
459 769 ## ADMIN MENU ADD-ONS: register Dashboard management pages #####################
460 770 ################################################################################
461 771
@@ -468,23 +778,15 @@
468 778 // add icon parameter
469 779 $menu[] = WP_PLUGIN_URL.'/'.$fwp_path.'/feedwordpress-tiny.png';
470 780 endif;
471 781
472 - if (fwp_test_wp_version(FWP_SCHEMA_26)) :
473 - $options = __('Settings');
474 - $longoptions = __('Syndication Settings');
475 - else :
476 - $options = __('Options');
477 - $longoptions = __('Syndication Options');
478 - endif;
479 -
480 782 call_user_func_array('add_menu_page', $menu);
481 - add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Posts', 'Posts', $fwp_capability['manage_options'], $fwp_path.'/posts-page.php');
783 + add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Feeds & Updates', 'Feeds & Updates', $fwp_capability['manage_options'], $fwp_path.'/feeds-page.php');
784 + add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Posts & Links', 'Posts & Links', $fwp_capability['manage_options'], $fwp_path.'/posts-page.php');
482 785 add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Authors', 'Authors', $fwp_capability['manage_options'], $fwp_path.'/authors-page.php');
483 - add_submenu_page($fwp_path.'/syndication.php', 'Categories & Tags', 'Categories & Tags', $fwp_capability['manage_options'], $fwp_path.'/categories-page.php');
484 - add_submenu_page($fwp_path.'/syndication.php', $longoptions, $options, $fwp_capability['manage_options'], $fwp_path.'/syndication-options.php');
485 -
486 - add_options_page($longoptions, 'Syndication', $fwp_capability['manage_options'], $fwp_path.'/syndication-options.php');
786 + add_submenu_page($fwp_path.'/syndication.php', 'Categories'.FEEDWORDPRESS_AND_TAGS, 'Categories'.FEEDWORDPRESS_AND_TAGS, $fwp_capability['manage_options'], $fwp_path.'/categories-page.php');
787 + add_submenu_page($fwp_path.'/syndication.php', 'FeedWordPress Performance', 'Performance', $fwp_capability['manage_options'], $fwp_path.'/performance-page.php');
788 + add_submenu_page($fwp_path.'/syndication.php', 'FeedWordPress Diagnostics', 'Diagnostics', $fwp_capability['manage_options'], $fwp_path.'/diagnostics-page.php');
487 789 } /* function fwp_add_pages () */
488 790
489 791 function fwp_check_debug () {
490 792 // This is a horrible fucking kludge that I have to do because the
@@ -507,97 +809,8 @@
507 809 <?php
508 810 endif;
509 811 } /* function fwp_check_debug () */
510 812
511 -define('EXPECTED_MAGPIE_VERSION', '2009.0618');
512 -function fwp_check_magpie () {
513 - if (isset($_REQUEST['feedwordpress_magpie_fix'])) :
514 - if ($_REQUEST['feedwordpress_magpie_fix']=='ignored') :
515 -?>
516 -<div class="updated fade">
517 -<p>O.K., we'll ignore the problem for now. FeedWordPress will not display any
518 -more error messages.</p>
519 -</div>
520 -<?php
521 - elseif ((bool) $_REQUEST['feedwordpress_magpie_fix']) :
522 -?>
523 -<div class="updated fade">
524 -<p>Congratulations! Your MagpieRSS has been successfully upgraded to the version
525 -shipped with FeedWordPress.</p>
526 -</div>
527 -<?php
528 - else :
529 - $source = dirname(__FILE__)."/MagpieRSS-upgrade/rss.php";
530 - $destination = ABSPATH . WPINC . '/rss.php';
531 - $cmd = "cp '".htmlspecialchars(addslashes($source))."' '".htmlspecialchars(addslashes($destination))."'";
532 - $cmd = wordwrap($cmd, /*width=*/ 75, /*break=*/ " \\\n\t");
533 -
534 -?>
535 -<div class="error">
536 -<p><strong>FeedWordPress was unable to automatically upgrade your copy of MagpieRSS.</strong></p>
537 -<p>It's likely that you need to change the file permissions on <code><?php print htmlspecialchars($source); ?></code>
538 -to allow FeedWordPress to overwrite it.</p>
539 -<p><strong>To perform the upgrade manually,</strong> you can
540 -use a SFTP or FTP client to upload a copy of <code>rss.php</code> from the
541 -<code>MagpieRSS-upgrades/</code> directory of your FeedWordPress archive so that
542 -it overwrites <code><?php print htmlspecialchars($destination); ?></code>. Or,
543 -if your web host provides shell access, you can issue the following command from
544 -a command prompt to perform the upgrade:</p>
545 -<pre>
546 -<samp>$</samp> <kbd><?php print $cmd; ?></kbd>
547 -</pre>
548 -<p><strong>If you've fixed the file permissions,</strong> you can try the
549 -automatic upgrade again.</p>
550 -
551 -<?php feedwordpress_upgrade_old_and_busted_buttons(); ?>
552 -</div>
553 -<?php
554 - endif;
555 - else :
556 - $magpie_version = FeedWordPress::magpie_version();
557 -
558 - $ignored = get_option('feedwordpress_magpie_ignored_upgrade_to');
559 - if (EXPECTED_MAGPIE_VERSION != $magpie_version and EXPECTED_MAGPIE_VERSION != $ignored) :
560 - if (current_user_can('edit_files')) :
561 - $youAre = 'you are';
562 - $itIsRecommendedThatYou = 'It is <strong>strongly recommended</strong> that you';
563 - else :
564 - $youAre = 'this site is';
565 - $itIsRecommendedThatYou = 'You may want to contact the administrator of the site; it is <strong>strongly recommended</strong> that they';
566 - endif;
567 - print '<div class="error">';
568 -?>
569 -<p style="font-style: italic"><strong>FeedWordPress has detected that <?php print $youAre; ?> currently using a version of
570 -MagpieRSS other than the upgraded version that ships with this version of FeedWordPress.</strong></p>
571 -<ul>
572 -<li><strong>Currently running:</strong> MagpieRSS <?php print $magpie_version; ?></li>
573 -<li><strong>Version included with FeedWordPress <?php print FEEDWORDPRESS_VERSION; ?>:</strong> MagpieRSS <?php print EXPECTED_MAGPIE_VERSION; ?></li>
574 -</ul>
575 -<p><?php print $itIsRecommendedThatYou; ?> install the upgraded
576 -version of MagpieRSS supplied with FeedWordPress. The version of
577 -MagpieRSS that ships with WordPress is very old and buggy, and
578 -encounters a number of errors when trying to parse modern Atom
579 -and RSS feeds.</p>
580 -<?php
581 - feedwordpress_upgrade_old_and_busted_buttons();
582 - print '</div>';
583 - endif;
584 - endif;
585 -}
586 -
587 -function feedwordpress_upgrade_old_and_busted_buttons() {
588 - if (current_user_can('edit_files')) :
589 -?>
590 -<form action="" method="post"><div>
591 -<?php FeedWordPressCompatibility::stamp_nonce('feedwordpress_fix_magpie'); ?>
592 -<input type="hidden" name="action" value="fix_magpie_version" />
593 -<input class="button-secondary" type="submit" name="ignore" value="<?php _e('Ignore this problem'); ?>" />
594 -<input class="button-primary" type="submit" name="upgrade" value="<?php _e('Upgrade'); ?>" />
595 -</div></form>
596 -<?php
597 - endif;
598 -}
599 -
600 813 ################################################################################
601 814 ## fwp_hold_pings() and fwp_release_pings(): Outbound XML-RPC ping reform ####
602 815 ## ... 'coz it's rude to send 500 pings the first time your aggregator runs ####
603 816 ################################################################################
@@ -653,8 +866,67 @@
653 866 endif;
654 867 endif;
655 868 }
656 869
870 + function feedwordpress_add_post_edit_controls () {
871 + add_meta_box('feedwordpress-post-controls', __('Syndication'), 'feedwordpress_post_edit_controls', 'post', 'side', 'high');
872 + } // function FeedWordPress::postEditControls
873 +
874 + function feedwordpress_post_edit_controls () {
875 + global $post;
876 +
877 + $frozen_values = get_post_custom_values('_syndication_freeze_updates', $post->ID);
878 + $frozen_post = (count($frozen_values) > 0 and 'yes' == $frozen_values[0]);
879 +
880 + if (is_syndicated($post->ID)) :
881 + ?>
882 + <p>This is a syndicated post, which originally appeared at
883 + <cite><?php print esc_html(get_syndication_source(NULL, $post->ID)); ?></cite>.
884 + <a href="<?php print esc_html(get_syndication_permalink($post->ID)); ?>">View original post</a>.</p>
885 +
886 + <p><input type="hidden" name="feedwordpress_noncename" id="feedwordpress_noncename" value="<?php print wp_create_nonce(plugin_basename(__FILE__)); ?>" />
887 + <label><input type="checkbox" name="freeze_updates" value="yes" <?php if ($frozen_post) : ?>checked="checked"<?php endif; ?> /> <strong>Manual editing.</strong>
888 + If set, FeedWordPress will not overwrite the changes you make manually
889 + to this post, if the syndicated content is updated on the
890 + feed.</label></p>
891 + <?php
892 + else :
893 + ?>
894 + <p>This post was created locally at this website.</p>
895 + <?php
896 + endif;
897 + } // function feedwordpress_post_edit_controls () */
898 +
899 + function feedwordpress_save_post_edit_controls ( $post_id ) {
900 + global $post;
901 +
902 + if (!isset($_POST['feedwordpress_noncename']) or !wp_verify_nonce($_POST['feedwordpress_noncename'], plugin_basename(__FILE__))) :
903 + return $post_id;
904 + endif;
905 +
906 + // Verify if this is an auto save routine. If it is our form has
907 + // not been submitted, so we don't want to do anything.
908 + if ( defined('DOING_AUTOSAVE') and DOING_AUTOSAVE ) :
909 + return $post_id;
910 + endif;
911 +
912 + // Check permissions
913 + if ( !current_user_can( 'edit_'.$_POST['post_type'], $post_id) ) :
914 + return $post_id;
915 + endif;
916 +
917 + // OK, we're golden. Now let's save some data.
918 + if (isset($_POST['freeze_updates'])) :
919 + update_post_meta($post_id, '_syndication_freeze_updates', $_POST['freeze_updates']);
920 + $ret = $_POST['freeze_updates'];
921 + else :
922 + delete_post_meta($post_id, '_syndication_freeze_updates');
923 + $ret = NULL;
924 + endif;
925 +
926 + return $ret;
927 + } // function feedwordpress_save_edit_controls
928 +
657 929 ################################################################################
658 930 ## class FeedWordPress #########################################################
659 931 ################################################################################
660 932
@@ -698,9 +970,9 @@
698 970 function FeedWordPress () {
699 971 $this->feeds = array ();
700 972 $links = FeedWordPress::syndicated_links();
701 973 if ($links): foreach ($links as $link):
702 - $this->feeds[] =& new SyndicatedLink($link);
974 + $this->feeds[] = new SyndicatedLink($link);
703 975 endforeach; endif;
704 976 } // FeedWordPress::FeedWordPress ()
705 977
706 978 # function update (): polls for updates on one or more Contributor feeds
@@ -786,9 +1058,9 @@
786 1058 if (!is_null($crash_ts) and (time() > $crash_ts)) : // Check whether we've exceeded the time limit
787 1059 break;
788 1060 endif;
789 1061
790 - $pinged_that = (is_null($uri) or in_array($uri, array($feed->uri(), $feed->homepage())));
1062 + $pinged_that = (is_null($uri) or ($uri=='*') or in_array($uri, array($feed->uri(), $feed->homepage())));
791 1063
792 1064 if (!is_null($uri)) : // A site-specific ping always updates
793 1065 $timely = true;
794 1066 else :
@@ -804,10 +1076,12 @@
804 1076 $start_ts = time();
805 1077 $added = $feed->poll($crash_ts);
806 1078 do_action('feedwordpress_check_feed_complete', $feed->settings, $added, time() - $start_ts);
807 1079
808 - if (isset($added['new'])) : $delta['new'] += $added['new']; endif;
809 - if (isset($added['updated'])) : $delta['updated'] += $added['updated']; endif;
1080 + if (is_array($added)) : // Success
1081 + if (isset($added['new'])) : $delta['new'] += $added['new']; endif;
1082 + if (isset($added['updated'])) : $delta['updated'] += $added['updated']; endif;
1083 + endif;
810 1084 endif;
811 1085 endforeach;
812 1086
813 1087 do_action('feedwordpress_update_complete', $delta);
@@ -816,8 +1090,11 @@
816 1090 }
817 1091
818 1092 function stale () {
819 1093 if (get_option('feedwordpress_automatic_updates')) :
1094 + // Do our best to avoid possible simultaneous
1095 + // updates by getting up-to-the-minute settings.
1096 +
820 1097 $last = get_option('feedwordpress_last_update_all');
821 1098
822 1099 // If we haven't updated all yet, give it a time window
823 1100 if (false === $last) :
@@ -836,12 +1113,8 @@
836 1113 else :
837 1114 FeedWordPress::critical_bug('FeedWordPress::stale::last', $last, __LINE__);
838 1115 endif;
839 1116
840 - // Explicit request for an update (e.g. from a cron job).
841 - elseif (FeedWordPress::update_requested()) :
842 - $ret = true;
843 -
844 1117 else :
845 1118 $ret = false;
846 1119 endif;
847 1120 return $ret;
@@ -847,11 +1120,25 @@
847 1120 return $ret;
848 1121 } // FeedWordPress::stale()
849 1122
850 1123 function update_requested () {
851 - return (isset($_REQUEST['update_feedwordpress']) and $_REQUEST['update_feedwordpress']);
1124 + return (
1125 + isset($_REQUEST['update_feedwordpress'])
1126 + and $_REQUEST['update_feedwordpress']
1127 + );
852 1128 } // FeedWordPress::update_requested()
853 1129
1130 + function update_requested_url () {
1131 + $ret = null;
1132 +
1133 + if (($_REQUEST['update_feedwordpress']=='*')
1134 + or (preg_match('|^http://.*|i', $_REQUEST['update_feedwordpress']))) :
1135 + $ret = $_REQUEST['update_feedwordpress'];
1136 + endif;
1137 +
1138 + return $ret;
1139 + } // FeedWordPress::update_requested_url()
1140 +
854 1141 function syndicate_link ($name, $uri, $rss) {
855 1142 global $wpdb;
856 1143
857 1144 // Get the category ID#
@@ -859,16 +1146,29 @@
859 1146
860 1147 // WordPress gets cranky if there's no homepage URI
861 1148 if (!isset($uri) or strlen($uri)<1) : $uri = $rss; endif;
862 1149
863 - if (function_exists('wp_insert_link')) { // WordPress 2.x
1150 + if (function_exists('wp_insert_link')) : // WordPress 2.x
1151 + if (FeedWordPressCompatibility::test_version(0, FWP_SCHEMA_21)) :
1152 + // Morons.
1153 + $name = $wpdb->escape($name);
1154 + $uri = $wpdb->escape($uri);
1155 + $rss = $wpdb->escape($rss);
1156 +
1157 + // Comes in as a single category
1158 + $linkCats = $cat_id;
1159 + else :
1160 + // Comes in as an array of categories
1161 + $linkCats = array($cat_id);
1162 + endif;
1163 +
864 1164 $link_id = wp_insert_link(array(
865 1165 "link_name" => $name,
866 1166 "link_url" => $uri,
867 - "link_category" => (fwp_test_wp_version(0, FWP_SCHEMA_21) ? $cat_id : array($cat_id)),
1167 + "link_category" => $linkCats,
868 1168 "link_rss" => $rss
869 1169 ));
870 - } else { // WordPress 1.5.x
1170 + else : // WordPress 1.5.x
871 1171 $result = $wpdb->query("
872 1172 INSERT INTO $wpdb->links
873 1173 SET
874 1174 link_name = '".$wpdb->escape($name)."',
@@ -876,12 +1176,20 @@
876 1176 link_category = '".$wpdb->escape($cat_id)."',
877 1177 link_rss = '".$wpdb->escape($rss)."'
878 1178 ");
879 1179 $link_id = $wpdb->insert_id;
880 - } // if
1180 + endif;
881 1181 return $link_id;
882 1182 } // function FeedWordPress::syndicate_link()
883 1183
1184 + /*static*/ function syndicated_status ($what, $default) {
1185 + $ret = get_option("feedwordpress_syndicated_{$what}_status");
1186 + if (!$ret) :
1187 + $ret = $default;
1188 + endif;
1189 + return $ret;
1190 + } /* FeedWordPress::syndicated_status() */
1191 +
884 1192 function on_unfamiliar ($what = 'author', $override = NULL) {
885 1193 $set = array(
886 1194 'author' => array('create', 'default', 'filter'),
887 1195 'category' => array('create', 'tag', 'default', 'filter'),
@@ -888,8 +1196,10 @@
888 1196 );
889 1197
890 1198 if (is_string($override)) :
891 1199 $ret = strtolower($override);
1200 + else :
1201 + $ret = NULL;
892 1202 endif;
893 1203
894 1204 if (!is_numeric($override) and !in_array($ret, $set[$what])) :
895 1205 $ret = get_option('feedwordpress_unfamiliar_'.$what);
@@ -925,8 +1235,19 @@
925 1235 $ret = get_option('feedwordpress_use_aggregator_source_data');
926 1236 return apply_filters('syndicated_post_use_aggregator_source_data', ($ret=='yes'));
927 1237 }
928 1238
1239 + /**
1240 + * FeedWordPress::munge_permalinks: check whether or not FeedWordPress
1241 + * should rewrite permalinks for syndicated items to reflect their
1242 + * original location.
1243 + *
1244 + * @return bool TRUE if FeedWordPress SHOULD rewrite permalinks; FALSE otherwise
1245 + */
1246 + /*static*/ function munge_permalinks () {
1247 + return (get_option('feedwordpress_munge_permalink', /*default=*/ 'yes') != 'no');
1248 + } /* FeedWordPress::munge_permalinks() */
1249 +
929 1250 function syndicated_links () {
930 1251 $contributors = FeedWordPress::link_category_id();
931 1252 if (function_exists('get_bookmarks')) :
932 1253 $links = get_bookmarks(array("category" => $contributors));
@@ -940,61 +1261,31 @@
940 1261 global $wpdb, $wp_db_version;
941 1262
942 1263 $cat_id = get_option('feedwordpress_cat_id');
943 1264
944 - // If we don't yet *have* the category, we'll have to create it
945 - if ($cat_id === false) :
946 - $cat = $wpdb->escape(DEFAULT_SYNDICATION_CATEGORY);
947 -
948 - // Look for something with the right name...
949 - // -----------------------------------------
1265 + // If we don't yet have the category ID stored, search by name
1266 + if (!$cat_id) :
1267 + $cat_id = FeedWordPressCompatibility::link_category_id(DEFAULT_SYNDICATION_CATEGORY);
950 1268
951 - // WordPress 2.3 introduces a new taxonomy/term API
952 - if (function_exists('is_term')) :
953 - $cat_id = is_term($cat, 'link_category');
954 - // WordPress 2.1 and 2.2 use a common table for both link and post categories
955 - elseif (fwp_test_wp_version(FWP_SCHEMA_21, FWP_SCHEMA_23)) :
956 - $cat_id = $wpdb->get_var("SELECT cat_id FROM {$wpdb->categories} WHERE cat_name='$cat'");
957 - // WordPress 1.5 and 2.0.x have a separate table for link categories
958 - elseif (fwp_test_wp_version(0, FWP_SCHEMA_21)):
959 - $cat_id = $wpdb->get_var("SELECT cat_id FROM {$wpdb->linkcategories} WHERE cat_name='$cat'");
960 - // This should never happen.
961 - else :
962 - FeedWordPress::critical_bug('FeedWordPress::link_category_id::wp_db_version', $wp_db_version, __LINE__);
1269 + if ($cat_id) :
1270 + // We found it; let's stamp it.
1271 + update_option('feedwordpress_cat_id', $cat_id);
963 1272 endif;
964 1273
965 - // If you still can't find anything, make it for yourself.
966 - // -------------------------------------------------------
967 - if (!$cat_id) :
968 - // WordPress 2.3+ term/taxonomy API
969 - if (function_exists('wp_insert_term')) :
970 - $term = wp_insert_term($cat, 'link_category');
971 - $cat_id = $term['term_id'];
972 - // WordPress 2.1, 2.2 category API. By the way, why the fuck is this API function only available in a wp-admin module?
973 - elseif (function_exists('wp_insert_category') and !fwp_test_wp_version(FWP_SCHEMA_20, FWP_SCHEMA_21)) :
974 - $cat_id = wp_insert_category(array('cat_name' => $cat));
975 - // WordPress 1.5 and 2.0.x
976 - elseif (fwp_test_wp_version(0, FWP_SCHEMA_21)) :
977 - $result = $wpdb->query("
978 - INSERT INTO $wpdb->linkcategories
979 - SET
980 - cat_id = 0,
981 - cat_name='$cat',
982 - show_images='N',
983 - show_description='N',
984 - show_rating='N',
985 - show_updated='N',
986 - sort_order='name'
987 - ");
988 - $cat_id = $wpdb->insert_id;
989 - // This should never happen.
990 - else :
991 - FeedWordPress::critical_bug('FeedWordPress::link_category_id::wp_db_version', $wp_db_version, __LINE__);
992 - endif;
993 - endif;
1274 + // If we *do* have the category ID stored, verify that it exists
1275 + else :
1276 + $cat_id = FeedWordPressCompatibility::link_category_id((int) $cat_id, 'cat_id');
1277 + endif;
1278 +
1279 + // If we could not find an appropriate link category,
1280 + // make a new one for ourselves.
1281 + if (!$cat_id) :
1282 + $cat_id = FeedWordPressCompatibility::insert_link_category(DEFAULT_SYNDICATION_CATEGORY);
994 1283
1284 + // Stamp it
995 1285 update_option('feedwordpress_cat_id', $cat_id);
996 1286 endif;
1287 +
997 1288 return $cat_id;
998 1289 } // function FeedWordPress::link_category_id()
999 1290
1000 1291 # Upgrades and maintenance...
@@ -1040,56 +1331,14 @@
1040 1331
1041 1332 if (is_null($from) or $from <= 0.96) : $from = 0.96; endif;
1042 1333
1043 1334 switch ($from) :
1044 - case 0.96: // account for changes to syndication custom values and guid
1045 - echo "<p>Upgrading database from {$from} to ".FEEDWORDPRESS_VERSION."...</p>\n";
1335 + case 0.96:
1336 + // Dropping legacy upgrade code. If anyone is still
1337 + // using 0.96 and just now decided to upgrade, well, I'm
1338 + // sorry about that. You'll just have to cope with a few
1339 + // duplicate posts.
1046 1340
1047 - $cat_id = FeedWordPress::link_category_id();
1048 -
1049 - // Avoid duplicates
1050 - $wpdb->query("DELETE FROM `{$wpdb->postmeta}` WHERE meta_key = 'syndication_feed_id'");
1051 -
1052 - // Look up all the link IDs
1053 - $wpdb->query("
1054 - CREATE TEMPORARY TABLE tmp_custom_values
1055 - SELECT
1056 - NULL AS meta_id,
1057 - post_id,
1058 - 'syndication_feed_id' AS meta_key,
1059 - link_id AS meta_value
1060 - FROM `{$wpdb->postmeta}`, `{$wpdb->links}`
1061 - WHERE
1062 - meta_key='syndication_feed'
1063 - AND meta_value=link_rss
1064 - AND link_category = {$cat_id}
1065 - ");
1066 -
1067 - // Now attach them to their posts
1068 - $wpdb->query("INSERT INTO `{$wpdb->postmeta}` SELECT * FROM tmp_custom_values");
1069 -
1070 - // And clean up after ourselves.
1071 - $wpdb->query("DROP TABLE tmp_custom_values");
1072 -
1073 - // Now fix the guids to avoid duplicate posts
1074 - echo "<ul>";
1075 - foreach ($this->feeds as $feed) :
1076 - echo "<li>Fixing post meta-data for <cite>".$feed['link/name']."</cite> &#8230; "; flush();
1077 - $rss = @fetch_rss($feed['link/uri']);
1078 - if (is_array($rss->items)) :
1079 - foreach ($rss->items as $item) :
1080 - $guid = $wpdb->escape(FeedWordPress::guid($item, $feed)); // new GUID algorithm
1081 - $link = $wpdb->escape($item['link']);
1082 -
1083 - $wpdb->query("
1084 - UPDATE `{$wpdb->posts}` SET guid='{$guid}' WHERE guid='{$link}'
1085 - ");
1086 - endforeach;
1087 - endif;
1088 - echo "<strong>complete.</strong></li>\n";
1089 - endforeach;
1090 - echo "</ul>\n";
1091 -
1092 1341 // Mark the upgrade as successful.
1093 1342 update_option('feedwordpress_version', FEEDWORDPRESS_VERSION);
1094 1343 endswitch;
1095 1344 echo "<p>Upgrade complete. FeedWordPress is now ready to use again.</p>";
@@ -1094,8 +1343,27 @@
1094 1343 endswitch;
1095 1344 echo "<p>Upgrade complete. FeedWordPress is now ready to use again.</p>";
1096 1345 } /* FeedWordPress::upgrade_database() */
1097 1346
1347 + function has_guid_index () {
1348 + global $wpdb;
1349 +
1350 + $found = false; // Guilty until proven innocent.
1351 +
1352 + $results = $wpdb->get_results("
1353 + SHOW INDEXES FROM {$wpdb->posts}
1354 + ");
1355 + if ($results) :
1356 + foreach ($results as $index) :
1357 + if (isset($index->Column_name)
1358 + and ('guid' == $index->Column_name)) :
1359 + $found = true;
1360 + endif;
1361 + endforeach;
1362 + endif;
1363 + return $found;
1364 + } /* FeedWordPress::has_guid_index () */
1365 +
1098 1366 function create_guid_index () {
1099 1367 global $wpdb;
1100 1368
1101 1369 $wpdb->query("
@@ -1102,15 +1370,72 @@
1102 1370 CREATE INDEX {$wpdb->posts}_guid_idx ON {$wpdb->posts}(guid)
1103 1371 ");
1104 1372 } /* FeedWordPress::create_guid_index () */
1105 1373
1106 - function magpie_version () {
1107 - if (!defined('MAGPIE_VERSION')) : $magpie_version = $GLOBALS['wp_version'].'-default';
1108 - else : $magpie_version = MAGPIE_VERSION;
1374 + function remove_guid_index () {
1375 + global $wpdb;
1376 +
1377 + $wpdb->query("
1378 + DROP INDEX {$wpdb->posts}_guid_idx ON {$wpdb->posts}
1379 + ");
1380 + }
1381 +
1382 + /*static*/ function fetch ($url) {
1383 + $feed = new SimplePie();
1384 + $feed->set_feed_url($url);
1385 + $feed->set_cache_class('WP_Feed_Cache');
1386 + $feed->set_file_class('WP_SimplePie_File');
1387 + $feed->set_content_type_sniffer_class('FeedWordPress_Content_Type_Sniffer');
1388 + $feed->set_cache_duration(FeedWordPress::cache_duration());
1389 + $feed->init();
1390 + $feed->handle_content_type();
1391 +
1392 + if ($feed->error()) :
1393 + $ret = new WP_Error('simplepie-error', $feed->error());
1394 + else :
1395 + $ret = $feed;
1109 1396 endif;
1110 - return $magpie_version;
1397 + return $ret;
1398 + } /* FeedWordPress::fetch () */
1399 +
1400 + function clear_cache () {
1401 + global $wpdb;
1402 +
1403 + // The WordPress SimplePie module stores its cached feeds as
1404 + // transient records in the options table. The data itself is
1405 + // stored in `_transient_feed_{md5 of url}` and the last-modified
1406 + // timestamp in `_transient_feed_mod_{md5 of url}`. Timeouts for
1407 + // these records are stored in `_transient_timeout_feed_{md5}`.
1408 + // Since the md5 is always 32 characters in length, the
1409 + // option_name is always over 32 characters.
1410 + $ret = $wpdb->query("
1411 + DELETE FROM {$wpdb->options}
1412 + WHERE option_name LIKE '_transient%_feed_%' AND LENGTH(option_name) > 32
1413 + ");
1414 + return (int) ($ret / 4); // Each transient has 4 rows: the data, the modified timestamp; and the timeouts for each
1415 + } /* FeedWordPress::clear_cache () */
1416 +
1417 + function cache_duration () {
1418 + $duration = NULL;
1419 + if (defined('FEEDWORDPRESS_CACHE_AGE')) :
1420 + $duration = FEEDWORDPRESS_CACHE_AGE;
1421 + endif;
1422 + return $duration;
1111 1423 }
1424 + function cache_lifetime ($duration) {
1425 + // Check for explicit setting of a lifetime duration
1426 + if (defined('FEEDWORDPRESS_CACHE_LIFETIME')) :
1427 + $duration = FEEDWORDPRESS_CACHE_LIFETIME;
1112 1428
1429 + // Fall back to the cache freshness duration
1430 + elseif (defined('FEEDWORDPRESS_CACHE_AGE')) :
1431 + $duration = FEEDWORDPRESS_CACHE_AGE;
1432 + endif;
1433 +
1434 + // Fall back to WordPress default
1435 + return $duration;
1436 + } /* FeedWordPress::cache_lifetime () */
1437 +
1113 1438 # Utility functions for handling text settings
1114 1439 function negative ($f, $setting) {
1115 1440 $nego = array ('n', 'no', 'f', 'false');
1116 1441 return (isset($f[$setting]) and in_array(strtolower($f[$setting]), $nego));
@@ -1125,17 +1450,12 @@
1125 1450 # Internal debugging functions
1126 1451 function critical_bug ($varname, $var, $line) {
1127 1452 global $wp_version;
1128 1453
1129 - if (defined('MAGPIE_VERSION')) : $mv = MAGPIE_VERSION;
1130 - else : $mv = 'WordPress '.$wp_version.' default.';
1131 - endif;
1132 -
1133 1454 echo '<p>There may be a bug in FeedWordPress. Please <a href="'.FEEDWORDPRESS_AUTHOR_CONTACT.'">contact the author</a> and paste the following information into your e-mail:</p>';
1134 1455 echo "\n<plaintext>";
1135 1456 echo "Triggered at line # ".$line."\n";
1136 1457 echo "FeedWordPress version: ".FEEDWORDPRESS_VERSION."\n";
1137 - echo "MagpieRSS version: {$mv}\n";
1138 1458 echo "WordPress version: {$wp_version}\n";
1139 1459 echo "PHP version: ".phpversion()."\n";
1140 1460 echo "\n";
1141 1461 echo $varname.": "; var_dump($var); echo "\n";
@@ -1146,10 +1466,55 @@
1146 1466 if (FEEDWORDPRESS_DEBUG) : // halt only when we are doing debugging
1147 1467 FeedWordPress::critical_bug($varname, $var, $line);
1148 1468 endif;
1149 1469 }
1470 +
1471 + function val ($v, $no_newlines = false) {
1472 + ob_start();
1473 + var_dump($v);
1474 + $out = ob_get_contents(); ob_end_clean();
1475 +
1476 + if ($no_newlines) :
1477 + $out = preg_replace('/\s+/', " ", $out);
1478 + endif;
1479 + return $out;
1480 + } /* FeedWordPress:val () */
1481 +
1482 + function diagnostic ($level, $out) {
1483 + global $feedwordpress_admin_footer;
1484 +
1485 + $output = get_option('feedwordpress_diagnostics_output', array());
1486 + $show = get_option('feedwordpress_diagnostics_show', array());
1487 +
1488 + $diagnostic_nesting = count(explode(":", $level));
1489 +
1490 + if (in_array($level, $show)) :
1491 + foreach ($output as $method) :
1492 + switch ($method) :
1493 + case 'echo' :
1494 + echo "<div><pre><strong>Diag".str_repeat('====', $diagnostic_nesting-1).'|</strong> '.esc_html($out)."</pre></div>";
1495 + break;
1496 + case 'admin_footer' :
1497 + $feedwordpress_admin_footer[] = $out;
1498 + break;
1499 + case 'error_log' :
1500 + error_log('[feedwordpress]' . $out);
1501 + break;
1502 + endswitch;
1503 + endforeach;
1504 + endif;
1505 + } /* FeedWordPress::diagnostic () */
1506 +
1507 + function admin_footer () {
1508 + global $feedwordpress_admin_footer;
1509 + foreach ($feedwordpress_admin_footer as $line) :
1510 + echo '<div><pre>'.esc_html($line).'</pre></div>';
1511 + endforeach;
1512 + } /* FeedWordPress::admin_footer () */
1150 1513 } // class FeedWordPress
1151 1514
1515 +$feedwordpress_admin_footer = array();
1516 +
1152 1517 require_once(dirname(__FILE__) . '/syndicatedpost.class.php');
1153 1518 require_once(dirname(__FILE__) . '/syndicatedlink.class.php');
1154 1519
1155 1520 ################################################################################
@@ -1161,9 +1526,9 @@
1161 1526 return $args;
1162 1527 }
1163 1528
1164 1529 function feedwordpress_pong ($args) {
1165 - $feedwordpress =& new FeedWordPress;
1530 + $feedwordpress = new FeedWordPress;
1166 1531 $delta = @$feedwordpress->update($args[1]);
1167 1532 if (is_null($delta)):
1168 1533 return array('flerror' => true, 'message' => "Sorry. I don't syndicate <$args[1]>.");
1169 1534 else:
@@ -1174,13 +1539,9 @@
1174 1539 return array('flerror' => false, 'message' => "Thanks for the ping.".implode(' and', $mesg));
1175 1540 endif;
1176 1541 }
1177 1542
1178 -# The upgraded MagpieRSS also uses this class. So if we have it loaded
1179 -# in, don't load it again.
1180 -if (!class_exists('Relative_URI')) {
1181 - require_once(dirname(__FILE__) . '/relative_uri.class.php');
1182 -}
1543 +require_once(dirname(__FILE__) . '/relative_uri.class.php');
1183 1544
1184 1545 // take your best guess at the realname and e-mail, given a string
1185 1546 define('FWP_REGEX_EMAIL_ADDY', '([^@"(<\s]+@[^"@(<\s]+\.[^"@(<\s]+)');
1186 1547 define('FWP_REGEX_EMAIL_NAME', '("([^"]*)"|([^"<(]+\S))');