| @@ -1,46 +1,34 @@ | ||
| 1 | 1 | <?php |
| 2 | -function fwp_linkedit_single_submit ($status = NULL) { | |
| 3 | - if (fwp_test_wp_version(FWP_SCHEMA_25, FWP_SCHEMA_27)) : | |
| 4 | -?> | |
| 5 | -<div class="submitbox" id="submitlink"> | |
| 6 | -<div id="previewview"></div> | |
| 7 | -<div class="inside"></div> | |
| 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 | -<p class="submit"> | |
| 10 | -<input type="submit" name="submit" value="<?php _e('Save') ?>" /> | |
| 11 | -</p> | |
| 12 | -</div> | |
| 13 | -<?php | |
| 14 | - endif; | |
| 15 | -} | |
| 14 | +$dir = dirname(__FILE__); | |
| 15 | +require_once("${dir}/feedwordpressadminpage.class.php"); | |
| 16 | +require_once("${dir}/feedwordpresssettingsui.class.php"); | |
| 16 | 17 | |
| 17 | -function fwp_linkedit_periodic_submit ($caption = NULL) { | |
| 18 | - if (!fwp_test_wp_version(FWP_SCHEMA_25)) : | |
| 19 | - if (is_null($caption)) : $caption = __('Save Changes »'); endif; | |
| 20 | -?> | |
| 21 | -<p class="submit"> | |
| 22 | -<input type="submit" name="submit" value="<?php print $caption; ?>" /> | |
| 23 | -</p> | |
| 24 | -<?php | |
| 25 | - endif; | |
| 26 | -} | |
| 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; | |
| 27 | 23 | |
| 28 | -function fwp_linkedit_single_submit_closer ($caption = NULL) { | |
| 29 | - if (fwp_test_wp_version(FWP_SCHEMA_27)) : | |
| 30 | - if (is_null($caption)) : $caption = __('Save Changes'); endif; | |
| 31 | -?> | |
| 32 | -<p class="submit"> | |
| 33 | -<input class="button-primary" type="submit" name="submit" value="<?php print $caption; ?>" /> | |
| 34 | -</p> | |
| 35 | -<?php | |
| 24 | + if (!is_null($joiner)) : | |
| 25 | + $mesg = implode($joiner, $mesg); | |
| 36 | 26 | endif; |
| 37 | -} | |
| 27 | + return $mesg; | |
| 28 | +} /* function fwp_update_set_results_message () */ | |
| 38 | 29 | |
| 39 | 30 | function fwp_authors_single_submit ($link = NULL) { |
| 40 | - global $wp_db_version; | |
| 41 | - | |
| 42 | - if (fwp_test_wp_version(FWP_SCHEMA_25)) : | |
| 43 | 31 | ?> |
| 44 | 32 | <div class="submitbox" id="submitlink"> |
| 45 | 33 | <div id="previewview"> |
| 46 | 34 | </div> |
| @@ -51,135 +39,155 @@ | ||
| 51 | 39 | <input type="submit" name="save" value="<?php _e('Save') ?>" /> |
| 52 | 40 | </p> |
| 53 | 41 | </div> |
| 54 | 42 | <?php |
| 43 | +} | |
| 44 | + | |
| 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 | + )); | |
| 55 | + | |
| 56 | + if (!is_array($tags)) : $tags = array(); endif; | |
| 57 | + | |
| 58 | + $tax_name = $params['taxonomy']; | |
| 59 | + | |
| 60 | + $oTax = get_taxonomy($params['taxonomy']); | |
| 61 | + $oTaxLabels = get_taxonomy_labels($oTax); | |
| 62 | + | |
| 63 | + $disabled = (!current_user_can($oTax->cap->assign_terms) ? 'disabled="disabled"' : ''); | |
| 64 | + | |
| 65 | + $desc = "<p style=\"font-size:smaller;font-style:bold;margin:0\">Tag $object as...</p>"; | |
| 66 | + | |
| 67 | + if (is_null($params['textarea_name'])) : | |
| 68 | + $params['textarea_name'] = "tax_input[$tax_name]"; | |
| 55 | 69 | endif; |
| 56 | -} | |
| 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; | |
| 57 | 79 | |
| 58 | -function fwp_option_box_opener ($legend, $id, $class = "stuffbox") { | |
| 59 | - global $wp_db_version; | |
| 60 | - if (isset($wp_db_version) and $wp_db_version >= FWP_SCHEMA_25) : | |
| 61 | -?> | |
| 62 | -<div id="<?php print $id; ?>" class="<?php print $class; ?>"> | |
| 63 | -<h3><?php print htmlspecialchars($legend); ?></h3> | |
| 64 | -<div class="inside"> | |
| 65 | -<?php | |
| 66 | - else : | |
| 67 | -?> | |
| 68 | -<fieldset class="options"><legend><?php print htmlspecialchars($legend); ?></legend> | |
| 69 | -<?php | |
| 80 | + if (is_null($params['id'])) : | |
| 81 | + $params['id'] = $tax_name; | |
| 70 | 82 | endif; |
| 83 | + | |
| 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> | |
| 93 | + | |
| 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> | |
| 104 | + | |
| 105 | + <div class="tagchecklist"></div> | |
| 106 | +</div> | |
| 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; | |
| 110 | + | |
| 71 | 111 | } |
| 72 | 112 | |
| 73 | -function fwp_option_box_closer () { | |
| 113 | +function fwp_category_box ($checked, $object, $tags = array(), $params = array()) { | |
| 74 | 114 | global $wp_db_version; |
| 75 | - if (isset($wp_db_version) and $wp_db_version >= FWP_SCHEMA_25) : | |
| 76 | -?> | |
| 77 | - </div> <!-- class="inside" --> | |
| 78 | - </div> <!-- class="stuffbox" --> | |
| 79 | -<?php | |
| 80 | - else : | |
| 81 | -?> | |
| 82 | -</fieldset> | |
| 83 | -<?php | |
| 115 | + | |
| 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'); | |
| 84 | 122 | endif; |
| 85 | -} | |
| 86 | - | |
| 87 | -function fwp_tags_box ($tags, $object) { | |
| 88 | - if (!is_array($tags)) : $tags = array(); endif; | |
| 89 | 123 | |
| 90 | - $desc = "<p style=\"font-size:smaller;font-style:bold;margin:0\">Tag $object as...</p>"; | |
| 124 | + $oTax = get_taxonomy($taxonomy); | |
| 125 | + $oTaxLabels = get_taxonomy_labels($oTax); | |
| 91 | 126 | |
| 92 | - if (fwp_test_wp_version(FWP_SCHEMA_28)) : // WordPress 2.8+ | |
| 93 | - fwp_option_box_opener(__('Tags'), 'tagsdiv', 'postbox'); | |
| 94 | -?> | |
| 95 | - <?php print $desc; ?> | |
| 96 | - <div class="tagsdiv" id="post_tag"> | |
| 97 | - <div class="jaxtag"> | |
| 98 | - <div class="nojs-tags hide-if-js"> | |
| 99 | - <p><?php _e('Add or remove tags'); ?></p> | |
| 100 | - <textarea name="tax_input[post_tag]" class="the-tags" id="tax-input[post_tag]"><?php echo implode(",", $tags); ?></textarea> | |
| 101 | - </div> | |
| 102 | - | |
| 103 | - <span class="ajaxtag hide-if-no-js"> | |
| 104 | - <label class="screen-reader-text" for="new-tag-post_tag"><?php _e('Tags'); ?></label> | |
| 105 | - <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'); ?>" /> | |
| 106 | - <input type="button" class="button tagadd" value="<?php esc_attr_e('Add'); ?>" /> | |
| 107 | - </span> | |
| 108 | - </div> | |
| 109 | - <p class="howto"><?php echo __('Separate tags with commas.'); ?></p> | |
| 110 | - <div class="tagchecklist"></div> | |
| 111 | - </div> | |
| 112 | - <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> | |
| 113 | - </div> | |
| 114 | - </div> | |
| 115 | -<?php | |
| 127 | + if (strlen($prefix) > 0) : | |
| 128 | + $idPrefix = $prefix.'-'; | |
| 129 | + $idSuffix = "-".$prefix; | |
| 130 | + $namePrefix = $prefix . '_'; | |
| 116 | 131 | else : |
| 117 | - fwp_option_box_opener(__('Tags'), 'tagsdiv', 'postbox'); | |
| 132 | + $idPrefix = 'feedwordpress-'; | |
| 133 | + $idSuffix = "-feedwordpress"; | |
| 134 | + $namePrefix = 'feedwordpress_'; | |
| 135 | + endif; | |
| 136 | + | |
| 118 | 137 | ?> |
| 119 | - <?php print $desc; ?> | |
| 120 | - <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> | |
| 121 | - <div id="tagchecklist"></div> | |
| 122 | - </div> | |
| 123 | - </div> | |
| 124 | -<?php | |
| 125 | - endif; | |
| 126 | -} | |
| 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> | |
| 127 | 144 | |
| 128 | -function fwp_category_box ($checked, $object, $tags = array()) { | |
| 129 | - global $wp_db_version; | |
| 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> | |
| 130 | 151 | |
| 131 | - if (fwp_test_wp_version(FWP_SCHEMA_25)) : // WordPress 2.5.x | |
| 132 | -?> | |
| 133 | -<div id="category-adder" class="wp-hidden-children"> | |
| 134 | - <h4><a id="category-add-toggle" href="#category-add" class="hide-if-no-js" tabindex="3"><?php _e( '+ Add New Category' ); ?></a></h4> | |
| 135 | - <p id="category-add" class="wp-hidden-child"> | |
| 136 | - <input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" tabindex="3" /> | |
| 137 | - <?php wp_dropdown_categories( array( 'hide_empty' => 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('Parent category'), 'tab_index' => 3 ) ); ?> | |
| 138 | - <input type="button" id="category-add-sumbit" class="add:categorychecklist:category-add button" value="<?php _e( 'Add' ); ?>" tabindex="3" /> | |
| 139 | - <?php wp_nonce_field( 'add-category', '_ajax_nonce', false ); ?> | |
| 140 | - <span id="category-ajax-response"></span> | |
| 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 | + | |
| 158 | + ?> | |
| 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> | |
| 141 | 185 | </p> |
| 142 | 186 | </div> |
| 143 | 187 | |
| 144 | -<ul id="category-tabs"> | |
| 145 | - <?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... */ ?> | |
| 146 | - <li class="ui-tabs-selected tabs"><a href="#categories-all" tabindex="3"><?php _e( 'All posts' ); ?></a> | |
| 147 | - <p style="font-size:smaller;font-style:bold;margin:0">Give <?php print $object; ?> these categories</p> | |
| 148 | -</li> | |
| 149 | -</ul> | |
| 150 | - | |
| 151 | -<?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... */ ?> | |
| 152 | -<div id="categories-all" class="ui-tabs-panel tabs-panel"> | |
| 153 | - <ul id="categorychecklist" class="list:category categorychecklist form-no-clear"> | |
| 154 | - <?php fwp_category_checklist(NULL, false, $checked) ?> | |
| 155 | - </ul> | |
| 156 | 188 | </div> |
| 157 | 189 | <?php |
| 158 | - elseif (fwp_test_wp_version(FWP_SCHEMA_20)) : // WordPress 2.x | |
| 159 | -?> | |
| 160 | - <div id="moremeta"> | |
| 161 | - <div id="grabit" class="dbx-group"> | |
| 162 | - <fieldset id="categorydiv" class="dbx-box"> | |
| 163 | - <h3 class="dbx-handle"><?php _e('Categories') ?></h3> | |
| 164 | - <div class="dbx-content"> | |
| 165 | - <p style="font-size:smaller;font-style:bold;margin:0">Place <?php print $object; ?> under...</p> | |
| 166 | - <p id="jaxcat"></p> | |
| 167 | - <div id="categorychecklist"><?php fwp_category_checklist(NULL, false, $checked); ?></div> | |
| 168 | - </div> | |
| 169 | - </fieldset> | |
| 170 | - </div> | |
| 171 | - </div> | |
| 172 | -<?php | |
| 173 | - else : // WordPress 1.5 | |
| 174 | -?> | |
| 175 | - <fieldset style="width: 60%;"> | |
| 176 | - <legend><?php _e('Categories') ?></legend> | |
| 177 | - <p style="font-size:smaller;font-style:bold;margin:0">Place <?php print $object; ?> under...</p> | |
| 178 | - <div style="height: 10em; overflow: scroll;"><?php fwp_category_checklist(NULL, false, $checked); ?></div> | |
| 179 | - </fieldset> | |
| 180 | -<?php | |
| 181 | - endif; | |
| 182 | 190 | } |
| 183 | 191 | |
| 184 | 192 | function update_feeds_mention ($feed) { |
| 185 | 193 | echo "<li>Updating <cite>".$feed['link/name']."</cite> from <<a href=\"" |
| @@ -186,9 +194,18 @@ | ||
| 186 | 194 | .$feed['link/uri']."\">".$feed['link/uri']."</a>> ..."; |
| 187 | 195 | flush(); |
| 188 | 196 | } |
| 189 | 197 | function update_feeds_finish ($feed, $added, $dt) { |
| 190 | - echo " completed in $dt second".(($dt==1)?'':'s')."</li>\n"; | |
| 198 | + if (is_wp_error($added)) : | |
| 199 | + $mesgs = $added->get_error_messages(); | |
| 200 | + foreach ($mesgs as $mesg) : | |
| 201 | + echo "<br/><strong>Feed error:</strong> <code>$mesg</code>"; | |
| 202 | + endforeach; | |
| 203 | + echo "</li>\n"; | |
| 204 | + else : | |
| 205 | + echo " completed in $dt second".(($dt==1)?'':'s')."</li>\n"; | |
| 206 | + endif; | |
| 207 | + flush(); | |
| 191 | 208 | } |
| 192 | 209 | |
| 193 | 210 | function fwp_author_list () { |
| 194 | 211 | global $wpdb; |
| @@ -193,20 +210,13 @@ | ||
| 193 | 210 | function fwp_author_list () { |
| 194 | 211 | global $wpdb; |
| 195 | 212 | $ret = array(); |
| 196 | 213 | |
| 197 | - // display_name introduced in WP 2.0 | |
| 198 | - if (fwp_test_wp_version(FWP_SCHEMA_20)) : | |
| 199 | - $name_column = 'display_name'; | |
| 200 | - else : | |
| 201 | - $name_column = 'user_nickname'; | |
| 202 | - endif; | |
| 203 | - | |
| 204 | - $users = $wpdb->get_results("SELECT * FROM $wpdb->users ORDER BY {$name_column}"); | |
| 214 | + $users = get_users(); | |
| 205 | 215 | if (is_array($users)) : |
| 206 | 216 | foreach ($users as $user) : |
| 207 | 217 | $id = (int) $user->ID; |
| 208 | - $ret[$id] = $user->{$name_column}; | |
| 218 | + $ret[$id] = $user->display_name; | |
| 209 | 219 | if (strlen(trim($ret[$id])) == 0) : |
| 210 | 220 | $ret[$id] = $user->user_login; |
| 211 | 221 | endif; |
| 212 | 222 | endforeach; |
| @@ -213,72 +223,8 @@ | ||
| 213 | 223 | endif; |
| 214 | 224 | return $ret; |
| 215 | 225 | } |
| 216 | 226 | |
| 217 | -class FeedWordPressSettingsUI { | |
| 218 | - function instead_of_posts_box ($link_id = null) { | |
| 219 | - fwp_option_box_opener('Syndicated Posts, Comments & Pings', 'syndicatedpostsdiv', 'postbox'); | |
| 220 | - if (!is_null($link_id)) : | |
| 221 | - $from_this_feed = 'from this feed'; | |
| 222 | - $by_default = ''; | |
| 223 | - $id_param = "&link_id=".$link_id; | |
| 224 | - else : | |
| 225 | - $from_this_feed = 'from syndicated feeds'; | |
| 226 | - $by_default = " by default"; | |
| 227 | - $id_param = ""; | |
| 228 | - endif; | |
| 229 | -?> | |
| 230 | -<p>Use the <a href="admin.php?page=<?php print $GLOBALS['fwp_path'] ?>/posts-page.php<?php print $id_param; ?>"><?php _e('Posts'); ?></a> | |
| 231 | -settings page to set up how new posts <?php print $from_this_feed; ?> will be published<?php $by_default; ?>, whether they will accept | |
| 232 | -comments and pings, any custom fields that should be set on each post, etc.</p> | |
| 233 | -<?php | |
| 234 | - fwp_option_box_closer(); | |
| 235 | - } /* FeedWordPressSettingsUI::instead_of_posts_box () */ | |
| 236 | - | |
| 237 | - function instead_of_authors_box ($link_id = null) { | |
| 238 | - if (!is_null($link_id)) : | |
| 239 | - $from_this_feed = 'from this feed'; | |
| 240 | - $by_default = ''; | |
| 241 | - $id_param = "&link_id=".$link_id; | |
| 242 | - else : | |
| 243 | - $from_this_feed = 'from syndicated feeds'; | |
| 244 | - $by_default = " by default"; | |
| 245 | - $id_param = ""; | |
| 246 | - endif; | |
| 247 | - | |
| 248 | - fwp_option_box_opener('Syndicated Authors', 'authordiv', 'postbox') | |
| 249 | -?> | |
| 250 | -<p>Use the <a | |
| 251 | -href="admin.php?page=<?php print $GLOBALS['fwp_path'] | |
| 252 | -?>/authors-page.php<?php print $id_param; ?>"><?php _e('Authors'); | |
| 253 | -?></a> settings page to set up how new posts | |
| 254 | -<?php print $from_this_feed; ?> will be assigned to | |
| 255 | -authors.</p> | |
| 256 | -<?php | |
| 257 | - fwp_option_box_closer(); | |
| 258 | - } /* FeedWordPressSettingsUI::instead_of_authors_box () */ | |
| 259 | - | |
| 260 | - function instead_of_categories_box ($link_id = null) { | |
| 261 | - if (!is_null($link_id)) : | |
| 262 | - $from_this_feed = 'from this feed'; | |
| 263 | - $by_default = ''; | |
| 264 | - $id_param = "&link_id=".$link_id; | |
| 265 | - else : | |
| 266 | - $from_this_feed = 'from syndicated feeds'; | |
| 267 | - $by_default = " by default"; | |
| 268 | - $id_param = ""; | |
| 269 | - endif; | |
| 270 | - | |
| 271 | - fwp_option_box_opener(__('Categories & Tags'), 'categorydiv', 'postbox'); | |
| 272 | -?> | |
| 273 | -<p>Use the <a href="admin.php?page=<?php print $GLOBALS['fwp_path'] ?>/categories-page.php<?php print $id_param; ?>"><?php _e('Categories & Tags'); ?></a> | |
| 274 | -settings page to set up how new posts <?php print $from_this_feed; ?> are assigned categories or tags<?php print $by_default; ?>.</p> | |
| 275 | -<?php | |
| 276 | - fwp_option_box_closer(); | |
| 277 | - } /* FeedWordPressSettingsUI::instead_of_categories_box () */ | |
| 278 | - | |
| 279 | -} /* class FeedWordPressSettingsUI */ | |
| 280 | - | |
| 281 | 227 | function fwp_insert_new_user ($newuser_name) { |
| 282 | 228 | global $wpdb; |
| 283 | 229 | |
| 284 | 230 | $ret = null; |
| @@ -284,25 +230,192 @@ | ||
| 284 | 230 | $ret = null; |
| 285 | 231 | if (strlen($newuser_name) > 0) : |
| 286 | 232 | $userdata = array(); |
| 287 | 233 | $userdata['ID'] = NULL; |
| 288 | - | |
| 289 | - $userdata['user_login'] = sanitize_user($newuser_name); | |
| 290 | - $userdata['user_login'] = apply_filters('pre_user_login', $userdata['user_login']); | |
| 291 | - | |
| 292 | - $userdata['user_nicename'] = sanitize_title($newuser_name); | |
| 293 | - $userdata['user_nicename'] = apply_filters('pre_user_nicename', $userdata['user_nicename']); | |
| 294 | - | |
| 295 | - $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 | |
| 296 | 238 | |
| 239 | + $blahUrl = get_bloginfo('url'); $url = parse_url($blahUrl); | |
| 240 | + $userdata['user_email'] = substr(md5(uniqid(microtime())), 0, 6).'@'.$url['host']; | |
| 241 | + | |
| 297 | 242 | $newuser_id = wp_insert_user($userdata); |
| 298 | - if (is_numeric($newuser_id)) : | |
| 299 | - $ret = $newuser_id; | |
| 300 | - else : | |
| 301 | - // TODO: Add some error detection and reporting | |
| 302 | - endif; | |
| 243 | + $ret = $newuser_id; // Either a numeric ID or a WP_Error object | |
| 303 | 244 | else : |
| 304 | 245 | // TODO: Add some error reporting |
| 305 | 246 | endif; |
| 306 | 247 | return $ret; |
| 307 | 248 | } /* fwp_insert_new_user () */ |
| 249 | + | |
| 250 | +function fwp_syndication_manage_page_links_table_rows ($links, $page, $visible = 'Y') { | |
| 251 | + | |
| 252 | + $fwp_syndicated_sources_columns = array(__('Name'), __('Feed'), __('Updated')); | |
| 253 | + | |
| 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"; | |
| 269 | + | |
| 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 '; | |
| 321 | + else : | |
| 322 | + $nextUpdate .= 'Scheduled for next update '; | |
| 323 | + endif; | |
| 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; | |
| 337 | + | |
| 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 | |
| 419 | + endif; | |
| 420 | +} /* function fwp_syndication_manage_page_links_table_rows () */ | |
| 308 | 421 | |
