| @@ -1,506 +1,193 @@ | ||
| 1 | 1 | <?php |
| 2 | -class FeedWordPressAdminPage { | |
| 3 | - var $context; | |
| 4 | - var $updated = false; | |
| 5 | - var $link = NULL; | |
| 6 | - var $dispatch = NULL; | |
| 7 | - var $filename = NULL; | |
| 2 | +/** | |
| 3 | + * admin-ui.php: This is kind of a junk pile of utility functions mostly created to smooth | |
| 4 | + * out interactions to make things show up, or behave correctly, within the WordPress admin | |
| 5 | + * settings interface. Major chunks of this code that deal with making it easy for FWP, | |
| 6 | + * add-on modules, etc. to create new settings panels have since been hived off into class | |
| 7 | + * FeedWordPressAdminPage. Many of the functions that remain here were created to handle | |
| 8 | + * compatibility across multiple, sometimes very old, versions of WordPress, many of which | |
| 9 | + * are no longer supported anymore. It's likely that some of these functions will be | |
| 10 | + * re-evaluated, re-organized, deprecated, or clipped out in the next few versions. | |
| 11 | + * -cj 2017-10-27 | |
| 12 | + */ | |
| 8 | 13 | |
| 9 | - /** | |
| 10 | - * Construct the admin page object. | |
| 11 | - * | |
| 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 | - */ | |
| 14 | - function FeedWordPressAdminPage ($page = 'feedwordpressadmin', $link = NULL) { | |
| 15 | - $this->link = $link; | |
| 14 | +$dir = dirname(__FILE__); | |
| 15 | +require_once("${dir}/feedwordpressadminpage.class.php"); | |
| 16 | +require_once("${dir}/feedwordpresssettingsui.class.php"); | |
| 16 | 17 | |
| 17 | - // Set meta-box context name | |
| 18 | - $this->context = $page; | |
| 19 | - if ($this->for_feed_settings()) : | |
| 20 | - $this->context .= 'forfeed'; | |
| 21 | - endif; | |
| 22 | - } /* FeedWordPressAdminPage constructor */ | |
| 18 | +function fwp_update_set_results_message ($delta, $joiner = ';') { | |
| 19 | + $mesg = array(); | |
| 20 | + if (isset($delta['new'])) : $mesg[] = ' '.$delta['new'].' new posts were syndicated'; endif; | |
| 21 | + if (isset($delta['updated']) and ($delta['updated'] != 0)) : $mesg[] = ' '.$delta['updated'].' existing posts were updated'; endif; | |
| 22 | + if (isset($delta['stored']) and ($delta['stored'] != 0)) : $mesg[] = ' '.$delta['stored'].' alternate versions of existing posts were stored for reference'; endif; | |
| 23 | 23 | |
| 24 | - function for_feed_settings () { return (is_object($this->link) and method_exists($this->link, 'found') and $this->link->found()); } | |
| 25 | - function for_default_settings () { return !$this->for_feed_settings(); } | |
| 24 | + if (!is_null($joiner)) : | |
| 25 | + $mesg = implode($joiner, $mesg); | |
| 26 | + endif; | |
| 27 | + return $mesg; | |
| 28 | +} /* function fwp_update_set_results_message () */ | |
| 26 | 29 | |
| 27 | - /*static*/ function submitted_link_id () { | |
| 28 | - global $fwp_post; | |
| 29 | - | |
| 30 | - // Presume global unless we get a specific link ID | |
| 31 | - $link_id = NULL; | |
| 32 | - | |
| 33 | - $submit_buttons = array( | |
| 34 | - 'save', | |
| 35 | - 'submit', | |
| 36 | - 'fix_mismatch', | |
| 37 | - 'feedfinder', | |
| 38 | - ); | |
| 39 | - foreach ($submit_buttons as $field) : | |
| 40 | - if (isset($fwp_post[$field])) : | |
| 41 | - $link_id = $_REQUEST['save_link_id']; | |
| 42 | - endif; | |
| 43 | - endforeach; | |
| 44 | - | |
| 45 | - if (is_null($link_id) and isset($_REQUEST['link_id'])) : | |
| 46 | - $link_id = $_REQUEST['link_id']; | |
| 47 | - endif; | |
| 48 | - | |
| 49 | - return $link_id; | |
| 50 | - } /* FeedWordPressAdminPage::submitted_link_id() */ | |
| 51 | - | |
| 52 | - /*static*/ function submitted_link () { | |
| 53 | - $link_id = FeedWordPressAdminPage::submitted_link_id(); | |
| 54 | - if (is_numeric($link_id) and $link_id) : | |
| 55 | - $link = new SyndicatedLink($link_id); | |
| 56 | - else : | |
| 57 | - $link = NULL; | |
| 58 | - endif; | |
| 59 | - return $link; | |
| 60 | - } /* FeedWordPressAdminPage::submitted_link () */ | |
| 61 | - | |
| 62 | - function stamp_link_id ($field = null) { | |
| 63 | - if (is_null($field)) : $field = 'save_link_id'; endif; | |
| 64 | - ?> | |
| 65 | - <input type="hidden" name="<?php print esc_html($field); ?>" value="<?php print ($this->for_feed_settings() ? $this->link->id : '*'); ?>" /> | |
| 66 | - <?php | |
| 67 | - } /* FeedWordPressAdminPage::stamp_link_id () */ | |
| 68 | - | |
| 69 | - function these_posts_phrase () { | |
| 70 | - if ($this->for_feed_settings()) : | |
| 71 | - $phrase = __('posts from this feed'); | |
| 72 | - else : | |
| 73 | - $phrase = __('syndicated posts'); | |
| 74 | - endif; | |
| 75 | - return $phrase; | |
| 76 | - } /* FeedWordPressAdminPage::these_posts_phrase() */ | |
| 77 | - | |
| 78 | - /** | |
| 79 | - * Provides a uniquely identifying name for the interface context for | |
| 80 | - * use with add_meta_box() and do_meta_boxes(), | |
| 81 | - * | |
| 82 | - * @return string the context name | |
| 83 | - * | |
| 84 | - * @see add_meta_box() | |
| 85 | - * @see do_meta_boxes() | |
| 86 | - */ | |
| 87 | - function meta_box_context () { | |
| 88 | - return $this->context; | |
| 89 | - } /* FeedWordPressAdminPage::meta_box_context () */ | |
| 90 | - | |
| 91 | - /** | |
| 92 | - * Outputs JavaScript to fix AJAX toggles settings. | |
| 93 | - * | |
| 94 | - * @uses FeedWordPressAdminPage::meta_box_context() | |
| 95 | - */ | |
| 96 | - function fix_toggles () { | |
| 97 | - FeedWordPressSettingsUI::fix_toggles_js($this->meta_box_context()); | |
| 98 | - } /* FeedWordPressAdminPage::fix_toggles() */ | |
| 99 | - | |
| 100 | - function ajax_interface_js () { | |
| 30 | +function fwp_authors_single_submit ($link = NULL) { | |
| 101 | 31 | ?> |
| 102 | -<script type="text/javascript"> | |
| 103 | - function contextual_appearance (item, appear, disappear, value, visibleStyle, checkbox) { | |
| 104 | - if (typeof(visibleStyle)=='undefined') visibleStyle = 'block'; | |
| 32 | +<div class="submitbox" id="submitlink"> | |
| 33 | +<div id="previewview"> | |
| 34 | +</div> | |
| 35 | +<div class="inside"> | |
| 36 | +</div> | |
| 105 | 37 | |
| 106 | - var rollup=document.getElementById(item); | |
| 107 | - var newuser=document.getElementById(appear); | |
| 108 | - var sitewide=document.getElementById(disappear); | |
| 109 | - if (rollup) { | |
| 110 | - if ((checkbox && rollup.checked) || (!checkbox && value==rollup.value)) { | |
| 111 | - if (newuser) newuser.style.display=visibleStyle; | |
| 112 | - if (sitewide) sitewide.style.display='none'; | |
| 113 | - } else { | |
| 114 | - if (newuser) newuser.style.display='none'; | |
| 115 | - if (sitewide) sitewide.style.display=visibleStyle; | |
| 116 | - } | |
| 117 | - } | |
| 118 | - } | |
| 119 | -</script> | |
| 120 | - | |
| 38 | +<p class="submit"> | |
| 39 | +<input type="submit" name="save" value="<?php _e('Save') ?>" /> | |
| 40 | +</p> | |
| 41 | +</div> | |
| 121 | 42 | <?php |
| 122 | - } /* FeedWordPressAdminPage::ajax_interface_js () */ | |
| 43 | +} | |
| 123 | 44 | |
| 124 | - function display_feed_select_dropdown() { | |
| 125 | - $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 !important; background-color: #333 !important; | |
| 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 | - | |
| 177 | - ?> | |
| 178 | - <p id="post-search"> | |
| 179 | - <select name="link_id" class="fwpfs" style="max-width: 20.0em;"> | |
| 180 | - <option value="*"<?php if ($this->for_default_settings()) : ?> selected="selected"<?php endif; ?>>- defaults for all feeds -</option> | |
| 181 | - <?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 esc_html($ddlink->link_name); ?></option> | |
| 183 | - <?php endforeach; endif; ?> | |
| 184 | - </select> | |
| 185 | - <input class="button" type="submit" name="go" value="<?php _e('Go') ?> »" /> | |
| 186 | - </p> | |
| 187 | - <?php | |
| 188 | - } /* FeedWordPressAdminPage::display_feed_select_dropdown() */ | |
| 45 | +function fwp_tags_box ($tags, $object, $params = array()) { | |
| 46 | + $params = wp_parse_args($params, array( // Default values | |
| 47 | + 'taxonomy' => 'post_tag', | |
| 48 | + 'textarea_name' => NULL, | |
| 49 | + 'textarea_id' => NULL, | |
| 50 | + 'input_id' => NULL, | |
| 51 | + 'input_name' => NULL, | |
| 52 | + 'id' => NULL, | |
| 53 | + 'box_title' => __('Post Tags'), | |
| 54 | + )); | |
| 189 | 55 | |
| 190 | - 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 esc_html(WP_PLUGIN_URL.'/'.$GLOBALS['fwp_path'].'/feedwordpress.png'); ?>" alt="" /></div> | |
| 194 | - <?php | |
| 195 | - endif; | |
| 196 | - ?> | |
| 56 | + if (!is_array($tags)) : $tags = array(); endif; | |
| 197 | 57 | |
| 198 | - <h2><?php print esc_html(__($pagename.($all ? '' : ' Settings'))); ?><?php if ($this->for_feed_settings()) : ?>: <?php echo esc_html($this->link->link->link_name); ?><?php endif; ?></h2> | |
| 199 | - <?php | |
| 200 | - } | |
| 201 | - | |
| 202 | - function display_update_notice_if_updated ($pagename = 'Syndication', $mesg = NULL) { | |
| 203 | - if ($this->updated) : | |
| 204 | - if ($this->updated === true) : | |
| 205 | - $mesg = $pagename . ' settings updated.'; | |
| 206 | - else : | |
| 207 | - $mesg = $this->updated; | |
| 208 | - endif; | |
| 209 | - endif; | |
| 210 | - | |
| 211 | - if (!is_null($mesg)) : | |
| 212 | - ?> | |
| 213 | - <div class="updated"> | |
| 214 | - <p><?php print esc_html($mesg); ?></p> | |
| 215 | - </div> | |
| 216 | - <?php | |
| 217 | - endif; | |
| 218 | - } /* FeedWordPressAdminPage::display_update_notice_if_updated() */ | |
| 219 | - | |
| 220 | - function display_settings_scope_message () { | |
| 221 | - if ($this->for_feed_settings()) : | |
| 222 | - ?> | |
| 223 | - <p>These settings only affect posts syndicated from | |
| 224 | - <strong><?php echo esc_html($this->link->link->link_name); ?></strong>.</p> | |
| 225 | - <?php | |
| 226 | - else : | |
| 227 | - ?> | |
| 228 | - <p>These settings affect posts syndicated from any feed unless they are overridden | |
| 229 | - by settings for that specific feed.</p> | |
| 230 | - <?php | |
| 231 | - endif; | |
| 232 | - } /* FeedWordPressAdminPage::display_settings_scope_message () */ | |
| 58 | + $tax_name = $params['taxonomy']; | |
| 233 | 59 | |
| 234 | - /*static*/ function has_link () { return true; } | |
| 60 | + $oTax = get_taxonomy($params['taxonomy']); | |
| 61 | + $oTaxLabels = get_taxonomy_labels($oTax); | |
| 62 | + | |
| 63 | + $disabled = (!current_user_can($oTax->cap->assign_terms) ? 'disabled="disabled"' : ''); | |
| 235 | 64 | |
| 236 | - function open_sheet ($header) { | |
| 237 | - // Set up prepatory AJAX stuff | |
| 238 | - $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; | |
| 65 | + $desc = "<p style=\"font-size:smaller;font-style:bold;margin:0\">Tag $object as...</p>"; | |
| 247 | 66 | |
| 248 | - ?> | |
| 249 | - <div class="wrap" style="position:relative"> | |
| 250 | - <?php | |
| 251 | - if (!is_null($header)) : | |
| 252 | - $this->display_sheet_header($header); | |
| 253 | - endif; | |
| 67 | + if (is_null($params['textarea_name'])) : | |
| 68 | + $params['textarea_name'] = "tax_input[$tax_name]"; | |
| 69 | + endif; | |
| 70 | + if (is_null($params['textarea_id'])) : | |
| 71 | + $params['textarea_id'] = "tax-input-${tax_name}"; | |
| 72 | + endif; | |
| 73 | + if (is_null($params['input_id'])) : | |
| 74 | + $params['input_id'] = "new-tag-${tax_name}"; | |
| 75 | + endif; | |
| 76 | + if (is_null($params['input_name'])) : | |
| 77 | + $params['input_name'] = "newtag[$tax_name]"; | |
| 78 | + endif; | |
| 254 | 79 | |
| 255 | - if (!is_null($this->dispatch)) : | |
| 256 | - ?> | |
| 257 | - <form action="admin.php?page=<?php print $GLOBALS['fwp_path']; ?>/<?php echo basename($this->filename); ?>" method="post"> | |
| 258 | - <div><?php | |
| 259 | - FeedWordPressCompatibility::stamp_nonce($this->dispatch); | |
| 260 | - $this->stamp_link_id(); | |
| 261 | - ?></div> | |
| 262 | - <?php | |
| 263 | - endif; | |
| 80 | + if (is_null($params['id'])) : | |
| 81 | + $params['id'] = $tax_name; | |
| 82 | + endif; | |
| 264 | 83 | |
| 265 | - if ($this->has_link()) : | |
| 266 | - $this->display_feed_select_dropdown(); | |
| 267 | - $this->display_settings_scope_message(); | |
| 268 | - endif; | |
| 84 | + print $desc; | |
| 85 | + $helps = __('Separate tags with commas.'); | |
| 86 | + $box['title'] = __('Tags'); | |
| 87 | + ?> | |
| 88 | +<div class="tagsdiv" id="<?php echo $params['id']; ?>"> | |
| 89 | + <div class="jaxtag"> | |
| 90 | + <div class="nojs-tags hide-if-js"> | |
| 91 | + <p><?php echo $oTaxLabels->add_or_remove_items; ?></p> | |
| 92 | + <textarea name="<?php echo $params['textarea_name']; ?>" class="the-tags" id="<?php echo $params['textarea_id']; ?>"><?php echo esc_attr(implode(",", $tags)); ?></textarea></div> | |
| 269 | 93 | |
| 270 | - if (function_exists('do_meta_boxes')) : | |
| 271 | - ?> | |
| 272 | - <div id="poststuff"> | |
| 273 | - <?php | |
| 274 | - else : | |
| 275 | - ?> | |
| 276 | - </div> <!-- class="wrap" --> | |
| 277 | - <?php | |
| 278 | - endif; | |
| 94 | + <?php if ( current_user_can($oTax->cap->assign_terms) ) :?> | |
| 95 | + <div class="ajaxtag hide-if-no-js"> | |
| 96 | + <label class="screen-reader-text" for="<?php echo $params['input_id']; ?>"><?php echo $params['box_title']; ?></label> | |
| 97 | + <div class="taghint"><?php echo $oTaxLabels->add_new_item; ?></div> | |
| 98 | + <p><input type="text" id="<?php print $params['input_id']; ?>" name="<?php print $params['input_name']; ?>" class="newtag form-input-tip" size="16" autocomplete="off" value="" /> | |
| 99 | + <input type="button" class="button tagadd" value="<?php esc_attr_e('Add'); ?>" tabindex="3" /></p> | |
| 100 | + </div> | |
| 101 | + <p class="howto"><?php echo esc_attr( $oTaxLabels->separate_items_with_commas ); ?></p> | |
| 102 | + <?php endif; ?> | |
| 103 | + </div> | |
| 279 | 104 | |
| 280 | - if (!is_null($this->dispatch)) : | |
| 281 | - fwp_settings_form_single_submit(); | |
| 282 | - endif; | |
| 283 | - } /* FeedWordPressAdminPage::open_sheet () */ | |
| 284 | - | |
| 285 | - 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 | |
| 296 | - endif; | |
| 297 | - } | |
| 298 | -} /* class FeedWordPressAdminPage */ | |
| 299 | - | |
| 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> | |
| 307 | - | |
| 308 | -<p class="submit"> | |
| 309 | -<input type="submit" name="save" value="<?php print $caption; ?>" /> | |
| 310 | -</p> | |
| 105 | + <div class="tagchecklist"></div> | |
| 311 | 106 | </div> |
| 312 | -<?php | |
| 313 | - endif; | |
| 314 | -} | |
| 107 | +<?php if ( current_user_can($oTax->cap->assign_terms) ) : ?> | |
| 108 | +<p class="hide-if-no-js"><a href="#titlediv" class="tagcloud-link" id="link-<?php echo $tax_name; ?>"><?php echo $oTaxLabels->choose_from_most_used; ?></a></p> | |
| 109 | +<?php endif; | |
| 315 | 110 | |
| 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 | 111 | } |
| 326 | 112 | |
| 327 | -function fwp_settings_form_single_submit_closer ($caption = NULL) { | |
| 328 | - if (fwp_test_wp_version(FWP_SCHEMA_27)) : | |
| 329 | - if (is_null($caption)) : $caption = __('Save Changes'); endif; | |
| 330 | -?> | |
| 331 | -<p class="submit"> | |
| 332 | -<input class="button-primary" type="submit" name="save" value="<?php print $caption; ?>" /> | |
| 333 | -</p> | |
| 334 | -<?php | |
| 335 | - endif; | |
| 336 | -} | |
| 337 | - | |
| 338 | -function fwp_authors_single_submit ($link = NULL) { | |
| 113 | +function fwp_category_box ($checked, $object, $tags = array(), $params = array()) { | |
| 339 | 114 | global $wp_db_version; |
| 340 | - | |
| 341 | - if (fwp_test_wp_version(FWP_SCHEMA_25)) : | |
| 342 | -?> | |
| 343 | -<div class="submitbox" id="submitlink"> | |
| 344 | -<div id="previewview"> | |
| 345 | -</div> | |
| 346 | -<div class="inside"> | |
| 347 | -</div> | |
| 348 | 115 | |
| 349 | -<p class="submit"> | |
| 350 | -<input type="submit" name="save" value="<?php _e('Save') ?>" /> | |
| 351 | -</p> | |
| 352 | -</div> | |
| 353 | -<?php | |
| 116 | + if (is_string($params)) : | |
| 117 | + $prefix = $params; | |
| 118 | + $taxonomy = 'category'; | |
| 119 | + elseif (is_array($params)) : | |
| 120 | + $prefix = (isset($params['prefix']) ? $params['prefix'] : ''); | |
| 121 | + $taxonomy = (isset($params['taxonomy']) ? $params['taxonomy'] : 'category'); | |
| 354 | 122 | endif; |
| 355 | -} | |
| 123 | + | |
| 124 | + $oTax = get_taxonomy($taxonomy); | |
| 125 | + $oTaxLabels = get_taxonomy_labels($oTax); | |
| 356 | 126 | |
| 357 | -function fwp_option_box_opener ($legend, $id, $class = "stuffbox") { | |
| 358 | - // WordPress 2.5+ | |
| 359 | - if (FeedWordPressCompatibility::test_version(FWP_SCHEMA_25)) : | |
| 360 | -?> | |
| 361 | -<div id="<?php print $id; ?>" class="<?php print $class; ?>"> | |
| 362 | -<h3><?php print htmlspecialchars($legend); ?></h3> | |
| 363 | -<div class="inside"> | |
| 364 | -<?php | |
| 127 | + if (strlen($prefix) > 0) : | |
| 128 | + $idPrefix = $prefix.'-'; | |
| 129 | + $idSuffix = "-".$prefix; | |
| 130 | + $namePrefix = $prefix . '_'; | |
| 365 | 131 | else : |
| 366 | -?> | |
| 367 | - <div class="wrap"> | |
| 368 | - <h2><?php print htmlspecialchars($legend); ?></h2> | |
| 369 | -<?php | |
| 132 | + $idPrefix = 'feedwordpress-'; | |
| 133 | + $idSuffix = "-feedwordpress"; | |
| 134 | + $namePrefix = 'feedwordpress_'; | |
| 370 | 135 | endif; |
| 371 | -} | |
| 372 | 136 | |
| 373 | -function fwp_option_box_closer () { | |
| 374 | - global $wp_db_version; | |
| 375 | - if (isset($wp_db_version) and $wp_db_version >= FWP_SCHEMA_25) : | |
| 376 | 137 | ?> |
| 377 | - </div> <!-- class="inside" --> | |
| 378 | - </div> <!-- class="stuffbox" --> | |
| 379 | -<?php | |
| 380 | - else : | |
| 381 | -?> | |
| 382 | - </div> <!-- class="wrap" --> | |
| 383 | -<?php | |
| 384 | - endif; | |
| 385 | -} | |
| 138 | +<div id="<?php print $idPrefix; ?>taxonomy-<?php print $taxonomy; ?>" class="feedwordpress-category-div"> | |
| 139 | + <ul id="<?php print $idPrefix; ?><?php print $taxonomy; ?>-tabs" class="category-tabs"> | |
| 140 | + <li class="ui-tabs-selected tabs"><a href="#<?php print $idPrefix; ?><?php print $taxonomy; ?>-all" tabindex="3"><?php _e( 'All posts' ); ?></a> | |
| 141 | + <p style="font-size:smaller;font-style:bold;margin:0">Give <?php print $object; ?> these <?php print $oTaxLabels->name; ?></p> | |
| 142 | + </li> | |
| 143 | + </ul> | |
| 386 | 144 | |
| 387 | -function fwp_tags_box ($tags, $object) { | |
| 388 | - if (!is_array($tags)) : $tags = array(); endif; | |
| 389 | - | |
| 390 | - $desc = "<p style=\"font-size:smaller;font-style:bold;margin:0\">Tag $object as...</p>"; | |
| 145 | +<div id="<?php print $idPrefix; ?><?php print $taxonomy; ?>-all" class="tabs-panel"> | |
| 146 | + <input type="hidden" value="0" name="tax_input[<?php print $taxonomy; ?>][]" /> | |
| 147 | + <ul id="<?php print $idPrefix; ?><?php print $taxonomy; ?>checklist" class="list:<?php print $taxonomy; ?> categorychecklist form-no-clear"> | |
| 148 | + <?php fwp_category_checklist(NULL, false, $checked, $params) ?> | |
| 149 | + </ul> | |
| 150 | +</div> | |
| 391 | 151 | |
| 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'); | |
| 152 | +<div id="<?php print $idPrefix; ?><?php print $taxonomy; ?>-adder" class="<?php print $taxonomy; ?>-adder wp-hidden-children"> | |
| 153 | + <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> | |
| 154 | + <p id="<?php print $idPrefix; ?><?php print $taxonomy; ?>-add" class="category-add wp-hidden-child"> | |
| 155 | + <?php | |
| 156 | + $newcat = 'new'.$taxonomy; | |
| 157 | + | |
| 397 | 158 | ?> |
| 398 | - <div class="tagsdiv" id="<?php echo $tax_name; ?>"> | |
| 399 | - <div class="jaxtag"> | |
| 400 | - <div class="nojs-tags hide-if-js"> | |
| 401 | - <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> | |
| 403 | - | |
| 404 | - <div class="ajaxtag hide-if-no-js"> | |
| 405 | - <label class="screen-reader-text" for="new-tag-<?php echo $tax_name; ?>"><?php echo $box['title']; ?></label> | |
| 406 | - <div class="taghint"><?php _e('Add new tag'); ?></div> | |
| 407 | - <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 | - <input type="button" class="button tagadd" value="<?php esc_attr_e('Add'); ?>" tabindex="3" /> | |
| 409 | - </div></div> | |
| 410 | - <p class="howto"><?php echo $helps; ?></p> | |
| 411 | - <div class="tagchecklist"></div> | |
| 412 | - </div> | |
| 413 | - <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; | |
| 447 | -} | |
| 448 | - | |
| 449 | -function fwp_category_box ($checked, $object, $tags = array()) { | |
| 450 | - global $wp_db_version; | |
| 451 | - | |
| 452 | - if (fwp_test_wp_version(FWP_SCHEMA_25)) : // WordPress 2.5.x | |
| 453 | -?> | |
| 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> | |
| 159 | + <label class="screen-reader-text" for="<?php print $idPrefix; ?>new<?php print $taxonomy; ?>"><?php _e('Add New Category'); ?></label> | |
| 160 | + <input | |
| 161 | + id="<?php print $idPrefix; ?>new<?php print $taxonomy; ?>" | |
| 162 | + class="new<?php print $taxonomy; ?> form-required form-input-tip" | |
| 163 | + aria-required="true" | |
| 164 | + tabindex="3" | |
| 165 | + type="text" name="<?php print $newcat; ?>" | |
| 166 | + value="<?php _e( 'New category name' ); ?>" | |
| 167 | + /> | |
| 168 | + <label class="screen-reader-text" for="<?php print $idPrefix; ?>new<?php print $taxonomy; ?>-parent"><?php _e('Parent Category:'); ?></label> | |
| 169 | + <?php wp_dropdown_categories( array( | |
| 170 | + 'taxonomy' => $taxonomy, | |
| 171 | + 'hide_empty' => 0, | |
| 172 | + 'id' => $idPrefix.'new'.$taxonomy.'-parent', | |
| 173 | + 'class' => 'new'.$taxonomy.'-parent', | |
| 174 | + 'name' => $newcat.'_parent', | |
| 175 | + 'orderby' => 'name', | |
| 176 | + 'hierarchical' => 1, | |
| 177 | + 'show_option_none' => __('Parent category'), | |
| 178 | + 'tab_index' => 3, | |
| 179 | + ) ); ?> | |
| 180 | + <input type="button" id="<?php print $idPrefix; ?><?php print $taxonomy; ?>-add-sumbit" class="add:<?php print $idPrefix; ?><?php print $taxonomy; ?>checklist:<?php print $idPrefix.$taxonomy; ?>-add add-categorychecklist-category-add button category-add-submit" value="<?php _e( 'Add' ); ?>" tabindex="3" /> | |
| 181 | + <?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 */ ?> | |
| 182 | + <input type="hidden" id="_ajax_nonce<?php print esc_html($idSuffix); ?>" name="_ajax_nonce" value="<?php print wp_create_nonce('add-'.$taxonomy); ?>" /> | |
| 183 | + <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); ?>" /> | |
| 184 | + <span id="<?php print $idPrefix; ?><?php print $taxonomy; ?>-ajax-response" class="<?php print $taxonomy; ?>-ajax-response"></span> | |
| 462 | 185 | </p> |
| 463 | 186 | </div> |
| 464 | 187 | |
| 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 | 188 | </div> |
| 478 | 189 | <?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 | 190 | } |
| 504 | 191 | |
| 505 | 192 | function update_feeds_mention ($feed) { |
| 506 | 193 | echo "<li>Updating <cite>".$feed['link/name']."</cite> from <<a href=\"" |
| @@ -516,8 +203,9 @@ | ||
| 516 | 203 | echo "</li>\n"; |
| 517 | 204 | else : |
| 518 | 205 | echo " completed in $dt second".(($dt==1)?'':'s')."</li>\n"; |
| 519 | 206 | endif; |
| 207 | + flush(); | |
| 520 | 208 | } |
| 521 | 209 | |
| 522 | 210 | function fwp_author_list () { |
| 523 | 211 | global $wpdb; |
| @@ -522,20 +210,13 @@ | ||
| 522 | 210 | function fwp_author_list () { |
| 523 | 211 | global $wpdb; |
| 524 | 212 | $ret = array(); |
| 525 | 213 | |
| 526 | - // display_name introduced in WP 2.0 | |
| 527 | - if (fwp_test_wp_version(FWP_SCHEMA_20)) : | |
| 528 | - $name_column = 'display_name'; | |
| 529 | - else : | |
| 530 | - $name_column = 'user_nickname'; | |
| 531 | - endif; | |
| 532 | - | |
| 533 | - $users = $wpdb->get_results("SELECT * FROM $wpdb->users ORDER BY {$name_column}"); | |
| 214 | + $users = get_users(); | |
| 534 | 215 | if (is_array($users)) : |
| 535 | 216 | foreach ($users as $user) : |
| 536 | 217 | $id = (int) $user->ID; |
| 537 | - $ret[$id] = $user->{$name_column}; | |
| 218 | + $ret[$id] = $user->display_name; | |
| 538 | 219 | if (strlen(trim($ret[$id])) == 0) : |
| 539 | 220 | $ret[$id] = $user->user_login; |
| 540 | 221 | endif; |
| 541 | 222 | endforeach; |
| @@ -542,125 +223,8 @@ | ||
| 542 | 223 | endif; |
| 543 | 224 | return $ret; |
| 544 | 225 | } |
| 545 | 226 | |
| 546 | -class FeedWordPressSettingsUI { | |
| 547 | - function instead_of_posts_box ($link_id = null) { | |
| 548 | - if (!is_null($link_id)) : | |
| 549 | - $from_this_feed = 'from this feed'; | |
| 550 | - $by_default = ''; | |
| 551 | - $id_param = "&link_id=".$link_id; | |
| 552 | - else : | |
| 553 | - $from_this_feed = 'from syndicated feeds'; | |
| 554 | - $by_default = " by default"; | |
| 555 | - $id_param = ""; | |
| 556 | - endif; | |
| 557 | -?> | |
| 558 | -<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> | |
| 559 | -settings page to set up how new posts <?php print $from_this_feed; ?> will be published<?php $by_default; ?>, whether they will accept | |
| 560 | -comments and pings, any custom fields that should be set on each post, etc.</p> | |
| 561 | -<?php | |
| 562 | - } /* FeedWordPressSettingsUI::instead_of_posts_box () */ | |
| 563 | - | |
| 564 | - function instead_of_authors_box ($link_id = null) { | |
| 565 | - if (!is_null($link_id)) : | |
| 566 | - $from_this_feed = 'from this feed'; | |
| 567 | - $by_default = ''; | |
| 568 | - $id_param = "&link_id=".$link_id; | |
| 569 | - else : | |
| 570 | - $from_this_feed = 'from syndicated feeds'; | |
| 571 | - $by_default = " by default"; | |
| 572 | - $id_param = ""; | |
| 573 | - endif; | |
| 574 | - | |
| 575 | -?> | |
| 576 | -<p>Use the <a | |
| 577 | -href="admin.php?page=<?php print $GLOBALS['fwp_path'] | |
| 578 | -?>/authors-page.php<?php print $id_param; ?>"><?php _e('Authors'); | |
| 579 | -?></a> settings page to set up how new posts | |
| 580 | -<?php print $from_this_feed; ?> will be assigned to | |
| 581 | -authors.</p> | |
| 582 | -<?php | |
| 583 | - } /* FeedWordPressSettingsUI::instead_of_authors_box () */ | |
| 584 | - | |
| 585 | - function instead_of_categories_box ($link_id = null) { | |
| 586 | - if (!is_null($link_id)) : | |
| 587 | - $from_this_feed = 'from this feed'; | |
| 588 | - $by_default = ''; | |
| 589 | - $id_param = "&link_id=".$link_id; | |
| 590 | - else : | |
| 591 | - $from_this_feed = 'from syndicated feeds'; | |
| 592 | - $by_default = " by default"; | |
| 593 | - $id_param = ""; | |
| 594 | - endif; | |
| 595 | - | |
| 596 | -?> | |
| 597 | -<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> | |
| 598 | -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> | |
| 599 | -<?php | |
| 600 | - } /* FeedWordPressSettingsUI::instead_of_categories_box () */ | |
| 601 | - | |
| 602 | - /*static*/ function ajax_nonce_fields () { | |
| 603 | - if (function_exists('wp_nonce_field')) : | |
| 604 | - echo "<form style='display: none' method='get' action=''>\n<p>\n"; | |
| 605 | - wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); | |
| 606 | - wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); | |
| 607 | - echo "</p>\n</form>\n"; | |
| 608 | - endif; | |
| 609 | - } /* FeedWordPressSettingsUI::ajax_nonce_fields () */ | |
| 610 | - | |
| 611 | - /*static*/ function fix_toggles_js ($context) { | |
| 612 | - ?> | |
| 613 | - <script type="text/javascript"> | |
| 614 | - jQuery(document).ready( function($) { | |
| 615 | - <?php if (FeedWordPressCompatibility::test_version(FWP_SCHEMA_29)) : ?> | |
| 616 | - if ( $('#post_tag').length ) { | |
| 617 | - tagBox.init(); | |
| 618 | - } | |
| 619 | - <?php endif; ?> | |
| 620 | - <?php if (FeedWordPressCompatibility::test_version(FWP_SCHEMA_25, FWP_SCHEMA_27)) : ?> | |
| 621 | - // In case someone got here first... | |
| 622 | - jQuery('.postbox h3').unbind('click'); | |
| 623 | - | |
| 624 | - add_postbox_toggles('<?php print $context; ?>'); | |
| 625 | - <?php elseif (FeedWordPressCompatibility::test_version(FWP_SCHEMA_27)) : ?> | |
| 626 | - // In case someone got here first... | |
| 627 | - $('.postbox h3, .postbox .handlediv').unbind('click'); | |
| 628 | - $('.postbox h3 a').unbind('click'); | |
| 629 | - $('.hide-postbox-tog').unbind('click'); | |
| 630 | - $('.columns-prefs input[type="radio"]').unbind('click'); | |
| 631 | - $('.meta-box-sortables').sortable('destroy'); | |
| 632 | - | |
| 633 | - postboxes.add_postbox_toggles('<?php print $context; ?>'); | |
| 634 | - <?php endif; ?> | |
| 635 | - } ); | |
| 636 | - </script> | |
| 637 | - <?php | |
| 638 | - } /* FeedWordPressSettingsUI::fix_toggles_js () */ | |
| 639 | - | |
| 640 | - function magic_input_tip_js ($id) { | |
| 641 | - if (FeedWordPressCompatibility::test_version(FWP_SCHEMA_25)) : | |
| 642 | - ?> | |
| 643 | - <script type="text/javascript"> | |
| 644 | - jQuery(document).ready( function () { | |
| 645 | - var inputBox = jQuery("#<?php print $id; ?>"); | |
| 646 | - var boxEl = inputBox.get(0); | |
| 647 | - if (boxEl.value==boxEl.defaultValue) { inputBox.addClass('form-input-tip'); } | |
| 648 | - inputBox.focus(function() { | |
| 649 | - if ( this.value == this.defaultValue ) | |
| 650 | - jQuery(this).val( '' ).removeClass( 'form-input-tip' ); | |
| 651 | - }); | |
| 652 | - inputBox.blur(function() { | |
| 653 | - if ( this.value == '' ) | |
| 654 | - jQuery(this).val( this.defaultValue ).addClass( 'form-input-tip' ); | |
| 655 | - }); | |
| 656 | - } ); | |
| 657 | - </script> | |
| 658 | - <?php | |
| 659 | - endif; | |
| 660 | - } /* FeedWordPressSettingsUI::magic_input_tip_js () */ | |
| 661 | -} /* class FeedWordPressSettingsUI */ | |
| 662 | - | |
| 663 | 227 | function fwp_insert_new_user ($newuser_name) { |
| 664 | 228 | global $wpdb; |
| 665 | 229 | |
| 666 | 230 | $ret = null; |
| @@ -666,23 +230,18 @@ | ||
| 666 | 230 | $ret = null; |
| 667 | 231 | if (strlen($newuser_name) > 0) : |
| 668 | 232 | $userdata = array(); |
| 669 | 233 | $userdata['ID'] = NULL; |
| 670 | - | |
| 671 | - $userdata['user_login'] = sanitize_user($newuser_name); | |
| 672 | - $userdata['user_login'] = apply_filters('pre_user_login', $userdata['user_login']); | |
| 673 | - | |
| 674 | - $userdata['user_nicename'] = sanitize_title($newuser_name); | |
| 675 | - $userdata['user_nicename'] = apply_filters('pre_user_nicename', $userdata['user_nicename']); | |
| 676 | - | |
| 677 | - $userdata['display_name'] = $wpdb->escape($newuser_name); | |
| 234 | + $userdata['user_login'] = apply_filters('pre_user_login', sanitize_user($newuser_name)); | |
| 235 | + $userdata['user_nicename'] = apply_filters('pre_user_nicename', sanitize_title($newuser_name)); | |
| 236 | + $userdata['display_name'] = $newuser_name; | |
| 237 | + $userdata['user_pass'] = substr(md5(uniqid(microtime())), 0, 6); // just something random to lock it up | |
| 678 | 238 | |
| 239 | + $blahUrl = get_bloginfo('url'); $url = parse_url($blahUrl); | |
| 240 | + $userdata['user_email'] = substr(md5(uniqid(microtime())), 0, 6).'@'.$url['host']; | |
| 241 | + | |
| 679 | 242 | $newuser_id = wp_insert_user($userdata); |
| 680 | - if (is_numeric($newuser_id)) : | |
| 681 | - $ret = $newuser_id; | |
| 682 | - else : | |
| 683 | - // TODO: Add some error detection and reporting | |
| 684 | - endif; | |
| 243 | + $ret = $newuser_id; // Either a numeric ID or a WP_Error object | |
| 685 | 244 | else : |
| 686 | 245 | // TODO: Add some error reporting |
| 687 | 246 | endif; |
| 688 | 247 | return $ret; |
| @@ -687,132 +246,176 @@ | ||
| 687 | 246 | endif; |
| 688 | 247 | return $ret; |
| 689 | 248 | } /* fwp_insert_new_user () */ |
| 690 | 249 | |
| 691 | -function fwp_add_meta_box ($id, $title, $callback, $page, $context = 'advanced', $priority = 'default', $callback_args = null) { | |
| 692 | - if (function_exists('add_meta_box')) : | |
| 693 | - return add_meta_box($id, $title, $callback, $page, $context, $priority, $callback_args); | |
| 694 | - else : | |
| 695 | - /* Re-used as per terms of the GPL from add_meta_box() in WordPress 2.8.1 wp-admin/includes/template.php. */ | |
| 696 | - global $wp_meta_boxes; | |
| 250 | +function fwp_syndication_manage_page_links_table_rows ($links, $page, $visible = 'Y') { | |
| 251 | + | |
| 252 | + $fwp_syndicated_sources_columns = array(__('Name'), __('Feed'), __('Updated')); | |
| 697 | 253 | |
| 698 | - if ( !isset($wp_meta_boxes) ) | |
| 699 | - $wp_meta_boxes = array(); | |
| 700 | - if ( !isset($wp_meta_boxes[$page]) ) | |
| 701 | - $wp_meta_boxes[$page] = array(); | |
| 702 | - if ( !isset($wp_meta_boxes[$page][$context]) ) | |
| 703 | - $wp_meta_boxes[$page][$context] = array(); | |
| 704 | - | |
| 705 | - foreach ( array_keys($wp_meta_boxes[$page]) as $a_context ) { | |
| 706 | - foreach ( array('high', 'core', 'default', 'low') as $a_priority ) { | |
| 707 | - if ( !isset($wp_meta_boxes[$page][$a_context][$a_priority][$id]) ) | |
| 708 | - continue; | |
| 709 | - | |
| 710 | - // If a core box was previously added or removed by a plugin, don't add. | |
| 711 | - if ( 'core' == $priority ) { | |
| 712 | - // If core box previously deleted, don't add | |
| 713 | - if ( false === $wp_meta_boxes[$page][$a_context][$a_priority][$id] ) | |
| 714 | - return; | |
| 715 | - // If box was added with default priority, give it core priority to maintain sort order | |
| 716 | - if ( 'default' == $a_priority ) { | |
| 717 | - $wp_meta_boxes[$page][$a_context]['core'][$id] = $wp_meta_boxes[$page][$a_context]['default'][$id]; | |
| 718 | - unset($wp_meta_boxes[$page][$a_context]['default'][$id]); | |
| 719 | - } | |
| 720 | - return; | |
| 721 | - } | |
| 722 | - // If no priority given and id already present, use existing priority | |
| 723 | - if ( empty($priority) ) { | |
| 724 | - $priority = $a_priority; | |
| 725 | - // 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. | |
| 726 | - } elseif ( 'sorted' == $priority ) { | |
| 727 | - $title = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['title']; | |
| 728 | - $callback = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['callback']; | |
| 729 | - $callback_args = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['args']; | |
| 730 | - } | |
| 731 | - // An id can be in only one priority and one context | |
| 732 | - if ( $priority != $a_priority || $context != $a_context ) | |
| 733 | - unset($wp_meta_boxes[$page][$a_context][$a_priority][$id]); | |
| 734 | - } | |
| 735 | - } | |
| 736 | - | |
| 737 | - if ( empty($priority) ) | |
| 738 | - $priority = 'low'; | |
| 739 | - | |
| 740 | - if ( !isset($wp_meta_boxes[$page][$context][$priority]) ) | |
| 741 | - $wp_meta_boxes[$page][$context][$priority] = array(); | |
| 742 | - | |
| 743 | - $wp_meta_boxes[$page][$context][$priority][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback, 'args' => $callback_args); | |
| 744 | - endif; | |
| 745 | -} /* function fwp_add_meta_box () */ | |
| 254 | + $subscribed = ('Y' == strtoupper($visible)); | |
| 255 | + if ($subscribed or (count($links) > 0)) : | |
| 256 | + ?> | |
| 257 | + <table class="widefat<?php if (!$subscribed) : ?> unsubscribed<?php endif; ?>"> | |
| 258 | + <thead> | |
| 259 | + <tr> | |
| 260 | + <th class="check-column" scope="col"><input type="checkbox" /></th> | |
| 261 | +<?php | |
| 262 | + foreach ($fwp_syndicated_sources_columns as $col) : | |
| 263 | + print "\t<th scope='col'>${col}</th>\n"; | |
| 264 | + endforeach; | |
| 265 | + print "</tr>\n"; | |
| 266 | + print "</thead>\n"; | |
| 267 | + print "\n"; | |
| 268 | + print "<tbody>\n"; | |
| 746 | 269 | |
| 747 | -function fwp_do_meta_boxes($page, $context, $object) { | |
| 748 | - if (function_exists('do_meta_boxes')) : | |
| 749 | - $ret = do_meta_boxes($page, $context, $object); | |
| 750 | - | |
| 751 | - // Avoid JavaScript error from WordPress 2.5 bug | |
| 752 | -?> | |
| 753 | - <div style="display: none"> | |
| 754 | - <div id="tags-input"></div> <!-- avoid JS error from WP 2.5 bug --> | |
| 755 | - </div> | |
| 756 | -<?php | |
| 757 | - return $ret; | |
| 758 | - else : | |
| 759 | - /* Derived as per terms of the GPL from do_meta_boxes() in WordPress 2.8.1 wp-admin/includes/template.php. */ | |
| 760 | - global $wp_meta_boxes; | |
| 761 | - static $already_sorted = false; | |
| 762 | - | |
| 763 | - //do_action('do_meta_boxes', $page, $context, $object); | |
| 764 | - | |
| 765 | - echo "<div id='$context-sortables' class='meta-box-sortables'>\n"; | |
| 766 | - | |
| 767 | - $i = 0; | |
| 768 | - do { | |
| 769 | - if ( !isset($wp_meta_boxes) || !isset($wp_meta_boxes[$page]) || !isset($wp_meta_boxes[$page][$context]) ) | |
| 770 | - break; | |
| 771 | - | |
| 772 | - foreach ( array('high', 'sorted', 'core', 'default', 'low') as $priority ) { | |
| 773 | - if ( isset($wp_meta_boxes[$page][$context][$priority]) ) { | |
| 774 | - foreach ( (array) $wp_meta_boxes[$page][$context][$priority] as $box ) { | |
| 775 | - if ( false == $box || ! $box['title'] ) | |
| 776 | - continue; | |
| 777 | - $i++; | |
| 778 | - fwp_option_box_opener($box['title'], $box['id'], 'postbox' /*. postbox_classes($box['id'], $page)*/); | |
| 779 | - call_user_func($box['callback'], $object, $box); | |
| 780 | - fwp_option_box_closer(); | |
| 781 | - | |
| 782 | - if (is_object($object) and method_exists($object, 'interstitial')) : | |
| 783 | - $object->interstitial(); | |
| 270 | + $alt_row = true; | |
| 271 | + if (count($links) > 0): | |
| 272 | + foreach ($links as $link): | |
| 273 | + $trClass = array(); | |
| 274 | + | |
| 275 | + // Prep: Get last updated timestamp | |
| 276 | + $sLink = new SyndicatedLink($link->link_id); | |
| 277 | + if (!is_null($sLink->setting('update/last'))) : | |
| 278 | + $lastUpdated = 'Last checked '. fwp_time_elapsed($sLink->setting('update/last')); | |
| 279 | + else : | |
| 280 | + $lastUpdated = __('None yet'); | |
| 281 | + endif; | |
| 282 | + | |
| 283 | + // Prep: get last error timestamp, if any | |
| 284 | + $fileSizeLines = array(); | |
| 285 | + $feed_type = $sLink->get_feed_type(); | |
| 286 | + if (is_null($sLink->setting('update/error'))) : | |
| 287 | + $errorsSince = ''; | |
| 288 | + if (!is_null($sLink->setting('link/item count'))) : | |
| 289 | + $N = $sLink->setting('link/item count'); | |
| 290 | + $fileSizeLines[] = sprintf((($N==1) ? __('%d item') : __('%d items')), $N) . ", " . $feed_type; | |
| 291 | + endif; | |
| 292 | + | |
| 293 | + if (!is_null($sLink->setting('link/filesize'))) : | |
| 294 | + $fileSizeLines[] = size_format($sLink->setting('link/filesize')). ' total'; | |
| 295 | + endif; | |
| 296 | + else : | |
| 297 | + $trClass[] = 'feed-error'; | |
| 298 | + | |
| 299 | + $theError = unserialize($sLink->setting('update/error')); | |
| 300 | + | |
| 301 | + $errorsSince = "<div class=\"returning-errors\">" | |
| 302 | + ."<p><strong>Returning errors</strong> since " | |
| 303 | + .fwp_time_elapsed($theError['since']) | |
| 304 | + ."</p>" | |
| 305 | + ."<p>Most recent (" | |
| 306 | + .fwp_time_elapsed($theError['ts']) | |
| 307 | + ."):<br/><code>" | |
| 308 | + .implode("</code><br/><code>", $theError['object']->get_error_messages()) | |
| 309 | + ."</code></p>" | |
| 310 | + ."</div>\n"; | |
| 311 | + endif; | |
| 312 | + | |
| 313 | + $nextUpdate = "<div style='max-width: 30.0em; font-size: 0.9em;'><div style='font-style:italic;'>"; | |
| 314 | + | |
| 315 | + $ttl = $sLink->setting('update/ttl'); | |
| 316 | + if (is_numeric($ttl)) : | |
| 317 | + $next = $sLink->setting('update/last') + $sLink->setting('update/fudge') + ((int) $ttl * 60); | |
| 318 | + if ('automatically'==$sLink->setting('update/timed')) : | |
| 319 | + if ($next < time()) : | |
| 320 | + $nextUpdate .= 'Ready and waiting to be updated since '; | |
| 784 | 321 | else : |
| 785 | - // Submit button for WP 1.5, early 2.x style | |
| 786 | - fwp_settings_form_periodic_submit(); | |
| 322 | + $nextUpdate .= 'Scheduled for next update '; | |
| 787 | 323 | endif; |
| 788 | - } | |
| 789 | - } | |
| 790 | - } | |
| 791 | - } while(0); | |
| 792 | - | |
| 793 | - echo "</div>"; | |
| 794 | - | |
| 795 | - return $i; | |
| 796 | - endif; | |
| 797 | -} /* function fwp_do_meta_boxes() */ | |
| 324 | + $nextUpdate .= fwp_time_elapsed($next); | |
| 325 | + if (FEEDWORDPRESS_DEBUG) : $nextUpdate .= " [".(($next-time())/60)." minutes]"; endif; | |
| 326 | + else : | |
| 327 | + $lastUpdated .= " · Next "; | |
| 328 | + if ($next < time()) : | |
| 329 | + $lastUpdated .= 'ASAP'; | |
| 330 | + elseif ($next - time() < 60) : | |
| 331 | + $lastUpdated .= fwp_time_elapsed($next); | |
| 332 | + elseif ($next - time() < 60*60*24) : | |
| 333 | + $lastUpdated .= gmdate('g:ia', $next + (get_option('gmt_offset') * 3600)); | |
| 334 | + else : | |
| 335 | + $lastUpdated .= gmdate('F j', $next + (get_option('gmt_offset') * 3600)); | |
| 336 | + endif; | |
| 798 | 337 | |
| 799 | -function fwp_remove_meta_box($id, $page, $context) { | |
| 800 | - if (function_exists('remove_meta_box')) : | |
| 801 | - return remove_meta_box($id, $page, $context); | |
| 802 | - else : | |
| 803 | - /* Re-used as per terms of the GPL from remove_meta_box() in WordPress 2.8.1 wp-admin/includes/template.php */ | |
| 804 | - global $wp_meta_boxes; | |
| 805 | - | |
| 806 | - if ( !isset($wp_meta_boxes) ) | |
| 807 | - $wp_meta_boxes = array(); | |
| 808 | - if ( !isset($wp_meta_boxes[$page]) ) | |
| 809 | - $wp_meta_boxes[$page] = array(); | |
| 810 | - if ( !isset($wp_meta_boxes[$page][$context]) ) | |
| 811 | - $wp_meta_boxes[$page][$context] = array(); | |
| 812 | - | |
| 813 | - foreach ( array('high', 'core', 'default', 'low') as $priority ) | |
| 814 | - $wp_meta_boxes[$page][$context][$priority][$id] = false; | |
| 338 | + $nextUpdate .= "Scheduled to be checked for updates every ".$ttl." minute".(($ttl!=1)?"s":"")."</div><div style='size:0.9em; margin-top: 0.5em'> This update schedule was requested by the feed provider"; | |
| 339 | + if ($sLink->setting('update/xml')) : | |
| 340 | + $nextUpdate .= " using a standard <code style=\"font-size: inherit; padding: 0; background: transparent\"><".$sLink->setting('update/xml')."></code> element"; | |
| 341 | + endif; | |
| 342 | + $nextUpdate .= "."; | |
| 343 | + endif; | |
| 344 | + else: | |
| 345 | + $nextUpdate .= "Scheduled for update as soon as possible"; | |
| 346 | + endif; | |
| 347 | + $nextUpdate .= "</div></div>"; | |
| 348 | + | |
| 349 | + $fileSize = ''; | |
| 350 | + if (count($fileSizeLines) > 0) : | |
| 351 | + $fileSize = '<div>'.implode(" / ", $fileSizeLines)."</div>"; | |
| 352 | + endif; | |
| 353 | + | |
| 354 | + unset($sLink); | |
| 355 | + | |
| 356 | + $alt_row = !$alt_row; | |
| 357 | + | |
| 358 | + if ($alt_row) : | |
| 359 | + $trClass[] = 'alternate'; | |
| 360 | + endif; | |
| 361 | + ?> | |
| 362 | + <tr<?php echo ((count($trClass) > 0) ? ' class="'.implode(" ", $trClass).'"':''); ?>> | |
| 363 | + <th class="check-column" scope="row"><input type="checkbox" name="link_ids[]" value="<?php echo $link->link_id; ?>" /></th> | |
| 364 | + <?php | |
| 365 | + $caption = ( | |
| 366 | + (strlen($link->link_rss) > 0) | |
| 367 | + ? __('Switch Feed') | |
| 368 | + : $caption=__('Find Feed') | |
| 369 | + ); | |
| 370 | + ?> | |
| 371 | + <td> | |
| 372 | + <strong><a href="<?php print $page->admin_page_href('feeds-page.php', array(), $link); ?>"><?php print esc_html($link->link_name); ?></a></strong> | |
| 373 | + <div class="row-actions"><?php if ($subscribed) : | |
| 374 | + $page->display_feed_settings_page_links(array( | |
| 375 | + 'before' => '<div><strong>Settings ></strong> ', | |
| 376 | + 'after' => '</div>', | |
| 377 | + 'subscription' => $link, | |
| 378 | + )); | |
| 379 | + endif; ?> | |
| 380 | + | |
| 381 | + <div><strong>Actions ></strong> | |
| 382 | + <?php if ($subscribed) : ?> | |
| 383 | + <a href="<?php print $page->admin_page_href('syndication.php', array('action' => 'feedfinder'), $link); ?>"><?php echo $caption; ?></a> | |
| 384 | + <?php else : ?> | |
| 385 | + <a href="<?php print $page->admin_page_href('syndication.php', array('action' => FWP_RESUB_CHECKED), $link); ?>"><?php _e('Re-subscribe'); ?></a> | |
| 386 | + <?php endif; ?> | |
| 387 | + | <a href="<?php print $page->admin_page_href('syndication.php', array('action' => 'Unsubscribe'), $link); ?>"><?php _e(($subscribed ? 'Unsubscribe' : 'Delete permanently')); ?></a> | |
| 388 | + | <a href="<?php print esc_html($link->link_url); ?>"><?php _e('View')?></a></div> | |
| 389 | + </div> | |
| 390 | + </td> | |
| 391 | + <?php if (strlen($link->link_rss) > 0): ?> | |
| 392 | + <td><div><a href="<?php echo esc_html($link->link_rss); ?>"><?php echo esc_html(feedwordpress_display_url($link->link_rss, 32)); ?></a></div></td> | |
| 393 | + <?php else: ?> | |
| 394 | + <td class="feed-missing"><p><strong>no feed assigned</strong></p></td> | |
| 395 | + <?php endif; ?> | |
| 396 | + | |
| 397 | + <td><div style="float: right; padding-left: 10px"> | |
| 398 | + <input type="submit" class="button" name="update_uri[<?php print esc_html($link->link_rss); ?>]" value="<?php _e('Update Now'); ?>" /> | |
| 399 | + </div> | |
| 400 | + <?php | |
| 401 | + print $lastUpdated; | |
| 402 | + print $fileSize; | |
| 403 | + print $errorsSince; | |
| 404 | + print $nextUpdate; | |
| 405 | + ?> | |
| 406 | + </td> | |
| 407 | + </tr> | |
| 408 | + <?php | |
| 409 | + endforeach; | |
| 410 | + else : | |
| 411 | +?> | |
| 412 | +<tr><td colspan="4"><p>There are no websites currently listed for syndication.</p></td></tr> | |
| 413 | +<?php | |
| 414 | + endif; | |
| 415 | +?> | |
| 416 | +</tbody> | |
| 417 | +</table> | |
| 418 | + <?php | |
| 815 | 419 | endif; |
| 816 | -} /* function fwp_remove_meta_box() */ | |
| 817 | - | |
| 420 | +} /* function fwp_syndication_manage_page_links_table_rows () */ | |
| 818 | 421 | |
