| @@ -1,11 +1,14 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | class FeedWordPressAdminPage { |
| 3 | 3 | var $context; |
| 4 | 4 | var $updated = false; |
| 5 | + var $mesg = NULL; | |
| 6 | + | |
| 5 | 7 | var $link = NULL; |
| 6 | 8 | var $dispatch = NULL; |
| 7 | 9 | var $filename = NULL; |
| 10 | + var $pagenames = array(); | |
| 8 | 11 | |
| 9 | 12 | /** |
| 10 | 13 | * Construct the admin page object. |
| 11 | 14 | * |
| @@ -20,11 +23,133 @@ | ||
| 20 | 23 | $this->context .= 'forfeed'; |
| 21 | 24 | endif; |
| 22 | 25 | } /* FeedWordPressAdminPage constructor */ |
| 23 | 26 | |
| 27 | + function pageslug () { | |
| 28 | + $slug = preg_replace('/FeedWordPress(.*)Page/', '$1', get_class($this)); | |
| 29 | + return strtolower($slug); | |
| 30 | + } | |
| 31 | + | |
| 32 | + function pagename ($context = NULL) { | |
| 33 | + if (is_null($context)) : | |
| 34 | + $context = 'default'; | |
| 35 | + endif; | |
| 36 | + | |
| 37 | + if (isset($this->pagenames[$context])) : | |
| 38 | + $name = $this->pagenames[$context]; | |
| 39 | + elseif (isset($tis->pagenames['default'])) : | |
| 40 | + $name = $this->pagenames['default']; | |
| 41 | + else : | |
| 42 | + $name = $this->pageslug(); | |
| 43 | + endif; | |
| 44 | + return __($name); | |
| 45 | + } /* FeedWordPressAdminPage::pagename () */ | |
| 46 | + | |
| 47 | + function accept_POST ($post) { | |
| 48 | + if ($this->for_feed_settings() and $this->update_requested_in($post)) : | |
| 49 | + $this->update_feed(); | |
| 50 | + elseif ($this->save_requested_in($post)) : // User mashed Save Changes | |
| 51 | + $this->save_settings($post); | |
| 52 | + endif; | |
| 53 | + do_action($this->dispatch.'_post', &$post, &$this); | |
| 54 | + } | |
| 55 | + | |
| 56 | + function update_feed () { | |
| 57 | + global $feedwordpress; | |
| 58 | + | |
| 59 | + add_action('feedwordpress_check_feed', 'update_feeds_mention'); | |
| 60 | + add_action('feedwordpress_check_feed_complete', 'update_feeds_finish', 10, 3); | |
| 61 | + | |
| 62 | + print '<div class="updated">'; | |
| 63 | + print "<ul>"; | |
| 64 | + $uri = $this->link->uri(); | |
| 65 | + $delta = $feedwordpress->update($uri); | |
| 66 | + print "</ul>"; | |
| 67 | + | |
| 68 | + if (!is_null($delta)) : | |
| 69 | + $mesg = array(); | |
| 70 | + if (isset($delta['new'])) : $mesg[] = ' '.$delta['new'].' new posts were syndicated'; endif; | |
| 71 | + if (isset($delta['updated'])) : $mesg[] = ' '.$delta['updated'].' existing posts were updated'; endif; | |
| 72 | + echo "<p><strong>Update complete.</strong>".implode(' and', $mesg)."</p>"; | |
| 73 | + echo "\n"; flush(); | |
| 74 | + else : | |
| 75 | + $uri = esc_html($uri); | |
| 76 | + echo "<p><strong>Error:</strong> There was a problem updating <a href=\"$uri\">$uri</a></p>\n"; | |
| 77 | + endif; | |
| 78 | + print "</div>\n"; | |
| 79 | + remove_action('feedwordpress_check_feed', 'update_feeds_mention'); | |
| 80 | + remove_action('feedwordpress_check_feed_complete', 'update_feeds_finish', 10, 3); | |
| 81 | + } | |
| 82 | + | |
| 83 | + function save_settings ($post) { | |
| 84 | + do_action($this->dispatch.'_save', &$post, &$this); | |
| 85 | + | |
| 86 | + if ($this->for_feed_settings()) : | |
| 87 | + // Save settings | |
| 88 | + $this->link->save_settings(/*reload=*/ true); | |
| 89 | + $this->updated = true; | |
| 90 | + | |
| 91 | + // Reset, reload | |
| 92 | + $link_id = $this->link->id; | |
| 93 | + unset($this->link); | |
| 94 | + $this->link = new SyndicatedLink($link_id); | |
| 95 | + else : | |
| 96 | + $this->updated = true; | |
| 97 | + endif; | |
| 98 | + } /* FeedWordPressAdminPage::save_settings () */ | |
| 99 | + | |
| 24 | 100 | function for_feed_settings () { return (is_object($this->link) and method_exists($this->link, 'found') and $this->link->found()); } |
| 25 | 101 | function for_default_settings () { return !$this->for_feed_settings(); } |
| 26 | 102 | |
| 103 | + function setting ($names, $fallback_value = NULL, $params = array()) { | |
| 104 | + if (!is_array($params)) : | |
| 105 | + $params = array('default' => $params); | |
| 106 | + endif; | |
| 107 | + $params = shortcode_atts(array( | |
| 108 | + 'default' => 'default', | |
| 109 | + 'fallback' => true, | |
| 110 | + ), $params); | |
| 111 | + | |
| 112 | + if (is_string($names)) : | |
| 113 | + $feed_name = $names; | |
| 114 | + $global_name = 'feedwordpress_'.preg_replace('![\s/]+!', '_', $names); | |
| 115 | + else : | |
| 116 | + $feed_name = $names['feed']; | |
| 117 | + $global_name = 'feedwordpress_'.$names['global']; | |
| 118 | + endif; | |
| 119 | + | |
| 120 | + if ($this->for_feed_settings()) : // Check feed-specific setting first; fall back to global | |
| 121 | + if (!$params['fallback']) : $global_name = NULL; endif; | |
| 122 | + $ret = $this->link->setting($feed_name, $global_name, $fallback_value, $params['default']); | |
| 123 | + else : // Check global setting | |
| 124 | + $ret = get_option($global_name, $fallback_value); | |
| 125 | + endif; | |
| 126 | + return $ret; | |
| 127 | + } | |
| 128 | + | |
| 129 | + function update_setting ($names, $value, $default = 'default') { | |
| 130 | + if (is_string($names)) : | |
| 131 | + $feed_name = $names; | |
| 132 | + $global_name = 'feedwordpress_'.preg_replace('![\s/]+!', '_', $names); | |
| 133 | + else : | |
| 134 | + $feed_name = $names['feed']; | |
| 135 | + $global_name = 'feedwordpress_'.$names['global']; | |
| 136 | + endif; | |
| 137 | + | |
| 138 | + if ($this->for_feed_settings()) : // Update feed-specific setting | |
| 139 | + $this->link->update_setting($feed_name, $value, $default); | |
| 140 | + else : // Update global setting | |
| 141 | + update_option($global_name, $value); | |
| 142 | + endif; | |
| 143 | + } /* FeedWordPressAdminPage::update_setting () */ | |
| 144 | + | |
| 145 | + function save_requested_in ($post) { | |
| 146 | + return (isset($post['save']) or isset($post['submit'])); | |
| 147 | + } | |
| 148 | + function update_requested_in ($post) { | |
| 149 | + return (isset($post['update']) and (strlen($post['update']) > 0)); | |
| 150 | + } | |
| 151 | + | |
| 27 | 152 | /*static*/ function submitted_link_id () { |
| 28 | 153 | global $fwp_post; |
| 29 | 154 | |
| 30 | 155 | // Presume global unless we get a specific link ID |
| @@ -51,9 +176,9 @@ | ||
| 51 | 176 | |
| 52 | 177 | /*static*/ function submitted_link () { |
| 53 | 178 | $link_id = FeedWordPressAdminPage::submitted_link_id(); |
| 54 | 179 | if (is_numeric($link_id) and $link_id) : |
| 55 | - $link =& new SyndicatedLink($link_id); | |
| 180 | + $link = new SyndicatedLink($link_id); | |
| 56 | 181 | else : |
| 57 | 182 | $link = NULL; |
| 58 | 183 | endif; |
| 59 | 184 | return $link; |
| @@ -61,9 +186,9 @@ | ||
| 61 | 186 | |
| 62 | 187 | function stamp_link_id ($field = null) { |
| 63 | 188 | if (is_null($field)) : $field = 'save_link_id'; endif; |
| 64 | 189 | ?> |
| 65 | - <input type="hidden" name="<?php print wp_specialchars($field, 'both'); ?>" value="<?php print ($this->for_feed_settings() ? $this->link->id : '*'); ?>" /> | |
| 190 | + <input type="hidden" name="<?php print esc_html($field); ?>" value="<?php print ($this->for_feed_settings() ? $this->link->id : '*'); ?>" /> | |
| 66 | 191 | <?php |
| 67 | 192 | } /* FeedWordPressAdminPage::stamp_link_id () */ |
| 68 | 193 | |
| 69 | 194 | function these_posts_phrase () { |
| @@ -98,121 +223,152 @@ | ||
| 98 | 223 | } /* FeedWordPressAdminPage::fix_toggles() */ |
| 99 | 224 | |
| 100 | 225 | function ajax_interface_js () { |
| 101 | 226 | ?> |
| 102 | -<script type="text/javascript"> | |
| 103 | 227 | function contextual_appearance (item, appear, disappear, value, visibleStyle, checkbox) { |
| 104 | 228 | if (typeof(visibleStyle)=='undefined') visibleStyle = 'block'; |
| 105 | 229 | |
| 106 | 230 | var rollup=document.getElementById(item); |
| 107 | - var newuser=document.getElementById(appear); | |
| 108 | - var sitewide=document.getElementById(disappear); | |
| 109 | 231 | if (rollup) { |
| 110 | 232 | if ((checkbox && rollup.checked) || (!checkbox && value==rollup.value)) { |
| 111 | - if (newuser) newuser.style.display=visibleStyle; | |
| 112 | - if (sitewide) sitewide.style.display='none'; | |
| 233 | + jQuery('#'+disappear).hide(); | |
| 234 | + jQuery('#'+appear).show(600); | |
| 113 | 235 | } else { |
| 114 | - if (newuser) newuser.style.display='none'; | |
| 115 | - if (sitewide) sitewide.style.display=visibleStyle; | |
| 236 | + jQuery('#'+appear).hide(); | |
| 237 | + jQuery('#'+disappear).show(600); | |
| 116 | 238 | } |
| 117 | 239 | } |
| 118 | 240 | } |
| 119 | -</script> | |
| 120 | - | |
| 121 | 241 | <?php |
| 122 | 242 | } /* FeedWordPressAdminPage::ajax_interface_js () */ |
| 123 | 243 | |
| 244 | + function display_feed_settings_page_links ($params = array()) { | |
| 245 | + global $fwp_path; | |
| 246 | + | |
| 247 | + $params = wp_parse_args($params, array( | |
| 248 | + 'before' => '', | |
| 249 | + 'between' => ' | ', | |
| 250 | + 'after' => '', | |
| 251 | + 'long' => false, | |
| 252 | + 'subscription' => $this->link, | |
| 253 | + )); | |
| 254 | + $sub = $params['subscription']; | |
| 255 | + | |
| 256 | + $links = array( | |
| 257 | + "Feed" => array('page' => 'feeds-page.php', 'long' => 'Feeds & Updates'), | |
| 258 | + "Posts" => array('page' => 'posts-page.php', 'long' => 'Posts & Links'), | |
| 259 | + "Authors" => array('page' => 'authors-page.php', 'long' => 'Authors'), | |
| 260 | + 'Categories' => array('page' => 'categories-page.php', 'long' => 'Categories'.FEEDWORDPRESS_AND_TAGS), | |
| 261 | + ); | |
| 262 | + | |
| 263 | + $hrefPrefix = 'admin.php?'; | |
| 264 | + | |
| 265 | + $link_id = NULL; | |
| 266 | + if (is_object($sub)) : | |
| 267 | + if (method_exists($sub, 'found')) : | |
| 268 | + if ($sub->found()) : | |
| 269 | + $link_id = $sub->link->link_id; | |
| 270 | + endif; | |
| 271 | + else : | |
| 272 | + $link_id = $sub->link_id; | |
| 273 | + endif; | |
| 274 | + endif; | |
| 275 | + | |
| 276 | + if (!is_null($link_id)) : | |
| 277 | + $urlParam = "link_id={$link_id}"; | |
| 278 | + $hrefPrefix .= $urlParam."&"; | |
| 279 | + $urlSuffix = "&".$urlParam; | |
| 280 | + else : | |
| 281 | + $urlParam = ''; | |
| 282 | + endif; | |
| 283 | + $hrefPrefix .= "page=${fwp_path}/"; | |
| 284 | + | |
| 285 | + print $params['before']; $first = true; | |
| 286 | + foreach ($links as $label => $link) : | |
| 287 | + if (!$first) : print $params['between']; endif; | |
| 288 | + | |
| 289 | + if (isset($link['url'])) : $url = $link['url'].$urlSuffix; | |
| 290 | + else : $url = $hrefPrefix.$link['page']; | |
| 291 | + endif; | |
| 292 | + $url = esc_html($url); | |
| 293 | + | |
| 294 | + if ($link['page']==basename($this->filename)) : | |
| 295 | + print "<strong>"; | |
| 296 | + else : | |
| 297 | + print "<a href=\"${url}\">"; | |
| 298 | + endif; | |
| 299 | + | |
| 300 | + if ($params['long']) : print esc_html(__($link['long'])); | |
| 301 | + else : print esc_html(__($label)); | |
| 302 | + endif; | |
| 303 | + | |
| 304 | + if ($link['page']==basename($this->filename)) : | |
| 305 | + print "</strong>"; | |
| 306 | + else : | |
| 307 | + print "</a>"; | |
| 308 | + endif; | |
| 309 | + | |
| 310 | + $first = false; | |
| 311 | + endforeach; | |
| 312 | + print $params['after']; | |
| 313 | + } /* FeedWordPressAdminPage::display_feed_settings_page_links */ | |
| 314 | + | |
| 124 | 315 | function display_feed_select_dropdown() { |
| 125 | 316 | $links = FeedWordPress::syndicated_links(); |
| 126 | - if (fwp_test_wp_version(FWP_SCHEMA_27)) : | |
| 127 | - ?> | |
| 128 | - <style type="text/css"> | |
| 129 | - #post-search { | |
| 130 | - float: right; | |
| 131 | - margin:11px 12px 0; | |
| 132 | - min-width: 130px; | |
| 133 | - position:relative; | |
| 134 | - } | |
| 135 | - .fwpfs { | |
| 136 | - color: #dddddd; | |
| 137 | - background:#797979 url(<?php bloginfo('home') ?>/wp-admin/images/fav.png) repeat-x scroll left center; | |
| 138 | - border-color:#777777 #777777 #666666 !important; -moz-border-radius-bottomleft:12px; | |
| 139 | - -moz-border-radius-bottomright:12px; | |
| 140 | - -moz-border-radius-topleft:12px; | |
| 141 | - -moz-border-radius-topright:12px; | |
| 142 | - border-style:solid; | |
| 143 | - border-width:1px; | |
| 144 | - line-height:15px; | |
| 145 | - padding:3px 30px 4px 12px; | |
| 146 | - } | |
| 147 | - .fwpfs.slide-down { | |
| 148 | - border-bottom-color: #626262; | |
| 149 | - -moz-border-radius-bottomleft:0; | |
| 150 | - -moz-border-radius-bottomright:0; | |
| 151 | - -moz-border-radius-topleft:12px; | |
| 152 | - -moz-border-radius-topright:12px; | |
| 153 | - background-image:url(<?php bloginfo('home') ?>/wp-admin/images/fav-top.png); | |
| 154 | - background-position:0 top; | |
| 155 | - background-repeat:repeat-x; | |
| 156 | - border-bottom-style:solid; | |
| 157 | - border-bottom-width:1px; | |
| 158 | - } | |
| 159 | - </style> | |
| 160 | - | |
| 161 | - <script type="text/javascript"> | |
| 162 | - jQuery(document).ready(function($){ | |
| 163 | - $('.fwpfs').toggle( | |
| 164 | - function(){$('.fwpfs').removeClass('slideUp').addClass('slideDown'); setTimeout(function(){if ( $('.fwpfs').hasClass('slideDown') ) { $('.fwpfs').addClass('slide-down'); }}, 10) }, | |
| 165 | - function(){$('.fwpfs').removeClass('slideDown').addClass('slideUp'); setTimeout(function(){if ( $('.fwpfs').hasClass('slideUp') ) { $('.fwpfs').removeClass('slide-down'); }}, 10) } | |
| 166 | - ); | |
| 167 | - $('.fwpfs').bind( | |
| 168 | - 'change', | |
| 169 | - function () { this.form.submit(); } | |
| 170 | - ); | |
| 171 | - $('#post-search .button').css( 'display', 'none' ); | |
| 172 | - }); | |
| 173 | - </script> | |
| 174 | - <?php | |
| 175 | - endif; | |
| 176 | 317 | |
| 177 | 318 | ?> |
| 178 | - <p id="post-search"> | |
| 179 | - <select name="link_id" class="fwpfs" style="max-width: 20.0em;"> | |
| 319 | + <div id="fwpfs-container"><ul class="subsubsub"> | |
| 320 | + <li><select name="link_id" class="fwpfs" style="max-width: 20.0em;"> | |
| 180 | 321 | <option value="*"<?php if ($this->for_default_settings()) : ?> selected="selected"<?php endif; ?>>- defaults for all feeds -</option> |
| 181 | 322 | <?php if ($links) : foreach ($links as $ddlink) : ?> |
| 182 | - <option value="<?php print (int) $ddlink->link_id; ?>"<?php if (!is_null($this->link) and ($this->link->id==$ddlink->link_id)) : ?> selected="selected"<?php endif; ?>><?php print wp_specialchars($ddlink->link_name, 1); ?></option> | |
| 323 | + <option value="<?php print (int) $ddlink->link_id; ?>"<?php if (!is_null($this->link) and ($this->link->id==$ddlink->link_id)) : ?> selected="selected"<?php endif; ?>><?php print esc_html($ddlink->link_name); ?></option> | |
| 183 | 324 | <?php endforeach; endif; ?> |
| 184 | 325 | </select> |
| 185 | - <input class="button" type="submit" name="go" value="<?php _e('Go') ?> »" /> | |
| 186 | - </p> | |
| 326 | + <input id="fwpfs-button" class="button" type="submit" name="go" value="<?php _e('Go') ?> »" /></li> | |
| 327 | + | |
| 187 | 328 | <?php |
| 329 | + $this->display_feed_settings_page_links(array( | |
| 330 | + 'before' => '<li>', | |
| 331 | + 'between' => "</li>\n<li>", | |
| 332 | + 'after' => '</li>', | |
| 333 | + 'subscription' => $this->link, | |
| 334 | + )); | |
| 335 | + | |
| 336 | + if ($this->for_feed_settings()) : | |
| 337 | + ?> | |
| 338 | + <li><input class="button" type="submit" name="update" value="Update Now" /></li> | |
| 339 | + <?php | |
| 340 | + endif; | |
| 341 | + ?> | |
| 342 | + </ul> | |
| 343 | + </div> | |
| 344 | + <?php | |
| 188 | 345 | } /* FeedWordPressAdminPage::display_feed_select_dropdown() */ |
| 189 | 346 | |
| 190 | 347 | function display_sheet_header ($pagename = 'Syndication', $all = false) { |
| 191 | - if (FeedWordPressCompatibility::test_version(FWP_SCHEMA_27)) : | |
| 192 | - ?> | |
| 193 | - <div class="icon32"><img src="<?php print wp_specialchars(WP_PLUGIN_URL.'/'.$GLOBALS['fwp_path'].'/feedwordpress.png', 1); ?>" alt="" /></div> | |
| 194 | - <?php | |
| 195 | - endif; | |
| 196 | 348 | ?> |
| 197 | - | |
| 198 | - <h2><?php print wp_specialchars(__($pagename.($all ? '' : ' Settings')), 1); ?><?php if ($this->for_feed_settings()) : ?>: <?php echo wp_specialchars($this->link->link->link_name, 1); ?><?php endif; ?></h2> | |
| 349 | + <div class="icon32"><img src="<?php print esc_html(WP_PLUGIN_URL.'/'.$GLOBALS['fwp_path'].'/feedwordpress.png'); ?>" alt="" /></div> | |
| 350 | + <h2><?php print esc_html(__($pagename.($all ? '' : ' Settings'))); ?><?php if ($this->for_feed_settings()) : ?>: <?php echo esc_html($this->link->name(/*from feed=*/ false)); ?><?php endif; ?></h2> | |
| 199 | 351 | <?php |
| 200 | 352 | } |
| 201 | 353 | |
| 202 | 354 | function display_update_notice_if_updated ($pagename = 'Syndication', $mesg = NULL) { |
| 355 | + if (!is_null($mesg)) : | |
| 356 | + $this->mesg = $mesg; | |
| 357 | + endif; | |
| 358 | + | |
| 203 | 359 | if ($this->updated) : |
| 204 | 360 | if ($this->updated === true) : |
| 205 | - $mesg = $pagename . ' settings updated.'; | |
| 361 | + $this->mesg = $pagename . ' settings updated.'; | |
| 206 | 362 | else : |
| 207 | - $mesg = $this->updated; | |
| 363 | + $this->mesg = $this->updated; | |
| 208 | 364 | endif; |
| 209 | 365 | endif; |
| 210 | 366 | |
| 211 | - if (!is_null($mesg)) : | |
| 367 | + if (!is_null($this->mesg)) : | |
| 212 | 368 | ?> |
| 213 | 369 | <div class="updated"> |
| 214 | - <p><?php print wp_specialchars($mesg, 1); ?></p> | |
| 370 | + <p><?php print esc_html($this->mesg); ?></p> | |
| 215 | 371 | </div> |
| 216 | 372 | <?php |
| 217 | 373 | endif; |
| 218 | 374 | } /* FeedWordPressAdminPage::display_update_notice_if_updated() */ |
| @@ -220,9 +376,9 @@ | ||
| 220 | 376 | function display_settings_scope_message () { |
| 221 | 377 | if ($this->for_feed_settings()) : |
| 222 | 378 | ?> |
| 223 | 379 | <p>These settings only affect posts syndicated from |
| 224 | - <strong><?php echo wp_specialchars($this->link->link->link_name, 1); ?></strong>.</p> | |
| 380 | + <strong><?php echo esc_html($this->link->link->link_name); ?></strong>.</p> | |
| 225 | 381 | <?php |
| 226 | 382 | else : |
| 227 | 383 | ?> |
| 228 | 384 | <p>These settings affect posts syndicated from any feed unless they are overridden |
| @@ -232,22 +388,99 @@ | ||
| 232 | 388 | } /* FeedWordPressAdminPage::display_settings_scope_message () */ |
| 233 | 389 | |
| 234 | 390 | /*static*/ function has_link () { return true; } |
| 235 | 391 | |
| 392 | + function form_action ($filename = NULL) { | |
| 393 | + global $fwp_path; | |
| 394 | + | |
| 395 | + if (is_null($filename)) : | |
| 396 | + $filename = basename($this->filename); | |
| 397 | + endif; | |
| 398 | + return "admin.php?page=${fwp_path}/".$filename; | |
| 399 | + } /* FeedWordPressAdminPage::form_action () */ | |
| 400 | + | |
| 401 | + function update_message () { | |
| 402 | + return $this->mesg; | |
| 403 | + } | |
| 404 | + | |
| 405 | + function display () { | |
| 406 | + if (FeedWordPress::needs_upgrade()) : | |
| 407 | + fwp_upgrade_page(); | |
| 408 | + return; | |
| 409 | + endif; | |
| 410 | + | |
| 411 | + FeedWordPressCompatibility::validate_http_request(/*action=*/ $this->dispatch, /*capability=*/ 'manage_links'); | |
| 412 | + | |
| 413 | + //////////////////////////////////////////////// | |
| 414 | + // Process POST request, if any //////////////// | |
| 415 | + //////////////////////////////////////////////// | |
| 416 | + if (strtoupper($_SERVER['REQUEST_METHOD'])=='POST') : | |
| 417 | + $this->accept_POST($GLOBALS['fwp_post']); | |
| 418 | + else : | |
| 419 | + $this->updated = false; | |
| 420 | + endif; | |
| 421 | + | |
| 422 | + //////////////////////////////////////////////// | |
| 423 | + // Prepare settings page /////////////////////// | |
| 424 | + //////////////////////////////////////////////// | |
| 425 | + | |
| 426 | + $this->display_update_notice_if_updated( | |
| 427 | + $this->pagename('settings-update'), | |
| 428 | + $this->update_message() | |
| 429 | + ); | |
| 430 | + | |
| 431 | + $this->open_sheet($this->pagename('open-sheet')); | |
| 432 | + ?> | |
| 433 | + <div id="post-body"> | |
| 434 | + <?php | |
| 435 | + foreach ($this->boxes_by_methods as $method => $row) : | |
| 436 | + if (is_array($row)) : | |
| 437 | + $id = $row['id']; | |
| 438 | + $title = $row['title']; | |
| 439 | + else : | |
| 440 | + $id = 'feedwordpress_'.$method; | |
| 441 | + $title = $row; | |
| 442 | + endif; | |
| 443 | + | |
| 444 | + add_meta_box( | |
| 445 | + /*id=*/ $id, | |
| 446 | + /*title=*/ $title, | |
| 447 | + /*callback=*/ array(&$this, $method), | |
| 448 | + /*page=*/ $this->meta_box_context(), | |
| 449 | + /*context=*/ $this->meta_box_context() | |
| 450 | + ); | |
| 451 | + endforeach; | |
| 452 | + do_action($this->dispatch.'_meta_boxes', $this); | |
| 453 | + ?> | |
| 454 | + <div class="metabox-holder"> | |
| 455 | + <?php | |
| 456 | + fwp_do_meta_boxes($this->meta_box_context(), $this->meta_box_context(), $this); | |
| 457 | + ?> | |
| 458 | + </div> <!-- class="metabox-holder" --> | |
| 459 | + </div> <!-- id="post-body" --> | |
| 460 | + <?php $this->close_sheet(); ?> | |
| 461 | + <?php | |
| 462 | + } | |
| 463 | + | |
| 236 | 464 | function open_sheet ($header) { |
| 237 | 465 | // Set up prepatory AJAX stuff |
| 466 | + ?> | |
| 467 | + <script type="text/javascript"> | |
| 468 | + <?php | |
| 238 | 469 | $this->ajax_interface_js(); |
| 239 | - if (function_exists('add_meta_box')) : | |
| 240 | - add_action( | |
| 241 | - FeedWordPressCompatibility::bottom_script_hook($this->filename), | |
| 242 | - /*callback=*/ array($this, 'fix_toggles'), | |
| 243 | - /*priority=*/ 10000 | |
| 244 | - ); | |
| 245 | - FeedWordPressSettingsUI::ajax_nonce_fields(); | |
| 246 | - endif; | |
| 470 | + ?> | |
| 471 | + </script> | |
| 472 | + | |
| 473 | + <?php | |
| 474 | + add_action( | |
| 475 | + FeedWordPressCompatibility::bottom_script_hook($this->filename), | |
| 476 | + /*callback=*/ array($this, 'fix_toggles'), | |
| 477 | + /*priority=*/ 10000 | |
| 478 | + ); | |
| 479 | + FeedWordPressSettingsUI::ajax_nonce_fields(); | |
| 247 | 480 | |
| 248 | 481 | ?> |
| 249 | - <div class="wrap" style="position:relative"> | |
| 482 | + <div class="wrap feedwordpress-admin" id="feedwordpress-admin-<?php print $this->pageslug(); ?>"> | |
| 250 | 483 | <?php |
| 251 | 484 | if (!is_null($header)) : |
| 252 | 485 | $this->display_sheet_header($header); |
| 253 | 486 | endif; |
| @@ -253,9 +486,9 @@ | ||
| 253 | 486 | endif; |
| 254 | 487 | |
| 255 | 488 | if (!is_null($this->dispatch)) : |
| 256 | 489 | ?> |
| 257 | - <form action="admin.php?page=<?php print $GLOBALS['fwp_path']; ?>/<?php echo basename($this->filename); ?>" method="post"> | |
| 490 | + <form action="<?php print $this->form_action(); ?>" method="post"> | |
| 258 | 491 | <div><?php |
| 259 | 492 | FeedWordPressCompatibility::stamp_nonce($this->dispatch); |
| 260 | 493 | $this->stamp_link_id(); |
| 261 | 494 | ?></div> |
| @@ -262,84 +495,221 @@ | ||
| 262 | 495 | <?php |
| 263 | 496 | endif; |
| 264 | 497 | |
| 265 | 498 | if ($this->has_link()) : |
| 266 | - $this->display_feed_select_dropdown(); | |
| 267 | 499 | $this->display_settings_scope_message(); |
| 268 | 500 | endif; |
| 269 | 501 | |
| 270 | - if (function_exists('do_meta_boxes')) : | |
| 271 | - ?> | |
| 272 | - <div id="poststuff"> | |
| 273 | - <?php | |
| 274 | - else : | |
| 275 | - ?> | |
| 276 | - </div> <!-- class="wrap" --> | |
| 277 | - <?php | |
| 502 | + ?><div class="tablenav"><?php | |
| 503 | + if (!is_null($this->dispatch)) : | |
| 504 | + ?><div class="alignright"><?php | |
| 505 | + $this->save_button(); | |
| 506 | + ?></div><?php | |
| 278 | 507 | endif; |
| 279 | 508 | |
| 280 | - if (!is_null($this->dispatch)) : | |
| 281 | - fwp_settings_form_single_submit(); | |
| 509 | + if ($this->has_link()) : | |
| 510 | + $this->display_feed_select_dropdown(); | |
| 282 | 511 | endif; |
| 512 | + ?> | |
| 513 | + </div> | |
| 514 | + | |
| 515 | + <div id="poststuff"> | |
| 516 | + <?php | |
| 283 | 517 | } /* FeedWordPressAdminPage::open_sheet () */ |
| 284 | 518 | |
| 285 | 519 | function close_sheet () { |
| 286 | - // WordPress 2.5+ | |
| 287 | - if (function_exists('do_meta_boxes')) : | |
| 288 | - ?> | |
| 289 | - </div> <!-- id="poststuff" --> | |
| 290 | - <?php if (!is_null($this->dispatch)) : ?> | |
| 291 | - <?php fwp_settings_form_single_submit_closer(); ?> | |
| 292 | - </form> | |
| 293 | - <?php endif; ?> | |
| 294 | - </div> <!-- class="wrap" --> | |
| 295 | - <?php | |
| 520 | + ?> | |
| 521 | + | |
| 522 | + </div> <!-- id="poststuff" --> | |
| 523 | + <?php | |
| 524 | + if (!is_null($this->dispatch)) : | |
| 525 | + $this->save_button(); | |
| 526 | + print "</form>\n"; | |
| 296 | 527 | endif; |
| 297 | - } | |
| 298 | -} /* class FeedWordPressAdminPage */ | |
| 528 | + ?> | |
| 529 | + </div> <!-- class="wrap" --> | |
| 530 | + | |
| 531 | + <?php | |
| 532 | + } /* FeedWordPressAdminPage::close_sheet () */ | |
| 533 | + | |
| 534 | + function setting_radio_control ($localName, $globalName, $options, $params = array()) { | |
| 535 | + global $fwp_path; | |
| 536 | + | |
| 537 | + if (isset($params['filename'])) : $filename = $params['filename']; | |
| 538 | + else : $filename = basename($this->filename); | |
| 539 | + endif; | |
| 540 | + | |
| 541 | + if (isset($params['site-wide-url'])) : $href = $params['site-wide-url']; | |
| 542 | + else : $href = "admin.php?page=${fwp_path}/${filename}"; | |
| 543 | + endif; | |
| 544 | + | |
| 545 | + if (isset($params['setting-default'])) : $settingDefault = $params['setting-default']; | |
| 546 | + else : $settingDefault = NULL; | |
| 547 | + endif; | |
| 548 | + | |
| 549 | + if (isset($params['global-setting-default'])) : $globalSettingDefault = $params['global-setting-default']; | |
| 550 | + else : $globalSettingDefault = $settingDefault; | |
| 551 | + endif; | |
| 299 | 552 | |
| 300 | -function fwp_settings_form_single_submit ($caption = NULL) { | |
| 301 | - if (fwp_test_wp_version(FWP_SCHEMA_25, FWP_SCHEMA_27)) : | |
| 302 | - if (is_null($caption)) : $caption = __('Save'); endif; | |
| 303 | -?> | |
| 304 | -<div class="submitbox" id="submitlink"> | |
| 305 | -<div id="previewview"></div> | |
| 306 | -<div class="inside"></div> | |
| 553 | + $globalSetting = get_option('feedwordpress_'.$globalName, $globalSettingDefault); | |
| 554 | + if ($this->for_feed_settings()) : | |
| 555 | + $setting = $this->link->setting($localName, NULL, $settingDefault); | |
| 556 | + else : | |
| 557 | + $setting = $globalSetting; | |
| 558 | + endif; | |
| 559 | + | |
| 560 | + if (isset($params['offer-site-wide'])) : $offerSiteWide = $params['offer-site-wide']; | |
| 561 | + else : $offerSiteWide = $this->for_feed_settings(); | |
| 562 | + endif; | |
| 563 | + | |
| 564 | + // This allows us to provide an alternative set of human-readable | |
| 565 | + // labels for each potential value. For use in Currently: line. | |
| 566 | + if (isset($params['labels'])) : $labels = $params['labels']; | |
| 567 | + elseif (is_callable($options)) : $labels = NULL; | |
| 568 | + else : $labels = $options; | |
| 569 | + endif; | |
| 570 | + | |
| 571 | + if (isset($params['input-name'])) : $inputName = $params['input-name']; | |
| 572 | + else : $inputName = $globalName; | |
| 573 | + endif; | |
| 574 | + | |
| 575 | + if (isset($params['default-input-id'])) : $defaultInputId = $params['default-input-id']; | |
| 576 | + else : $defaultInputId = NULL; | |
| 577 | + endif; | |
| 307 | 578 | |
| 308 | -<p class="submit"> | |
| 309 | -<input type="submit" name="save" value="<?php print $caption; ?>" /> | |
| 310 | -</p> | |
| 311 | -</div> | |
| 312 | -<?php | |
| 313 | - endif; | |
| 314 | -} | |
| 579 | + if (isset($params['default-input-id-no'])) : $defaultInputIdNo = $params['default-input-id-no']; | |
| 580 | + elseif (!is_null($defaultInputId)) : $defaultInputIdNo = $defaultInputId.'-no'; | |
| 581 | + else : $defaultInputIdNo = NULL; | |
| 582 | + endif; | |
| 583 | + | |
| 584 | + // This allows us to either include the site-default setting as | |
| 585 | + // one of the options within the radio box, or else as a simple | |
| 586 | + // yes/no toggle that controls whether or not to check another | |
| 587 | + // set of inputs. | |
| 588 | + if (isset($params['default-input-name'])) : $defaultInputName = $params['default-input-name']; | |
| 589 | + else : $defaultInputName = $inputName; | |
| 590 | + endif; | |
| 315 | 591 | |
| 316 | -function fwp_settings_form_periodic_submit ($caption = NULL) { | |
| 317 | - if (!fwp_test_wp_version(FWP_SCHEMA_25)) : | |
| 318 | - if (is_null($caption)) : $caption = __('Save Changes »'); endif; | |
| 319 | -?> | |
| 320 | -<p class="submit"> | |
| 321 | -<input type="submit" name="save" value="<?php print $caption; ?>" /> | |
| 322 | -</p> | |
| 323 | -<?php | |
| 324 | - endif; | |
| 325 | -} | |
| 592 | + if ($defaultInputName != $inputName) : | |
| 593 | + $defaultInputValue = 'yes'; | |
| 594 | + else : | |
| 595 | + $defaultInputValue = ( | |
| 596 | + isset($params['default-input-value']) | |
| 597 | + ? $params['default-input-value'] | |
| 598 | + : 'site-default' | |
| 599 | + ); | |
| 600 | + endif; | |
| 601 | + | |
| 602 | + $settingDefaulted = (is_null($setting) or ($settingDefault === $setting)); | |
| 326 | 603 | |
| 327 | -function fwp_settings_form_single_submit_closer ($caption = NULL) { | |
| 328 | - if (fwp_test_wp_version(FWP_SCHEMA_27)) : | |
| 604 | + if (!is_callable($options)) : | |
| 605 | + $checked = array(); | |
| 606 | + if ($settingDefaulted) : | |
| 607 | + $checked[$defaultInputValue] = ' checked="checked"'; | |
| 608 | + endif; | |
| 609 | + | |
| 610 | + foreach ($options as $value => $label) : | |
| 611 | + if ($setting == $value) : | |
| 612 | + $checked[$value] = ' checked="checked"'; | |
| 613 | + else : | |
| 614 | + $checked[$value] = ''; | |
| 615 | + endif; | |
| 616 | + endforeach; | |
| 617 | + endif; | |
| 618 | + | |
| 619 | + $defaulted = array(); | |
| 620 | + if ($defaultInputName != $inputName) : | |
| 621 | + $defaulted['yes'] = ($settingDefaulted ? ' checked="checked"' : ''); | |
| 622 | + $defaulted['no'] = ($settingDefaulted ? '' : ' checked="checked"'); | |
| 623 | + else : | |
| 624 | + $defaulted['yes'] = (isset($checked[$defaultInputValue]) ? $checked[$defaultInputValue] : ''); | |
| 625 | + endif; | |
| 626 | + | |
| 627 | + if (isset($params['defaulted'])) : | |
| 628 | + $defaulted['yes'] = ($params['defaulted'] ? ' checked="checked"' : ''); | |
| 629 | + $defaulted['no'] = ($params['defaulted'] ? '' : ' checked="checked"'); | |
| 630 | + endif; | |
| 631 | + | |
| 632 | + if ($offerSiteWide) : | |
| 633 | + ?> | |
| 634 | + <table class="twofer"> | |
| 635 | + <tbody> | |
| 636 | + <tr><td class="equals first inactive"> | |
| 637 | + <ul class="options"> | |
| 638 | + <li><label><input type="radio" | |
| 639 | + name="<?php print $defaultInputName; ?>" | |
| 640 | + value="<?php print $defaultInputValue; ?>" | |
| 641 | + <?php if (!is_null($defaultInputId)) : ?>id="<?php print $defaultInputId; ?>" <?php endif; ?> | |
| 642 | + <?php print $defaulted['yes']; ?> /> | |
| 643 | + Use the site-wide setting</label> | |
| 644 | + <span class="current-setting">Currently: | |
| 645 | + <strong><?php if (is_callable($labels)) : | |
| 646 | + print call_user_func($labels, $globalSetting, $defaulted, $params); | |
| 647 | + elseif (is_null($labels)) : | |
| 648 | + print $globalSetting; | |
| 649 | + else : | |
| 650 | + print $labels[$globalSetting]; | |
| 651 | + endif; ?></strong> (<a href="<?php print $href; ?>">change</a>)</span></li> | |
| 652 | + </ul></td> | |
| 653 | + | |
| 654 | + <td class="equals second inactive"> | |
| 655 | + <?php if ($defaultInputName != $inputName) : ?> | |
| 656 | + <ul class="options"> | |
| 657 | + <li><label><input type="radio" | |
| 658 | + name="<?php print $defaultInputName; ?>" | |
| 659 | + value="no" | |
| 660 | + <?php if (!is_null($defaultInputIdNo)) : ?>id="<?php print $defaultInputIdNo; ?>" <?php endif; ?> | |
| 661 | + <?php print $defaulted['no']; ?> /> | |
| 662 | + <?php _e('Do something different with this feed.'); ?></label> | |
| 663 | + <?php endif; | |
| 664 | + endif; | |
| 665 | + | |
| 666 | + // Let's spit out the controls here. | |
| 667 | + if (is_callable($options)) : | |
| 668 | + // Method call to print out options list | |
| 669 | + call_user_func($options, $setting, $defaulted, $params); | |
| 670 | + else : | |
| 671 | + ?> | |
| 672 | + <ul class="options"> | |
| 673 | + <?php foreach ($options as $value => $label) : ?> | |
| 674 | + <li><label><input type="radio" name="<?php print $inputName; ?>" | |
| 675 | + value="<?php print $value; ?>" | |
| 676 | + <?php print $checked[$value]; ?> /> | |
| 677 | + <?php print $label; ?></label></li> | |
| 678 | + <?php endforeach; ?> | |
| 679 | + </ul> <!-- class="options" --> | |
| 680 | + <?php | |
| 681 | + endif; | |
| 682 | + | |
| 683 | + if ($offerSiteWide) : | |
| 684 | + if ($defaultInputName != $inputName) : | |
| 685 | + // Close the <li> and <ul class="options"> we opened above | |
| 686 | + ?> | |
| 687 | + </li> | |
| 688 | + </ul> <!-- class="options" --> | |
| 689 | + <?php | |
| 690 | + endif; | |
| 691 | + | |
| 692 | + // Close off the twofer table that we opened up above. | |
| 693 | + ?> | |
| 694 | + </td></tr> | |
| 695 | + </tbody> | |
| 696 | + </table> | |
| 697 | + <?php | |
| 698 | + endif; | |
| 699 | + } /* FeedWordPressAdminPage::setting_radio_control () */ | |
| 700 | + | |
| 701 | + function save_button ($caption = NULL) { | |
| 329 | 702 | if (is_null($caption)) : $caption = __('Save Changes'); endif; |
| 330 | -?> | |
| 703 | + ?> | |
| 331 | 704 | <p class="submit"> |
| 332 | 705 | <input class="button-primary" type="submit" name="save" value="<?php print $caption; ?>" /> |
| 333 | 706 | </p> |
| 334 | -<?php | |
| 335 | - endif; | |
| 336 | -} | |
| 707 | + <?php | |
| 708 | + } | |
| 709 | +} /* class FeedWordPressAdminPage */ | |
| 337 | 710 | |
| 338 | 711 | function fwp_authors_single_submit ($link = NULL) { |
| 339 | - global $wp_db_version; | |
| 340 | - | |
| 341 | - if (fwp_test_wp_version(FWP_SCHEMA_25)) : | |
| 342 | 712 | ?> |
| 343 | 713 | <div class="submitbox" id="submitlink"> |
| 344 | 714 | <div id="previewview"> |
| 345 | 715 | </div> |
| @@ -350,25 +720,16 @@ | ||
| 350 | 720 | <input type="submit" name="save" value="<?php _e('Save') ?>" /> |
| 351 | 721 | </p> |
| 352 | 722 | </div> |
| 353 | 723 | <?php |
| 354 | - endif; | |
| 355 | 724 | } |
| 356 | 725 | |
| 357 | 726 | function fwp_option_box_opener ($legend, $id, $class = "stuffbox") { |
| 358 | - // WordPress 2.5+ | |
| 359 | - if (FeedWordPressCompatibility::test_version(FWP_SCHEMA_25)) : | |
| 360 | 727 | ?> |
| 361 | 728 | <div id="<?php print $id; ?>" class="<?php print $class; ?>"> |
| 362 | 729 | <h3><?php print htmlspecialchars($legend); ?></h3> |
| 363 | 730 | <div class="inside"> |
| 364 | 731 | <?php |
| 365 | - else : | |
| 366 | -?> | |
| 367 | - <div class="wrap"> | |
| 368 | - <h2><?php print htmlspecialchars($legend); ?></h2> | |
| 369 | -<?php | |
| 370 | - endif; | |
| 371 | 732 | } |
| 372 | 733 | |
| 373 | 734 | function fwp_option_box_closer () { |
| 374 | 735 | global $wp_db_version; |
| @@ -383,124 +744,123 @@ | ||
| 383 | 744 | <?php |
| 384 | 745 | endif; |
| 385 | 746 | } |
| 386 | 747 | |
| 387 | -function fwp_tags_box ($tags, $object) { | |
| 748 | +function fwp_tags_box ($tags, $object, $params = array()) { | |
| 388 | 749 | if (!is_array($tags)) : $tags = array(); endif; |
| 389 | - | |
| 750 | + $tax_name = (isset($params['taxonomy']) ? $params['taxonomy'] : 'post_tag'); | |
| 390 | 751 | $desc = "<p style=\"font-size:smaller;font-style:bold;margin:0\">Tag $object as...</p>"; |
| 391 | 752 | |
| 392 | - if (fwp_test_wp_version(FWP_SCHEMA_29)) : // WordPress 2.9+ | |
| 393 | - print $desc; | |
| 394 | - $tax_name = 'post_tag'; | |
| 395 | - $helps = __('Separate tags with commas.'); | |
| 396 | - $box['title'] = __('Tags'); | |
| 753 | + if (isset($params['textarea_name'])) : | |
| 754 | + $textAreaName = $params['textarea_name']; | |
| 755 | + else : | |
| 756 | + $textAreaName = "tax_input[$tax_name]"; | |
| 757 | + endif; | |
| 758 | + print $desc; | |
| 759 | + $helps = __('Separate tags with commas.'); | |
| 760 | + $box['title'] = __('Tags'); | |
| 397 | 761 | ?> |
| 398 | 762 | <div class="tagsdiv" id="<?php echo $tax_name; ?>"> |
| 399 | 763 | <div class="jaxtag"> |
| 400 | 764 | <div class="nojs-tags hide-if-js"> |
| 401 | 765 | <p><?php _e('Add or remove tags'); ?></p> |
| 402 | - <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> | |
| 766 | + <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> | |
| 403 | 767 | |
| 404 | 768 | <div class="ajaxtag hide-if-no-js"> |
| 405 | 769 | <label class="screen-reader-text" for="new-tag-<?php echo $tax_name; ?>"><?php echo $box['title']; ?></label> |
| 406 | 770 | <div class="taghint"><?php _e('Add new tag'); ?></div> |
| 771 | + <p> | |
| 407 | 772 | <input type="text" id="new-tag-<?php echo $tax_name; ?>" name="newtag[<?php echo $tax_name; ?>]" class="newtag form-input-tip" size="16" autocomplete="off" value="" /> |
| 408 | 773 | <input type="button" class="button tagadd" value="<?php esc_attr_e('Add'); ?>" tabindex="3" /> |
| 774 | + </p> | |
| 409 | 775 | </div></div> |
| 410 | 776 | <p class="howto"><?php echo $helps; ?></p> |
| 411 | 777 | <div class="tagchecklist"></div> |
| 412 | 778 | </div> |
| 413 | 779 | <p class="hide-if-no-js"><a href="#titlediv" class="tagcloud-link" id="link-<?php echo $tax_name; ?>"><?php printf( __('Choose from the most used tags in %s'), $box['title'] ); ?></a></p> |
| 414 | -<?php | |
| 415 | - elseif (fwp_test_wp_version(FWP_SCHEMA_28)) : // WordPress 2.8+ | |
| 416 | -?> | |
| 417 | - <?php print $desc; ?> | |
| 418 | - <div class="tagsdiv" id="post_tag"> | |
| 419 | - <div class="jaxtag"> | |
| 420 | - <div class="nojs-tags hide-if-js"> | |
| 421 | - <p><?php _e('Add or remove tags'); ?></p> | |
| 422 | - <textarea name="tax_input[post_tag]" class="the-tags" id="tax-input[post_tag]"><?php echo implode(",", $tags); ?></textarea> | |
| 423 | - </div> | |
| 424 | - | |
| 425 | - <span class="ajaxtag hide-if-no-js"> | |
| 426 | - <label class="screen-reader-text" for="new-tag-post_tag"><?php _e('Tags'); ?></label> | |
| 427 | - <input type="text" id="new-tag-post_tag" name="newtag[post_tag]" class="newtag form-input-tip" size="16" autocomplete="off" value="<?php esc_attr_e('Add new tag'); ?>" /> | |
| 428 | - <input type="button" class="button tagadd" value="<?php esc_attr_e('Add'); ?>" /> | |
| 429 | - </span> | |
| 430 | - </div> | |
| 431 | - <p class="howto"><?php echo __('Separate tags with commas.'); ?></p> | |
| 432 | - <div class="tagchecklist"></div> | |
| 433 | - </div> | |
| 434 | - <p class="tagcloud-link hide-if-no-js"><a href="#titlediv" class="tagcloud-link" id="link-post_tag"><?php printf( __('Choose from the most used tags in %s'), 'Post Tags'); ?></a></p> | |
| 435 | - </div> | |
| 436 | - </div> | |
| 437 | -<?php | |
| 438 | - else : | |
| 439 | -?> | |
| 440 | - <?php print $desc; ?> | |
| 441 | - <p id="jaxtag"><input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo implode(",", $tags); ?>" /></p> | |
| 442 | - <div id="tagchecklist"></div> | |
| 443 | - </div> | |
| 444 | - </div> | |
| 445 | -<?php | |
| 446 | - endif; | |
| 780 | + <?php | |
| 447 | 781 | } |
| 448 | 782 | |
| 449 | -function fwp_category_box ($checked, $object, $tags = array()) { | |
| 783 | +function fwp_category_box ($checked, $object, $tags = array(), $params = array()) { | |
| 450 | 784 | global $wp_db_version; |
| 451 | 785 | |
| 452 | - if (fwp_test_wp_version(FWP_SCHEMA_25)) : // WordPress 2.5.x | |
| 786 | + if (is_string($params)) : | |
| 787 | + $prefix = $params; | |
| 788 | + $taxonomy = 'category'; | |
| 789 | + elseif (is_array($params)) : | |
| 790 | + $prefix = (isset($params['prefix']) ? $params['prefix'] : ''); | |
| 791 | + $taxonomy = (isset($params['taxonomy']) ? $params['taxonomy'] : 'category'); | |
| 792 | + endif; | |
| 793 | + $tax = get_taxonomy($taxonomy); | |
| 794 | + | |
| 795 | + if (strlen($prefix) > 0) : | |
| 796 | + $idPrefix = $prefix.'-'; | |
| 797 | + $idSuffix = "-".$prefix; | |
| 798 | + $namePrefix = $prefix . '_'; | |
| 799 | + else : | |
| 800 | + $idPrefix = 'feedwordpress-'; | |
| 801 | + $idSuffix = "-feedwordpress"; | |
| 802 | + $namePrefix = 'feedwordpress_'; | |
| 803 | + endif; | |
| 804 | + | |
| 453 | 805 | ?> |
| 454 | -<div id="category-adder" class="wp-hidden-children"> | |
| 455 | - <h4><a id="category-add-toggle" href="#category-add" class="hide-if-no-js" tabindex="3"><?php _e( '+ Add New Category' ); ?></a></h4> | |
| 456 | - <p id="category-add" class="wp-hidden-child"> | |
| 457 | - <input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" tabindex="3" /> | |
| 458 | - <?php wp_dropdown_categories( array( 'hide_empty' => 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('Parent category'), 'tab_index' => 3 ) ); ?> | |
| 459 | - <input type="button" id="category-add-sumbit" class="add:categorychecklist:category-add button" value="<?php _e( 'Add' ); ?>" tabindex="3" /> | |
| 460 | - <?php wp_nonce_field( 'add-category', '_ajax_nonce', false ); ?> | |
| 461 | - <span id="category-ajax-response"></span> | |
| 806 | +<div id="<?php print $idPrefix; ?>taxonomy-<?php print $taxonomy; ?>" class="feedwordpress-category-div"> | |
| 807 | + <ul id="<?php print $idPrefix; ?><?php print $taxonomy; ?>-tabs" class="category-tabs"> | |
| 808 | + <li class="ui-tabs-selected tabs"><a href="#<?php print $idPrefix; ?><?php print $taxonomy; ?>-all" tabindex="3"><?php _e( 'All posts' ); ?></a> | |
| 809 | + <p style="font-size:smaller;font-style:bold;margin:0">Give <?php print $object; ?> these <?php print $tax->labels->name; ?></p> | |
| 810 | + </li> | |
| 811 | + </ul> | |
| 812 | + | |
| 813 | +<div id="<?php print $idPrefix; ?><?php print $taxonomy; ?>-all" class="tabs-panel"> | |
| 814 | + <input type="hidden" value="0" name="tax_input[<?php print $taxonomy; ?>][]" /> | |
| 815 | + <ul id="<?php print $idPrefix; ?><?php print $taxonomy; ?>checklist" class="list:<?php print $taxonomy; ?> categorychecklist form-no-clear"> | |
| 816 | + <?php fwp_category_checklist(NULL, false, $checked, $params) ?> | |
| 817 | + </ul> | |
| 818 | +</div> | |
| 819 | + | |
| 820 | +<div id="<?php print $idPrefix; ?><?php print $taxonomy; ?>-adder" class="<?php print $taxonomy; ?>-adder wp-hidden-children"> | |
| 821 | + <h4><a id="<?php print $idPrefix; ?><?php print $taxonomy; ?>-add-toggle" class="category-add-toggle" href="#<?php print $idPrefix; ?><?php print $taxonomy; ?>-add" class="hide-if-no-js" tabindex="3"><?php _e( '+ Add New Category' ); ?></a></h4> | |
| 822 | + <p id="<?php print $idPrefix; ?><?php print $taxonomy; ?>-add" class="category-add wp-hidden-child"> | |
| 823 | + <?php | |
| 824 | + $newcat = 'new'.$taxonomy; | |
| 825 | + | |
| 826 | + // Well, thank God they added "egory" before WP 3.0 came out. | |
| 827 | + if ('newcategory'==$newcat | |
| 828 | + and !FeedWordPressCompatibility::test_version(FWP_SCHEMA_30)) : | |
| 829 | + $newcat = 'newcat'; | |
| 830 | + endif; | |
| 831 | + ?> | |
| 832 | + <label class="screen-reader-text" for="<?php print $idPrefix; ?>new<?php print $taxonomy; ?>"><?php _e('Add New Category'); ?></label> | |
| 833 | + <input | |
| 834 | + id="<?php print $idPrefix; ?>new<?php print $taxonomy; ?>" | |
| 835 | + class="new<?php print $taxonomy; ?> form-required form-input-tip" | |
| 836 | + aria-required="true" | |
| 837 | + tabindex="3" | |
| 838 | + type="text" name="<?php print $newcat; ?>" | |
| 839 | + value="<?php _e( 'New category name' ); ?>" | |
| 840 | + /> | |
| 841 | + <label class="screen-reader-text" for="<?php print $idPrefix; ?>new<?php print $taxonomy; ?>-parent"><?php _e('Parent Category:'); ?></label> | |
| 842 | + <?php wp_dropdown_categories( array( | |
| 843 | + 'taxonomy' => $taxonomy, | |
| 844 | + 'hide_empty' => 0, | |
| 845 | + 'id' => $idPrefix.'new'.$taxonomy.'-parent', | |
| 846 | + 'class' => 'new'.$taxonomy.'-parent', | |
| 847 | + 'name' => $newcat.'_parent', | |
| 848 | + 'orderby' => 'name', | |
| 849 | + 'hierarchical' => 1, | |
| 850 | + 'show_option_none' => __('Parent category'), | |
| 851 | + 'tab_index' => 3, | |
| 852 | + ) ); ?> | |
| 853 | + <input type="button" id="<?php print $idPrefix; ?><?php print $taxonomy; ?>-add-sumbit" class="add:<?php print $idPrefix; ?><?php print $taxonomy; ?>checklist:<?php print $taxonomy; ?>-add add-categorychecklist-category-add button category-add-submit" value="<?php _e( 'Add' ); ?>" tabindex="3" /> | |
| 854 | + <?php /* wp_nonce_field currently doesn't let us set an id different from name, but we need a non-unique name and a unique id */ ?> | |
| 855 | + <input type="hidden" id="_ajax_nonce<?php print esc_html($idSuffix); ?>" name="_ajax_nonce" value="<?php print wp_create_nonce('add-'.$taxonomy); ?>" /> | |
| 856 | + <input type="hidden" id="_ajax_nonce-add-<?php print $taxonomy; ?><?php print esc_html($idSuffix); ?>" name="_ajax_nonce-add-<?php print $taxonomy; ?>" value="<?php print wp_create_nonce('add-'.$taxonomy); ?>" /> | |
| 857 | + <span id="<?php print $idPrefix; ?><?php print $taxonomy; ?>-ajax-response" class="<?php print $taxonomy; ?>-ajax-response"></span> | |
| 462 | 858 | </p> |
| 463 | 859 | </div> |
| 464 | 860 | |
| 465 | -<ul id="category-tabs"> | |
| 466 | - <?php /* ui-tabs-selected in WP 2.7 CSS = tabs in WP 2.8 CSS. Thank you, o brilliant wordsmiths of the WordPress 2.8 stylesheet... */ ?> | |
| 467 | - <li class="ui-tabs-selected tabs"><a href="#categories-all" tabindex="3"><?php _e( 'All posts' ); ?></a> | |
| 468 | - <p style="font-size:smaller;font-style:bold;margin:0">Give <?php print $object; ?> these categories</p> | |
| 469 | -</li> | |
| 470 | -</ul> | |
| 471 | - | |
| 472 | -<?php /* ui-tabs-panel in WP 2.7 CSS = tabs-panel in WP 2.8 CSS. Thank you, o brilliant wordsmiths of the WordPress 2.8 stylesheet... */ ?> | |
| 473 | -<div id="categories-all" class="ui-tabs-panel tabs-panel"> | |
| 474 | - <ul id="categorychecklist" class="list:category categorychecklist form-no-clear"> | |
| 475 | - <?php fwp_category_checklist(NULL, false, $checked) ?> | |
| 476 | - </ul> | |
| 477 | 861 | </div> |
| 478 | 862 | <?php |
| 479 | - elseif (fwp_test_wp_version(FWP_SCHEMA_20)) : // WordPress 2.x | |
| 480 | -?> | |
| 481 | - <div id="moremeta" style="position: relative; right: auto"> | |
| 482 | - <div id="grabit" class="dbx-group"> | |
| 483 | - <fieldset id="categorydiv" class="dbx-box"> | |
| 484 | - <h3 class="dbx-handle"><?php _e('Categories') ?></h3> | |
| 485 | - <div class="dbx-content"> | |
| 486 | - <p style="font-size:smaller;font-style:bold;margin:0">Place <?php print $object; ?> under...</p> | |
| 487 | - <p id="jaxcat"></p> | |
| 488 | - <div id="categorychecklist"><?php fwp_category_checklist(NULL, false, $checked); ?></div> | |
| 489 | - </div> | |
| 490 | - </fieldset> | |
| 491 | - </div> | |
| 492 | - </div> | |
| 493 | -<?php | |
| 494 | - else : // WordPress 1.5 | |
| 495 | -?> | |
| 496 | - <fieldset style="width: 60%;"> | |
| 497 | - <legend><?php _e('Categories') ?></legend> | |
| 498 | - <p style="font-size:smaller;font-style:bold;margin:0">Place <?php print $object; ?> under...</p> | |
| 499 | - <div style="height: 10em; overflow: scroll;"><?php fwp_category_checklist(NULL, false, $checked); ?></div> | |
| 500 | - </fieldset> | |
| 501 | -<?php | |
| 502 | - endif; | |
| 503 | 863 | } |
| 504 | 864 | |
| 505 | 865 | function update_feeds_mention ($feed) { |
| 506 | 866 | echo "<li>Updating <cite>".$feed['link/name']."</cite> from <<a href=\"" |
| @@ -507,9 +867,18 @@ | ||
| 507 | 867 | .$feed['link/uri']."\">".$feed['link/uri']."</a>> ..."; |
| 508 | 868 | flush(); |
| 509 | 869 | } |
| 510 | 870 | function update_feeds_finish ($feed, $added, $dt) { |
| 511 | - echo " completed in $dt second".(($dt==1)?'':'s')."</li>\n"; | |
| 871 | + if (is_wp_error($added)) : | |
| 872 | + $mesgs = $added->get_error_messages(); | |
| 873 | + foreach ($mesgs as $mesg) : | |
| 874 | + echo "<br/><strong>Feed error:</strong> <code>$mesg</code>"; | |
| 875 | + endforeach; | |
| 876 | + echo "</li>\n"; | |
| 877 | + else : | |
| 878 | + echo " completed in $dt second".(($dt==1)?'':'s')."</li>\n"; | |
| 879 | + endif; | |
| 880 | + flush(); | |
| 512 | 881 | } |
| 513 | 882 | |
| 514 | 883 | function fwp_author_list () { |
| 515 | 884 | global $wpdb; |
| @@ -514,20 +883,13 @@ | ||
| 514 | 883 | function fwp_author_list () { |
| 515 | 884 | global $wpdb; |
| 516 | 885 | $ret = array(); |
| 517 | 886 | |
| 518 | - // display_name introduced in WP 2.0 | |
| 519 | - if (fwp_test_wp_version(FWP_SCHEMA_20)) : | |
| 520 | - $name_column = 'display_name'; | |
| 521 | - else : | |
| 522 | - $name_column = 'user_nickname'; | |
| 523 | - endif; | |
| 524 | - | |
| 525 | - $users = $wpdb->get_results("SELECT * FROM $wpdb->users ORDER BY {$name_column}"); | |
| 887 | + $users = get_users_of_blog(); | |
| 526 | 888 | if (is_array($users)) : |
| 527 | 889 | foreach ($users as $user) : |
| 528 | 890 | $id = (int) $user->ID; |
| 529 | - $ret[$id] = $user->{$name_column}; | |
| 891 | + $ret[$id] = $user->display_name; | |
| 530 | 892 | if (strlen(trim($ret[$id])) == 0) : |
| 531 | 893 | $ret[$id] = $user->user_login; |
| 532 | 894 | endif; |
| 533 | 895 | endforeach; |
| @@ -535,63 +897,66 @@ | ||
| 535 | 897 | return $ret; |
| 536 | 898 | } |
| 537 | 899 | |
| 538 | 900 | class FeedWordPressSettingsUI { |
| 539 | - function instead_of_posts_box ($link_id = null) { | |
| 540 | - if (!is_null($link_id)) : | |
| 541 | - $from_this_feed = 'from this feed'; | |
| 542 | - $by_default = ''; | |
| 543 | - $id_param = "&link_id=".$link_id; | |
| 544 | - else : | |
| 545 | - $from_this_feed = 'from syndicated feeds'; | |
| 546 | - $by_default = " by default"; | |
| 547 | - $id_param = ""; | |
| 901 | + function is_admin () { | |
| 902 | + global $fwp_path; | |
| 903 | + | |
| 904 | + $admin_page = false; // Innocent until proven guilty | |
| 905 | + if (isset($_REQUEST['page'])) : | |
| 906 | + $admin_page = ( | |
| 907 | + is_admin() | |
| 908 | + and preg_match("|^{$fwp_path}/|", $_REQUEST['page']) | |
| 909 | + ); | |
| 548 | 910 | endif; |
| 549 | -?> | |
| 550 | -<p>Use the <a href="admin.php?page=<?php print $GLOBALS['fwp_path'] ?>/posts-page.php<?php print $id_param; ?>"><?php _e('Posts & Links'); ?></a> | |
| 551 | -settings page to set up how new posts <?php print $from_this_feed; ?> will be published<?php $by_default; ?>, whether they will accept | |
| 552 | -comments and pings, any custom fields that should be set on each post, etc.</p> | |
| 553 | -<?php | |
| 554 | - } /* FeedWordPressSettingsUI::instead_of_posts_box () */ | |
| 911 | + return $admin_page; | |
| 912 | + } | |
| 555 | 913 | |
| 556 | - function instead_of_authors_box ($link_id = null) { | |
| 557 | - if (!is_null($link_id)) : | |
| 558 | - $from_this_feed = 'from this feed'; | |
| 559 | - $by_default = ''; | |
| 560 | - $id_param = "&link_id=".$link_id; | |
| 561 | - else : | |
| 562 | - $from_this_feed = 'from syndicated feeds'; | |
| 563 | - $by_default = " by default"; | |
| 564 | - $id_param = ""; | |
| 914 | + function admin_scripts () { | |
| 915 | + global $fwp_path; | |
| 916 | + | |
| 917 | + wp_enqueue_script('post'); // for magic tag and category boxes | |
| 918 | + if (!FeedWordPressCompatibility::test_version(FWP_SCHEMA_29)) : // < 2.9 | |
| 919 | + wp_enqueue_script('thickbox'); // for fold-up boxes | |
| 565 | 920 | endif; |
| 921 | + wp_enqueue_script('admin-forms'); // for checkbox selection | |
| 922 | + | |
| 923 | + wp_register_script('feedwordpress-elements', WP_PLUGIN_URL.'/'.$fwp_path.'/feedwordpress-elements.js'); | |
| 924 | + wp_enqueue_script('feedwordpress-elements'); | |
| 925 | + } | |
| 566 | 926 | |
| 567 | -?> | |
| 568 | -<p>Use the <a | |
| 569 | -href="admin.php?page=<?php print $GLOBALS['fwp_path'] | |
| 570 | -?>/authors-page.php<?php print $id_param; ?>"><?php _e('Authors'); | |
| 571 | -?></a> settings page to set up how new posts | |
| 572 | -<?php print $from_this_feed; ?> will be assigned to | |
| 573 | -authors.</p> | |
| 574 | -<?php | |
| 575 | - } /* FeedWordPressSettingsUI::instead_of_authors_box () */ | |
| 576 | - | |
| 577 | - function instead_of_categories_box ($link_id = null) { | |
| 578 | - if (!is_null($link_id)) : | |
| 579 | - $from_this_feed = 'from this feed'; | |
| 580 | - $by_default = ''; | |
| 581 | - $id_param = "&link_id=".$link_id; | |
| 582 | - else : | |
| 583 | - $from_this_feed = 'from syndicated feeds'; | |
| 584 | - $by_default = " by default"; | |
| 585 | - $id_param = ""; | |
| 586 | - endif; | |
| 927 | + function admin_styles () { | |
| 928 | + ?> | |
| 929 | + <style type="text/css"> | |
| 930 | + #feedwordpress-admin-feeds .link-rss-params-remove .x, .feedwordpress-admin .remove-it .x { | |
| 931 | + background: url(<?php print admin_url('images/xit.gif') ?>) no-repeat scroll 0 0 transparent; | |
| 932 | + } | |
| 933 | + | |
| 934 | + #feedwordpress-admin-feeds .link-rss-params-remove:hover .x, .feedwordpress-admin .remove-it:hover .x { | |
| 935 | + background: url(<?php print admin_url('images/xit.gif') ?>) no-repeat scroll -10px 0 transparent; | |
| 936 | + } | |
| 937 | + | |
| 938 | + .fwpfs { | |
| 939 | + background-image: url(<?php print admin_url('images/fav.png'); ?>); | |
| 940 | + background-repeat: repeat-x; | |
| 941 | + background-position: left center; | |
| 942 | + background-attachment: scroll; | |
| 943 | + } | |
| 944 | + .fwpfs.slide-down { | |
| 945 | + background-image:url(<?php print admin_url('images/fav-top.png'); ?>); | |
| 946 | + background-position:0 top; | |
| 947 | + background-repeat:repeat-x; | |
| 948 | + } | |
| 587 | 949 | |
| 588 | -?> | |
| 589 | -<p>Use the <a href="admin.php?page=<?php print $GLOBALS['fwp_path'] ?>/categories-page.php<?php print $id_param; ?>"><?php _e('Categories'.FEEDWORDPRESS_AND_TAGS); ?></a> | |
| 590 | -settings page to set up how new posts <?php print $from_this_feed; ?> are assigned categories <?php if (FeedWordPressCompatibility::post_tags()) : ?>or tags<?php endif; ?><?php print $by_default; ?>.</p> | |
| 591 | -<?php | |
| 592 | - } /* FeedWordPressSettingsUI::instead_of_categories_box () */ | |
| 950 | + .update-results { | |
| 951 | + max-width: 100%; | |
| 952 | + overflow: auto; | |
| 953 | + } | |
| 593 | 954 | |
| 955 | + </style> | |
| 956 | + <?php | |
| 957 | + } /* FeedWordPressSettingsUI::admin_styles () */ | |
| 958 | + | |
| 594 | 959 | /*static*/ function ajax_nonce_fields () { |
| 595 | 960 | if (function_exists('wp_nonce_field')) : |
| 596 | 961 | echo "<form style='display: none' method='get' action=''>\n<p>\n"; |
| 597 | 962 | wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); |
| @@ -602,29 +967,17 @@ | ||
| 602 | 967 | |
| 603 | 968 | /*static*/ function fix_toggles_js ($context) { |
| 604 | 969 | ?> |
| 605 | 970 | <script type="text/javascript"> |
| 606 | - jQuery(document).ready( function($) { | |
| 607 | - <?php if (FeedWordPressCompatibility::test_version(FWP_SCHEMA_29)) : ?> | |
| 608 | - if ( $('#post_tag').length ) { | |
| 609 | - tagBox.init(); | |
| 610 | - } | |
| 611 | - <?php endif; ?> | |
| 612 | - <?php if (FeedWordPressCompatibility::test_version(FWP_SCHEMA_25, FWP_SCHEMA_27)) : ?> | |
| 613 | - // In case someone got here first... | |
| 614 | - jQuery('.postbox h3').unbind('click'); | |
| 615 | - | |
| 616 | - add_postbox_toggles('<?php print $context; ?>'); | |
| 617 | - <?php elseif (FeedWordPressCompatibility::test_version(FWP_SCHEMA_27)) : ?> | |
| 618 | - // In case someone got here first... | |
| 619 | - $('.postbox h3, .postbox .handlediv').unbind('click'); | |
| 620 | - $('.postbox h3 a').unbind('click'); | |
| 621 | - $('.hide-postbox-tog').unbind('click'); | |
| 622 | - $('.columns-prefs input[type="radio"]').unbind('click'); | |
| 623 | - $('.meta-box-sortables').sortable('destroy'); | |
| 971 | + jQuery(document).ready( function($) { | |
| 972 | + // In case someone got here first... | |
| 973 | + $('.postbox h3, .postbox .handlediv').unbind('click'); | |
| 974 | + $('.postbox h3 a').unbind('click'); | |
| 975 | + $('.hide-postbox-tog').unbind('click'); | |
| 976 | + $('.columns-prefs input[type="radio"]').unbind('click'); | |
| 977 | + $('.meta-box-sortables').sortable('destroy'); | |
| 624 | 978 | |
| 625 | - postboxes.add_postbox_toggles('<?php print $context; ?>'); | |
| 626 | - <?php endif; ?> | |
| 979 | + postboxes.add_postbox_toggles('<?php print $context; ?>'); | |
| 627 | 980 | } ); |
| 628 | 981 | </script> |
| 629 | 982 | <?php |
| 630 | 983 | } /* FeedWordPressSettingsUI::fix_toggles_js () */ |
| @@ -629,13 +982,15 @@ | ||
| 629 | 982 | <?php |
| 630 | 983 | } /* FeedWordPressSettingsUI::fix_toggles_js () */ |
| 631 | 984 | |
| 632 | 985 | function magic_input_tip_js ($id) { |
| 633 | - if (FeedWordPressCompatibility::test_version(FWP_SCHEMA_25)) : | |
| 986 | + if (!preg_match('/^[.#]/', $id)) : | |
| 987 | + $id = '#'.$id; | |
| 988 | + endif; | |
| 634 | 989 | ?> |
| 635 | 990 | <script type="text/javascript"> |
| 636 | 991 | jQuery(document).ready( function () { |
| 637 | - var inputBox = jQuery("#<?php print $id; ?>"); | |
| 992 | + var inputBox = jQuery("<?php print $id; ?>"); | |
| 638 | 993 | var boxEl = inputBox.get(0); |
| 639 | 994 | if (boxEl.value==boxEl.defaultValue) { inputBox.addClass('form-input-tip'); } |
| 640 | 995 | inputBox.focus(function() { |
| 641 | 996 | if ( this.value == this.defaultValue ) |
| @@ -647,9 +1002,8 @@ | ||
| 647 | 1002 | }); |
| 648 | 1003 | } ); |
| 649 | 1004 | </script> |
| 650 | 1005 | <?php |
| 651 | - endif; | |
| 652 | 1006 | } /* FeedWordPressSettingsUI::magic_input_tip_js () */ |
| 653 | 1007 | } /* class FeedWordPressSettingsUI */ |
| 654 | 1008 | |
| 655 | 1009 | function fwp_insert_new_user ($newuser_name) { |
| @@ -658,23 +1012,18 @@ | ||
| 658 | 1012 | $ret = null; |
| 659 | 1013 | if (strlen($newuser_name) > 0) : |
| 660 | 1014 | $userdata = array(); |
| 661 | 1015 | $userdata['ID'] = NULL; |
| 1016 | + $userdata['user_login'] = apply_filters('pre_user_login', sanitize_user($newuser_name)); | |
| 1017 | + $userdata['user_nicename'] = apply_filters('pre_user_nicename', sanitize_title($newuser_name)); | |
| 1018 | + $userdata['display_name'] = $newuser_name; | |
| 1019 | + $userdata['user_pass'] = substr(md5(uniqid(microtime())), 0, 6); // just something random to lock it up | |
| 662 | 1020 | |
| 663 | - $userdata['user_login'] = sanitize_user($newuser_name); | |
| 664 | - $userdata['user_login'] = apply_filters('pre_user_login', $userdata['user_login']); | |
| 1021 | + $blahUrl = get_bloginfo('url'); $url = parse_url($blahUrl); | |
| 1022 | + $userdata['user_email'] = substr(md5(uniqid(microtime())), 0, 6).'@'.$url['host']; | |
| 665 | 1023 | |
| 666 | - $userdata['user_nicename'] = sanitize_title($newuser_name); | |
| 667 | - $userdata['user_nicename'] = apply_filters('pre_user_nicename', $userdata['user_nicename']); | |
| 668 | - | |
| 669 | - $userdata['display_name'] = $wpdb->escape($newuser_name); | |
| 670 | - | |
| 671 | 1024 | $newuser_id = wp_insert_user($userdata); |
| 672 | - if (is_numeric($newuser_id)) : | |
| 673 | - $ret = $newuser_id; | |
| 674 | - else : | |
| 675 | - // TODO: Add some error detection and reporting | |
| 676 | - endif; | |
| 1025 | + $ret = $newuser_id; // Either a numeric ID or a WP_Error object | |
| 677 | 1026 | else : |
| 678 | 1027 | // TODO: Add some error reporting |
| 679 | 1028 | endif; |
| 680 | 1029 | return $ret; |
| @@ -679,132 +1028,178 @@ | ||
| 679 | 1028 | endif; |
| 680 | 1029 | return $ret; |
| 681 | 1030 | } /* fwp_insert_new_user () */ |
| 682 | 1031 | |
| 1032 | +/** | |
| 1033 | + * fwp_add_meta_box | |
| 1034 | + * | |
| 1035 | + * This function is no longer necessary, since no versions of WordPress that FWP | |
| 1036 | + * still supports lack add_meta_box(). But I've left it in place for the time | |
| 1037 | + * being for add-on modules that may have used it in setting up their UI. | |
| 1038 | + */ | |
| 683 | 1039 | function fwp_add_meta_box ($id, $title, $callback, $page, $context = 'advanced', $priority = 'default', $callback_args = null) { |
| 684 | - if (function_exists('add_meta_box')) : | |
| 685 | - return add_meta_box($id, $title, $callback, $page, $context, $priority, $callback_args); | |
| 686 | - else : | |
| 687 | - /* Re-used as per terms of the GPL from add_meta_box() in WordPress 2.8.1 wp-admin/includes/template.php. */ | |
| 688 | - global $wp_meta_boxes; | |
| 689 | - | |
| 690 | - if ( !isset($wp_meta_boxes) ) | |
| 691 | - $wp_meta_boxes = array(); | |
| 692 | - if ( !isset($wp_meta_boxes[$page]) ) | |
| 693 | - $wp_meta_boxes[$page] = array(); | |
| 694 | - if ( !isset($wp_meta_boxes[$page][$context]) ) | |
| 695 | - $wp_meta_boxes[$page][$context] = array(); | |
| 696 | - | |
| 697 | - foreach ( array_keys($wp_meta_boxes[$page]) as $a_context ) { | |
| 698 | - foreach ( array('high', 'core', 'default', 'low') as $a_priority ) { | |
| 699 | - if ( !isset($wp_meta_boxes[$page][$a_context][$a_priority][$id]) ) | |
| 700 | - continue; | |
| 701 | - | |
| 702 | - // If a core box was previously added or removed by a plugin, don't add. | |
| 703 | - if ( 'core' == $priority ) { | |
| 704 | - // If core box previously deleted, don't add | |
| 705 | - if ( false === $wp_meta_boxes[$page][$a_context][$a_priority][$id] ) | |
| 706 | - return; | |
| 707 | - // If box was added with default priority, give it core priority to maintain sort order | |
| 708 | - if ( 'default' == $a_priority ) { | |
| 709 | - $wp_meta_boxes[$page][$a_context]['core'][$id] = $wp_meta_boxes[$page][$a_context]['default'][$id]; | |
| 710 | - unset($wp_meta_boxes[$page][$a_context]['default'][$id]); | |
| 711 | - } | |
| 712 | - return; | |
| 713 | - } | |
| 714 | - // If no priority given and id already present, use existing priority | |
| 715 | - if ( empty($priority) ) { | |
| 716 | - $priority = $a_priority; | |
| 717 | - // else if we're adding to the sorted priortiy, we don't know the title or callback. Glab them from the previously added context/priority. | |
| 718 | - } elseif ( 'sorted' == $priority ) { | |
| 719 | - $title = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['title']; | |
| 720 | - $callback = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['callback']; | |
| 721 | - $callback_args = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['args']; | |
| 722 | - } | |
| 723 | - // An id can be in only one priority and one context | |
| 724 | - if ( $priority != $a_priority || $context != $a_context ) | |
| 725 | - unset($wp_meta_boxes[$page][$a_context][$a_priority][$id]); | |
| 726 | - } | |
| 727 | - } | |
| 728 | - | |
| 729 | - if ( empty($priority) ) | |
| 730 | - $priority = 'low'; | |
| 731 | - | |
| 732 | - if ( !isset($wp_meta_boxes[$page][$context][$priority]) ) | |
| 733 | - $wp_meta_boxes[$page][$context][$priority] = array(); | |
| 734 | - | |
| 735 | - $wp_meta_boxes[$page][$context][$priority][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback, 'args' => $callback_args); | |
| 736 | - endif; | |
| 1040 | + return add_meta_box($id, $title, $callback, $page, $context, $priority, $callback_args); | |
| 737 | 1041 | } /* function fwp_add_meta_box () */ |
| 738 | 1042 | |
| 739 | 1043 | function fwp_do_meta_boxes($page, $context, $object) { |
| 740 | - if (function_exists('do_meta_boxes')) : | |
| 741 | - $ret = do_meta_boxes($page, $context, $object); | |
| 1044 | + $ret = do_meta_boxes($page, $context, $object); | |
| 742 | 1045 | |
| 743 | - // Avoid JavaScript error from WordPress 2.5 bug | |
| 1046 | + // Avoid JavaScript error from WordPress 2.5 bug | |
| 744 | 1047 | ?> |
| 745 | 1048 | <div style="display: none"> |
| 746 | 1049 | <div id="tags-input"></div> <!-- avoid JS error from WP 2.5 bug --> |
| 747 | 1050 | </div> |
| 748 | 1051 | <?php |
| 749 | - return $ret; | |
| 750 | - else : | |
| 751 | - /* Derived as per terms of the GPL from do_meta_boxes() in WordPress 2.8.1 wp-admin/includes/template.php. */ | |
| 752 | - global $wp_meta_boxes; | |
| 753 | - static $already_sorted = false; | |
| 754 | - | |
| 755 | - //do_action('do_meta_boxes', $page, $context, $object); | |
| 756 | - | |
| 757 | - echo "<div id='$context-sortables' class='meta-box-sortables'>\n"; | |
| 758 | - | |
| 759 | - $i = 0; | |
| 760 | - do { | |
| 761 | - if ( !isset($wp_meta_boxes) || !isset($wp_meta_boxes[$page]) || !isset($wp_meta_boxes[$page][$context]) ) | |
| 762 | - break; | |
| 763 | - | |
| 764 | - foreach ( array('high', 'sorted', 'core', 'default', 'low') as $priority ) { | |
| 765 | - if ( isset($wp_meta_boxes[$page][$context][$priority]) ) { | |
| 766 | - foreach ( (array) $wp_meta_boxes[$page][$context][$priority] as $box ) { | |
| 767 | - if ( false == $box || ! $box['title'] ) | |
| 768 | - continue; | |
| 769 | - $i++; | |
| 770 | - fwp_option_box_opener($box['title'], $box['id'], 'postbox' /*. postbox_classes($box['id'], $page)*/); | |
| 771 | - call_user_func($box['callback'], $object, $box); | |
| 772 | - fwp_option_box_closer(); | |
| 773 | - | |
| 774 | - if (is_object($object) and method_exists($object, 'interstitial')) : | |
| 775 | - $object->interstitial(); | |
| 776 | - else : | |
| 777 | - // Submit button for WP 1.5, early 2.x style | |
| 778 | - fwp_settings_form_periodic_submit(); | |
| 779 | - endif; | |
| 780 | - } | |
| 781 | - } | |
| 782 | - } | |
| 783 | - } while(0); | |
| 784 | - | |
| 785 | - echo "</div>"; | |
| 786 | - | |
| 787 | - return $i; | |
| 788 | - endif; | |
| 1052 | + return $ret; | |
| 789 | 1053 | } /* function fwp_do_meta_boxes() */ |
| 790 | 1054 | |
| 791 | 1055 | function fwp_remove_meta_box($id, $page, $context) { |
| 792 | - if (function_exists('remove_meta_box')) : | |
| 793 | - return remove_meta_box($id, $page, $context); | |
| 794 | - else : | |
| 795 | - /* Re-used as per terms of the GPL from remove_meta_box() in WordPress 2.8.1 wp-admin/includes/template.php */ | |
| 796 | - global $wp_meta_boxes; | |
| 1056 | + return remove_meta_box($id, $page, $context); | |
| 1057 | +} /* function fwp_remove_meta_box() */ | |
| 1058 | + | |
| 1059 | +function fwp_syndication_manage_page_links_table_rows ($links, $page, $visible = 'Y') { | |
| 1060 | + global $fwp_path; | |
| 797 | 1061 | |
| 798 | - if ( !isset($wp_meta_boxes) ) | |
| 799 | - $wp_meta_boxes = array(); | |
| 800 | - if ( !isset($wp_meta_boxes[$page]) ) | |
| 801 | - $wp_meta_boxes[$page] = array(); | |
| 802 | - if ( !isset($wp_meta_boxes[$page][$context]) ) | |
| 803 | - $wp_meta_boxes[$page][$context] = array(); | |
| 804 | - | |
| 805 | - foreach ( array('high', 'core', 'default', 'low') as $priority ) | |
| 806 | - $wp_meta_boxes[$page][$context][$priority][$id] = false; | |
| 1062 | + $subscribed = ('Y' == strtoupper($visible)); | |
| 1063 | + if ($subscribed or (count($links) > 0)) : | |
| 1064 | + ?> | |
| 1065 | + <table class="widefat<?php if (!$subscribed) : ?> unsubscribed<?php endif; ?>"> | |
| 1066 | + <thead> | |
| 1067 | + <tr> | |
| 1068 | + <th class="check-column" scope="col"><input type="checkbox" /></th> | |
| 1069 | + <th scope="col"><?php _e('Name'); ?></th> | |
| 1070 | + <th scope="col"><?php _e('Feed'); ?></th> | |
| 1071 | + <th scope="col"><?php _e('Updated'); ?></th> | |
| 1072 | + </tr> | |
| 1073 | + </thead> | |
| 1074 | + | |
| 1075 | + <tbody> | |
| 1076 | +<?php | |
| 1077 | + $alt_row = true; | |
| 1078 | + if (count($links) > 0): | |
| 1079 | + foreach ($links as $link): | |
| 1080 | + $trClass = array(); | |
| 1081 | + | |
| 1082 | + // Prep: Get last updated timestamp | |
| 1083 | + $sLink = new SyndicatedLink($link->link_id); | |
| 1084 | + if (!is_null($sLink->setting('update/last'))) : | |
| 1085 | + $lastUpdated = fwp_time_elapsed($sLink->setting('update/last')); | |
| 1086 | + else : | |
| 1087 | + $lastUpdated = __('None yet'); | |
| 1088 | + endif; | |
| 1089 | + | |
| 1090 | + // Prep: get last error timestamp, if any | |
| 1091 | + if (is_null($sLink->setting('update/error'))) : | |
| 1092 | + $errorsSince = ''; | |
| 1093 | + else : | |
| 1094 | + $trClass[] = 'feed-error'; | |
| 1095 | + | |
| 1096 | + $theError = unserialize($sLink->setting('update/error')); | |
| 1097 | + | |
| 1098 | + $errorsSince = "<div class=\"returning-errors\">" | |
| 1099 | + ."<p><strong>Returning errors</strong> since " | |
| 1100 | + .fwp_time_elapsed($theError['since']) | |
| 1101 | + ."</p>" | |
| 1102 | + ."<p>Most recent (" | |
| 1103 | + .fwp_time_elapsed($theError['ts']) | |
| 1104 | + ."):<br/><code>" | |
| 1105 | + .implode("</code><br/><code>", $theError['object']->get_error_messages()) | |
| 1106 | + ."</code></p>" | |
| 1107 | + ."</div>\n"; | |
| 1108 | + endif; | |
| 1109 | + | |
| 1110 | + $nextUpdate = "<div style='font-style:italic;size:0.9em'>Ready for next update "; | |
| 1111 | + if (isset($sLink->settings['update/ttl']) and is_numeric($sLink->settings['update/ttl'])) : | |
| 1112 | + if (isset($sLink->settings['update/timed']) and $sLink->settings['update/timed']=='automatically') : | |
| 1113 | + $next = $sLink->settings['update/last'] + ((int) $sLink->settings['update/ttl'] * 60); | |
| 1114 | + $nextUpdate .= fwp_time_elapsed($next); | |
| 1115 | + if (FEEDWORDPRESS_DEBUG) : $nextUpdate .= " [".(($next-time())/60)." minutes]"; endif; | |
| 1116 | + else : | |
| 1117 | + $nextUpdate .= "every ".$sLink->settings['update/ttl']." minute".(($sLink->settings['update/ttl']!=1)?"s":""); | |
| 1118 | + endif; | |
| 1119 | + else: | |
| 1120 | + $nextUpdate .= "as soon as possible"; | |
| 1121 | + endif; | |
| 1122 | + $nextUpdate .= "</div>"; | |
| 1123 | + | |
| 1124 | + unset($sLink); | |
| 1125 | + | |
| 1126 | + $alt_row = !$alt_row; | |
| 1127 | + | |
| 1128 | + if ($alt_row) : | |
| 1129 | + $trClass[] = 'alternate'; | |
| 1130 | + endif; | |
| 1131 | + ?> | |
| 1132 | + <tr<?php echo ((count($trClass) > 0) ? ' class="'.implode(" ", $trClass).'"':''); ?>> | |
| 1133 | + <th class="check-column" scope="row"><input type="checkbox" name="link_ids[]" value="<?php echo $link->link_id; ?>" /></th> | |
| 1134 | + <?php | |
| 1135 | + $hrefPrefix = "admin.php?link_id={$link->link_id}&page=${fwp_path}/"; | |
| 1136 | + $caption = ( | |
| 1137 | + (strlen($link->link_rss) > 0) | |
| 1138 | + ? __('Switch Feed') | |
| 1139 | + : $caption=__('Find Feed') | |
| 1140 | + ); | |
| 1141 | + ?> | |
| 1142 | + <td> | |
| 1143 | + <strong><a href="<?php print $hrefPrefix; ?>feeds-page.php"><?php print esc_html($link->link_name); ?></a></strong> | |
| 1144 | + <div class="row-actions"><?php if ($subscribed) : | |
| 1145 | + $page->display_feed_settings_page_links(array( | |
| 1146 | + 'before' => '<div><strong>Settings ></strong> ', | |
| 1147 | + 'after' => '</div>', | |
| 1148 | + 'subscription' => $link, | |
| 1149 | + )); | |
| 1150 | + endif; ?> | |
| 1151 | + | |
| 1152 | + <div><strong>Actions ></strong> | |
| 1153 | + <?php if ($subscribed) : ?> | |
| 1154 | + <a href="<?php print $hrefPrefix; ?>syndication.php&action=feedfinder"><?php echo $caption; ?></a> | |
| 1155 | + <?php else : ?> | |
| 1156 | + <a href="<?php print $hrefPrefix; ?>syndication.php&action=<?php print FWP_RESUB_CHECKED; ?>"><?php _e('Re-subscribe'); ?></a> | |
| 1157 | + <?php endif; ?> | |
| 1158 | + | <a href="<?php print $hrefPrefix; ?>syndication.php&action=Unsubscribe"><?php _e(($subscribed ? 'Unsubscribe' : 'Delete permanently')); ?></a> | |
| 1159 | + | <a href="<?php print esc_html($link->link_url); ?>"><?php _e('View')?></a></div> | |
| 1160 | + </div> | |
| 1161 | + </td> | |
| 1162 | + <?php if (strlen($link->link_rss) > 0): ?> | |
| 1163 | + <td><a href="<?php echo esc_html($link->link_rss); ?>"><?php echo esc_html(feedwordpress_display_url($link->link_rss, 32)); ?></a></td> | |
| 1164 | + <?php else: ?> | |
| 1165 | + <td class="feed-missing"><p><strong>no feed assigned</strong></p></td> | |
| 1166 | + <?php endif; ?> | |
| 1167 | + | |
| 1168 | + <td><div style="float: right; padding-left: 10px"> | |
| 1169 | + <input type="submit" class="button" name="update_uri[<?php print esc_html($link->link_rss); ?>]" value="<?php _e('Update Now'); ?>" /> | |
| 1170 | + </div> | |
| 1171 | + <?php print $lastUpdated; ?> | |
| 1172 | + <?php print $errorsSince; ?> | |
| 1173 | + <?php print $nextUpdate; ?> | |
| 1174 | + </td> | |
| 1175 | + </tr> | |
| 1176 | + <?php | |
| 1177 | + endforeach; | |
| 1178 | + else : | |
| 1179 | +?> | |
| 1180 | +<tr><td colspan="4"><p>There are no websites currently listed for syndication.</p></td></tr> | |
| 1181 | +<?php | |
| 1182 | + endif; | |
| 1183 | +?> | |
| 1184 | +</tbody> | |
| 1185 | +</table> | |
| 1186 | + <?php | |
| 807 | 1187 | endif; |
| 808 | -} /* function fwp_remove_meta_box() */ | |
| 1188 | +} /* function fwp_syndication_manage_page_links_table_rows () */ | |
| 809 | 1189 | |
| 1190 | +function fwp_syndication_manage_page_links_subsubsub ($sources, $showInactive) { | |
| 1191 | + global $fwp_path; | |
| 1192 | + $hrefPrefix = "admin.php?page=${fwp_path}/syndication.php"; | |
| 1193 | + ?> | |
| 1194 | + <ul class="subsubsub"> | |
| 1195 | + <li><a <?php if (!$showInactive) : ?>class="current" <?php endif; ?>href="<?php print $hrefPrefix; ?>&visibility=Y">Subscribed | |
| 1196 | + <span class="count">(<?php print count($sources['Y']); ?>)</span></a></li> | |
| 1197 | + <?php if ($showInactive or (count($sources['N']) > 0)) : ?> | |
| 1198 | + <li><a <?php if ($showInactive) : ?>class="current" <?php endif; ?>href="<?php print $hrefPrefix; ?>&visibility=N">Inactive</a> | |
| 1199 | + <span class="count">(<?php print count($sources['N']); ?>)</span></a></li> | |
| 1200 | + <?php endif; ?> | |
| 1201 | + | |
| 1202 | + </ul> <!-- class="subsubsub" --> | |
| 1203 | + <?php | |
| 1204 | +} | |
| 810 | 1205 | |
