Changeset 2229752

Timestamp:

01/18/2020 11:37:53 PM (5 years ago)

Author:

radgeek

Message:

2020.0118 / roll up Github improvements to present.

Location:

feedwordpress/trunk

Files:

• admin-ui.php (modified) (8 diffs)
• diagnostics-page.php (modified) (3 diffs)
• feeds-page.php (modified) (6 diffs)
• feedwordpress.php (modified) (24 diffs)
• feedwordpress_parser.class.php (modified) (4 diffs)
• feedwordpressadminpage.class.php (added)
• feedwordpressdiagnostic.class.php (added)
• feedwordpresslocalpost.class.php (modified) (3 diffs)
• feedwordpresssettingsui.class.php (added)
• feedwordpresssyndicationpage.class.php (modified) (9 diffs)
• performance-page.php (modified) (3 diffs)
• readme.txt (modified) (5 diffs)
• syndicatedlink.class.php (modified) (5 diffs)
• syndicatedpost.class.php (modified) (12 diffs)
• syndicatedpostterm.class.php (modified) (1 diff)
• template-functions.php (added)

feedwordpress/trunk/admin-ui.php ¶

@@ -1 +1 @@
 <?php
-class FeedWordPressAdminPage {
-    protected $context;
-    protected $updated = false;
-    protected $mesg = NULL;
-
-    var $link = NULL;
-    var $dispatch = NULL;
-    var $filename = NULL;
-    var $pagenames = array();
-
-    /**
-     * Construct the admin page object.
-     *
-     * @param mixed $link An object of class {@link SyndicatedLink} if created for one feed's settings, NULL if created for global default settings
-     */
-    public function __construct( $page = 'feedwordpressadmin', $link = NULL ) {
-        $this->link = $link;
-
-        // Set meta-box context name
-        $this->context = $page;
-        if ($this->for_feed_settings()) :
-            $this->context .= 'forfeed';
-        endif;
-    } /* FeedWordPressAdminPage constructor */
-
-    public function pageslug () {
-        $slug = preg_replace('/FeedWordPress(.*)Page/', '$1', get_class($this));
-        return strtolower($slug);
-    }
-
-    public function pagename ($context = NULL) {
-        if (is_null($context)) :
-            $context = 'default';
-        endif;
-
-        if (isset($this->pagenames[$context])) :
-            $name = $this->pagenames[$context];
-        elseif (isset($tis->pagenames['default'])) :
-            $name = $this->pagenames['default'];
-        else :
-            $name = $this->pageslug();
-        endif;
-        return __($name);
-    } /* FeedWordPressAdminPage::pagename () */
-
-    public function accept_POST ($post) {
-        if ($this->for_feed_settings() and $this->update_requested_in($post)) :
-            $this->update_feed();
-        elseif ($this->save_requested_in($post)) : // User mashed Save Changes
-            $this->save_settings($post);
-        endif;
-        do_action($this->dispatch.'_post', $post, $this);
-    }
-
-    public function update_feed () {
-        global $feedwordpress;
-
-        add_action('feedwordpress_check_feed', 'update_feeds_mention');
-        add_action('feedwordpress_check_feed_complete', 'update_feeds_finish', 10, 3);
-
-        $link = $this->link;
-        
-        print '<div class="updated">';
-        print "<ul>";
-        $uri = $this->link->uri();
-        $displayUrl = $uri;
-
-        // check for effects of an effective-url filter
-        $effectiveUrl = $link->uri(array('fetch' => true));
-        if ($uri != $effectiveUrl) : $displayUrl .= ' | ' . $effectiveUrl; endif;
-
-        $delta = $feedwordpress->update($uri);
-        print "</ul>";
-
-        if (!is_null($delta)) :
-            echo "<p><strong>Update complete.</strong>".fwp_update_set_results_message($delta)."</p>";
-            echo "\n"; flush();
-        else :
-            $effectiveUrl  = esc_html($effectiveUrl);
-            echo "<p><strong>Error:</strong> There was a problem updating <a href=\"$effectiveUrl\">$displayUrl</a></p>\n";
-        endif;
-        print "</div>\n";
-        remove_action('feedwordpress_check_feed', 'update_feeds_mention');
-        remove_action('feedwordpress_check_feed_complete', 'update_feeds_finish', 10, 3);
-    }
-
-    public function save_settings ($post) {
-        do_action($this->dispatch.'_save', $post, $this);
-
-        if ($this->for_feed_settings()) :
-            // Save settings
-            $this->link->save_settings(/*reload=*/ true);
-            $this->updated = true;
-
-            // Reset, reload
-            $link_id = $this->link->id;
-            unset($this->link);
-            $this->link = new SyndicatedLink($link_id);
-        else :
-            $this->updated = true;
-        endif;
-    } /* FeedWordPressAdminPage::save_settings () */
-
-    public function for_feed_settings () { return (is_object($this->link) and method_exists($this->link, 'found') and $this->link->found()); }
-    public function for_default_settings () { return !$this->for_feed_settings(); }
-
-    public function setting ($names, $fallback_value = NULL, $params = array()) {
-        if (!is_array($params)) :
-            $params = array('default' => $params);
-        endif;
-        $params = shortcode_atts(array(
-        'default' => 'default',
-        'fallback' => true,
-        ), $params);
-
-        if (is_string($names)) :
-            $feed_name = $names;
-            $global_name = 'feedwordpress_'.preg_replace('![\s/]+!', '_', $names);
-        else :
-            $feed_name = $names['feed'];
-            $global_name = 'feedwordpress_'.$names['global'];
-        endif;
-
-        if ($this->for_feed_settings()) : // Check feed-specific setting first; fall back to global
-            if (!$params['fallback']) : $global_name = NULL; endif;
-            $ret = $this->link->setting($feed_name, $global_name, $fallback_value, $params['default']);
-        else : // Check global setting
-            $ret = get_option($global_name, $fallback_value);
-        endif;
-        return $ret;
-    }
-
-    public function update_setting ($names, $value, $default = 'default') {
-        if (is_string($names)) :
-            $feed_name = $names;
-            $global_name = 'feedwordpress_'.preg_replace('![\s/]+!', '_', $names);
-        else :
-            $feed_name = $names['feed'];
-            $global_name = 'feedwordpress_'.$names['global'];
-        endif;
-
-        if ($this->for_feed_settings()) : // Update feed-specific setting
-            $this->link->update_setting($feed_name, $value, $default);
-        else : // Update global setting
-            update_option($global_name, $value);
-        endif;
-    } /* FeedWordPressAdminPage::update_setting () */
-
-    public function save_requested_in ($post) {
-        return (isset($post['save']) or isset($post['submit']));
-    }
-    public function update_requested_in ($post) {
-        return (isset($post['update']) and (strlen($post['update']) > 0));
-    }
-
-    public function submitted_link_id () {
-        global $fwp_post;
-
-        // Presume global unless we get a specific link ID
-        $link_id = NULL;
-
-        $submit_buttons = array(
-            'save',
-            'submit',
-            'fix_mismatch',
-            'feedfinder',
-        );
-        foreach ($submit_buttons as $field) :
-            if (isset($fwp_post[$field])) :
-                $link_id = MyPHP::request('save_link_id');
-            endif;
-        endforeach;
-
-        if (is_null($link_id) and isset($_REQUEST['link_id'])) :
-            $link_id = MyPHP::request('link_id');
-        endif;
-
-        return $link_id;
-    } /* FeedWordPressAdminPage::submitted_link_id() */
-
-    public function submitted_link () {
-        $link_id = $this->submitted_link_id();
-        if (is_numeric($link_id) and $link_id) :
-            $link = new SyndicatedLink($link_id);
-        else :
-            $link = NULL;
-        endif;
-        return $link;
-    } /* FeedWordPressAdminPage::submitted_link () */
-
-    public function stamp_link_id ($field = null) {
-        if (is_null($field)) : $field = 'save_link_id'; endif;
-        ?>
-    <input type="hidden" name="<?php print esc_attr($field); ?>" value="<?php print ($this->for_feed_settings() ? $this->link->id : '*'); ?>" />
-        <?php
-    } /* FeedWordPressAdminPage::stamp_link_id () */
-
-    public function these_posts_phrase () {
-        if ($this->for_feed_settings()) :
-            $phrase = __('posts from this feed');
-        else :
-            $phrase = __('syndicated posts');
-        endif;
-        return $phrase;
-    } /* FeedWordPressAdminPage::these_posts_phrase() */
-
-    /**
-     * Provides a uniquely identifying name for the interface context for
-     * use with add_meta_box() and do_meta_boxes(),
-     *
-     * @return string the context name
-     *
-     * @see add_meta_box()
-     * @see do_meta_boxes()
-     */
-    public function meta_box_context () {
-        return $this->context;
-    } /* FeedWordPressAdminPage::meta_box_context () */
-
-    /**
-     * Outputs JavaScript to fix AJAX toggles settings.
-     *
-     * @uses FeedWordPressAdminPage::meta_box_context()
-     */
-     public function fix_toggles () {
-         FeedWordPressSettingsUI::fix_toggles_js($this->meta_box_context());
-     } /* FeedWordPressAdminPage::fix_toggles() */
-
-     public function ajax_interface_js () {
-?>
-    function contextual_appearance (item, appear, disappear, value, visibleStyle, checkbox) {
-        if (typeof(visibleStyle)=='undefined') visibleStyle = 'block';
-
-        var rollup=document.getElementById(item);
-        if (rollup) {
-            if ((checkbox && rollup.checked) || (!checkbox && value==rollup.value)) {
-                jQuery('#'+disappear).hide();
-                jQuery('#'+appear).show(600);
-            } else {
-                jQuery('#'+appear).hide();
-                jQuery('#'+disappear).show(600);
-            }
-        }
-    }
-<?php
-    } /* FeedWordPressAdminPage::ajax_interface_js () */
-
-    public function admin_page_href ($page, $params = array(), $link = NULL) {
-        global $fwp_path;
-
-        // Merge in the page's filename
-        $params = array_merge($params, array('page' => $fwp_path.'/'.$page));
-
-        // If there is a link ID provided, then merge that in too.
-        if (!is_null($link)) :
-            $link_id = NULL;
-            if (is_object($link)) :
-                if (method_exists($link, 'found')) :
-                    // Is this a SyndicatedLink object?
-                    if ($link->found()) :
-                        $link_id = $link->link->link_id;
-                    endif;
-                else :
-                    // Is this a wp_links table record?
-                    $link_id = $link->link_id;
-                endif;
-            else :
-                // Is this just a numeric ID?
-                $link_id = $link;
-            endif;
-
-            if (!is_null($link_id)) :
-                $params = array_merge($params, array('link_id' => $link_id));
-            endif;
-        endif;
-
-        return MyPHP::url(admin_url('admin.php'), $params);
-    } /* FeedWordPressAdminPage::admin_page_href () */
-
-    public function display_feed_settings_page_links ($params = array()) {
-        global $fwp_path;
-
-        $params = wp_parse_args($params, array(
-            'before' => '',
-            'between' => ' | ',
-            'after' => '',
-            'long' => false,
-            'subscription' => $this->link,
-        ));
-        $sub = $params['subscription'];
-
-        $links = array(
-            "Feed" => array('page' => 'feeds-page.php', 'long' => 'Feeds & Updates'),
-            "Posts" => array('page' => 'posts-page.php', 'long' => 'Posts & Links'),
-            "Authors" => array('page' => 'authors-page.php', 'long' => 'Authors'),
-            'Categories' => array('page' => 'categories-page.php', 'long' => 'Categories & Tags'),
-        );
-
-        $link_id = NULL;
-        if (is_object($sub)) :
-            if (method_exists($sub, 'found')) :
-                if ($sub->found()) :
-                    $link_id = $sub->link->link_id;
-                endif;
-            else :
-                $link_id = $sub->link_id;
-            endif;
-        endif;
-
-        print $params['before']; $first = true;
-        foreach ($links as $label => $link) :
-            if (!$first) :  print $params['between']; endif;
-
-            if (isset($link['url'])) : MyPHP::url($link['url'], array("link_id" => $link_id));
-            else : $url = $this->admin_page_href($link['page'], array(), $sub);
-            endif;
-            $url = esc_html($url);
-
-            if ($link['page']==basename($this->filename)) :
-                print "<strong>";
-            else :
-                print "<a href=\"${url}\">";
-            endif;
-
-            if ($params['long']) : print esc_html(__($link['long']));
-            else : print esc_html(__($label));
-            endif;
-
-            if ($link['page']==basename($this->filename)) :
-                print "</strong>";
-            else :
-                print "</a>";
-            endif;
-
-            $first = false;
-        endforeach;
-        print $params['after'];
-    } /* FeedWordPressAdminPage::display_feed_settings_page_links */
-
-    public function display_feed_select_dropdown() {
-        $links = FeedWordPress::syndicated_links();
-
-        ?>
-        <div id="fwpfs-container"><ul class="subsubsub">
-        <li><select name="link_id" class="fwpfs" style="max-width: 20.0em;">
-          <option value="*"<?php if ($this->for_default_settings()) : ?> selected="selected"<?php endif; ?>>- defaults for all feeds -</option>
-        <?php if ($links) : foreach ($links as $ddlink) : ?>
-          <option value="<?php print (int) $ddlink->link_id; ?>"<?php if (!is_null($this->link) and ($this->link->id==$ddlink->link_id)) : ?> selected="selected"<?php endif; ?>><?php print esc_html($ddlink->link_name); ?></option>
-        <?php endforeach; endif; ?>
-        </select>
-        <input id="fwpfs-button" class="button" type="submit" name="go" value="<?php _e('Go') ?> &raquo;" /></li>
-
-        <?php
-        $this->display_feed_settings_page_links(array(
-            'before' => '<li>',
-            'between' => "</li>\n<li>",
-            'after' => '</li>',
-            'subscription' => $this->link,
-        ));
-
-        if ($this->for_feed_settings()) :
-        ?>
-        <li><input class="button" type="submit" name="update" value="Update Now" /></li>
-        <?php
-        endif;
-        ?>
-        </ul>
-        </div>
-        <?php
-    } /* FeedWordPressAdminPage::display_feed_select_dropdown() */
-
-    public function display_sheet_header ($pagename = 'Syndication', $all = false) {
-        global $fwp_path;
-        ?>
-        <div class="icon32"><img src="<?php print esc_html( plugins_url( '/'.$fwp_path.'/feedwordpress.png') ); ?>" alt="" /></div>
-        <h2><?php print esc_html(__($pagename.($all ? '' : ' Settings'))); ?><?php if ($this->for_feed_settings()) : ?>: <?php echo esc_html($this->link->name(/*from feed=*/ false)); ?><?php endif; ?></h2>
-        <?php
-    }
-
-    public function display_update_notice_if_updated ($pagename = 'Syndication', $mesg = NULL) {
-        if (!is_null($mesg)) :
-            $this->mesg = $mesg;
-        endif;
-
-        if ($this->updated) :
-            if ($this->updated === true) :
-                $this->mesg = $pagename . ' settings updated.';
-            else :
-                $this->mesg = $this->updated;
-            endif;
-        endif;
-
-        if (!is_null($this->mesg)) :
-            ?>
-            <div class="updated">
-            <p><?php print esc_html($this->mesg); ?></p>
-            </div>
-            <?php
-        endif;
-    } /* FeedWordPressAdminPage::display_update_notice_if_updated() */
-
-    public function display_settings_scope_message () {
-        if ($this->for_feed_settings()) :
-        ?>
-    <p>These settings only affect posts syndicated from
-    <strong><?php echo esc_html($this->link->link->link_name); ?></strong>.</p>
-        <?php
-        else :
-        ?>
-    <p>These settings affect posts syndicated from any feed unless they are overridden
-    by settings for that specific feed.</p>
-        <?php
-        endif;
-    } /* FeedWordPressAdminPage::display_settings_scope_message () */
-
-    /*static*/ function has_link () { return true; }
-
-    public function form_action ($filename = NULL) {
-        global $fwp_path;
-
-        if (is_null($filename)) :
-            $filename = basename($this->filename);
-        endif;
-        return $this->admin_page_href($filename);
-    } /* FeedWordPressAdminPage::form_action () */
-
-    public function update_message () {
-        return $this->mesg;
-    }
-
-    public function display () {
-        global $fwp_post;
-
-        if (FeedWordPress::needs_upgrade()) :
-            fwp_upgrade_page();
-            return;
-        endif;
-
-        FeedWordPressCompatibility::validate_http_request(/*action=*/ $this->dispatch, /*capability=*/ 'manage_links');
-
-        ////////////////////////////////////////////////
-        // Process POST request, if any ////////////////
-        ////////////////////////////////////////////////
-        if (strtoupper($_SERVER['REQUEST_METHOD'])=='POST') :
-            $this->accept_POST($fwp_post);
-        else :
-            $this->updated = false;
-        endif;
-
-        ////////////////////////////////////////////////
-        // Prepare settings page ///////////////////////
-        ////////////////////////////////////////////////
-
-        $this->display_update_notice_if_updated(
-            $this->pagename('settings-update'),
-            $this->update_message()
-        );
-
-        $this->open_sheet($this->pagename('open-sheet'));
-        ?>
-        <div id="post-body">
-        <?php
-        foreach ($this->boxes_by_methods as $method => $row) :
-            if (is_array($row)) :
-                $id = $row['id'];
-                $title = $row['title'];
-            else :
-                $id = 'feedwordpress_'.$method;
-                $title = $row;
-            endif;
-
-            add_meta_box(
-                /*id=*/ $id,
-                /*title=*/ $title,
-                /*callback=*/ array($this, $method),
-                /*page=*/ $this->meta_box_context(),
-                /*context=*/ $this->meta_box_context()
-            );
-        endforeach;
-        do_action($this->dispatch.'_meta_boxes', $this);
-        ?>
-        <div class="metabox-holder">
-        <?php
-            fwp_do_meta_boxes($this->meta_box_context(), $this->meta_box_context(), $this);
-        ?>
-        </div> <!-- class="metabox-holder" -->
-        </div> <!-- id="post-body" -->
-        <?php $this->close_sheet(); ?>
-    <?php
-    }
-
-    public function open_sheet ($header) {
-        // Set up prepatory AJAX stuff
-        ?>
-        <script type="text/javascript">
-        <?php
-        $this->ajax_interface_js();
-        ?>
-        </script>
-
-        <?php
-        add_action(
-            FeedWordPressCompatibility::bottom_script_hook($this->filename),
-            /*callback=*/ array($this, 'fix_toggles'),
-            /*priority=*/ 10000
-        );
-        FeedWordPressSettingsUI::ajax_nonce_fields();
-
-        ?>
-        <div class="wrap feedwordpress-admin" id="feedwordpress-admin-<?php print $this->pageslug(); ?>">
-        <?php
-        if (!is_null($header)) :
-            $this->display_sheet_header($header);
-        endif;
-
-        if (!is_null($this->dispatch)) :
-            ?>
-            <form action="<?php print $this->form_action(); ?>" method="post">
-            <div><?php
-                FeedWordPressCompatibility::stamp_nonce($this->dispatch);
-                $this->stamp_link_id();
-            ?></div>
-            <?php
-        endif;
-
-        if ($this->has_link()) :
-            $this->display_settings_scope_message();
-        endif;
-
-        ?><div class="tablenav"><?php
-        if (!is_null($this->dispatch)) :
-            ?><div class="alignright"><?php
-            $this->save_button();
-            ?></div><?php
-        endif;
-
-        if ($this->has_link()) :
-            $this->display_feed_select_dropdown();
-        endif;
-        ?>
-        </div>
-
-        <div id="poststuff">
-        <?php
-    } /* FeedWordPressAdminPage::open_sheet () */
-
-    public function close_sheet () {
-        ?>
-
-        </div> <!-- id="poststuff" -->
-        <?php
-        if (!is_null($this->dispatch)) :
-            $this->save_button();
-            print "</form>\n";
-        endif;
-        ?>
-        </div> <!-- class="wrap" -->
-
-        <?php
-    } /* FeedWordPressAdminPage::close_sheet () */
-
-    public function setting_radio_control ($localName, $globalName, $options, $params = array()) {
-        global $fwp_path;
-
-        if (isset($params['filename'])) : $filename = $params['filename'];
-        else : $filename = basename($this->filename);
-        endif;
-
-        if (isset($params['site-wide-url'])) : $href = $params['site-wide-url'];
-        else :  $href = $this->admin_page_href($filename);
-        endif;
-
-        if (isset($params['setting-default'])) : $settingDefault = $params['setting-default'];
-        else : $settingDefault = NULL;
-        endif;
-
-        if (isset($params['global-setting-default'])) : $globalSettingDefault = $params['global-setting-default'];
-        else : $globalSettingDefault = $settingDefault;
-        endif;
-
-        $globalSetting = get_option('feedwordpress_'.$globalName, $globalSettingDefault);
-        if ($this->for_feed_settings()) :
-            $setting = $this->link->setting($localName, NULL, $settingDefault);
-        else :
-            $setting = $globalSetting;
-        endif;
-
-        if (isset($params['offer-site-wide'])) : $offerSiteWide = $params['offer-site-wide'];
-        else : $offerSiteWide = $this->for_feed_settings();
-        endif;
-
-        // This allows us to provide an alternative set of human-readable
-        // labels for each potential value. For use in Currently: line.
-        if (isset($params['labels'])) : $labels = $params['labels'];
-        elseif (is_callable($options)) : $labels = NULL;
-        else : $labels = $options;
-        endif;
-
-        if (isset($params['input-name'])) : $inputName = $params['input-name'];
-        else : $inputName = $globalName;
-        endif;
-
-        if (isset($params['default-input-id'])) : $defaultInputId = $params['default-input-id'];
-        else : $defaultInputId = NULL;
-        endif;
-
-        if (isset($params['default-input-id-no'])) : $defaultInputIdNo = $params['default-input-id-no'];
-        elseif (!is_null($defaultInputId)) : $defaultInputIdNo = $defaultInputId.'-no';
-        else : $defaultInputIdNo = NULL;
-        endif;
-
-        // This allows us to either include the site-default setting as
-        // one of the options within the radio box, or else as a simple
-        // yes/no toggle that controls whether or not to check another
-        // set of inputs.
-        if (isset($params['default-input-name'])) : $defaultInputName = $params['default-input-name'];
-        else : $defaultInputName = $inputName;
-        endif;
-
-        if ($defaultInputName != $inputName) :
-            $defaultInputValue = 'yes';
-        else :
-            $defaultInputValue = (
-                isset($params['default-input-value'])
-                ? $params['default-input-value']
-                : 'site-default'
-            );
-        endif;
-
-        $settingDefaulted = (is_null($setting) or ($settingDefault === $setting));
-
-        if (!is_callable($options)) :
-            $checked = array();
-            if ($settingDefaulted) :
-                $checked[$defaultInputValue] = ' checked="checked"';
-            endif;
-
-            foreach ($options as $value => $label) :
-                if ($setting == $value) :
-                    $checked[$value] = ' checked="checked"';
-                else :
-                    $checked[$value] = '';
-                endif;
-            endforeach;
-        endif;
-
-        $defaulted = array();
-        if ($defaultInputName != $inputName) :
-            $defaulted['yes'] = ($settingDefaulted ? ' checked="checked"' : '');
-            $defaulted['no'] = ($settingDefaulted ? '' : ' checked="checked"');
-        else :
-            $defaulted['yes'] = (isset($checked[$defaultInputValue]) ? $checked[$defaultInputValue] : '');
-        endif;
-
-        if (isset($params['defaulted'])) :
-            $defaulted['yes'] = ($params['defaulted'] ? ' checked="checked"' : '');
-            $defaulted['no'] = ($params['defaulted'] ? '' : ' checked="checked"');
-        endif;
-
-        if ($offerSiteWide) :
-            ?>
-            <table class="twofer">
-            <tbody>
-            <tr><td class="equals first inactive">
-            <ul class="options">
-            <li><label><input type="radio"
-                name="<?php print $defaultInputName; ?>"
-                value="<?php print $defaultInputValue; ?>"
-                <?php if (!is_null($defaultInputId)) : ?>id="<?php print $defaultInputId; ?>" <?php endif; ?>
-                <?php print $defaulted['yes']; ?> />
-            Use the site-wide setting</label>
-            <span class="current-setting">Currently:
-            <strong><?php if (is_callable($labels)) :
-                print call_user_func($labels, $globalSetting, $defaulted, $params);
-            elseif (is_null($labels)) :
-                print $globalSetting;
-            else :
-                print $labels[$globalSetting];
-            endif;  ?></strong> (<a href="<?php print $href; ?>">change</a>)</span></li>
-            </ul></td>
-
-            <td class="equals second inactive">
-            <?php if ($defaultInputName != $inputName) : ?>
-                <ul class="options">
-                <li><label><input type="radio"
-                    name="<?php print $defaultInputName; ?>"
-                    value="no"
-                    <?php if (!is_null($defaultInputIdNo)) : ?>id="<?php print $defaultInputIdNo; ?>" <?php endif; ?>
-                    <?php print $defaulted['no']; ?> />
-                <?php _e('Do something different with this feed.'); ?></label>
-            <?php endif;
-        endif;
-
-        // Let's spit out the controls here.
-        if (is_callable($options)) :
-            // Method call to print out options list
-            call_user_func($options, $setting, $defaulted, $params);
-        else :
-            ?>
-            <ul class="options">
-            <?php foreach ($options as $value => $label) : ?>
-            <li><label><input type="radio" name="<?php print $inputName; ?>"
-                value="<?php print $value; ?>"
-                <?php print $checked[$value]; ?> />
-            <?php print $label; ?></label></li>
-            <?php endforeach; ?>
-            </ul> <!-- class="options" -->
-            <?php
-        endif;
-
-        if ($offerSiteWide) :
-            if ($defaultInputName != $inputName) :
-                // Close the <li> and <ul class="options"> we opened above
-            ?>
-                </li>
-                </ul> <!-- class="options" -->
-            <?php
-            endif;
-
-            // Close off the twofer table that we opened up above.
-            ?>
-            </td></tr>
-            </tbody>
-            </table>
-            <?php
-        endif;
-    } /* FeedWordPressAdminPage::setting_radio_control () */
-
-    public function save_button ($caption = NULL) {
-        if (is_null($caption)) : $caption = __('Save Changes'); endif;
-        ?>
-<p class="submit">
-<input class="button-primary" type="submit" name="save" value="<?php print $caption; ?>" />
-</p>
-        <?php
-    }
-} /* class FeedWordPressAdminPage */
+/**
+ * admin-ui.php: This is kind of a junk pile of utility functions mostly created to smooth
+ * out interactions to make things show up, or behave correctly, within the WordPress admin
+ * settings interface. Major chunks of this code that deal with making it easy for FWP,
+ * add-on modules, etc. to create new settings panels have since been hived off into class
+ * FeedWordPressAdminPage. Many of the functions that remain here were created to handle
+ * compatibility across multiple, sometimes very old, versions of WordPress, many of which
+ * are no longer supported anymore. It's likely that some of these functions will be
+ * re-evaluated, re-organized, deprecated, or clipped out in the next few versions.
+ * -cj 2017-10-27
+ */
+
+$dir = dirname(__FILE__);
+require_once("${dir}/feedwordpressadminpage.class.php");
+require_once("${dir}/feedwordpresssettingsui.class.php");
 
 function fwp_update_set_results_message ($delta, $joiner = ';') {
@@ -762 +40 @@
 </p>
 </div>
-<?php
-}
-
-function fwp_option_box_opener ($legend, $id, $class = "stuffbox") {
-?>
-<div id="<?php print $id; ?>" class="<?php print $class; ?>">
-<h3><?php print htmlspecialchars($legend); ?></h3>
-<div class="inside">
-<?php
-}
-
-function fwp_option_box_closer () {
-?>
-    </div> <!-- class="inside" -->
-    </div> <!-- class="stuffbox" -->
 <?php
 }
