| @@ -10,108 +10,117 @@ | ||
| 10 | 10 | * Construct the posts page object. |
| 11 | 11 | * |
| 12 | 12 | * @param mixed $link An object of class {@link SyndicatedLink} if created for one feed's settings, NULL if created for global default settings |
| 13 | 13 | */ |
| 14 | - function FeedWordPressPostsPage ($link = NULL) { | |
| 14 | + function FeedWordPressPostsPage ($link = -1) { | |
| 15 | + if (is_numeric($link) and -1 == $link) : | |
| 16 | + $link = FeedWordPressAdminPage::submitted_link(); | |
| 17 | + endif; | |
| 18 | + | |
| 15 | 19 | FeedWordPressAdminPage::FeedWordPressAdminPage('feedwordpresspostspage', $link); |
| 16 | - $this->dispatch = 'feedwordpress_posts_settings'; | |
| 20 | + $this->dispatch = 'feedwordpress_admin_page_posts'; | |
| 17 | 21 | $this->filename = __FILE__; |
| 18 | 22 | $this->updatedPosts = new UpdatedPostsControl($this); |
| 23 | + | |
| 24 | + $this->pagenames = array( | |
| 25 | + 'default' => 'Posts', | |
| 26 | + 'settings-update' => 'Syndicated posts', | |
| 27 | + 'open-sheet' => 'Syndicated Posts & Links', | |
| 28 | + ); | |
| 19 | 29 | } /* FeedWordPressPostsPage constructor */ |
| 20 | 30 | |
| 21 | - function accept_POST ($post) { | |
| 22 | - global $wpdb; | |
| 23 | - | |
| 24 | - $link_id = $this->link->id; | |
| 31 | + function save_settings ($post) { | |
| 32 | + // custom post settings | |
| 33 | + $custom_settings = $this->custom_post_settings(); | |
| 25 | 34 | |
| 26 | - // User mashed a Save Changes button | |
| 27 | - if (isset($post['save']) or isset($post['submit'])) : | |
| 28 | - // custom post settings | |
| 29 | - foreach ($post['notes'] as $mn) : | |
| 35 | + foreach ($post['notes'] as $mn) : | |
| 36 | + if (isset($mn['key0'])) : | |
| 30 | 37 | $mn['key0'] = trim($mn['key0']); |
| 31 | - $mn['key1'] = trim($mn['key1']); | |
| 32 | - | |
| 33 | 38 | if (strlen($mn['key0']) > 0) : |
| 34 | 39 | unset($custom_settings[$mn['key0']]); // out with the old |
| 35 | 40 | endif; |
| 41 | + endif; | |
| 36 | 42 | |
| 43 | + if (isset($mn['key1'])) : | |
| 44 | + $mn['key1'] = trim($mn['key1']); | |
| 45 | + | |
| 37 | 46 | if (($mn['action']=='update') and (strlen($mn['key1']) > 0)) : |
| 38 | 47 | $custom_settings[$mn['key1']] = $mn['value']; // in with the new |
| 39 | 48 | endif; |
| 40 | - endforeach; | |
| 41 | - | |
| 42 | - $this->updatedPosts->accept_POST($post); | |
| 43 | - if ($this->for_feed_settings()) : | |
| 44 | - $alter = array (); | |
| 45 | - | |
| 46 | - $this->link->settings['postmeta'] = serialize($custom_settings); | |
| 47 | - | |
| 48 | - if (isset($post['resolve_relative'])) : | |
| 49 | - $this->link->settings['resolve relative'] = $post['resolve_relative']; | |
| 50 | - endif; | |
| 51 | - | |
| 52 | - // Post status, comment status, ping status | |
| 53 | - foreach (array('post', 'comment', 'ping') as $what) : | |
| 54 | - $sfield = "feed_{$what}_status"; | |
| 55 | - if (isset($post[$sfield])) : | |
| 56 | - if ($post[$sfield]=='site-default') : | |
| 57 | - unset($this->link->settings["{$what} status"]); | |
| 58 | - else : | |
| 59 | - $this->link->settings["{$what} status"] = $post[$sfield]; | |
| 60 | - endif; | |
| 61 | - endif; | |
| 62 | - endforeach; | |
| 49 | + endif; | |
| 50 | + endforeach; | |
| 63 | 51 | |
| 64 | - $alter[] = "link_notes = '".$wpdb->escape($this->link->settings_to_notes())."'"; | |
| 65 | - $alter_set = implode(", ", $alter); | |
| 66 | - | |
| 67 | - // issue update query | |
| 68 | - $result = $wpdb->query(" | |
| 69 | - UPDATE $wpdb->links | |
| 70 | - SET $alter_set | |
| 71 | - WHERE link_id='$link_id' | |
| 72 | - "); | |
| 73 | - $this->updated = true; | |
| 74 | - | |
| 75 | - // reload link information from DB | |
| 76 | - if (function_exists('clean_bookmark_cache')) : | |
| 77 | - clean_bookmark_cache($link_id); | |
| 78 | - endif; | |
| 79 | - $link =& new SyndicatedLink($link_id); | |
| 80 | - else : | |
| 81 | - // update_option ... | |
| 82 | - if (isset($post['feed_post_status'])) : | |
| 83 | - update_option('feedwordpress_syndicated_post_status', $post['feed_post_status']); | |
| 84 | - endif; | |
| 52 | + $this->updatedPosts->accept_POST($post); | |
| 53 | + if ($this->for_feed_settings()) : | |
| 54 | + $alter = array (); | |
| 85 | 55 | |
| 86 | - update_option('feedwordpress_custom_settings', serialize($custom_settings)); | |
| 87 | - | |
| 88 | - update_option('feedwordpress_munge_permalink', $_REQUEST['munge_permalink']); | |
| 89 | - update_option('feedwordpress_use_aggregator_source_data', $_REQUEST['use_aggregator_source_data']); | |
| 90 | - update_option('feedwordpress_formatting_filters', $_REQUEST['formatting_filters']); | |
| 91 | - | |
| 92 | - if (isset($post['resolve_relative'])) : | |
| 93 | - update_option('feedwordpress_resolve_relative', $post['resolve_relative']); | |
| 56 | + $this->link->settings['postmeta'] = serialize($custom_settings); | |
| 57 | + | |
| 58 | + if (isset($post['resolve_relative'])) : | |
| 59 | + $this->link->settings['resolve relative'] = $post['resolve_relative']; | |
| 60 | + endif; | |
| 61 | + if (isset($post['munge_permalink'])) : | |
| 62 | + $this->link->settings['munge permalink'] = $post['munge_permalink']; | |
| 63 | + endif; | |
| 64 | + if (isset($post['munge_comments_feed_links'])) : | |
| 65 | + $this->link->settings['munge comments feed links'] = $post['munge_comments_feed_links']; | |
| 66 | + endif; | |
| 67 | + | |
| 68 | + // Post status, comment status, ping status | |
| 69 | + foreach (array('post', 'comment', 'ping') as $what) : | |
| 70 | + $sfield = "feed_{$what}_status"; | |
| 71 | + if (isset($post[$sfield])) : | |
| 72 | + if ($post[$sfield]=='site-default') : | |
| 73 | + unset($this->link->settings["{$what} status"]); | |
| 74 | + else : | |
| 75 | + $this->link->settings["{$what} status"] = $post[$sfield]; | |
| 76 | + endif; | |
| 94 | 77 | endif; |
| 95 | - if (isset($_REQUEST['feed_comment_status']) and ($_REQUEST['feed_comment_status'] == 'open')) : | |
| 96 | - update_option('feedwordpress_syndicated_comment_status', 'open'); | |
| 78 | + endforeach; | |
| 79 | + | |
| 80 | + if (isset($post['syndicated_post_type'])) : | |
| 81 | + if ($post['syndicated_post_type']=='default') : | |
| 82 | + unset($this->link->settings['syndicated post type']); | |
| 97 | 83 | else : |
| 98 | - update_option('feedwordpress_syndicated_comment_status', 'closed'); | |
| 84 | + $this->link->settings['syndicated post type'] = $post['syndicated_post_type']; | |
| 99 | 85 | endif; |
| 86 | + endif; | |
| 100 | 87 | |
| 101 | - if (isset($_REQUEST['feed_ping_status']) and ($_REQUEST['feed_ping_status'] == 'open')) : | |
| 102 | - update_option('feedwordpress_syndicated_ping_status', 'open'); | |
| 103 | - else : | |
| 104 | - update_option('feedwordpress_syndicated_ping_status', 'closed'); | |
| 105 | - endif; | |
| 106 | - | |
| 107 | - $this->updated = true; | |
| 88 | + else : | |
| 89 | + // update_option ... | |
| 90 | + if (isset($post['feed_post_status'])) : | |
| 91 | + update_option('feedwordpress_syndicated_post_status', $post['feed_post_status']); | |
| 108 | 92 | endif; |
| 109 | 93 | |
| 110 | - // Probably a "Go" button for the drop-down | |
| 111 | - else : | |
| 112 | - $this->updated = false; | |
| 113 | - endif; | |
| 94 | + update_option('feedwordpress_custom_settings', serialize($custom_settings)); | |
| 95 | + | |
| 96 | + update_option('feedwordpress_munge_permalink', $_REQUEST['munge_permalink']); | |
| 97 | + update_option('feedwordpress_use_aggregator_source_data', $_REQUEST['use_aggregator_source_data']); | |
| 98 | + update_option('feedwordpress_formatting_filters', $_REQUEST['formatting_filters']); | |
| 99 | + | |
| 100 | + if (isset($post['resolve_relative'])) : | |
| 101 | + update_option('feedwordpress_resolve_relative', $post['resolve_relative']); | |
| 102 | + endif; | |
| 103 | + if (isset($post['munge_comments_feed_links'])) : | |
| 104 | + update_option('feedwordpress_munge_comments_feed_links', $post['munge_comments_feed_links']); | |
| 105 | + endif; | |
| 106 | + if (isset($_REQUEST['feed_comment_status']) and ($_REQUEST['feed_comment_status'] == 'open')) : | |
| 107 | + update_option('feedwordpress_syndicated_comment_status', 'open'); | |
| 108 | + else : | |
| 109 | + update_option('feedwordpress_syndicated_comment_status', 'closed'); | |
| 110 | + endif; | |
| 111 | + | |
| 112 | + if (isset($_REQUEST['feed_ping_status']) and ($_REQUEST['feed_ping_status'] == 'open')) : | |
| 113 | + update_option('feedwordpress_syndicated_ping_status', 'open'); | |
| 114 | + else : | |
| 115 | + update_option('feedwordpress_syndicated_ping_status', 'closed'); | |
| 116 | + endif; | |
| 117 | + | |
| 118 | + if (isset($post['syndicated_post_type'])) : | |
| 119 | + update_option('feedwordpress_syndicated_post_type', $post['syndicated_post_type']); | |
| 120 | + endif; | |
| 121 | + endif; | |
| 122 | + parent::save_settings($post); | |
| 114 | 123 | } |
| 115 | 124 | |
| 116 | 125 | /** |
| 117 | 126 | * Outputs "Publication" settings box. |
| @@ -124,72 +133,41 @@ | ||
| 124 | 133 | * @uses FeedWordPressPostsPage::these_posts_phrase() |
| 125 | 134 | * @uses FeedWordPress::syndicated_status() |
| 126 | 135 | * @uses SyndicatedLink::syndicated_status() |
| 127 | 136 | * @uses SyndicatedPost::use_api() |
| 128 | - * @uses fwp_option_box_opener() | |
| 129 | - * @uses fwp_option_box_closer() | |
| 130 | 137 | */ |
| 131 | 138 | /*static*/ function publication_box ($page, $box = NULL) { |
| 132 | - global $fwp_path; | |
| 133 | - | |
| 134 | - $post_status_global = FeedWordPress::syndicated_status('post', /*default=*/ 'publish'); | |
| 135 | 139 | $thesePosts = $page->these_posts_phrase(); |
| 136 | - | |
| 137 | - // Set up array for selector | |
| 138 | - $setting = array( | |
| 139 | - 'publish' => array ('label' => "Publish %s immediately", 'checked' => ''), | |
| 140 | - 'draft' => array('label' => "Save %s as drafts", 'checked' => ''), | |
| 141 | - 'private' => array('label' => "Save %s as private posts", 'checked' => ''), | |
| 140 | + $postSelector = array( | |
| 141 | + 'publish' => "Publish %s immediately", | |
| 142 | + 'pending' => "Hold %s for review; mark as Pending", | |
| 143 | + 'draft' => "Save %s as drafts", | |
| 144 | + 'private' => "Save %s as private posts", | |
| 142 | 145 | ); |
| 143 | - if (SyndicatedPost::use_api('post_status_pending')) : | |
| 144 | - $setting['pending'] = array('label' => "Hold %s for review; mark as Pending", 'checked' => ''); | |
| 145 | - endif; | |
| 146 | + $labels = array(); | |
| 147 | + foreach ($postSelector as $index => $value) : | |
| 148 | + $postSelector[$index] = sprintf(__($value), $thesePosts); | |
| 149 | + $labels[$index] = __(str_replace(' %s', '', strtolower(strtok($value, ';')))); | |
| 150 | + endforeach; | |
| 151 | + | |
| 152 | + $params = array( | |
| 153 | + 'input-name' => 'feed_post_status', | |
| 154 | + 'setting-default' => NULL, | |
| 155 | + 'global-setting-default' => 'publish', | |
| 156 | + 'labels' => $labels, | |
| 157 | + ); | |
| 146 | 158 | |
| 147 | - | |
| 148 | - if ($page->for_feed_settings()) : | |
| 149 | - $href = $fwp_path.'/'.basename(__FILE__); | |
| 150 | - $currently = str_replace('%s', '', strtolower(strtok($setting[$post_status_global]['label'], ';'))); | |
| 151 | - $setting['site-default'] = array('label' => "Use <a href=\"admin.php?page=${href}\">site-wide setting</a>", 'checked' => ''); | |
| 152 | - $setting['site-default']['label'] .= " (currently: <strong>${currently}</strong>)"; | |
| 153 | - | |
| 154 | - $checked = $page->link->syndicated_status('post', 'site-default', /*fallback=*/ false); | |
| 155 | - else : | |
| 156 | - $checked = $post_status_global; | |
| 157 | - endif; | |
| 158 | - | |
| 159 | - // Re-order appropriately | |
| 160 | - $selector = array(); | |
| 161 | - $order = array( | |
| 162 | - 'site-default', | |
| 163 | - 'publish', | |
| 164 | - 'pending', | |
| 165 | - 'draft', | |
| 166 | - 'private', | |
| 167 | - ); | |
| 168 | - foreach ($order as $line) : | |
| 169 | - if (isset($setting[$line])) : | |
| 170 | - $selector[$line] = $setting[$line]; | |
| 171 | - endif; | |
| 172 | - endforeach; | |
| 173 | - $selector[$checked]['checked'] = ' checked="checked"'; | |
| 174 | - | |
| 175 | 159 | // Hey ho, let's go... |
| 176 | 160 | ?> |
| 177 | - <style type="text/css"> | |
| 178 | - #syndicated-publication-form th { width: 27%; vertical-align: top; } | |
| 179 | - #syndicated-publication-form td { width: 73%; vertical-align: top; } | |
| 180 | - </style> | |
| 181 | - | |
| 182 | - <table id="syndicated-publication-form" class="form-table" cellspacing="2" cellpadding="5"> | |
| 161 | + <table id="syndicated-publication-form" class="edit-form narrow"> | |
| 183 | 162 | <tr><th scope="row"><?php _e('New posts:'); ?></th> |
| 184 | - <td><ul class="options"> | |
| 185 | - <?php foreach ($selector as $code => $li) : ?> | |
| 186 | - <li><label><input type="radio" name="feed_post_status" | |
| 187 | - value="<?php print $code; ?>"<?php print $li['checked']; ?> /> | |
| 188 | - <?php print str_replace('%s', $thesePosts, $li['label']); ?></label></li> | |
| 189 | - <?php endforeach; ?> | |
| 190 | - </ul></td> | |
| 191 | - </tr> | |
| 163 | + <td><?php | |
| 164 | + $this->setting_radio_control( | |
| 165 | + 'post status', 'syndicated_post_status', | |
| 166 | + $postSelector, $params | |
| 167 | + ); | |
| 168 | + ?> | |
| 169 | + </td></tr> | |
| 192 | 170 | |
| 193 | 171 | <?php $page->updatedPosts->display(); ?> |
| 194 | 172 | </table> |
| 195 | 173 | |
| @@ -203,31 +181,21 @@ | ||
| 203 | 181 | * @param object $page of class FeedWordPressPostsPage tells us whether this is |
| 204 | 182 | * a page for one feed's settings or for global defaults |
| 205 | 183 | * @param array $box |
| 206 | 184 | * |
| 207 | - * @uses fwp_option_box_opener() | |
| 208 | - * @uses fwp_option_box_closer() | |
| 209 | 185 | */ |
| 210 | 186 | function formatting_box ($page, $box = NULL) { |
| 211 | - global $fwp_path; | |
| 212 | 187 | $thesePosts = $page->these_posts_phrase(); |
| 213 | - $global_resolve_relative = get_option('feedwordpress_resolve_relative', 'yes'); | |
| 188 | + | |
| 214 | 189 | if ($page->for_feed_settings()) : |
| 215 | 190 | $formatting_filters = null; |
| 216 | - $resolve_relative = $page->link->setting('resolve relative', NULL, 'default'); | |
| 217 | 191 | $url = preg_replace('|/+$|', '', $page->link->homepage()); |
| 218 | - $setting = array( | |
| 219 | - 'yes' => __('resolve relative URIs'), | |
| 220 | - 'no' => __('leave relative URIs unresolved'), | |
| 221 | - ); | |
| 222 | - $href = $fwp_path.'/'.basename(__FILE__); | |
| 223 | 192 | else : |
| 224 | 193 | $formatting_filters = get_option('feedwordpress_formatting_filters', 'no'); |
| 225 | - $resolve_relative = $global_resolve_relative; | |
| 226 | 194 | $url = 'http://example.com'; |
| 227 | 195 | endif; |
| 228 | 196 | ?> |
| 229 | - <table class="form-table" cellspacing="2" cellpadding="5"> | |
| 197 | + <table class="edit-form narrow"> | |
| 230 | 198 | <?php if (!is_null($formatting_filters)) : ?> |
| 231 | 199 | |
| 232 | 200 | <tr><th scope="row">Formatting filters:</th> |
| 233 | 201 | <td><select name="formatting_filters" size="1"> |
| @@ -242,22 +210,32 @@ | ||
| 242 | 210 | |
| 243 | 211 | <?php endif; ?> |
| 244 | 212 | |
| 245 | 213 | <tr><th scope="row">Relative URIs:</th> |
| 246 | - <td>If link or image in a syndicated post from <code><?php print $url; ?></code> | |
| 214 | + <td><p>If link or image in a syndicated post from <code><?php print $url; ?></code> | |
| 247 | 215 | refers to a partial URI like <code>/about</code>, where should |
| 248 | 216 | the syndicated copy point to?</p> |
| 249 | 217 | |
| 250 | - <ul> | |
| 251 | - <?php if ($page->for_feed_settings()) : ?> | |
| 252 | - <li><p><label><input type="radio" name="resolve_relative" value='default' <?php echo ($resolve_relative=='default')?' checked="checked"':''; ?>/> Use <a href="admin.php?page=<?php print $href; ?>">site-wide setting</a><br/> | |
| 253 | - <small style="margin-left: 2.0em;">Currently: <strong><?php print $setting[$global_resolve_relative]; ?></strong></small></label></p></li> | |
| 254 | - <?php endif; ?> | |
| 255 | - <li><p><label><input type="radio" name="resolve_relative" value="yes"<?php echo ($resolve_relative!='no' and $resolve_relative!='default')?' checked="checked"':''; ?>/> Resolve the URI so it points to <code><?php print $url; ?></code><br/> | |
| 256 | - <small style="margin-left: 2.0em;"><code>/contact</code> is rewritten as <code><?php print $url; ?>/contact</code></label></small></p></li> | |
| 257 | - <li><p><label><input type="radio" name="resolve_relative" value="no"<?php echo ($resolve_relative=='no')?' checked="checked"':''; ?>/> Leave relative URIs unchanged, so they point to this site<br/> | |
| 258 | - <small style="margin-left: 2.0em;"><code>/contact</code> is left as <code>/contact</code></small></label></li> | |
| 259 | - </ul> | |
| 218 | + <?php | |
| 219 | + $options = array( | |
| 220 | + 'yes' => 'Resolve the URI so it points to <code>'.$url.'</code><br/><small style="margin-left: 2.0em;"><code>/contact</code> is rewritten as <code>'.$url.'/contact</code></small>', | |
| 221 | + 'no' => 'Leave relative URIs unchanged, so they point to this site<br/><small style="margin-left: 2.0em;"><code>/contact</code> is left as <code>/contact</code></small>', | |
| 222 | + ); | |
| 223 | + $params = array( | |
| 224 | + 'setting-default' => 'default', | |
| 225 | + 'global-setting-default' => 'yes', | |
| 226 | + 'labels' => array( | |
| 227 | + 'yes' => __('resolve relative URIs'), | |
| 228 | + 'no' => __('leave relative URIs unresolved'), | |
| 229 | + ), | |
| 230 | + 'default-input-value' => 'default', | |
| 231 | + ); | |
| 232 | + | |
| 233 | + $this->setting_radio_control( | |
| 234 | + 'resolve relative', 'resolve_relative', | |
| 235 | + $options, $params | |
| 236 | + ); | |
| 237 | + ?> | |
| 260 | 238 | </td></tr> |
| 261 | 239 | |
| 262 | 240 | </table> |
| 263 | 241 | <?php |
| @@ -270,23 +248,39 @@ | ||
| 270 | 248 | * @param object $page of class FeedWordPressPostsPage tells us whether this is |
| 271 | 249 | * a page for one feed's settings or for global defaults |
| 272 | 250 | * @param array $box |
| 273 | 251 | * |
| 274 | - * @uses fwp_option_box_opener() | |
| 275 | - * @uses fwp_option_box_closer() | |
| 276 | 252 | */ |
| 277 | 253 | /*static*/ function links_box ($page, $box = NULL) { |
| 278 | - $munge_permalink = get_option('feedwordpress_munge_permalink'); | |
| 279 | - $use_aggregator_source_data = get_option('feedwordpress_use_aggregator_source_data'); | |
| 254 | + $setting = array( | |
| 255 | + 'munge_permalink' => array( | |
| 256 | + 'yes' => __('The copy on the original website'), | |
| 257 | + 'no' => __('The local copy on this website'), | |
| 258 | + ), | |
| 259 | + ); | |
| 260 | + | |
| 261 | + if (!$page->for_feed_settings()) : | |
| 262 | + $use_aggregator_source_data = get_option('feedwordpress_use_aggregator_source_data'); | |
| 263 | + endif; | |
| 280 | 264 | ?> |
| 281 | - <table class="form-table" cellspacing="2" cellpadding="5"> | |
| 282 | - <tr><th scope="row">Permalinks:</th> | |
| 283 | - <td><select name="munge_permalink" size="1"> | |
| 284 | - <option value="yes"<?php echo ($munge_permalink=='yes')?' selected="selected"':''; ?>>point to the copy on the original website</option> | |
| 285 | - <option value="no"<?php echo ($munge_permalink=='no')?' selected="selected"':''; ?>>point to the local copy on this website</option> | |
| 286 | - </select></td> | |
| 287 | - </tr> | |
| 265 | + <table class="edit-form narrow"> | |
| 266 | + <tr><th scope="row">Permalinks point to:</th> | |
| 267 | + <td><?php | |
| 288 | 268 | |
| 269 | + $params = array( | |
| 270 | + 'setting-default' => 'default', | |
| 271 | + 'global-setting-default' => 'yes', | |
| 272 | + 'default-input-value' => 'default', | |
| 273 | + ); | |
| 274 | + $this->setting_radio_control( | |
| 275 | + 'munge permalink', 'munge_permalink', | |
| 276 | + $setting['munge_permalink'], $params | |
| 277 | + ); | |
| 278 | + ?> | |
| 279 | + | |
| 280 | + </td></tr> | |
| 281 | + | |
| 282 | + <?php if (!$page->for_feed_settings()) : ?> | |
| 289 | 283 | <tr><th scope="row">Posts from aggregator feeds:</th> |
| 290 | 284 | <td><ul class="options"> |
| 291 | 285 | <li><label><input type="radio" name="use_aggregator_source_data" value="no"<?php echo ($use_aggregator_source_data!="yes")?' checked="checked"':''; ?>> Give the aggregator itself as the source of posts from an aggregator feed.</label></li> |
| 292 | 286 | <li><label><input type="radio" name="use_aggregator_source_data" value="yes"<?php echo ($use_aggregator_source_data=="yes")?' checked="checked"':''; ?>> Give the original source of the post as the source, not the aggregator.</label></li> |
| @@ -294,8 +288,9 @@ | ||
| 294 | 288 | <p class="setting-description">Some feeds (for example, those produced by FeedWordPress) aggregate content from several different sources, and include information about the original source of the post. |
| 295 | 289 | This setting controls what FeedWordPress will give as the source of posts from |
| 296 | 290 | such an aggregator feed.</p> |
| 297 | 291 | </td></tr> |
| 292 | + <?php endif; ?> | |
| 298 | 293 | </table> |
| 299 | 294 | |
| 300 | 295 | <?php |
| 301 | 296 | } /* FeedWordPressPostsPage::links_box() */ |
| @@ -307,73 +302,102 @@ | ||
| 307 | 302 | * @param object $page of class FeedWordPressPostsPage tells us whether this is |
| 308 | 303 | * a page for one feed's settings or for global defaults |
| 309 | 304 | * @param array $box |
| 310 | 305 | * |
| 311 | - * @uses fwp_option_box_opener() | |
| 312 | - * @uses fwp_option_box_closer() | |
| 313 | 306 | */ |
| 314 | 307 | /*static*/ function comments_and_pings_box ($page, $box = NULL) { |
| 315 | - $setting = array(); | |
| 316 | - $selector = array(); | |
| 317 | - | |
| 318 | 308 | $whatsits = array( |
| 319 | 309 | 'comment' => array('label' => __('Comments'), 'accept' => 'Allow comments'), |
| 320 | 310 | 'ping' => array('label' => __('Pings'), 'accept' => 'Accept pings'), |
| 321 | 311 | ); |
| 322 | 312 | $onThesePosts = 'on '.$page->these_posts_phrase(); |
| 313 | + | |
| 314 | + $mcflSettings = array( | |
| 315 | + "yes" => __('Point to comment feeds from the original website (when provided by the syndicated feed)'), | |
| 316 | + "no" => __('Point to local comment feeds on this website'), | |
| 317 | + ); | |
| 318 | + $mcflParams = array( | |
| 319 | + 'setting-default' => 'default', | |
| 320 | + 'global-setting-default' => 'yes', | |
| 321 | + 'labels' => array( | |
| 322 | + 'yes' => __('comment feeds from the original website'), | |
| 323 | + 'no' => __('local comment feeds on this website') | |
| 324 | + ), | |
| 325 | + 'default-input-value' => 'default', | |
| 326 | + ); | |
| 323 | 327 | |
| 328 | + $settings = array(); $params = array(); | |
| 324 | 329 | foreach ($whatsits as $what => $how) : |
| 325 | 330 | $whatsits[$what]['default'] = FeedWordPress::syndicated_status($what, /*default=*/ 'closed'); |
| 326 | 331 | |
| 327 | 332 | // Set up array for selector |
| 328 | - $setting = array( | |
| 329 | - 'open' => array ('label' => "{$how['accept']} %s", 'checked' => ''), | |
| 330 | - 'closed' => array('label' => "Don't ".strtolower($how['accept'])." %s", 'checked' => ''), | |
| 333 | + $settings[$what] = array( | |
| 334 | + 'open' => sprintf(__("{$how['accept']} %s"), __($onThesePosts)), | |
| 335 | + 'closed' => sprintf(__("Don't ".strtolower($how['accept'])." %s"), __($onThesePosts)), | |
| 331 | 336 | ); |
| 332 | - if ($page->for_feed_settings()) : | |
| 333 | - $href = $fwp_path.'/'.basename(__FILE__); | |
| 334 | - $currently = trim(str_replace('%s', '', strtolower(strtok($setting[$whatsits[$what]['default']]['label'], ';')))); | |
| 335 | - $setting['site-default'] = array('label' => "Use <a href=\"admin.php?page=${href}\">site-wide setting</a>", 'checked' => ''); | |
| 336 | - $setting['site-default']['label'] .= " (currently: <strong>${currently}</strong>)"; | |
| 337 | - | |
| 338 | - $checked = $page->link->syndicated_status($what, 'site-default', /*fallback=*/ false); | |
| 339 | - else : | |
| 340 | - $checked = $whatsits[$what]['default']; | |
| 341 | - endif; | |
| 342 | - | |
| 343 | - // Re-order appropriately | |
| 344 | - $selector[$what] = array(); | |
| 345 | - $order = array( | |
| 346 | - 'site-default', | |
| 347 | - 'open', | |
| 348 | - 'closed', | |
| 337 | + $params[$what] = array( | |
| 338 | + 'input-name' => "feed_${what}_status", | |
| 339 | + 'setting-default' => NULL, | |
| 340 | + 'global-setting-default' => FeedWordPress::syndicated_status($what, /*default=*/ 'closed'), | |
| 341 | + 'labels' => array( | |
| 342 | + 'open' => strtolower(__($how['accept'])), | |
| 343 | + 'closed' => strtolower(__("Don't ".$how['accept'])), | |
| 344 | + ), | |
| 349 | 345 | ); |
| 350 | - foreach ($order as $line) : | |
| 351 | - if (isset($setting[$line])) : | |
| 352 | - $selector[$what][$line] = $setting[$line]; | |
| 353 | - endif; | |
| 354 | - endforeach; | |
| 355 | - $selector[$what][$checked]['checked'] = ' checked="checked"'; | |
| 356 | 346 | endforeach; |
| 357 | 347 | |
| 358 | 348 | // Hey ho, let's go... |
| 359 | 349 | ?> |
| 360 | - <table class="form-table" cellspacing="2" cellpadding="5"> | |
| 350 | + <table class="edit-form narrow"> | |
| 361 | 351 | <?php foreach ($whatsits as $what => $how) : ?> |
| 352 | + | |
| 362 | 353 | <tr><th scope="row"><?php print $how['label']; ?>:</th> |
| 363 | - <td><ul class="options"> | |
| 364 | - <?php foreach ($selector[$what] as $code => $li) : ?> | |
| 365 | - <li><label><input type="radio" name="feed_<?php print $what; ?>_status" | |
| 366 | - value="<?php print $code; ?>"<?php print $li['checked']; ?> /> | |
| 367 | - <?php print trim(str_replace('%s', $onThesePosts, $li['label'])); ?></label></li> | |
| 368 | - <?php endforeach; ?> | |
| 369 | - </ul></td></tr> | |
| 354 | + <td><?php | |
| 355 | + $this->setting_radio_control( | |
| 356 | + "$what status", "syndicated_${what}_status", | |
| 357 | + $settings[$what], $params[$what] | |
| 358 | + ); | |
| 359 | + ?></td></tr> | |
| 360 | + | |
| 370 | 361 | <?php endforeach; ?> |
| 362 | + | |
| 363 | + <tr><th scope="row"><?php _e('Comment feeds'); ?></th> | |
| 364 | + <td><p>When WordPress feeds and templates link to comments | |
| 365 | + feeds for <?php print $page->these_posts_phrase(); ?>, the | |
| 366 | + URLs for the feeds should...</p> | |
| 367 | + <?php | |
| 368 | + $this->setting_radio_control( | |
| 369 | + "munge comments feed links", "munge_comments_feed_links", | |
| 370 | + $mcflSettings, $mcflParams | |
| 371 | + ); | |
| 372 | + ?></td></tr> | |
| 371 | 373 | </table> |
| 372 | 374 | |
| 373 | 375 | <?php |
| 374 | 376 | } /* FeedWordPressPostsPage::comments_and_pings_box() */ |
| 375 | 377 | |
| 378 | + /*static*/ function custom_post_settings ($page = NULL) { | |
| 379 | + if (is_null($page)) : | |
| 380 | + $page = $this; | |
| 381 | + endif; | |
| 382 | + | |
| 383 | + if ($page->for_feed_settings()) : | |
| 384 | + $custom_settings = $page->link->setting("postmeta", NULL, array()); | |
| 385 | + else : | |
| 386 | + $custom_settings = get_option('feedwordpress_custom_settings'); | |
| 387 | + endif; | |
| 388 | + | |
| 389 | + if ($custom_settings and !is_array($custom_settings)) : | |
| 390 | + $custom_settings = unserialize($custom_settings); | |
| 391 | + endif; | |
| 392 | + | |
| 393 | + if (!is_array($custom_settings)) : | |
| 394 | + $custom_settings = array(); | |
| 395 | + endif; | |
| 396 | + | |
| 397 | + return $custom_settings; | |
| 398 | + } /* FeedWordPressPostsPage::custom_post_settings() */ | |
| 399 | + | |
| 376 | 400 | /** |
| 377 | 401 | * Output "Custom Post Settings" settings box |
| 378 | 402 | * |
| 379 | 403 | * @since 2009.0713 |
| @@ -379,35 +403,14 @@ | ||
| 379 | 403 | * @since 2009.0713 |
| 380 | 404 | * @param object $page of class FeedWordPressPostsPage tells us whether this is |
| 381 | 405 | * a page for one feed's settings or for global defaults |
| 382 | 406 | * @param array $box |
| 383 | - * | |
| 384 | - * @uses fwp_option_box_opener() | |
| 385 | - * @uses fwp_option_box_closer() | |
| 386 | 407 | */ |
| 387 | 408 | /*static*/ function custom_post_settings_box ($page, $box = NULL) { |
| 388 | - if ($page->for_feed_settings()) : | |
| 389 | - $custom_settings = $page->link->settings["postmeta"]; | |
| 390 | - if ($custom_settings and !is_array($custom_settings)) : | |
| 391 | - $custom_settings = unserialize($custom_settings); | |
| 392 | - endif; | |
| 393 | - | |
| 394 | - if (!is_array($custom_settings)) : | |
| 395 | - $custom_settings = array(); | |
| 396 | - endif; | |
| 397 | - else : | |
| 398 | - $custom_settings = get_option('feedwordpress_custom_settings'); | |
| 399 | - if ($custom_settings and !is_array($custom_settings)) : | |
| 400 | - $custom_settings = unserialize($custom_settings); | |
| 401 | - endif; | |
| 402 | - | |
| 403 | - if (!is_array($custom_settings)) : | |
| 404 | - $custom_settings = array(); | |
| 405 | - endif; | |
| 406 | - endif; | |
| 407 | - | |
| 409 | + $custom_settings = FeedWordPressPostsPage::custom_post_settings($page); | |
| 408 | 410 | ?> |
| 409 | 411 | <div id="postcustomstuff"> |
| 412 | + <p>Custom fields can be used to add extra metadata to a post that you can <a href="http://codex.wordpress.org/Using_Custom_Fields">use in your theme</a>.</p> | |
| 410 | 413 | <table id="meta-list" cellpadding="3"> |
| 411 | 414 | <tr> |
| 412 | 415 | <th>Key</th> |
| 413 | 416 | <th>Value</th> |
| @@ -418,11 +421,11 @@ | ||
| 418 | 421 | $i = 0; |
| 419 | 422 | foreach ($custom_settings as $key => $value) : |
| 420 | 423 | ?> |
| 421 | 424 | <tr style="vertical-align:top"> |
| 422 | - <th width="30%" scope="row"><input type="hidden" name="notes[<?php echo $i; ?>][key0]" value="<?php echo wp_specialchars($key, 'both'); ?>" /> | |
| 423 | - <input id="notes-<?php echo $i; ?>-key" name="notes[<?php echo $i; ?>][key1]" value="<?php echo wp_specialchars($key, 'both'); ?>" /></th> | |
| 424 | - <td width="60%"><textarea rows="2" cols="40" id="notes-<?php echo $i; ?>-value" name="notes[<?php echo $i; ?>][value]"><?php echo wp_specialchars($value, 'both'); ?></textarea></td> | |
| 425 | + <th width="30%" scope="row"><input type="hidden" name="notes[<?php echo $i; ?>][key0]" value="<?php echo esc_html($key); ?>" /> | |
| 426 | + <input id="notes-<?php echo $i; ?>-key" name="notes[<?php echo $i; ?>][key1]" value="<?php echo esc_html($key); ?>" /></th> | |
| 427 | + <td width="60%"><textarea rows="2" cols="40" id="notes-<?php echo $i; ?>-value" name="notes[<?php echo $i; ?>][value]"><?php echo esc_html($value); ?></textarea></td> | |
| 425 | 428 | <td width="10%"><select name="notes[<?php echo $i; ?>][action]"> |
| 426 | 429 | <option value="update">save changes</option> |
| 427 | 430 | <option value="delete">delete this setting</option> |
| 428 | 431 | </select></td> |
| @@ -432,11 +435,17 @@ | ||
| 432 | 435 | $i++; |
| 433 | 436 | endforeach; |
| 434 | 437 | ?> |
| 435 | 438 | |
| 436 | - <tr> | |
| 439 | + <tr style="vertical-align: top"> | |
| 437 | 440 | <th scope="row"><input type="text" size="10" name="notes[<?php echo $i; ?>][key1]" value="" /></th> |
| 438 | - <td><textarea name="notes[<?php echo $i; ?>][value]" rows="2" cols="40"></textarea></td> | |
| 441 | + <td><textarea name="notes[<?php echo $i; ?>][value]" rows="2" cols="40"></textarea> | |
| 442 | + <p>Enter a text value, or a path to a data element from the syndicated item.<br/> | |
| 443 | + For data elements, you can use an XPath-like syntax wrapped in <code>$( ... )</code>.<br/> | |
| 444 | + <code>hello</code> = the text value <code><span style="background-color: #30FFA0;">hello</span></code><br/> | |
| 445 | + <code>$(author/email)</code> = the contents of <code><author><email><span style="background-color: #30FFA0">...</span></email></author></code><br/> | |
| 446 | + <code>$(media:content/@url)</code> = the contents of <code><media:content url="<span style="background-color: #30FFA0">...</span>">...</media:content></code></p> | |
| 447 | + </td> | |
| 439 | 448 | <td><em>add new setting...</em><input type="hidden" name="notes[<?php echo $i; ?>][action]" value="update" /></td> |
| 440 | 449 | </tr> |
| 441 | 450 | </table> |
| 442 | 451 | </div> <!-- id="postcustomstuff" --> |
| @@ -441,88 +450,65 @@ | ||
| 441 | 450 | </table> |
| 442 | 451 | </div> <!-- id="postcustomstuff" --> |
| 443 | 452 | |
| 444 | 453 | <?php |
| 445 | - } /* FeedWordPressPostsPage::custom_post_settings_box() */ | |
| 446 | -} | |
| 454 | + } /* FeedWordPressPostsPage::custom_post_settings_box() */ | |
| 447 | 455 | |
| 448 | -function fwp_posts_page () { | |
| 449 | - global $wpdb, $wp_db_version; | |
| 450 | - global $fwp_post; | |
| 456 | + function custom_post_types_box ($page, $box = NULL) { | |
| 457 | + global $fwp_path; | |
| 458 | + | |
| 459 | + // local: syndicated post type // default NULL | |
| 460 | + // global: syndicated_post_type // default 'post' | |
| 461 | + // default-input-value => 'default' | |
| 462 | + | |
| 463 | + // Get all custom post types | |
| 464 | + $post_types = get_post_types(array( | |
| 465 | + '_builtin' => false, | |
| 466 | + ), 'objects'); | |
| 451 | 467 | |
| 452 | - if (FeedWordPress::needs_upgrade()) : | |
| 453 | - fwp_upgrade_page(); | |
| 454 | - return; | |
| 455 | - endif; | |
| 456 | - | |
| 457 | - // If this is a POST, validate source and user credentials | |
| 458 | - FeedWordPressCompatibility::validate_http_request(/*action=*/ 'feedwordpress_posts_settings', /*capability=*/ 'manage_links'); | |
| 459 | - | |
| 460 | - $link = FeedWordPressAdminPage::submitted_link(); | |
| 461 | - $link_id = $link->id; | |
| 462 | - $postsPage = new FeedWordPressPostsPage($link); | |
| 463 | - | |
| 464 | - $mesg = null; | |
| 465 | - | |
| 466 | - //////////////////////////////////////////////// | |
| 467 | - // Process POST request, if any //////////////// | |
| 468 | - //////////////////////////////////////////////// | |
| 469 | - if (strtoupper($_SERVER['REQUEST_METHOD'])=='POST') : | |
| 470 | - $postsPage->accept_POST($fwp_post); | |
| 471 | - do_action('feedwordpress_admin_page_posts_save', $fwp_post, $postsPage); | |
| 472 | - endif; | |
| 468 | + $ul = array(); | |
| 469 | + $ul['post'] = __('Normal WordPress posts'); | |
| 470 | + foreach ($post_types as $post_type) : | |
| 471 | + $ul[$post_type->name] = __($post_type->labels->name); | |
| 472 | + endforeach; | |
| 473 | + | |
| 474 | + $params = array( | |
| 475 | + 'global-setting-default' => 'post', | |
| 476 | + 'default-input-value' => 'default', | |
| 477 | + ); | |
| 478 | + | |
| 479 | + // Hey, ho, let's go... | |
| 480 | + ?> | |
| 481 | + <table class="edit-form narrow"> | |
| 482 | + <tbody> | |
| 483 | + <tr><th><?php _e('Custom Post Types:'); ?></th> | |
| 484 | + <td><p>Incoming syndicated posts should be stored in the | |
| 485 | + posts database as...</p> | |
| 486 | + <?php | |
| 487 | + $this->setting_radio_control( | |
| 488 | + 'syndicated post type', 'syndicated_post_type', | |
| 489 | + $ul, $params | |
| 490 | + ); | |
| 491 | + ?> | |
| 492 | + </td></tr> | |
| 493 | + </tbody> | |
| 494 | + </table> | |
| 495 | + <?php | |
| 496 | + } /* FeedWordPressPostsPage::custom_post_types_box() */ | |
| 473 | 497 | |
| 474 | - $postsPage->ajax_interface_js(); | |
| 475 | - | |
| 476 | - if ($postsPage->updated) : ?> | |
| 477 | -<div class="updated"><p>Syndicated posts settings updated.</p></div> | |
| 478 | -<?php elseif (!is_null($mesg)) : ?> | |
| 479 | -<div class="updated"><p><?php print wp_specialchars($mesg, 1); ?></p></div> | |
| 480 | -<?php endif; ?> | |
| 481 | - | |
| 482 | -<?php | |
| 483 | - $links = FeedWordPress::syndicated_links(); | |
| 484 | - $postsPage->open_sheet('Syndicated Posts & Links'); | |
| 485 | -?> | |
| 486 | -<style type="text/css"> | |
| 487 | - table.edit-form th, table.form-table th { width: 27%; vertical-align: top; } | |
| 488 | - table.edit-form td, table.form-table td { width: 73%; vertical-align: top; } | |
| 489 | - ul.options { margin: 0; padding: 0; list-style: none; } | |
| 490 | -</style> | |
| 491 | -<div id="post-body"> | |
| 492 | -<?php | |
| 493 | -$boxes_by_methods = array( | |
| 494 | - 'publication_box' => __('Syndicated Posts'), | |
| 495 | - 'links_box' => __('Links'), | |
| 496 | - 'formatting_box' => __('Formatting'), | |
| 497 | - 'comments_and_pings_box' => __('Comments & Pings'), | |
| 498 | - 'custom_post_settings_box' => __('Custom Post Settings (to apply to each syndicated post)'), | |
| 499 | -); | |
| 500 | - | |
| 501 | -// Feed-level settings don't exist for these. | |
| 502 | -if ($postsPage->for_feed_settings()) : | |
| 503 | - unset($boxes_by_methods['links_box']); | |
| 504 | -endif; | |
| 505 | - | |
| 506 | - foreach ($boxes_by_methods as $method => $title) : | |
| 507 | - fwp_add_meta_box( | |
| 508 | - /*id=*/ 'feedwordpress_'.$method, | |
| 509 | - /*title=*/ $title, | |
| 510 | - /*callback=*/ array('FeedWordPressPostsPage', $method), | |
| 511 | - /*page=*/ $postsPage->meta_box_context(), | |
| 512 | - /*context=*/ $postsPage->meta_box_context() | |
| 498 | + function display () { | |
| 499 | + $this->boxes_by_methods = array( | |
| 500 | + 'publication_box' => __('Syndicated Posts'), | |
| 501 | + 'links_box' => __('Links'), | |
| 502 | + 'formatting_box' => __('Formatting'), | |
| 503 | + 'comments_and_pings_box' => __('Comments & Pings'), | |
| 504 | + 'custom_post_settings_box' => __('Custom Post Settings (to apply to each syndicated post)'), | |
| 505 | + 'custom_post_types_box' => ('Custom Post Types (advanced database settings)'), | |
| 513 | 506 | ); |
| 514 | - endforeach; | |
| 515 | - do_action('feedwordpress_admin_page_posts_meta_boxes', $postsPage); | |
| 516 | -?> | |
| 517 | - <div class="metabox-holder"> | |
| 518 | -<?php | |
| 519 | - fwp_do_meta_boxes($postsPage->meta_box_context(), $postsPage->meta_box_context(), $postsPage); | |
| 520 | -?> | |
| 521 | - </div> <!-- class="metabox-holder" --> | |
| 522 | -</div> <!-- id="post-body" --> | |
| 523 | -<?php | |
| 524 | - $postsPage->close_sheet(); | |
| 525 | -} /* function fwp_posts_page () */ | |
| 507 | + | |
| 508 | + parent::display(); | |
| 509 | + } /* FeedWordPressPostsPage::display () */ | |
| 510 | +} | |
| 526 | 511 | |
| 527 | - fwp_posts_page(); | |
| 512 | + $postsPage = new FeedWordPressPostsPage; | |
| 513 | + $postsPage->display(); | |
| 528 | 514 | |
