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