@@ -962 +225 @@
 }
 
-class FeedWordPressSettingsUI {
-    static function is_admin () {
-        global $fwp_path;
-
-        $admin_page = false; // Innocent until proven guilty
-        if (isset($_REQUEST['page'])) :
-            $admin_page = (
-                is_admin()
-                and preg_match("|^{$fwp_path}/|", $_REQUEST['page'])
-            );
-        endif;
-        return $admin_page;
-    }
-
-    static function admin_scripts () {
-        global $fwp_path;
-
-        wp_enqueue_script('post'); // for magic tag and category boxes
-        wp_enqueue_script('admin-forms'); // for checkbox selection
-
-        wp_register_script('feedwordpress-elements', plugins_url('/' . $fwp_path . '/feedwordpress-elements.js') );
-        wp_enqueue_script('feedwordpress-elements');
-    }
-
-    static function admin_styles () {
-        ?>
-        <style type="text/css">
-        #feedwordpress-admin-feeds .link-rss-params-remove .x, .feedwordpress-admin .remove-it .x {
-            background: url(<?php print admin_url('images/xit.gif') ?>) no-repeat scroll 0 0 transparent;
-        }
-
-        #feedwordpress-admin-feeds .link-rss-params-remove:hover .x, .feedwordpress-admin .remove-it:hover .x {
-            background: url(<?php print admin_url('images/xit.gif') ?>) no-repeat scroll -10px 0 transparent;
-        }
-
-        .fwpfs {
-            background-image: url(<?php print admin_url('images/fav.png'); ?>);
-            background-repeat: repeat-x;
-            background-position: left center;
-            background-attachment: scroll;
-        }
-        .fwpfs.slide-down {
-            background-image:url(<?php print admin_url('images/fav-top.png'); ?>);
-            background-position:0 top;
-            background-repeat:repeat-x;
-        }
-
-        .update-results {
-            max-width: 100%;
-            overflow: auto;
-        }
-
-        </style>
-        <?php
-    } /* FeedWordPressSettingsUI::admin_styles () */
-
-    static function ajax_nonce_fields () {
-        if (function_exists('wp_nonce_field')) :
-            echo "<form style='display: none' method='get' action=''>\n<p>\n";
-            wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
-            wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
-            echo "</p>\n</form>\n";
-        endif;
-    } /* FeedWordPressSettingsUI::ajax_nonce_fields () */
-
-    static function fix_toggles_js ($context) {
-    ?>
-        <script type="text/javascript">
-            jQuery(document).ready( function($) {
-            // In case someone got here first...
-            $('.postbox h3, .postbox .handlediv').unbind('click');
-            $('.postbox h3 a').unbind('click');
-            $('.hide-postbox-tog').unbind('click');
-            $('.columns-prefs input[type="radio"]').unbind('click');
-            $('.meta-box-sortables').sortable('destroy');
-
-            postboxes.add_postbox_toggles('<?php print $context; ?>');
-            } );
-        </script>
-    <?php
-    } /* FeedWordPressSettingsUI::fix_toggles_js () */
-
-    static function magic_input_tip_js ($id) {
-            if (!preg_match('/^[.#]/', $id)) :
-                $id = '#'.$id;
-            endif;
-        ?>
-            <script type="text/javascript">
-            jQuery(document).ready( function () {
-                var inputBox = jQuery("<?php print $id; ?>");
-                var boxEl = inputBox.get(0);
-                if (boxEl.value==boxEl.defaultValue) { inputBox.addClass('form-input-tip'); }
-                inputBox.focus(function() {
-                    if ( this.value == this.defaultValue )
-                        jQuery(this).val( '' ).removeClass( 'form-input-tip' );
-                });
-                inputBox.blur(function() {
-                    if ( this.value == '' )
-                        jQuery(this).val( this.defaultValue ).addClass( 'form-input-tip' );
-                });
-            } );
-            </script>
-        <?php
-    } /* FeedWordPressSettingsUI::magic_input_tip_js () */
-} /* class FeedWordPressSettingsUI */
-
 function fwp_insert_new_user ($newuser_name) {
     global $wpdb;
@@ -1091 +248 @@
 } /* fwp_insert_new_user () */
 
