| @@ -2,9 +2,9 @@ | ||
| 2 | 2 | /* |
| 3 | 3 | Plugin Name: FeedWordPress |
| 4 | 4 | Plugin URI: http://feedwordpress.radgeek.com/ |
| 5 | 5 | Description: simple and flexible Atom/RSS syndication for WordPress |
| 6 | -Version: 2010.0528 | |
| 6 | +Version: 2011.0721 | |
| 7 | 7 | Author: Charles Johnson |
| 8 | 8 | Author URI: http://radgeek.com/ |
| 9 | 9 | License: GPL |
| 10 | 10 | */ |
| @@ -10,15 +10,16 @@ | ||
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | 12 | /** |
| 13 | 13 | * @package FeedWordPress |
| 14 | - * @version 2010.0528 | |
| 14 | + * @version 2011.0721 | |
| 15 | 15 | */ |
| 16 | 16 | |
| 17 | 17 | # This uses code derived from: |
| 18 | 18 | # - wp-rss-aggregate.php by Kellan Elliot-McCrea <kellan@protest.net> |
| 19 | -# - HTTP Navigator 2 by Keyvan Minoukadeh <keyvan@k1m.com> | |
| 19 | +# - MagpieRSS by Kellan Elliot-McCrea <kellan@protest.net> | |
| 20 | 20 | # - Ultra-Liberal Feed Finder by Mark Pilgrim <mark@diveintomark.org> |
| 21 | +# - WordPress Blog Tool and Publishing Platform <http://wordpress.org/> | |
| 21 | 22 | # according to the terms of the GNU General Public License. |
| 22 | 23 | # |
| 23 | 24 | # INSTALLATION: see readme.txt or <http://projects.radgeek.com/install> |
| 24 | 25 | # |
| @@ -32,11 +33,15 @@ | ||
| 32 | 33 | # or use a cron job. |
| 33 | 34 | |
| 34 | 35 | # -- Don't change these unless you know what you're doing... |
| 35 | 36 | |
| 36 | -define ('FEEDWORDPRESS_VERSION', '2010.0528'); | |
| 37 | +define ('FEEDWORDPRESS_VERSION', '2011.0721'); | |
| 37 | 38 | define ('FEEDWORDPRESS_AUTHOR_CONTACT', 'http://radgeek.com/contact'); |
| 38 | 39 | |
| 40 | +if (!defined('FEEDWORDPRESS_BLEG')) : | |
| 41 | + define ('FEEDWORDPRESS_BLEG', true); | |
| 42 | +endif; | |
| 43 | + | |
| 39 | 44 | // Defaults |
| 40 | 45 | define ('DEFAULT_SYNDICATION_CATEGORY', 'Contributors'); |
| 41 | 46 | define ('DEFAULT_UPDATE_PERIOD', 60); // value in minutes |
| 42 | 47 | |
| @@ -57,8 +62,9 @@ | ||
| 57 | 62 | |
| 58 | 63 | define ('FEEDWORDPRESS_FRESHNESS_INTERVAL', 10*60); // Every ten minutes |
| 59 | 64 | |
| 60 | 65 | define ('FWP_SCHEMA_HAS_USERMETA', 2966); |
| 66 | +define ('FWP_SCHEMA_USES_ARGS_TAXONOMY', 12694); // Revision # for using $args['taxonomy'] to get link categories | |
| 61 | 67 | define ('FWP_SCHEMA_20', 3308); // Database schema # for WP 2.0 |
| 62 | 68 | define ('FWP_SCHEMA_21', 4772); // Database schema # for WP 2.1 |
| 63 | 69 | define ('FWP_SCHEMA_23', 5495); // Database schema # for WP 2.3 |
| 64 | 70 | define ('FWP_SCHEMA_25', 7558); // Database schema # for WP 2.5 |
| @@ -65,8 +71,9 @@ | ||
| 65 | 71 | define ('FWP_SCHEMA_26', 8201); // Database schema # for WP 2.6 |
| 66 | 72 | define ('FWP_SCHEMA_27', 9872); // Database schema # for WP 2.7 |
| 67 | 73 | define ('FWP_SCHEMA_28', 11548); // Database schema # for WP 2.8 |
| 68 | 74 | define ('FWP_SCHEMA_29', 12329); // Database schema # for WP 2.9 |
| 75 | +define ('FWP_SCHEMA_30', 12694); // Database schema # for WP 3.0 | |
| 69 | 76 | |
| 70 | 77 | if (FEEDWORDPRESS_DEBUG) : |
| 71 | 78 | // Help us to pick out errors, if any. |
| 72 | 79 | ini_set('error_reporting', E_ALL & ~E_NOTICE); |
| @@ -78,15 +85,15 @@ | ||
| 78 | 85 | // make sure FEEDWORDPRESS_DEBUG is FALSE for any site that will be |
| 79 | 86 | // used for more than testing purposes! |
| 80 | 87 | define('FEEDWORDPRESS_CACHE_AGE', 1); |
| 81 | 88 | define('FEEDWORDPRESS_CACHE_LIFETIME', 1); |
| 82 | - define('FEEDWORDPRESS_FETCH_TIME_OUT', 60); | |
| 89 | + define('FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT', 60); | |
| 83 | 90 | else : |
| 84 | 91 | // Hold onto data all day for conditional GET purposes, |
| 85 | 92 | // but consider it stale after 1 min (requiring a conditional GET) |
| 86 | 93 | define('FEEDWORDPRESS_CACHE_LIFETIME', 24*60*60); |
| 87 | 94 | define('FEEDWORDPRESS_CACHE_AGE', 1*60); |
| 88 | - define('FEEDWORDPRESS_FETCH_TIME_OUT', 10); | |
| 95 | + define('FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT', 20); | |
| 89 | 96 | endif; |
| 90 | 97 | |
| 91 | 98 | // Use our the cache settings that we want. |
| 92 | 99 | add_filter('wp_feed_cache_transient_lifetime', array('FeedWordPress', 'cache_lifetime')); |
| @@ -92,33 +99,42 @@ | ||
| 92 | 99 | add_filter('wp_feed_cache_transient_lifetime', array('FeedWordPress', 'cache_lifetime')); |
| 93 | 100 | |
| 94 | 101 | // Ensure that we have SimplePie loaded up and ready to go. |
| 95 | 102 | // We no longer need a MagpieRSS upgrade module. Hallelujah! |
| 96 | -require_once(ABSPATH . WPINC . '/feed.php'); | |
| 103 | +if (!class_exists('SimplePie')) : | |
| 104 | + require_once(ABSPATH . WPINC . '/class-simplepie.php'); | |
| 105 | +endif; | |
| 106 | +require_once(ABSPATH . WPINC . '/class-feed.php'); | |
| 97 | 107 | |
| 98 | -if (isset($wp_db_version)) : | |
| 99 | - if ($wp_db_version >= FWP_SCHEMA_23) : | |
| 100 | - require_once (ABSPATH . WPINC . '/registration.php'); // for wp_insert_user | |
| 101 | - elseif ($wp_db_version >= FWP_SCHEMA_21) : // WordPress 2.1 and 2.2, but not 2.3 | |
| 102 | - require_once (ABSPATH . WPINC . '/registration.php'); // for wp_insert_user | |
| 103 | - require_once (ABSPATH . 'wp-admin/admin-db.php'); // for wp_insert_category | |
| 104 | - elseif ($wp_db_version >= FWP_SCHEMA_20) : // WordPress 2.0 | |
| 105 | - require_once (ABSPATH . WPINC . '/registration-functions.php'); // for wp_insert_user | |
| 106 | - require_once (ABSPATH . 'wp-admin/admin-db.php'); // for wp_insert_category | |
| 107 | - endif; | |
| 108 | +if (!function_exists('wp_insert_user')) : | |
| 109 | + require_once (ABSPATH . WPINC . '/registration.php'); // for wp_insert_user | |
| 108 | 110 | endif; |
| 109 | 111 | |
| 110 | -require_once(dirname(__FILE__) . '/compatability.php'); // LEGACY API: Replicate or mock up functions for legacy support purposes | |
| 111 | -require_once(dirname(__FILE__) . '/feedwordpresshtml.class.php'); | |
| 112 | +$dir = dirname(__FILE__); | |
| 113 | +require_once("${dir}/admin-ui.php"); | |
| 114 | +require_once("${dir}/feedwordpresssyndicationpage.class.php"); | |
| 115 | +require_once("${dir}/compatability.php"); // Legacy API | |
| 116 | +require_once("${dir}/syndicatedpost.class.php"); | |
| 117 | +require_once("${dir}/syndicatedlink.class.php"); | |
| 118 | +require_once("${dir}/feedwordpresshtml.class.php"); | |
| 119 | +require_once("${dir}/feedwordpress-content-type-sniffer.class.php"); | |
| 120 | +require_once("${dir}/inspectpostmeta.class.php"); | |
| 121 | +require_once("${dir}/syndicationdataqueries.class.php"); | |
| 122 | +require_once("${dir}/feedwordpress_file.class.php"); | |
| 123 | +require_once("${dir}/feedwordpress_parser.class.php"); | |
| 124 | +require_once("${dir}/feedwordpressrpc.class.php"); | |
| 112 | 125 | |
| 113 | 126 | // Magic quotes are just about the stupidest thing ever. |
| 114 | 127 | if (is_array($_POST)) : |
| 115 | - $fwp_post = stripslashes_deep($_POST); | |
| 128 | + $fwp_post = $_POST; | |
| 129 | + if (get_magic_quotes_gpc()) : | |
| 130 | + $fwp_post = stripslashes_deep($fwp_post); | |
| 131 | + endif; | |
| 116 | 132 | endif; |
| 117 | 133 | |
| 118 | 134 | // Get the path relative to the plugins directory in which FWP is stored |
| 119 | 135 | preg_match ( |
| 120 | - '|/wp-content/plugins/(.+)$|', | |
| 136 | + '|'.preg_quote(WP_PLUGIN_DIR).'/(.+)$|', | |
| 121 | 137 | dirname(__FILE__), |
| 122 | 138 | $ref |
| 123 | 139 | ); |
| 124 | 140 | |
| @@ -127,36 +143,23 @@ | ||
| 127 | 143 | else : // Something went wrong. Let's just guess. |
| 128 | 144 | $fwp_path = 'feedwordpress'; |
| 129 | 145 | endif; |
| 130 | 146 | |
| 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 | - | |
| 136 | 147 | // If this is a FeedWordPress admin page, queue up scripts for AJAX functions that FWP uses |
| 137 | 148 | // If it is a display page or a non-FeedWordPress admin page, don't. |
| 138 | -if (is_admin() and isset($_REQUEST['page']) and preg_match("|^{$fwp_path}/|", $_REQUEST['page'])) : | |
| 139 | - if (function_exists('wp_enqueue_script')) : | |
| 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)) : | |
| 143 | - wp_enqueue_script('post'); // for magic tag and category boxes | |
| 144 | - wp_enqueue_script('thickbox'); // for fold-up boxes | |
| 145 | - wp_enqueue_script('admin-forms'); // for checkbox selection | |
| 146 | - else : | |
| 147 | - wp_enqueue_script( 'ajaxcat' ); // Provides the handy-dandy new category text box | |
| 148 | - endif; | |
| 149 | - endif; | |
| 150 | - if (function_exists('wp_enqueue_style')) : | |
| 151 | - if (fwp_test_wp_version(FWP_SCHEMA_25)) : | |
| 152 | - wp_enqueue_style('dashboard'); | |
| 153 | - endif; | |
| 154 | - endif; | |
| 149 | +wp_register_style('feedwordpress-elements', WP_PLUGIN_URL.'/'.$fwp_path.'/feedwordpress-elements.css'); | |
| 150 | +if (FeedWordPressSettingsUI::is_admin()) : | |
| 151 | + // For JavaScript that needs to be generated dynamically | |
| 152 | + add_action('admin_print_scripts', array('FeedWordPressSettingsUI', 'admin_scripts')); | |
| 153 | + | |
| 154 | + // For CSS that needs to be generated dynamically. | |
| 155 | + add_action('admin_print_styles', array('FeedWordPressSettingsUI', 'admin_styles')); | |
| 156 | + | |
| 157 | + wp_enqueue_style('dashboard'); | |
| 158 | + wp_enqueue_style('feedwordpress-elements'); | |
| 159 | + | |
| 155 | 160 | if (function_exists('wp_admin_css')) : |
| 156 | - if (fwp_test_wp_version(FWP_SCHEMA_25)) : | |
| 157 | - wp_admin_css('css/dashboard'); | |
| 158 | - endif; | |
| 161 | + wp_admin_css('css/dashboard'); | |
| 159 | 162 | endif; |
| 160 | 163 | endif; |
| 161 | 164 | |
| 162 | 165 | if (!FeedWordPress::needs_upgrade()) : // only work if the conditions are safe! |
| @@ -179,9 +182,9 @@ | ||
| 179 | 182 | |
| 180 | 183 | add_action('atom_entry', 'feedwordpress_item_feed_data'); |
| 181 | 184 | |
| 182 | 185 | # Filter in original permalinks if the user wants that |
| 183 | - add_filter('post_link', 'syndication_permalink', 1); | |
| 186 | + add_filter('post_link', 'syndication_permalink', /*priority=*/ 1, /*arguments=*/ 3); | |
| 184 | 187 | |
| 185 | 188 | # When foreign URLs are used for permalinks in feeds or display |
| 186 | 189 | # contexts, they need to be escaped properly. |
| 187 | 190 | add_filter('the_permalink', 'syndication_permalink_escaped'); |
| @@ -202,11 +205,13 @@ | ||
| 202 | 205 | |
| 203 | 206 | add_action('admin_menu', 'feedwordpress_add_post_edit_controls'); |
| 204 | 207 | add_action('save_post', 'feedwordpress_save_post_edit_controls'); |
| 205 | 208 | |
| 209 | + add_action('admin_footer', array('FeedWordPress', 'admin_footer')); | |
| 210 | + | |
| 206 | 211 | # Inbound XML-RPC update methods |
| 207 | - add_filter('xmlrpc_methods', 'feedwordpress_xmlrpc_hook'); | |
| 208 | - | |
| 212 | + $feedwordpressRPC = new FeedWordPressRPC; | |
| 213 | + | |
| 209 | 214 | # Outbound XML-RPC ping reform |
| 210 | 215 | remove_action('publish_post', 'generic_ping'); // WP 1.5.x |
| 211 | 216 | remove_action('do_pings', 'do_all_pings', 10, 1); // WP 2.1, 2.2 |
| 212 | 217 | remove_action('publish_post', '_publish_post_hook', 5, 1); // WP 2.3 |
| @@ -215,39 +220,25 @@ | ||
| 215 | 220 | add_action('do_pings', 'fwp_do_pings', 10, 1); |
| 216 | 221 | add_action('feedwordpress_update', 'fwp_hold_pings'); |
| 217 | 222 | add_action('feedwordpress_update_complete', 'fwp_release_pings'); |
| 218 | 223 | |
| 219 | - # Hook in logging functions only if the logging option is ON | |
| 220 | - $update_logging = get_option('feedwordpress_update_logging'); | |
| 221 | - if ($update_logging == 'yes') : | |
| 222 | - add_action('post_syndicated_item', 'log_feedwordpress_post', 100); | |
| 223 | - add_action('update_syndicated_item', 'log_feedwordpress_update_post', 100); | |
| 224 | - add_action('feedwordpress_update', 'log_feedwordpress_update_feeds', 100); | |
| 225 | - add_action('feedwordpress_check_feed', 'log_feedwordpress_check_feed', 100); | |
| 226 | - add_action('feedwordpress_update_complete', 'log_feedwordpress_update_complete', 100); | |
| 227 | - endif; | |
| 224 | + add_action('syndicated_feed_error', array('FeedWordPressDiagnostic', 'feed_error'), 100, 3); | |
| 225 | + | |
| 226 | + add_action('wp_footer', 'debug_out_feedwordpress_footer', -100); | |
| 227 | + add_action('admin_footer', 'debug_out_feedwordpress_footer', -100); | |
| 228 | 228 | |
| 229 | - if (FeedWordPress::update_requested()) : | |
| 230 | - if (FEEDWORDPRESS_DEBUG) : | |
| 231 | - add_action('post_syndicated_item', 'debug_out_feedwordpress_post', 100); | |
| 232 | - add_action('update_syndicated_item', 'debug_out_feedwordpress_update_post', 100); | |
| 233 | - add_action('feedwordpress_update', 'debug_out_feedwordpress_update_feeds', 100); | |
| 234 | - add_action('feedwordpress_check_feed', 'debug_out_feedwordpress_check_feed', 100); | |
| 235 | - add_action('feedwordpress_update_complete', 'debug_out_feedwordpress_update_complete', 100); | |
| 236 | - endif; | |
| 229 | + $feedwordpress = new FeedWordPress; | |
| 237 | 230 | |
| 238 | - add_action('feedwordpress_check_feed_complete', 'debug_out_feedwordpress_feed_error', 100, 3); | |
| 239 | - endif; | |
| 240 | - | |
| 241 | 231 | # Cron-less auto-update. Hooray! |
| 242 | - $autoUpdateHook = get_option('feedwordpress_automatic_updates'); | |
| 243 | - if ($autoUpdateHook != 'init') : | |
| 244 | - $autoUpdateHook = 'shutdown'; | |
| 232 | + $autoUpdateHook = $feedwordpress->automatic_update_hook(); | |
| 233 | + if (!is_null($autoUpdateHook)) : | |
| 234 | + add_action($autoUpdateHook, array(&$feedwordpress, 'auto_update')); | |
| 245 | 235 | endif; |
| 246 | - add_action($autoUpdateHook, 'feedwordpress_auto_update'); | |
| 236 | + | |
| 237 | + add_action('init', array(&$feedwordpress, 'init')); | |
| 238 | + add_action('shutdown', array(&$feedwordpress, 'email_diagnostic_log')); | |
| 239 | + add_action('wp_dashboard_setup', array(&$feedwordpress, 'dashboard_setup')); | |
| 247 | 240 | |
| 248 | - add_action('init', 'feedwordpress_update_magic_url'); | |
| 249 | - | |
| 250 | 241 | # Default sanitizers |
| 251 | 242 | add_filter('syndicated_item_content', array('SyndicatedPost', 'resolve_relative_uris'), 0, 2); |
| 252 | 243 | add_filter('syndicated_item_content', array('SyndicatedPost', 'sanitize_content'), 0, 2); |
| 253 | 244 | |
| @@ -255,127 +246,78 @@ | ||
| 255 | 246 | # Hook in the menus, which will just point to the upgrade interface |
| 256 | 247 | add_action('admin_menu', 'fwp_add_pages'); |
| 257 | 248 | endif; // if (!FeedWordPress::needs_upgrade()) |
| 258 | 249 | |
| 259 | -function feedwordpress_auto_update () { | |
| 260 | - if (FeedWordPress::stale()) : | |
| 261 | - $feedwordpress = new FeedWordPress; | |
| 262 | - $feedwordpress->update(); | |
| 263 | - endif; | |
| 264 | -} /* feedwordpress_auto_update () */ | |
| 265 | - | |
| 266 | -function feedwordpress_update_magic_url () { | |
| 267 | - global $wpdb; | |
| 268 | - | |
| 269 | - // Explicit update request in the HTTP request (e.g. from a cron job) | |
| 270 | - if (FeedWordPress::update_requested()) : | |
| 271 | - $feedwordpress = new FeedWordPress; | |
| 272 | - $feedwordpress->update(FeedWordPress::update_requested_url()); | |
| 273 | - | |
| 274 | - if (FEEDWORDPRESS_DEBUG and count($wpdb->queries) > 0) : | |
| 275 | - $mysqlTime = 0.0; | |
| 276 | - $byTime = array(); | |
| 277 | - foreach ($wpdb->queries as $query) : | |
| 278 | - $time = $query[1] * 1000000.0; | |
| 279 | - $mysqlTime += $query[1]; | |
| 280 | - if (!isset($byTime[$time])) : $byTime[$time] = array(); endif; | |
| 281 | - $byTime[$time][] = $query[0]. ' // STACK: ' . $query[2]; | |
| 282 | - endforeach; | |
| 283 | - krsort($byTime); | |
| 284 | - | |
| 285 | - foreach ($byTime as $time => $querySet) : | |
| 286 | - foreach ($querySet as $query) : | |
| 287 | - print "[".(sprintf('%4.4f', $time/1000.0)) . "ms] $query\n"; | |
| 288 | - endforeach; | |
| 289 | - endforeach; | |
| 290 | - echo "[feedwordpress] $wpdb->num_queries queries. $mysqlTime seconds in MySQL. Total of "; timer_stop(1); print " seconds."; | |
| 291 | - endif; | |
| 292 | - | |
| 293 | - | |
| 294 | - // Magic URL should return nothing but a 200 OK header packet | |
| 295 | - // when successful. | |
| 296 | - exit; | |
| 297 | - endif; | |
| 298 | -} /* feedwordpress_magic_update_url () */ | |
| 299 | - | |
| 300 | 250 | ################################################################################ |
| 301 | 251 | ## LOGGING FUNCTIONS: log status updates to error_log if you want it ########### |
| 302 | 252 | ################################################################################ |
| 303 | 253 | |
| 304 | -function log_feedwordpress_post ($id) { | |
| 305 | - $post = wp_get_single_post($id); | |
| 306 | - error_log("[".date('Y-m-d H:i:s')."][feedwordpress] posted " | |
| 307 | - ."'{$post->post_title}' ({$post->post_date})"); | |
| 308 | -} | |
| 254 | +class FeedWordPressDiagnostic { | |
| 255 | + function feed_error ($error, $old, $link) { | |
| 256 | + $wpError = $error['object']; | |
| 257 | + $url = $link->uri(); | |
| 258 | + | |
| 259 | + $mesgs = $wpError->get_error_messages(); | |
| 260 | + foreach ($mesgs as $mesg) : | |
| 261 | + $mesg = esc_html($mesg); | |
| 262 | + FeedWordPress::diagnostic( | |
| 263 | + 'updated_feeds:errors', | |
| 264 | + "Feed Error: [${url}] update returned error: $mesg" | |
| 265 | + ); | |
| 266 | + | |
| 267 | + $hours = get_option('feedwordpress_diagnostics_persistent_errors_hours', 2); | |
| 268 | + $span = ($error['ts'] - $error['since']); | |
| 309 | 269 | |
| 310 | -function log_feedwordpress_update_post ($id) { | |
| 311 | - $post = wp_get_single_post($id); | |
| 312 | - error_log("[".date('Y-m-d H:i:s')."][feedwordpress] updated " | |
| 313 | - ."'{$post->post_title}' ({$post->post_date})" | |
| 314 | - ." (as of {$post->post_modified})"); | |
| 315 | -} | |
| 270 | + if ($span >= ($hours * 60 * 60)) : | |
| 271 | + $since = date('r', $error['since']); | |
| 272 | + $mostRecent = date('r', $error['ts']); | |
| 273 | + FeedWordPress::diagnostic( | |
| 274 | + 'updated_feeds:errors:persistent', | |
| 275 | + "Feed Update Error: [${url}] returning errors" | |
| 276 | + ." since ${since}:<br/><code>$mesg</code>", | |
| 277 | + $url, $error['since'], $error['ts'] | |
| 278 | + ); | |
| 279 | + endif; | |
| 280 | + endforeach; | |
| 281 | + } | |
| 316 | 282 | |
| 317 | -function log_feedwordpress_update_feeds ($uri) { | |
| 318 | - error_log("[".date('Y-m-d H:i:s')."][feedwordpress] update('$uri')"); | |
| 319 | -} | |
| 283 | + function admin_emails ($id = '') { | |
| 284 | + $users = get_users_of_blog($id); | |
| 285 | + $recipients = array(); | |
| 286 | + foreach ($users as $user) : | |
| 287 | + $user_id = (isset($user->user_id) ? $user->user_id : $user->ID); | |
| 288 | + $dude = new WP_User($user_id); | |
| 289 | + if ($dude->has_cap('administrator')) : | |
| 290 | + if ($dude->user_email) : | |
| 291 | + $recipients[] = $dude->user_email; | |
| 292 | + endif; | |
| 293 | + endif; | |
| 294 | + endforeach; | |
| 295 | + return $recipients; | |
| 296 | + } | |
| 297 | +} /* class FeedWordPressDiagnostic */ | |
| 320 | 298 | |
| 321 | -function log_feedwordpress_check_feed ($feed) { | |
| 322 | - $uri = $feed['link/uri']; $name = $feed['link/name']; | |
| 323 | - error_log("[".date('Y-m-d H:i:s')."][feedwordpress] Examining $name <$uri>"); | |
| 299 | +function debug_out_human_readable_bytes ($quantity) { | |
| 300 | + $quantity = (int) $quantity; | |
| 301 | + $magnitude = 'B'; | |
| 302 | + $orders = array('KB', 'MB', 'GB', 'TB'); | |
| 303 | + while (($quantity > (1024*100)) and (count($orders) > 0)) : | |
| 304 | + $quantity = floor($quantity / 1024); | |
| 305 | + $magnitude = array_shift($orders); | |
| 306 | + endwhile; | |
| 307 | + return "${quantity} ${magnitude}"; | |
| 324 | 308 | } |
| 325 | 309 | |
| 326 | -function log_feedwordpress_update_complete ($delta) { | |
| 327 | - $mesg = array(); | |
| 328 | - if (isset($delta['new'])) $mesg[] = 'added '.$delta['new'].' new posts'; | |
| 329 | - if (isset($delta['updated'])) $mesg[] = 'updated '.$delta['updated'].' existing posts'; | |
| 330 | - if (empty($mesg)) $mesg[] = 'nothing changed'; | |
| 331 | - | |
| 332 | - error_log("[".date('Y-m-d H:i:s')."][feedwordpress] " | |
| 333 | - .(is_null($delta) ? "Error: I don't syndicate that URI" | |
| 334 | - : implode(' and ', $mesg))); | |
| 335 | -} | |
| 336 | - | |
| 337 | -function debug_out_feedwordpress_post ($id) { | |
| 338 | - $post = wp_get_single_post($id); | |
| 339 | - print ("[".date('Y-m-d H:i:s')."][feedwordpress] posted " | |
| 340 | - ."'{$post->post_title}' ({$post->post_date})\n"); | |
| 341 | -} | |
| 342 | - | |
| 343 | -function debug_out_feedwordpress_update_post ($id) { | |
| 344 | - $post = wp_get_single_post($id); | |
| 345 | - print ("[".date('Y-m-d H:i:s')."][feedwordpress] updated " | |
| 346 | - ."'{$post->post_title}' ({$post->post_date})" | |
| 347 | - ." (as of {$post->post_modified})\n"); | |
| 348 | -} | |
| 349 | - | |
| 350 | -function debug_out_feedwordpress_update_feeds ($uri) { | |
| 351 | - print ("[".date('Y-m-d H:i:s')."][feedwordpress] update('$uri')\n"); | |
| 352 | -} | |
| 353 | - | |
| 354 | -function debug_out_feedwordpress_check_feed ($feed) { | |
| 355 | - $uri = $feed['link/uri']; $name = $feed['link/name']; | |
| 356 | - print ("[".date('Y-m-d H:i:s')."][feedwordpress] Examining $name <$uri>\n"); | |
| 357 | -} | |
| 358 | - | |
| 359 | -function debug_out_feedwordpress_update_complete ($delta) { | |
| 360 | - $mesg = array(); | |
| 361 | - if (isset($delta['new'])) $mesg[] = 'added '.$delta['new'].' new posts'; | |
| 362 | - if (isset($delta['updated'])) $mesg[] = 'updated '.$delta['updated'].' existing posts'; | |
| 363 | - if (empty($mesg)) $mesg[] = 'nothing changed'; | |
| 364 | - | |
| 365 | - print ("[".date('Y-m-d H:i:s')."][feedwordpress] " | |
| 366 | - .(is_null($delta) ? "Error: I don't syndicate that URI" | |
| 367 | - : implode(' and ', $mesg))."\n"); | |
| 368 | -} | |
| 369 | - | |
| 370 | -function debug_out_feedwordpress_feed_error ($feed, $added, $dt) { | |
| 371 | - if (is_wp_error($added)) : | |
| 372 | - $mesgs = $added->get_error_messages(); | |
| 373 | - foreach ($mesgs as $mesg) : | |
| 374 | - echo "[feedwordpress] Error updating [{$feed['link/uri']}]: $mesg\n"; | |
| 375 | - endforeach; | |
| 310 | +function debug_out_feedwordpress_footer () { | |
| 311 | + if (FeedWordPress::diagnostic_on('memory_usage')) : | |
| 312 | + if (function_exists('memory_get_usage')) : | |
| 313 | + FeedWordPress::diagnostic ('memory_usage', "Memory: Current usage: ".debug_out_human_readable_bytes(memory_get_usage())); | |
| 314 | + endif; | |
| 315 | + if (function_exists('memory_get_peak_usage')) : | |
| 316 | + FeedWordPress::diagnostic ('memory_usage', "Memory: Peak usage: ".debug_out_human_readable_bytes(memory_get_peak_usage())); | |
| 317 | + endif; | |
| 376 | 318 | endif; |
| 377 | -} | |
| 319 | +} /* debug_out_feedwordpress_footer() */ | |
| 378 | 320 | |
| 379 | 321 | ################################################################################ |
| 380 | 322 | ## TEMPLATE API: functions to make your templates syndication-aware ############ |
| 381 | 323 | ################################################################################ |
| @@ -392,34 +334,16 @@ | ||
| 392 | 334 | function is_syndicated ($id = NULL) { |
| 393 | 335 | return (strlen(get_syndication_feed_id($id)) > 0); |
| 394 | 336 | } /* function is_syndicated() */ |
| 395 | 337 | |
| 396 | -function get_syndication_source_link ($original = NULL, $id = NULL) { | |
| 397 | - if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data(); | |
| 398 | - endif; | |
| 399 | - | |
| 400 | - if ($original) : $vals = get_post_custom_values('syndication_source_uri_original', $id); | |
| 401 | - else : $vals = array(); | |
| 402 | - endif; | |
| 403 | - | |
| 404 | - if (count($vals) == 0) : $vals = get_post_custom_values('syndication_source_uri', $id); | |
| 405 | - endif; | |
| 406 | - | |
| 407 | - if (count($vals) > 0) : $ret = $vals[0]; else : $ret = NULL; endif; | |
| 408 | - | |
| 409 | - return $ret; | |
| 410 | -} /* function get_syndication_source_link() */ | |
| 411 | - | |
| 412 | -function the_syndication_source_link ($original = NULL, $id = NULL) { | |
| 413 | - echo get_syndication_source_link($original, $id); | |
| 414 | -} | |
| 415 | - | |
| 416 | 338 | function feedwordpress_display_url ($url, $before = 60, $after = 0) { |
| 417 | 339 | $bits = parse_url($url); |
| 418 | 340 | |
| 419 | 341 | // Strip out crufty subdomains |
| 420 | - $bits['host'] = preg_replace('/^www[0-9]*\./i', '', $bits['host']); | |
| 421 | - | |
| 342 | + if (isset($bits['host'])) : | |
| 343 | + $bits['host'] = preg_replace('/^www[0-9]*\./i', '', $bits['host']); | |
| 344 | + endif; | |
| 345 | + | |
| 422 | 346 | // Reassemble bit-by-bit with minimum of crufty elements |
| 423 | 347 | $url = (isset($bits['user'])?$bits['user'].'@':'') |
| 424 | 348 | .(isset($bits['host'])?$bits['host']:'') |
| 425 | 349 | .(isset($bits['path'])?$bits['path']:'') |
| @@ -430,77 +354,59 @@ | ||
| 430 | 354 | $url = substr($url, 0, $before).'…'.substr($url, 0 - $after, $after); |
| 431 | 355 | endif; |
| 432 | 356 | |
| 433 | 357 | return $url; |
| 434 | -} | |
| 358 | +} /* feedwordpress_display_url () */ | |
| 435 | 359 | |
| 436 | -function get_syndication_source ($original = NULL, $id = NULL) { | |
| 360 | +function get_syndication_source_property ($original, $id, $local, $remote = NULL) { | |
| 361 | + $ret = NULL; | |
| 437 | 362 | if (is_null($original)) : |
| 438 | 363 | $original = FeedWordPress::use_aggregator_source_data(); |
| 439 | 364 | endif; |
| 440 | - | |
| 441 | - if ($original) : | |
| 442 | - $vals = get_post_custom_values('syndication_source_original', $id); | |
| 443 | - else : | |
| 444 | - $vals = array(); | |
| 365 | + | |
| 366 | + if (is_null($remote)) : | |
| 367 | + $remote = $local . '_original'; | |
| 445 | 368 | endif; |
| 446 | 369 | |
| 447 | - if (count($vals) == 0) : | |
| 448 | - $vals = get_post_custom_values('syndication_source', $id); | |
| 370 | + $vals = ($original ? get_post_custom_values($remote, $id) : array()); | |
| 371 | + if (count($vals) < 1) : | |
| 372 | + $vals = get_post_custom_values($local, $id); | |
| 449 | 373 | endif; |
| 450 | 374 | |
| 451 | 375 | if (count($vals) > 0) : |
| 452 | 376 | $ret = $vals[0]; |
| 453 | - else : | |
| 454 | - $ret = NULL; | |
| 455 | 377 | endif; |
| 378 | + return $ret; | |
| 379 | +} /* function get_syndication_source_property () */ | |
| 456 | 380 | |
| 457 | - if (is_null($ret) or strlen(trim($ret)) == 0) : | |
| 458 | - // Fall back to URL of blog | |
| 381 | +function the_syndication_source_link ($original = NULL, $id = NULL) { echo get_syndication_source_link($original, $id); } | |
| 382 | +function get_syndication_source_link ($original = NULL, $id = NULL) { | |
| 383 | + return get_syndication_source_property($original, $id, 'syndication_source_uri'); | |
| 384 | +} /* function get_syndication_source_link() */ | |
| 385 | + | |
| 386 | +function the_syndication_source ($original = NULL, $id = NULL) { echo get_syndication_source($original, $id); } | |
| 387 | +function get_syndication_source ($original = NULL, $id = NULL) { | |
| 388 | + $ret = get_syndication_source_property($original, $id, 'syndication_source'); | |
| 389 | + if (is_null($ret) or strlen(trim($ret)) == 0) : // Fall back to URL of blog | |
| 459 | 390 | $ret = feedwordpress_display_url(get_syndication_source_link()); |
| 460 | 391 | endif; |
| 461 | - | |
| 462 | 392 | return $ret; |
| 463 | 393 | } /* function get_syndication_source() */ |
| 464 | 394 | |
| 465 | -function the_syndication_source ($original = NULL, $id = NULL) { echo get_syndication_source($original, $id); } | |
| 466 | - | |
| 395 | +function the_syndication_feed ($original = NULL, $id = NULL) { echo get_syndication_feed($original, $id); } | |
| 467 | 396 | function get_syndication_feed ($original = NULL, $id = NULL) { |
| 468 | - if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data(); | |
| 469 | - endif; | |
| 470 | - | |
| 471 | - if ($original) : $vals = get_post_custom_values('syndication_feed_original', $id); | |
| 472 | - else : $vals = array(); | |
| 473 | - endif; | |
| 474 | - | |
| 475 | - if (count($vals) == 0) : $vals = get_post_custom_values('syndication_feed', $id); | |
| 476 | - endif; | |
| 477 | - | |
| 478 | - if (count($vals) > 0) : $ret = $vals[0]; else : $ret = NULL; endif; | |
| 479 | - | |
| 480 | - return $ret; | |
| 397 | + return get_syndication_source_property($original, $id, 'syndication_feed'); | |
| 481 | 398 | } /* function get_syndication_feed() */ |
| 482 | 399 | |
| 483 | -function the_syndication_feed ($original = NULL, $id = NULL) { echo get_syndication_feed($original, $id); } | |
| 484 | - | |
| 400 | +function the_syndication_feed_guid ($original = NULL, $id = NULL) { echo get_syndication_feed_guid($original, $id); } | |
| 485 | 401 | function get_syndication_feed_guid ($original = NULL, $id = NULL) { |
| 486 | - if (is_null($original)) : $original = FeedWordPress::use_aggregator_source_data(); | |
| 402 | + $ret = get_syndication_source_property($original, $id, 'syndication_source_id'); | |
| 403 | + if (is_null($ret) or strlen(trim($ret))==0) : // Fall back to URL of feed | |
| 404 | + $ret = get_syndication_feed(); | |
| 487 | 405 | endif; |
| 488 | - | |
| 489 | - if ($original) : $vals = get_post_custom_values('syndication_source_id_original', $id); | |
| 490 | - else : $vals = array(); | |
| 491 | - endif; | |
| 492 | - | |
| 493 | - if (count($vals) == 0) : $vals = array(get_feed_meta('feed/id', $id)); | |
| 494 | - endif; | |
| 495 | - | |
| 496 | - if (count($vals) > 0) : $ret = $vals[0]; else : $ret = NULL; endif; | |
| 497 | - | |
| 498 | 406 | return $ret; |
| 499 | 407 | } /* function get_syndication_feed_guid () */ |
| 500 | 408 | |
| 501 | -function the_syndication_feed_guid ($original = NULL, $id = NULL) { echo get_syndication_feed_guid($original, $id); } | |
| 502 | - | |
| 503 | 409 | function get_syndication_feed_id ($id = NULL) { list($u) = get_post_custom_values('syndication_feed_id', $id); return $u; } |
| 504 | 410 | function the_syndication_feed_id ($id = NULL) { echo get_syndication_feed_id($id); } |
| 505 | 411 | |
| 506 | 412 | $feedwordpress_linkcache = array (); // only load links from database once |
| @@ -647,30 +553,43 @@ | ||
| 647 | 553 | * @return string The new permalink. Same as the old if the post is not |
| 648 | 554 | * syndicated, or if FWP is set to use internal permalinks, or if the post |
| 649 | 555 | * was syndicated, but didn't have a proper permalink recorded. |
| 650 | 556 | * |
| 651 | - * @uses FeedWordPress::munge_permalinks() | |
| 557 | + * @uses SyndicatedLink::setting() | |
| 652 | 558 | * @uses get_syndication_permalink() |
| 559 | + * @uses get_syndication_feed_object() | |
| 560 | + * @uses url_to_postid() | |
| 561 | + * @global $id | |
| 653 | 562 | * @global $feedwordpress_the_original_permalink |
| 654 | - */ | |
| 655 | -function syndication_permalink ($permalink = '') { | |
| 563 | + */ | |
| 564 | +function syndication_permalink ($permalink = '', $post = null, $leavename = false) { | |
| 565 | + global $id; | |
| 656 | 566 | global $feedwordpress_the_original_permalink; |
| 657 | 567 | |
| 658 | 568 | // Save the local permalink in case we need to retrieve it later. |
| 659 | 569 | $feedwordpress_the_original_permalink = $permalink; |
| 660 | 570 | |
| 661 | - // Map this permalink to a post ID so we can get the correct permalink | |
| 662 | - // even outside of the Post Loop. Props Björn. | |
| 663 | - $id = url_to_postid($permalink); | |
| 571 | + if (is_object($post) and isset($post->ID) and !empty($post->ID)) : | |
| 572 | + // Use the post ID we've been provided with. | |
| 573 | + $postId = $post->ID; | |
| 574 | + elseif (is_string($permalink) and strlen($permalink) > 0) : | |
| 575 | + // Map this permalink to a post ID so we can get the correct | |
| 576 | + // permalink even outside of the Post Loop. Props Björn. | |
| 577 | + $postId = url_to_postid($permalink); | |
| 578 | + else : | |
| 579 | + // If the permalink string is empty but Post Loop context | |
| 580 | + // provides an id. | |
| 581 | + $postId = $id; | |
| 582 | + endif; | |
| 664 | 583 | |
| 665 | 584 | $munge = false; |
| 666 | - $link = get_syndication_feed_object($id); | |
| 585 | + $link = get_syndication_feed_object($postId); | |
| 667 | 586 | if (is_object($link)) : |
| 668 | 587 | $munge = ($link->setting('munge permalink', 'munge_permalink', 'yes') != 'no'); |
| 669 | 588 | endif; |
| 670 | 589 | |
| 671 | 590 | if ($munge): |
| 672 | - $uri = get_syndication_permalink($id); | |
| 591 | + $uri = get_syndication_permalink($postId); | |
| 673 | 592 | $permalink = ((strlen($uri) > 0) ? $uri : $permalink); |
| 674 | 593 | endif; |
| 675 | 594 | return $permalink; |
| 676 | 595 | } /* function syndication_permalink () */ |
| @@ -686,8 +605,9 @@ | ||
| 686 | 605 | * @uses FeedWordPress::munge_permalinks() |
| 687 | 606 | * |
| 688 | 607 | */ |
| 689 | 608 | function syndication_permalink_escaped ($permalink) { |
| 609 | + /* FIXME: This should review link settings not just global settings */ | |
| 690 | 610 | if (is_syndicated() and FeedWordPress::munge_permalinks()) : |
| 691 | 611 | // This is a foreign link; WordPress can't vouch for its not |
| 692 | 612 | // having any entities that need to be &-escaped. So we'll do |
| 693 | 613 | // it here. |
| @@ -764,23 +684,55 @@ | ||
| 764 | 684 | ## ADMIN MENU ADD-ONS: register Dashboard management pages ##################### |
| 765 | 685 | ################################################################################ |
| 766 | 686 | |
| 767 | 687 | function fwp_add_pages () { |
| 768 | - global $fwp_capability; | |
| 769 | - global $fwp_path; | |
| 688 | + $menu_cap = FeedWordPress::menu_cap(); | |
| 689 | + $settings_cap = FeedWordPress::menu_cap(/*sub=*/ true); | |
| 690 | + $syndicationMenu = FeedWordPress::path('syndication.php'); | |
| 691 | + | |
| 692 | + add_menu_page( | |
| 693 | + 'Syndicated Sites', 'Syndication', | |
| 694 | + $menu_cap, | |
| 695 | + $syndicationMenu, | |
| 696 | + NULL, | |
| 697 | + WP_PLUGIN_URL.'/'.FeedWordPress::path('feedwordpress-tiny.png') | |
| 698 | + ); | |
| 770 | 699 | |
| 771 | - $menu = array('Syndicated Sites', 'Syndication', $fwp_capability['manage_links'], $fwp_path.'/syndication.php', NULL); | |
| 772 | - if (fwp_test_wp_version(FWP_SCHEMA_27)) : | |
| 773 | - // add icon parameter | |
| 774 | - $menu[] = WP_PLUGIN_URL.'/'.$fwp_path.'/feedwordpress-tiny.png'; | |
| 775 | - endif; | |
| 700 | + do_action('feedwordpress_admin_menu_pre_feeds', $menu_cap, $settings_cap); | |
| 701 | + add_submenu_page( | |
| 702 | + $syndicationMenu, 'Syndicated Feeds & Updates', 'Feeds & Updates', | |
| 703 | + $settings_cap, FeedWordPress::path('feeds-page.php') | |
| 704 | + ); | |
| 776 | 705 | |
| 777 | - call_user_func_array('add_menu_page', $menu); | |
| 778 | - add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Feeds & Updates', 'Feeds & Updates', $fwp_capability['manage_options'], $fwp_path.'/feeds-page.php'); | |
| 779 | - add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Posts & Links', 'Posts & Links', $fwp_capability['manage_options'], $fwp_path.'/posts-page.php'); | |
| 780 | - add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Authors', 'Authors', $fwp_capability['manage_options'], $fwp_path.'/authors-page.php'); | |
| 781 | - add_submenu_page($fwp_path.'/syndication.php', 'Categories'.FEEDWORDPRESS_AND_TAGS, 'Categories'.FEEDWORDPRESS_AND_TAGS, $fwp_capability['manage_options'], $fwp_path.'/categories-page.php'); | |
| 782 | - add_submenu_page($fwp_path.'/syndication.php', 'FeedWordPress Back End', 'Back End', $fwp_capability['manage_options'], $fwp_path.'/backend-page.php'); | |
| 706 | + do_action('feedwordpress_admin_menu_pre_posts', $menu_cap, $settings_cap); | |
| 707 | + add_submenu_page( | |
| 708 | + $syndicationMenu, 'Syndicated Posts & Links', 'Posts & Links', | |
| 709 | + $settings_cap, FeedWordPress::path('posts-page.php') | |
| 710 | + ); | |
| 711 | + | |
| 712 | + do_action('feedwordpress_admin_menu_pre_authors', $menu_cap, $settings_cap); | |
| 713 | + add_submenu_page( | |
| 714 | + $syndicationMenu, 'Syndicated Authors', 'Authors', | |
| 715 | + $settings_cap, FeedWordPress::path('authors-page.php') | |
| 716 | + ); | |
| 717 | + | |
| 718 | + do_action('feedwordpress_admin_menu_pre_categories', $menu_cap, $settings_cap); | |
| 719 | + add_submenu_page( | |
| 720 | + $syndicationMenu, 'Categories'.FEEDWORDPRESS_AND_TAGS, 'Categories'.FEEDWORDPRESS_AND_TAGS, | |
| 721 | + $settings_cap, FeedWordPress::path('categories-page.php') | |
| 722 | + ); | |
| 723 | + | |
| 724 | + do_action('feedwordpress_admin_menu_pre_performance', $menu_cap, $settings_cap); | |
| 725 | + add_submenu_page( | |
| 726 | + $syndicationMenu, 'FeedWordPress Performance', 'Performance', | |
| 727 | + $settings_cap, FeedWordPress::path('performance-page.php') | |
| 728 | + ); | |
| 729 | + | |
| 730 | + do_action('feedwordpress_admin_menu_pre_diagnostics', $menu_cap, $settings_cap); | |
| 731 | + add_submenu_page( | |
| 732 | + $syndicationMenu, 'FeedWordPress Diagnostics', 'Diagnostics', | |
| 733 | + $settings_cap, FeedWordPress::path('diagnostics-page.php') | |
| 734 | + ); | |
| 783 | 735 | } /* function fwp_add_pages () */ |
| 784 | 736 | |
| 785 | 737 | function fwp_check_debug () { |
| 786 | 738 | // This is a horrible fucking kludge that I have to do because the |
| @@ -862,8 +814,11 @@ | ||
| 862 | 814 | } |
| 863 | 815 | |
| 864 | 816 | function feedwordpress_add_post_edit_controls () { |
| 865 | 817 | add_meta_box('feedwordpress-post-controls', __('Syndication'), 'feedwordpress_post_edit_controls', 'post', 'side', 'high'); |
| 818 | + if (FeedWordPress::diagnostic_on('syndicated_posts:static_meta_data')) : | |
| 819 | + $GLOBALS['inspectPostMeta'] = new InspectPostMeta; | |
| 820 | + endif; | |
| 866 | 821 | } // function FeedWordPress::postEditControls |
| 867 | 822 | |
| 868 | 823 | function feedwordpress_post_edit_controls () { |
| 869 | 824 | global $post; |
| @@ -909,14 +864,16 @@ | ||
| 909 | 864 | endif; |
| 910 | 865 | |
| 911 | 866 | // OK, we're golden. Now let's save some data. |
| 912 | 867 | if (isset($_POST['freeze_updates'])) : |
| 913 | - update_post_meta($post_id, '_syndication_freeze_updates', $_POST['freeze_updates']); | |
| 868 | + update_post_meta($post_id, '_syndication_freeze_updates', $_POST['freeze_updates']); | |
| 869 | + $ret = $_POST['freeze_updates']; | |
| 914 | 870 | else : |
| 915 | 871 | delete_post_meta($post_id, '_syndication_freeze_updates'); |
| 872 | + $ret = NULL; | |
| 916 | 873 | endif; |
| 917 | 874 | |
| 918 | - return $_POST['freeze_updates']; | |
| 875 | + return $ret; | |
| 919 | 876 | } // function feedwordpress_save_edit_controls |
| 920 | 877 | |
| 921 | 878 | ################################################################################ |
| 922 | 879 | ## class FeedWordPress ######################################################### |
| @@ -1022,11 +979,18 @@ | ||
| 1022 | 979 | if (FeedWordPress::needs_upgrade()) : // Will make duplicate posts if we don't hold off |
| 1023 | 980 | return NULL; |
| 1024 | 981 | endif; |
| 1025 | 982 | |
| 1026 | - if (!is_null($uri)) : | |
| 983 | + if (!is_null($uri) and $uri != '*') : | |
| 1027 | 984 | $uri = trim($uri); |
| 1028 | 985 | else : // Update all |
| 986 | + if ($this->update_hooked) : | |
| 987 | + $diag = $this->update_hooked; | |
| 988 | + else : | |
| 989 | + $diag = 'Initiating a MANUAL check-in on the update schedule at '.date('r', time()); | |
| 990 | + endif; | |
| 991 | + $this->diagnostic('update_schedule:check', $diag); | |
| 992 | + | |
| 1029 | 993 | update_option('feedwordpress_last_update_all', time()); |
| 1030 | 994 | endif; |
| 1031 | 995 | |
| 1032 | 996 | do_action('feedwordpress_update', $uri); |
| @@ -1031,27 +995,34 @@ | ||
| 1031 | 995 | |
| 1032 | 996 | do_action('feedwordpress_update', $uri); |
| 1033 | 997 | |
| 1034 | 998 | if (is_null($crash_ts)) : |
| 1035 | - $crash_dt = (int) get_option('feedwordpress_update_time_limit'); | |
| 1036 | - if ($crash_dt > 0) : | |
| 1037 | - $crash_ts = time() + $crash_dt; | |
| 1038 | - else : | |
| 1039 | - $crash_ts = NULL; | |
| 1040 | - endif; | |
| 999 | + $crash_ts = $this->crash_ts(); | |
| 1041 | 1000 | endif; |
| 1001 | + | |
| 1002 | + $max_polls = apply_filters('feedwordpress_polls_per_update', get_option('feedwordpress_polls_per_update', 10), $uri); | |
| 1042 | 1003 | |
| 1043 | 1004 | // Randomize order for load balancing purposes |
| 1044 | 1005 | $feed_set = $this->feeds; |
| 1045 | 1006 | shuffle($feed_set); |
| 1046 | 1007 | |
| 1008 | + $feed_set = apply_filters('feedwordpress_update_feeds', $feed_set, $uri); | |
| 1009 | + | |
| 1047 | 1010 | // Loop through and check for new posts |
| 1048 | - $delta = NULL; | |
| 1011 | + $delta = NULL; $remaining = $max_polls; | |
| 1049 | 1012 | foreach ($feed_set as $feed) : |
| 1050 | - if (!is_null($crash_ts) and (time() > $crash_ts)) : // Check whether we've exceeded the time limit | |
| 1013 | + | |
| 1014 | + // Has this process overstayed its welcome? | |
| 1015 | + if ( | |
| 1016 | + // Over time limit? | |
| 1017 | + (!is_null($crash_ts) and (time() > $crash_ts)) | |
| 1018 | + | |
| 1019 | + // Over feed count? | |
| 1020 | + or ($remaining == 0) | |
| 1021 | + ) : | |
| 1051 | 1022 | break; |
| 1052 | 1023 | endif; |
| 1053 | - | |
| 1024 | + | |
| 1054 | 1025 | $pinged_that = (is_null($uri) or ($uri=='*') or in_array($uri, array($feed->uri(), $feed->homepage()))); |
| 1055 | 1026 | |
| 1056 | 1027 | if (!is_null($uri)) : // A site-specific ping always updates |
| 1057 | 1028 | $timely = true; |
| @@ -1058,13 +1029,15 @@ | ||
| 1058 | 1029 | else : |
| 1059 | 1030 | $timely = $feed->stale(); |
| 1060 | 1031 | endif; |
| 1061 | 1032 | |
| 1062 | - if ($pinged_that and is_null($delta)) : // If at least one feed was hit for updating... | |
| 1033 | + if ($pinged_that and is_null($delta)) : // If at least one feed was hit for updating... | |
| 1063 | 1034 | $delta = array('new' => 0, 'updated' => 0); // ... don't return error condition |
| 1064 | 1035 | endif; |
| 1065 | 1036 | |
| 1066 | 1037 | if ($pinged_that and $timely) : |
| 1038 | + $remaining = $remaining - 1; | |
| 1039 | + | |
| 1067 | 1040 | do_action('feedwordpress_check_feed', $feed->settings); |
| 1068 | 1041 | $start_ts = time(); |
| 1069 | 1042 | $added = $feed->poll($crash_ts); |
| 1070 | 1043 | do_action('feedwordpress_check_feed_complete', $feed->settings, $added, time() - $start_ts); |
| @@ -1080,14 +1053,91 @@ | ||
| 1080 | 1053 | |
| 1081 | 1054 | return $delta; |
| 1082 | 1055 | } |
| 1083 | 1056 | |
| 1057 | + function crash_ts ($default = NULL) { | |
| 1058 | + $crash_dt = (int) get_option('feedwordpress_update_time_limit', 0); | |
| 1059 | + if ($crash_dt > 0) : | |
| 1060 | + $crash_ts = time() + $crash_dt; | |
| 1061 | + else : | |
| 1062 | + $crash_ts = $default; | |
| 1063 | + endif; | |
| 1064 | + return $crash_ts; | |
| 1065 | + } | |
| 1066 | + | |
| 1067 | + function secret_key () { | |
| 1068 | + $secret = get_option('feedwordpress_secret_key', false); | |
| 1069 | + if (!$secret) : // Generate random key. | |
| 1070 | + $secret = substr(md5(uniqid(microtime())), 0, 6); | |
| 1071 | + update_option('feedwordpress_secret_key', $secret); | |
| 1072 | + endif; | |
| 1073 | + return $secret; | |
| 1074 | + } | |
| 1075 | + | |
| 1076 | + function has_secret () { | |
| 1077 | + return ($this->by_request('feedwordpress_key', $this->secret_key())); | |
| 1078 | + } | |
| 1079 | + | |
| 1080 | + // Utility function so I don't have to repeat myself w/ 1,000,003 isset()'s | |
| 1081 | + function by_request ($param, $eq = NULL) { | |
| 1082 | + $match = false; | |
| 1083 | + if (isset($_REQUEST[$param])) : | |
| 1084 | + $match = (is_null($eq) ? $_REQUEST[$param] : ($eq==$_REQUEST[$param])); | |
| 1085 | + endif; | |
| 1086 | + return $match; | |
| 1087 | + } | |
| 1088 | + | |
| 1089 | + var $update_hooked = NULL; | |
| 1090 | + function automatic_update_hook ($params = array()) { | |
| 1091 | + $params = wp_parse_args($params, array( // Defaults | |
| 1092 | + 'setting only' => false, | |
| 1093 | + )); | |
| 1094 | + $hook = get_option('feedwordpress_automatic_updates', NULL); | |
| 1095 | + $method = 'FeedWordPress option'; | |
| 1096 | + | |
| 1097 | + // Allow for forced behavior in testing. | |
| 1098 | + if ( | |
| 1099 | + !$params['setting only'] | |
| 1100 | + and $this->has_secret() | |
| 1101 | + and $this->by_request('automatic_update') | |
| 1102 | + ) : | |
| 1103 | + $hook = $_REQUEST['automatic_update']; | |
| 1104 | + $method = 'URL parameter'; | |
| 1105 | + endif; | |
| 1106 | + | |
| 1107 | + $exact = $hook; // Before munging | |
| 1108 | + | |
| 1109 | + if (!!$hook) : | |
| 1110 | + if ($hook != 'init') : // Constrain values. | |
| 1111 | + $hook = 'shutdown'; | |
| 1112 | + endif; | |
| 1113 | + endif; | |
| 1114 | + | |
| 1115 | + if ($hook) : | |
| 1116 | + $this->update_hooked = "Initiating an AUTOMATIC CHECK FOR UPDATES ON PAGE LOAD ".$hook." due to ".$method." = ".trim($this->val($exact)); | |
| 1117 | + endif; | |
| 1118 | + | |
| 1119 | + return $hook; | |
| 1120 | + } | |
| 1121 | + function last_update_all () { | |
| 1122 | + $last = get_option('feedwordpress_last_update_all'); | |
| 1123 | + if ($this->has_secret() and $this->by_request('automatic_update')) : | |
| 1124 | + $last = 1; // A long, long time ago. | |
| 1125 | + elseif ($this->has_secret() and $this->by_request('last_update_all')) : | |
| 1126 | + $last = $_REQUEST['last_update_all']; | |
| 1127 | + endif; | |
| 1128 | + return $last; | |
| 1129 | + } | |
| 1130 | + function force_update_all () { | |
| 1131 | + return ($this->has_secret() and $this->by_request('force_update_feeds')); | |
| 1132 | + } | |
| 1133 | + | |
| 1084 | 1134 | function stale () { |
| 1085 | - if (get_option('feedwordpress_automatic_updates')) : | |
| 1135 | + if (!is_null($this->automatic_update_hook())) : | |
| 1086 | 1136 | // Do our best to avoid possible simultaneous |
| 1087 | 1137 | // updates by getting up-to-the-minute settings. |
| 1088 | 1138 | |
| 1089 | - $last = get_option('feedwordpress_last_update_all'); | |
| 1139 | + $last = $this->last_update_all(); | |
| 1090 | 1140 | |
| 1091 | 1141 | // If we haven't updated all yet, give it a time window |
| 1092 | 1142 | if (false === $last) : |
| 1093 | 1143 | $ret = false; |
| @@ -1098,13 +1148,13 @@ | ||
| 1098 | 1148 | $freshness = get_option('feedwordpress_freshness'); |
| 1099 | 1149 | if (false === $freshness) : // Use default |
| 1100 | 1150 | $freshness = FEEDWORDPRESS_FRESHNESS_INTERVAL; |
| 1101 | 1151 | endif; |
| 1102 | - $ret = ( (time() - $last) > $freshness); | |
| 1103 | - | |
| 1104 | - // This should never happen. | |
| 1152 | + $ret = ( (time() - $last) > $freshness ); | |
| 1153 | + | |
| 1154 | + // This should never happen. | |
| 1105 | 1155 | else : |
| 1106 | - FeedWordPress::critical_bug('FeedWordPress::stale::last', $last, __LINE__); | |
| 1156 | + FeedWordPress::critical_bug('FeedWordPress::stale::last', $last, __LINE__, __FILE__); | |
| 1107 | 1157 | endif; |
| 1108 | 1158 | |
| 1109 | 1159 | else : |
| 1110 | 1160 | $ret = false; |
| @@ -1110,69 +1160,182 @@ | ||
| 1110 | 1160 | $ret = false; |
| 1111 | 1161 | endif; |
| 1112 | 1162 | return $ret; |
| 1113 | 1163 | } // FeedWordPress::stale() |
| 1164 | + | |
| 1165 | + function init () { | |
| 1166 | + $this->clear_cache_magic_url(); | |
| 1167 | + $this->update_magic_url(); | |
| 1168 | + } /* FeedWordPress::init() */ | |
| 1114 | 1169 | |
| 1115 | - function update_requested () { | |
| 1170 | + function dashboard_setup () { | |
| 1171 | + $see_it = FeedWordPress::menu_cap(); | |
| 1172 | + | |
| 1173 | + if (current_user_can($see_it)) : | |
| 1174 | + // Get the stylesheet | |
| 1175 | + wp_enqueue_style('feedwordpress-elements'); | |
| 1176 | + | |
| 1177 | + $widget_id = 'feedwordpress_dashboard'; | |
| 1178 | + $widget_name = __('Syndicated Sources'); | |
| 1179 | + $column = 'side'; | |
| 1180 | + $priority = 'core'; | |
| 1181 | + | |
| 1182 | + // I would love to use wp_add_dashboard_widget() here and save | |
| 1183 | + // myself some trouble. But WP 3 does not yet have any way to | |
| 1184 | + // push a dashboard widget onto the side, or to give it a default | |
| 1185 | + // location. | |
| 1186 | + add_meta_box( | |
| 1187 | + /*id=*/ $widget_id, | |
| 1188 | + /*title=*/ $widget_name, | |
| 1189 | + /*callback=*/ array(&$this, 'dashboard'), | |
| 1190 | + /*page=*/ 'dashboard', | |
| 1191 | + /*context=*/ $column, | |
| 1192 | + /*priority=*/ $priority | |
| 1193 | + ); | |
| 1194 | + /*control_callback= array(&$this, 'dashboard_control') */ | |
| 1195 | + | |
| 1196 | + // This is kind of rude, I know, but the dashboard widget isn't | |
| 1197 | + // worth much if users don't know that it exists, and I don't | |
| 1198 | + // know of any better way to reorder the boxen. | |
| 1199 | + // | |
| 1200 | + // Gleefully ripped off of codex.wordpress.org/Dashboard_Widgets_API | |
| 1201 | + | |
| 1202 | + // Globalize the metaboxes array, this holds all the widgets for wp-admin | |
| 1203 | + global $wp_meta_boxes; | |
| 1204 | + | |
| 1205 | + // Get the regular dashboard widgets array | |
| 1206 | + // (which has our new widget already but at the end) | |
| 1207 | + | |
| 1208 | + $normal_dashboard = $wp_meta_boxes['dashboard'][$column][$priority]; | |
| 1209 | + | |
| 1210 | + // Backup and delete our new dashbaord widget from the end of the array | |
| 1211 | + if (isset($normal_dashboard[$widget_id])) : | |
| 1212 | + $backup = array(); | |
| 1213 | + $backup[$widget_id] = $normal_dashboard[$widget_id]; | |
| 1214 | + unset($normal_dashboard[$widget_id]); | |
| 1215 | + | |
| 1216 | + // Merge the two arrays together so our widget is at the | |
| 1217 | + // beginning | |
| 1218 | + $sorted_dashboard = array_merge($backup, $normal_dashboard); | |
| 1219 | + | |
| 1220 | + // Save the sorted array back into the original metaboxes | |
| 1221 | + $wp_meta_boxes['dashboard'][$column][$priority] = $sorted_dashboard; | |
| 1222 | + endif; | |
| 1223 | + endif; | |
| 1224 | + } /* FeedWordPress::dashboard_setup () */ | |
| 1225 | + | |
| 1226 | + function dashboard () { | |
| 1227 | + $syndicationPage = new FeedWordPressSyndicationPage(dirname(__FILE__).'/syndication.php'); | |
| 1228 | + $syndicationPage->dashboard_box($syndicationPage); | |
| 1229 | + } /* FeedWordPress::dashboard () */ | |
| 1230 | + | |
| 1231 | + function update_magic_url () { | |
| 1232 | + global $wpdb; | |
| 1233 | + | |
| 1234 | + // Explicit update request in the HTTP request (e.g. from a cron job) | |
| 1235 | + if ($this->update_requested()) : | |
| 1236 | + $this->update_hooked = "Initiating a CRON JOB CHECK-IN ON UPDATE SCHEDULE due to URL parameter = ".trim($this->val($_REQUEST['update_feedwordpress'])); | |
| 1237 | + | |
| 1238 | + $this->update($this->update_requested_url()); | |
| 1239 | + | |
| 1240 | + if (FEEDWORDPRESS_DEBUG and count($wpdb->queries) > 0) : | |
| 1241 | + $mysqlTime = 0.0; | |
| 1242 | + $byTime = array(); | |
| 1243 | + foreach ($wpdb->queries as $query) : | |
| 1244 | + $time = $query[1] * 1000000.0; | |
| 1245 | + $mysqlTime += $query[1]; | |
| 1246 | + if (!isset($byTime[$time])) : $byTime[$time] = array(); endif; | |
| 1247 | + $byTime[$time][] = $query[0]. ' // STACK: ' . $query[2]; | |
| 1248 | + endforeach; | |
| 1249 | + krsort($byTime); | |
| 1250 | + | |
| 1251 | + foreach ($byTime as $time => $querySet) : | |
| 1252 | + foreach ($querySet as $query) : | |
| 1253 | + print "[".(sprintf('%4.4f', $time/1000.0)) . "ms] $query\n"; | |
| 1254 | + endforeach; | |
| 1255 | + endforeach; | |
| 1256 | + echo $this->log_prefix()."$wpdb->num_queries queries. $mysqlTime seconds in MySQL. Total of "; timer_stop(1); print " seconds."; | |
| 1257 | + endif; | |
| 1258 | + | |
| 1259 | + debug_out_feedwordpress_footer(); | |
| 1260 | + | |
| 1261 | + // Magic URL should return nothing but a 200 OK header packet | |
| 1262 | + // when successful. | |
| 1263 | + exit; | |
| 1264 | + endif; | |
| 1265 | + } /* FeedWordPress::magic_update_url () */ | |
| 1266 | + | |
| 1267 | + function clear_cache_magic_url () { | |
| 1268 | + if ($this->clear_cache_requested()) : | |
| 1269 | + $this->clear_cache(); | |
| 1270 | + endif; | |
| 1271 | + } /* FeedWordPress::clear_cache_magic_url() */ | |
| 1272 | + | |
| 1273 | + function clear_cache_requested () { | |
| 1116 | 1274 | return ( |
| 1117 | - isset($_REQUEST['update_feedwordpress']) | |
| 1118 | - and $_REQUEST['update_feedwordpress'] | |
| 1275 | + isset($_GET['clear_cache']) | |
| 1276 | + and $_GET['clear_cache'] | |
| 1119 | 1277 | ); |
| 1278 | + } /* FeedWordPress::clear_cache_requested() */ | |
| 1279 | + | |
| 1280 | + function update_requested () { | |
| 1281 | + return FeedWordPress::by_request('update_feedwordpress'); | |
| 1120 | 1282 | } // FeedWordPress::update_requested() |
| 1121 | 1283 | |
| 1122 | 1284 | function update_requested_url () { |
| 1123 | - $ret = null; | |
| 1124 | - | |
| 1125 | - if (($_REQUEST['update_feedwordpress']=='*') | |
| 1126 | - or (preg_match('|^http://.*|i', $_REQUEST['update_feedwordpress']))) : | |
| 1127 | - $ret = $_REQUEST['update_feedwordpress']; | |
| 1128 | - endif; | |
| 1285 | + $ret = null; | |
| 1286 | + | |
| 1287 | + if (($_REQUEST['update_feedwordpress']=='*') | |
| 1288 | + or (preg_match('|^http://.*|i', $_REQUEST['update_feedwordpress']))) : | |
| 1289 | + $ret = $_REQUEST['update_feedwordpress']; | |
| 1290 | + endif; | |
| 1129 | 1291 | |
| 1130 | - return $ret; | |
| 1292 | + return $ret; | |
| 1131 | 1293 | } // FeedWordPress::update_requested_url() |
| 1132 | 1294 | |
| 1133 | - function syndicate_link ($name, $uri, $rss) { | |
| 1295 | + function auto_update () { | |
| 1296 | + if ($this->stale()) : | |
| 1297 | + $this->update(); | |
| 1298 | + endif; | |
| 1299 | + } /* FeedWordPress::auto_update () */ | |
| 1300 | + | |
| 1301 | + function find_link ($uri, $field = 'link_rss') { | |
| 1134 | 1302 | global $wpdb; |
| 1135 | 1303 | |
| 1304 | + $unslashed = untrailingslashit($uri); | |
| 1305 | + $slashed = trailingslashit($uri); | |
| 1306 | + $link_id = $wpdb->get_var($wpdb->prepare(" | |
| 1307 | + SELECT link_id FROM $wpdb->links WHERE $field IN ('%s', '%s') | |
| 1308 | + LIMIT 1", $unslashed, $slashed | |
| 1309 | + )); | |
| 1310 | + | |
| 1311 | + return $link_id; | |
| 1312 | + } /* FeedWordPress::find_link () */ | |
| 1313 | + | |
| 1314 | + function syndicate_link ($name, $uri, $rss) { | |
| 1136 | 1315 | // Get the category ID# |
| 1137 | 1316 | $cat_id = FeedWordPress::link_category_id(); |
| 1138 | - | |
| 1317 | + if (!is_wp_error($cat_id)) : | |
| 1318 | + $link_category = array($cat_id); | |
| 1319 | + else : | |
| 1320 | + $link_category = array(); | |
| 1321 | + endif; | |
| 1322 | + | |
| 1139 | 1323 | // WordPress gets cranky if there's no homepage URI |
| 1140 | - if (!isset($uri) or strlen($uri)<1) : $uri = $rss; endif; | |
| 1324 | + if (!is_string($uri) or strlen($uri)<1) : $uri = $rss; endif; | |
| 1141 | 1325 | |
| 1142 | - if (function_exists('wp_insert_link')) : // WordPress 2.x | |
| 1143 | - if (FeedWordPressCompatibility::test_version(0, FWP_SCHEMA_21)) : | |
| 1144 | - // Morons. | |
| 1145 | - $name = $wpdb->escape($name); | |
| 1146 | - $uri = $wpdb->escape($uri); | |
| 1147 | - $rss = $wpdb->escape($rss); | |
| 1148 | - | |
| 1149 | - // Comes in as a single category | |
| 1150 | - $linkCats = $cat_id; | |
| 1151 | - else : | |
| 1152 | - // Comes in as an array of categories | |
| 1153 | - $linkCats = array($cat_id); | |
| 1154 | - endif; | |
| 1326 | + // Check if this feed URL is already being syndicated. | |
| 1327 | + $link_id = wp_insert_link(array( | |
| 1328 | + "link_id" => FeedWordPress::find_link($rss), // insert if nothing was found; else update | |
| 1329 | + "link_rss" => $rss, | |
| 1330 | + "link_name" => $name, | |
| 1331 | + "link_url" => $uri, | |
| 1332 | + "link_category" => $link_category, | |
| 1333 | + "link_visible" => 'Y', // reactivate if inactivated | |
| 1334 | + )); | |
| 1155 | 1335 | |
| 1156 | - $link_id = wp_insert_link(array( | |
| 1157 | - "link_name" => $name, | |
| 1158 | - "link_url" => $uri, | |
| 1159 | - "link_category" => $linkCats, | |
| 1160 | - "link_rss" => $rss | |
| 1161 | - )); | |
| 1162 | - else : // WordPress 1.5.x | |
| 1163 | - $result = $wpdb->query(" | |
| 1164 | - INSERT INTO $wpdb->links | |
| 1165 | - SET | |
| 1166 | - link_name = '".$wpdb->escape($name)."', | |
| 1167 | - link_url = '".$wpdb->escape($uri)."', | |
| 1168 | - link_category = '".$wpdb->escape($cat_id)."', | |
| 1169 | - link_rss = '".$wpdb->escape($rss)."' | |
| 1170 | - "); | |
| 1171 | - $link_id = $wpdb->insert_id; | |
| 1172 | - endif; | |
| 1173 | 1336 | return $link_id; |
| 1174 | - } // function FeedWordPress::syndicate_link() | |
| 1337 | + } /* function FeedWordPress::syndicate_link() */ | |
| 1175 | 1338 | |
| 1176 | 1339 | /*static*/ function syndicated_status ($what, $default) { |
| 1177 | 1340 | $ret = get_option("feedwordpress_syndicated_{$what}_status"); |
| 1178 | 1341 | if (!$ret) : |
| @@ -1180,28 +1343,16 @@ | ||
| 1180 | 1343 | endif; |
| 1181 | 1344 | return $ret; |
| 1182 | 1345 | } /* FeedWordPress::syndicated_status() */ |
| 1183 | 1346 | |
| 1184 | - function on_unfamiliar ($what = 'author', $override = NULL) { | |
| 1185 | - $set = array( | |
| 1186 | - 'author' => array('create', 'default', 'filter'), | |
| 1187 | - 'category' => array('create', 'tag', 'default', 'filter'), | |
| 1188 | - ); | |
| 1347 | + function on_unfamiliar ($what = 'author') { | |
| 1348 | + switch ($what) : | |
| 1349 | + case 'category' : $suffix = ':category'; break; | |
| 1350 | + case 'post_tag' : $suffix = ':post_tag'; break; | |
| 1351 | + default: $suffix = ''; | |
| 1352 | + endswitch; | |
| 1189 | 1353 | |
| 1190 | - if (is_string($override)) : | |
| 1191 | - $ret = strtolower($override); | |
| 1192 | - else : | |
| 1193 | - $ret = NULL; | |
| 1194 | - endif; | |
| 1195 | - | |
| 1196 | - if (!is_numeric($override) and !in_array($ret, $set[$what])) : | |
| 1197 | - $ret = get_option('feedwordpress_unfamiliar_'.$what); | |
| 1198 | - if (!is_numeric($ret) and !in_array($ret, $set[$what])) : | |
| 1199 | - $ret = 'create'; | |
| 1200 | - endif; | |
| 1201 | - endif; | |
| 1202 | - | |
| 1203 | - return $ret; | |
| 1354 | + return get_option('feedwordpress_unfamiliar_'.$what, 'create'.$suffix); | |
| 1204 | 1355 | } // function FeedWordPress::on_unfamiliar() |
| 1205 | 1356 | |
| 1206 | 1357 | function null_email_set () { |
| 1207 | 1358 | $base = get_option('feedwordpress_null_email_set'); |
| @@ -1238,14 +1389,17 @@ | ||
| 1238 | 1389 | /*static*/ function munge_permalinks () { |
| 1239 | 1390 | return (get_option('feedwordpress_munge_permalink', /*default=*/ 'yes') != 'no'); |
| 1240 | 1391 | } /* FeedWordPress::munge_permalinks() */ |
| 1241 | 1392 | |
| 1242 | - function syndicated_links () { | |
| 1393 | + function syndicated_links ($args = array()) { | |
| 1243 | 1394 | $contributors = FeedWordPress::link_category_id(); |
| 1244 | - if (function_exists('get_bookmarks')) : | |
| 1245 | - $links = get_bookmarks(array("category" => $contributors)); | |
| 1246 | - else: | |
| 1247 | - $links = get_linkobjects($contributors); // deprecated as of WP 2.1 | |
| 1395 | + if (!is_wp_error($contributors)) : | |
| 1396 | + $links = get_bookmarks(array_merge( | |
| 1397 | + array("category" => $contributors), | |
| 1398 | + $args | |
| 1399 | + )); | |
| 1400 | + else : | |
| 1401 | + $links = array(); | |
| 1248 | 1402 | endif; |
| 1249 | 1403 | return $links; |
| 1250 | 1404 | } // function FeedWordPress::syndicated_links() |
| 1251 | 1405 | |
| @@ -1271,11 +1425,12 @@ | ||
| 1271 | 1425 | // If we could not find an appropriate link category, |
| 1272 | 1426 | // make a new one for ourselves. |
| 1273 | 1427 | if (!$cat_id) : |
| 1274 | 1428 | $cat_id = FeedWordPressCompatibility::insert_link_category(DEFAULT_SYNDICATION_CATEGORY); |
| 1275 | - | |
| 1276 | - // Stamp it | |
| 1277 | - update_option('feedwordpress_cat_id', $cat_id); | |
| 1429 | + if (!is_wp_error($cat_id)) : | |
| 1430 | + // Stamp it | |
| 1431 | + update_option('feedwordpress_cat_id', $cat_id); | |
| 1432 | + endif; | |
| 1278 | 1433 | endif; |
| 1279 | 1434 | |
| 1280 | 1435 | return $cat_id; |
| 1281 | 1436 | } // function FeedWordPress::link_category_id() |
| @@ -1301,15 +1456,47 @@ | ||
| 1301 | 1456 | update_option('feedwordpress_version', FEEDWORDPRESS_VERSION); |
| 1302 | 1457 | endif; |
| 1303 | 1458 | elseif ($fwp_db_version < 2009.0707) : |
| 1304 | 1459 | // We need to clear out any busted AJAX crap |
| 1305 | - if (fwp_test_wp_version(FWP_SCHEMA_HAS_USERMETA)) : | |
| 1306 | - $wpdb->query(" | |
| 1307 | - DELETE FROM $wpdb->usermeta | |
| 1308 | - WHERE LOCATE('feedwordpress', meta_key) | |
| 1309 | - AND LOCATE('box', meta_key); | |
| 1310 | - "); | |
| 1460 | + $wpdb->query(" | |
| 1461 | + DELETE FROM $wpdb->usermeta | |
| 1462 | + WHERE LOCATE('feedwordpress', meta_key) | |
| 1463 | + AND LOCATE('box', meta_key); | |
| 1464 | + "); | |
| 1465 | + | |
| 1466 | + update_option('feedwordpress_version', FEEDWORDPRESS_VERSION); | |
| 1467 | + elseif ($fwp_db_version < 2010.0814) : | |
| 1468 | + // Change in terminology. | |
| 1469 | + if (get_option('feedwordpress_unfamiliar_category', 'create')=='default') : | |
| 1470 | + update_option('feedwordpress_unfamiliar_category', 'null'); | |
| 1311 | 1471 | endif; |
| 1472 | + foreach (FeedWordPress::syndicated_links() as $link) : | |
| 1473 | + $sub = new SyndicatedLink($link); | |
| 1474 | + | |
| 1475 | + $remap_uf = array( | |
| 1476 | + 'default' => 'null', | |
| 1477 | + 'filter' => 'null', | |
| 1478 | + 'create' => 'create:category', | |
| 1479 | + 'tag' => 'create:post_tag' | |
| 1480 | + ); | |
| 1481 | + if (isset($sub->settings['unfamiliar category'])) : | |
| 1482 | + if ($sub->settings['unfamiliar category']=='filter') : | |
| 1483 | + $sub->settings['match/filter'] = array('category'); | |
| 1484 | + endif; | |
| 1485 | + foreach ($remap_uf as $from => $to) : | |
| 1486 | + if ($sub->settings['unfamiliar category']==$from) : | |
| 1487 | + $sub->settings['unfamiliar category'] = $to; | |
| 1488 | + endif; | |
| 1489 | + endforeach; | |
| 1490 | + endif; | |
| 1491 | + | |
| 1492 | + if (isset($sub->settings['add global categories'])) : | |
| 1493 | + $sub->settings['add/category'] = $sub->settings['add global categories']; | |
| 1494 | + unset($sub->settings['add global categories']); | |
| 1495 | + endif; | |
| 1496 | + | |
| 1497 | + $sub->save_settings(/*reload=*/ true); | |
| 1498 | + endforeach; | |
| 1312 | 1499 | update_option('feedwordpress_version', FEEDWORDPRESS_VERSION); |
| 1313 | 1500 | else : |
| 1314 | 1501 | // No. Just brand it with the new version. |
| 1315 | 1502 | update_option('feedwordpress_version', FEEDWORDPRESS_VERSION); |
| @@ -1370,14 +1557,49 @@ | ||
| 1370 | 1557 | DROP INDEX {$wpdb->posts}_guid_idx ON {$wpdb->posts} |
| 1371 | 1558 | "); |
| 1372 | 1559 | } |
| 1373 | 1560 | |
| 1374 | - /*static*/ function fetch ($url) { | |
| 1375 | - require_once (ABSPATH . WPINC . '/class-feed.php'); | |
| 1376 | - $feed = new SimplePie(); | |
| 1561 | + /*static*/ function fetch_timeout () { | |
| 1562 | + return apply_filters( | |
| 1563 | + 'feedwordpress_fetch_timeout', | |
| 1564 | + intval(get_option('feedwordpress_fetch_timeout', FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT)) | |
| 1565 | + ); | |
| 1566 | + } | |
| 1567 | + | |
| 1568 | + /*static*/ function fetch ($url, $params = array()) { | |
| 1569 | + $force_feed = true; // Default | |
| 1570 | + | |
| 1571 | + // Allow user to change default feed-fetch timeout with a global setting. Props Erigami Scholey-Fuller <http://www.piepalace.ca/blog/2010/11/feedwordpress-broke-my-heart.html> 'timeout' => | |
| 1572 | + $timeout = FeedWordPress::fetch_timeout(); | |
| 1573 | + | |
| 1574 | + if (!is_array($params)) : | |
| 1575 | + $force_feed = $params; | |
| 1576 | + else : // Parameter array | |
| 1577 | + $args = shortcode_atts(array( | |
| 1578 | + 'force_feed' => $force_feed, | |
| 1579 | + 'timeout' => $timeout | |
| 1580 | + ), $params); | |
| 1581 | + | |
| 1582 | + extract($args); | |
| 1583 | + endif; | |
| 1584 | + $timeout = intval($timeout); | |
| 1585 | + | |
| 1586 | + $pie_class = apply_filters('feedwordpress_simplepie_class', 'SimplePie'); | |
| 1587 | + $cache_class = apply_filters('feedwordpress_cache_class', 'WP_Feed_Cache'); | |
| 1588 | + $file_class = apply_filters('feedwordpress_file_class', 'FeedWordPress_File'); | |
| 1589 | + $parser_class = apply_filters('feedwordpress_parser_class', 'FeedWordPress_Parser'); | |
| 1590 | + | |
| 1591 | + $sniffer_class = apply_filters('feedwordpress_sniffer_class', 'FeedWordPress_Content_Type_Sniffer'); | |
| 1592 | + | |
| 1593 | + $feed = new $pie_class; | |
| 1377 | 1594 | $feed->set_feed_url($url); |
| 1378 | - $feed->set_cache_class('WP_Feed_Cache'); | |
| 1379 | - $feed->set_file_class('WP_SimplePie_File'); | |
| 1595 | + $feed->set_cache_class($cache_class); | |
| 1596 | + $feed->set_timeout($timeout); | |
| 1597 | + | |
| 1598 | + $feed->set_content_type_sniffer_class($sniffer_class); | |
| 1599 | + $feed->set_file_class($file_class); | |
| 1600 | + $feed->set_parser_class($parser_class); | |
| 1601 | + $feed->force_feed($force_feed); | |
| 1380 | 1602 | $feed->set_cache_duration(FeedWordPress::cache_duration()); |
| 1381 | 1603 | $feed->init(); |
| 1382 | 1604 | $feed->handle_content_type(); |
| 1383 | 1605 | |
| @@ -1391,8 +1613,14 @@ | ||
| 1391 | 1613 | |
| 1392 | 1614 | function clear_cache () { |
| 1393 | 1615 | global $wpdb; |
| 1394 | 1616 | |
| 1617 | + // Just in case, clear out any old MagpieRSS cache records. | |
| 1618 | + $magpies = $wpdb->query(" | |
| 1619 | + DELETE FROM {$wpdb->options} | |
| 1620 | + WHERE option_name LIKE 'rss_%' AND LENGTH(option_name) > 32 | |
| 1621 | + "); | |
| 1622 | + | |
| 1395 | 1623 | // The WordPress SimplePie module stores its cached feeds as |
| 1396 | 1624 | // transient records in the options table. The data itself is |
| 1397 | 1625 | // stored in `_transient_feed_{md5 of url}` and the last-modified |
| 1398 | 1626 | // timestamp in `_transient_feed_mod_{md5 of url}`. Timeouts for |
| @@ -1398,12 +1626,15 @@ | ||
| 1398 | 1626 | // timestamp in `_transient_feed_mod_{md5 of url}`. Timeouts for |
| 1399 | 1627 | // these records are stored in `_transient_timeout_feed_{md5}`. |
| 1400 | 1628 | // Since the md5 is always 32 characters in length, the |
| 1401 | 1629 | // option_name is always over 32 characters. |
| 1402 | - $wpdb->query(" | |
| 1630 | + $simplepies = $wpdb->query(" | |
| 1403 | 1631 | DELETE FROM {$wpdb->options} |
| 1404 | 1632 | WHERE option_name LIKE '_transient%_feed_%' AND LENGTH(option_name) > 32 |
| 1405 | 1633 | "); |
| 1634 | + $simplepies = (int) ($simplepies / 4); // Each transient has 4 rows: the data, the modified timestamp; and the timeouts for each | |
| 1635 | + | |
| 1636 | + return ($magpies + $simplepies); | |
| 1406 | 1637 | } /* FeedWordPress::clear_cache () */ |
| 1407 | 1638 | |
| 1408 | 1639 | function cache_duration () { |
| 1409 | 1640 | $duration = NULL; |
| @@ -1436,58 +1667,287 @@ | ||
| 1436 | 1667 | $affirmo = array ('y', 'yes', 't', 'true', 1); |
| 1437 | 1668 | return (isset($f[$setting]) and in_array(strtolower($f[$setting]), $affirmo)); |
| 1438 | 1669 | } |
| 1439 | 1670 | |
| 1440 | - | |
| 1441 | 1671 | # Internal debugging functions |
| 1442 | - function critical_bug ($varname, $var, $line) { | |
| 1672 | + function critical_bug ($varname, $var, $line, $file = NULL) { | |
| 1443 | 1673 | global $wp_version; |
| 1444 | - | |
| 1445 | - 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>'; | |
| 1446 | - echo "\n<plaintext>"; | |
| 1447 | - echo "Triggered at line # ".$line."\n"; | |
| 1448 | - echo "FeedWordPress version: ".FEEDWORDPRESS_VERSION."\n"; | |
| 1449 | - echo "WordPress version: {$wp_version}\n"; | |
| 1450 | - echo "PHP version: ".phpversion()."\n"; | |
| 1451 | - echo "\n"; | |
| 1452 | - echo $varname.": "; var_dump($var); echo "\n"; | |
| 1674 | + | |
| 1675 | + if (!is_null($file)) : | |
| 1676 | + $location = "line # ${line} of ".basename($file); | |
| 1677 | + else : | |
| 1678 | + $location = "line # ${line}"; | |
| 1679 | + endif; | |
| 1680 | + | |
| 1681 | + print '<p><strong>Critical error:</strong> There may be a bug in FeedWordPress. Please <a href="'.FEEDWORDPRESS_AUTHOR_CONTACT.'">contact the author</a> and paste the following information into your e-mail:</p>'; | |
| 1682 | + print "\n<plaintext>"; | |
| 1683 | + print "Triggered at ${location}\n"; | |
| 1684 | + print "FeedWordPress: ".FEEDWORDPRESS_VERSION."\n"; | |
| 1685 | + print "WordPress: {$wp_version}\n"; | |
| 1686 | + print "PHP: ".phpversion()."\n"; | |
| 1687 | + print "Error data: "; | |
| 1688 | + print $varname.": "; var_dump($var); echo "\n"; | |
| 1453 | 1689 | die; |
| 1454 | 1690 | } |
| 1455 | 1691 | |
| 1456 | - function noncritical_bug ($varname, $var, $line) { | |
| 1692 | + function noncritical_bug ($varname, $var, $line, $file = NULL) { | |
| 1457 | 1693 | if (FEEDWORDPRESS_DEBUG) : // halt only when we are doing debugging |
| 1458 | - FeedWordPress::critical_bug($varname, $var, $line); | |
| 1694 | + FeedWordPress::critical_bug($varname, $var, $line, $file); | |
| 1459 | 1695 | endif; |
| 1460 | 1696 | } |
| 1461 | -} // class FeedWordPress | |
| 1697 | + | |
| 1698 | + function val ($v, $no_newlines = false) { | |
| 1699 | + ob_start(); | |
| 1700 | + var_dump($v); | |
| 1701 | + $out = ob_get_contents(); ob_end_clean(); | |
| 1702 | + | |
| 1703 | + if ($no_newlines) : | |
| 1704 | + $out = preg_replace('/\s+/', " ", $out); | |
| 1705 | + endif; | |
| 1706 | + return $out; | |
| 1707 | + } /* FeedWordPress::val () */ | |
| 1462 | 1708 | |
| 1463 | -require_once(dirname(__FILE__) . '/syndicatedpost.class.php'); | |
| 1464 | -require_once(dirname(__FILE__) . '/syndicatedlink.class.php'); | |
| 1709 | + function diagnostic_on ($level) { | |
| 1710 | + $show = get_option('feedwordpress_diagnostics_show', array()); | |
| 1711 | + return (in_array($level, $show)); | |
| 1712 | + } /* FeedWordPress::diagnostic_on () */ | |
| 1465 | 1713 | |
| 1466 | -################################################################################ | |
| 1467 | -## XML-RPC HOOKS: accept XML-RPC update pings from Contributors ################ | |
| 1468 | -################################################################################ | |
| 1714 | + function diagnostic ($level, $out, $persist = NULL, $since = NULL, $mostRecent = NULL) { | |
| 1715 | + global $feedwordpress_admin_footer; | |
| 1469 | 1716 | |
| 1470 | -function feedwordpress_xmlrpc_hook ($args = array ()) { | |
| 1471 | - $args['weblogUpdates.ping'] = 'feedwordpress_pong'; | |
| 1472 | - return $args; | |
| 1473 | -} | |
| 1717 | + $output = get_option('feedwordpress_diagnostics_output', array()); | |
| 1718 | + $dlog = get_option('feedwordpress_diagnostics_log', array()); | |
| 1474 | 1719 | |
| 1475 | -function feedwordpress_pong ($args) { | |
| 1476 | - $feedwordpress = new FeedWordPress; | |
| 1477 | - $delta = @$feedwordpress->update($args[1]); | |
| 1478 | - if (is_null($delta)): | |
| 1479 | - return array('flerror' => true, 'message' => "Sorry. I don't syndicate <$args[1]>."); | |
| 1480 | - else: | |
| 1481 | - $mesg = array(); | |
| 1482 | - if (isset($delta['new'])) { $mesg[] = ' '.$delta['new'].' new posts were syndicated'; } | |
| 1483 | - if (isset($delta['updated'])) { $mesg[] = ' '.$delta['updated'].' existing posts were updated'; } | |
| 1720 | + $diagnostic_nesting = count(explode(":", $level)); | |
| 1484 | 1721 | |
| 1485 | - return array('flerror' => false, 'message' => "Thanks for the ping.".implode(' and', $mesg)); | |
| 1486 | - endif; | |
| 1487 | -} | |
| 1722 | + if (FeedWordPress::diagnostic_on($level)) : | |
| 1723 | + foreach ($output as $method) : | |
| 1724 | + switch ($method) : | |
| 1725 | + case 'echo' : | |
| 1726 | + if (!FeedWordPress::update_requested()) : | |
| 1727 | + echo "<div><pre><strong>Diag".str_repeat('====', $diagnostic_nesting-1).'|</strong> '.$out."</pre></div>"; | |
| 1728 | + endif; | |
| 1729 | + break; | |
| 1730 | + case 'echo_in_cronjob' : | |
| 1731 | + if (FeedWordPress::update_requested()) : | |
| 1732 | + echo FeedWordPress::log_prefix()." ".$out."\n"; | |
| 1733 | + endif; | |
| 1734 | + break; | |
| 1735 | + case 'admin_footer' : | |
| 1736 | + $feedwordpress_admin_footer[] = $out; | |
| 1737 | + break; | |
| 1738 | + case 'error_log' : | |
| 1739 | + error_log(FeedWordPress::log_prefix().' '.$out); | |
| 1740 | + break; | |
| 1741 | + case 'email' : | |
| 1742 | + if (is_null($persist)) : | |
| 1743 | + $sect = 'occurrent'; | |
| 1744 | + $hook = (isset($dlog['mesg'][$sect]) ? count($dlog['mesg'][$sect]) : 0); | |
| 1745 | + $line = array("Time" => time(), "Message" => $out); | |
| 1746 | + else : | |
| 1747 | + $sect = 'persistent'; | |
| 1748 | + $hook = md5($level."\n".$persist); | |
| 1749 | + $line = array("Since" => $since, "Message" => $out, "Most Recent" => $mostRecent); | |
| 1750 | + endif; | |
| 1751 | + | |
| 1752 | + if (!isset($dlog['mesg'])) : $dlog['mesg'] = array(); endif; | |
| 1753 | + if (!isset($dlog['mesg'][$sect])) : $dlog['mesg'][$sect] = array(); endif; | |
| 1754 | + | |
| 1755 | + $dlog['mesg'][$sect][$hook] = $line; | |
| 1756 | + endswitch; | |
| 1757 | + endforeach; | |
| 1758 | + endif; | |
| 1759 | + | |
| 1760 | + update_option('feedwordpress_diagnostics_log', $dlog); | |
| 1761 | + } /* FeedWordPress::diagnostic () */ | |
| 1762 | + | |
| 1763 | + function email_diagnostics_override () { | |
| 1764 | + return ($this->has_secret() and isset($_REQUEST['feedwordpress_email_diagnostics']) and !!$_REQUEST['feedwordpress_email_diagnostics']); | |
| 1765 | + } | |
| 1766 | + function has_emailed_diagnostics ($dlog) { | |
| 1767 | + $ret = false; | |
| 1768 | + if ($this->email_diagnostics_override() | |
| 1769 | + or (isset($dlog['schedule']) and isset($dlog['schedule']['last']))) : | |
| 1770 | + $ret = true; | |
| 1771 | + endif; | |
| 1772 | + return $ret; | |
| 1773 | + } | |
| 1774 | + function ready_to_email_diagnostics ($dlog) { | |
| 1775 | + $ret = false; | |
| 1776 | + if ($this->email_diagnostics_override() | |
| 1777 | + or (time() > ($dlog['schedule']['last'] + $dlog['schedule']['freq']))) : | |
| 1778 | + $ret = true; | |
| 1779 | + endif; | |
| 1780 | + return $ret; | |
| 1781 | + } | |
| 1782 | + | |
| 1783 | + function email_diagnostic_log () { | |
| 1784 | + $dlog = get_option('feedwordpress_diagnostics_log', array()); | |
| 1785 | + | |
| 1786 | + if ($this->has_emailed_diagnostics($dlog)) : | |
| 1787 | + if ($this->ready_to_email_diagnostics($dlog)) : | |
| 1788 | + // No news is good news; only send if | |
| 1789 | + // there are some messages to send. | |
| 1790 | + $body = NULL; | |
| 1791 | + if (!isset($dlog['mesg'])) : $dlog['mesg'] = array(); endif; | |
| 1792 | + | |
| 1793 | + foreach ($dlog['mesg'] as $sect => $mesgs) : | |
| 1794 | + if (count($mesgs) > 0) : | |
| 1795 | + if (is_null($body)) : $body = ''; endif; | |
| 1796 | + | |
| 1797 | + $paradigm = reset($mesgs); | |
| 1798 | + $body .= "<h2>".ucfirst($sect)." issues</h2>\n" | |
| 1799 | + ."<table>\n" | |
| 1800 | + ."<thead><tr>\n"; | |
| 1801 | + foreach ($paradigm as $col => $value) : | |
| 1802 | + $body .= '<th scope="col">'.$col."</th>\n"; | |
| 1803 | + endforeach; | |
| 1804 | + $body .= "</tr></thead>\n" | |
| 1805 | + ."<tbody>\n"; | |
| 1806 | + | |
| 1807 | + foreach ($mesgs as $line) : | |
| 1808 | + $body .= "<tr>\n"; | |
| 1809 | + foreach ($line as $col => $cell) : | |
| 1810 | + if (is_numeric($cell)) : | |
| 1811 | + $cell = date('j-M-y, h:i a', $cell); | |
| 1812 | + endif; | |
| 1813 | + $class = strtolower(preg_replace('/\s+/', '-', $col)); | |
| 1814 | + $body .= "<td class=\"$class\">${cell}</td>"; | |
| 1815 | + endforeach; | |
| 1816 | + $body .= "</tr>\n"; | |
| 1817 | + endforeach; | |
| 1818 | + | |
| 1819 | + $body .= "</tbody>\n</table>\n\n"; | |
| 1820 | + endif; | |
| 1821 | + endforeach; | |
| 1822 | + | |
| 1823 | + $body = apply_filters('feedwordpress_diagnostic_email_body', $body, $dlog); | |
| 1824 | + if (!is_null($body)) : | |
| 1825 | + $home = feedwordpress_display_url(get_bloginfo('url')); | |
| 1826 | + $subj = apply_filters('feedwordpress_diagnostic_email_subject', $home . " syndication issues", $dlog); | |
| 1827 | + $agent = 'FeedWordPress '.FEEDWORDPRESS_VERSION; | |
| 1828 | + $body = <<<EOMAIL | |
| 1829 | +<html> | |
| 1830 | +<head> | |
| 1831 | +<title>$subj</title> | |
| 1832 | +<style type="text/css"> | |
| 1833 | + body { background-color: white; color: black; } | |
| 1834 | + table { width: 100%; border: 1px solid black; } | |
| 1835 | + table thead tr th { background-color: #ff7700; color: white; border-bottom: 1px solid black; } | |
| 1836 | + table thead tr { border-bottom: 1px solid black; } | |
| 1837 | + table tr { vertical-align: top; } | |
| 1838 | + table .since { width: 20%; } | |
| 1839 | + table .time { width: 20%; } | |
| 1840 | + table .most-recently { width: 20%; } | |
| 1841 | + table .message { width: auto; } | |
| 1842 | +</style> | |
| 1843 | +</head> | |
| 1844 | +<body> | |
| 1845 | +<h1>Syndication Issues encountered by $agent on $home</h1> | |
| 1846 | +$body | |
| 1847 | +</body> | |
| 1848 | +</html> | |
| 1488 | 1849 | |
| 1489 | -require_once(dirname(__FILE__) . '/relative_uri.class.php'); | |
| 1850 | +EOMAIL; | |
| 1851 | + | |
| 1852 | + $ded = get_option('feedwordpress_diagnostics_email_destination', 'admins'); | |
| 1853 | + | |
| 1854 | + // e-mail address | |
| 1855 | + if (preg_match('/^mailto:(.*)$/', $ded, $ref)) : | |
| 1856 | + $recipients = array($ref[1]); | |
| 1857 | + | |
| 1858 | + // userid | |
| 1859 | + elseif (preg_match('/^user:(.*)$/', $ded, $ref)) : | |
| 1860 | + $userdata = get_userdata((int) $ref[1]); | |
| 1861 | + $recipients = array($userdata->user_email); | |
| 1862 | + | |
| 1863 | + // admins | |
| 1864 | + else : | |
| 1865 | + $recipients = FeedWordPressDiagnostic::admin_emails(); | |
| 1866 | + endif; | |
| 1867 | + | |
| 1868 | + foreach ($recipients as $email) : | |
| 1869 | + add_filter('wp_mail_content_type', array('FeedWordPress', 'allow_html_mail')); | |
| 1870 | + wp_mail($email, $subj, $body); | |
| 1871 | + remove_filter('wp_mail_content_type', array('FeedWordPress', 'allow_html_mail')); | |
| 1872 | + endforeach; | |
| 1873 | + endif; | |
| 1874 | + | |
| 1875 | + // Clear the logs | |
| 1876 | + $dlog['mesg']['persistent'] = array(); | |
| 1877 | + $dlog['mesg']['occurrent'] = array(); | |
| 1878 | + | |
| 1879 | + // Set schedule for next update | |
| 1880 | + $dlog['schedule']['last'] = time(); | |
| 1881 | + endif; | |
| 1882 | + else : | |
| 1883 | + $dlog['schedule'] = array( | |
| 1884 | + 'freq' => 24 /*hr*/ * 60 /*min*/ * 60 /*s*/, | |
| 1885 | + 'last' => time(), | |
| 1886 | + ); | |
| 1887 | + endif; | |
| 1888 | + | |
| 1889 | + update_option('feedwordpress_diagnostics_log', $dlog); | |
| 1890 | + } /* FeedWordPress::email_diagnostic_log () */ | |
| 1891 | + | |
| 1892 | + function allow_html_mail () { | |
| 1893 | + return 'text/html'; | |
| 1894 | + } /* FeedWordPress::allow_html_mail () */ | |
| 1895 | + | |
| 1896 | + function admin_footer () { | |
| 1897 | + global $feedwordpress_admin_footer; | |
| 1898 | + foreach ($feedwordpress_admin_footer as $line) : | |
| 1899 | + echo '<div><pre>'.$line.'</pre></div>'; | |
| 1900 | + endforeach; | |
| 1901 | + } /* FeedWordPress::admin_footer () */ | |
| 1902 | + | |
| 1903 | + function log_prefix ($date = false) { | |
| 1904 | + $home = get_bloginfo('url'); | |
| 1905 | + $prefix = '['.feedwordpress_display_url($home).'] [feedwordpress] '; | |
| 1906 | + if ($date) : | |
| 1907 | + $prefix = "[".date('Y-m-d H:i:s')."]".$prefix; | |
| 1908 | + endif; | |
| 1909 | + return $prefix; | |
| 1910 | + } /* FeedWordPress::log_prefix () */ | |
| 1911 | + | |
| 1912 | + function menu_cap ($sub = false) { | |
| 1913 | + if ($sub) : | |
| 1914 | + $cap = apply_filters('feedwordpress_menu_settings_capacity', 'manage_options'); | |
| 1915 | + else : | |
| 1916 | + $cap = apply_filters('feedwordpress_menu_main_capacity', 'manage_links'); | |
| 1917 | + endif; | |
| 1918 | + return $cap; | |
| 1919 | + } /* FeedWordPress::menu_cap () */ | |
| 1920 | + | |
| 1921 | + function path ($filename = '') { | |
| 1922 | + global $fwp_path; | |
| 1923 | + | |
| 1924 | + $path = $fwp_path; | |
| 1925 | + if (strlen($filename) > 0) : | |
| 1926 | + $path .= '/'.$filename; | |
| 1927 | + endif; | |
| 1928 | + return $path; | |
| 1929 | + } | |
| 1930 | + | |
| 1931 | + function param ($key, $type = 'REQUEST', $default = NULL) { | |
| 1932 | + $where = '_'.strtoupper($type); | |
| 1933 | + $ret = $default; | |
| 1934 | + if (isset($GLOBALS[$where]) and is_array($GLOBALS[$where])) : | |
| 1935 | + if (isset($GLOBALS[$where][$key])) : | |
| 1936 | + $ret = $GLOBALS[$where][$key]; | |
| 1937 | + if (get_magic_quotes_gpc()) : | |
| 1938 | + $ret = stripslashes_deep($ret); | |
| 1939 | + endif; | |
| 1940 | + endif; | |
| 1941 | + endif; | |
| 1942 | + return $ret; | |
| 1943 | + } | |
| 1944 | + function post ($key, $default = NULL) { | |
| 1945 | + return FeedWordPress::param($key, 'POST'); | |
| 1946 | + } | |
| 1947 | +} // class FeedWordPress | |
| 1948 | + | |
| 1949 | +$feedwordpress_admin_footer = array(); | |
| 1490 | 1950 | |
| 1491 | 1951 | // take your best guess at the realname and e-mail, given a string |
| 1492 | 1952 | define('FWP_REGEX_EMAIL_ADDY', '([^@"(<\s]+@[^"@(<\s]+\.[^"@(<\s]+)'); |
| 1493 | 1953 | define('FWP_REGEX_EMAIL_NAME', '("([^"]*)"|([^"<(]+\S))'); |
