Changeset 1880

Timestamp:

02/16/2011 10:29:14 AM (15 months ago)

Author:

Xiping.Wang

Message:

[trunk] upgrade wordpress plugin feedwordpress to 2011.0211.2

Location:

trunk/blogs/wp-content/plugins/feedwordpress

Files:

• admin-ui.php (modified) (16 diffs)
• authors-page.php (modified) (9 diffs)
• categories-page.php (modified) (2 diffs)
• compatability.php (modified) (4 diffs)
• diagnostics-page.php (modified) (4 diffs)
• feedfinder.class.php (modified) (1 diff)
• feeds-page.php (modified) (9 diffs)
• feedtime.class.php (modified) (1 diff)
• feedwordpress-elements.css (modified) (1 diff)
• feedwordpress-elements.js (modified) (1 diff)
• feedwordpress-walker-category-checklist.class.php (modified) (2 diffs)
• feedwordpress.php (modified) (22 diffs)
• feedwordpresssyndicationpage.class.php (modified) (6 diffs)
• magpiefromsimplepie.class.php (modified) (3 diffs)
• readme.txt (modified) (1 diff)
• syndicatedlink.class.php (modified) (9 diffs)
• syndicatedpost.class.php (modified) (31 diffs)
• updatedpostscontrol.class.php (modified) (1 diff)

trunk/blogs/wp-content/plugins/feedwordpress/admin-ui.php

@@ -3 +3 @@
         var $context;
         var $updated = false;
+        var $mesg = NULL;
+
         var $link = NULL;
         var $dispatch = NULL;
@@ -44 +46 @@
 
         function accept_POST ($post) {
-                if ($this->save_requested_in($post)) : // User mashed Save Changes
+                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);               
+                do_action($this->dispatch.'_post', &$post, &$this);             
+        }
+
+        function update_feed () {
+                global $feedwordpress;
+
+                add_action('feedwordpress_check_feed', 'update_feeds_mention');
+                add_action('feedwordpress_check_feed_complete', 'update_feeds_finish', 10, 3);
+                
+                print '<div class="updated">';
+                print "<ul>";
+                $uri = $this->link->uri();
+                $delta = $feedwordpress->update($uri);
+                print "</ul>";
+
+                if (!is_null($delta)) :
+                        $mesg = array();
+                        if (isset($delta['new'])) : $mesg[] = ' '.$delta['new'].' new posts were syndicated'; endif;
+                        if (isset($delta['updated'])) : $mesg[] = ' '.$delta['updated'].' existing posts were updated'; endif;
+                        echo "<p><strong>Update complete.</strong>".implode(' and', $mesg)."</p>";
+                        echo "\n"; flush();
+                else :
+                        $uri = esc_html($uri);
+                        echo "<p><strong>Error:</strong> There was a problem updating <a href=\"$uri\">$uri</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);
         }
 
         function save_settings ($post) {
+                do_action($this->dispatch.'_save', &$post, &$this);
+
                 if ($this->for_feed_settings()) :
                         // Save settings
@@ -63 +96 @@
                         $this->updated = true;
                 endif;
-                do_action($this->dispatch.'_save', $post, $this);
         } /* FeedWordPressAdminPage::save_settings () */
 
         function for_feed_settings () { return (is_object($this->link) and method_exists($this->link, 'found') and $this->link->found()); }
         function for_default_settings () { return !$this->for_feed_settings(); }
+
+        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;
+        }
 
         function update_setting ($names, $value, $default = 'default') {
@@ -88 +146 @@
                 return (isset($post['save']) or isset($post['submit']));
         }
-
+        function update_requested_in ($post) {
+                return (isset($post['update']) and (strlen($post['update']) > 0));
+        }
+        
         /*static*/ function submitted_link_id () {
                 global $fwp_post;
@@ -263 +324 @@
                 <?php endforeach; endif; ?>
                 </select>
-                <input class="button" type="submit" name="go" value="<?php _e('Go') ?> &raquo;" /></li>
+                <input id="fwpfs-button" class="button" type="submit" name="go" value="<?php _e('Go') ?> &raquo;" /></li>
 
                 <?php
@@ -272 +333 @@
                         'subscription' => $this->link,
                 ));
-                ?>
-                </ul>
+                
+                if ($this->for_feed_settings()) :
+                ?>
+                <li><input class="button" type="submit" name="update" value="Update Now" /></li>
+                <?php
+                endif;
+                ?>
+                </ul>           
                 </div>
                 <?php
@@ -286 +353 @@
 
         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) :
-                                $mesg = $pagename . ' settings updated.';
+                                $this->mesg = $pagename . ' settings updated.';
                         else :
-                                $mesg = $this->updated;
+                                $this->mesg = $this->updated;
                         endif;
                 endif;
                 
-                if (!is_null($mesg)) :
+                if (!is_null($this->mesg)) :
                         ?>
                         <div class="updated">
-                        <p><?php print esc_html($mesg); ?></p>
+                        <p><?php print esc_html($this->mesg); ?></p>
                         </div>
                         <?php
@@ -329 +400 @@
 
         function update_message () {
-                return NULL;
+                return $this->mesg;
         }
 
@@ -494 +565 @@
                 // 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;
@@ -573 +645 @@
                         <strong><?php if (is_callable($labels)) :
                                 print call_user_func($labels, $globalSetting, $defaulted, $params);
+                        elseif (is_null($labels)) :
+                                print $globalSetting;
                         else :
                                 print $labels[$globalSetting];
@@ -677 +751 @@
         $desc = "<p style=\"font-size:smaller;font-style:bold;margin:0\">Tag $object as...</p>";
 
+        if (isset($params['textarea_name'])) :
+                $textAreaName = $params['textarea_name'];
+        else :
+                $textAreaName = "tax_input[$tax_name]";
+        endif;
         print $desc;
         $helps = __('Separate tags with commas.');
@@ -685 +764 @@
                 <div class="nojs-tags hide-if-js">
                 <p><?php _e('Add or remove tags'); ?></p>
-                <textarea name="<?php echo "tax_input[$tax_name]"; ?>" class="the-tags" id="tax-input[<?php echo $tax_name; ?>]"><?php echo esc_attr(implode(",", $tags)); ?></textarea></div>
+                <textarea name="<?php echo esc_html($textAreaName); ?>" class="the-tags" id="tax-input[<?php echo $tax_name; ?>]"><?php echo esc_attr(implode(",", $tags)); ?></textarea></div>
         
                 <div class="ajaxtag hide-if-no-js">
@@ -806 +885 @@
         $ret = array();
 
-        $users = $wpdb->get_results("SELECT * FROM $wpdb->users ORDER BY display_name");
+        $users = get_users_of_blog();
         if (is_array($users)) :
                 foreach ($users as $user) :
@@ -849 +928 @@
                 ?>
                 <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'); ?>);
@@ -891 +978 @@
         
         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 inputBox = jQuery("<?php print $id; ?>");
                                 var boxEl = inputBox.get(0);
                                 if (boxEl.value==boxEl.defaultValue) { inputBox.addClass('form-input-tip'); }
@@ -1070 +1160 @@
                                 <?php endif; ?>
 
-        <td><?php print $lastUpdated; ?>
+        <td><div style="float: right; padding-left: 10px">
+        <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 $errorsSince; ?>
         <?php print $nextUpdate; ?>

trunk/blogs/wp-content/plugins/feedwordpress/authors-page.php

@@ -6 +6 @@
         var $rule_count = 0;
         
-        function FeedWordPressAuthorsPage ($link) {
+        function FeedWordPressAuthorsPage ($link = -1) {
+                if (is_numeric($link) and -1 == $link) :
+                        $link = FeedWordPressAdminPage::submitted_link();
+                endif;
+
                 FeedWordPressAdminPage::FeedWordPressAdminPage('feedwordpressauthors', $link);
                 $this->refresh_author_list();
                 $this->dispatch = 'feedwordpress_author_settings';
                 $this->filename = __FILE__;
+
+                $this->pagenames = array(
+                        'default' => 'Authors',
+                        'settings-update' => 'Syndicated Authors',
+                        'open-sheet' => 'Syndicated Author',
+                );
         }
         
@@ -22 +32 @@
 
                 if ($page->for_feed_settings()) :
-                        $key = $link->setting('unfamiliar author', NULL, 'site-default');
+                        $key = $this->link->setting('unfamiliar author', NULL, 'site-default');
                         $unfamiliar['site-default'] = '';
                 else :
@@ -35 +45 @@
                 ?>
 <table class="form-table">
-<tbody>
-<tr>
-  <th>New authors</th>
-  <td><span>Authors who haven't been syndicated before</span>
-  <select style="max-width: 27.0em" id="unfamiliar-author" name="unfamiliar_author" onchange="contextual_appearance('unfamiliar-author', 'unfamiliar-author-newuser', 'unfamiliar-author-default', 'newuser', 'inline');">
-<?php if ($page->for_feed_settings()) : ?>
-    <option value="site-default"<?php print $unfamiliar['site-default']; ?>>are handled according to the default for all feeds</option>
-<?php endif; ?>
-    <option value="create"<?php print $unfamiliar['create']; ?>>will have a new author account created for them</option>
-    <?php foreach ($page->authorlist as $author_id => $author_name) : ?>
-      <option value="<?php echo $author_id; ?>"<?php print (isset($unfamiliar[$author_id]) ? $unfamiliar[$author_id] : ''); ?>>will have their posts attributed to <?php echo $author_name; ?></option>
+<?php
+if ($page->for_feed_settings()) :
+        $map = $this->link->setting('map authors', NULL, array());
+?>
+<tr><th>Matching authors</th>
+<td><p>How should FeedWordPress attribute posts from this feed to WordPress
+authors?</p>
+<ul class="settings">
+<li><p><input type="radio" name="author_rules_name[all]" value="*"
+<?php if (isset($map['name']['*'])) : $author_action = $map['name']['*']; ?>
+        checked="checked"
+<?php else : $author_action = NULL; ?>
+<?php endif; ?>
+        /> All posts syndicated
+from this feed <select class="author-rules" id="author-rules-all"
+name="author_rules_action[all]" onchange="contextual_appearance('author-rules-all', 'author-rules-all-newuser', 'author-rules-all-default', 'newuser', 'inline');">
+    <?php foreach ($page->authorlist as $local_author_id => $local_author_name) : ?>
+    <option value="<?php echo $local_author_id; ?>"<?php if ($local_author_id==$author_action) : echo ' selected="selected"'; endif; ?>>are assigned to <?php echo $local_author_name; ?></option>
     <?php endforeach; ?>
-    <option value="newuser">will have their posts attributed to a new user...</option>
-    <option value="filter"<?php print $unfamiliar['filter'] ?>>get filtered out</option>
+    <option value="newuser">will be assigned to a new user...</option>
+    <option value="filter"<?php if ('filter'==$author_action) : echo ' selected="selected"'; endif; ?>>get filtered out</option>
   </select>
-
-  <span id="unfamiliar-author-newuser">named <input type="text" name="unfamiliar_author_newuser" value="" /></span></p>
-  </td>
-</tr>
-
-<?php
-if ($page->for_feed_settings()) :
+  <span class="author-rules-newuser" id="author-rules-all-newuser">named
+  <input type="text" name="author_rules_newuser[all]" value="" /></span></p></li>
+<li><p><input type="radio" name="author_rules_name[all]" value=""
+<?php if (!isset($map['name']['*'])) : ?>
+        checked="checked"
+<?php endif; ?>
+/> Attribute posts to authors based on automatic mapping rules. (Blank out a
+name to delete the rule. Fill in a new name at the bottom to create a new rule.)</p>
+
+<table style="width: 100%">
+<?php
+        if (isset($this->link->settings['map authors'])) :
 ?>
-<tr><th>Syndicated authors</th>
-<td>For attributing posts by specific authors. Blank out a name to delete the rule. Fill in a new name at the bottom to create a new rule.</p>
-<table style="width: 100%">
-<?php
-        if (isset($link->settings['map authors'])) :
-?>
 <?php
                 $page->rule_count=0;
-                foreach ($link->settings['map authors'] as $author_rules) :
+                foreach ($this->link->settings['map authors'] as $author_rules) :
                         foreach ($author_rules as $author_name => $author_action) :
-                                $page->rule_count++; 
+                                if ($author_name != '*') :
+                                        $page->rule_count++; 
 ?>
 <tr>
 <th style="text-align: left; width: 15.0em">Posts by <input type="text" name="author_rules_name[]" value="<?php echo htmlspecialchars($author_name); ?>" size="11" /></th>
   <td>
-  <select id="author-rules-<?php echo $page->rule_count; ?>" name="author_rules_action[]" onchange="contextual_appearance('author-rules-<?php echo $page->rule_count; ?>', 'author-rules-<?php echo $page->rule_count; ?>-newuser', 'author-rules-<?php echo $page->rule_count; ?>-default', 'newuser', 'inline');">
+  <select class="author-rules" id="author-rules-<?php echo $page->rule_count; ?>" name="author_rules_action[]" onchange="contextual_appearance('author-rules-<?php echo $page->rule_count; ?>', 'author-rules-<?php echo $page->rule_count; ?>-newuser', 'author-rules-<?php echo $page->rule_count; ?>-default', 'newuser', 'inline');">
     <?php foreach ($page->authorlist as $local_author_id => $local_author_name) : ?>
     <option value="<?php echo $local_author_id; ?>"<?php if ($local_author_id==$author_action) : echo ' selected="selected"'; endif; ?>>are assigned to <?php echo $local_author_name; ?></option>
@@ -81 +98 @@
   </select>
   
-  <span id="author-rules-<?php echo $page->rule_count; ?>-newuser">named <input type="text" name="author_rules_newuser[]" value="" /></span>
+  <span class="author-rules-newuser" id="author-rules-<?php echo $page->rule_count; ?>-newuser">named <input type="text" name="author_rules_newuser[]" value="" /></span>
   </td>
 </tr>
-<?php                   endforeach;
+<?php
+                                endif;
+                        endforeach;
                 endforeach;
         endif;
@@ -103 +122 @@
    </td>
 </tr>
-</table>
+
+<tr>
+<th style="text-align: left; width: 15.0em">Unmatched authors</th>
+<td>
+<span>Authors who haven't been syndicated before</span>
+  <select style="max-width: 27.0em" id="unfamiliar-author" name="unfamiliar_author" onchange="contextual_appearance('unfamiliar-author', 'unfamiliar-author-newuser', 'unfamiliar-author-default', 'newuser', 'inline');">
+<?php if ($page->for_feed_settings()) : ?>
+    <option value="site-default"<?php print $unfamiliar['site-default']; ?>>are handled according to the default for all feeds</option>
+<?php endif; ?>
+    <option value="create"<?php print $unfamiliar['create']; ?>>will have a new author account created for them</option>
+    <?php foreach ($page->authorlist as $author_id => $author_name) : ?>
+      <option value="<?php echo $author_id; ?>"<?php print (isset($unfamiliar[$author_id]) ? $unfamiliar[$author_id] : ''); ?>>will have their posts attributed to <?php echo $author_name; ?></option>
+    <?php endforeach; ?>
+    <option value="newuser">will have their posts attributed to a user named ...</option>
+    <option value="filter"<?php print $unfamiliar['filter'] ?>>get filtered out</option>
+  </select>
+
+  <span id="unfamiliar-author-newuser"><input type="text" name="unfamiliar_author_newuser" value="" /></span></p>
+</td>
+</tr>
+</table></li>
+</ul>
+
 </td>
 </tr>
@@ -156 +197 @@
                 <?php
         } /* FeedWordPressAuthorsPage::fix_authors_box () */