-/**
- * fwp_add_meta_box
- *
- * This function is no longer necessary, since no versions of WordPress that FWP
- * still supports lack add_meta_box(). But I've left it in place for the time
- * being for add-on modules that may have used it in setting up their UI.
- */
-function fwp_add_meta_box ($id, $title, $callback, $page, $context = 'advanced', $priority = 'default', $callback_args = null) {
-    return add_meta_box($id, $title, $callback, $page, $context, $priority, $callback_args);
-} /* function fwp_add_meta_box () */
-
-function fwp_do_meta_boxes($page, $context, $object) {
-    $ret = do_meta_boxes($page, $context, $object);
-
-    // Avoid JavaScript error from WordPress 2.5 bug
-?>
-    <div style="display: none">
-    <div id="tags-input"></div> <!-- avoid JS error from WP 2.5 bug -->
-    </div>
-<?php
-    return $ret;
-} /* function fwp_do_meta_boxes() */
-
-function fwp_remove_meta_box($id, $page, $context) {
-    return remove_meta_box($id, $page, $context);
-} /* function fwp_remove_meta_box() */
-
 function fwp_syndication_manage_page_links_table_rows ($links, $page, $visible = 'Y') {
 
+    $fwp_syndicated_sources_columns = array(__('Name'), __('Feed'), __('Updated'));
+    
     $subscribed = ('Y' == strtoupper($visible));
     if ($subscribed or (count($links) > 0)) :
@@ -1127 +259 @@
     <tr>
     <th class="check-column" scope="col"><input type="checkbox" /></th>
-    <th scope="col"><?php _e('Name'); ?></th>
-    <th scope="col"><?php _e('Feed'); ?></th>
-    <th scope="col"><?php _e('Updated'); ?></th>
-    </tr>
-    </thead>
-
-    <tbody>
 <?php
+        foreach ($fwp_syndicated_sources_columns as $col) :
+            print "\t<th scope='col'>${col}</th>\n";
+        endforeach;
+        print "</tr>\n";
+        print "</thead>\n";
+        print "\n";
+        print "<tbody>\n";
+
         $alt_row = true;
         if (count($links) > 0):
@@ -1150 +283 @@
                 // Prep: get last error timestamp, if any
                 $fileSizeLines = array();
+                $feed_type = $sLink->get_feed_type();               
                 if (is_null($sLink->setting('update/error'))) :
                     $errorsSince = '';
                     if (!is_null($sLink->setting('link/item count'))) :
                         $N = $sLink->setting('link/item count');
-                        $fileSizeLines[] = sprintf((($N==1) ? __('%d item') : __('%d items')), $N);
+                        $fileSizeLines[] = sprintf((($N==1) ? __('%d item') : __('%d items')), $N) . ", " . $feed_type;
                     endif;
 
@@ -1256 +390 @@
     </td>
                 <?php if (strlen($link->link_rss) > 0): ?>
-    <td><a href="<?php echo esc_html($link->link_rss); ?>"><?php echo esc_html(feedwordpress_display_url($link->link_rss, 32)); ?></a></td>
+    <td><div><a href="<?php echo esc_html($link->link_rss); ?>"><?php echo esc_html(feedwordpress_display_url($link->link_rss, 32)); ?></a></div></td>
                 <?php else: ?>
     <td class="feed-missing"><p><strong>no feed assigned</strong></p></td>
@@ -1264 +398 @@
     <input type="submit" class="button" name="update_uri[<?php print esc_html($link->link_rss); ?>]" value="<?php _e('Update Now'); ?>" />
     </div>
-    <?php print $lastUpdated; ?>
-    <?php print $fileSize; ?>
-    <?php print $errorsSince; ?>
-    <?php print $nextUpdate; ?>
+    <?php
+        print $lastUpdated;
+        print $fileSize;
+        print $errorsSince;
+        print $nextUpdate;
+    ?>
     </td>
     </tr>

feedwordpress/trunk/diagnostics-page.php ¶

@@ -16 +16 @@
 
     function display () {
-        global $wpdb, $wp_db_version, $fwp_path;
-        global $fwp_post;
-
         if (FeedWordPress::needs_upgrade()) :
             fwp_upgrade_page();
@@ -28 +25 @@
 
         if (strtoupper($_SERVER['REQUEST_METHOD'])=='POST') :
-            $this->accept_POST($fwp_post);
-            do_action('feedwordpress_admin_page_diagnostics_save', $fwp_post, $this);
+            $this->accept_POST($_POST);
+            do_action('feedwordpress_admin_page_diagnostics_save', $_POST, $this);
         endif;
 
@@ -62 +59 @@
             <div class="metabox-holder">
             <?php
-            fwp_do_meta_boxes($this->meta_box_context(), $this->meta_box_context(), $this);
+            do_meta_boxes($this->meta_box_context(), $this->meta_box_context(), $this);
             ?>
             </div> <!-- class="metabox-holder" -->

feedwordpress/trunk/feeds-page.php ¶

@@ -162 +162 @@
                 );
             } /* for */
+            
+            // Let's make the interface for the PAUSE/RESUME a bit better
+            jQuery('<tr id="reveal-pause-resume"><th></th><td><button id="pause-resume-reveal-button">&#8212; PAUSE or RESUME UPDATES &#8212;</button></td></tr>').insertBefore('#pause-resume');
+            jQuery('#pause-resume').hide();
+            jQuery('#pause-resume-reveal-button').click(function(ev) {
+                ev.preventDefault();
+
+                jQuery('#pause-resume').toggle();
+                return false;
+            });
+
         } );
 
@@ -187 +198 @@
 
         <tr>
-        <th scope="row">Updates:</th>
+        <th scope="row">Update Method:</th>
         <td><select id="automatic-updates-selector" name="automatic_updates" size="1" onchange="contextual_appearance('automatic-updates-selector', 'cron-job-explanation', null, 'no');">
         <option value="shutdown"<?php echo ($automatic_updates=='shutdown')?' selected="selected"':''; ?>>automatically check for updates after pages load</option>
@@ -199 +210 @@
         // or to wget. If everything fails or shell_exec() isn't available, then just make
         // up something for the sake of example.
+        $curlOrWgetPath = NULL;
+
         $shellExecAvailable = (is_callable('shell_exec') && false === stripos(ini_get('disable_functions'), 'shell_exec'));     
 
         if ($shellExecAvailable) :
-            $path = `which curl`; $opts = '--silent %s';
-        endif;
-
-        if ($shellExecAvailable and (is_null($path) or strlen(trim($path))==0)) :
-            $path = `which wget`; $opts = '-q -O - %s';
-        endif;
-
-        if (is_null($path) or strlen(trim($path))==0) :
-            $path = '/usr/bin/curl'; $opts = '--silent %s';
-        endif;
-
-        $path = preg_replace('/\n+$/', '', $path);
-        
-        $cmdline = $path . ' ' . sprintf($opts, get_bloginfo('url').'?update_feedwordpress=1');
+            $curlOrWgetPath = `which curl`; $opts = '--silent %s';
+        endif;
+
+        if ($shellExecAvailable and (is_null($curlOrWgetPath) or strlen(trim($curlOrWgetPath))==0)) :
+            $curlOrWgetPath = `which wget`; $opts = '-q -O - %s';
+        endif;
+
+        if (is_null($curlOrWgetPath) or strlen(trim($curlOrWgetPath))==0) :
+            $curlOrWgetPath = '/usr/bin/curl'; $opts = '--silent %s';
+        endif;
+
+        $curlOrWgetPath = preg_replace('/\n+$/', '', $curlOrWgetPath);
+        
+        $cmdline = $curlOrWgetPath . ' ' . sprintf($opts, get_bloginfo('url').'?update_feedwordpress=1');
         
         ?>If you want to use a cron job,
@@ -268 +281 @@
         
         <?php endif; ?>
-        
+
+        <tr id="pause-resume">
+        <th scope="row"><?php print __('Pause/Resume:'); ?></th>
+        <td><?php
+        $this->setting_radio_control(
+            'update/pause', 'update_pause',
+            /*options=*/ array(
+                'no' => '<strong>UPDATE:</strong> import new posts as normal',
+                'yes' => '<strong>PAUSE:</strong> do not import new posts until I unpause updates',
+            ),
+            /*params=*/ array(
+                'setting-default' => NULL,
+                'global-setting-default' => 'no',
+                'default-input-value' => 'default',
+            )
+        );
+        ?></td>
+        </tr>
+
         <tr>
         <th scope="row"><?php print __('Update scheduling:') ?></th>
