| @@ -2,12 +2,13 @@ | ||
| 2 | 2 | /* |
| 3 | 3 | Plugin Name: FeedWordPress |
| 4 | 4 | Plugin URI: http://projects.radgeek.com/feedwordpress |
| 5 | 5 | Description: simple and flexible Atom/RSS syndication for WordPress |
| 6 | -Version: 2009.0612 | |
| 6 | +Version: 2008.1214 | |
| 7 | 7 | Author: Charles Johnson |
| 8 | 8 | Author URI: http://radgeek.com/ |
| 9 | 9 | License: GPL |
| 10 | +Last modified: 2008-12-14 4:29pm PST | |
| 10 | 11 | */ |
| 11 | 12 | |
| 12 | 13 | # This uses code derived from: |
| 13 | 14 | # - wp-rss-aggregate.php by Kellan Elliot-McCrea <kellan@protest.net> |
| @@ -27,17 +28,13 @@ | ||
| 27 | 28 | # or use a cron job. |
| 28 | 29 | |
| 29 | 30 | # -- Don't change these unless you know what you're doing... |
| 30 | 31 | |
| 31 | -define ('FEEDWORDPRESS_VERSION', '2009.0612'); | |
| 32 | +define ('FEEDWORDPRESS_VERSION', '2008.1214'); | |
| 32 | 33 | define ('FEEDWORDPRESS_AUTHOR_CONTACT', 'http://radgeek.com/contact'); |
| 33 | 34 | define ('DEFAULT_SYNDICATION_CATEGORY', 'Contributors'); |
| 34 | 35 | |
| 35 | -$feedwordpress_debug = get_option('feedwordpress_debug'); | |
| 36 | -if (is_string($feedwordpress_debug)) : | |
| 37 | - $feedwordpress_debug = ($feedwordpress_debug == 'yes'); | |
| 38 | -endif; | |
| 39 | -define ('FEEDWORDPRESS_DEBUG', $feedwordpress_debug); | |
| 36 | +define ('FEEDWORDPRESS_DEBUG', false); | |
| 40 | 37 | |
| 41 | 38 | define ('FEEDWORDPRESS_CAT_SEPARATOR_PATTERN', '/[:\n]/'); |
| 42 | 39 | define ('FEEDWORDPRESS_CAT_SEPARATOR', "\n"); |
| 43 | 40 | |
| @@ -91,9 +88,8 @@ | ||
| 91 | 88 | endif; |
| 92 | 89 | endif; |
| 93 | 90 | |
| 94 | 91 | require_once(dirname(__FILE__) . '/compatability.php'); // LEGACY API: Replicate or mock up functions for legacy support purposes |
| 95 | -require_once(dirname(__FILE__) . '/feedwordpresshtml.class.php'); | |
| 96 | 92 | |
| 97 | 93 | // Magic quotes are just about the stupidest thing ever. |
| 98 | 94 | if (is_array($_POST)) : |
| 99 | 95 | $fwp_post = stripslashes_deep($_POST); |
| @@ -167,11 +163,9 @@ | ||
| 167 | 163 | remove_filter('pre_link_url', 'wp_filter_kses'); |
| 168 | 164 | |
| 169 | 165 | # Admin menu |
| 170 | 166 | add_action('admin_menu', 'fwp_add_pages'); |
| 171 | - add_action('admin_notices', 'fwp_check_debug'); | |
| 172 | - add_action('admin_notices', 'fwp_check_magpie'); | |
| 173 | - | |
| 167 | + | |
| 174 | 168 | # Inbound XML-RPC update methods |
| 175 | 169 | add_filter('xmlrpc_methods', 'feedwordpress_xmlrpc_hook'); |
| 176 | 170 | |
| 177 | 171 | # Outbound XML-RPC ping reform |
| @@ -195,12 +189,10 @@ | ||
| 195 | 189 | endif; |
| 196 | 190 | |
| 197 | 191 | # Cron-less auto-update. Hooray! |
| 198 | 192 | add_action('init', 'feedwordpress_auto_update'); |
| 199 | - add_action('init', 'feedwordpress_check_for_magpie_fix'); | |
| 200 | 193 | |
| 201 | 194 | # Default sanitizers |
| 202 | - add_filter('syndicated_item_content', array('SyndicatedPost', 'resolve_relative_uris'), 0, 2); | |
| 203 | 195 | add_filter('syndicated_item_content', array('SyndicatedPost', 'sanitize_content'), 0, 2); |
| 204 | 196 | |
| 205 | 197 | else : |
| 206 | 198 | # Hook in the menus, which will just point to the upgrade interface |
| @@ -206,33 +198,8 @@ | ||
| 206 | 198 | # Hook in the menus, which will just point to the upgrade interface |
| 207 | 199 | add_action('admin_menu', 'fwp_add_pages'); |
| 208 | 200 | endif; // if (!FeedWordPress::needs_upgrade()) |
| 209 | 201 | |
| 210 | -function feedwordpress_check_for_magpie_fix () { | |
| 211 | - if (isset($_POST['action']) and $_POST['action']=='fix_magpie_version') : | |
| 212 | - FeedWordPressCompatibility::validate_http_request(/*action=*/ 'feedwordpress_fix_magpie', /*capability=*/ 'edit_files'); | |
| 213 | - | |
| 214 | - $back_to = $_SERVER['REQUEST_URI']; | |
| 215 | - if (isset($_POST['ignore'])) : | |
| 216 | - // kill error message by telling it to expect whatever we've got | |
| 217 | - update_option('feedwordpress_expected_magpie', FeedWordPress::magpie_version()); | |
| 218 | - $ret = 'ignored'; | |
| 219 | - elseif (isset($_POST['upgrade'])) : | |
| 220 | - $source = dirname(__FILE__)."/MagpieRSS-upgrade/rss.php"; | |
| 221 | - $destination = ABSPATH . WPINC . '/rss.php'; | |
| 222 | - $success = @copy($source, $destination); | |
| 223 | - $ret = (int) $success; | |
| 224 | - endif; | |
| 225 | - | |
| 226 | - if (strpos($back_to, '?')===false) : $sep = '?'; | |
| 227 | - else : $sep = '&'; | |
| 228 | - endif; | |
| 229 | - | |
| 230 | - header("Location: {$back_to}{$sep}feedwordpress_magpie_fix=".$ret); | |
| 231 | - exit; | |
| 232 | - endif; | |
| 233 | -} /* feedwordpress_check_for_magpie_fix() */ | |
| 234 | - | |
| 235 | 202 | function feedwordpress_auto_update () { |
| 236 | 203 | if (FeedWordPress::stale()) : |
| 237 | 204 | $feedwordpress =& new FeedWordPress; |
| 238 | 205 | $feedwordpress->update(); |
| @@ -396,13 +363,9 @@ | ||
| 396 | 363 | |
| 397 | 364 | function feedwordpress_preserve_syndicated_content ($text) { |
| 398 | 365 | global $feedwordpress_the_syndicated_content; |
| 399 | 366 | |
| 400 | - $globalExpose = (get_option('feedwordpress_formatting_filters') == 'yes'); | |
| 401 | - $localExpose = get_post_custom_values('_feedwordpress_formatting_filters'); | |
| 402 | - $expose = ($globalExpose or ((count($localExpose) > 0) and $localExpose[0])); | |
| 403 | - | |
| 404 | - if ( is_syndicated() and !$expose ) : | |
| 367 | + if ( is_syndicated() and get_option('feedwordpress_formatting_filters') != 'yes' ) : | |
| 405 | 368 | $feedwordpress_the_syndicated_content = $text; |
| 406 | 369 | else : |
| 407 | 370 | $feedwordpress_the_syndicated_content = NULL; |
| 408 | 371 | endif; |
| @@ -476,131 +439,14 @@ | ||
| 476 | 439 | $longoptions = __('Syndication Options'); |
| 477 | 440 | endif; |
| 478 | 441 | |
| 479 | 442 | call_user_func_array('add_menu_page', $menu); |
| 480 | - add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Posts', 'Posts', $fwp_capability['manage_options'], $fwp_path.'/posts-page.php'); | |
| 481 | - add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Authors', 'Authors', $fwp_capability['manage_options'], $fwp_path.'/authors-page.php'); | |
| 482 | - add_submenu_page($fwp_path.'/syndication.php', 'Categories & Tags', 'Categories & Tags', $fwp_capability['manage_options'], $fwp_path.'/categories-page.php'); | |
| 443 | + add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Authors', 'Authors', $fwp_capability['manage_options'], $fwp_path.'/authors.php'); | |
| 483 | 444 | add_submenu_page($fwp_path.'/syndication.php', $longoptions, $options, $fwp_capability['manage_options'], $fwp_path.'/syndication-options.php'); |
| 484 | 445 | |
| 485 | 446 | add_options_page($longoptions, 'Syndication', $fwp_capability['manage_options'], $fwp_path.'/syndication-options.php'); |
| 486 | -} /* function fwp_add_pages () */ | |
| 447 | +} // function fwp_add_pages () */ | |
| 487 | 448 | |
| 488 | -function fwp_check_debug () { | |
| 489 | - // This is a horrible fucking kludge that I have to do because the | |
| 490 | - // admin notice code is triggered before the code that updates the | |
| 491 | - // setting. | |
| 492 | - if (isset($_POST['feedwordpress_debug'])) : | |
| 493 | - $feedwordpress_debug = $_POST['feedwordpress_debug']; | |
| 494 | - else : | |
| 495 | - $feedwordpress_debug = get_option('feedwordpress_debug'); | |
| 496 | - endif; | |
| 497 | - if ($feedwordpress_debug==='yes') : | |
| 498 | -?> | |
| 499 | - <div class="error"> | |
| 500 | -<p><strong>FeedWordPress warning.</strong> Debugging mode is <strong>ON</strong>. | |
| 501 | -While it remains on, FeedWordPress displays many diagnostic error messages, | |
| 502 | -warnings, and notices that are ordinarily suppressed, and also turns off all | |
| 503 | -caching of feeds. Use with caution: this setting is absolutely inappropriate | |
| 504 | -for a production server.</p> | |
| 505 | - </div> | |
| 506 | -<?php | |
| 507 | - endif; | |
| 508 | -} /* function fwp_check_debug () */ | |
| 509 | - | |
| 510 | -define('DEFAULT_EXPECTED_MAGPIE_VERSION', '0.85'); | |
| 511 | -function fwp_check_magpie () { | |
| 512 | - if (isset($_REQUEST['feedwordpress_magpie_fix'])) : | |
| 513 | - if ($_REQUEST['feedwordpress_magpie_fix']=='ignored') : | |
| 514 | -?> | |
| 515 | -<div class="updated fade"> | |
| 516 | -<p>O.K., we'll ignore the problem for now. FeedWordPress will not display any | |
| 517 | -more error messages.</p> | |
| 518 | -</div> | |
| 519 | -<?php | |
| 520 | - elseif ((bool) $_REQUEST['feedwordpress_magpie_fix']) : | |
| 521 | -?> | |
| 522 | -<div class="updated fade"> | |
| 523 | -<p>Congratulations! Your MagpieRSS has been successfully upgraded to the version | |
| 524 | -shipped with FeedWordPress.</p> | |
| 525 | -</div> | |
| 526 | -<?php | |
| 527 | - else : | |
| 528 | - $source = dirname(__FILE__)."/MagpieRSS-upgrade/rss.php"; | |
| 529 | - $destination = ABSPATH . WPINC . '/rss.php'; | |
| 530 | - $cmd = "cp '".htmlspecialchars(addslashes($source))."' '".htmlspecialchars(addslashes($destination))."'"; | |
| 531 | - $cmd = wordwrap($cmd, /*width=*/ 75, /*break=*/ " \\\n\t"); | |
| 532 | - | |
| 533 | -?> | |
| 534 | -<div class="error"> | |
| 535 | -<p><strong>FeedWordPress was unable to automatically upgrade your copy of MagpieRSS.</strong></p> | |
| 536 | -<p>It's likely that you need to change the file permissions on <code><?php print htmlspecialchars($source); ?></code> | |
| 537 | -to allow FeedWordPress to overwrite it.</p> | |
| 538 | -<p><strong>To perform the upgrade manually,</strong> you can | |
| 539 | -use a SFTP or FTP client to upload a copy of <code>rss.php</code> from the | |
| 540 | -<code>MagpieRSS-upgrades/</code> directory of your FeedWordPress archive so that | |
| 541 | -it overwrites <code><?php print htmlspecialchars($destination); ?></code>. Or, | |
| 542 | -if your web host provides shell access, you can issue the following command from | |
| 543 | -a command prompt to perform the upgrade:</p> | |
| 544 | -<pre> | |
| 545 | -<samp>$</samp> <kbd><?php print $cmd; ?></kbd> | |
| 546 | -</pre> | |
| 547 | -<p><strong>If you've fixed the file permissions,</strong> you can try the | |
| 548 | -automatic upgrade again.</p> | |
| 549 | - | |
| 550 | -<?php feedwordpress_upgrade_old_and_busted_buttons(); ?> | |
| 551 | -</div> | |
| 552 | -<?php | |
| 553 | - endif; | |
| 554 | - else : | |
| 555 | - $magpie_version = FeedWordPress::magpie_version(); | |
| 556 | - | |
| 557 | - $exp = get_option('feedwordpress_expected_magpie'); | |
| 558 | - if ($exp) : $expected = array($exp, DEFAULT_EXPECTED_MAGPIE_VERSION); | |
| 559 | - else : $expected = array(DEFAULT_EXPECTED_MAGPIE_VERSION); | |
| 560 | - endif; | |
| 561 | - | |
| 562 | - if (in_array($magpie_version, $expected)) : | |
| 563 | - if ($magpie_version != $exp) : | |
| 564 | - update_option('feedwordpress_expected_magpie', $magpie_version); | |
| 565 | - endif; | |
| 566 | - else : | |
| 567 | - if (current_user_can('edit_files')) : | |
| 568 | - $youAre = 'you are'; | |
| 569 | - $itIsRecommendedThatYou = 'It is <strong>strongly recommended</strong> that you'; | |
| 570 | - else : | |
| 571 | - $youAre = 'this site is'; | |
| 572 | - $itIsRecommendedThatYou = 'You may want to contact the administrator of the site; it is <strong>strongly recommended</strong> that they'; | |
| 573 | - endif; | |
| 574 | - print '<div class="error">'; | |
| 575 | -?> | |
| 576 | -<p style="font-style: italic"><strong>FeedWordPress has detected that <?php print $youAre; ?> currently using a version of | |
| 577 | -MagpieRSS other than the upgraded version that ships with FeedWordPress.</strong></p> | |
| 578 | -<p><?php print $itIsRecommendedThatYou; ?> install the upgraded | |
| 579 | -version of MagpieRSS supplied with FeedWordPress. The version of | |
| 580 | -MagpieRSS that ships with WordPress is very old and buggy, and | |
| 581 | -encounters a number of errors when trying to parse modern Atom | |
| 582 | -and RSS feeds.</p> | |
| 583 | -<?php | |
| 584 | - feedwordpress_upgrade_old_and_busted_buttons(); | |
| 585 | - print '</div>'; | |
| 586 | - endif; | |
| 587 | - endif; | |
| 588 | -} | |
| 589 | - | |
| 590 | -function feedwordpress_upgrade_old_and_busted_buttons() { | |
| 591 | - if (current_user_can('edit_files')) : | |
| 592 | -?> | |
| 593 | -<form action="" method="post"><div> | |
| 594 | -<?php FeedWordPressCompatibility::stamp_nonce('feedwordpress_fix_magpie'); ?> | |
| 595 | -<input type="hidden" name="action" value="fix_magpie_version" /> | |
| 596 | -<input class="button-secondary" type="submit" name="ignore" value="<?php _e('Ignore this problem'); ?>" /> | |
| 597 | -<input class="button-primary" type="submit" name="upgrade" value="<?php _e('Upgrade'); ?>" /> | |
| 598 | -</div></form> | |
| 599 | -<?php | |
| 600 | - endif; | |
| 601 | -} | |
| 602 | - | |
| 603 | 449 | ################################################################################ |
| 604 | 450 | ## fwp_hold_pings() and fwp_release_pings(): Outbound XML-RPC ping reform #### |
| 605 | 451 | ## ... 'coz it's rude to send 500 pings the first time your aggregator runs #### |
| 606 | 452 | ################################################################################ |
| @@ -954,12 +800,12 @@ | ||
| 954 | 800 | // WordPress 2.3 introduces a new taxonomy/term API |
| 955 | 801 | if (function_exists('is_term')) : |
| 956 | 802 | $cat_id = is_term($cat, 'link_category'); |
| 957 | 803 | // WordPress 2.1 and 2.2 use a common table for both link and post categories |
| 958 | - elseif (fwp_test_wp_version(FWP_SCHEMA_21, FWP_SCHEMA_23)) : | |
| 804 | + elseif (isset($wp_db_version) and ($wp_db_version >= FWP_SCHEMA_21 and $wp_db_version < FWP_SCHEMA_23) ) : | |
| 959 | 805 | $cat_id = $wpdb->get_var("SELECT cat_id FROM {$wpdb->categories} WHERE cat_name='$cat'"); |
| 960 | 806 | // WordPress 1.5 and 2.0.x have a separate table for link categories |
| 961 | - elseif (fwp_test_wp_version(0, FWP_SCHEMA_21)): | |
| 807 | + elseif (!isset($wp_db_version) or $wp_db_version < FWP_SCHEMA_21) : | |
| 962 | 808 | $cat_id = $wpdb->get_var("SELECT cat_id FROM {$wpdb->linkcategories} WHERE cat_name='$cat'"); |
| 963 | 809 | // This should never happen. |
| 964 | 810 | else : |
| 965 | 811 | FeedWordPress::critical_bug('FeedWordPress::link_category_id::wp_db_version', $wp_db_version, __LINE__); |
| @@ -1095,15 +941,8 @@ | ||
| 1095 | 941 | CREATE INDEX {$wpdb->posts}_guid_idx ON {$wpdb->posts}(guid) |
| 1096 | 942 | "); |
| 1097 | 943 | } /* FeedWordPress::create_guid_index () */ |
| 1098 | 944 | |
| 1099 | - function magpie_version () { | |
| 1100 | - if (!defined('MAGPIE_VERSION')) : $magpie_version = $GLOBALS['wp_version'].'-default'; | |
| 1101 | - else : $magpie_version = MAGPIE_VERSION; | |
| 1102 | - endif; | |
| 1103 | - return $magpie_version; | |
| 1104 | - } | |
| 1105 | - | |
| 1106 | 945 | # Utility functions for handling text settings |
| 1107 | 946 | function negative ($f, $setting) { |
| 1108 | 947 | $nego = array ('n', 'no', 'f', 'false'); |
| 1109 | 948 | return (isset($f[$setting]) and in_array(strtolower($f[$setting]), $nego)); |
| @@ -1118,18 +957,13 @@ | ||
| 1118 | 957 | # Internal debugging functions |
| 1119 | 958 | function critical_bug ($varname, $var, $line) { |
| 1120 | 959 | global $wp_version; |
| 1121 | 960 | |
| 1122 | - if (defined('MAGPIE_VERSION')) : $mv = MAGPIE_VERSION; | |
| 1123 | - else : $mv = 'WordPress '.$wp_version.' default.'; | |
| 1124 | - endif; | |
| 1125 | - | |
| 1126 | 961 | 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>'; |
| 1127 | 962 | echo "\n<plaintext>"; |
| 1128 | 963 | echo "Triggered at line # ".$line."\n"; |
| 1129 | 964 | echo "FeedWordPress version: ".FEEDWORDPRESS_VERSION."\n"; |
| 1130 | - echo "MagpieRSS version: {$mv}\n"; | |
| 1131 | - echo "WordPress version: {$wp_version}\n"; | |
| 965 | + echo "WordPress version: $wp_version\n"; | |
| 1132 | 966 | echo "PHP version: ".phpversion()."\n"; |
| 1133 | 967 | echo "\n"; |
| 1134 | 968 | echo $varname.": "; var_dump($var); echo "\n"; |
| 1135 | 969 | die; |
| @@ -1149,8 +983,9 @@ | ||
| 1149 | 983 | var $feed = null; |
| 1150 | 984 | var $feedmeta = null; |
| 1151 | 985 | |
| 1152 | 986 | var $post = array (); |
| 987 | + var $_base = null; | |
| 1153 | 988 | |
| 1154 | 989 | var $_freshness = null; |
| 1155 | 990 | var $_wp_id = null; |
| 1156 | 991 | |
| @@ -1194,11 +1029,9 @@ | ||
| 1194 | 1029 | $this->post['named']['author'] = apply_filters('syndicated_item_author', $this->author(), $this); |
| 1195 | 1030 | |
| 1196 | 1031 | # Identify content and sanitize it. |
| 1197 | 1032 | # --------------------------------- |
| 1198 | - if (isset($this->item['atom_content'])) : | |
| 1199 | - $content = $this->item['atom_content']; | |
| 1200 | - elseif (isset($this->item['xhtml']['body'])) : | |
| 1033 | + if (isset($this->item['xhtml']['body'])) : | |
| 1201 | 1034 | $content = $this->item['xhtml']['body']; |
| 1202 | 1035 | elseif (isset($this->item['xhtml']['div'])) : |
| 1203 | 1036 | $content = $this->item['xhtml']['div']; |
| 1204 | 1037 | elseif (isset($this->item['content']['encoded']) and $this->item['content']['encoded']): |
| @@ -1247,26 +1080,8 @@ | ||
| 1247 | 1080 | |
| 1248 | 1081 | // Unique ID (hopefully a unique tag: URI); failing that, the permalink |
| 1249 | 1082 | $this->post['guid'] = apply_filters('syndicated_item_guid', $this->guid(), $this); |
| 1250 | 1083 | |
| 1251 | - // User-supplied custom settings to apply to each post. Do first so that FWP-generated custom settings will overwrite if necessary; thus preventing any munging | |
| 1252 | - $default_custom_settings = get_option('feedwordpress_custom_settings'); | |
| 1253 | - if ($default_custom_settings) : | |
| 1254 | - $default_custom_settings = unserialize($default_custom_settings); | |
| 1255 | - endif; | |
| 1256 | - if (!is_array($default_custom_settings)) : | |
| 1257 | - $default_custom_settings = array(); | |
| 1258 | - endif; | |
| 1259 | - | |
| 1260 | - $custom_settings = $this->link->settings['postmeta']; | |
| 1261 | - if ($custom_settings) : | |
| 1262 | - $custom_settings = unserialize($custom_settings); | |
| 1263 | - endif; | |
| 1264 | - if (!is_array($custom_settings)) : | |
| 1265 | - $custom_settings = array(); | |
| 1266 | - endif; | |
| 1267 | - $this->post['meta'] = array_merge($default_custom_settings, $custom_settings); | |
| 1268 | - | |
| 1269 | 1084 | // RSS 2.0 / Atom 1.0 enclosure support |
| 1270 | 1085 | if ( isset($this->item['enclosure#']) ) : |
| 1271 | 1086 | for ($i = 1; $i <= $this->item['enclosure#']; $i++) : |
| 1272 | 1087 | $eid = (($i > 1) ? "#{$id}" : ""); |
| @@ -1507,223 +1322,187 @@ | ||
| 1507 | 1322 | } // function SyndicatedPost::store () |
| 1508 | 1323 | |
| 1509 | 1324 | function insert_new () { |
| 1510 | 1325 | global $wpdb, $wp_db_version; |
| 1511 | - | |
| 1512 | - $dbpost = $this->normalize_post(/*new=*/ true); | |
| 1513 | - if (!is_null($dbpost)) : | |
| 1514 | - if ($this->use_api('wp_insert_post')) : | |
| 1515 | - $dbpost['post_pingback'] = false; // Tell WP 2.1 and 2.2 not to process for pingbacks | |
| 1516 | - | |
| 1517 | - // This is a ridiculous fucking kludge necessitated by WordPress 2.6 munging authorship meta-data | |
| 1518 | - add_action('_wp_put_post_revision', array($this, 'fix_revision_meta')); | |
| 1519 | - | |
| 1520 | - // Kludge to prevent kses filters from stripping the | |
| 1521 | - // content of posts when updating without a logged in | |
| 1522 | - // user who has `unfiltered_html` capability. | |
| 1523 | - add_filter('content_save_pre', array($this, 'avoid_kses_munge'), 11); | |
| 1524 | - | |
| 1525 | - $this->_wp_id = wp_insert_post($dbpost); | |
| 1526 | - | |
| 1527 | - // Turn off ridiculous fucking kludges #1 and #2 | |
| 1528 | - remove_action('_wp_put_post_revision', array($this, 'fix_revision_meta')); | |
| 1529 | - remove_filter('content_save_pre', array($this, 'avoid_kses_munge'), 11); | |
| 1530 | - | |
| 1531 | - $this->validate_post_id($dbpost, array(__CLASS__, __FUNCTION__)); | |
| 1532 | - | |
| 1533 | - // Unfortunately, as of WordPress 2.3, wp_insert_post() | |
| 1534 | - // *still* offers no way to use a guid of your choice, | |
| 1535 | - // and munges your post modified timestamp, too. | |
| 1536 | - $result = $wpdb->query(" | |
| 1537 | - UPDATE $wpdb->posts | |
| 1538 | - SET | |
| 1539 | - guid='{$dbpost['guid']}', | |
| 1540 | - post_modified='{$dbpost['post_modified']}', | |
| 1541 | - post_modified_gmt='{$dbpost['post_modified_gmt']}' | |
| 1542 | - WHERE ID='{$this->_wp_id}' | |
| 1543 | - "); | |
| 1326 | + | |
| 1327 | + // Why the fuck doesn't wp_insert_post already do this? | |
| 1328 | + foreach ($this->post as $key => $value) : | |
| 1329 | + if (is_string($value)) : | |
| 1330 | + $dbpost[$key] = $wpdb->escape($value); | |
| 1544 | 1331 | else : |
| 1545 | - # The right way to do this is the above. But, alas, | |
| 1546 | - # in earlier versions of WordPress, wp_insert_post has | |
| 1547 | - # too much behavior (mainly related to pings) that can't | |
| 1548 | - # be overridden. In WordPress 1.5, it's enough of a | |
| 1549 | - # resource hog to make PHP segfault after inserting | |
| 1550 | - # 50-100 posts. This can get pretty annoying, especially | |
| 1551 | - # if you are trying to update your feeds for the first | |
| 1552 | - # time. | |
| 1553 | - | |
| 1554 | - $result = $wpdb->query(" | |
| 1555 | - INSERT INTO $wpdb->posts | |
| 1556 | - SET | |
| 1557 | - guid = '{$dbpost['guid']}', | |
| 1558 | - post_author = '{$dbpost['post_author']}', | |
| 1559 | - post_date = '{$dbpost['post_date']}', | |
| 1560 | - post_date_gmt = '{$dbpost['post_date_gmt']}', | |
| 1561 | - post_content = '{$dbpost['post_content']}'," | |
| 1562 | - .(isset($dbpost['post_excerpt']) ? "post_excerpt = '{$dbpost['post_excerpt']}'," : "")." | |
| 1563 | - post_title = '{$dbpost['post_title']}', | |
| 1564 | - post_name = '{$dbpost['post_name']}', | |
| 1565 | - post_modified = '{$dbpost['post_modified']}', | |
| 1566 | - post_modified_gmt = '{$dbpost['post_modified_gmt']}', | |
| 1567 | - comment_status = '{$dbpost['comment_status']}', | |
| 1568 | - ping_status = '{$dbpost['ping_status']}', | |
| 1569 | - post_status = '{$dbpost['post_status']}' | |
| 1570 | - "); | |
| 1571 | - $this->_wp_id = $wpdb->insert_id; | |
| 1572 | - | |
| 1573 | - $this->validate_post_id($dbpost, array(__CLASS__, __FUNCTION__)); | |
| 1574 | - | |
| 1575 | - // WordPress 1.5.x - 2.0.x | |
| 1576 | - wp_set_post_cats('1', $this->wp_id(), $this->post['post_category']); | |
| 1577 | - | |
| 1578 | - // Since we are not going through official channels, we need to | |
| 1579 | - // manually tell WordPress that we've published a new post. | |
| 1580 | - // We need to make sure to do this in order for FeedWordPress | |
| 1581 | - // to play well with the staticize-reloaded plugin (something | |
| 1582 | - // that a large aggregator website is going to *want* to be | |
| 1583 | - // able to use). | |
| 1584 | - do_action('publish_post', $this->_wp_id); | |
| 1332 | + $dbpost[$key] = $value; | |
| 1585 | 1333 | endif; |
| 1334 | + endforeach; | |
| 1335 | + | |
| 1336 | + if (strlen($dbpost['post_title'].$dbpost['post_content'].$dbpost['post_excerpt']) == 0) : | |
| 1337 | + // FIXME: Option for filtering out empty posts | |
| 1586 | 1338 | endif; |
| 1587 | - } /* SyndicatedPost::insert_new() */ | |
| 1339 | + if (strlen($dbpost['post_title'])==0) : | |
| 1340 | + $dbpost['post_title'] = $this->post['meta']['syndication_source'] | |
| 1341 | + .' '.gmdate('Y-m-d H:i:s', $this->published() + $offset); | |
| 1342 | + // FIXME: Option for what to fill a blank title with... | |
| 1343 | + endif; | |
| 1588 | 1344 | |
| 1589 | - function update_existing () { | |
| 1590 | - global $wpdb; | |
| 1345 | + if ($this->use_api('wp_insert_post')) : | |
| 1346 | + $dbpost['post_pingback'] = false; // Tell WP 2.1 and 2.2 not to process for pingbacks | |
| 1591 | 1347 | |
| 1592 | - // Why the fuck doesn't wp_insert_post already do this? | |
| 1593 | - $dbpost = $this->normalize_post(/*new=*/ false); | |
| 1594 | - if (!is_null($dbpost)) : | |
| 1595 | - if ($this->use_api('wp_insert_post')) : | |
| 1596 | - $dbpost['post_pingback'] = false; // Tell WP 2.1 and 2.2 not to process for pingbacks | |
| 1597 | - | |
| 1598 | - // This is a ridiculous fucking kludge necessitated by WordPress 2.6 munging authorship meta-data | |
| 1599 | - add_action('_wp_put_post_revision', array($this, 'fix_revision_meta')); | |
| 1600 | - | |
| 1601 | - // Kludge to prevent kses filters from stripping the | |
| 1602 | - // content of posts when updating without a logged in | |
| 1603 | - // user who has `unfiltered_html` capability. | |
| 1604 | - add_filter('content_save_pre', array($this, 'avoid_kses_munge'), 11); | |
| 1348 | + // This is a ridiculous fucking kludge necessitated by WordPress 2.6 munging authorship meta-data | |
| 1349 | + add_action('_wp_put_post_revision', array($this, 'fix_revision_meta')); | |
| 1350 | + | |
| 1351 | + // Kludge to prevent kses filters from stripping the | |
| 1352 | + // content of posts when updating without a logged in | |
| 1353 | + // user who has `unfiltered_html` capability. | |
| 1354 | + add_filter('content_save_pre', array($this, 'avoid_kses_munge'), 11); | |
| 1355 | + | |
| 1356 | + $this->_wp_id = wp_insert_post($dbpost); | |
| 1605 | 1357 | |
| 1606 | - // Don't munge status fields that the user may have reset manually | |
| 1607 | - if (function_exists('get_post_field')) : | |
| 1608 | - $doNotMunge = array('post_status', 'comment_status', 'ping_status'); | |
| 1609 | - foreach ($doNotMunge as $field) : | |
| 1610 | - $dbpost[$field] = get_post_field($field, $this->wp_id()); | |
| 1611 | - endforeach; | |
| 1612 | - endif; | |
| 1358 | + // Turn off ridiculous fucking kludges #1 and #2 | |
| 1359 | + remove_action('_wp_put_post_revision', array($this, 'fix_revision_meta')); | |
| 1360 | + remove_filter('content_save_pre', array($this, 'avoid_kses_munge'), 11); | |
| 1613 | 1361 | |
| 1614 | - $this->_wp_id = wp_insert_post($dbpost); | |
| 1362 | + // This should never happen. | |
| 1363 | + if (!is_numeric($this->_wp_id) or ($this->_wp_id == 0)) : | |
| 1364 | + FeedWordPress::critical_bug('SyndicatedPost (_wp_id problem)', array("dbpost" => $dbpost, "this" => $this), __LINE__); | |
| 1365 | + endif; | |
| 1615 | 1366 | |
| 1616 | - // Turn off ridiculous fucking kludges #1 and #2 | |
| 1617 | - remove_action('_wp_put_post_revision', array($this, 'fix_revision_meta')); | |
| 1618 | - remove_filter('content_save_pre', array($this, 'avoid_kses_munge'), 11); | |
| 1619 | - | |
| 1620 | - $this->validate_post_id($dbpost, array(__CLASS__, __FUNCTION__)); | |
| 1621 | - | |
| 1622 | - // Unfortunately, as of WordPress 2.3, wp_insert_post() | |
| 1623 | - // munges your post modified timestamp. | |
| 1624 | - $result = $wpdb->query(" | |
| 1625 | - UPDATE $wpdb->posts | |
| 1626 | - SET | |
| 1627 | - post_modified='{$dbpost['post_modified']}', | |
| 1628 | - post_modified_gmt='{$dbpost['post_modified_gmt']}' | |
| 1629 | - WHERE ID='{$this->_wp_id}' | |
| 1630 | - "); | |
| 1631 | - else : | |
| 1632 | - | |
| 1633 | - $result = $wpdb->query(" | |
| 1367 | + // Unfortunately, as of WordPress 2.3, wp_insert_post() | |
| 1368 | + // *still* offers no way to use a guid of your choice, | |
| 1369 | + // and munges your post modified timestamp, too. | |
| 1370 | + $result = $wpdb->query(" | |
| 1634 | 1371 | UPDATE $wpdb->posts |
| 1635 | 1372 | SET |
| 1636 | - post_author = '{$dbpost['post_author']}', | |
| 1637 | - post_content = '{$dbpost['post_content']}'," | |
| 1638 | - .(isset($dbpost['post_excerpt']) ? "post_excerpt = '{$dbpost['post_excerpt']}'," : "")." | |
| 1639 | - post_title = '{$dbpost['post_title']}', | |
| 1640 | - post_name = '{$dbpost['post_name']}', | |
| 1641 | - post_modified = '{$dbpost['post_modified']}', | |
| 1642 | - post_modified_gmt = '{$dbpost['post_modified_gmt']}' | |
| 1643 | - WHERE guid='{$dbpost['guid']}' | |
| 1644 | - "); | |
| 1645 | - | |
| 1646 | - // WordPress 2.1.x and up | |
| 1647 | - if (function_exists('wp_set_post_categories')) : | |
| 1648 | - wp_set_post_categories($this->wp_id(), $this->post['post_category']); | |
| 1649 | - // WordPress 1.5.x - 2.0.x | |
| 1650 | - elseif (function_exists('wp_set_post_cats')) : | |
| 1651 | - wp_set_post_cats('1', $this->wp_id(), $this->post['post_category']); | |
| 1652 | - // This should never happen. | |
| 1653 | - else : | |
| 1654 | - FeedWordPress::critical_bug(__CLASS__.'::'.__FUNCTION.'(): no post categorizing function', array("dbpost" => $dbpost, "this" => $this), __LINE__); | |
| 1655 | - endif; | |
| 1656 | - | |
| 1657 | - // Since we are not going through official channels, we need to | |
| 1658 | - // manually tell WordPress that we've published a new post. | |
| 1659 | - // We need to make sure to do this in order for FeedWordPress | |
| 1660 | - // to play well with the staticize-reloaded plugin (something | |
| 1661 | - // that a large aggregator website is going to *want* to be | |
| 1662 | - // able to use). | |
| 1663 | - do_action('edit_post', $this->post['ID']); | |
| 1373 | + guid='{$dbpost['guid']}', | |
| 1374 | + post_modified='{$dbpost['post_modified']}', | |
| 1375 | + post_modified_gmt='{$dbpost['post_modified_gmt']}' | |
| 1376 | + WHERE ID='{$this->_wp_id}' | |
| 1377 | + "); | |
| 1378 | + else : | |
| 1379 | + # The right way to do this is the above. But, alas, | |
| 1380 | + # in earlier versions of WordPress, wp_insert_post has | |
| 1381 | + # too much behavior (mainly related to pings) that can't | |
| 1382 | + # be overridden. In WordPress 1.5, it's enough of a | |
| 1383 | + # resource hog to make PHP segfault after inserting | |
| 1384 | + # 50-100 posts. This can get pretty annoying, especially | |
| 1385 | + # if you are trying to update your feeds for the first | |
| 1386 | + # time. | |
| 1387 | + | |
| 1388 | + $result = $wpdb->query(" | |
| 1389 | + INSERT INTO $wpdb->posts | |
| 1390 | + SET | |
| 1391 | + guid = '{$dbpost['guid']}', | |
| 1392 | + post_author = '{$dbpost['post_author']}', | |
| 1393 | + post_date = '{$dbpost['post_date']}', | |
| 1394 | + post_date_gmt = '{$dbpost['post_date_gmt']}', | |
| 1395 | + post_content = '{$dbpost['post_content']}'," | |
| 1396 | + .(isset($dbpost['post_excerpt']) ? "post_excerpt = '{$dbpost['post_excerpt']}'," : "")." | |
| 1397 | + post_title = '{$dbpost['post_title']}', | |
| 1398 | + post_name = '{$dbpost['post_name']}', | |
| 1399 | + post_modified = '{$dbpost['post_modified']}', | |
| 1400 | + post_modified_gmt = '{$dbpost['post_modified_gmt']}', | |
| 1401 | + comment_status = '{$dbpost['comment_status']}', | |
| 1402 | + ping_status = '{$dbpost['ping_status']}', | |
| 1403 | + post_status = '{$dbpost['post_status']}' | |
| 1404 | + "); | |
| 1405 | + $this->_wp_id = $wpdb->insert_id; | |
| 1406 | + | |
| 1407 | + // This should never happen. | |
| 1408 | + if (!is_numeric($this->_wp_id) or ($this->_wp_id == 0)) : | |
| 1409 | + FeedWordPress::critical_bug('SyndicatedPost (_wp_id problem)', array("dbpost" => $dbpost, "this" => $this), __LINE__); | |
| 1664 | 1410 | endif; |
| 1411 | + | |
| 1412 | + // WordPress 1.5.x - 2.0.x | |
| 1413 | + wp_set_post_cats('1', $this->wp_id(), $this->post['post_category']); | |
| 1414 | + | |
| 1415 | + // Since we are not going through official channels, we need to | |
| 1416 | + // manually tell WordPress that we've published a new post. | |
| 1417 | + // We need to make sure to do this in order for FeedWordPress | |
| 1418 | + // to play well with the staticize-reloaded plugin (something | |
| 1419 | + // that a large aggregator website is going to *want* to be | |
| 1420 | + // able to use). | |
| 1421 | + do_action('publish_post', $this->_wp_id); | |
| 1665 | 1422 | endif; |
| 1666 | - } /* SyndicatedPost::update_existing() */ | |
| 1423 | + } /* SyndicatedPost::insert_new() */ | |
| 1667 | 1424 | |
| 1668 | - /** | |
| 1669 | - * SyndicatedPost::normalize_post() | |
| 1670 | - * | |
| 1671 | - * @param bool $new If true, this post is to be inserted anew. If false, it is an update of an existing post. | |
| 1672 | - * @return array A normalized representation of the post ready to be inserted into the database or sent to the WordPress API functions | |
| 1673 | - */ | |
| 1674 | - function normalize_post ($new = true) { | |
| 1425 | + function update_existing () { | |
| 1675 | 1426 | global $wpdb; |
| 1676 | 1427 | |
| 1677 | - $out = array(); | |
| 1678 | - | |
| 1679 | 1428 | // Why the fuck doesn't wp_insert_post already do this? |
| 1429 | + $dbpost = array(); | |
| 1680 | 1430 | foreach ($this->post as $key => $value) : |
| 1681 | 1431 | if (is_string($value)) : |
| 1682 | - $out[$key] = $wpdb->escape($value); | |
| 1432 | + $dbpost[$key] = $wpdb->escape($value); | |
| 1683 | 1433 | else : |
| 1684 | - $out[$key] = $value; | |
| 1434 | + $dbpost[$key] = $value; | |
| 1685 | 1435 | endif; |
| 1686 | 1436 | endforeach; |
| 1687 | 1437 | |
| 1688 | - if (strlen($out['post_title'].$out['post_content'].$out['post_excerpt']) == 0) : | |
| 1689 | - // FIXME: Option for filtering out empty posts | |
| 1690 | - endif; | |
| 1691 | - if (strlen($out['post_title'])==0) : | |
| 1692 | - $offset = (int) get_option('gmt_offset') * 60 * 60; | |
| 1693 | - $out['post_title'] = | |
| 1694 | - $this->post['meta']['syndication_source'] | |
| 1695 | - .' '.gmdate('Y-m-d H:i:s', $this->published() + $offset); | |
| 1696 | - // FIXME: Option for what to fill a blank title with... | |
| 1697 | - endif; | |
| 1438 | + if ($this->use_api('wp_insert_post')) : | |
| 1439 | + $dbpost['post_pingback'] = false; // Tell WP 2.1 and 2.2 not to process for pingbacks | |
| 1698 | 1440 | |
| 1699 | - return $out; | |
| 1700 | - } | |
| 1441 | + // This is a ridiculous fucking kludge necessitated by WordPress 2.6 munging authorship meta-data | |
| 1442 | + add_action('_wp_put_post_revision', array($this, 'fix_revision_meta')); | |
| 1701 | 1443 | |
| 1702 | - /** | |
| 1703 | - * SyndicatedPost::validate_post_id() | |
| 1704 | - * | |
| 1705 | - * @param array $dbpost An array representing the post we attempted to insert or update | |
| 1706 | - * @param mixed $ns A string or array representing the namespace (class, method) whence this method was called. | |
| 1707 | - */ | |
| 1708 | - function validate_post_id ($dbpost, $ns) { | |
| 1709 | - if (is_array($ns)) : $ns = implode('::', $ns); | |
| 1710 | - else : $ns = (string) $ns; endif; | |
| 1711 | - | |
| 1712 | - // This should never happen. | |
| 1713 | - if (!is_numeric($this->_wp_id) or ($this->_wp_id == 0)) : | |
| 1714 | - FeedWordPress::critical_bug( | |
| 1715 | - /*name=*/ $ns.'::_wp_id', | |
| 1716 | - /*var =*/ array( | |
| 1717 | - "\$this->_wp_id" => $this->_wp_id, | |
| 1718 | - "\$dbpost" => $dbpost, | |
| 1719 | - "\$this" => $this | |
| 1720 | - ), | |
| 1721 | - /*line # =*/ __LINE__ | |
| 1722 | - ); | |
| 1444 | + // Kludge to prevent kses filters from stripping the | |
| 1445 | + // content of posts when updating without a logged in | |
| 1446 | + // user who has `unfiltered_html` capability. | |
| 1447 | + add_filter('content_save_pre', array($this, 'avoid_kses_munge'), 11); | |
| 1448 | + | |
| 1449 | + $this->_wp_id = wp_insert_post($dbpost); | |
| 1450 | + | |
| 1451 | + // Turn off ridiculous fucking kludges #1 and #2 | |
| 1452 | + remove_action('_wp_put_post_revision', array($this, 'fix_revision_meta')); | |
| 1453 | + remove_filter('content_save_pre', array($this, 'avoid_kses_munge'), 11); | |
| 1454 | + | |
| 1455 | + // This should never happen. | |
| 1456 | + if (!is_numeric($this->_wp_id) or ($this->_wp_id == 0)) : | |
| 1457 | + FeedWordPress::critical_bug('SyndicatedPost (_wp_id problem)', array("dbpost" => $dbpost, "this" => $this), __LINE__); | |
| 1458 | + endif; | |
| 1459 | + | |
| 1460 | + // Unfortunately, as of WordPress 2.3, wp_insert_post() | |
| 1461 | + // munges your post modified timestamp. | |
| 1462 | + $result = $wpdb->query(" | |
| 1463 | + UPDATE $wpdb->posts | |
| 1464 | + SET | |
| 1465 | + post_modified='{$dbpost['post_modified']}', | |
| 1466 | + post_modified_gmt='{$dbpost['post_modified_gmt']}' | |
| 1467 | + WHERE ID='{$this->_wp_id}' | |
| 1468 | + "); | |
| 1469 | + else : | |
| 1470 | + | |
| 1471 | + $result = $wpdb->query(" | |
| 1472 | + UPDATE $wpdb->posts | |
| 1473 | + SET | |
| 1474 | + post_author = '{$dbpost['post_author']}', | |
| 1475 | + post_content = '{$dbpost['post_content']}'," | |
| 1476 | + .(isset($dbpost['post_excerpt']) ? "post_excerpt = '{$dbpost['post_excerpt']}'," : "")." | |
| 1477 | + post_title = '{$dbpost['post_title']}', | |
| 1478 | + post_name = '{$dbpost['post_name']}', | |
| 1479 | + post_modified = '{$dbpost['post_modified']}', | |
| 1480 | + post_modified_gmt = '{$dbpost['post_modified_gmt']}' | |
| 1481 | + WHERE guid='{$dbpost['guid']}' | |
| 1482 | + "); | |
| 1483 | + | |
| 1484 | + // WordPress 2.1.x and up | |
| 1485 | + if (function_exists('wp_set_post_categories')) : | |
| 1486 | + wp_set_post_categories($this->wp_id(), $this->post['post_category']); | |
| 1487 | + // WordPress 1.5.x - 2.0.x | |
| 1488 | + elseif (function_exists('wp_set_post_cats')) : | |
| 1489 | + wp_set_post_cats('1', $this->wp_id(), $this->post['post_category']); | |
| 1490 | + // This should never happen. | |
| 1491 | + else : | |
| 1492 | + FeedWordPress::critical_bug('SyndicatedPost (_wp_id problem)', array("dbpost" => $dbpost, "this" => $this), __LINE__); | |
| 1493 | + endif; | |
| 1494 | + | |
| 1495 | + // Since we are not going through official channels, we need to | |
| 1496 | + // manually tell WordPress that we've published a new post. | |
| 1497 | + // We need to make sure to do this in order for FeedWordPress | |
| 1498 | + // to play well with the staticize-reloaded plugin (something | |
| 1499 | + // that a large aggregator website is going to *want* to be | |
| 1500 | + // able to use). | |
| 1501 | + do_action('edit_post', $this->post['ID']); | |
| 1723 | 1502 | endif; |
| 1724 | - } /* SyndicatedPost::validate_post_id() */ | |
| 1725 | - | |
| 1503 | + } /* SyndicatedPost::update_existing() */ | |
| 1504 | + | |
| 1726 | 1505 | /** |
| 1727 | 1506 | * SyndicatedPost::fix_revision_meta() - Fixes the way WP 2.6+ fucks up |
| 1728 | 1507 | * meta-data (authorship, etc.) when storing revisions of an updated |
| 1729 | 1508 | * syndicated post. |
| @@ -2248,87 +2027,25 @@ | ||
| 2248 | 2027 | |
| 2249 | 2028 | return $author; |
| 2250 | 2029 | } // SyndicatedPost::author() |
| 2251 | 2030 | |
| 2252 | - var $uri_attrs = array ( | |
| 2253 | - array('a', 'href'), | |
| 2254 | - array('applet', 'codebase'), | |
| 2255 | - array('area', 'href'), | |
| 2256 | - array('blockquote', 'cite'), | |
| 2257 | - array('body', 'background'), | |
| 2258 | - array('del', 'cite'), | |
| 2259 | - array('form', 'action'), | |
| 2260 | - array('frame', 'longdesc'), | |
| 2261 | - array('frame', 'src'), | |
| 2262 | - array('iframe', 'longdesc'), | |
| 2263 | - array('iframe', 'src'), | |
| 2264 | - array('head', 'profile'), | |
| 2265 | - array('img', 'longdesc'), | |
| 2266 | - array('img', 'src'), | |
| 2267 | - array('img', 'usemap'), | |
| 2268 | - array('input', 'src'), | |
| 2269 | - array('input', 'usemap'), | |
| 2270 | - array('ins', 'cite'), | |
| 2271 | - array('link', 'href'), | |
| 2272 | - array('object', 'classid'), | |
| 2273 | - array('object', 'codebase'), | |
| 2274 | - array('object', 'data'), | |
| 2275 | - array('object', 'usemap'), | |
| 2276 | - array('q', 'cite'), | |
| 2277 | - array('script', 'src') | |
| 2278 | - ); /* var SyndicatedPost::$uri_attrs */ | |
| 2279 | - | |
| 2280 | - var $_base = null; | |
| 2281 | - | |
| 2282 | - function resolve_single_relative_uri ($refs) { | |
| 2283 | - $tag = FeedWordPressHTML::attributeMatch($refs); | |
| 2284 | - $url = Relative_URI::resolve($tag['value'], $this->_base); | |
| 2285 | - return $tag['prefix'] . $url . $tag['suffix']; | |
| 2286 | - } /* function SyndicatedPost::resolve_single_relative_uri() */ | |
| 2287 | - | |
| 2288 | - function resolve_relative_uris ($content, $obj) { | |
| 2289 | - # The MagpieRSS upgrade has some `xml:base` support baked in. | |
| 2290 | - # However, sometimes people do silly things, like putting | |
| 2291 | - # relative URIs out on a production RSS 2.0 feed or other feeds | |
| 2292 | - # with no good support for `xml:base`. So we'll do our best to | |
| 2293 | - # try to catch any remaining relative URIs and resolve them as | |
| 2294 | - # best we can. | |
| 2295 | - $obj->_base = $obj->item['link']; // Reset the base for resolving relative URIs | |
| 2296 | - | |
| 2297 | - foreach ($obj->uri_attrs as $pair) : | |
| 2298 | - list($tag, $attr) = $pair; | |
| 2299 | - $pattern = FeedWordPressHTML::attributeRegex($tag, $attr); | |
| 2300 | - $content = preg_replace_callback ( | |
| 2301 | - $pattern, | |
| 2302 | - array(&$obj, 'resolve_single_relative_uri'), | |
| 2303 | - $content | |
| 2304 | - ); | |
| 2305 | - endforeach; | |
| 2306 | - | |
| 2307 | - return $content; | |
| 2308 | - } /* function SyndicatedPost::resolve_relative_uris () */ | |
| 2309 | - | |
| 2310 | 2031 | var $strip_attrs = array ( |
| 2311 | - array('[a-z]+', 'target'), | |
| 2312 | -// array('[a-z]+', 'style'), | |
| 2313 | -// array('[a-z]+', 'on[a-z]+'), | |
| 2032 | + array('[a-z]+', 'style'), | |
| 2033 | + array('[a-z]+', 'target'), | |
| 2314 | 2034 | ); |
| 2315 | - | |
| 2316 | - function strip_attribute_from_tag ($refs) { | |
| 2317 | - $tag = FeedWordPressHTML::attributeMatch($refs); | |
| 2318 | - return $tag['before_attribute'].$tag['after_attribute']; | |
| 2319 | - } | |
| 2320 | - | |
| 2321 | 2035 | function sanitize_content ($content, $obj) { |
| 2036 | + # FeedWordPress used to resolve URIs relative to the | |
| 2037 | + # feed URI. It now relies on the xml:base support | |
| 2038 | + # baked in to the MagpieRSS upgrade. So all we do here | |
| 2039 | + # now is to sanitize problematic attributes. | |
| 2040 | + # | |
| 2322 | 2041 | # This kind of sucks. I intend to replace it with |
| 2323 | 2042 | # lib_filter sometime soon. |
| 2324 | 2043 | foreach ($obj->strip_attrs as $pair): |
| 2325 | 2044 | list($tag,$attr) = $pair; |
| 2326 | - $pattern = FeedWordPressHTML::attributeRegex($tag, $attr); | |
| 2327 | - | |
| 2328 | - $content = preg_replace_callback ( | |
| 2329 | - $pattern, | |
| 2330 | - array(&$obj, 'strip_attribute_from_tag'), | |
| 2045 | + $content = preg_replace ( | |
| 2046 | + ":(<$tag [^>]*)($attr=(\"[^\">]*\"|[^>\\s]+))([^>]*>):i", | |
| 2047 | + "\\1\\4", | |
| 2331 | 2048 | $content |
| 2332 | 2049 | ); |
| 2333 | 2050 | endforeach; |
| 2334 | 2051 | return $content; |
| @@ -2334,10 +2051,438 @@ | ||
| 2334 | 2051 | return $content; |
| 2335 | 2052 | } |
| 2336 | 2053 | } // class SyndicatedPost |
| 2337 | 2054 | |
| 2338 | -require_once(dirname(__FILE__) . '/syndicatedlink.class.php'); | |
| 2055 | +# class SyndicatedLink: represents a syndication feed stored within the | |
| 2056 | +# WordPress database | |
| 2057 | +# | |
| 2058 | +# To keep things compact and editable from within WordPress, we use all the | |
| 2059 | +# links under a particular category in the WordPress "Blogroll" for the list of | |
| 2060 | +# feeds to syndicate. "Contributors" is the category used by default; you can | |
| 2061 | +# configure that under Options --> Syndication. | |
| 2062 | +# | |
| 2063 | +# Fields used are: | |
| 2064 | +# | |
| 2065 | +# * link_rss: the URI of the Atom/RSS feed to syndicate | |
| 2066 | +# | |
| 2067 | +# * link_notes: user-configurable options, with keys and values | |
| 2068 | +# like so: | |
| 2069 | +# | |
| 2070 | +# key: value | |
| 2071 | +# cats: computers\nweb | |
| 2072 | +# feed/key: value | |
| 2073 | +# | |
| 2074 | +# Keys that start with "feed/" are gleaned from the data supplied | |
| 2075 | +# by the feed itself, and will be overwritten with each update. | |
| 2076 | +# | |
| 2077 | +# Values have linebreak characters escaped with C-style | |
| 2078 | +# backslashes (so, for example, a newline becomes "\n"). | |
| 2079 | +# | |
| 2080 | +# The value of `cats` is used as a newline-separated list of | |
| 2081 | +# default categories for any post coming from a particular feed. | |
| 2082 | +# (In the example above, any posts from this feed will be placed | |
| 2083 | +# in the "computers" and "web" categories--*in addition to* any | |
| 2084 | +# categories that may already be applied to the posts.) | |
| 2085 | +# | |
| 2086 | +# Values of keys in link_notes are accessible from templates using | |
| 2087 | +# the function `get_feed_meta($key)` if this plugin is activated. | |
| 2339 | 2088 | |
| 2089 | +class SyndicatedLink { | |
| 2090 | + var $id = null; | |
| 2091 | + var $link = null; | |
| 2092 | + var $settings = array (); | |
| 2093 | + var $magpie = null; | |
| 2094 | + | |
| 2095 | + function SyndicatedLink ($link) { | |
| 2096 | + global $wpdb; | |
| 2097 | + | |
| 2098 | + if (is_object($link)) : | |
| 2099 | + $this->link = $link; | |
| 2100 | + $this->id = $link->link_id; | |
| 2101 | + else : | |
| 2102 | + $this->id = $link; | |
| 2103 | + if (function_exists('get_bookmark')) : // WP 2.1+ | |
| 2104 | + $this->link = get_bookmark($link); | |
| 2105 | + else : | |
| 2106 | + $this->link = $wpdb->get_row(" | |
| 2107 | + SELECT * FROM $wpdb->links | |
| 2108 | + WHERE (link_id = '".$wpdb->escape($link)."')" | |
| 2109 | + ); | |
| 2110 | + endif; | |
| 2111 | + endif; | |
| 2112 | + | |
| 2113 | + if (strlen($this->link->link_rss) > 0) : | |
| 2114 | + // Read off feed settings from link_notes | |
| 2115 | + $notes = explode("\n", $this->link->link_notes); | |
| 2116 | + foreach ($notes as $note): | |
| 2117 | + list($key, $value) = explode(": ", $note, 2); | |
| 2118 | + | |
| 2119 | + if (strlen($key) > 0) : | |
| 2120 | + // Unescape and trim() off the whitespace. | |
| 2121 | + // Thanks to Ray Lischner for pointing out the | |
| 2122 | + // need to trim off whitespace. | |
| 2123 | + $this->settings[$key] = stripcslashes (trim($value)); | |
| 2124 | + endif; | |
| 2125 | + endforeach; | |
| 2126 | + | |
| 2127 | + // "Magic" feed settings | |
| 2128 | + $this->settings['link/uri'] = $this->link->link_rss; | |
| 2129 | + $this->settings['link/name'] = $this->link->link_name; | |
| 2130 | + $this->settings['link/id'] = $this->link->link_id; | |
| 2131 | + | |
| 2132 | + // `hardcode categories` and `unfamiliar categories` are deprecated in favor of `unfamiliar category` | |
| 2133 | + if ( | |
| 2134 | + isset($this->settings['unfamiliar categories']) | |
| 2135 | + and !isset($this->settings['unfamiliar category']) | |
| 2136 | + ) : | |
| 2137 | + $this->settings['unfamiliar category'] = $this->settings['unfamiliar categories']; | |
| 2138 | + endif; | |
| 2139 | + if ( | |
| 2140 | + FeedWordPress::affirmative($this->settings, 'hardcode categories') | |
| 2141 | + and !isset($this->settings['unfamiliar category']) | |
| 2142 | + ) : | |
| 2143 | + $this->settings['unfamiliar category'] = 'default'; | |
| 2144 | + endif; | |
| 2145 | + | |
| 2146 | + // Set this up automagically for del.icio.us | |
| 2147 | + $bits = parse_url($this->link->link_rss); | |
| 2148 | + $tagspacers = array('del.icio.us', 'feeds.delicious.com'); | |
| 2149 | + if (!isset($this->settings['cat_split']) and in_array($bits['host'], $tagspacers)) : | |
| 2150 | + $this->settings['cat_split'] = '\s'; // Whitespace separates multiple tags in del.icio.us RSS feeds | |
| 2151 | + endif; | |
| 2152 | + | |
| 2153 | + if (isset($this->settings['cats'])): | |
| 2154 | + $this->settings['cats'] = preg_split(FEEDWORDPRESS_CAT_SEPARATOR_PATTERN, $this->settings['cats']); | |
| 2155 | + endif; | |
| 2156 | + if (isset($this->settings['tags'])): | |
| 2157 | + $this->settings['tags'] = preg_split(FEEDWORDPRESS_CAT_SEPARATOR_PATTERN, $this->settings['tags']); | |
| 2158 | + endif; | |
| 2159 | + | |
| 2160 | + if (isset($this->settings['map authors'])) : | |
| 2161 | + $author_rules = explode("\n\n", $this->settings['map authors']); | |
| 2162 | + $ma = array(); | |
| 2163 | + foreach ($author_rules as $rule) : | |
| 2164 | + list($rule_type, $author_name, $author_action) = explode("\n", $rule); | |
| 2165 | + | |
| 2166 | + // Normalize for case and whitespace | |
| 2167 | + $rule_type = strtolower(trim($rule_type)); | |
| 2168 | + $author_name = strtolower(trim($author_name)); | |
| 2169 | + $author_action = strtolower(trim($author_action)); | |
| 2170 | + | |
| 2171 | + $ma[$rule_type][$author_name] = $author_action; | |
| 2172 | + endforeach; | |
| 2173 | + $this->settings['map authors'] = $ma; | |
| 2174 | + endif; | |
| 2175 | + endif; | |
| 2176 | + } /* SyndicatedLink::SyndicatedLink () */ | |
| 2177 | + | |
| 2178 | + function found () { | |
| 2179 | + return is_object($this->link); | |
| 2180 | + } /* SyndicatedLink::found () */ | |
| 2181 | + | |
| 2182 | + function stale () { | |
| 2183 | + $stale = true; | |
| 2184 | + if (isset($this->settings['update/hold']) and ($this->settings['update/hold']=='ping')) : | |
| 2185 | + $stale = false; // don't update on any timed updates; pings only | |
| 2186 | + elseif (isset($this->settings['update/hold']) and ($this->settings['update/hold']=='next')) : | |
| 2187 | + $stale = true; // update on the next timed update | |
| 2188 | + elseif (!isset($this->settings['update/ttl']) or !isset($this->settings['update/last'])) : | |
| 2189 | + $stale = true; // initial update | |
| 2190 | + else : | |
| 2191 | + $after = ((int) $this->settings['update/last']) | |
| 2192 | + +((int) $this->settings['update/ttl'] * 60); | |
| 2193 | + $stale = (time() >= $after); | |
| 2194 | + endif; | |
| 2195 | + return $stale; | |
| 2196 | + } /* SyndicatedLink::stale () */ | |
| 2197 | + | |
| 2198 | + function poll ($crash_ts = NULL) { | |
| 2199 | + global $wpdb; | |
| 2200 | + | |
| 2201 | + $this->magpie = fetch_rss($this->link->link_rss); | |
| 2202 | + $new_count = NULL; | |
| 2203 | + | |
| 2204 | + $resume = FeedWordPress::affirmative($this->settings, 'update/unfinished'); | |
| 2205 | + if ($resume) : | |
| 2206 | + // pick up where we left off | |
| 2207 | + $processed = array_map('trim', explode("\n", $this->settings['update/processed'])); | |
| 2208 | + else : | |
| 2209 | + // begin at the beginning | |
| 2210 | + $processed = array(); | |
| 2211 | + endif; | |
| 2212 | + | |
| 2213 | + if (is_object($this->magpie)) : | |
| 2214 | + $new_count = array('new' => 0, 'updated' => 0); | |
| 2215 | + | |
| 2216 | + # -- Update Link metadata live from feed | |
| 2217 | + $channel = $this->magpie->channel; | |
| 2218 | + | |
| 2219 | + if (!isset($channel['id'])) : | |
| 2220 | + $channel['id'] = $this->link->link_rss; | |
| 2221 | + endif; | |
| 2222 | + | |
| 2223 | + $update = array(); | |
| 2224 | + if (!$this->hardcode('url') and isset($channel['link'])) : | |
| 2225 | + $update[] = "link_url = '".$wpdb->escape($channel['link'])."'"; | |
| 2226 | + endif; | |
| 2227 | + | |
| 2228 | + if (!$this->hardcode('name') and isset($channel['title'])) : | |
| 2229 | + $update[] = "link_name = '".$wpdb->escape($channel['title'])."'"; | |
| 2230 | + endif; | |
| 2231 | + | |
| 2232 | + if (!$this->hardcode('description')) : | |
| 2233 | + if (isset($channel['tagline'])) : | |
| 2234 | + $update[] = "link_description = '".$wpdb->escape($channel['tagline'])."'"; | |
| 2235 | + elseif (isset($channel['description'])) : | |
| 2236 | + $update[] = "link_description = '".$wpdb->escape($channel['description'])."'"; | |
| 2237 | + endif; | |
| 2238 | + endif; | |
| 2239 | + | |
| 2240 | + $this->settings = array_merge($this->settings, $this->flatten_array($channel)); | |
| 2241 | + | |
| 2242 | + $this->settings['update/last'] = time(); $ttl = $this->ttl(); | |
| 2243 | + if (!is_null($ttl)) : | |
| 2244 | + $this->settings['update/ttl'] = $ttl; | |
| 2245 | + $this->settings['update/timed'] = 'feed'; | |
| 2246 | + else : | |
| 2247 | + $this->settings['update/ttl'] = rand(30, 120); // spread over time interval for staggered updates | |
| 2248 | + $this->settings['update/timed'] = 'automatically'; | |
| 2249 | + endif; | |
| 2250 | + | |
| 2251 | + if (!isset($this->settings['update/hold']) or $this->settings['update/hold']!='ping') : | |
| 2252 | + $this->settings['update/hold'] = 'scheduled'; | |
| 2253 | + endif; | |
| 2254 | + | |
| 2255 | + $this->settings['update/unfinished'] = 'yes'; | |
| 2256 | + | |
| 2257 | + $update[] = "link_notes = '".$wpdb->escape($this->settings_to_notes())."'"; | |
| 2258 | + | |
| 2259 | + $update_set = implode(',', $update); | |
| 2260 | + | |
| 2261 | + // Update the properties of the link from the feed information | |
| 2262 | + $result = $wpdb->query(" | |
| 2263 | + UPDATE $wpdb->links | |
| 2264 | + SET $update_set | |
| 2265 | + WHERE link_id='$this->id' | |
| 2266 | + "); | |
| 2267 | + | |
| 2268 | + # -- Add new posts from feed and update any updated posts | |
| 2269 | + $crashed = false; | |
| 2270 | + | |
| 2271 | + if (is_array($this->magpie->items)) : | |
| 2272 | + foreach ($this->magpie->items as $item) : | |
| 2273 | + $post =& new SyndicatedPost($item, $this); | |
| 2274 | + if (!$resume or !in_array(trim($post->guid()), $processed)) : | |
| 2275 | + $processed[] = $post->guid(); | |
| 2276 | + if (!$post->filtered()) : | |
| 2277 | + $new = $post->store(); | |
| 2278 | + if ( $new !== false ) $new_count[$new]++; | |
| 2279 | + endif; | |
| 2280 | + | |
| 2281 | + if (!is_null($crash_ts) and (time() > $crash_ts)) : | |
| 2282 | + $crashed = true; | |
| 2283 | + break; | |
| 2284 | + endif; | |
| 2285 | + endif; | |
| 2286 | + endforeach; | |
| 2287 | + endif; | |
| 2288 | + | |
| 2289 | + // Copy back any changes to feed settings made in the course of updating (e.g. new author rules) | |
| 2290 | + $to_notes = $this->settings; | |
| 2291 | + | |
| 2292 | + $this->settings['update/processed'] = $processed; | |
| 2293 | + if (!$crashed) : | |
| 2294 | + $this->settings['update/unfinished'] = 'no'; | |
| 2295 | + endif; | |
| 2296 | + | |
| 2297 | + $update_set = "link_notes = '".$wpdb->escape($this->settings_to_notes())."'"; | |
| 2298 | + | |
| 2299 | + // Update the properties of the link from the feed information | |
| 2300 | + $result = $wpdb->query(" | |
| 2301 | + UPDATE $wpdb->links | |
| 2302 | + SET $update_set | |
| 2303 | + WHERE link_id='$this->id' | |
| 2304 | + "); | |
| 2305 | + endif; | |
| 2306 | + | |
| 2307 | + return $new_count; | |
| 2308 | + } /* SyndicatedLink::poll() */ | |
| 2309 | + | |
| 2310 | + function map_name_to_new_user ($name, $newuser_name) { | |
| 2311 | + global $wpdb; | |
| 2312 | + | |
| 2313 | + if (strlen($newuser_name) > 0) : | |
| 2314 | + $userdata = array(); | |
| 2315 | + $userdata['ID'] = NULL; | |
| 2316 | + | |
| 2317 | + $userdata['user_login'] = sanitize_user($newuser_name); | |
| 2318 | + $userdata['user_login'] = apply_filters('pre_user_login', $userdata['user_login']); | |
| 2319 | + | |
| 2320 | + $userdata['user_nicename'] = sanitize_title($newuser_name); | |
| 2321 | + $userdata['user_nicename'] = apply_filters('pre_user_nicename', $userdata['user_nicename']); | |
| 2322 | + | |
| 2323 | + $userdata['display_name'] = $wpdb->escape($newuser_name); | |
| 2324 | + | |
| 2325 | + $newuser_id = wp_insert_user($userdata); | |
| 2326 | + if (is_numeric($newuser_id)) : | |
| 2327 | + if (is_null($name)) : // Unfamiliar author | |
| 2328 | + $this->settings['unfamiliar author'] = $newuser_id; | |
| 2329 | + else : | |
| 2330 | + $this->settings['map authors']['name'][$name] = $newuser_id; | |
| 2331 | + endif; | |
| 2332 | + else : | |
| 2333 | + // TODO: Add some error detection and reporting | |
| 2334 | + endif; | |
| 2335 | + else : | |
| 2336 | + // TODO: Add some error reporting | |
| 2337 | + endif; | |
| 2338 | + } /* SyndicatedLink::map_name_to_new_user () */ | |
| 2339 | + | |
| 2340 | + function settings_to_notes () { | |
| 2341 | + $to_notes = $this->settings; | |
| 2342 | + | |
| 2343 | + unset($to_notes['link/id']); // Magic setting; don't save | |
| 2344 | + unset($to_notes['link/uri']); // Magic setting; don't save | |
| 2345 | + unset($to_notes['link/name']); // Magic setting; don't save | |
| 2346 | + unset($to_notes['hardcode categories']); // Deprecated | |
| 2347 | + unset($to_notes['unfamiliar categories']); // Deprecated | |
| 2348 | + | |
| 2349 | + // Collapse array settings | |
| 2350 | + if (isset($to_notes['update/processed']) and (is_array($to_notes['update/processed']))) : | |
| 2351 | + $to_notes['update/processed'] = implode("\n", $to_notes['update/processed']); | |
| 2352 | + endif; | |
| 2353 | + | |
| 2354 | + if (is_array($to_notes['cats'])) : | |
| 2355 | + $to_notes['cats'] = implode(FEEDWORDPRESS_CAT_SEPARATOR, $to_notes['cats']); | |
| 2356 | + endif; | |
| 2357 | + if (is_array($to_notes['tags'])) : | |
| 2358 | + $to_notes['tags'] = implode(FEEDWORDPRESS_CAT_SEPARATOR, $to_notes['tags']); | |
| 2359 | + endif; | |
| 2360 | + | |
| 2361 | + // Collapse the author mapping rule structure back into a flat string | |
| 2362 | + if (isset($to_notes['map authors'])) : | |
| 2363 | + $ma = array(); | |
| 2364 | + foreach ($to_notes['map authors'] as $rule_type => $author_rules) : | |
| 2365 | + foreach ($author_rules as $author_name => $author_action) : | |
| 2366 | + $ma[] = $rule_type."\n".$author_name."\n".$author_action; | |
| 2367 | + endforeach; | |
| 2368 | + endforeach; | |
| 2369 | + $to_notes['map authors'] = implode("\n\n", $ma); | |
| 2370 | + endif; | |
| 2371 | + | |
| 2372 | + $notes = ''; | |
| 2373 | + foreach ($to_notes as $key => $value) : | |
| 2374 | + $notes .= $key . ": ". addcslashes($value, "\0..\37".'\\') . "\n"; | |
| 2375 | + endforeach; | |
| 2376 | + return $notes; | |
| 2377 | + } /* SyndicatedLink::settings_to_notes () */ | |
| 2378 | + | |
| 2379 | + function uri () { | |
| 2380 | + return (is_object($this->link) ? $this->link->link_rss : NULL); | |
| 2381 | + } /* SyndicatedLink::uri () */ | |
| 2382 | + | |
| 2383 | + function homepage () { | |
| 2384 | + return (isset($this->settings['feed/link']) ? $this->settings['feed/link'] : NULL); | |
| 2385 | + } /* SyndicatedLink::homepage () */ | |
| 2386 | + | |
| 2387 | + function ttl () { | |
| 2388 | + if (is_object($this->magpie)) : | |
| 2389 | + $channel = $this->magpie->channel; | |
| 2390 | + else : | |
| 2391 | + $channel = array(); | |
| 2392 | + endif; | |
| 2393 | + | |
| 2394 | + if (isset($channel['ttl'])) : | |
| 2395 | + // "ttl stands for time to live. It's a number of | |
| 2396 | + // minutes that indicates how long a channel can be | |
| 2397 | + // cached before refreshing from the source." | |
| 2398 | + // <http://blogs.law.harvard.edu/tech/rss#ltttlgtSubelementOfLtchannelgt> | |
| 2399 | + $ret = $channel['ttl']; | |
| 2400 | + elseif (isset($channel['sy']['updatefrequency']) or isset($channel['sy']['updateperiod'])) : | |
| 2401 | + $period_minutes = array ( | |
| 2402 | + 'hourly' => 60, /* minutes in an hour */ | |
| 2403 | + 'daily' => 1440, /* minutes in a day */ | |
| 2404 | + 'weekly' => 10080, /* minutes in a week */ | |
| 2405 | + 'monthly' => 43200, /* minutes in a month */ | |
| 2406 | + 'yearly' => 525600, /* minutes in a year */ | |
| 2407 | + ); | |
| 2408 | + | |
| 2409 | + // "sy:updatePeriod: Describes the period over which the | |
| 2410 | + // channel format is updated. Acceptable values are: | |
| 2411 | + // hourly, daily, weekly, monthly, yearly. If omitted, | |
| 2412 | + // daily is assumed." <http://web.resource.org/rss/1.0/modules/syndication/> | |
| 2413 | + if (isset($channel['sy']['updateperiod'])) : $period = $channel['sy']['updateperiod']; | |
| 2414 | + else : $period = 'daily'; | |
| 2415 | + endif; | |
| 2416 | + | |
| 2417 | + // "sy:updateFrequency: Used to describe the frequency | |
| 2418 | + // of updates in relation to the update period. A | |
| 2419 | + // positive integer indicates how many times in that | |
| 2420 | + // period the channel is updated. ... If omitted a value | |
| 2421 | + // of 1 is assumed." <http://web.resource.org/rss/1.0/modules/syndication/> | |
| 2422 | + if (isset($channel['sy']['updatefrequency'])) : $freq = (int) $channel['sy']['updatefrequency']; | |
| 2423 | + else : $freq = 1; | |
| 2424 | + endif; | |
| 2425 | + | |
| 2426 | + $ret = (int) ($period_minutes[$period] / $freq); | |
| 2427 | + else : | |
| 2428 | + $ret = NULL; | |
| 2429 | + endif; | |
| 2430 | + return $ret; | |
| 2431 | + } /* SyndicatedLink::ttl() */ | |
| 2432 | + | |
| 2433 | + // SyndicatedLink::flatten_array (): flatten an array. Useful for | |
| 2434 | + // hierarchical and namespaced elements. | |
| 2435 | + // | |
| 2436 | + // Given an array which may contain array or object elements in it, | |
| 2437 | + // return a "flattened" array: a one-dimensional array of scalars | |
| 2438 | + // containing each of the scalar elements contained within the array | |
| 2439 | + // structure. Thus, for example, if $a['b']['c']['d'] == 'e', then the | |
| 2440 | + // returned array for FeedWordPress::flatten_array($a) will contain a key | |
| 2441 | + // $a['feed/b/c/d'] with value 'e'. | |
| 2442 | + function flatten_array ($arr, $prefix = 'feed/', $separator = '/') { | |
| 2443 | + $ret = array (); | |
| 2444 | + if (is_array($arr)) : | |
| 2445 | + foreach ($arr as $key => $value) : | |
| 2446 | + if (is_scalar($value)) : | |
| 2447 | + $ret[$prefix.$key] = $value; | |
| 2448 | + else : | |
| 2449 | + $ret = array_merge($ret, $this->flatten_array($value, $prefix.$key.$separator, $separator)); | |
| 2450 | + endif; | |
| 2451 | + endforeach; | |
| 2452 | + endif; | |
| 2453 | + return $ret; | |
| 2454 | + } /* SyndicatedLink::flatten_array () */ | |
| 2455 | + | |
| 2456 | + function hardcode ($what) { | |
| 2457 | + $default = get_option("feedwordpress_hardcode_$what"); | |
| 2458 | + if ( $default === 'yes' ) : | |
| 2459 | + // If the default is to hardcode, then we want the | |
| 2460 | + // negation of negative(): TRUE by default and FALSE if | |
| 2461 | + // the setting is explicitly "no" | |
| 2462 | + $ret = !FeedWordPress::negative($this->settings, "hardcode $what"); | |
| 2463 | + else : | |
| 2464 | + // If the default is NOT to hardcode, then we want | |
| 2465 | + // affirmative(): FALSE by default and TRUE if the | |
| 2466 | + // setting is explicitly "yes" | |
| 2467 | + $ret = FeedWordPress::affirmative($this->settings, "hardcode $what"); | |
| 2468 | + endif; | |
| 2469 | + return $ret; | |
| 2470 | + } /* SyndicatedLink::hardcode () */ | |
| 2471 | + | |
| 2472 | + function syndicated_status ($what, $default) { | |
| 2473 | + global $wpdb; | |
| 2474 | + | |
| 2475 | + $ret = get_option("feedwordpress_syndicated_{$what}_status"); | |
| 2476 | + if ( isset($this->settings["$what status"]) ) : | |
| 2477 | + $ret = $this->settings["$what status"]; | |
| 2478 | + elseif (!$ret) : | |
| 2479 | + $ret = $default; | |
| 2480 | + endif; | |
| 2481 | + return $wpdb->escape(trim(strtolower($ret))); | |
| 2482 | + } /* SyndicatedLink:syndicated_status () */ | |
| 2483 | +} // class SyndicatedLink | |
| 2484 | + | |
| 2340 | 2485 | ################################################################################ |
| 2341 | 2486 | ## XML-RPC HOOKS: accept XML-RPC update pings from Contributors ################ |
| 2342 | 2487 | ################################################################################ |
| 2343 | 2488 | |
| @@ -2405,12 +2550,8 @@ | ||
| 2405 | 2550 | $href = array_merge($href, $this->_a_href_feeds(TRUE)); |
| 2406 | 2551 | |
| 2407 | 2552 | // If all that failed, look harder |
| 2408 | 2553 | if (count($href) == 0) $href = $this->_a_href_feeds(FALSE); |
| 2409 | - | |
| 2410 | - // Our search may turn up duplicate URIs. We only need to do any given URI once. | |
| 2411 | - // Props to Camilo <http://projects.radgeek.com/2008/12/14/feedwordpress-20081214/#comment-20090122160414> | |
| 2412 | - $href = array_unique($href); | |
| 2413 | 2554 | |
| 2414 | 2555 | // Verify feeds and resolve relative URIs |
| 2415 | 2556 | foreach ($href as $u) { |
| 2416 | 2557 | $the_uri = Relative_URI::resolve($u, $this->uri); |