-} /* class FeedWordPressAuthorsPage */
-
-function fwp_authors_page () {
-        global $wpdb, $wp_db_version;
-
-        if (FeedWordPress::needs_upgrade()) :
-                fwp_upgrade_page();
-                return;
-        endif;
-
-        FeedWordPressCompatibility::validate_http_request(/*action=*/ 'feedwordpress_author_settings', /*capability=*/ 'manage_links');
-
-        $link = FeedWordPressAdminPage::submitted_link();
-        $authorsPage = new FeedWordPressAuthorsPage($link);
-
-        $mesg = null;
-        $updated_link = false;
-
-        if (isset($GLOBALS['fwp_post']['fix_mismatch'])) :
-                if ('newuser'==$GLOBALS['fwp_post']['fix_mismatch_to']) :
-                        $newuser_name = trim($GLOBALS['fwp_post']['fix_mismatch_to_newuser']);
-                        $fix_mismatch_to_id = fwp_insert_new_user($newuser_name);
+
+        function display () {
+                $this->boxes_by_methods = array(
+                'syndicated_authors_box' => __('Syndicated Authors'),
+                'fix_authors_box' => __('Reassign Authors'),
+                );
+                if ($this->for_default_settings()) :
+                        unset($this->boxes_by_methods['fix_authors_box']);
+                endif;
+
+                parent::display();
+                ?>
+<script type="text/javascript">
+        contextual_appearance('unfamiliar-author', 'unfamiliar-author-newuser', 'unfamiliar-author-default', 'newuser', 'inline');
+</script>
+
+<?php           if ($this->for_feed_settings()) : ?>
+<script type="text/javascript">
+        jQuery('.author-rules').each ( function () {
+                contextual_appearance(this.id, this.id+'-newuser', this.id+'-default', 'newuser', 'inline');
+        } );
+
+        contextual_appearance('add-author-rule', 'add-author-rule-newuser', 'add-author-rule-default', 'newuser', 'inline');
+        contextual_appearance('fix-mismatch-to', 'fix-mismatch-to-newuser', null, 'newuser', 'inline');
+</script>
+<?php           else : ?>
+<script type="text/javascript">
+        contextual_appearance('match-author-by-email', 'unless-null-email', null, 'yes', 'block', /*checkbox=*/ true);
+</script>
+<?php           endif;
+        } /* FeedWordPressAuthorsPage::display () */
+
+        function accept_POST ($post) {
+                if (isset($post['fix_mismatch']) and (strlen($post['fix_mismatch']) > 0)) :
+                        $this->fix_mismatch($post);
                 else :
-                        $fix_mismatch_to_id = $GLOBALS['fwp_post']['fix_mismatch_to'];
-                endif;
-                $fix_mismatch_from_id = (int) $GLOBALS['fwp_post']['fix_mismatch_from'];
-                if (is_numeric($fix_mismatch_from_id)) :
-                        // Make a list of all the items by this author syndicated from this feed...
+                        parent::accept_POST($post);
+                endif;
+        }
+
+        function fix_mismatch ($post) {
+                global $wpdb;
+
+                if ('newuser'==$post['fix_mismatch_to']) :
+                        $newuser_name = trim($post['fix_mismatch_to_newuser']);
+                        $to = fwp_insert_new_user($newuser_name);
+                else :
+                        $to = $post['fix_mismatch_to'];
+                endif;
+
+                $from = (int) $post['fix_mismatch_from'];
+                if (is_numeric($from)) :
+                        // Make a list of all the items by this author
+                        // syndicated from this feed...
                         $post_ids = $wpdb->get_col("
                         SELECT {$wpdb->posts}.id
@@ -189 +256 @@
                         WHERE ({$wpdb->posts}.id = {$wpdb->postmeta}.post_id)
                         AND {$wpdb->postmeta}.meta_key = 'syndication_feed_id'
-                        AND {$wpdb->postmeta}.meta_value = '{$link->id}'
-                        AND {$wpdb->posts}.post_author = '{$fix_mismatch_from_id}'
+                        AND {$wpdb->postmeta}.meta_value = '{$this->link->id}'
+                        AND {$wpdb->posts}.post_author = '{$from}'
                         ");
                         
                         if (count($post_ids) > 0) :
+                                $N = count($post_ids);
+                                $posts = 'post'.(($N==1) ? '' : 's');
+
                                 // Re-assign them all to the correct author
-                                if (is_numeric($fix_mismatch_to_id)) : // re-assign to a particular user
+                                if (is_numeric($to)) : // re-assign to a particular user
                                         $post_set = "(".implode(",", $post_ids).")";
                                         
@@ -203 +273 @@
                                         $wpdb->query("
                                         UPDATE {$wpdb->posts}
-                                        SET post_author='{$fix_mismatch_to_id}'
+                                        SET post_author='{$to}'
                                         WHERE ({$wpdb->posts}.id IN $post_set
                                         $parent_in_clause)
                                         ");
-                                        $mesg = "Re-assigned ".count($post_ids)." post".((count($post_ids)==1)?'':'s').".";
+                                        $this->mesg = sprintf(__("Re-assigned %d ${posts}."), $N);
 
                                 // ... and kill them all
-                                elseif ($fix_mismatch_to_id=='filter') :
+                                elseif ('filter'==$to) :
                                         foreach ($post_ids as $post_id) :
                                                 wp_delete_post($post_id);
-                                        endforeach;                                             
-                                        $mesg = "Deleted ".count($post_ids)." post".((count($post_ids)==1)?'':'s').".";
+                                        endforeach;
+                        
+                                        $this->mesg = sprintf(__("Deleted %d ${posts}."), $N);
                                 endif;
                         else :
-                                $mesg = "Couldn't find any posts that matched your criteria.";
-                        endif;
-                endif;
-                $updated_link = false;
-        elseif (isset($GLOBALS['fwp_post']['save'])) :
-                if (is_object($link) and $link->found()) :
+                                $this->mesg = __("Couldn't find any posts that matched your criteria.");
+                        endif;
+                endif;
+                $this->updated = false;
+        }
+
+        function save_settings ($post) {
+
+                if ($this->for_feed_settings()) :
                         $alter = array ();
 
                         // Unfamiliar author rule
-                        if (isset($GLOBALS['fwp_post']["unfamiliar_author"])) :
-                                if ('site-default'==$GLOBALS['fwp_post']["unfamiliar_author"]) :
-                                        unset($link->settings["unfamiliar author"]);
-                                elseif ('newuser'==$GLOBALS['fwp_post']["unfamiliar_author"]) :
-                                        $newuser_name = trim($GLOBALS['fwp_post']["unfamiliar_author_newuser"]);
-                                        $link->map_name_to_new_user(/*name=*/ NULL, $newuser_name);
+                        if (isset($post["unfamiliar_author"])) :
+                                if ('newuser'==$post['unfamiliar_author']) :
+                                        $new_name = trim($post["unfamiliar_author_newuser"]);
+                                        $this->link->map_name_to_new_user(/*name=*/ NULL, $new_name);
                                 else :
-                                        $link->settings["unfamiliar author"] = $GLOBALS['fwp_post']["unfamiliar_author"];
+                                        $this->link->update_setting(
+                                                "unfamiliar author",
+                                                $post['unfamiliar_author'],
+                                                'site-default'
+                                        );
                                 endif;
                         endif;
                         
                         // Handle author mapping rules
-                        if (isset($GLOBALS['fwp_post']['author_rules_name']) and isset($GLOBALS['fwp_post']['author_rules_action'])) :
-                                unset($link->settings['map authors']);
-                                foreach ($GLOBALS['fwp_post']['author_rules_name'] as $key => $name) :
+                        if (isset($post['author_rules_name'])
+                        and isset($post['author_rules_action'])) :
+                                if (isset($post['author_rules_name']['all'])) :
+                                        if (strlen($post['author_rules_name']['all']) > 0) :
+                                                $post['author_rules_name'] = array(
+                                                        'all' => $post['author_rules_name']['all'],
+                                                );
+                                                
+                                                // Erase all the rest.
+                                        endif;
+                                endif;
+                                
+                                unset($this->link->settings['map authors']);
+                                foreach ($post['author_rules_name'] as $key => $name) :
                                         // Normalize for case and whitespace
                                         $name = strtolower(trim($name));
-                                        $author_action = strtolower(trim($GLOBALS['fwp_post']['author_rules_action'][$key]));
+                                        $author_action = strtolower(trim($post['author_rules_action'][$key]));
                                         
                                         if (strlen($name) > 0) :
                                                 if ('newuser' == $author_action) :
-                                                        $newuser_name = trim($GLOBALS['fwp_post']['author_rules_newuser'][$key]);
-                                                        $link->map_name_to_new_user($name, $newuser_name);
+                                                        $new_name = trim($post['author_rules_newuser'][$key]);
+                                                        $this->link->map_name_to_new_user($name, $new_name);
                                                 else :
-                                                        $link->settings['map authors']['name'][$name] = $author_action;
+                                                        $this->link->settings['map authors']['name'][$name] = $author_action;
                                                 endif;
                                         endif;
@@ -256 +343 @@
                         endif;
 
-                        if (isset($GLOBALS['fwp_post']['add_author_rule_name']) and isset($GLOBALS['fwp_post']['add_author_rule_action'])) :
-                                $name = strtolower(trim($GLOBALS['fwp_post']['add_author_rule_name']));
-                                $author_action = strtolower(trim($GLOBALS['fwp_post']['add_author_rule_action']));
+                        if (isset($post['add_author_rule_name'])
+                        and isset($post['add_author_rule_action'])) :
+                                $name = strtolower(trim($post['add_author_rule_name']));
+                                $author_action = strtolower(trim($post['add_author_rule_action']));
+                                
                                 if (strlen($name) > 0) :
                                         if ('newuser' == $author_action) :
-                                                $newuser_name = trim($GLOBALS['fwp_post']['add_author_rule_newuser']);
-                                                $link->map_name_to_new_user($name, $newuser_name);
+                                                $new_name = trim($post['add_author_rule_newuser']);
+                                                $this->link->map_name_to_new_user($name, $new_name);
                                         else :
-                                                $link->settings['map authors']['name'][$name] = $author_action;
+                                                $this->link->settings['map authors']['name'][$name] = $author_action;
                                         endif;
                                 endif;
                         endif;
-                        
-                        // Save settings
-                        $link->save_settings(/*reload=*/ true);
-                        $updated_link = true;
-                        
-                        // Reset, reload
-                        $link_id = $link->id;
-                        unset($link);
-                        $link = new SyndicatedLink($link_id);
                 else :
-                        if ('newuser'==$GLOBALS['fwp_post']['unfamiliar_author']) :
-                                $newuser_name = trim($GLOBALS['fwp_post']['unfamiliar_author_newuser']);
-                                $newuser_id = fwp_insert_new_user($newuser_name);
-                                if (is_numeric($newuser_id)) :
-                                        update_option('feedwordpress_unfamiliar_author', $newuser_id);
+                        if ('newuser'==$post['unfamiliar_author']) :
+                                $new_name = trim($post['unfamiliar_author_newuser']);
+                                $new_id = fwp_insert_new_user($new_name);
+                                if (is_numeric($new_id)) :
+                                        update_option('feedwordpress_unfamiliar_author', $new_id);
                                 else :
                                         // TODO: Add some error detection and reporting
+                                        // Put WP_Error stuff into $this->mesg ?
                                 endif;
                         else :
-                                update_option('feedwordpress_unfamiliar_author', $GLOBALS['fwp_post']['unfamiliar_author']);
-                        endif;
-
-                        if (isset($GLOBALS['fwp_post']['match_author_by_email']) and $GLOBALS['fwp_post']['match_author_by_email']=='yes') :
-                                update_option('feedwordpress_do_not_match_author_by_email', 'no');
-                        else :
-                                update_option('feedwordpress_do_not_match_author_by_email', 'yes');
-                        endif;
-
-                        if (isset($GLOBALS['fwp_post']['null_emails'])) :
-                                update_option('feedwordpress_null_email_set', $GLOBALS['fwp_post']['null_emails']);
-                        endif;
-                        
-                        $updated_link = true;
-                endif;
-
-                do_action('feedwordpress_admin_page_authors_save', $GLOBALS['fwp_post'], $authorsPage);
-                $authorsPage->refresh_author_list();
-        else :
-                $updated_link = false;
-        endif;
-        
-        ////////////////////////////////////////////////
-        // Prepare settings page ///////////////////////
-        ////////////////////////////////////////////////
-
-        if ($updated_link) :
-?>
-<div class="updated"><p>Syndicated author settings updated.</p></div>
-<?php elseif (!is_null($mesg)) : ?>
-<div class="updated"><p><?php print esc_html($mesg); ?></p></div>
-<?php endif;
-
-        if (function_exists('add_meta_box')) :
-                add_action(
-                        FeedWordPressCompatibility::bottom_script_hook(__FILE__),
-                        /*callback=*/ array($authorsPage, 'fix_toggles'),
-                        /*priority=*/ 10000
-                );
-                FeedWordPressSettingsUI::ajax_nonce_fields();
-        endif;
-
-        $authorsPage->open_sheet('Syndicated Author');
-        ?>
-        <div id="post-body">
-        <?php
-        ////////////////////////////////////////////////
-        // Display settings boxes //////////////////////
-        ////////////////////////////////////////////////
-
-        $boxes_by_methods = array(
-                'syndicated_authors_box' => __('Syndicated Authors'),
-                'fix_authors_box' => __('Reassign Authors'),
-        );
-        if ($authorsPage->for_default_settings()) :
-                unset($boxes_by_methods['fix_authors_box']);
-        endif;
-
-        foreach ($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('FeedWordPressAuthorsPage', $method),
-                        /*page=*/ $authorsPage->meta_box_context(),
-                        /*context=*/ $authorsPage->meta_box_context()
-                );
-        endforeach;
-        do_action('feedwordpress_admin_page_authors_meta_boxes', $authorsPage);
-?>
-        <div class="metabox-holder">
-<?php
-        fwp_do_meta_boxes($authorsPage->meta_box_context(), $authorsPage->meta_box_context(), $authorsPage);
-?>
-        </div> <!-- class="metabox-holder" -->
-</div> <!-- id="post-body" -->
-<?php $authorsPage->close_sheet(); ?>
-
-<script type="text/javascript">
-        contextual_appearance('unfamiliar-author', 'unfamiliar-author-newuser', 'unfamiliar-author-default', 'newuser', 'inline');
-<?php if (is_object($link) and $link->found()) : ?>
-<?php   for ($j=1; $j<=$authorsPage->rule_count; $j++) : ?>
-        contextual_appearance('author-rules-<?php echo $j; ?>', 'author-rules-<?php echo $j; ?>-newuser', 'author-rules-<?php echo $j; ?>-default', 'newuser', 'inline');
-<?php   endfor; ?>
-        contextual_appearance('add-author-rule', 'add-author-rule-newuser', 'add-author-rule-default', 'newuser', 'inline');
-        contextual_appearance('fix-mismatch-to', 'fix-mismatch-to-newuser', null, 'newuser', 'inline');
-<?php else : ?>
-        contextual_appearance('match-author-by-email', 'unless-null-email', null, 'yes', 'block', /*checkbox=*/ true);
-<?php endif; ?>
-</script>
-<?php
-} /* function fwp_authors_page () */
-
-        fwp_authors_page();
-
+                                update_option('feedwordpress_unfamiliar_author', $post['unfamiliar_author']);
+                        endif;
+
+                        update_option('feedwordpress_do_not_match_author_by_email',
+                                (isset($post['match_author_by_email'])
+                                 and 'yes'==$post['match_author_by_email'])
+                                ? 'no'
+                                : 'yes'
+                        );
+
+                        if (isset($post['null_emails'])) :
+                                update_option('feedwordpress_null_email_set', $post['null_emails']);
+                        endif;
+                endif;
+
+                parent::save_settings($post);
+                $this->refresh_author_list();
+        }
+} /* class FeedWordPressAuthorsPage */
+
+        $authorsPage = new FeedWordPressAuthorsPage;
+        $authorsPage->display();
+

trunk/blogs/wp-content/plugins/feedwordpress/categories-page.php

@@ -458 +458 @@
                         <h4>Site-wide <?php print $taxonomy->labels->name; ?></h4>
                         <?php if (count($globalCats) > 0) : ?>
-                        <ul class="current-setting">
-                        <?php
-                        foreach ($globalDogs as $dog) :
-                        ?>
-                        <li><?php $cat = get_term($dog, $tax); print $cat->name; ?></li>
-                        <?php endforeach; ?>
-                        </ul>
-                        </div>
-                        <p>
+                          <ul class="current-setting">
+                          <?php foreach ($globalDogs as $dog) : ?>
+                            <li><?php $cat = get_term($dog, $tax); print $cat->name; ?></li>
+                          <?php endforeach; ?>
+                          </ul>
+                          </div>
+                          <p>
                         <?php else : ?>
-                        <p>Site-wide settings may also assign categories to syndicated
+                          <p>Site-wide settings may also assign categories to syndicated
                         posts.
                         <?php endif; ?>
@@ -477 +475 @@
                         <ul class="settings">
                         <li><p><label><input type="radio" name="add_global[<?php print $tax; ?>]" value="yes" <?php print $checked['yes']; ?> /> Yes. Place <?php print $page->these_posts_phrase(); ?> under all these categories.</label></p></li>
-                        <li><p><label><input type="radio" name="add_global[<?php print $tax; ?>]" value="no" <?php print $checked['no']; ?> /> No. Only use the categories I set up on the left. Do not ise the global defaults for <?php print $page->these_posts_phrase(); ?></label></p></li>
+                        <li><p><label><input type="radio" name="add_global[<?php print $tax; ?>]" value="no" <?php print $checked['no']; ?> /> No. Only use the categories I set up on the left. Do not use the global defaults for <?php print $page->these_posts_phrase(); ?></label></p></li>
                         </ul>
                         </td>

trunk/blogs/wp-content/plugins/feedwordpress/compatability.php

@@ -5 +5 @@
 
 class FeedWordPressCompatibility {
-        // version testing based on database schema version
+
+        /**
+         * FeedWordPressCompatibility::test_version: test version of WordPress
+         * based on the database schema version.
+         *
+         * @param int $floor The minimum version necessary
+         * @param mixed $ceiling The first version that is too high. If omitted
+         *      or NULL, no version is too high.
+         * @return bool TRUE if within the range of versions, FALSE if too low
+         *      or too high.
+         */
         /*static*/ function test_version ($floor, $ceiling = null) {
                 global $wp_db_version;
@@ -20 +30 @@
                 global $wpdb;
 
-                $name = $wpdb->escape($name);
-
                 // WordPress 2.3+ term/taxonomy API
                 $term = wp_insert_term($name, 'link_category');
-                $cat_id = $term['term_id'];
-                
+
+                // OK: returned array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id)
+                if (!is_wp_error($term)) :
+                        $cat_id = $term['term_id'];
+
+                // Error: term with this name already exists. Well, let's use that then.
+                elseif ($term->get_error_code() == 'term_exists') :
+                        // Already-existing term ID is returned in data field
+                        $cat_id = $term->get_error_data('term_exists');
+
+                // Error: another kind of error, harder to recover from. Return WP_Error.
+                else :
+                        $cat_id = $term;
+                endif;
+        
                 // Return newly-created category ID
                 return $cat_id;
@@ -121 +142 @@
                 return __checked_selected_helper( $disabled, $current, $echo, 'disabled' );
         }
+} /* if */
+
+// Compat
+
+if (!function_exists('set_post_field')) {
+
+        /**
+         * Update data from a post field based on Post ID
+         *
+         * Examples of the post field will be, 'post_type', 'post_status', 'post_content', etc.
+         *
+         * The context values are based off of the taxonomy filter functions and
+         * supported values are found within those functions.
+         *
+         * @uses sanitize_post_field()
+         *
+         * @param string $field Post field name
+         * @param mixed $value New value for post field
+         * @param id $post Post ID
+         * @return bool Result of UPDATE query
+         *
+         * Included under terms of GPL from WordPress Ticket #10946 <http://core.trac.wordpress.org/attachment/ticket/10946/post.php.diff>
+         */
+        function set_post_field ($field, $value, $post_id) {
+                global $wpdb; 
+
+                $post_id = absint($post_id);
+                // sigh ... when FWP is active, I need to avoid avoid_kses_munge
+                // $value = sanitize_post_field($field, $value, $post_id, 'db'); 
+                return $wpdb->update($wpdb->posts, array($field => $value), array('ID' => $post_id));
+        } /* function set_post_field () */
+
 } /* if */
 
@@ -141 +194 @@
         endif;
         
-        $walker = new FeedWordPress_Walker_Category_Checklist;
+        $walker = new FeedWordPress_Walker_Category_Checklist($params);
         $walker->set_prefix($prefix);
         $walker->set_taxonomy($taxonomy); 

trunk/blogs/wp-content/plugins/feedwordpress/diagnostics-page.php

@@ -40 +40 @@
                 <?php
                 $boxes_by_methods = array(
-                        'diagnostics_box' => __('Diagnostics'),
+                        'info_box' => __('Diagnostic Information'),
+                        'diagnostics_box' => __('Display Diagnostics'),
                         'updates_box' => __('Updates'),
                 );
@@ -83 +84 @@
                         update_option('feedwordpress_diagnostics_show', $post['diagnostics_show']);
 
+                        if ($post['diagnostics_show']
+                        and in_array('updated_feeds:errors:persistent', $post['diagnostics_show'])) :
+                                update_option('feedwordpress_diagnostics_persistent_errors_hours', (int) $post['diagnostics_persistent_error_hours']);
+                        else :
+                                delete_option('feedwordpress_diagnostics_persistent_errors_hours');
+                        endif;
+                        
+                        if (in_array('email', $post['diagnostics_output'])) :
+                                $ded = $post['diagnostics_email_destination'];
+                                if ('mailto'==$ded) :
+                                        $ded .= ':'.$post['diagnostics_email_destination_address'];
+                                endif;
+
+                                update_option('feedwordpress_diagnostics_email_destination', $ded);
+                        else :
+                                delete_option('feedwordpress_diagnostics_email_destination');
+                        endif;
+                        
                         $this->updated = true; // Default update message
                 endif;
         } /* FeedWordPressDiagnosticsPage::accept_POST () */
 