@@ -507 +538 @@
 
             $params = array();
-            if (FeedWordPressCompatibility::test_version(FWP_SCHEMA_USES_ARGS_TAXONOMY)) :
-                $params['taxonomy'] = 'link_category';
-            else :
-                $params['type'] = 'link';
-            endif;
+            $params['taxonomy'] = 'link_category';
             $params['hide_empty'] = false;
             $results = get_categories($params);
@@ -1216 +1243 @@
         endif;
         
+        if (isset($post['update_pause'])) :
+            $this->update_setting('update/pause', $post['update_pause']);
+        endif;
+
         if (isset($post['fetch_timeout'])) :
             if (isset($post['fetch_timeout_default']) and $post['fetch_timeout_default']=='yes') :

feedwordpress/trunk/feedwordpress.php ¶

@@ -4 +4 @@
 Plugin URI: http://feedwordpress.radgeek.com/
 Description: simple and flexible Atom/RSS syndication for WordPress
-Version: 2017.1020
+Version: 2020.0118
 Author: C. Johnson
 Author URI: https://feedwordpress.radgeek.com/contact/
@@ -12 +12 @@
 /**
  * @package FeedWordPress
- * @version 2017.1020
+ * @version 2020.0118
  */
 
-# This uses code derived from:
+# This plugin uses code derived from:
 # - wp-rss-aggregate.php by Kellan Elliot-McCrea <kellan@protest.net>
 # - SimplePie feed parser by Ryan Parman, Geoffrey Sneddon, Ryan McCue, et al.
@@ -21 +21 @@
 # - Ultra-Liberal Feed Finder by Mark Pilgrim <mark@diveintomark.org>
 # - WordPress Blog Tool and Publishing Platform <http://wordpress.org/>
+# - Github contributors @Flynsarmy, @BandonRandon, @david-robinson-practiceweb,
+#   @daidais, @thegreatmichael, @stedaniels, @alexiskulash, @quassy, @zoul0813,
+#   @timmmmyboy, @vobornik, and @inanimatt
 # according to the terms of the GNU General Public License.
-#
-# INSTALLATION: see readme.txt or <http://feedwordpress.radgeek.com/install>
-#
-# USAGE: once FeedWordPress is installed, you manage just about everything from
-# the WordPress Dashboard, under the Syndication menu. To keep fresh content
-# coming in as it becomes available, you'll have to either check for updates
-# manually, or set up one of the automatically-scheduled update methods. See
-# <http://feedwordpress.radgeek.com/wiki/quick-start/> for some details.
-
-# -- Don't change these unless you know what you're doing...
-
-define ('FEEDWORDPRESS_VERSION', '2017.1020');
+
+####################################################################################
+## CONSTANTS & DEFAULTS ############################################################
+####################################################################################
+
+define ('FEEDWORDPRESS_VERSION', '2020.0118');
 define ('FEEDWORDPRESS_AUTHOR_CONTACT', 'http://feedwordpress.radgeek.com/contact');
 
@@ -42 +39 @@
 define('FEEDWORDPRESS_BLEG_PAYPAL', '22PAJZZCK5Z3W');
 
-define('FEEDWORDPRESS_BOILERPLATE_DEFAULT_HOOK_ORDER', 11000); // at the tail end of the filtering process
-
 // Defaults
 define ('DEFAULT_SYNDICATION_CATEGORY', 'Contributors');
 define ('DEFAULT_UPDATE_PERIOD', 60); // value in minutes
+define ('FEEDWORDPRESS_DEFAULT_CHECKIN_INTERVAL', DEFAULT_UPDATE_PERIOD/10);
 
 if (isset($_REQUEST['feedwordpress_debug'])) :
@@ -67 +63 @@
 define ('FEEDWORDPRESS_FRESHNESS_INTERVAL', 10*60); // Every ten minutes
 
-define ('FWP_SCHEMA_HAS_USERMETA', 2966);
-define ('FWP_SCHEMA_USES_ARGS_TAXONOMY', 12694); // Revision # for using $args['taxonomy'] to get link categories
-define ('FWP_SCHEMA_30', 12694); // Database schema # for WP 3.0
+define('FEEDWORDPRESS_BOILERPLATE_DEFAULT_HOOK_ORDER', 11000); // at the tail end of the filtering process
 
 if (FEEDWORDPRESS_DEBUG) :
@@ -92 +86 @@
 endif;
 
-// Use our the cache settings that we want.
-add_filter('wp_feed_cache_transient_lifetime', array('FeedWordPress', 'cache_lifetime'));
+####################################################################################
+## CORE DEPENDENCIES & PLUGIN MODULES ##############################################
+####################################################################################
 
 // Dependencies: modules packaged with WordPress core
@@ -130 +125 @@
 $dir = dirname(__FILE__);
 require_once("${dir}/externals/myphp/myphp.class.php");
+require_once("${dir}/feedwordpressadminpage.class.php");
+require_once("${dir}/feedwordpresssettingsui.class.php");
+require_once("${dir}/feedwordpressdiagnostic.class.php");
 require_once("${dir}/admin-ui.php");
+require_once("${dir}/template-functions.php");
 require_once("${dir}/feedwordpresssyndicationpage.class.php");
 require_once("${dir}/compatability.php"); // Legacy API
@@ -147 +146 @@
 require_once("${dir}/feedwordpresslocalpost.class.php");
 
-// Magic quotes are just about the stupidest thing ever.
+####################################################################################
+## GLOBAL PARAMETERS ###############################################################
+####################################################################################
+
+// $fwp_post used to be a global variable used to make it easier to cope
+// with the frustrating sometime presence of "Magic Quotes" in earlier
+// versions of PHP (<http://php.net/manual/en/security.magicquotes.php>).
+// Magic quotes were DEPRECATED as of PHP 5.3.0, and REMOVED as of PHP
+// 5.4.0, so for the time being $fwp_post just gets a copy of $_POST.
+global $fwp_post;
+
 if (is_array($_POST)) :
     $fwp_post = $_POST;
-    if (get_magic_quotes_gpc()) :
-        $fwp_post = stripslashes_deep($fwp_post);
-    endif;
+else:
+    $fwp_post = null;
 endif;
 
@@ -167 +175 @@
     $fwp_path = 'feedwordpress';
 endif;
+
+####################################################################################
+## FEEDWORDPRESS: INITIALIZE OBJECT AND FILTERS ####################################
+####################################################################################
 
 $feedwordpress = new FeedWordPress;
@@ -282 +294 @@
     add_action('all_admin_notices', array($feedwordpress, 'all_admin_notices'));
 
+    // Use our the cache settings that we want.
+    add_filter('wp_feed_cache_transient_lifetime', array('FeedWordPress', 'cache_lifetime'));
+
+
 else :
     # Hook in the menus, which will just point to the upgrade interface
@@ -287 +303 @@
 endif; // if (!FeedWordPress::needs_upgrade())
 
+register_deactivation_hook(__FILE__, 'feedwordpress_deactivate');
+function feedwordpress_deactivate () {
+    wp_clear_scheduled_hook('fwp_scheduled_update_checkin');
+} /* feedwordpress_deactivate () */
+
 ################################################################################
 ## LOGGING FUNCTIONS: log status updates to error_log if you want it ###########
 ################################################################################
-
-class FeedWordPressDiagnostic {
-    public static function feed_error ($error, $old, $link) {
-        $wpError = $error['object'];
-        $url = $link->uri();
-        
-        // check for effects of an effective-url filter
-        $effectiveUrl = $link->uri(array('fetch' => true));
-        if ($url != $effectiveUrl) : $url .= ' | ' . $effectiveUrl; endif;
-
-        $mesgs = $wpError->get_error_messages();
-        foreach ($mesgs as $mesg) :
-            $mesg = esc_html($mesg);
-            FeedWordPress::diagnostic(
-                'updated_feeds:errors',
-                "Feed Error: [${url}] update returned error: $mesg"
-            );
-
-            $hours = get_option('feedwordpress_diagnostics_persistent_errors_hours', 2);
-            $span = ($error['ts'] - $error['since']);
-
-            if ($span >= ($hours * 60 * 60)) :
-                $since = date('r', $error['since']);
-                $mostRecent = date('r', $error['ts']);
-                FeedWordPress::diagnostic(
-                    'updated_feeds:errors:persistent',
-                    "Feed Update Error: [${url}] returning errors"
-                    ." since ${since}:<br/><code>$mesg</code>",
-                    $url, $error['since'], $error['ts']
-                );
-            endif;
-        endforeach;
-    }
-
-    function admin_emails ($id = '') {
-        $users = get_users_of_blog($id);
-        $recipients = array();
-        foreach ($users as $user) :
-            $user_id = (isset($user->user_id) ? $user->user_id : $user->ID);
-            $dude = new WP_User($user_id);
-            if ($dude->has_cap('administrator')) :
-                if ($dude->user_email) :
-                    $recipients[] = $dude->user_email;
-                endif;
-            endif;
-        endforeach;
-        return $recipients;
-    }
-} /* class FeedWordPressDiagnostic */
 
 function debug_out_human_readable_bytes ($quantity) {
@@ -352 +324 @@
 
 function debug_out_feedwordpress_footer () {
-    if (FeedWordPress::diagnostic_on('memory_usage')) :
+    if (FeedWordPressDiagnostic::is_on('memory_usage')) :
         if (function_exists('memory_get_usage')) :
             FeedWordPress::diagnostic ('memory_usage', "Memory: Current usage: ".debug_out_human_readable_bytes(memory_get_usage()));
@@ -361 +333 @@
     endif;
 } /* debug_out_feedwordpress_footer() */
-
-################################################################################
-## TEMPLATE API: functions to make your templates syndication-aware ############
-################################################################################
-
-/**
- * is_syndicated: Tests whether the current post in a Loop context, or a post
- * given by ID number, was syndicated by FeedWordPress. Useful for templates
- * to determine whether or not to retrieve syndication-related meta-data in
- * displaying a post.
- *
- * @param int $id The post to check for syndicated status. Defaults to the current post in a Loop context.
- * @return bool TRUE if the post's meta-data indicates it was syndicated; FALSE otherwise
- */
-function is_syndicated ($id = NULL) {
-    $p = new FeedWordPressLocalPost($id);
-    return $p->is_syndicated();
-} /* function is_syndicated() */
-
-function feedwordpress_display_url ($url, $before = 60, $after = 0) {
-    $bits = parse_url($url);
-
-    // Strip out crufty subdomains
-    if (isset($bits['host'])) :
-        $bits['host'] = preg_replace('/^www[0-9]*\./i', '', $bits['host']);
-    endif;
-
-    // Reassemble bit-by-bit with minimum of crufty elements
-    $url = (isset($bits['user'])?$bits['user'].'@':'')
-        .(isset($bits['host'])?$bits['host']:'')
-        .(isset($bits['path'])?$bits['path']:'')
-        .(isset($uri_bits['port'])?':'.$uri_bits['port']:'')
-        .(isset($bits['query'])?'?'.$bits['query']:'');
-
-    if (strlen($url) > ($before+$after)) :
-        $url = substr($url, 0, $before).'.'.substr($url, 0 - $after, $after);
-    endif;
-
-    return $url;
-} /* feedwordpress_display_url () */
-
-function get_syndication_source_property ($original, $id, $local, $remote = NULL) {
-    $p = new FeedWordPressLocalPost($id);
-    return $p->meta($local, array("unproxy" => $original, "unproxied setting" => $remote));
-} /* function get_syndication_source_property () */
-
-function get_syndication_source_link ($original = NULL, $id = NULL) {
-    $p = new FeedWordPressLocalPost($id);
-    return $p->syndication_source_link($original);
-} /* function get_syndication_source_link() */
-
-function the_syndication_source_link ($original = NULL, $id = NULL) {
-    echo get_syndication_source_link($original, $id);
-} /* function the_syndication_source_link() */
-
-function get_syndication_source ($original = NULL, $id = NULL) {
-    $p = new FeedWordPressLocalPost($id);
-    return $p->syndication_source($original);
-} /* function get_syndication_source() */
-
-function the_syndication_source ($original = NULL, $id = NULL) {
-    echo get_syndication_source($original, $id);
-} /* function the_syndication_source () */
-
-function get_syndication_feed ($original = NULL, $id = NULL) {
-    $p = new FeedWordPressLocalPost($id);
-    return $p->syndication_feed($original);
-} /* function get_syndication_feed() */
-
-function the_syndication_feed ($original = NULL, $id = NULL) {
-    echo get_syndication_feed($original, $id);
-} /* function the_syndication_feed() */
-
-function get_syndication_feed_guid ($original = NULL, $id = NULL) {
-    $p = new FeedWordPressLocalPost($id);
-    return $p->syndication_feed_guid($original);
-} /* function get_syndication_feed_guid () */
-
-function the_syndication_feed_guid ($original = NULL, $id = NULL) {
-    echo get_syndication_feed_guid($original, $id);
-} /* function the_syndication_feed_guid () */
-
-function get_syndication_feed_id ($id = NULL) {
-    $p = new FeedWordPressLocalPost($id);
-    return $p->feed_id();
-} /* function get_syndication_feed_id () */
-
-function the_syndication_feed_id ($id = NULL) {
-    echo get_syndication_feed_id($id);
-} /* function the_syndication_feed_id () */
-
-function get_syndication_feed_object ($id = NULL) {
-    $p = new FeedWordPressLocalPost($id);
-    return $p->feed();
-} /* function get_syndication_feed_object() */
-
-function get_feed_meta ($key, $id = NULL) {
-    $ret = NULL;
-
-    $link = get_syndication_feed_object($id);
-    if (is_object($link) and isset($link->settings[$key])) :
-        $ret = $link->settings[$key];
-    endif;
-    return $ret;
-} /* function get_feed_meta() */
-
-function get_syndication_permalink ($id = NULL) {
-    $p = new FeedWordPressLocalPost($id);
-    return $p->syndication_permalink();
-} /* function get_syndication_permalink () */
-
-function the_syndication_permalink ($id = NULL) {
-    echo get_syndication_permalink($id);
-} /* function the_syndication_permalink () */
-
-/**
- * get_local_permalink: returns a string containing the internal permalink
- * for a post (whether syndicated or not) on your local WordPress installation.
- * This may be useful if you want permalinks to point to the original source of
- * an article for most purposes, but want to retrieve a URL for the local
- * representation of the post for one or two limited purposes (for example,
- * linking to a comments page on your local aggregator site).
- *
- * @param $id The numerical ID of the post to get the permalink for. If empty,
- *  defaults to the current post in a Loop context.
- * @return string The URL of the local permalink for this post.
- *
- * @uses get_permalink()
- * @global $feedwordpress_the_original_permalink
- *
- * @since 2010.0217
- */
-function get_local_permalink ($id = NULL) {
-    global $feedwordpress_the_original_permalink;
-
-    // get permalink, and thus activate filter and force global to be filled
-    // with original URL.
-    $url = get_permalink($id);
-    return $feedwordpress_the_original_permalink;
-} /* get_local_permalink() */
-
-/**
- * the_original_permalink: displays the contents of get_original_permalink()
- *
- * @param $id The numerical ID of the post to get the permalink for. If empty,
- *  defaults to the current post in a Loop context.
- *
- * @uses get_local_permalinks()
- * @uses apply_filters
- *
- * @since 2010.0217
- */
-function the_local_permalink ($id = NULL) {
-    print apply_filters('the_permalink', get_local_permalink($id));
-} /* function the_local_permalink() */
 
 ################################################################################
@@ -863 +680 @@
         add_filter('user_can_richedit', array($feedwordpress, 'user_can_richedit'), 1000, 1);
 
-        if (FeedWordPress::diagnostic_on('syndicated_posts:static_meta_data')) :
+        if (FeedWordPressDiagnostic::is_on('syndicated_posts:static_meta_data')) :
             $inspectPostMeta = new InspectPostMeta;
         endif;
@@ -883 +700 @@
 
         $frozen_values = get_post_custom_values('_syndication_freeze_updates', $post->ID);
-        $frozen_post = (count($frozen_values) > 0 and 'yes' == $frozen_values[0]);
+        $frozen_post = ($frozen_values !== null and count($frozen_values) > 0 and 'yes' == $frozen_values[0]);
 
         if (is_syndicated($post->ID)) :
@@ -1188 +1005 @@
         $this->feedurls  = array();
         $links = FeedWordPress::syndicated_links();
+
         if ($links): foreach ($links as $link):
             $id = intval($link->link_id);
@@ -1199 +1017 @@
         endforeach; endif;
 
+        // System-related event hooks
+        add_filter('cron_schedules', array($this, 'cron_schedules'), 10, 1);
+
+        // FeedWordPress-related event hooks
         add_filter('feedwordpress_update_complete', array($this, 'process_retirements'), 1000, 1);
-
+        
         $this->httpauth = new FeedWordPressHTTPAuthenticator;
     } /* FeedWordPress::__construct () */
@@ -1491 +1313 @@
             // This should never happen.
             else :
-                FeedWordPress::critical_bug('FeedWordPress::stale::last', $last, __LINE__, __FILE__);
+                FeedWordPressDiagnostic::critical_bug('FeedWordPress::stale::last', $last, __LINE__, __FILE__);
             endif;
 
@@ -1714 +1536 @@
             wp_enqueue_style('dashboard');
             wp_enqueue_style('feedwordpress-elements');
-
-            /*if (function_exists('wp_admin_css')) :
-                wp_admin_css('css/dashboard');
-            endif;*/
         endif;
 
@@ -1766 +1584 @@
     } /* FeedWordPress::wp_loaded () */
     
+    /**
+     * FeedWordPress::cron_schedules(): Filter hook to add WP-Cron schedules
+     * that plugins like FeedWordPress can use to carry out scheduled events.
+     *
+     * @param array $schedules An associative array containing the current set of cron schedules (hourly, daily, etc.)
+     * @return array The same array, with a new entry ('fwp_checkin_interval') added to the list.
+     *
+     * @since 2017.1021
+     */
+    public function cron_schedules ($schedules) {
+        $interval = FEEDWORDPRESS_DEFAULT_CHECKIN_INTERVAL*60 /*sec/min*/;
+
+        // add 'fwp_checkin_interval' to the existing set
+        $schedules['fwp_checkin_interval'] = array(
+        'interval' => $interval,
+        'display' => 'FeedWordPress update schedule check-in',
+        );
+
+        return $schedules;
+    } /* FeedWordPress::cron_schedules () */
+
     public function fwp_feeds () {
         $feeds = array();
@@ -2497 +2336 @@
 
     # Internal debugging functions
-    static function critical_bug ($varname, $var, $line, $file = NULL) {
-        global $wp_version;
-
-        if (!is_null($file)) :
-            $location = "line # ${line} of ".basename($file);
-        else :
-            $location = "line # ${line}";
-        endif;
-
-        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>';
-        print "\n<plaintext>";
-        print "Triggered at ${location}\n";
-        print "FeedWordPress: ".FEEDWORDPRESS_VERSION."\n";
-        print "WordPress:     {$wp_version}\n";
-        print "PHP:           ".phpversion()."\n";
-        print "Error data:    ";
-        print  $varname.": "; var_dump($var); echo "\n";
-        die;
-    } /* FeedWordPress::critical_bug () */
-
-    static function noncritical_bug ($varname, $var, $line, $file = NULL) {
-        if (FEEDWORDPRESS_DEBUG) : // halt only when we are doing debugging
-            FeedWordPress::critical_bug($varname, $var, $line, $file);
-        endif;
-    } /* FeedWordPress::noncritical_bug () */
-
-    static function val ($v, $no_newlines = false) {
-        return MyPHP::val($v, $no_newlines);
-    } /* FeedWordPress::val () */
-
-    static function diagnostic_on ($level) {
-        $show = get_option('feedwordpress_diagnostics_show', array());
-        return (in_array($level, $show));
-    } /* FeedWordPress::diagnostic_on () */
 
     static function diagnostic ($level, $out, $persist = NULL, $since = NULL, $mostRecent = NULL) {
@@ -2540 +2345 @@
         $diagnostic_nesting = count(explode(":", $level));
 
-        if (self::diagnostic_on($level)) :
+        if (FeedWordPressDiagnostic::is_on($level)) :
             foreach ($output as $method) :
                 switch ($method) :
@@ -2773 +2578 @@
     } /* FeedWordPress::path () */
 
-    // These are superceded by MyPHP::param/post/get/request, but kept
-    // here for backward compatibility.
-
+    // -- DEPRCATED UTILITY FUNCTIONS -------------------------------------
+    // These are superceded by later code re-organization, (for example
+    // MyPHP::param/post/get/request, or FeedWordPressDiagnostic methods),
+    // but for the last several versions have been kept here for backward
+    // compatibility with add-ons, older code, etc. Maybe someday they
+    // will go away.
+    // -------------------------------------------------------------------
     static function param ($key, $type = 'REQUEST', $default = NULL) {
         return MyPHP::param($key, $default, $type);
@@ -2783 +2592 @@
         return MyPHP::post($key, $default);
     } /* FeedWordPress::post () */
+
+    static function val ($v, $no_newlines = false) {
+        return MyPHP::val($v, $no_newlines);
+    } /* FeedWordPress::val () */
+
+    static function critical_bug ($varname, $var, $line, $file = NULL) {
+        FeedWordPressDiagnostic::critical_bug($varname, $var, $line, $file);
+    } /* FeedWordPress::critical_bug () */
+
+    static function noncritical_bug ($varname, $var, $line, $file = NULL) {
+        FeedWordPressDiagnostic::noncritical_bug($varname, $var, $line, $file);     
+    } /* FeedWordPress::noncritical_bug () */
+
+    static function diagnostic_on ($level) {
+        return FeedWordPressDiagnostic::is_on($level);
+    } /* FeedWordPress::diagnostic_on () */
 
 } /* class FeedWordPress */

feedwordpress/trunk/feedwordpress_parser.class.php ¶