-        /*static*/ function diagnostics_box ($page, $box = NULL) {
+        function info_box ($page, $box = NULL) {
+                        $link_category_id = FeedWordPress::link_category_id();
+                ?>
+                <table class="edit-form narrow">
+                <thead style="display: none">
+                <th scope="col">Topic</th>
+                <th scope="col">Information</th>
+                </thead>
+
+                <tbody>
+                <tr>
+                <th scope="row">Version:</th>
+                <td>You are using FeedWordPress version <strong><?php print FEEDWORDPRESS_VERSION; ?></strong>.</td>
+                </tr>
+
+                <tr>
+                <th scope="row">Link Category:</th>
+                <td><?php if (!is_wp_error($link_category_id)) :
+                        $term = get_term($link_category_id, 'link_category');
+                ?><p>Syndicated feeds are
+                kept in link category #<?php print $term->term_id; ?>, <strong><?php print $term->name; ?></strong>.</p>
+                <?php else : ?>
+                <p><strong>FeedWordPress has been unable to set up a valid Link Category
+                for syndicated feeds.</strong> Attempting to set one up returned an
+                <code><?php $link_category_id->get_error_code(); ?></code> error with this
+                additional data:</p>
+                <table>
+                <tbody>
+                <tr>
+                <th scope="row">Message:</th>
+                <td><?php print $link_category_id->get_error_message(); ?></td>
+                </tr>
+                <?php $data = $link_category_id->get_error_data(); if (!empty($data)) : ?>
+                <tr>
+                <th scope="row">Auxiliary Data:</th>
+                <td><pre><?php print esc_html(FeedWordPress::val($link_category_id->get_error_data())); ?></pre></td>
+                </tr>
+                <?php endif; ?>
+                </table>
+                <?php endif; ?></td>
+                </tr>
+                </table>
+
+                <?php
+        } /* FeedWordPressDiagnosticsPage::info_box () */
+        
+        function diagnostics_box ($page, $box = NULL) {
                 $settings = array();
                 $settings['debug'] = (get_option('feedwordpress_debug')=='yes');
 
                 $diagnostics_output = get_option('feedwordpress_diagnostics_output', array());
+                
+                $users = fwp_author_list();
+
+                $ded = get_option('feedwordpress_diagnostics_email_destination', 'admins');
+
+                if (preg_match('/^mailto:(.*)$/', $ded, $ref)) :
+                        $ded_addy = $ref[1];
+                else :
+                        $ded_addy = NULL;
+                endif;
                 
                 // Hey ho, let's go...
@@ -117 +192 @@
 <li><input type="checkbox" name="diagnostics_output[]" value="echo" <?php print (in_array('echo', $diagnostics_output) ? ' checked="checked"' : ''); ?> /> Echo in web browser as they are issued</label></li>
 <li><input type="checkbox" name="diagnostics_output[]" value="echo_in_cronjob" <?php print (in_array('echo_in_cronjob', $diagnostics_output) ? ' checked="checked"' : ''); ?> /> Echo to output when they are issued during an update cron job</label></li>
-<li><input type="checkbox" name="diagnostics_output[]" value="email" <?php print (in_array('email', $diagnostics_output) ? ' checked="checked"' : ''); ?> /> Send a daily email digest to the site administrator</label></li>
+<li><input type="checkbox" name="diagnostics_output[]" value="email" <?php print (in_array('email', $diagnostics_output) ? ' checked="checked"' : ''); ?> /> Send a daily email digest to:</label> <select name="diagnostics_email_destination" id="diagnostics-email-destination" size="1">
+<option value="admins"<?php if ('admins'==$ded) : ?> selected="selected"<?php endif; ?>>the site administrators</option>
+<?php foreach ($users as $id => $name) : ?>
+<option value="user:<?php print (int) $id; ?>"<?php if (sprintf('user:%d', (int) $id)==$ded) : ?> selected="selected"<?php endif; ?>><?php print esc_html($name); ?></option>
+<?php endforeach; ?>
+<option value="mailto"<?php if (!is_null($ded_addy)) : ?> selected="selected"<?php endif; ?>>another e-mail address...</option>
+</select>
+<input type="email" id="diagnostics-email-destination-address" name="diagnostics_email_destination_address" value="<?php print $ded_addy; ?>" placeholder="email address" /></li>
 </ul></td>
 </tr>
 </table>
+
+<script type="text/javascript">
+        contextual_appearance(
+                'diagnostics-email-destination',
+                'diagnostics-email-destination-address',
+                'diagnostics-email-destination-default',
+                'mailto',
+                'inline'
+        );
+        jQuery('#diagnostics-email-destination').change ( function () {
+                contextual_appearance(
+                        'diagnostics-email-destination',
+                        'diagnostics-email-destination-address',
+                        'diagnostics-email-destination-default',
+                        'mailto',
+                        'inline'
+                );
+        } );    
+</script>
                 <?php
         } /* FeedWordPressDiagnosticsPage::diagnostics_box () */
         
         /*static*/ function updates_box ($page, $box = NULL) {
-                $checked = array(
-                        'updated_feeds' => '', 'updated_feeds:errors' => '',
-                        'updated_feeds:errors:persistent' => '',
-                        "syndicated_posts" => '', 'syndicated_posts:meta_data' => '',
-                        'feed_items' => '',
-                        'memory_usage' => '',
-                );
+                $hours = get_option('feedwordpress_diagnostics_persistent_errors_hours', 2);
+                $fields = apply_filters('feedwordpress_diagnostics', array(
+                        'Update Diagnostics' => array(
+                                'updated_feeds' => 'as each feed checked for updates',
+                                'updated_feeds:errors:persistent' => 'when attempts to update a feed have resulted in errors</label> <label>for at least <input type="number" min="1" max="360" step="1" name="diagnostics_persistent_error_hours" value="'.$hours.'" /> hours',
+                                'updated_feeds:errors' => 'any time FeedWordPress encounters any errors while checking a feed for updates',
+                                'syndicated_posts' => 'as each syndicated post is added to the database',
+                                'feed_items' => 'as each syndicated item is considered on the feed',
+                                'memory_usage' => 'indicating how much memory was used',
+                        ),
+                        'Syndicated Post Details' => array(
+                                'syndicated_posts:meta_data' => 'as syndication meta-data is added on the post',
+                        ),
+                ), $page);
+                
+                foreach ($fields as $section => $items) :
+                        foreach ($items as $key => $label) :
+                                $checked[$key] = '';
+                        endforeach;
+                endforeach;
 
                 $diagnostics_show = get_option('feedwordpress_diagnostics_show', array());
@@ -141 +255 @@
                 ?>
 <table class="edit-form">
-<tr>
-<th scope="row">Update diagnostics:</th>
-<td><p>Show a diagnostic message...</p>
-<ul class="options">
-<li><label><input type="checkbox" name="diagnostics_show[]" value="updated_feeds" <?php print $checked['updated_feeds']; ?> /> as each feed checked for updates</label></li>
-<li><label><input type="checkbox" name="diagnostics_show[]" value="updated_feeds:errors:persistent" <?php print $checked['updated_feeds:errors:persistent'] ?> /> when FeedWordPress encounters repeated errors while checking a feed for updates</label></li>
-<li><label><input type="checkbox" name="diagnostics_show[]" value="updated_feeds:errors" <?php print $checked['updated_feeds:errors']; ?> /> any time FeedWordPress encounters any errors while checking a feed for updates</label></li>
-<li><label><input type="checkbox" name="diagnostics_show[]" value="syndicated_posts" <?php print $checked['syndicated_posts']; ?> /> as each syndicated post is added to the database</label></li>
-<li><label><input type="checkbox" name="diagnostics_show[]" value="feed_items" <?php print $checked['feed_items']; ?> /> as each syndicated item is considered on the feed</label></li>
-<li><label><input type="checkbox" name="diagnostics_show[]" value="memory_usage" <?php print $checked['memory_usage']; ?> /> indicating how much memory was used</label></li>
-</ul></td>
-</tr>
-<tr>
-<th>Syndicated post details:</th>
-<td><p>Show a diagnostic message...</p>
-<ul class="options">
-<li><label><input type="checkbox" name="diagnostics_show[]" value="syndicated_posts:meta_data" <?php print $checked['syndicated_posts:meta_data']; ?> /> as syndication meta-data is added on the post</label></li>
-</ul></td>
-</tr>
+        <?php foreach ($fields as $section => $ul) : ?>
+          <tr>
+          <th scope="row"><?php print esc_html($section); ?>:</th>
+          <td><p>Show a diagnostic message...</p>
+          <ul class="options">
+          <?php foreach ($ul as $key => $label) : ?>
+            <li><label><input
+                type="checkbox" name="diagnostics_show[]"
+                value="<?php print esc_html($key); ?>"
+                <?php print $checked[$key]; ?> />
+            <?php print $label; ?></label></li>
+          <?php endforeach; ?>
+          </ul></td>
+          </tr>
+        <?php endforeach; ?>
 </table>
                 <?php

trunk/blogs/wp-content/plugins/feedwordpress/feedfinder.class.php

@@ -166 +166 @@
                         $client = wp_remote_request($this->uri, array(
                                 'headers' => $headers,
-                                'timeout' => FEEDWORDPRESS_FETCH_TIME_OUT,
+                                'timeout' => FeedWordPress::fetch_timeout(),
                         ));
 

trunk/blogs/wp-content/plugins/feedwordpress/feeds-page.php

@@ -48 +48 @@
         var $updatedPosts = NULL;
 
-        /**
-         * Constructs the Feeds 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
-         */
-        function FeedWordPressFeedsPage ($link = -1) {
-                if (is_numeric($link) and -1 == $link) :
-                        $link = FeedWordPressAdminPage::submitted_link();
-                endif;
-
-                FeedWordPressAdminPage::FeedWordPressAdminPage('feedwordpressfeeds', $link);
-
-                $this->dispatch = 'feedwordpress_admin_page_feeds';
-                $this->pagenames = array(
-                        'default' => 'Feeds',
-                        'settings-update' => 'Syndicated feed',
-                        'open-sheet' => 'Feed and Update',
-                );
-                $this->filename = __FILE__;
-                $this->updatedPosts = new UpdatedPostsControl($this);
-        } /* FeedWordPressFeedsPage constructor */
-
         var $special_settings = array ( /* Regular expression syntax is OK here */
                 'cats',
                 'cat_split',
+                'fetch timeout',
                 'freeze updates',
                 'hardcode name',
@@ -85 +64 @@
                 'post status',
                 'postmeta',
+                'query parameters',
                 'resolve relative',
                 'syndicated post type',
@@ -92 +72 @@
                 'unfamiliar category',
                 'unfamiliar post_tag',
+                'add/.*',
                 'update/.*',
                 'feed/.*',
@@ -98 +79 @@
         );
 
+        /**
+         * Constructs the Feeds 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
+         */
+        function FeedWordPressFeedsPage ($link = -1) {
+                if (is_numeric($link) and -1 == $link) :
+                        $link = FeedWordPressAdminPage::submitted_link();
+                endif;
+
+                FeedWordPressAdminPage::FeedWordPressAdminPage('feedwordpressfeeds', $link);
+
+                $this->dispatch = 'feedwordpress_admin_page_feeds';
+                $this->pagenames = array(
+                        'default' => 'Feeds',
+                        'settings-update' => 'Syndicated feed',
+                        'open-sheet' => 'Feed and Update',
+                );
+                $this->filename = __FILE__;
+                $this->updatedPosts = new UpdatedPostsControl($this);
+                
+                $this->special_settings = apply_filters('syndicated_feed_special_settings', $this->special_settings, $this);
+        } /* FeedWordPressFeedsPage constructor */
+
         function display () {
                 global $fwp_post;
@@ -107 +112 @@
                         'updated_posts_box' => __('Updated Posts'),
                         'custom_settings_box' => __('Custom Feed Settings (for use in templates)'),
+                        'fetch_settings_box' => __('Settings for Fetching Feeds (Advanced)'),
                 );
                 if ($this->for_default_settings()) :
@@ -299 +305 @@
         } /* FeedWordPressFeedsPage::update_window_currently () */
         
+        function fetch_timeout_setting ($setting, $defaulted, $params) {
+                $timeout = intval($this->setting('fetch timeout', FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT));
+
+                if ($this->for_feed_settings()) :
+                        $article = 'this';
+                else :
+                        $article = 'a';
+                endif;
+                ?>
+                <p>Wait no more than
+                than <input name="fetch_timeout" type="number" min="0" size="3" value="<?php print $timeout; ?>" />
+                second(s) when trying to fetch <?php print $article; ?> feed to check for updates.</p>
+                <p>If <?php print $article; ?> source's web server does not respond before time runs
+                out, FeedWordPress will skip over the source and try again during
+                the next update cycle.</p>
+                <?php
+        }
+        function fetch_timeout_setting_value ($setting, $defaulted, $params) {
+                print number_format(intval($setting)) . " " . (($setting==1) ? "second" : "seconds");
+        }
+        
+        function fetch_settings_box ($page, $box = NULL) {
+                $this->setting_radio_control(
+                        'fetch timeout', 'fetch_timeout',
+                        array(&$this, 'fetch_timeout_setting'),
+                        array(
+                                'global-setting-default' => FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT,
+                                'input-name' => 'fetch_timeout',
+                                'default-input-name' => 'fetch_timeout_default',
+                                'labels' => array(&$this, 'fetch_timeout_setting_value'),
+                        )
+                );
+        } /* FeedWordPressFeedsPage::fetch_settings_box () */
+        
         function feed_information_box ($page, $box = NULL) {
                 global $wpdb;
+                $link_rss_params = maybe_unserialize($page->setting('query parameters', ''));
+                if (!is_array($link_rss_params)) :
+                        $link_rss_params = array();
+                endif;
+                
                 if ($page->for_feed_settings()) :
                         $info['name'] = esc_html($page->link->link->link_name);
@@ -354 +399 @@
                 (<a href="<?php echo FEEDVALIDATOR_URI; ?>?url=<?php echo urlencode($rss_url); ?>"
                 title="Check feed &lt;<?php echo esc_html($rss_url); ?>&gt; for validity">validate</a>)
-                <input type="submit" name="feedfinder" value="switch &rarr;" style="font-size:smaller" /></td>
+                <input type="submit" name="feedfinder" value="switch &rarr;" style="font-size:smaller" />
+                
+                <table id="link-rss-params">
+                <tbody>
+                <?php
+                $link_rss_params['new'] = array('', '');
+                $i = 0;
+                foreach ($link_rss_params as $index => $pair) :
+                ?>
+                <tr class="link-rss-params-row" id="link-rss-params-<?php print $index; ?>">
+                <td><label>Parameter: <input type="text" class="link_params_key"
+                name="link_rss_params_key[<?php print $index; ?>]" value="<?php print esc_html($pair[0]); ?>"
+                size="5" style="width: 5em" placeholder="name" /></label></td>
+                <td class="link-rss-params-value-cell"><label class="link_params_value_label">= <input type="text" class="link_params_value"
+                name="link_rss_params_value[<?php print $index; ?>]" value="<?php print esc_html($pair[1]); ?>"
+                size="8" placeholder="value" /></label></td>
+                </tr>
+                <?php
+                        $i++;
+                endforeach;
+                ?>
+                </tbody>
+                </table>
+                
+                <div><input type="hidden" id="link-rss-params-num" name="link_rss_params_num" value="<?php print $i; ?>" /></div>
+                
+                <script type="text/javascript">
+                function linkParamsRowRemove (element) {
+                        jQuery(element).closest('tr').fadeOut('slow', function () {
+                                jQuery(this).remove();
+                        } );
+                }
+
+                jQuery('<td><a href="#" class="add-remove link-rss-params-remove"><span class="x">(X)</span> Remove</a></td>').insertAfter('.link-rss-params-value-cell');
+
+                jQuery('#link-rss-params-new').hide();
+                jQuery('<a  class="add-remove" id="link-rss-params-add" href="#">+ Add a query parameter</a>').insertAfter('#link-rss-params');
+                jQuery('#link-rss-params-add').click( function () {
+                        var next = jQuery('#link-rss-params-num').val();
+                        var newRow = jQuery('#link-rss-params-new').clone().attr('id', 'link-rss-params-'+next);
+                        newRow.find('.link_params_key').attr('name', 'link_rss_params_key['+next+']');
+                        newRow.find('.link_params_value').attr('name', 'link_rss_params_value['+next+']');
+                        
+                        newRow.find('.link-rss-params-remove').click( function () {
+                                linkParamsRowRemove(this);
+                                return false;
+                        } );
+
+                        newRow.appendTo('#link-rss-params');
+                        newRow.show();
+                        
+                        // Update counter for next row.
+                        next++;
+                        jQuery('#link-rss-params-num').val(next);
+
+                        return false;
+                } );
+                jQuery('.link-rss-params-remove').click( function () {
+                        linkParamsRowRemove(this);
+                        return false;
+                } );
+                </script>
+                </td>
                 </tr>
 
@@ -736 +843 @@
         function save_settings ($post) {
                 if ($this->for_feed_settings()) :
+                        if (isset($post['link_rss_params_key'])) :
+                                $qp = array();
+                                foreach ($post['link_rss_params_key'] as $index => $key) :
+                                        if (strlen($key) > 0) :
+                                                if (isset($post['link_rss_params_value'][$index])
+                                                and strlen($post['link_rss_params_value'][$index])) :
+                                                        $value = $post['link_rss_params_value'][$index];
+                                                        $qp[] = array($key, $value);
+                                                endif;
+                                        endif;
+                                endforeach;
+                                $this->update_setting('query parameters', serialize($qp));
+                        endif;
+                        
                         // custom feed settings first
                         foreach ($post['notes'] as $mn) :
@@ -804 +925 @@
                                 update_option("feedwordpress_hardcode_{$what}", $hardcode);
                         endforeach;
+                        
+                endif;
+                
+                if (isset($post['fetch_timeout'])) :
+                        if (isset($post['fetch_timeout_default']) and $post['fetch_timeout_default']=='yes') :
+                                $timeout = NULL;
+                        else :
+                                $timeout = $post['fetch_timeout'];
+                        endif;
+
+                        if (is_int($timeout)) :
+                                $timeout = intval($timeout);
+                        endif;
+                        $this->update_setting('fetch timeout', $timeout);
                 endif;
                 

trunk/blogs/wp-content/plugins/feedwordpress/feedtime.class.php

@@ -104 +104 @@
                                 # zulu time, aka GMT
                         else :
-                                $tz_mod = $match[12];
-                                $tz_hour = $match[13];
-                                $tz_min = $match[14];
+                                $tz_mod = (isset($match[12]) ? $match[12] : NULL);
+                                $tz_hour = (isset($match[13]) ? $match[13] : NULL);
+                                $tz_min = (isset($match[14]) ? $match[14] : NULL);
 
                                 # zero out the variables
-                                if ( ! $tz_hour ) { $tz_hour = 0; }
-                                if ( ! $tz_min ) { $tz_min = 0; }
+                                if ( is_null($tz_hour) ) :
+                                        $offset = (int) get_option('gmt_offset');
+                                        $tz_hour = abs($offset);
+                                        $tz_mod = ((abs($offset) != $offset) ? '-' : '+');
+                                endif;
+                                if ( is_null($tz_min) ) : $tz_min = 0; endif;
                 
                                 $offset_secs = (($tz_hour*60)+$tz_min)*60;

trunk/blogs/wp-content/plugins/feedwordpress/feedwordpress-elements.css

@@ -380 +380 @@
 }
 
+#feedwordpress-admin-feeds .add-remove, .feedwordpress-admin .remove-it {
+        padding-left: 1.5em;
+        font-size: 0.80em;
+        text-transform: uppercase;
+        text-decoration: none !important;
+        vertical-align: middle;
+}
+
+#feedwordpress-admin-feeds .link-rss-params-row { vertical-align: middle; }
+#feedwordpress-admin-feeds .link-rss-params-remove, .feedwordpress-admin .remove-it {
+        display: block;
+        padding-left: 0em !important;
+        margin-top: 7px;
+        color: #777;
+}
+
+#feedwordpress-admin-feeds .link-rss-params-remove:hover, .feedwordpress-admin .remove-it:hover {
+        color: #aa3030;
+}
+
+#feedwordpress-admin-feeds .link-rss-params-remove .x, .feedwordpress-admin .remove-it .x {
+        cursor: pointer;
+        display: block;
+        float: left;
+        width: 10px; height: 10px;
+        margin-right: 2px;
+        overflow: hidden;
+        text-indent: -9999px;
+}
+
+
+#feedwordpress-admin-feeds #link-rss-params td { width: auto !important; }
+