@@ -2 +2 @@
 class FeedWordPress_Parser extends SimplePie_Parser {
     function reset_parser (&$xml) {
+        // reset members
+        $this->namespace = array('');
+        $this->element = array('');
+        $this->xml_base = array('');
+        $this->xml_base_explicit = array(false);
+        $this->xml_lang = array('');
+        $this->data = array();
+        $this->datas = array(array());
+        $this->current_xhtml_construct = -1;
+        $this->xmlns_stack = array();
+        $this->xmlns_current = array();
+
+        // reset libxml parser
         xml_parser_free($xml);
                 
@@ -13 +26 @@
     }
     
-    function parse (&$data, $encoding) {
+    public function parse (&$data, $encoding) {
         $data = apply_filters('feedwordpress_parser_parse', $data, $encoding, $this);
         
@@ -96 +109 @@
             if (!$parseResults and $endOfJunk > 0) :
                 // There is some junk before the feed prolog. Try to get rid of it.
-                $newData = substr($data, $endOfJunk);
-                $newData = trim($newData);
+                $data = substr($data, $endOfJunk);
+                $data = trim($data);
                 $this->reset_parser($xml);
             
-                $parseResults = xml_parse($xml, $newData, true);
+                $parseResults = xml_parse($xml, $data, true);
             endif;
             
-            if (!$parseResults)
-            {
-                if (class_exists('DOMDocument')) :
-                    libxml_use_internal_errors(true);   
-                    $doc = new DOMDocument;
-                    $doc->loadHTML('<html>'.$data.'</html>');
-                    ///*DBG*/ echo "<plaintext>";
-                    ///*DBG*/ $dd = $doc->getElementsByTagName('html');
-                    ///*DBG*/ for ($i = 0; $i < $dd->length; $i++) :
-                    ///*DBG*/       var_dump($dd->item($i)->nodeName);
-                    ///*DBG*/ endfor;
-                    ///*DBG*/ var_dump($doc);
-                    libxml_use_internal_errors(false);
-                    ///*DBG*/ die;
-                endif;
-                
+            $badEntity = (xml_get_error_code($xml) == 26);
+            if (!$parseResults and $badEntity) :
+                // There was an entity that libxml couldn't understand.
+                // Chances are, it was a stray HTML entity. So let's try
+                // converting all the named HTML entities to numeric XML
+                // entities and starting over.
+                $data = $this->html_convert_entities($data);
+                $this->reset_parser($xml);
+
+                $parseResults = xml_parse($xml, $data, true);
+            endif;
+
+            if (!$parseResults) {
                 $this->error_code = xml_get_error_code($xml);
                 $this->error_string = xml_error_string($this->error_code);
-                ///*DBG*/ echo "WOOGA WOOGA"; var_dump($this->error_string); die;
                 $return = false;
             }
@@ -241 +250 @@
         return true;
     } /* FeedWordPress_Parser::start_xmlns() */
-}
-
+
+    /* html_convert_entities($string) -- convert named HTML entities to 
+     * XML-compatible numeric entities. Adapted from code by @inanimatt:
+     * https://gist.github.com/inanimatt/879249
+     */
+    public function html_convert_entities($string) {
+        return preg_replace_callback('/&([a-zA-Z][a-zA-Z0-9]+);/S', 
+            array($this, 'convert_entity'), $string);
+    }
+
+    /* Swap HTML named entity with its numeric equivalent. If the entity
+     * isn't in the lookup table, this function returns a blank, which
+     * destroys the character in the output - this is probably the 
+     * desired behaviour when producing XML. Adapted from code by @inanimatt:
+     * https://gist.github.com/inanimatt/879249
+     */
+    public function convert_entity($matches) {
+        static $table = array(
+            'quot'     => '&#34;',
+            'amp'      => '&#38;',
+            'lt'       => '&#60;',
+            'gt'       => '&#62;',
+            'OElig'    => '&#338;',
+            'oelig'    => '&#339;',
+            'Scaron'   => '&#352;',
+            'scaron'   => '&#353;',
+            'Yuml'     => '&#376;',
+            'circ'     => '&#710;',
+            'tilde'    => '&#732;',
+            'ensp'     => '&#8194;',
+            'emsp'     => '&#8195;',
+            'thinsp'   => '&#8201;',
+            'zwnj'     => '&#8204;',
+            'zwj'      => '&#8205;',
+            'lrm'      => '&#8206;',
+            'rlm'      => '&#8207;',
+            'ndash'    => '&#8211;',
+            'mdash'    => '&#8212;',
+            'lsquo'    => '&#8216;',
+            'rsquo'    => '&#8217;',
+            'sbquo'    => '&#8218;',
+            'ldquo'    => '&#8220;',
+            'rdquo'    => '&#8221;',
+            'bdquo'    => '&#8222;',
+            'dagger'   => '&#8224;',
+            'Dagger'   => '&#8225;',
+            'permil'   => '&#8240;',
+            'lsaquo'   => '&#8249;',
+            'rsaquo'   => '&#8250;',
+            'euro'     => '&#8364;',
+            'fnof'     => '&#402;',
+            'Alpha'    => '&#913;',
+            'Beta'     => '&#914;',
+            'Gamma'    => '&#915;',
+            'Delta'    => '&#916;',
+            'Epsilon'  => '&#917;',
+            'Zeta'     => '&#918;',
+            'Eta'      => '&#919;',
+            'Theta'    => '&#920;',
+            'Iota'     => '&#921;',
+            'Kappa'    => '&#922;',
+            'Lambda'   => '&#923;',
+            'Mu'       => '&#924;',
+            'Nu'       => '&#925;',
+            'Xi'       => '&#926;',
+            'Omicron'  => '&#927;',
+            'Pi'       => '&#928;',
+            'Rho'      => '&#929;',
+            'Sigma'    => '&#931;',
+            'Tau'      => '&#932;',
+            'Upsilon'  => '&#933;',
+            'Phi'      => '&#934;',
+            'Chi'      => '&#935;',
+            'Psi'      => '&#936;',
+            'Omega'    => '&#937;',
+            'alpha'    => '&#945;',
+            'beta'     => '&#946;',
+            'gamma'    => '&#947;',
+            'delta'    => '&#948;',
+            'epsilon'  => '&#949;',
+            'zeta'     => '&#950;',
+            'eta'      => '&#951;',
+            'theta'    => '&#952;',
+            'iota'     => '&#953;',
+            'kappa'    => '&#954;',
+            'lambda'   => '&#955;',
+            'mu'       => '&#956;',
+            'nu'       => '&#957;',
+            'xi'       => '&#958;',
+            'omicron'  => '&#959;',
+            'pi'       => '&#960;',
+            'rho'      => '&#961;',
+            'sigmaf'   => '&#962;',
+            'sigma'    => '&#963;',
+            'tau'      => '&#964;',
+            'upsilon'  => '&#965;',
+            'phi'      => '&#966;',
+            'chi'      => '&#967;',
+            'psi'      => '&#968;',
+            'omega'    => '&#969;',
+            'thetasym' => '&#977;',
+            'upsih'    => '&#978;',
+            'piv'      => '&#982;',
+            'bull'     => '&#8226;',
+            'hellip'   => '&#8230;',
+            'prime'    => '&#8242;',
+            'Prime'    => '&#8243;',
+            'oline'    => '&#8254;',
+            'frasl'    => '&#8260;',
+            'weierp'   => '&#8472;',
+            'image'    => '&#8465;',
+            'real'     => '&#8476;',
+            'trade'    => '&#8482;',
+            'alefsym'  => '&#8501;',
+            'larr'     => '&#8592;',
+            'uarr'     => '&#8593;',
+            'rarr'     => '&#8594;',
+            'darr'     => '&#8595;',
+            'harr'     => '&#8596;',
+            'crarr'    => '&#8629;',
+            'lArr'     => '&#8656;',
+            'uArr'     => '&#8657;',
+            'rArr'     => '&#8658;',
+            'dArr'     => '&#8659;',
+            'hArr'     => '&#8660;',
+            'forall'   => '&#8704;',
+            'part'     => '&#8706;',
+            'exist'    => '&#8707;',
+            'empty'    => '&#8709;',
+            'nabla'    => '&#8711;',
+            'isin'     => '&#8712;',
+            'notin'    => '&#8713;',
+            'ni'       => '&#8715;',
+            'prod'     => '&#8719;',
+            'sum'      => '&#8721;',
+            'minus'    => '&#8722;',
+            'lowast'   => '&#8727;',
+            'radic'    => '&#8730;',
+            'prop'     => '&#8733;',
+            'infin'    => '&#8734;',
+            'ang'      => '&#8736;',
+            'and'      => '&#8743;',
+            'or'       => '&#8744;',
+            'cap'      => '&#8745;',
+            'cup'      => '&#8746;',
+            'int'      => '&#8747;',
+            'there4'   => '&#8756;',
+            'sim'      => '&#8764;',
+            'cong'     => '&#8773;',
+            'asymp'    => '&#8776;',
+            'ne'       => '&#8800;',
+            'equiv'    => '&#8801;',
+            'le'       => '&#8804;',
+            'ge'       => '&#8805;',
+            'sub'      => '&#8834;',
+            'sup'      => '&#8835;',
+            'nsub'     => '&#8836;',
+            'sube'     => '&#8838;',
+            'supe'     => '&#8839;',
+            'oplus'    => '&#8853;',
+            'otimes'   => '&#8855;',
+            'perp'     => '&#8869;',
+            'sdot'     => '&#8901;',
+            'lceil'    => '&#8968;',
+            'rceil'    => '&#8969;',
+            'lfloor'   => '&#8970;',
+            'rfloor'   => '&#8971;',
+            'lang'     => '&#9001;',
+            'rang'     => '&#9002;',
+            'loz'      => '&#9674;',
+            'spades'   => '&#9824;',
+            'clubs'    => '&#9827;',
+            'hearts'   => '&#9829;',
+            'diams'    => '&#9830;',
+            'nbsp'     => '&#160;',
+            'iexcl'    => '&#161;',
+            'cent'     => '&#162;',
+            'pound'    => '&#163;',
+            'curren'   => '&#164;',
+            'yen'      => '&#165;',
+            'brvbar'   => '&#166;',
+            'sect'     => '&#167;',
+            'uml'      => '&#168;',
+            'copy'     => '&#169;',
+            'ordf'     => '&#170;',
+            'laquo'    => '&#171;',
+            'not'      => '&#172;',
+            'shy'      => '&#173;',
+            'reg'      => '&#174;',
+            'macr'     => '&#175;',
+            'deg'      => '&#176;',
+            'plusmn'   => '&#177;',
+            'sup2'     => '&#178;',
+            'sup3'     => '&#179;',
+            'acute'    => '&#180;',
+            'micro'    => '&#181;',
+            'para'     => '&#182;',
+            'middot'   => '&#183;',
+            'cedil'    => '&#184;',
+            'sup1'     => '&#185;',
+            'ordm'     => '&#186;',
+            'raquo'    => '&#187;',
+            'frac14'   => '&#188;',
+            'frac12'   => '&#189;',
+            'frac34'   => '&#190;',
+            'iquest'   => '&#191;',
+            'Agrave'   => '&#192;',
+            'Aacute'   => '&#193;',
+            'Acirc'    => '&#194;',
+            'Atilde'   => '&#195;',
+            'Auml'     => '&#196;',
+            'Aring'    => '&#197;',
+            'AElig'    => '&#198;',
+            'Ccedil'   => '&#199;',
+            'Egrave'   => '&#200;',
+            'Eacute'   => '&#201;',
+            'Ecirc'    => '&#202;',
+            'Euml'     => '&#203;',
+            'Igrave'   => '&#204;',
+            'Iacute'   => '&#205;',
+            'Icirc'    => '&#206;',
+            'Iuml'     => '&#207;',
+            'ETH'      => '&#208;',
+            'Ntilde'   => '&#209;',
+            'Ograve'   => '&#210;',
+            'Oacute'   => '&#211;',
+            'Ocirc'    => '&#212;',
+            'Otilde'   => '&#213;',
+            'Ouml'     => '&#214;',
+            'times'    => '&#215;',
+            'Oslash'   => '&#216;',
+            'Ugrave'   => '&#217;',
+            'Uacute'   => '&#218;',
+            'Ucirc'    => '&#219;',
+            'Uuml'     => '&#220;',
+            'Yacute'   => '&#221;',
+            'THORN'    => '&#222;',
+            'szlig'    => '&#223;',
+            'agrave'   => '&#224;',
+            'aacute'   => '&#225;',
+            'acirc'    => '&#226;',
+            'atilde'   => '&#227;',
+            'auml'     => '&#228;',
+            'aring'    => '&#229;',
+            'aelig'    => '&#230;',
+            'ccedil'   => '&#231;',
+            'egrave'   => '&#232;',
+            'eacute'   => '&#233;',
+            'ecirc'    => '&#234;',
+            'euml'     => '&#235;',
+            'igrave'   => '&#236;',
+            'iacute'   => '&#237;',
+            'icirc'    => '&#238;',
+            'iuml'     => '&#239;',
+            'eth'      => '&#240;',
+            'ntilde'   => '&#241;',
+            'ograve'   => '&#242;',
+            'oacute'   => '&#243;',
+            'ocirc'    => '&#244;',
+            'otilde'   => '&#245;',
+            'ouml'     => '&#246;',
+            'divide'   => '&#247;',
+            'oslash'   => '&#248;',
+            'ugrave'   => '&#249;',
+            'uacute'   => '&#250;',
+            'ucirc'    => '&#251;',
+            'uuml'     => '&#252;',
+            'yacute'   => '&#253;',
+            'thorn'    => '&#254;',
+            'yuml'     => '&#255;'
+        );
+        // Entity not found? Destroy it.
+        return isset($table[$matches[1]]) ? $table[$matches[1]] : '';
+    } /* FeedWordPress_Parser::convert_entity() */
+
+} /* class FeedWordPress_Parser */
+
+

feedwordpress/trunk/feedwordpresslocalpost.class.php ¶

@@ -18 +18 @@
     
     public function id () {
-        return $this->post->ID;
-    }
+        if (is_null($this->post) or !is_object($this->post)) :
+            return NULL;
+        else :
+            return $this->post->ID;
+        endif;
+    } /* FeedWordPressLocalPost::id () */
     
     public function meta ($what, $params = array()) {
@@ -32 +36 @@
         ));
     
+        // If we got put through the_content without a current
+        // $post object set, then bail out immediately.
+        if (is_null($this->post) or !is_object($this->post)) :
+            return $params['default'];
+        endif;
+
         // This is a little weird, just bear with me here.
         $results = array();
@@ -153 +163 @@
 
     public function content () {
-        return apply_filters('the_content', $this->post->post_content, $this->post->ID);
+        if (is_null($this->post) or !is_object($this->post)) :
+            $post_content = NULL;
+            $post_id = NULL;
+        else :
+            $post_content = $this->post->post_content;
+            $post_id = $this->post->ID;
+        endif;
+        return apply_filters('the_content', $post_content, $post_id);
     }
     
     public function title () {
-        return apply_filters('the_title', $this->post->post_title, $this->post->ID);
+        if (is_null($this->post) or !is_object($this->post)) :
+            $post_title = NULL;
+            $post_id = NULL;
+        else :
+            $post_title = $this->post->post_title;
+            $post_id = $this->post->ID;
+        endif;
+        return apply_filters('the_title', $post_title, $post_id);
     }
 
     public function guid () {
-        return apply_filters('get_the_guid', $this->post->guid);
+        if (is_null($this->post) or !is_object($this->post)) :
+            $post_guid = NULL;
+        else :
+            $post_guid = $this->post->guid;
+        endif;
+        return apply_filters('get_the_guid', $post_guid);
     }
     
     public function get_categories () {
+        if (is_null($this->post) or !is_object($this->post)) :
+            return array();
+        endif;
+
         $terms = wp_get_object_terms(
             $this->post->ID,

feedwordpress/trunk/feedwordpresssyndicationpage.class.php ¶

@@ -140 +140 @@
                     endforeach;
                 else : // This should never happen
-                    FeedWordPress::critical_bug('fwp_syndication_manage_page::targets', $targets, __LINE__, __FILE__);
+                    FeedWordPressDiagnostic::critical_bug('fwp_syndication_manage_page::targets', $targets, __LINE__, __FILE__);
                 endif;
             elseif (!is_null(MyPHP::post('update_uri'))) :
@@ -147 +147 @@
                     $targets = array($targets);
                 endif;
-                
-                $first = each($targets);
-                if (!is_numeric($first['key'])) : // URLs in keys
-                    $targets = array_keys($targets);
+
+                $targets_keys = array_keys($targets);
+                $first_key = reset($targets_keys);
+                if (!is_numeric($first_key)) : // URLs in keys
+                    $targets = $targets_keys;
                 endif;
                 $update_set = $targets;
@@ -440 +441 @@
             <div class="metabox-holder">        
             <?php
-                fwp_do_meta_boxes($this->meta_box_context(), $this->meta_box_context(), $this);
+                do_meta_boxes($this->meta_box_context(), $this->meta_box_context(), $this);
             ?>
             </div> <!-- class="metabox-holder" -->
@@ -455 +456 @@
 
     function dashboard_box ($page, $box = NULL) {
-        global $fwp_path;
-
         $links = FeedWordPress::syndicated_links(array("hide_invisible" => false));
         $sources = $this->sources('*');
@@ -478 +477 @@
         // Hey ho, let's go...
         ?>
-        <div style="float: left; background: #F5F5F5; padding-top: 5px; padding-right: 5px;"><a href="<?php print $this->form_action(); ?>"><img src="<?php print esc_html(plugins_url( "/${fwp_path}/feedwordpress.png") ); ?>" alt="" /></a></div>
+        <div style="float: left; background: #F5F5F5; padding-top: 5px; padding-right: 5px;"><a href="<?php print $this->form_action(); ?>"><img src="<?php print esc_url(plugins_url( "feedwordpress.png", __FILE__ ) ); ?>" alt="" /></a></div>
 
         <p class="info" style="margin-bottom: 0px; border-bottom: 1px dotted black;">Managed by <a href="http://feedwordpress.radgeek.com/">FeedWordPress</a>
@@ -537 +536 @@
           <?php FeedWordPressSettingsUI::magic_input_tip_js('add-uri'); ?>
           <input type="hidden" name="action" value="<?php print FWP_SYNDICATE_NEW; ?>" />
-          <input style="vertical-align: middle;" type="image" src="<?php print plugins_url('/'.$fwp_path .'/plus.png' ); ?>" alt="<?php print FWP_SYNDICATE_NEW; ?>" /></div>
+          <input style="vertical-align: middle;" type="image" src="<?php print esc_url(plugins_url('plus.png', __FILE__)); ?>" alt="<?php print FWP_SYNDICATE_NEW; ?>" /></div>
           </form>
         </div> <!-- id="add-single-uri" -->
@@ -547 +546 @@
     
     function syndicated_sources_box ($page, $box = NULL) {
-        global $fwp_path;
 
         $links = FeedWordPress::syndicated_links(array("hide_invisible" => false));
@@ -603 +601 @@
           <input type="hidden" name="action" value="feedfinder" />
           <input type="submit" class="button-secondary" name="action" value="<?php print FWP_SYNDICATE_NEW; ?>" />
-          <div style="text-align: right; margin-right: 2.0em"><a id="turn-on-multiple-sources" href="#add-multiple-uri"><img style="vertical-align: middle" src="<?php print plugins_url('/' . $fwp_path . '/down.png'); ?>" alt="" /> add multiple</a>
+          <div style="text-align: right; margin-right: 2.0em"><a id="turn-on-multiple-sources" href="#add-multiple-uri"><img style="vertical-align: middle" src="<?php print esc_url(plugins_url('down.png', __FILE__)); ?>" alt="" /> add multiple</a>
           <span class="screen-reader-text"> or </span>
-          <a id="turn-on-opml-upload" href="#upload-opml"><img src="<?php print plugins_url('/' . $fwp_path . '/plus.png'); ?>" alt="" style="vertical-align: middle" /> import source list</a></div>
+          <a id="turn-on-opml-upload" href="#upload-opml"><img src="<?php print esc_url(plugins_url('plus.png', __FILE__)); ?>" alt="" style="vertical-align: middle" /> import source list</a></div>
           </li>
           </ul>
@@ -1199 +1197 @@
 
 function fwp_switchfeed_page () {
-    global $wpdb, $wp_db_version;
+    global $wpdb;
     global $fwp_post, $fwp_path;
 

feedwordpress/trunk/performance-page.php ¶

@@ -13 +13 @@
 
     function display () {
-        global $wpdb, $wp_db_version, $fwp_path;
-        global $fwp_post;
-
         if (FeedWordPress::needs_upgrade()) :
             fwp_upgrade_page();
@@ -25 +22 @@
 
         if (strtoupper($_SERVER['REQUEST_METHOD'])=='POST') :
-            $this->accept_POST($fwp_post);
-            do_action('feedwordpress_admin_page_performance_save', $fwp_post, $this);
+            $this->accept_POST($_POST);
+            do_action('feedwordpress_admin_page_performance_save', $_POST, $this);
         endif;
 
@@ -56 +53 @@
             <div class="metabox-holder">
             <?php
-            fwp_do_meta_boxes($this->meta_box_context(), $this->meta_box_context(), $this);
+            do_meta_boxes($this->meta_box_context(), $this->meta_box_context(), $this);
             ?>
             </div> <!-- class="metabox-holder" -->

feedwordpress/trunk/readme.txt ¶

@@ -1 +1 @@
 === FeedWordPress ===
 Contributors: C. Johnson
-Donate link: http://feedwordpress.radgeek.com/
+Donate link: http://feedwordpress.radgeek.com/donate/
 Tags: syndication, aggregation, feed, atom, rss
 Requires at least: 4.5
-Tested up to: 4.8.2
-Stable tag: 2017.1020
+Tested up to: 5.3.2
+Stable tag: 2020.0118
+License: GPLv2 or later
+License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
 FeedWordPress syndicates content from feeds you choose into your WordPress weblog. 
@@ -21 +23 @@
 FeedWordPress is designed with flexibility, ease of use, and ease of configuration in mind. You'll need a working installation of WordPress (version [4.5][] or later), and it helps to have SFTP or FTP access to your web host. The ability to create cron jobs on your web host is helpful but not required.
 
-  [WordPress]: http://wordpress.org/
-  [WordPress MU]: http://mu.wordpress.org/
+  [WordPress]: https://wordpress.org/
   [4.5]: http://codex.wordpress.org/Version_4.5
 
@@ -29 +30 @@
 To use FeedWordPress, you will need:
 
-*   an installed and configured copy of [WordPress][] (version 4.5 or later).
+*   an installed and configured copy of [WordPress](https://wordpress.org/) (version 4.5 or later).
 
 *   the ability to install new plugins on your site using either WordPress's Plugins Repository, SFTP, FTP or shell access to your web host
@@ -1920 +1921 @@
 == License ==
 
-The FeedWordPress plugin is copyright © 2005-2017 by Charles Johnson. It uses
-code derived or translated from:
+The FeedWordPress plugin is copyright © 2005-2017 by Charles Johnson. It uses code derived or translated from:
 
 -   [wp-rss-aggregate.php][] by [Kellan Elliot-McCrea](kellan@protest.net)
@@ -1931 +1931 @@
 according to the terms of the [GNU General Public License][].
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the [GNU General Public License][] as published by the Free
-Software Foundation; either version 2 of the License, or (at your option) any
-later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is free software; you can redistribute it and/or modify it under the terms of the [GNU General Public License][] as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
   [wp-rss-aggregate.php]: http://laughingmeme.org/archives/002203.html

feedwordpress/trunk/syndicatedlink.class.php ¶

@@ -129 +129 @@
     } /* SyndicatedLink::live_posts () */
 
+    protected function pause_updates () {
+        return ('yes'==$this->setting("update/pause", "update_pause", 'no'));
+    } /* SyndicatedLink::pause_updates () */
+
     public function poll ($crash_ts = NULL) {
         global $wpdb;
@@ -211 +215 @@
                 endif;
             endif;
+
+            $this->update_setting('link/feed_type', $this->simplepie->get_type());
 
             $this->merge_settings($channel, 'feed/');
@@ -276 +282 @@
             if (is_array($posts)) :
                 foreach ($posts as $key => $item) :
-                    $post = new SyndicatedPost($item, $this);
-
-                    if (!$resume or !in_array(trim($post->guid()), $processed)) :
-                        $processed[] = $post->guid();
-                        if (!$post->filtered()) :
-                            $new = $post->store();
-                            if ( $new !== false ) $new_count[$new]++;
+                    if (!$this->pause_updates()) :
+                        $post = new SyndicatedPost($item, $this);
+
+                        if (!$resume or !in_array(trim($post->guid()), $processed)) :
+                            $processed[] = $post->guid();
+                            if (!$post->filtered()) :
+                                $new = $post->store();
+                                if ( $new !== false ) $new_count[$new]++;
+                            endif;
+
+                            if (!is_null($crash_ts) and (time() > $crash_ts)) :
+                                $crashed = true;
+                                break;
+                            endif;
                         endif;
 
-                        if (!is_null($crash_ts) and (time() > $crash_ts)) :
-                            $crashed = true;
-                            break;
-                        endif;
-                    endif;
-
-                    unset($post);
-                    
+                        unset($post);
+                    endif;                  
                 endforeach;
             endif;
@@ -300 +307 @@
                 // <http://tools.ietf.org/html/draft-snell-atompub-tombstones-18>
                 $tombstones = $this->simplepie->get_feed_tags('http://purl.org/atompub/tombstones/1.0', 'deleted-entry');
-                if (count($tombstones) > 0) :
+                if (!is_null($tombstones) && count($tombstones) > 0) :
                     foreach ($tombstones as $tombstone) :
                         $ref = NULL;
@@ -741 +748 @@
     } /* SyndicatedLink::is_non_incremental () */
 
+    public function get_feed_type () {
+        $type_code = $this->setting('link/feed_type');
+        
+        // list derived from: <http://simplepie.org/api/class-SimplePie.html>, retrieved 2020/01/18
+        $bitmasks = array(
+            SIMPLEPIE_TYPE_RSS_090 => 'RSS 0.90',
+            SIMPLEPIE_TYPE_RSS_091_NETSCAPE => 'RSS 0.91 (Netscape)',
+            SIMPLEPIE_TYPE_RSS_091_USERLAND => 'RSS 0.91 (Userland)',
+            SIMPLEPIE_TYPE_RSS_091 => 'RSS 0.91',
+            SIMPLEPIE_TYPE_RSS_092 => 'RSS 0.92',
+            SIMPLEPIE_TYPE_RSS_093 => 'RSS 0.93',
+            SIMPLEPIE_TYPE_RSS_094 => 'RSS 0.94',
+            SIMPLEPIE_TYPE_RSS_10 => 'RSS 1.0',
+            SIMPLEPIE_TYPE_RSS_20 => 'RSS 2.0.x',
+            SIMPLEPIE_TYPE_RSS_RDF => 'RDF-based RSS',
+            SIMPLEPIE_TYPE_RSS_SYNDICATION => 'Non-RDF-based RSS',
+            SIMPLEPIE_TYPE_RSS_ALL => 'Any version of RSS',
+            SIMPLEPIE_TYPE_ATOM_03 => 'Atom 0.3',
+            SIMPLEPIE_TYPE_ATOM_10 => 'Atom 1.0',
+            SIMPLEPIE_TYPE_ATOM_ALL => 'Atom (any version)',
+            SIMPLEPIE_TYPE_ALL => 'Supported Feed (unspecified format)',
+        );
+
+        $type = "Unknown or unsupported format";
+        foreach ($bitmasks as $format_flag => $format_string) :
+            if (is_numeric($format_flag)) : // Guard against failure of constants to be defined.
+                if ($type_code & $format_flag) :
+                    $type = $format_string;
+                    break; // foreach
+                endif;
+            endif;
+        endforeach;
+        
+        return $type;
+    } /* SyndicatedLink::get_feed_type () */
+    
     public function uri ($params = array()) {
         $params = wp_parse_args($params, array(

feedwordpress/trunk/syndicatedpost.class.php ¶

@@ -1229 +1229 @@
 
         if ($this->filtered()) : // This should never happen.
-            FeedWordPress::critical_bug('SyndicatedPost', $this, __LINE__, __FILE__);
+            FeedWordPressDiagnostic::critical_bug('SyndicatedPost', $this, __LINE__, __FILE__);
         endif;
 
@@ -1245 +1245 @@
             if ($q->have_posts()) :
                 while ($q->have_posts()) : $q->the_post();
-                    $old_post = $q->post;
+                    if (get_post_type($q->post->ID) == $this->post['post_type']):
+                        $old_post = $q->post;
+                    endif;
                 endwhile;
             endif;
@@ -1306 +1308 @@
                     endif;
 
-                    if ($updated and FeedWordPress::diagnostic_on('feed_items:freshness:reasons')) :
+                    if ($updated and FeedWordPressDiagnostic::is_on('feed_items:freshness:reasons')) :
                         // In the absence of definitive
                         // timestamp information, we
@@ -1452 +1454 @@
     function wp_id () {
         if ($this->filtered()) : // This should never happen.
-            FeedWordPress::critical_bug('SyndicatedPost', $this, __LINE__, __FILE__);
+            FeedWordPressDiagnostic::critical_bug('SyndicatedPost', $this, __LINE__, __FILE__);
         endif;
 
@@ -1461 +1463 @@
     }
 
+    /**
+     * SyndicatedPost::secure_author_id(). Look up, or create, a numeric ID
+     * for the author of the incoming post.
+     *
+     * side effect: int|NULL stored in $this->post['post_author']
+     * side effect: IF no valid author is found, NULL stored in $this->post 
+     * side effect: diagnostic output in case item is rejected with NULL author
+     *
+     * @used-by SyndicatedPost::store
+     *
+     * @uses SyndicatedPost::post
+     * @uses SyndicatedPost::author_id
+     * @uses SyndicatedLink::setting
+     * @uses FeedWordPress::diagnostic
+     */
+    protected function secure_author_id () {
+        # -- Look up, or create, numeric ID for author
+        $this->post['post_author'] = $this->author_id (
+            $this->link->setting('unfamiliar author', 'unfamiliar_author', 'create')
+        );
+
+        if (is_null($this->post['post_author'])) :
+            FeedWordPress::diagnostic('feed_items:rejected', 'Filtered out item ['.$this->guid().'] without syndication: no author available');
+            $this->post = NULL;
+        endif;
+    } /* SyndicatedPost::secure_author_id() */
+
+    /**
+     * SyndicatedPost::secure_term_ids(). Look up, or create, numeric IDs
+     * for the terms (categories, tags, etc.) assigned to the incoming post,
+     * whether by global settings, feed settings, or by the tags on the feed.
+     *
+     * side effect: array of term ids stored in $this->post['tax_input']
+     * side effect: IF settings or filters determine post should be filtered out,
+     *  NULL stored in $this->post
+     *
+     * @used-by SyndicatedPost::store
+     *
+     * @uses apply_filters
+     * @uses SyndicatedLink::setting
+     * @uses SyndicatedPost::category_ids
+     * @uses SyndicatedPost::preset_terms
+     * @uses SyndicatedPost::post
+     */
+    protected function secure_term_ids () {
+        $mapping = apply_filters('syndicated_post_terms_mapping', array(
+            'category' => array('abbr' => 'cats', 'unfamiliar' => 'category', 'domain' => array('category', 'post_tag')),
+            'post_tag' => array('abbr' => 'tags', 'unfamiliar' => 'post_tag', 'domain' => array('post_tag')),
+        ), $this);
+
+        $termSet = array(); $valid = null;
+        foreach ($this->feed_terms as $what => $anTerms) :
+            // Default to using the inclusive procedures (for cats) rather than exclusive (for inline tags)
+            $taxes = (isset($mapping[$what]) ? $mapping[$what] : $mapping['category']);
+            $unfamiliar = $taxes['unfamiliar'];
+                
+            if (!is_null($this->post)) : // Not filtered out yet
+                # -- Look up, or create, numeric ID for categories
+                $taxonomies = $this->link->setting("match/".$taxes['abbr'], 'match_'.$taxes['abbr'], $taxes['domain']);
+
+                // Eliminate dummy variables
+                $taxonomies = array_filter($taxonomies, 'remove_dummy_zero');
+
+                // Allow FWP add-on filters to control the taxonomies we use to search for a term
+                $taxonomies = apply_filters("syndicated_post_terms_match", $taxonomies, $what, $this);
+                $taxonomies = apply_filters("syndicated_post_terms_match_${what}", $taxonomies, $this);
+
+                // Allow FWP add-on filters to control with greater precision what happens on unmatched
+                $unmatched = apply_filters("syndicated_post_terms_unfamiliar",
+                    $this->link->setting(
+                        "unfamiliar {$unfamiliar}",
+                        "unfamiliar_{$unfamiliar}",
+                        'create:'.$unfamiliar
+                    ),
+                    $what,
+                    $this
+                );
+
+                $terms = $this->category_ids (
+                    $anTerms,
+                    $unmatched,
+                    /*taxonomies=*/ $taxonomies,
+                    array(
+                      'singleton' => false, // I don't like surprises
+                      'filters' => true,
+                    )
+                );
+
+                if (is_null($terms) or is_null($termSet)) :
+                    // filtered out -- no matches
+                else :
+                    $valid = true;
+
+                    // filter mode off, or at least one match
+                    foreach ($terms as $tax => $term_ids) :
+                        if (!isset($termSet[$tax])) :
+                            $termSet[$tax] = array();
+                        endif;
+                        $termSet[$tax] = array_merge($termSet[$tax], $term_ids);
+                    endforeach;
+                endif;
+            endif;
+        endforeach;
+
+        if (is_null($valid)) : // Plonked
+            $this->post = NULL;
+        else : // We can proceed
+            $this->post['tax_input'] = array();
+            foreach ($termSet as $tax => $term_ids) :
+                if (!isset($this->post['tax_input'][$tax])) :
+                    $this->post['tax_input'][$tax] = array();
+                endif;
+                $this->post['tax_input'][$tax] = array_merge(
+                    $this->post['tax_input'][$tax],
+                    $term_ids
+                );
+            endforeach;
+
+            // Now let's add on the feed and global presets
+            foreach ($this->preset_terms as $tax => $term_ids) :
+                if (!isset($this->post['tax_input'][$tax])) :
+                    $this->post['tax_input'][$tax] = array();
+                endif;
+
+                $this->post['tax_input'][$tax] = array_merge (
+                    $this->post['tax_input'][$tax],
+                    $this->category_ids (
+                    /*terms=*/ $term_ids,
+                    /*unfamiliar=*/ 'create:'.$tax, // These are presets; for those added in a tagbox editor, the tag may not yet exist
+                    /*taxonomies=*/ array($tax),
+                    array(
+                      'singleton' => true,
+                    ))
+                );
+            endforeach;
+        endif;
+    } /* SyndicatedPost::secure_term_ids() */
+
+    /**
+     * SyndicatedPost::store
+     *
+     * @uses SyndicatedPost::secure_author_id
+     */
     public function store () {
         global $wpdb;
 
         if ($this->filtered()) : // This should never happen.
-            FeedWordPress::critical_bug('SyndicatedPost', $this, __LINE__, __FILE__);
+            FeedWordPressDiagnostic::critical_bug('SyndicatedPost', $this, __LINE__, __FILE__);
         endif;
 
         $freshness = $this->freshness();
         if ($this->has_fresh_content()) :
-            # -- Look up, or create, numeric ID for author
-            $this->post['post_author'] = $this->author_id (
-                $this->link->setting('unfamiliar author', 'unfamiliar_author', 'create')
-            );
-
-            if (is_null($this->post['post_author'])) :
-                FeedWordPress::diagnostic('feed_items:rejected', 'Filtered out item ['.$this->guid().'] without syndication: no author available');
-                $this->post = NULL;
-            endif;
-        endif;
-
-        // We have to check again in case post has been filtered during
-        // the author_id lookup
-        if ($this->has_fresh_content()) :
-            $mapping = apply_filters('syndicated_post_terms_mapping', array(
-                'category' => array('abbr' => 'cats', 'unfamiliar' => 'category', 'domain' => array('category', 'post_tag')),
-                'post_tag' => array('abbr' => 'tags', 'unfamiliar' => 'post_tag', 'domain' => array('post_tag')),
-            ), $this);
-
-            $termSet = array(); $valid = null;
-            foreach ($this->feed_terms as $what => $anTerms) :
-                // Default to using the inclusive procedures (for cats) rather than exclusive (for inline tags)
-                $taxes = (isset($mapping[$what]) ? $mapping[$what] : $mapping['category']);
-                $unfamiliar = $taxes['unfamiliar'];
-                
-                if (!is_null($this->post)) : // Not filtered out yet
-                    # -- Look up, or create, numeric ID for categories
-                    $taxonomies = $this->link->setting("match/".$taxes['abbr'], 'match_'.$taxes['abbr'], $taxes['domain']);
-
-                    // Eliminate dummy variables
-                    $taxonomies = array_filter($taxonomies, 'remove_dummy_zero');
-
-                    // Allow FWP add-on filters to control the taxonomies we use to search for a term
-                    $taxonomies = apply_filters("syndicated_post_terms_match", $taxonomies, $what, $this);
-                    $taxonomies = apply_filters("syndicated_post_terms_match_${what}", $taxonomies, $this);
-
-                    // Allow FWP add-on filters to control with greater precision what happens on unmatched
-                    $unmatched = apply_filters("syndicated_post_terms_unfamiliar",
-                        $this->link->setting(
-                            "unfamiliar {$unfamiliar}",
-                            "unfamiliar_{$unfamiliar}",
-                            'create:'.$unfamiliar
-                        ),
-                        $what,
-                        $this
-                    );
-
-                    $terms = $this->category_ids (
-                        $anTerms,
-                        $unmatched,
-                        /*taxonomies=*/ $taxonomies,
-                        array(
-                          'singleton' => false, // I don't like surprises
-                          'filters' => true,
-                        )
-                    );
-
-                    if (is_null($terms) or is_null($termSet)) :
-                        // filtered out -- no matches
-                    else :
-                        $valid = true;
-
-                        // filter mode off, or at least one match
-                        foreach ($terms as $tax => $term_ids) :
-                            if (!isset($termSet[$tax])) :
-                                $termSet[$tax] = array();
-                            endif;
-                            $termSet[$tax] = array_merge($termSet[$tax], $term_ids);
-                        endforeach;
-                    endif;
-                endif;
-            endforeach;
-
-            if (is_null($valid)) : // Plonked
-                $this->post = NULL;
-            else : // We can proceed
-                $this->post['tax_input'] = array();
-                foreach ($termSet as $tax => $term_ids) :
-                    if (!isset($this->post['tax_input'][$tax])) :
-                        $this->post['tax_input'][$tax] = array();
-                    endif;
-                    $this->post['tax_input'][$tax] = array_merge(
-                        $this->post['tax_input'][$tax],
-                        $term_ids
-                    );
-                endforeach;
-
-                // Now let's add on the feed and global presets
-                foreach ($this->preset_terms as $tax => $term_ids) :
-                    if (!isset($this->post['tax_input'][$tax])) :
-                        $this->post['tax_input'][$tax] = array();
-                    endif;
-
-                    $this->post['tax_input'][$tax] = array_merge (
-                        $this->post['tax_input'][$tax],
-                        $this->category_ids (
-                        /*terms=*/ $term_ids,
-                        /*unfamiliar=*/ 'create:'.$tax, // These are presets; for those added in a tagbox editor, the tag may not yet exist
-                        /*taxonomies=*/ array($tax),
-                        array(
-                          'singleton' => true,
-                        ))
-                    );
-                endforeach;
-            endif;
+            $this->secure_author_id();
+        endif;
+
+        if ($this->has_fresh_content()) : // Was this filtered during author_id lookup?
+            $this->secure_term_ids();
         endif;
 
@@ -1787 +1832 @@
     } /* function SyndicatedPost::insert_post () */
 
+    /**
+     * SyndicatedPost::insert_new(). Uses the data collected in this post object to insert
+     * a new post into the wp_posts table.
+     *
+     * @uses SyndicatedPost::insert_post
+     */
     function insert_new () {
         $this->insert_post(/*update=*/ false, 1);
     } /* SyndicatedPost::insert_new() */
 
+    /**
+     * SyndicatedPost::insert_new(). Uses the data collected in this post object to update
+     * an existing post in the wp_posts table.
+     *
+     * @uses SyndicatedPost::insert_post
+     */
     function update_existing () {
         $this->insert_post(/*update=*/ true, 2);
@@ -1935 +1992 @@
 $ns::_wp_id
 EOM;
-            FeedWordPress::noncritical_bug(
+            FeedWordPressDiagnostic::noncritical_bug(
                 /*message=*/ $mesg,
                 /*var =*/ array(
@@ -2143 +2200 @@
 
         $author = NULL;
-        while (is_null($author) and ($candidate = each($candidates))) :
-            if (!is_null($candidate['value'])
-            and (strlen(trim($candidate['value'])) > 0)
-            and !in_array(strtolower(trim($candidate['value'])), $forbidden)) :
-                $author = $candidate['value'];
-            endif;
-        endwhile;
+        foreach ($candidates as $candidate) {
+            if (!is_null($candidate)
+                and (strlen(trim($candidate)) > 0)
+                and !in_array(strtolower(trim($candidate)), $forbidden)) :
+                    $author = $candidate;
+                    break;
+            endif;
+        }
 
         $email = (isset($a['email']) ? $a['email'] : NULL);
@@ -2253 +2311 @@
                     $userdata = array();
 
-                    // WordPress 3 is going to pitch a fit if we attempt to register
-                    // more than one user account with an empty e-mail address, so we
-                    // need *something* here. Ugh.
+                    #-- we need *something* for the email here or WordPress
+                    #-- is liable to pitch a fit. So, make something up if
+                    #-- necessary. (Ugh.)
                     if (strlen($email) == 0 or FeedWordPress::is_null_email($email)) :
                         $url = parse_url($hostUrl);
@@ -2269 +2327 @@
                     $userdata['user_url'] = $authorUrl;
                     $userdata['nickname'] = $author;
+
                     $parts = preg_split('/\s+/', trim($author), 2);
                     if (isset($parts[0])) : $userdata['first_name'] = $parts[0]; endif;
                     if (isset($parts[1])) : $userdata['last_name'] = $parts[1]; endif;
+
                     $userdata['display_name'] = $author;
                     $userdata['role'] = 'contributor';
 
-                    do { // Keep trying until you get it right. Or until PHP crashes, I guess.
+                    #-- loop. Keep trying to add the user until you get it
+                    #-- right. Or until PHP crashes, I guess.
+                    do {
                         $id = wp_insert_user($userdata);
                         if (is_wp_error($id)) :
@@ -2286 +2348 @@
                                 break;
                             case 'user_nicename_too_long' :
-                                // Add a limited 50 caracters user_nicename based on user_login
+                                // Add a limited 50 characters user_nicename based on user_login
                                                 $userdata['user_nicename'] = mb_substr( $userdata['user_login'], 0, 50 );
                                 break;
                             case 'existing_user_email' :
-                                // No disassemble!
+                                // Disassemble email for username, host
                                 $parts = explode('@', $userdata['user_email'], 2);
 
@@ -2302 +2364 @@
                         endif;
                     } while (is_wp_error($id));
+
+                    // $id should now contain the numeric ID of a newly minted
+                    // user account. Let's mark them as having been generated
+                    // by FeedWordPress in the usermeta table, as per the
+                    // suggestion of @boonebgorges, in case we need to process,
+                    // winnow, filter, or merge syndicated author accounts, &c.
+                    add_user_meta($id, 'feedwordpress_generated', 1);
+
                 elseif (is_numeric($unfamiliar_author) and get_userdata((int) $unfamiliar_author)) :
                     $id = (int) $unfamiliar_author;

feedwordpress/trunk/syndicatedpostterm.class.php ¶

@@ -182 +182 @@
             
                 // If debug mode is ON, this will halt us here.
-                FeedWordPress::noncritical_bug(
+                FeedWordPressDiagnostic::noncritical_bug(
                     'term insertion problem', array(
                         'term' => $this->term,
                         'result' => $aTerm,
-                        'post' => $post, 
+                        'post' => $this->post, 
                         'this' => $this
                     ), __LINE__, __FILE__