trunk/blogs/wp-content/plugins/feedwordpress/feedwordpress-elements.js

@@ -449 +449 @@
                 function () { this.form.submit(); }
         );
-        $('#fwpfs-container .button').css( 'display', 'none' );
+        $('#fwpfs-button').css( 'display', 'none' );
         
         $('table.twofer td.active input[type="radio"], table.twofer td.inactive input[type="radio"]').each( function () {

trunk/blogs/wp-content/plugins/feedwordpress/feedwordpress-walker-category-checklist.class.php

@@ -13 +13 @@
 class FeedWordPress_Walker_Category_Checklist extends Walker_Category_Checklist {
         var $prefix = ''; var $taxonomy = 'category';
-        function FeedWordPress_Walker_Category_Checklist () {
+        var $checkbox_name = NULL;
+        function FeedWordPress_Walker_Category_Checklist ($params = array()) {
                 $this->set_taxonomy('category');
+                
+                if (isset($params['checkbox_name'])) :
+                        $this->checkbox_name = $params['checkbox_name'];
+                endif;
         }
         
@@ -30 +35 @@
                 endif; 
 
-                if ($taxonomy=='category') :
+                if (!is_null($this->checkbox_name)) :
+                        $name = $this->checkbox_name;
+                elseif ($taxonomy=='category') :
                         $name = 'post_category';
                 else :

trunk/blogs/wp-content/plugins/feedwordpress/feedwordpress.php

@@ -4 +4 @@
 Plugin URI: http://feedwordpress.radgeek.com/
 Description: simple and flexible Atom/RSS syndication for WordPress
-Version: 2010.0905
+Version: 2011.0211.2
 Author: Charles Johnson
 Author URI: http://radgeek.com/
@@ -12 +12 @@
 /**
  * @package FeedWordPress
- * @version 2010.0905
+ * @version 2011.0211.2
  */
 
@@ -35 +35 @@
 # -- Don't change these unless you know what you're doing...
 
-define ('FEEDWORDPRESS_VERSION', '2010.0905');
+define ('FEEDWORDPRESS_VERSION', '2011.0211.2');
 define ('FEEDWORDPRESS_AUTHOR_CONTACT', 'http://radgeek.com/contact');
 
@@ -87 +87 @@
         define('FEEDWORDPRESS_CACHE_AGE', 1);
         define('FEEDWORDPRESS_CACHE_LIFETIME', 1);
-        define('FEEDWORDPRESS_FETCH_TIME_OUT', 60);
+        define('FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT', 60);
 else :
         // Hold onto data all day for conditional GET purposes,
@@ -93 +93 @@
         define('FEEDWORDPRESS_CACHE_LIFETIME', 24*60*60);
         define('FEEDWORDPRESS_CACHE_AGE', 1*60);
-        define('FEEDWORDPRESS_FETCH_TIME_OUT', 10);
+        define('FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT', 20);
 endif;
 
@@ -106 +106 @@
 require_once(ABSPATH . WPINC . '/class-feed.php');
 
-require_once (ABSPATH . WPINC . '/registration.php'); // for wp_insert_user
+if (!function_exists('wp_insert_user')) :
+        require_once (ABSPATH . WPINC . '/registration.php'); // for wp_insert_user
+endif;
 
 require_once(dirname(__FILE__) . '/admin-ui.php');
@@ -119 +121 @@
 // Magic quotes are just about the stupidest thing ever.
 if (is_array($_POST)) :
-        $fwp_post = stripslashes_deep($_POST);
+        $fwp_post = $_POST;
+        if (get_magic_quotes_gpc()) :
+                $fwp_post = stripslashes_deep($fwp_post);
+        endif;
 endif;
 
@@ -254 +259 @@
                                 "Feed Error: [${url}] update returned error: $mesg"
                         );
-                        if ($error['ts'] > $error['since']) :
+                        
+                        $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']);
@@ -271 +280 @@
                 $recipients = array();
                 foreach ($users as $user) :
-                        $dude = new WP_User($user->user_id);
+                        $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) :
@@ -671 +681 @@
 
 function fwp_add_pages () {
-        global $fwp_path;
-
-        add_menu_page('Syndicated Sites', 'Syndication', 'manage_links', $fwp_path.'/syndication.php', NULL, WP_PLUGIN_URL.'/'.$fwp_path.'/feedwordpress-tiny.png');
-        do_action('feedwordpress_admin_menu_pre_feeds');
-        add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Feeds & Updates', 'Feeds & Updates', 'manage_options', $fwp_path.'/feeds-page.php');
-        do_action('feedwordpress_admin_menu_pre_posts');
-        add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Posts & Links', 'Posts & Links', 'manage_options', $fwp_path.'/posts-page.php');
-        do_action('feedwordpress_admin_menu_pre_authors');
-        add_submenu_page($fwp_path.'/syndication.php', 'Syndicated Authors', 'Authors', 'manage_options', $fwp_path.'/authors-page.php');
-        do_action('feedwordpress_admin_menu_pre_categories');
-        add_submenu_page($fwp_path.'/syndication.php', 'Categories'.FEEDWORDPRESS_AND_TAGS, 'Categories'.FEEDWORDPRESS_AND_TAGS, 'manage_options', $fwp_path.'/categories-page.php');
-        do_action('feedwordpress_admin_menu_pre_performance');
-        add_submenu_page($fwp_path.'/syndication.php', 'FeedWordPress Performance', 'Performance', 'manage_options', $fwp_path.'/performance-page.php');
-        do_action('feedwordpress_admin_menu_pre_diagnostics');
-        add_submenu_page($fwp_path.'/syndication.php', 'FeedWordPress Diagnostics', 'Diagnostics', 'manage_options', $fwp_path.'/diagnostics-page.php');
+        $menu_cap = FeedWordPress::menu_cap();
+        $settings_cap = FeedWordPress::menu_cap(/*sub=*/ true);
+        $syndicationMenu = FeedWordPress::path('syndication.php');
+        
+        add_menu_page(
+                'Syndicated Sites', 'Syndication',
+                $menu_cap,
+                $syndicationMenu,
+                NULL,
+                WP_PLUGIN_URL.'/'.FeedWordPress::path('feedwordpress-tiny.png')
+        );
+
+        do_action('feedwordpress_admin_menu_pre_feeds', $menu_cap, $settings_cap);
+        add_submenu_page(
+                $syndicationMenu, 'Syndicated Feeds & Updates', 'Feeds & Updates',
+                $settings_cap, FeedWordPress::path('feeds-page.php')
+        );
+
+        do_action('feedwordpress_admin_menu_pre_posts', $menu_cap, $settings_cap);
+        add_submenu_page(
+                $syndicationMenu, 'Syndicated Posts & Links', 'Posts & Links',
+                $settings_cap, FeedWordPress::path('posts-page.php')
+        );
+
+        do_action('feedwordpress_admin_menu_pre_authors', $menu_cap, $settings_cap);
+        add_submenu_page(
+                $syndicationMenu, 'Syndicated Authors', 'Authors',
+                $settings_cap, FeedWordPress::path('authors-page.php')
+        );
+
+        do_action('feedwordpress_admin_menu_pre_categories', $menu_cap, $settings_cap);
+        add_submenu_page(
+                $syndicationMenu, 'Categories'.FEEDWORDPRESS_AND_TAGS, 'Categories'.FEEDWORDPRESS_AND_TAGS,
+                $settings_cap, FeedWordPress::path('categories-page.php')
+        );
+
+        do_action('feedwordpress_admin_menu_pre_performance', $menu_cap, $settings_cap);
+        add_submenu_page(
+                $syndicationMenu, 'FeedWordPress Performance', 'Performance',
+                $settings_cap, FeedWordPress::path('performance-page.php')
+        );
+
+        do_action('feedwordpress_admin_menu_pre_diagnostics', $menu_cap, $settings_cap);
+        add_submenu_page(
+                $syndicationMenu, 'FeedWordPress Diagnostics', 'Diagnostics',
+                $settings_cap, FeedWordPress::path('diagnostics-page.php')
+        );
 } /* function fwp_add_pages () */
 
@@ -940 +982 @@
 
                 if (is_null($crash_ts)) :
-                        $crash_dt = (int) get_option('feedwordpress_update_time_limit');
-                        if ($crash_dt > 0) :
-                                $crash_ts = time() + $crash_dt;
-                        else :
-                                $crash_ts = NULL;
-                        endif;
+                        $crash_ts = $this->crash_ts();
                 endif;
 
@@ -991 +1028 @@
         }
 
+        function crash_ts ($default = NULL) {
+                $crash_dt = (int) get_option('feedwordpress_update_time_limit', 0);
+                if ($crash_dt > 0) :
+                        $crash_ts = time() + $crash_dt;
+                else :
+                        $crash_ts = $default;
+                endif;
+                return $crash_ts;
+        }
+        
         function stale () {
                 if (get_option('feedwordpress_automatic_updates')) :
@@ -1028 +1075 @@
         
         function dashboard_setup () {
-                // Get the stylesheet
-                wp_enqueue_style('feedwordpress-elements');
-
-                $widget_id = 'feedwordpress_dashboard';
-                $widget_name = __('Syndicated Sources');
-                $column = 'side';
-                $priority = 'core';
-
-                // I would love to use wp_add_dashboard_widget() here and save
-                // myself some trouble. But WP 3 does not yet have any way to
-                // push a dashboard widget onto the side, or to give it a default
-                // location.
-                add_meta_box(
-                        /*id=*/ $widget_id,
-                        /*title=*/ $widget_name,
-                        /*callback=*/ array(&$this, 'dashboard'),
-                        /*page=*/ 'dashboard',
-                        /*context=*/ $column,
-                        /*priority=*/ $priority
-                );
-                /*control_callback= array(&$this, 'dashboard_control') */
-                
-                // This is kind of rude, I know, but the dashboard widget isn't
-                // worth much if users don't know that it exists, and I don't
-                // know of any better way to reorder the boxen.
-                //
-                // Gleefully ripped off of codex.wordpress.org/Dashboard_Widgets_API
-                
-                // Globalize the metaboxes array, this holds all the widgets for wp-admin
-                global $wp_meta_boxes;
-
-                // Get the regular dashboard widgets array 
-                // (which has our new widget already but at the end)
-
-                $normal_dashboard = $wp_meta_boxes['dashboard'][$column][$priority];
-        
-                // Backup and delete our new dashbaord widget from the end of the array
-                if (isset($normal_dashboard[$widget_id])) :
-                        $backup = array();
-                        $backup[$widget_id] = $normal_dashboard[$widget_id];
-                        unset($normal_dashboard[$widget_id]);
-
-                        // Merge the two arrays together so our widget is at the
-                        // beginning
-                        $sorted_dashboard = array_merge($backup, $normal_dashboard);
-
-                        // Save the sorted array back into the original metaboxes 
-                        $wp_meta_boxes['dashboard'][$column][$priority] = $sorted_dashboard;
+                $see_it = FeedWordPress::menu_cap();
+                
+                if (current_user_can($see_it)) :
+                        // Get the stylesheet
+                        wp_enqueue_style('feedwordpress-elements');
+        
+                        $widget_id = 'feedwordpress_dashboard';
+                        $widget_name = __('Syndicated Sources');
+                        $column = 'side';
+                        $priority = 'core';
+        
+                        // I would love to use wp_add_dashboard_widget() here and save
+                        // myself some trouble. But WP 3 does not yet have any way to
+                        // push a dashboard widget onto the side, or to give it a default
+                        // location.
+                        add_meta_box(
+                                /*id=*/ $widget_id,
+                                /*title=*/ $widget_name,
+                                /*callback=*/ array(&$this, 'dashboard'),
+                                /*page=*/ 'dashboard',
+                                /*context=*/ $column,
+                                /*priority=*/ $priority
+                        );
+                        /*control_callback= array(&$this, 'dashboard_control') */
+                        
+                        // This is kind of rude, I know, but the dashboard widget isn't
+                        // worth much if users don't know that it exists, and I don't
+                        // know of any better way to reorder the boxen.
+                        //
+                        // Gleefully ripped off of codex.wordpress.org/Dashboard_Widgets_API
+                        
+                        // Globalize the metaboxes array, this holds all the widgets for wp-admin
+                        global $wp_meta_boxes;
+        
+                        // Get the regular dashboard widgets array 
+                        // (which has our new widget already but at the end)
+        
+                        $normal_dashboard = $wp_meta_boxes['dashboard'][$column][$priority];
+                
+                        // Backup and delete our new dashbaord widget from the end of the array
+                        if (isset($normal_dashboard[$widget_id])) :
+                                $backup = array();
+                                $backup[$widget_id] = $normal_dashboard[$widget_id];
+                                unset($normal_dashboard[$widget_id]);
+        
+                                // Merge the two arrays together so our widget is at the
+                                // beginning
+                                $sorted_dashboard = array_merge($backup, $normal_dashboard);
+        
+                                // Save the sorted array back into the original metaboxes 
+                                $wp_meta_boxes['dashboard'][$column][$priority] = $sorted_dashboard;
+                        endif;
                 endif;
         } /* FeedWordPress::dashboard_setup () */
@@ -1171 +1222 @@
                 // Get the category ID#
                 $cat_id = FeedWordPress::link_category_id();
-                
+                if (!is_wp_error($cat_id)) :
+                        $link_category = array($cat_id);
+                else :
+                        $link_category = array();
+                endif;
+
                 // WordPress gets cranky if there's no homepage URI
                 if (!is_string($uri) or strlen($uri)<1) : $uri = $rss; endif;
@@ -1181 +1237 @@
                 "link_name" => $name,
                 "link_url" => $uri,
-                "link_category" => array($cat_id),
+                "link_category" => $link_category,
                 "link_visible" => 'Y', // reactivate if inactivated
                 ));
@@ -1244 +1300 @@
         function syndicated_links ($args = array()) {
                 $contributors = FeedWordPress::link_category_id();
-                $links = get_bookmarks(array_merge(
-                        array("category" => $contributors),
-                        $args
-                ));
+                if (!is_wp_error($contributors)) :
+                        $links = get_bookmarks(array_merge(
+                                array("category" => $contributors),
+                                $args
+                        ));
+                else :
+                        $links = array();
+                endif;
                 return $links;
         } // function FeedWordPress::syndicated_links()
@@ -1274 +1334 @@
                 if (!$cat_id) :
                         $cat_id = FeedWordPressCompatibility::insert_link_category(DEFAULT_SYNDICATION_CATEGORY);
-
-                        // Stamp it
-                        update_option('feedwordpress_cat_id', $cat_id);
+                        if (!is_wp_error($cat_id)) :
+                                // Stamp it
+                                update_option('feedwordpress_cat_id', $cat_id);
+                        endif;
                 endif;
 
@@ -1405 +1466 @@
         }
 
-        /*static*/ function fetch ($url, $force_feed = true) {
-                $feed = new SimplePie();
+        /*static*/ function fetch_timeout () {
+                return apply_filters(
+                        'feedwordpress_fetch_timeout',
+                        intval(get_option('feedwordpress_fetch_timeout', FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT))
+                );
+        }
+        
+        /*static*/ function fetch ($url, $params = array()) {
+                $force_feed = true; // Default
+
+                // Allow user to change default feed-fetch timeout with a global setting. Props Erigami Scholey-Fuller <http://www.piepalace.ca/blog/2010/11/feedwordpress-broke-my-heart.html>                 'timeout' => 
+                $timeout = FeedWordPress::fetch_timeout();
+                
+                if (!is_array($params)) :
+                        $force_feed = $params;
+                else : // Parameter array
+                        $args = shortcode_atts(array(
+                        'force_feed' => $force_feed,
+                        'timeout' => $timeout
+                        ), $params);
+                        
+                        extract($args);
+                endif;
+                $timeout = intval($timeout);
+                
+                $pie_class = apply_filters('feedwordpress_simplepie_class', 'SimplePie');
+                $cache_class = apply_filters('feedwordpress_cache_class', 'WP_Feed_Cache');
+                $file_class = apply_filters('feedwordpress_file_class', 'FeedWordPress_File');
+                $parser_class = apply_filters('feedwordpress_parser_class', 'FeedWordPress_Parser');
+
+                $sniffer_class = apply_filters('feedwordpress_sniffer_class', 'FeedWordPress_Content_Type_Sniffer');
+
+                $feed = new $pie_class;
                 $feed->set_feed_url($url);
-                $feed->set_cache_class('WP_Feed_Cache');
-                $feed->set_file_class('WP_SimplePie_File');
-                $feed->set_content_type_sniffer_class('FeedWordPress_Content_Type_Sniffer');
-                $feed->set_file_class('FeedWordPress_File');
-                $feed->set_parser_class('FeedWordPress_Parser');
+                $feed->set_cache_class($cache_class);
+                $feed->set_timeout($timeout);
+                
+                //$feed->set_file_class('WP_SimplePie_File');
+                $feed->set_content_type_sniffer_class($sniffer_class);
+                $feed->set_file_class($file_class);
+                $feed->set_parser_class($parser_class);
                 $feed->force_feed($force_feed);
                 $feed->set_cache_duration(FeedWordPress::cache_duration());
@@ -1569 +1663 @@
         function email_diagnostic_log () {
                 $dlog = get_option('feedwordpress_diagnostics_log', array());
-
-                $recipients = get_option('feedwordpress_diagnostics_log_recipients', NULL);
-                if (is_null($recipients)) :
-                        $recipients = FeedWordPressDiagnostic::admin_emails();
-                endif;
                 
                 if (isset($dlog['schedule']) and isset($dlog['schedule']['last'])) :
@@ -1637 +1726 @@
 
 EOMAIL;
+
+                                        $ded = get_option('feedwordpress_diagnostics_email_destination', 'admins');
+
+                                        // e-mail address
+                                        if (preg_match('/^mailto:(.*)$/', $ded, $ref)) :
+                                                $recipients = array($ref[1]);
+                                                
+                                        // userid
+                                        elseif (preg_match('/^user:(.*)$/', $ded, $ref)) :
+                                                $userdata = get_userdata((int) $ref[1]);
+                                                $recipients = array($userdata->user_email);
+                                        
+                                        // admins
+                                        else :
+                                                $recipients = FeedWordPressDiagnostic::admin_emails();
+                                        endif;
+
                                         foreach ($recipients as $email) :                                               
                                                 add_filter('wp_mail_content_type', array('FeedWordPress', 'allow_html_mail'));
@@ -1653 +1759 @@
                 else :
                         $dlog['schedule'] = array(
-                                'freq' =>24 /*hr*/ * 60 /*min*/ * 60 /*s*/,
+                                'freq' => 24 /*hr*/ * 60 /*min*/ * 60 /*s*/,
                                 'last' => time(),
                         );
@@ -1680 +1786 @@
                 return $prefix;
         } /* FeedWordPress::log_prefix () */
+        
+        function menu_cap ($sub = false) {
+                if ($sub) :
+                        $cap = apply_filters('feedwordpress_menu_settings_capacity', 'manage_options');
+                else :
+                        $cap = apply_filters('feedwordpress_menu_main_capacity', 'manage_links');
+                endif;
+                return $cap;
+        } /* FeedWordPress::menu_cap () */
+        
+        function path ($filename = '') {
+                global $fwp_path;
+                
+                $path = $fwp_path;
+                if (strlen($filename) > 0) :
+                        $path .= '/'.$filename;
+                endif;
+                return $path;
+        }
+        
+        function param ($key, $type = 'REQUEST', $default = NULL) {
+                $where = '_'.strtoupper($type);
+                $ret = $default;
+                if (isset($GLOBALS[$where]) and is_array($GLOBALS[$where])) :
+                        if (isset($GLOBALS[$where][$key])) :
+                                $ret = $GLOBALS[$where][$key];
+                                if (get_magic_quotes_gpc()) :
+                                        $ret = stripslashes_deep($ret);
+                                endif;
+                        endif;
+                endif;
+                return $ret;
+        }
+        function post ($key, $default = NULL) {
+                return FeedWordPress::param($key, 'POST');
+        }
 } // class FeedWordPress
 

trunk/blogs/wp-content/plugins/feedwordpress/feedwordpresssyndicationpage.class.php

@@ -75 +75 @@
 
                 if (isset($_POST['update']) or isset($_POST['action']) or isset($_POST['update_uri'])) :
-                         // Only do things with side-effects for HTTP POST or command line
-                         $fwp_update_invoke = 'post';
+                        // Only do things with side-effects for HTTP POST or command line
+                        $fwp_update_invoke = 'post';
                 else :
                         $fwp_update_invoke = 'get';
@@ -83 +83 @@
                 $update_set = array();
                 if ($fwp_update_invoke != 'get') :
-                        if (isset($_POST['link_ids']) and is_array($_POST['link_ids']) and ($_POST['action']==FWP_UPDATE_CHECKED)) :
+                        if (is_array(FeedWordPress::post('link_ids'))
+                        and (FeedWordPress::post('action')==FWP_UPDATE_CHECKED)) :
                                 $targets = $wpdb->get_results("
                                 SELECT * FROM $wpdb->links
@@ -95 +96 @@
                                         FeedWordPress::critical_bug('fwp_syndication_manage_page::targets', $targets, __LINE__);
                                 endif;
-                        elseif (isset($_POST['update_uri'])) :
-                                $targets = $_POST['update_uri'];
+                        elseif (!is_null(FeedWordPress::post('update_uri'))) :
+                                $targets = FeedWordPress::post('update_uri');
                                 if (!is_array($targets)) :
                                         $targets = array($targets);
+                                endif;
+                                
+                                $first = each($targets);
+                                if (!is_numeric($first['key'])) : // URLs in keys
+                                        $targets = array_keys($targets);
                                 endif;
                                 $update_set = $targets;
@@ -578 +584 @@
                 ?>
 
-                <?php   if (count($sources[$visibility]) > 0) : ?>
-                        <div style="clear: left" class="alignleft">
-                        <?php if ($showInactive) : ?>
-                        <input class="button-secondary" type="submit" name="action" value="<?php print FWP_RESUB_CHECKED; ?>" />
-                        <input class="button-secondary" type="submit" name="action" value="<?php print FWP_DELETE_CHECKED; ?>" />
-                        <?php else : ?>
-                        <input class="button-secondary" type="submit" name="action" value="<?php print FWP_UPDATE_CHECKED; ?>" />
-                        <input class="button-secondary delete" type="submit" name="action" value="<?php print FWP_UNSUB_CHECKED; ?>" />
-                        <?php endif ; ?>
-                        </div> <!-- class="alignleft" -->
-                
-                <?php   else : ?>
+                <?php
+                if (count($sources[$visibility]) > 0) :
+                        $this->display_button_bar($showInactive);
+                else :
+                ?>
                         <?php fwp_syndication_manage_page_links_subsubsub($sources, $showInactive); ?>
-                <?php   endif; ?>
-        
-                <br class="clear" />
-        
                 <?php
+                endif;
+                
                 fwp_syndication_manage_page_links_table_rows($sources[$visibility], $this, $visibility);
+                $this->display_button_bar($showInactive);
                 ?>
                 </form>
                 <?php
         } /* FeedWordPressSyndicationPage::syndicated_sources_box() */
+        
+        function display_button_bar ($showInactive) {
+                ?>
+                <div style="clear: left" class="alignleft">
+                <?php if ($showInactive) : ?>
+                <input class="button-secondary" type="submit" name="action" value="<?php print FWP_RESUB_CHECKED; ?>" />
+                <input class="button-secondary" type="submit" name="action" value="<?php print FWP_DELETE_CHECKED; ?>" />
+                <?php else : ?>
+                <input class="button-secondary" type="submit" name="action" value="<?php print FWP_UPDATE_CHECKED; ?>" />
+                <input class="button-secondary delete" type="submit" name="action" value="<?php print FWP_UNSUB_CHECKED; ?>" />
+                <?php endif ; ?>
+                </div> <!-- class="alignleft" -->
+                
+                <br class="clear" />
+                <?php
+        }
         
         function bleg_thanks ($page, $box = NULL) {
@@ -970 +984 @@
                 add_action('feedwordpress_check_feed_complete', 'update_feeds_finish', 10, 3);
 
-                $crash_dt = (int) get_option('feedwordpress_update_time_limit');
-                if ($crash_dt > 0) :
-                        $crash_ts = time() + $crash_dt;
-                else :
-                        $crash_ts = NULL;
-                endif;
+                $crash_ts = $feedwordpress->crash_ts();
 
                 echo "<div class=\"update-results\">\n";
@@ -996 +1005 @@
                                 endif;
                         else :
-                                echo "<li><p><strong>Error:</strong> There was a problem updating <a href=\"$uri\">$uri</a></p></li>\n";
+                                $display_uri = esc_html(feedwordpress_display_url($uri));
+                                $uri = esc_html($uri);
+                                echo "<li><p><strong>Error:</strong> There was a problem updating <code><a href=\"$uri\">${display_uri}</a></code></p></li>\n";
                         endif;
                 endforeach;

trunk/blogs/wp-content/plugins/feedwordpress/magpiefromsimplepie.class.php

@@ -59 +59 @@
          *
          * @param SimplePie $pie The feed to convert to MagpieRSS format.
-         *
+         * @param mixed $item
+         *
+         * @uses SimplePie::get_items
+         * @uses MagpieFromSimplePie::processFeedData
          * @uses MagpieFromSimplePie::processItemData
          * @uses MagpieFromSimplePie::normalize 
-         */
-        function MagpieFromSimplePie ($pie) {
+         * @uses MagpieFromSimplePie::is_atom
+         */
+        function MagpieFromSimplePie ($pie, $item = true) {
                 $this->pie = $pie;
-                $this->originals = $this->pie->get_items();
-
-                $this->channel = $this->processFeedData($this->pie->data);
-                foreach ($this->originals as $key => $item) :
-                        $this->items[$key] = $this->processItemData($item->data);
-                endforeach;
+
+                // item in {NULL, true} = process channel data
+                if (!is_a($item, 'SimplePie_Item')) :
+                        $this->originals = $this->pie->get_items();
+
+                        $this->channel = $this->processFeedData($this->pie->data);
+                else :
+                        $this->originals = array($item);
+                        $this->channel = NULL;
+                endif;
+
+                // item in {true, SimplePie_Item} = process item data
+                if (!is_null($item)) :
+                        foreach ($this->originals as $key => $item) :
+                                $this->items[$key] = $this->processItemData($item->data);
+                        endforeach;
+                else :
+                        $this->items = NULL;
+                endif;
 
                 $this->normalize();
@@ -81 +98 @@
         
         /**
-         * MagpieFromSimplePie::get_item: returns a MagpieRSS format array
-         * which is equivalent to the SimplePie_Item object from which this
+         * MagpieFromSimplePie::get_items: returns an array of MagpieRSS format arrays
+         * equivalent to the SimplePie_Item objects in the SimplePie object from which this
          * object was constructed.
          * 
-         * @return array A MagpieRSS format array representing this feed item.
+         * @return array An array of MagpieRSS-format arrays representing the items on this feed
          */
         function get_items () {
                 return $this->items;
-        } /* MagpieFromSimplePie::get_item */
-        
+        } /* MagpieFromSimplePie::get_items () */
+        
+        /**
+         * MagpieFromSimplePie::get_item: returns a single MagpieRSS format array equivalent
+         * to a SimplePie_Item object from which this object was constructed.
+         *
+         * @return array A MagpieRSS-format array representing an item on this feed
+         */
+        function get_item () {
+                if (is_array($this->items)) :
+                        $ret = reset($this->items);
+                else :
+                        $ret = NULL;
+                endif;
+                return $ret;
+        } /* MagpieFromSimplePie::get_item () */
+
         /**
         * MagpieFromSimplePie::processFeedData
@@ -355 +387 @@
          */
         function normalize () {
-                // Normalize channel data
-                if ( $this->is_atom() ) :
-                        // Atom 1.0 elements <=> Atom 0.3 elements (Thanks, o brilliant wordsmiths of the Atom 1.0 standard!)
-                        if ($this->feed_version() < 1.0) :
-                                $this->normalize_element($this->channel, 'tagline', $this->channel, 'subtitle');
-                                $this->normalize_element($this->channel, 'copyright', $this->channel, 'rights');
-                                $this->normalize_element($this->channel, 'modified', $this->channel, 'updated');
-                        else :
-                                $this->normalize_element($this->channel, 'subtitle', $this->channel, 'tagline');
-                                $this->normalize_element($this->channel, 'rights', $this->channel, 'copyright');
-                                $this->normalize_element($this->channel, 'updated', $this->channel, 'modified');
+                if (!is_null($this->channel)) :
+                        // Normalize channel data
+                        if ( $this->is_atom() ) :
+                                // Atom 1.0 elements <=> Atom 0.3 elements (Thanks, o brilliant wordsmiths of the Atom 1.0 standard!)
+                                if ($this->feed_version() < 1.0) :
+                                        $this->normalize_element($this->channel, 'tagline', $this->channel, 'subtitle');
+                                        $this->normalize_element($this->channel, 'copyright', $this->channel, 'rights');
+                                        $this->normalize_element($this->channel, 'modified', $this->channel, 'updated');
+                                else :
+                                        $this->normalize_element($this->channel, 'subtitle', $this->channel, 'tagline');
+                                        $this->normalize_element($this->channel, 'rights', $this->channel, 'copyright');
+                                        $this->normalize_element($this->channel, 'updated', $this->channel, 'modified');
+                                endif;
+                                $this->normalize_element($this->channel, 'author', $this->channel['dc'], 'creator', 'normalize_atom_person');
+                                $this->normalize_element($this->channel, 'contributor', $this->channel['dc'], 'contributor', 'normalize_atom_person');
+        
+                                // Atom elements to RSS elements
+                                $this->normalize_element($this->channel, 'subtitle', $this->channel, 'description');
+                
+                                if ( isset($this->channel['logo']) ) :
+                                        $this->normalize_element($this->channel, 'logo', $this->image, 'url');
+                                        $this->normalize_element($this->channel, 'link', $this->image, 'link');
+                                        $this->normalize_element($this->channel, 'title', $this->image, 'title');
+                                endif;
+
+                        elseif ( $this->is_rss() ) :
+                                // Normalize image element from where stupid MagpieRSS puts it
+                                //$this->normalize_element($this->channel, 'image_title', $this->image, 'title');
+                                //$this->normalize_element($this->channel, 'image_link', $this->image, 'link');
+                                //$this->normalize_element($this->channel, 'image_url', $this->image, 'url');
+
+                                // ... and, gag, textInput
+                                //$this->normalize_element($this->channel, 'textinput_title', $this->textinput, 'title');
+                                //$this->normalize_element($this->channel, 'textinput_link', $this->textinput, 'link');
+                                //$this->normalize_element($this->channel, 'textinput_name', $this->textinput, 'name');
+                                //$this->normalize_element($this->channel, 'textinput_description', $this->textinput, 'description');
+                        
+                                // RSS elements to Atom elements
+                                $this->normalize_element($this->channel, 'description', $this->channel, 'tagline'); // Atom 0.3
+                                $this->normalize_element($this->channel, 'description', $this->channel, 'subtitle'); // Atom 1.0 (yay wordsmithing!)
+                                $this->normalize_element($this->image, 'url', $this->channel, 'logo');
                         endif;
-                        $this->normalize_element($this->channel, 'author', $this->channel['dc'], 'creator', 'normalize_atom_person');
-                        $this->normalize_element($this->channel, 'contributor', $this->channel['dc'], 'contributor', 'normalize_atom_person');
-        
-                        // Atom elements to RSS elements
-                        $this->normalize_element($this->channel, 'subtitle', $this->channel, 'description');
-                
-                        if ( isset($this->channel['logo']) ) :
-                                $this->normalize_element($this->channel, 'logo', $this->image, 'url');
-                                $this->normalize_element($this->channel, 'link', $this->image, 'link');
-                                $this->normalize_element($this->channel, 'title', $this->image, 'title');
-                        endif;
-
-                elseif ( $this->is_rss() ) :
-                        // Normalize image element from where stupid MagpieRSS puts it
-                        //$this->normalize_element($this->channel, 'image_title', $this->image, 'title');
-                        //$this->normalize_element($this->channel, 'image_link', $this->image, 'link');
-                        //$this->normalize_element($this->channel, 'image_url', $this->image, 'url');
-
-                        // ... and, gag, textInput
-                        //$this->normalize_element($this->channel, 'textinput_title', $this->textinput, 'title');
-                        //$this->normalize_element($this->channel, 'textinput_link', $this->textinput, 'link');
-                        //$this->normalize_element($this->channel, 'textinput_name', $this->textinput, 'name');
-                        //$this->normalize_element($this->channel, 'textinput_description', $this->textinput, 'description');
+                endif;
+
+                if (!is_null($this->items)) :
+                        // Now loop through and normalize item data
+                        for ( $i = 0; $i < count($this->items); $i++) :
+                                $item = $this->items[$i];
                         
-                        // RSS elements to Atom elements
-                        $this->normalize_element($this->channel, 'description', $this->channel, 'tagline'); // Atom 0.3
-                        $this->normalize_element($this->channel, 'description', $this->channel, 'subtitle'); // Atom 1.0 (yay wordsmithing!)
-                        $this->normalize_element($this->image, 'url', $this->channel, 'logo');
-                endif;
-                
-                // Now loop through and normalize item data
-                for ( $i = 0; $i < count($this->items); $i++) :
-                        $item = $this->items[$i];
-                        
-                        // if atom populate rss fields and normalize 0.3 and 1.0 feeds
-                        if ( $this->is_atom() ) :
-                                // Atom 1.0 elements <=> Atom 0.3 elements
-                                if ($this->feed_version() < 1.0) :
-                                        $this->normalize_element($item, 'modified', $item, 'updated');
-                                        $this->normalize_element($item, 'issued', $item, 'published');
-                                else :
-                                        $this->normalize_element($item, 'updated', $item, 'modified');
-                                        $this->normalize_element($item, 'published', $item, 'issued');
-                                endif;
-
-                                $this->normalize_author_inheritance($item, $this->originals[$i]);
-        
-                                // Atom elements to RSS elements
-                                $this->normalize_element($item, 'author', $item['dc'], 'creator', 'normalize_atom_person');
-                                $this->normalize_element($item, 'contributor', $item['dc'], 'contributor', 'normalize_atom_person');
-                                $this->normalize_element($item, 'summary', $item, 'description');
-                                $this->normalize_element($item, 'atom_content', $item['content'], 'encoded');
-                                $this->normalize_element($item, 'link_enclosure', $item, 'enclosure', 'normalize_enclosure');
-
-                                // Categories
-                                if ( isset($item['category#']) ) : // Atom 1.0 categories to dc:subject and RSS 2.0 categories
-                                        $this->normalize_element($item, 'category', $item['dc'], 'subject', 'normalize_category');
-                                elseif ( isset($item['dc']['subject#']) ) : // dc:subject to Atom 1.0 and RSS 2.0 categories
-                                        $this->normalize_element($item['dc'], 'subject', $item, 'category', 'normalize_dc_subject');
-                                endif;
-
-                                // Normalized item timestamp
-                                $item_date = (isset($item['published']) ) ? $item['published'] : $item['updated'];
-                        elseif ( $this->is_rss() ) :
-                                // RSS elements to Atom elements
-                                $this->normalize_element($item, 'description', $item, 'summary');
-                                $this->normalize_element($item, 'enclosure', $item, 'link_enclosure', 'normalize_enclosure');
+                                // if atom populate rss fields and normalize 0.3 and 1.0 feeds
+                                if ( $this->is_atom() ) :
+                                        // Atom 1.0 elements <=> Atom 0.3 elements
+                                        if ($this->feed_version() < 1.0) :
+                                                $this->normalize_element($item, 'modified', $item, 'updated');
+                                                $this->normalize_element($item, 'issued', $item, 'published');
+                                        else :
+                                                $this->normalize_element($item, 'updated', $item, 'modified');
+                                                $this->normalize_element($item, 'published', $item, 'issued');
+                                        endif;
+
+                                        $this->normalize_author_inheritance($item, $this->originals[$i]);
+        
+                                        // Atom elements to RSS elements
+                                        $this->normalize_element($item, 'author', $item['dc'], 'creator', 'normalize_atom_person');
+                                        $this->normalize_element($item, 'contributor', $item['dc'], 'contributor', 'normalize_atom_person');
+                                        $this->normalize_element($item, 'summary', $item, 'description');
+                                        $this->normalize_element($item, 'atom_content', $item['content'], 'encoded');
+                                        $this->normalize_element($item, 'link_enclosure', $item, 'enclosure', 'normalize_enclosure');
+
+                                        // Categories
+                                        if ( isset($item['category#']) ) : // Atom 1.0 categories to dc:subject and RSS 2.0 categories
+                                                $this->normalize_element($item, 'category', $item['dc'], 'subject', 'normalize_category');
+                                        elseif ( isset($item['dc']['subject#']) ) : // dc:subject to Atom 1.0 and RSS 2.0 categories
+                                                $this->normalize_element($item['dc'], 'subject', $item, 'category', 'normalize_dc_subject');
+                                        endif;
+
+                                        // Normalized item timestamp
+                                        $item_date = (isset($item['published']) ) ? $item['published'] : $item['updated'];
+                                elseif ( $this->is_rss() ) :
+                                        // RSS elements to Atom elements
+                                        $this->normalize_element($item, 'description', $item, 'summary');
+                                        $this->normalize_element($item, 'enclosure', $item, 'link_enclosure', 'normalize_enclosure');
                                 
-                                // Categories
-                                if ( isset($item['category#']) ) : // RSS 2.0 categories to dc:subject and Atom 1.0 categories
-                                        $this->normalize_element($item, 'category', $item['dc'], 'subject', 'normalize_category');
-                                elseif ( isset($item['dc']['subject#']) ) : // dc:subject to Atom 1.0 and RSS 2.0 categories
-                                        $this->normalize_element($item['dc'], 'subject', $item, 'category', 'normalize_dc_subject');
-                                endif;
-        
-                                // Normalized item timestamp
-                                if (isset($item['pubdate'])) :
-                                        $item_date = $item['pubdate'];
-                                elseif (isset($item['dc']['date'])) :
-                                        $item_date = $item['dc']['date'];
-                                else :
-                                        $item_date = null;
-                                endif;
-                        endif;
-
-                        if ( $item_date ) :
-                                $date_timestamp = new FeedTime($item_date);
-        
-                                if (!$date_timestamp->failed()) :
-                                        $item['date_timestamp'] = $date_timestamp->timestamp();
-                                endif;
-                        endif;
-
-                        $this->items[$i] = $item;
-                endfor;
+                                        // Categories
+                                        if ( isset($item['category#']) ) : // RSS 2.0 categories to dc:subject and Atom 1.0 categories
+                                                $this->normalize_element($item, 'category', $item['dc'], 'subject', 'normalize_category');
+                                        elseif ( isset($item['dc']['subject#']) ) : // dc:subject to Atom 1.0 and RSS 2.0 categories
+                                                $this->normalize_element($item['dc'], 'subject', $item, 'category', 'normalize_dc_subject');
+                                        endif;
+        
+                                        // Normalized item timestamp
+                                        if (isset($item['pubdate'])) :
+                                                $item_date = $item['pubdate'];
+                                        elseif (isset($item['dc']['date'])) :
+                                                $item_date = $item['dc']['date'];
+                                        else :
+                                                $item_date = null;
+                                        endif;
+                                endif;
+
+                                if ( $item_date ) :
+                                        $date_timestamp = new FeedTime($item_date);
+        
+                                        if (!$date_timestamp->failed()) :
+                                                $item['date_timestamp'] = $date_timestamp->timestamp();
+                                        endif;
+                                endif;
+
+                                $this->items[$i] = $item;
+                        endfor;
+                endif;
         } /* MagpieFromSimplePie::normalize() */
 

trunk/blogs/wp-content/plugins/feedwordpress/readme.txt

@@ -4 +4 @@
 Tags: syndication, aggregation, feed, atom, rss
 Requires at least: 3.0
-Tested up to: 3.0.1
-Stable tag: 2010.0905
+Tested up to: 3.0.5
+Stable tag: 2011.0211.2
 
 FeedWordPress syndicates content from feeds you choose into your WordPress weblog. 

trunk/blogs/wp-content/plugins/feedwordpress/syndicatedlink.class.php

@@ -113 +113 @@
 
                         if (isset($this->settings['terms'])) :
-                                $this->settings['terms'] = explode(FEEDWORDPRESS_CAT_SEPARATOR.FEEDWORDPRESS_CAT_SEPARATOR, $this->settings['terms']);
-                                $terms = array();
-                                foreach ($this->settings['terms'] as $line) :
-                                        $line = explode(FEEDWORDPRESS_CAT_SEPARATOR, $line);
-                                        $tax = array_shift($line);
-                                        $terms[$tax] = $line;
-                                endforeach;
-                                $this->settings['terms'] = $terms;
+                                // Look for new format
+                                $this->settings['terms'] = maybe_unserialize($this->settings['terms']);
+                                
+                                if (!is_array($this->settings['terms'])) :
+                                        // Deal with old format instead. Ugh.
+
+                                        // Split on two *or more* consecutive breaks
+                                        // because in the old format, a taxonomy
+                                        // without any associated terms would
+                                        // produce tax_name#1\n\n\ntax_name#2\nterm,
+                                        // and the naive split on the first \n\n
+                                        // would screw up the tax_name#2 list.
+                                        //
+                                        // Props to David Morris for pointing this
+                                        // out.
+
+                                        $this->settings['terms'] = preg_split(
+                                                "/".FEEDWORDPRESS_CAT_SEPARATOR."{2,}/",
+                                                $this->settings['terms']
+                                        );
+                                        $terms = array();
+                                        foreach ($this->settings['terms'] as $line) :
+                                                $line = explode(FEEDWORDPRESS_CAT_SEPARATOR, $line);
+                                                $tax = array_shift($line);
+                                                $terms[$tax] = $line;
+                                        endforeach;
+                                        $this->settings['terms'] = $terms;
+                                endif;
                         endif;
                         
@@ -164 +184 @@
                 global $wpdb;
 
-                FeedWordPress::diagnostic('updated_feeds', 'Polling feed ['.$this->link->link_rss.']');
+                $url = $this->uri(array('add_params' => true));
+                FeedWordPress::diagnostic('updated_feeds', 'Polling feed ['.$url.']');
+
+                $timeout = $this->setting('fetch timeout', 'feedwordpress_fetch_timeout', FEEDWORDPRESS_FETCH_TIMEOUT_DEFAULT);
 
                 $this->simplepie = apply_filters(
                         'syndicated_feed',
-                        FeedWordPress::fetch($this->link->link_rss),
+                        FeedWordPress::fetch($url, array('timeout' => $timeout)),
                         $this
                 );
@@ -176 +199 @@
                         $this->magpie = $this->simplepie;
                 else :
-                        $this->magpie = new MagpieFromSimplePie($this->simplepie);
+                        $this->magpie = new MagpieFromSimplePie($this->simplepie, NULL);
                 endif;
 
@@ -289 +312 @@
                         $posts = apply_filters(
                                 'syndicated_feed_items',
-                                $this->magpie->originals,
-                                $this
+                                $this->simplepie->get_items(),
+                                &$this
                         );
+
+                        $this->magpie->originals = $posts;
+
                         if (is_array($posts)) :
-                                foreach ($posts as $key => $original) :
-                                        $item = $this->magpie->items[$key];
-                                        $post = new SyndicatedPost(array(
-                                                'simplepie' => $original,
-                                                'magpie' => $item,
-                                        ), $this);
+                                foreach ($posts as $key => $item) :
+                                        $post = new SyndicatedPost($item, $this);
 
                                         if (!$resume or !in_array(trim($post->guid()), $processed)) :
@@ -471 +493 @@
                 
                 if (isset($to_notes['terms']) and is_array($to_notes['terms'])) :
-                        $tt = array();
-                        foreach ($to_notes['terms'] as $tax => $terms) :
-                                $tt[] = $tax.FEEDWORDPRESS_CAT_SEPARATOR.implode(FEEDWORDPRESS_CAT_SEPARATOR, $terms);
-                        endforeach;
-                        $to_notes['terms'] = implode(FEEDWORDPRESS_CAT_SEPARATOR.FEEDWORDPRESS_CAT_SEPARATOR, $tt);
+                        // Serialize it.
+                        $to_notes['terms'] = serialize($to_notes['terms']);
                 endif;
                 
@@ -533 +552 @@
          * @return bool TRUE on success, FALSE on failure.
          */
-        function setting ($name, $fallback_global = NULL, $fallback_value = NULL) {
+        function setting ($name, $fallback_global = NULL, $fallback_value = NULL, $default = 'default') {
                 $ret = NULL;
                 if (isset($this->settings[$name])) :
@@ -541 +560 @@
                 $no_value = (
                         is_null($ret)
-                        or (is_string($ret) and strtolower($ret)=='default')
+                        or (is_string($ret) and strtolower($ret)==$default)
                 );
 
                 if ($no_value and !is_null($fallback_global)) :
+                        // Avoid duplication of this correction
+                        $fallback_global = preg_replace('/^feedwordpress_/', '', $fallback_global);
+                        
                         $ret = get_option('feedwordpress_'.$fallback_global, /*default=*/ NULL);
                 endif;
@@ -550 +572 @@
                 $no_value = (
                         is_null($ret)
-                        or (is_string($ret) and strtolower($ret)=='default')
+                        or (is_string($ret) and strtolower($ret)==$default)
                 );
 
@@ -567 +589 @@
         } /* SyndicatedLink::update_setting () */
         
-        function uri () {
-                return (is_object($this->link) ? $this->link->link_rss : NULL);
+        function uri ($params = array()) {
+                $params = shortcode_atts(array(
+                'add_params' => false,
+                ), $params);
+                
+                $uri = (is_object($this->link) ? $this->link->link_rss : NULL);
+                if (!is_null($uri) and strlen($uri) > 0 and $params['add_params']) :
+                        $qp = maybe_unserialize($this->setting('query parameters', array()));
+                        
+                        // For high-tech HTTP feed request kung fu
+                        $qp = apply_filters('syndicated_feed_parameters', $qp, $uri, $this);
+                        
+                        $q = array();
+                        if (is_array($qp) and count($qp) > 0) :
+                                foreach ($qp as $pair) :
+                                        $q[] = urlencode($pair[0]).'='.urlencode($pair[1]);
+                                endforeach;
+                                
+                                // Are we appending to a URI that already has params?
+                                $sep = ((strpos('?', $uri)===false) ? '?' : '&');
+                                
+                                // Tack it on
+                                $uri .= $sep . implode("&", $q);
+                        endif;
+                endif;
+                
+                return $uri;
         } /* SyndicatedLink::uri () */
 

trunk/blogs/wp-content/plugins/feedwordpress/syndicatedpost.class.php

@@ -25 +25 @@
         var $post = array ();
 
+        var $named = array ();
+        var $preset_terms = array ();
+        var $feed_terms = array ();
+        
         var $_freshness = null;
         var $_wp_id = null;
@@ -37 +41 @@
          * @param SyndicatedLink $source The feed it was syndicated from.
          */
-        function SyndicatedPost ($item, $source) {
+        function SyndicatedPost ($item, &$source) {
                 global $wpdb;
 
@@ -46 +50 @@
                         $this->item = $item['magpie'];
                         $item = $item['magpie'];
+                elseif (is_a($item, 'SimplePie_Item')) :
+                        $this->entry = $item;
+                        
+                        // convert to Magpie for compat purposes
+                        $mp = new MagpieFromSimplePie($source->simplepie, $this->entry);
+                        $this->item = $mp->get_item();
+                        
+                        // done with conversion object
+                        $mp = NULL; unset($mp);
                 else :
                         $this->item = $item;
                 endif;
 
-                $this->link = $source;
+                $this->link =& $source;
                 $this->feed = $source->magpie;
                 $this->feedmeta = $source->settings;
@@ -95 +108 @@
                 );
                 $this->item = $changed;
-
+                
                 # Filters can halt further processing by returning NULL
                 if (is_null($this->item)) :
@@ -110 +123 @@
                         );
 
-                        $this->post['named']['author'] = apply_filters(
+                        $this->named['author'] = apply_filters(
                                 'syndicated_item_author',
                                 $this->author(), $this
@@ -127 +140 @@
                                 $this->post['post_excerpt'] = $excerpt;
                         endif;
-                        
-                        $this->post['epoch']['issued'] = apply_filters('syndicated_item_published', $this->published(), $this);
-                        $this->post['epoch']['created'] = apply_filters('syndicated_item_created', $this->created(), $this);
-                        $this->post['epoch']['modified'] = apply_filters('syndicated_item_updated', $this->updated(), $this);
 
                         // Dealing with timestamps in WordPress is so fucking fucked.
                         $offset = (int) get_option('gmt_offset') * 60 * 60;
-                        $this->post['post_date'] = gmdate('Y-m-d H:i:s', apply_filters('syndicated_item_published', $this->published(/*fallback=*/ true, /*default=*/ -1), $this) + $offset);
-                        $this->post['post_modified'] = gmdate('Y-m-d H:i:s', apply_filters('syndicated_item_updated', $this->updated(/*fallback=*/ true, /*default=*/ -1), $this) + $offset);
-                        $this->post['post_date_gmt'] = gmdate('Y-m-d H:i:s', apply_filters('syndicated_item_published', $this->published(/*fallback=*/ true, /*default=*/ -1), $this));
-                        $this->post['post_modified_gmt'] = gmdate('Y-m-d H:i:s', apply_filters('syndicated_item_updated', $this->updated(/*fallback=*/ true, /*default=*/ -1), $this));
+                        $post_date_gmt = $this->published(array('default' => -1));
+                        $post_modified_gmt = $this->updated(array('default' => -1));
+
+                        $this->post['post_date_gmt'] = gmdate('Y-m-d H:i:s', $post_date_gmt);
+                        $this->post['post_date'] = gmdate('Y-m-d H:i:s', $post_date_gmt + $offset);
+                        $this->post['post_modified_gmt'] = gmdate('Y-m-d H:i:s', $post_modified_gmt);
+                        $this->post['post_modified'] = gmdate('Y-m-d H:i:s', $post_modified_gmt + $offset);
 
                         // Use feed-level preferences or the global default.
@@ -292 +304 @@
                                 $cats = array_merge($cats, $fc);
                         endif;
-                        $this->post['pretax']['category'] = $cats;
+                        $this->preset_terms['category'] = $cats;
                         
                         // Now add categories from the post, if we have 'em
@@ -317 +329 @@
                         endforeach; endif;
 
-                        $this->post['taxed']['category'] = apply_filters('syndicated_item_categories', $cats, $this);
+                        $this->feed_terms['category'] = apply_filters('syndicated_item_categories', $cats, $this);
                         
                         // Tags: start with default tags, if any
@@ -330 +342 @@
                                 $tags = array_merge($tags, $ft);
                         endif;
-                        $this->post['pretax']['post_tag'] = $tags;
+                        $this->preset_terms['post_tag'] = $tags;
                         
                         // Scan post for /a[@rel='tag'] and use as tags if present
                         $tags = $this->inline_tags();
-                        $this->post['taxed']['post_tag'] = apply_filters('syndicated_item_tags', $tags, $this);
+                        $this->feed_terms['post_tag'] = apply_filters('syndicated_item_tags', $tags, $this);
                         
                         $taxonomies = $this->link->taxonomies();
@@ -358 +370 @@
 
                                         // That's all, folks.
-                                        $this->post['pretax'][$tax] = $terms;
+                                        $this->preset_terms[$tax] = $terms;
                                 endif;
                         endforeach;
@@ -628 +640 @@
         }
 
-        function created () {
+        function created ($params = array()) {
+                $unfiltered = false; $default = NULL;
+                extract($params);
+                
                 $date = '';
                 if (isset($this->item['dc']['created'])) :
@@ -638 +653 @@
                 endif;
 
-                $epoch = new FeedTime($date);
-                return $epoch->timestamp();
+                $time = new FeedTime($date);
+                $ts = $time->timestamp();
+                if (!$unfiltered) :
+                        apply_filters('syndicated_item_created', $ts, $this);
+                endif;
+                return $ts;
         } /* SyndicatedPost::created() */
 
-        function published ($fallback = true, $default = NULL) {
+        function published ($params = array(), $default = NULL) {
+                $fallback = true; $unfiltered = false;
+                if (!is_array($params)) : // Old style
+                        $fallback = $params;
+                else : // New style
+                        extract($params);
+                endif;
+                
                 $date = '';
-                $epoch = null;
+                $ts = null;
 
                 # RSS is a fucking mess. Figure out whether we have a date in
@@ -664 +690 @@
                 if (strlen($date) > 0) :
                         $time = new FeedTime($date);
-                        $epoch = $time->timestamp();
+                        $ts = $time->timestamp();
                 elseif ($fallback) :                                            // Fall back to <updated> / <modified> if present
-                        $epoch = $this->updated(/*fallback=*/ false, /*default=*/ $default);
+                        $ts = $this->updated(/*fallback=*/ false, /*default=*/ $default);
                 endif;
                 
                 # If everything failed, then default to the current time.
-                if (is_null($epoch)) :
+                if (is_null($ts)) :
                         if (-1 == $default) :
-                                $epoch = time();
+                                $ts = time();
                         else :
-                                $epoch = $default;
-                        endif;
-                endif;
-                
-                return $epoch;
+                                $ts = $default;
+                        endif;
+                endif;
+                
+                if (!$unfiltered) :
+                        $ts = apply_filters('syndicated_item_published', $ts, $this);
+                endif;
+                return $ts;
         } /* SyndicatedPost::published() */
 
-        function updated ($fallback = true, $default = -1) {
+        function updated ($params = array(), $default = -1) {
+                $fallback = true; $unfiltered = false;
+                if (!is_array($params)) : // Old style
+                        $fallback = $params;
+                else : // New style
+                        extract($params);
+                endif;
+
                 $date = '';
-                $epoch = null;
+                $ts = null;
 
                 # As far as I know, only dcterms and Atom have reliable ways to
@@ -694 +730 @@
                 elseif (isset($this->item['modified'])):                        // Atom 0.3
                         $date = $this->item['modified'];
-                elseif (isset($this->item['updated'])):                         // Atom 1.0
+                elseif (isset($this->item['updated'])):                 // Atom 1.0
                         $date = $this->item['updated'];
                 endif;
@@ -700 +736 @@
                 if (strlen($date) > 0) :
                         $time = new FeedTime($date);
-                        $epoch = $time->timestamp();
+                        $ts = $time->timestamp();
                 elseif ($fallback) :                                            // Fall back to issued / dc:date
-                        $epoch = $this->published(/*fallback=*/ false, /*default=*/ $default);
+                        $ts = $this->published(/*fallback=*/ false, /*default=*/ $default);
                 endif;
                 
                 # If everything failed, then default to the current time.
-                if (is_null($epoch)) :
+                if (is_null($ts)) :
                         if (-1 == $default) :
-                                $epoch = time();
+                                $ts = time();
                         else :
-                                $epoch = $default;
-                        endif;
-                endif;
-
-                return $epoch;
+                                $ts = $default;
+                        endif;
+                endif;
+
+                if (!$unfiltered) :
+                        apply_filters('syndicated_item_updated', $ts, $this);
+                endif;
+                return $ts;
         } /* SyndicatedPost::updated() */
 
@@ -725 +764 @@
                 if (isset($this->item['id'])):                  // Atom 0.3 / 1.0
                         $guid = $this->item['id'];
-                elseif (isset($this->item['atom']['id'])) :     // Namespaced Atom
+                elseif (isset($this->item['atom']['id'])) :             // Namespaced Atom
                         $guid = $this->item['atom']['id'];
-                elseif (isset($this->item['guid'])) :           // RSS 2.0
+                elseif (isset($this->item['guid'])) :                   // RSS 2.0
                         $guid = $this->item['guid'];
-                elseif (isset($this->item['dc']['identifier'])) :// yeah, right
+                elseif (isset($this->item['dc']['identifier'])) :       // yeah, right
                         $guid = $this->item['dc']['identifier'];
-                else :
+                endif;
+                
+                // Un-set or too long to use as-is. Generate a tag: URI.
+                if (is_null($guid) or strlen($guid) > 250) :
+                        // In case we need to check this again
+                        $original_guid = $guid;
+                        
                         // The feed does not seem to have provided us with a
-                        // unique identifier, so we'll have to cobble together
-                        // a tag: URI that might work for us. The base of the
-                        // URI will be the host name of the feed source ...
+                        // usable unique identifier, so we'll have to cobble
+                        // together a tag: URI that might work for us. The base
+                        // of the URI will be the host name of the feed source ...
                         $bits = parse_url($this->link->uri());
                         $guid = 'tag:'.$bits['host'];
 
+                        // Some ill-mannered feeds (for example, certain feeds
+                        // coming from Google Calendar) have extraordinarily long
+                        // guids -- so long that they exceed the 255 character
+                        // width of the WordPress guid field. But if the string
+                        // gets clipped by MySQL, uniqueness tests will fail
+                        // forever after and the post will be endlessly
+                        // reduplicated. So, instead, Guids Of A Certain Length
+                        // are hashed down into a nice, manageable tag: URI.
+                        if (!is_null($original_guid)) :
+                                $guid .= ',2010-12-03:id.'.md5($original_guid);
+                        
                         // If we have a date of creation, then we can use that
                         // to uniquely identify the item. (On the other hand, if
@@ -744 +800 @@
                         // generate dates of creation, she probably also was
                         // conscientious enough to generate unique identifiers.)
-                        if (!is_null($this->created())) :
+                        elseif (!is_null($this->created())) :
                                 $guid .= '://post.'.date('YmdHis', $this->created());
                         
@@ -1156 +1212 @@
 
                         if (!$result) :
+                                $this->_wp_id = NULL;
                                 $this->_freshness = 2; // New content
                         else:
-                                $stored_update_hashes = get_post_custom_values('syndication_item_hash', $result->id);
-                                if (count($stored_update_hashes) > 0) :
-                                        $stored_update_hash = $stored_update_hashes[0];
-                                        $update_hash_changed = ($stored_update_hash != $this->update_hash());
-                                else :
-                                        $update_hash_changed = true; // Can't find syndication meta-data
-                                endif;
-
                                 preg_match('/([0-9]+)-([0-9]+)-([0-9]+) ([0-9]+):([0-9]+):([0-9]+)/', $result->post_modified_gmt, $backref);
 
@@ -1171 +1220 @@
                                 $updated_ts = $this->updated(/*fallback=*/ true, /*default=*/ NULL);
                                 
-                                $frozen_values = get_post_custom_values('_syndication_freeze_updates', $result->id);
-                                $frozen_post = (count($frozen_values) > 0 and 'yes' == $frozen_values[0]);
-                                $frozen_feed = ('yes' == $this->link->setting('freeze updates', 'freeze_updates', NULL));
-
                                 // Check timestamps...
                                 $updated = (
@@ -1181 +1226 @@
                                 );
                                 
-                        
-                                // Or the hash...
-                                $updated = ($updated or $update_hash_changed);
+                                if (!$updated) :
+                                        // Or the hash...
+                                        $stored_update_hashes = get_post_custom_values('syndication_item_hash', $result->id);
+                                        if (count($stored_update_hashes) > 0) :
+                                                $stored_update_hash = $stored_update_hashes[0];
+                                                $updated = ($stored_update_hash != $this->update_hash());
+                                        else :
+                                                $updated = true; // Can't find syndication meta-data
+                                        endif;
+                                endif;
                                 
-                                // But only if the post is not frozen.
-                                $updated = (
-                                        $updated
-                                        and !$frozen_post
-                                        and !$frozen_feed
-                                ); 
+                                $frozen = false;
+                                if ($updated) : // Ignore if the post is frozen
+                                        $frozen = ('yes' == $this->link->setting('freeze updates', 'freeze_updates', NULL));
+                                        if (!$frozen) :
+                                                $frozen_values = get_post_custom_values('_syndication_freeze_updates', $result->id);
+                                                $frozen = (count($frozen_values) > 0 and 'yes' == $frozen_values[0]);
+                                        endif;
+                                endif;
+                                $updated = ($updated and !$frozen);
 
                                 if ($updated) :
@@ -1254 +1309 @@
         
                                         $terms = $this->category_ids (
-                                                $this->post['taxed'][$what],
+                                                $this->feed_terms[$what],
                                                 $this->link->setting("unfamiliar {$what}", "unfamiliar_{$what}", 'create:'.$what),
                                                 /*taxonomies=*/ $taxonomies,
@@ -1294 +1349 @@
 
                                 // Now let's add on the feed and global presets
-                                foreach ($this->post['pretax'] as $tax => $term_ids) :
+                                foreach ($this->preset_terms as $tax => $term_ids) :
                                         if (!isset($this->post['tax_input'][$tax])) :
                                                 $this->post['tax_input'][$tax] = array();
@@ -1314 +1369 @@
                 
                 if (!$this->filtered() and $freshness > 0) :
-                        unset($this->post['named']);
+                        // Filter some individual fields
+                        
+                        // Allow filters to set post slug. Props niska.
+                        $post_name = apply_filters('syndicated_post_slug', NULL, $this);
+                        if (!empty($post_name)) :
+                                $this->post['post_name'] = $post_name;
+                        endif;
+                        
                         $this->post = apply_filters('syndicated_post', $this->post, $this);
-
+                        
                         // Allow for feed-specific syndicated_post filters.
                         $this->post = apply_filters(
@@ -1333 +1395 @@
                 );
 
-                if (!$this->filtered() and $freshness == 2) :
-                        // The item has not yet been added. So let's add it.
-                        FeedWordPress::diagnostic('syndicated_posts', 'Inserting new post "'.$this->post['post_title'].'"');
-
-                        $this->insert_new();
-                        do_action('post_syndicated_item', $this->wp_id(), $this);
-
-                        $ret = 'new';
-                elseif (!$this->filtered() and $freshness == 1) :
-                        FeedWordPress::diagnostic('syndicated_posts', 'Updating existing post # '.$this->wp_id().', "'.$this->post['post_title'].'"');
-
-                        $this->post['ID'] = $this->wp_id();
-                        $this->update_existing();
-                        do_action('update_syndicated_item', $this->wp_id(), $this);
-
-                        $ret = 'updated';                       
-                else :
-                        $ret = false;
+                $retval = array(1 => 'updated', 2 => 'new');
+                
+                $ret = false;
+                if (!$this->filtered() and isset($retval[$freshness])) :                        
+                        $diag = array(
+                                1 => 'Updating existing post # '.$this->wp_id().', "'.$this->post['post_title'].'"',
+                                2 => 'Inserting new post "'.$this->post['post_title'].'"',
+                        );
+                        FeedWordPress::diagnostic('syndicated_posts', $diag[$freshness]);
+
+                        $this->insert_post(/*update=*/ ($freshness == 1));
+                        
+                        $hook = array(  1 => 'update_syndicated_item', 2 => 'post_syndicated_item' );
+                        do_action($hook[$freshness], $this->wp_id(), $this);
+
+                        $ret = $retval[$freshness];
                 endif;
 
@@ -1397 +1457 @@
                         /*arguments=*/ 3
                         );
-
+                        
+                        // WP3 appears to override whatever you give it for
+                        // post_modified. Ugh.
+                        add_action(
+                        /*hook=*/ 'transition_post_status',
+                        /*callback=*/ array(&$this, 'fix_post_modified_ts'),
+                        /*priority=*/ -10000, /* very early */
+                        /*arguments=*/ 3
+                        );
+
+                        if ($update) :
+                                $this->post['ID'] = $this->wp_id();
+                                $dbpost['ID'] = $this->post['ID'];
+                        endif;
                         $this->_wp_id = wp_insert_post($dbpost);
 
@@ -1406 +1479 @@
                         /*arguments=*/ 3
                         );
-        
+
+                        remove_action(
+                        /*hook=*/ 'transition_post_status',
+                        /*callback=*/ array(&$this, 'fix_post_modified_ts'),
+                        /*priority=*/ -10000, /* very early */
+                        /*arguments=*/ 3
+                        );
+
                         // Turn off ridiculous fucking kludges #1 and #2
                         remove_action('_wp_put_post_revision', array($this, 'fix_revision_meta'));
@@ -1574 +1654 @@
         
         /**
+         * SyndicatedPost::fix_post_modified_ts() -- We would like to set
+         * post_modified and post_modified_gmt to reflect the value of
+         * <atom:updated> or equivalent elements on the feed. Unfortunately,
+         * wp_insert_post() refuses to acknowledge explicitly-set post_modified
+         * fields and overwrites them, either with the post_date (if new) or the
+         * current timestamp (if updated).
+         *
+         * So, wp_insert_post() is not going to do the last-modified assignments
+         * for us. If you want something done right....
+         *
+         * @param string $new_status Unused action parameter.
+         * @param string $old_status Unused action parameter.
+         * @param object $post The database record for the post just inserted.
+         */
+        function fix_post_modified_ts ($new_status, $old_status, $post) {
+                global $wpdb;
+                $wpdb->update( $wpdb->posts, /*data=*/ array(
+                'post_modified' => $this->post['post_modified'],
+                'post_modified_gmt' => $this->post['post_modified_gmt'],
+                ), /*where=*/ array('ID' => $post->ID) );
+        } /* SyndicatedPost::fix_post_modified_ts () */
+        
+        /**
          * SyndicatedPost::add_rss_meta: adds interesting meta-data to each entry
          * using the space for custom keys. The set of keys and values to add is
@@ -1624 +1727 @@
         } /* SyndicatedPost::add_rss_meta () */
 
-        // SyndicatedPost::author_id (): get the ID for an author name from
-        // the feed. Create the author if necessary.
+        /**
+         * SyndicatedPost::author_id (): get the ID for an author name from
+         * the feed. Create the author if necessary.
+         *
+         * @param string $unfamiliar_author
+         *
+         * @return NULL|int The numeric ID of the author to attribute the post to
+         *      NULL if the post should be filtered out.
+         */
         function author_id ($unfamiliar_author = 'create') {
                 global $wpdb;
 
-                $a = $this->author();
-                $author = $a['name'];
+                $a = $this->named['author'];
+                
+                $source = $this->source();
+                $forbidden = apply_filters('feedwordpress_forbidden_author_names',
+                        array('admin', 'administrator', 'www', 'root'));
+                
+                $candidates = array();
+                $candidates[] = $a['name'];
+                if (!is_null($source)) : $candidates[] = $source['title']; endif;
+                $candidates[] = $this->link->name(/*fromFeed=*/ true);
+                $candidates[] = $this->link->name(/*fromFeed=*/ false);
+                if (strlen($this->link->homepage()) > 0) : $candidates[] = feedwordpress_display_url($this->link->homepage()); endif;
+                $candidates[] = feedwordpress_display_url($this->link->uri());
+                $candidates[] = 'unknown author';
+                
+                $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;
+                
                 $email = (isset($a['email']) ? $a['email'] : NULL);
                 $authorUrl = (isset($a['uri']) ? $a['uri'] : NULL);
 
+                
                 $hostUrl = $this->link->homepage();
                 if (is_null($hostUrl) or (strlen($hostUrl) < 0)) :
@@ -1680 +1813 @@
 
                 // Check for an existing author rule....
-                if (isset($this->link->settings['map authors']['name'][strtolower(trim($author))])) :
+                if (isset($this->link->settings['map authors']['name']['*'])) :
+                        $author_rule = $this->link->settings['map authors']['name']['*'];
+                elseif (isset($this->link->settings['map authors']['name'][strtolower(trim($author))])) :
                         $author_rule = $this->link->settings['map authors']['name'][strtolower(trim($author))];
                 else :
@@ -1745 +1880 @@
                                         $userdata['user_url'] = $authorUrl;
                                         $userdata['display_name'] = $author;
+                                        $userdata['role'] = 'contributor';
                                         
                                         do { // Keep trying until you get it right. Or until PHP crashes, I guess.
@@ -1779 +1915 @@
                 if ($id) :
                         $this->link->settings['map authors']['name'][strtolower(trim($author))] = $id;
+                        
+                        // Multisite: Check whether the author has been recorded
+                        // on *this* blog before. If not, put her down as a
+                        // Contributor for *this* blog.
+                        $user = new WP_User((int) $id);
+                        if (empty($user->roles)) :
+                                $user->add_role('contributor');
+                        endif;
                 endif;
                 return $id;     

trunk/blogs/wp-content/plugins/feedwordpress/updatedpostscontrol.class.php

@@ -2 +2 @@
 class UpdatedPostsControl {
         var $page;
-        function UpdatedPostsControl ($page) {
+        function UpdatedPostsControl (&$page) {
                 $this->page =& $page;
         } /* UpdatedPostsControl constructor */