| @@ -1,164 +1,73 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * Admin UI Compatibility (admin-ui.php): This is kind of a junk pile of utility functions | |
| 4 | - * mostly created to smooth out interactions to make things show up, or behave correctly, | |
| 5 | - * within the WordPress admin settings interface. Major chunks of this code that deal with | |
| 6 | - * making it easy for FWP, add-on modules, etc. to create new settings panels have since | |
| 7 | - * been hived off into class FeedWordPressAdminPage. Many of the functions that remain here | |
| 8 | - * were created to handle compatibility across multiple, sometimes very old, versions of | |
| 9 | - * WordPress, many of which are no longer supported anymore. It's likely that some of these | |
| 10 | - * functions will be re-evaluated, re-organized, deprecated, or clipped out in the next few | |
| 11 | - * versions. | |
| 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. | |
| 12 | 11 | * -cj 2017-10-27 |
| 13 | - * | |
| 14 | - * @package FeedWordPress | |
| 15 | 12 | */ |
| 16 | 13 | |
| 17 | -$dir = dirname( __FILE__ ); | |
| 18 | -require_once "{$dir}/feedwordpressadminpage.class.php"; | |
| 19 | -require_once "{$dir}/feedwordpresssettingsui.class.php"; | |
| 14 | +$dir = dirname(__FILE__); | |
| 15 | +require_once("${dir}/feedwordpressadminpage.class.php"); | |
| 16 | +require_once("${dir}/feedwordpresssettingsui.class.php"); | |
| 20 | 17 | |
| 21 | -/** | |
| 22 | - * Prints the class="..." attribute (if any) for an HTML form element | |
| 23 | - * | |
| 24 | - * If there is at least one class to add to the element, escape it for attribute contet and print; | |
| 25 | - * if not, omit the attribute entirely. | |
| 26 | - * | |
| 27 | - * @param string $class_name The name(s) of the HTML class or classes to apply. | |
| 28 | - * @param string $before Separator prefix string to print just before class="..." attribute, when printed (usually whitespace). | |
| 29 | - * @param string $after Separator suffix string to print just after class="..." attribute, when printed (usually blank). | |
| 30 | - */ | |
| 31 | -function fwp_form_class_attr( $class_name, $before = ' ', $after = '' ) { | |
| 18 | +function fwp_form_class_attr( $className ) { | |
| 32 | 19 | |
| 33 | - if ( is_string( $class_name ) ) : | |
| 34 | - if ( strlen( $class_name ) > 0 ) : | |
| 35 | - $s_class_name = sanitize_html_class( $class_name ); | |
| 36 | - printf( '%sclass="%s"%s', esc_html( $before ), esc_attr( $s_class_name ), esc_html( $after ) ); | |
| 20 | + if ( is_string($className) ) : | |
| 21 | + if (strlen($className) > 0 ) : | |
| 22 | + $sClassName = sanitize_html_class( $className ); | |
| 23 | + print sprintf( 'class="%s"', esc_attr( $sClassName ) ); | |
| 37 | 24 | endif; |
| 38 | 25 | endif; |
| 39 | - | |
| 40 | 26 | } /* fwp_form_class_attr() */ |
| 41 | 27 | |
| 42 | -/** | |
| 43 | - * Prints a flag attribute for selected UI elements (selected="selected" or checked="checked", etc.) when appropriate | |
| 44 | - * | |
| 45 | - * In HTML form output templates, this allows conditional output of the selected="selected" | |
| 46 | - * (or checked="checked", etc.) attribute on input or option controls when appropriate, and | |
| 47 | - * omits the element when not appropriate, as measured by a flag that is monitored and updated | |
| 48 | - * by the caller. | |
| 49 | - * | |
| 50 | - * @param mixed $arg Flag monitoring variable. | |
| 51 | - * @param mixed $key When $arg is an array, $key provides the index within the array to check for the flag. | |
| 52 | - * @param string $flag The name of the flag attribute to output when appropriate; default, "selected". | |
| 53 | - */ | |
| 54 | -function fwp_selected_flag( /* mixed */ $arg = null, $key = null, $flag = 'selected' ) { | |
| 55 | - | |
| 56 | - $is_on = false; | |
| 57 | - | |
| 58 | - $s_arg = $arg; | |
| 59 | - if ( is_array( $arg ) && ! is_null( $key ) ) : | |
| 60 | - if ( array_key_exists( $key, $arg ) ) : | |
| 61 | - $s_arg = $arg[ $key ]; | |
| 28 | +function fwp_selected_flag( /* mixed */ $arg = null, $key = null, $flag = "selected" ) { | |
| 29 | + | |
| 30 | + $bIsOn = false; | |
| 31 | + | |
| 32 | + $theArg = $arg; | |
| 33 | + if (is_array($arg) and !is_null($key)) : | |
| 34 | + if (array_key_exists($key, $arg)) : | |
| 35 | + $theArg = $arg[$key]; | |
| 62 | 36 | else : |
| 63 | - $s_arg = false; | |
| 37 | + $theArg = false; | |
| 64 | 38 | endif; |
| 65 | 39 | endif; |
| 66 | - | |
| 67 | - if ( is_string( $s_arg ) ) : | |
| 68 | - $is_on = ( strlen( $s_arg ) > 0 ); | |
| 40 | + | |
| 41 | + if (is_string($theArg)) : | |
| 42 | + $bIsOn = (strlen($theArg) > 0); | |
| 69 | 43 | else : |
| 70 | - $is_on = (bool) ( $s_arg ); | |
| 44 | + $bIsOn = !!($theArg); | |
| 71 | 45 | endif; |
| 72 | - | |
| 73 | - if ( $is_on ) : | |
| 74 | - print sprintf( '%s="%s"', esc_attr( $flag ), esc_attr( $flag ) ); | |
| 46 | + | |
| 47 | + if ( $bIsOn ) : | |
| 48 | + print sprintf( '%s="%s"', esc_attr($flag), esc_attr($flag) ); | |
| 75 | 49 | endif; |
| 76 | 50 | } /* fwp_selected_flag() */ |
| 77 | 51 | |
| 78 | -/** | |
| 79 | - * Outputs a flag attribute for checked UI elements (checked="checked") when appropriate | |
| 80 | - * | |
| 81 | - * In HTML form output templates, this allows conditional output of the check="checked" | |
| 82 | - * attribute on input controls (e.g. checkbox, radio) when appropriate, and omits when | |
| 83 | - * inappropriate (unchecked), as determined by a flag monitored and updated by caller. | |
| 84 | - * | |
| 85 | - * @param mixed $arg Flag monitoring variable. | |
| 86 | - * @param mixed $key When $arg is an array, $key provides index within the array to check for flag value. | |
| 87 | - * | |
| 88 | - * @uses fwp_selected_flag() | |
| 89 | - */ | |
| 90 | 52 | function fwp_checked_flag( /* mixed */ $arg = null, $key = null ) { |
| 91 | - fwp_selected_flag( $arg, $key, 'checked' ); | |
| 53 | + fwp_selected_flag( $arg, $key, "checked" ); | |
| 92 | 54 | } /* fwp_checked_flag() */ |
| 93 | 55 | |
| 94 | -if ( ! function_exists( '_s' ) ) : | |
| 95 | -/** | |
| 96 | - * Retrieves a plural or singular form of a string based on the supplied number. | |
| 97 | - * | |
| 98 | - * Used when you want to use the appropriate form of a string based on whether | |
| 99 | - * a number is singular or plural. Very similar to WordPress l10n.php _n(), | |
| 100 | - * but designed for a nice short form in the | |
| 101 | - * default case (provide "s" when plural, "" otherwise). | |
| 102 | - * | |
| 103 | - * @note This function *may* have been defined elsewhere; also, consider | |
| 104 | - * using WordPress's own `_n()` function and derivatives. (gwyneth 20230920) | |
| 105 | - * | |
| 106 | - * @param int $n The counter to determine singular or plural form. | |
| 107 | - * @param string $plural The text to use if the counter is plural. | |
| 108 | - * @param string $singular The text to use if the counter is singular. | |
| 109 | - * | |
| 110 | - * @return string The text of the singular or plural form. | |
| 111 | - */ | |
| 112 | -function _s( $n = 0, $plural = 's', $singular = '' ) { | |
| 113 | - $is_singular = ( is_numeric( $n ) && intval( $n ) === 1 ); | |
| 114 | - return ( $is_singular ? $singular : $plural ); | |
| 115 | -} /* _s() */ | |
| 116 | -endif; | |
| 117 | - | |
| 118 | -/** | |
| 119 | - * Outputs a status message for the aggregate results of polling a set of feeds. | |
| 120 | - * | |
| 121 | - * This will always output the number of new syndicated posts added, even if this is 0. | |
| 122 | - * Posts updated and alternate versions stored will be added to the message iff > 0. | |
| 123 | - * | |
| 124 | - * @param array $delta Counters indicating results in "new", "updated" and "stored". | |
| 125 | - * @param string $joiner Default ';'. Delimiter used to separate messages about new, updated and stored posts. | |
| 126 | - */ | |
| 127 | -function fwp_update_set_results_message( $delta, $joiner = ';' ) { | |
| 128 | - | |
| 56 | +function fwp_update_set_results_message ($delta, $joiner = ';') { | |
| 129 | 57 | $mesg = array(); |
| 58 | + if (isset($delta['new'])) : $mesg[] = ' '.$delta['new'].' new posts were syndicated'; endif; | |
| 59 | + if (isset($delta['updated']) and ($delta['updated'] != 0)) : $mesg[] = ' '.$delta['updated'].' existing posts were updated'; endif; | |
| 60 | + if (isset($delta['stored']) and ($delta['stored'] != 0)) : $mesg[] = ' '.$delta['stored'].' alternate versions of existing posts were stored for reference'; endif; | |
| 130 | 61 | |
| 131 | - $delta = wp_parse_args( | |
| 132 | - $delta, | |
| 133 | - array( | |
| 134 | - 'new' => 0, | |
| 135 | - 'updated' => 0, | |
| 136 | - 'stored' => 0, | |
| 137 | - ) | |
| 138 | - ); | |
| 139 | - | |
| 140 | - $mesg[] = sprintf( ' %d new post%s syndicated', intval( $delta['new'] ), _s( $delta['new'], 's were', ' was' ) ); | |
| 141 | - if ( $delta['updated'] > 0 ) : | |
| 142 | - $mesg[] = sprintf( ' %d existing post%s updated', intval( $delta['updated'] ), _s( $delta['updated'], 's were', ' was' ) ); | |
| 62 | + if (!is_null($joiner)) : | |
| 63 | + $mesg = implode($joiner, $mesg); | |
| 143 | 64 | endif; |
| 144 | - if ( $delta['stored'] > 0 ) : | |
| 145 | - $mesg[] = sprintf( ' %d alternate version%s of existing post%s stored for reference', intval( $delta['stored'] ), _s( $delta['stored'] ), _s( $delta['stored'], 's were', ' was' ) ); | |
| 146 | - endif; | |
| 147 | - | |
| 148 | - if ( ! is_null( $joiner ) ) : | |
| 149 | - $mesg = implode( $joiner, $mesg ); | |
| 150 | - endif; | |
| 151 | 65 | return $mesg; |
| 152 | -} /* function fwp_update_set_results_message() */ | |
| 66 | +} /* function fwp_update_set_results_message () */ | |
| 153 | 67 | |
| 154 | -/** | |
| 155 | - * Outputs the HTML template for a "Submit" button on FWP admin pages. | |
| 156 | - * | |
| 157 | - * @param mixed $link The syndicated link, if any, that we are viewing settings for. (Unused) | |
| 158 | - */ | |
| 159 | -function fwp_authors_single_submit( $link = null ) { | |
| 160 | - ?> | |
| 68 | +function fwp_authors_single_submit ($link = NULL) { | |
| 69 | +?> | |
| 161 | 70 | <div class="submitbox" id="submitlink"> |
| 162 | 71 | <div id="previewview"> |
| 163 | 72 | </div> |
| 164 | 73 | <div class="inside"> |
| @@ -164,595 +73,395 @@ | ||
| 164 | 73 | <div class="inside"> |
| 165 | 74 | </div> |
| 166 | 75 | |
| 167 | 76 | <p class="submit"> |
| 168 | -<input type="submit" name="save" value="<?php esc_html_e( 'Save' ); ?>" /> | |
| 77 | +<input type="submit" name="save" value="<?php _e('Save') ?>" /> | |
| 169 | 78 | </p> |
| 170 | 79 | </div> |
| 171 | - <?php | |
| 172 | -} /* function fwp_authors_single_submit() */ | |
| 80 | +<?php | |
| 81 | +} | |
| 173 | 82 | |
| 174 | -/** | |
| 175 | - * Outputs the HTML template for a Tags (or similar taxonomy) add / remove box in FeedWordPress admin UI pages. | |
| 176 | - * | |
| 177 | - * @param array $tags An array of tags already applied to the object. | |
| 178 | - * @param string $object The human-readable description of the objects to be tagged ("post", "posts from this feed", etc.). | |
| 179 | - * @param array $params An array of optional parameters. | |
| 180 | - */ | |
| 181 | -function fwp_tags_box( $tags, $object, $params = array() ) { | |
| 182 | - $params = wp_parse_args( | |
| 183 | - $params, | |
| 184 | - array( // Default values. | |
| 185 | - 'taxonomy' => 'post_tag', | |
| 186 | - 'textarea_name' => null, | |
| 187 | - 'textarea_id' => null, | |
| 188 | - 'input_id' => null, | |
| 189 | - 'input_name' => null, | |
| 190 | - 'id' => null, | |
| 191 | - 'box_title' => __( 'Post Tags' ), | |
| 192 | - ) | |
| 193 | - ); | |
| 83 | +function fwp_tags_box ($tags, $object, $params = array()) { | |
| 84 | + $params = wp_parse_args($params, array( // Default values | |
| 85 | + 'taxonomy' => 'post_tag', | |
| 86 | + 'textarea_name' => NULL, | |
| 87 | + 'textarea_id' => NULL, | |
| 88 | + 'input_id' => NULL, | |
| 89 | + 'input_name' => NULL, | |
| 90 | + 'id' => NULL, | |
| 91 | + 'box_title' => __('Post Tags'), | |
| 92 | + )); | |
| 194 | 93 | |
| 195 | - if ( ! is_array( $tags ) ) : | |
| 196 | - $tags = array(); | |
| 197 | - endif; | |
| 94 | + if (!is_array($tags)) : $tags = array(); endif; | |
| 198 | 95 | |
| 199 | - $tax_name = $params['taxonomy']; | |
| 200 | - $o_tax = get_taxonomy( $params['taxonomy'] ); | |
| 201 | - $o_tax_labels = get_taxonomy_labels( $o_tax ); | |
| 202 | - $is_enabled = current_user_can( $o_tax->cap->assign_terms ); | |
| 96 | + $tax_name = $params['taxonomy']; | |
| 97 | + | |
| 98 | + $oTax = get_taxonomy($params['taxonomy']); | |
| 99 | + $oTaxLabels = get_taxonomy_labels($oTax); | |
| 100 | + | |
| 101 | + $disabled = (!current_user_can($oTax->cap->assign_terms) ? 'disabled="disabled"' : ''); | |
| 203 | 102 | |
| 204 | - if ( is_null( $params['textarea_name'] ) ) : | |
| 103 | + $desc = "<p style=\"font-size:smaller;font-style:bold;margin:0\">Tag $object as...</p>"; | |
| 104 | + | |
| 105 | + if (is_null($params['textarea_name'])) : | |
| 205 | 106 | $params['textarea_name'] = "tax_input[$tax_name]"; |
| 206 | 107 | endif; |
| 207 | - if ( is_null( $params['textarea_id'] ) ) : | |
| 208 | - $params['textarea_id'] = "tax-input-{$tax_name}"; | |
| 108 | + if (is_null($params['textarea_id'])) : | |
| 109 | + $params['textarea_id'] = "tax-input-${tax_name}"; | |
| 209 | 110 | endif; |
| 210 | - if ( is_null( $params['input_id'] ) ) : | |
| 211 | - $params['input_id'] = "new-tag-{$tax_name}"; | |
| 111 | + if (is_null($params['input_id'])) : | |
| 112 | + $params['input_id'] = "new-tag-${tax_name}"; | |
| 212 | 113 | endif; |
| 213 | - if ( is_null( $params['input_name'] ) ) : | |
| 114 | + if (is_null($params['input_name'])) : | |
| 214 | 115 | $params['input_name'] = "newtag[$tax_name]"; |
| 215 | 116 | endif; |
| 216 | - if ( is_null( $params['id'] ) ) : | |
| 117 | + | |
| 118 | + if (is_null($params['id'])) : | |
| 217 | 119 | $params['id'] = $tax_name; |
| 218 | 120 | endif; |
| 219 | 121 | |
| 220 | - printf( /* $desc = */ '<p style="font-size:smaller;font-style:bold;margin:0\">' . esc_html__( 'Tag' ) . ' %s ' | |
| 221 | - . esc_html__( 'as' ) . '...</p>', esc_html( $object ) ); | |
| 222 | - $helps = __( 'Separate tags with commas.' ); | |
| 223 | - $box['title'] = __( 'Tags' ); | |
| 122 | + print $desc; | |
| 123 | + $helps = __('Separate tags with commas.'); | |
| 124 | + $box['title'] = __('Tags'); | |
| 224 | 125 | ?> |
| 225 | 126 | <div class="tagsdiv" id="<?php echo esc_attr( $params['id'] ); ?>"> |
| 226 | 127 | <div class="jaxtag"> |
| 227 | 128 | <div class="nojs-tags hide-if-js"> |
| 228 | - <p><?php echo esc_html( $o_tax_labels->add_or_remove_items ); ?></p> | |
| 229 | - <textarea name="<?php echo esc_attr( $params['textarea_name'] ); ?>" class="the-tags" id="<?php echo esc_attr( $params['textarea_id'] ); ?>"><?php echo esc_attr( implode( ',', $tags ) ); ?></textarea></div> | |
| 129 | + <p><?php echo esc_html( $oTaxLabels->add_or_remove_items ); ?></p> | |
| 130 | + <textarea name="<?php echo esc_attr( $params['textarea_name'] ); ?>" class="the-tags" id="<?php echo esc_attr( $params['textarea_id'] ); ?>"><?php echo esc_attr(implode(",", $tags)); ?></textarea></div> | |
| 230 | 131 | |
| 231 | - <?php if ( $is_enabled ) : ?> | |
| 132 | + <?php if ( current_user_can($oTax->cap->assign_terms) ) :?> | |
| 232 | 133 | <div class="ajaxtag hide-if-no-js"> |
| 233 | 134 | <label class="screen-reader-text" for="<?php echo esc_attr( $params['input_id'] ); ?>"><?php echo esc_html( $params['box_title'] ); ?></label> |
| 234 | - <div class="taghint"><?php echo esc_html( $o_tax_labels->add_new_item ); ?></div> | |
| 135 | + <div class="taghint"><?php echo esc_html( $oTaxLabels->add_new_item ); ?></div> | |
| 235 | 136 | <p><input type="text" id="<?php print esc_attr( $params['input_id'] ); ?>" name="<?php print esc_attr( $params['input_name'] ); ?>" class="newtag form-input-tip" size="16" autocomplete="off" value="" /> |
| 236 | - <input type="button" class="button tagadd" value="<?php esc_attr_e( 'Add' ); ?>" tabindex="3" /></p> | |
| 137 | + <input type="button" class="button tagadd" value="<?php esc_attr_e('Add'); ?>" tabindex="3" /></p> | |
| 237 | 138 | </div> |
| 238 | - <p class="howto"><?php echo esc_attr( $o_tax_labels->separate_items_with_commas ); ?></p> | |
| 139 | + <p class="howto"><?php echo esc_attr( $oTaxLabels->separate_items_with_commas ); ?></p> | |
| 239 | 140 | <?php endif; ?> |
| 240 | 141 | </div> |
| 241 | 142 | |
| 242 | 143 | <div class="tagchecklist"></div> |
| 243 | 144 | </div> |
| 244 | - <?php | |
| 245 | - if ( $is_enabled ) : | |
| 246 | - ?> | |
| 247 | -<p class="hide-if-no-js"><a href="#titlediv" class="tagcloud-link" id="link-<?php echo esc_attr( $tax_name ); ?>"><?php echo esc_html( $o_tax_labels->choose_from_most_used ); ?></a></p> | |
| 248 | - <?php | |
| 249 | - endif; | |
| 145 | +<?php if ( current_user_can($oTax->cap->assign_terms) ) : ?> | |
| 146 | +<p class="hide-if-no-js"><a href="#titlediv" class="tagcloud-link" id="link-<?php echo esc_attr( $tax_name ); ?>"><?php echo esc_html( $oTaxLabels->choose_from_most_used ); ?></a></p> | |
| 147 | +<?php endif; | |
| 250 | 148 | |
| 251 | 149 | } |
| 252 | 150 | |
| 253 | -/** | |
| 254 | - * Outputs the HTML template for a Category (or similar taxonomy) add / remove box in FeedWordPress admin UI pages. | |
| 255 | - * | |
| 256 | - * @param array $checked An array of cats already applied to the object. | |
| 257 | - * @param string $object The human-readable description of the objects to be tagged ("post", "posts from this feed", etc.). | |
| 258 | - * @param array $tags Not used. | |
| 259 | - * @param array $params An array of optional parameters (to be parsed with wp_parse_args). | |
| 260 | - * | |
| 261 | - * @uses wp_parse_args() | |
| 262 | - * @uses get_taxonomy() | |
| 263 | - * @uses get_taxonomy_labels() | |
| 264 | - */ | |
| 265 | -function fwp_category_box( $checked, $object, $tags = array(), $params = array() ) { | |
| 266 | - if ( is_string( $params ) ) : | |
| 267 | - $prefix = $params; | |
| 151 | +function fwp_category_box ($checked, $object, $tags = array(), $params = array()) { | |
| 152 | + global $wp_db_version; | |
| 153 | + | |
| 154 | + if (is_string($params)) : | |
| 155 | + $prefix = $params; | |
| 268 | 156 | $taxonomy = 'category'; |
| 269 | - elseif ( is_array( $params ) ) : | |
| 270 | - $params = wp_parse_args( | |
| 271 | - $params, | |
| 272 | - array( | |
| 273 | - 'prefix' => '', | |
| 274 | - 'taxonomy' => 'category', | |
| 275 | - ) | |
| 276 | - ); | |
| 277 | - | |
| 278 | - $prefix = $params['prefix']; | |
| 279 | - $taxonomy = $params['taxonomy']; | |
| 157 | + elseif (is_array($params)) : | |
| 158 | + $prefix = (isset($params['prefix']) ? $params['prefix'] : ''); | |
| 159 | + $taxonomy = (isset($params['taxonomy']) ? $params['taxonomy'] : 'category'); | |
| 280 | 160 | endif; |
| 161 | + | |
| 162 | + $oTax = get_taxonomy($taxonomy); | |
| 163 | + $oTaxLabels = get_taxonomy_labels($oTax); | |
| 281 | 164 | |
| 282 | - $o_tax = get_taxonomy( $taxonomy ); | |
| 283 | - $o_tax_labels = get_taxonomy_labels( $o_tax ); | |
| 284 | - | |
| 285 | - if ( strlen( $prefix ) === 0 ) : | |
| 286 | - $prefix = 'feedwordpress'; | |
| 165 | + if (strlen($prefix) > 0) : | |
| 166 | + $idPrefix = $prefix.'-'; | |
| 167 | + $idSuffix = "-".$prefix; | |
| 168 | + $namePrefix = $prefix . '_'; | |
| 169 | + else : | |
| 170 | + $idPrefix = 'feedwordpress-'; | |
| 171 | + $idSuffix = "-feedwordpress"; | |
| 172 | + $namePrefix = 'feedwordpress_'; | |
| 287 | 173 | endif; |
| 288 | 174 | |
| 289 | - $id_prefix = $prefix . '-'; | |
| 290 | - $id_suffix = '-' . $prefix; | |
| 291 | - $name_prefix = $prefix . '_'; // unused? (gwyneth 20230918) | |
| 175 | + $boxDivId = sanitize_html_class( $idPrefix . 'taxonomy-' . $taxonomy ); | |
| 176 | + $tabsUlId = sanitize_html_class( $idPrefix . $taxonomy . '-tabs' ); | |
| 177 | + $allTabId = sanitize_html_class( $idPrefix . $taxonomy . '-all' ); | |
| 178 | + $chkLstId = sanitize_html_class( $idPrefix . $taxonomy . 'checklist' ); | |
| 179 | + $addTaxId = sanitize_html_class( $idPrefix . $taxonomy . '-adder' ); | |
| 180 | + $addTogId = sanitize_html_class( $idPrefix . $taxonomy . '-add-toggle' ); | |
| 181 | + $addCatId = sanitize_html_class( $idPrefix . $taxonomy . '-add' ); | |
| 182 | + $newTaxId = sanitize_html_class( $idPrefix . 'new' . $taxonomy ); | |
| 183 | + $taxIdAddSubmit = sanitize_html_class( $idPrefix . $taxonomy . '-add-sumbit' ); | |
| 184 | +?> | |
| 185 | +<div id="<?php print esc_attr( $boxDivId ); ?>" class="feedwordpress-category-div"> | |
| 186 | + <ul id="<?php print esc_attr( $tabsUlId ); ?>" class="category-tabs"> | |
| 187 | + <li class="ui-tabs-selected tabs"><a href="#<?php print esc_attr( $allTabId ); ?>" tabindex="3"><?php _e( 'All posts' ); ?></a> | |
| 188 | + <p style="font-size:smaller;font-style:bold;margin:0">Give <?php print esc_html( $object ); ?> these <?php print esc_html( $oTaxLabels->name ); ?></p> | |
| 189 | + </li> | |
| 190 | + </ul> | |
| 292 | 191 | |
| 293 | - $box_div_id = sanitize_html_class( $id_prefix . 'taxonomy-' . $taxonomy ); | |
| 294 | - $tabs_ul_id = sanitize_html_class( $id_prefix . $taxonomy . '-tabs' ); | |
| 295 | - $all_tab_id = sanitize_html_class( $id_prefix . $taxonomy . '-all' ); | |
| 296 | - $chk_lst_id = sanitize_html_class( $id_prefix . $taxonomy . 'checklist' ); | |
| 297 | - $add_tax_id = sanitize_html_class( $id_prefix . $taxonomy . '-adder' ); | |
| 298 | - $add_tog_id = sanitize_html_class( $id_prefix . $taxonomy . '-add-toggle' ); | |
| 299 | - $add_cat_id = sanitize_html_class( $id_prefix . $taxonomy . '-add' ); | |
| 300 | - $new_tax_id = sanitize_html_class( $id_prefix . 'new' . $taxonomy ); | |
| 301 | - | |
| 302 | - $tax_id_add_submit = sanitize_html_class( $id_prefix . $taxonomy . '-add-sumbit' ); | |
| 303 | - ?> | |
| 304 | -<div id="<?php print esc_attr( $box_div_id ); ?>" class="feedwordpress-category-div"> | |
| 305 | - <ul id="<?php print esc_attr( $tabs_ul_id ); ?>" class="category-tabs"> | |
| 306 | - <li class="ui-tabs-selected tabs"><a href="#<?php print esc_attr( $all_tab_id ); ?>" tabindex="3"><?php esc_html_e( 'All posts' ); ?></a> | |
| 307 | - <p style="font-size:smaller;font-style:bold;margin:0"><?php esc_html_e( 'Give' ); ?> <?php print esc_html( $object ); ?> <?php esc_html_e( 'these' ); ?> <?php print esc_html( $o_tax_labels->name ); ?></p> | |
| 308 | - </li> | |
| 309 | - </ul> | |
| 310 | - | |
| 311 | -<div id="<?php print esc_attr( $all_tab_id ); ?>" class="tabs-panel"> | |
| 312 | - <input type="hidden" value="0" name="tax_input[<?php print esc_attr( $taxonomy ); ?>][]" /> | |
| 313 | - <ul id="<?php print esc_attr( $chk_lst_id ); ?>" class="list:<?php print esc_attr( $taxonomy ); ?> categorychecklist form-no-clear"> | |
| 314 | - <?php fwp_category_checklist( null, false, $checked, $params ); ?> | |
| 315 | - </ul> | |
| 192 | +<div id="<?php print esc_attr( $allTabId); ?>" class="tabs-panel"> | |
| 193 | + <input type="hidden" value="0" name="tax_input[<?php print esc_attr( $taxonomy ); ?>][]" /> | |
| 194 | + <ul id="<?php print esc_attr($chkLstId); ?>" class="list:<?php print esc_attr( $taxonomy ); ?> categorychecklist form-no-clear"> | |
| 195 | + <?php fwp_category_checklist(null, false, $checked, $params) ?> | |
| 196 | + </ul> | |
| 316 | 197 | </div> |
| 317 | 198 | |
| 318 | -<div id="<?php print esc_attr( $add_tax_id ); ?>" class="<?php print esc_attr( $taxonomy ); ?>-adder wp-hidden-children"> | |
| 319 | - <h4><a id="<?php print esc_attr( $add_tog_id ); ?>" class="category-add-toggle" href="#<?php print esc_attr( $add_cat_id ); ?>" class="hide-if-no-js" tabindex="3"><span class="dashicons dashicons-plus fwp-no-underline"></span> <?php esc_html_e( 'Add New Category' ); ?></a></h4>. | |
| 320 | - <p id="<?php print esc_attr( $add_cat_id ); ?>" class="category-add wp-hidden-child"> | |
| 321 | - <?php | |
| 199 | +<div id="<?php print esc_attr( $addTaxId ); ?>" class="<?php print esc_attr( $taxonomy ); ?>-adder wp-hidden-children"> | |
| 200 | + <h4><a id="<?php print esc_attr( $addTogId ); ?>" class="category-add-toggle" href="#<?php print esc_attr( $addCatId ); ?>" class="hide-if-no-js" tabindex="3"><?php _e( '+ Add New Category' ); ?></a></h4> | |
| 201 | + <p id="<?php print esc_attr($addCatId); ?>" class="category-add wp-hidden-child"> | |
| 202 | +<?php | |
| 322 | 203 | $newcat = 'new' . $taxonomy; |
| 323 | - ?> | |
| 324 | - <label class="screen-reader-text" for="<?php print esc_attr( $new_tax_id ); ?>"><?php esc_html_e( 'Add New Category' ); ?></label> | |
| 325 | - <input | |
| 326 | - id="<?php print esc_attr( $new_tax_id ); ?>" | |
| 327 | - class="<?php print esc_attr( $newcat ); ?> form-required form-input-tip" | |
| 328 | - aria-required="true" | |
| 329 | - tabindex="3" | |
| 330 | - type="text" name="<?php print esc_attr( $newcat ); ?>" | |
| 331 | - value="<?php esc_attr_e( 'New category name' ); ?>" | |
| 332 | - /> | |
| 333 | - <label class="screen-reader-text" for="<?php print esc_attr( $new_tax_id ); ?>-parent"><?php esc_html_e( 'Parent Category' ); ?>:</label> | |
| 334 | - <?php | |
| 335 | - wp_dropdown_categories( | |
| 336 | - array( | |
| 337 | - 'taxonomy' => $taxonomy, | |
| 338 | - 'hide_empty' => 0, | |
| 339 | - 'id' => $new_tax_id . '-parent', | |
| 340 | - 'class' => $newcat . '-parent', | |
| 341 | - 'name' => $newcat . '_parent', | |
| 342 | - 'orderby' => 'name', | |
| 343 | - 'hierarchical' => 1, | |
| 344 | - 'show_option_none' => __( 'Parent category' ), | |
| 345 | - 'tab_index' => 3, | |
| 346 | - ) | |
| 347 | - ); | |
| 348 | - | |
| 349 | - $nonce_code = ( 'add-' . $taxonomy ); | |
| 350 | - ?> | |
| 351 | - <input type="button" id="<?php print esc_attr( $tax_id_add_submit ); ?>" class="add:<?php print esc_attr( $id_prefix . $taxonomy ); ?>checklist:<?php print esc_attr( $id_prefix . $taxonomy ); ?>-add add-categorychecklist-category-add button category-add-submit" value="<?php esc_attr_e( 'Add' ); ?>" tabindex="3" /> | |
| 204 | +?> | |
| 205 | + <label class="screen-reader-text" for="<?php print esc_attr($newTaxId); ?>"><?php _e('Add New Category'); ?></label> | |
| 206 | + <input | |
| 207 | + id="<?php print esc_attr($newTaxId); ?>" | |
| 208 | + class="<?php print esc_attr( $newcat ); ?> form-required form-input-tip" | |
| 209 | + aria-required="true" | |
| 210 | + tabindex="3" | |
| 211 | + type="text" name="<?php print esc_attr( $newcat ); ?>" | |
| 212 | + value="<?php _e( 'New category name' ); ?>" | |
| 213 | + /> | |
| 214 | + <label class="screen-reader-text" for="<?php print esc_attr( $newTaxId ); ?>-parent"><?php _e('Parent Category:'); ?></label> | |
| 215 | + <?php wp_dropdown_categories( array( | |
| 216 | + 'taxonomy' => $taxonomy, | |
| 217 | + 'hide_empty' => 0, | |
| 218 | + 'id' => $newTaxId . '-parent', | |
| 219 | + 'class' => $newcat . '-parent', | |
| 220 | + 'name' => $newcat . '_parent', | |
| 221 | + 'orderby' => 'name', | |
| 222 | + 'hierarchical' => 1, | |
| 223 | + 'show_option_none' => __('Parent category'), | |
| 224 | + 'tab_index' => 3, | |
| 225 | + ) ); ?> | |
| 226 | + <input type="button" id="<?php print esc_attr( $taxIdAddSubmit ); ?>" class="add:<?php print esc_attr( $idPrefix . $taxonomy ); ?>checklist:<?php print esc_attr( $idPrefix . $taxonomy ); ?>-add add-categorychecklist-category-add button category-add-submit" value="<?php _e( 'Add' ); ?>" tabindex="3" /> | |
| 352 | 227 | <?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 */ ?> |
| 353 | - <input type="hidden" id="_ajax_nonce<?php print esc_html( $id_suffix ); ?>" name="_ajax_nonce" value="<?php print esc_attr( wp_create_nonce( $nonce_code ) ); ?>" /> | |
| 354 | - <input type="hidden" id="_ajax_nonce-add-<?php print esc_attr( $taxonomy . $id_suffix ); ?>" name="_ajax_nonce-add-<?php print esc_attr( $taxonomy ); ?>" value="<?php print esc_attr( wp_create_nonce( $nonce_code ) ); ?>" /> | |
| 355 | - <span id="<?php print esc_attr( $id_prefix . $taxonomy ); ?>-ajax-response" class="<?php print esc_attr( $taxonomy ); ?>-ajax-response"></span> | |
| 356 | - </p> | |
| 228 | + <input type="hidden" id="_ajax_nonce<?php print esc_html($idSuffix); ?>" name="_ajax_nonce" value="<?php print wp_create_nonce('add-'.$taxonomy); ?>" /> | |
| 229 | + <input type="hidden" id="_ajax_nonce-add-<?php print esc_attr( $taxonomy . $idSuffix ); ?>" name="_ajax_nonce-add-<?php print esc_attr( $taxonomy ); ?>" value="<?php print wp_create_nonce('add-'.$taxonomy); ?>" /> | |
| 230 | + <span id="<?php print esc_attr( $idPrefix . $taxonomy ); ?>-ajax-response" class="<?php print esc_attr( $taxonomy ); ?>-ajax-response"></span> | |
| 231 | + </p> | |
| 357 | 232 | </div> |
| 358 | 233 | |
| 359 | 234 | </div> |
| 360 | - <?php | |
| 235 | +<?php | |
| 361 | 236 | } |
| 362 | 237 | |
| 363 | -/** | |
| 364 | - * Outputs a text/html status message indicating that FWP has started polling a feed. | |
| 365 | - * | |
| 366 | - * @param array $feed An associative array containing meta-data about the feed being polled. | |
| 367 | - */ | |
| 368 | -function update_feeds_mention( $feed ) { | |
| 369 | - printf( | |
| 370 | - '<li>' . esc_html__( 'Updating' ) . ' <cite>%s</cite> ' . esc_html__( 'from' ) . ' <<a href="%s">%s</a>> ...', | |
| 371 | - esc_html( $feed['link/name'] ), | |
| 372 | - esc_url( $feed['link/uri'] ), | |
| 373 | - esc_html( $feed['link/uri'] ) | |
| 374 | - ); | |
| 238 | +function update_feeds_mention ($feed) { | |
| 239 | + echo "<li>Updating <cite>".$feed['link/name']."</cite> from <<a href=\"" | |
| 240 | + .$feed['link/uri']."\">".$feed['link/uri']."</a>> ..."; | |
| 375 | 241 | flush(); |
| 376 | -} /* update_feeds_mention() */ | |
| 377 | - | |
| 378 | -/** | |
| 379 | - * Outputs a text/html status message indicating that FWP has completed polling a feed. | |
| 380 | - * | |
| 381 | - * @param array $feed An associative array containing meta-data about the feed being polled (unused). | |
| 382 | - * @param mixed $added a WP_Error object with error codes and messages, if there was an error in polling. | |
| 383 | - * @param int $dt seconds it took to complete the poll. | |
| 384 | - */ | |
| 385 | -function update_feeds_finish( $feed, $added, $dt ) { | |
| 386 | - if ( is_wp_error( $added ) ) : | |
| 242 | +} | |
| 243 | +function update_feeds_finish ($feed, $added, $dt) { | |
| 244 | + if (is_wp_error($added)) : | |
| 387 | 245 | $mesgs = $added->get_error_messages(); |
| 388 | - foreach ( $mesgs as $mesg ) : | |
| 389 | - printf( '<br/><strong>%s:</strong> <code>%s</code>', esc_html__( 'Feed error' ), esc_html( $mesg ) ); | |
| 246 | + foreach ($mesgs as $mesg) : | |
| 247 | + echo "<br/><strong>Feed error:</strong> <code>$mesg</code>"; | |
| 390 | 248 | endforeach; |
| 391 | 249 | echo "</li>\n"; |
| 392 | 250 | else : |
| 393 | - printf( esc_html__(" completed in %d second%s") . "</li>\n", esc_html( $dt ), esc_html( _s( $dt ) ) ); | |
| 251 | + echo " completed in $dt second".(($dt==1)?'':'s')."</li>\n"; | |
| 394 | 252 | endif; |
| 395 | 253 | flush(); |
| 396 | -} /* update_feeds_finish() */ | |
| 254 | +} | |
| 397 | 255 | |
| 398 | -/** | |
| 399 | - * Retrieves a list of users via the WordPress API. | |
| 400 | - * | |
| 401 | - * @return array List of users, by numeric ID => display_name | |
| 402 | - */ | |
| 403 | -function fwp_author_list() { | |
| 256 | +function fwp_author_list () { | |
| 257 | + global $wpdb; | |
| 404 | 258 | $ret = array(); |
| 405 | 259 | |
| 406 | 260 | $users = get_users(); |
| 407 | - if ( is_array( $users ) ) : | |
| 408 | - foreach ( $users as $user ) : | |
| 409 | - $id = (int) $user->ID; | |
| 410 | - $ret[ $id ] = $user->display_name; | |
| 411 | - | |
| 412 | - if ( strlen( trim( $ret[ $id ] ) ) === 0 ) : | |
| 413 | - $ret[ $id ] = $user->user_login; | |
| 261 | + if (is_array($users)) : | |
| 262 | + foreach ($users as $user) : | |
| 263 | + $id = (int) $user->ID; | |
| 264 | + $ret[$id] = $user->display_name; | |
| 265 | + if (strlen(trim($ret[$id])) == 0) : | |
| 266 | + $ret[$id] = $user->user_login; | |
| 414 | 267 | endif; |
| 415 | 268 | endforeach; |
| 416 | 269 | endif; |
| 417 | 270 | return $ret; |
| 418 | -} /* fwp_author_list() */ | |
| 271 | +} | |
| 419 | 272 | |
| 420 | -/** | |
| 421 | - * Insert a new user into the WordPress database, with some FeedWordPress-specific default behaviors. | |
| 422 | - * | |
| 423 | - * @param string $newuser_name The "Display Name" for the new user; user logins and the like will be determined by a formula. | |
| 424 | - * @return int|WP_Error Either a numeric ID or a WP_Error object. | |
| 425 | - */ | |
| 426 | -function fwp_insert_new_user( $newuser_name ) { | |
| 273 | +function fwp_insert_new_user ($newuser_name) { | |
| 274 | + global $wpdb; | |
| 275 | + | |
| 427 | 276 | $ret = null; |
| 428 | - if ( strlen( $newuser_name ) > 0 ) : | |
| 429 | - $userdata = array(); | |
| 430 | - $userdata['ID'] = null; | |
| 431 | - $userdata['user_login'] = apply_filters( 'pre_user_login', sanitize_user( $newuser_name ) ); | |
| 432 | - $userdata['user_nicename'] = apply_filters( 'pre_user_nicename', sanitize_title( $newuser_name ) ); | |
| 433 | - $userdata['display_name'] = $newuser_name; | |
| 434 | - $userdata['user_pass'] = substr( md5( uniqid( microtime() ) ), 0, 6 ); // just something random to lock it up. | |
| 277 | + if (strlen($newuser_name) > 0) : | |
| 278 | + $userdata = array(); | |
| 279 | + $userdata['ID'] = NULL; | |
| 280 | + $userdata['user_login'] = apply_filters('pre_user_login', sanitize_user($newuser_name)); | |
| 281 | + $userdata['user_nicename'] = apply_filters('pre_user_nicename', sanitize_title($newuser_name)); | |
| 282 | + $userdata['display_name'] = $newuser_name; | |
| 283 | + $userdata['user_pass'] = substr(md5(uniqid(microtime())), 0, 6); // just something random to lock it up | |
| 435 | 284 | |
| 436 | - $blah_url = get_bloginfo( 'url' ); | |
| 437 | - $url = wp_parse_url( $blah_url ); | |
| 285 | + $blahUrl = get_bloginfo('url'); $url = parse_url($blahUrl); | |
| 286 | + $userdata['user_email'] = substr(md5(uniqid(microtime())), 0, 6).'@'.$url['host']; | |
| 438 | 287 | |
| 439 | - $userdata['user_email'] = substr( md5( uniqid( microtime() ) ), 0, 6 ) . '@' . $url['host']; | |
| 440 | - | |
| 441 | - $newuser_id = wp_insert_user( $userdata ); | |
| 442 | - | |
| 443 | - $ret = $newuser_id; // Either a numeric ID or a WP_Error object. | |
| 444 | - | |
| 288 | + $newuser_id = wp_insert_user($userdata); | |
| 289 | + $ret = $newuser_id; // Either a numeric ID or a WP_Error object | |
| 445 | 290 | else : |
| 446 | - | |
| 447 | - $ret = new WP_Error( 'empty_username', 'Provide a non-empty string for the Display Name to fwp_insert_new_user' ); | |
| 448 | - | |
| 291 | + // TODO: Add some error reporting | |
| 449 | 292 | endif; |
| 450 | 293 | return $ret; |
| 451 | -} /* fwp_insert_new_user ( ) */ | |
| 294 | +} /* fwp_insert_new_user () */ | |
| 452 | 295 | |
| 453 | -/** | |
| 454 | - * Output HTML for table row in FeedWordPress Syndicated Sources list. | |
| 455 | - * | |
| 456 | - * @param array $links array of WordPress link objects. | |
| 457 | - * @param object $page FeedWordPress admin page object. | |
| 458 | - * @param string $visible 'Y' or 'N', whether to display syndicated sources marked as visible or as hidden. | |
| 459 | - */ | |
| 460 | -function fwp_syndication_manage_page_links_table_rows( $links, $page, $visible = 'Y' ) { | |
| 296 | +function fwp_syndication_manage_page_links_table_rows ($links, $page, $visible = 'Y') { | |
| 461 | 297 | |
| 462 | - $fwp_syndicated_sources_columns = array( __( 'Name' ), __( 'Feed' ), __( 'Updated' ) ); | |
| 463 | - | |
| 464 | - $subscribed = ( 'Y' === strtoupper( $visible ) ); | |
| 465 | - if ( $subscribed || ( count( $links ) > 0 ) ) : | |
| 466 | - $table_classes = array( 'widefat' ); | |
| 467 | - if ( ! $subscribed ) : | |
| 468 | - $table_classes[] = 'unsubscribed'; | |
| 469 | - endif; | |
| 470 | - $table_classes = implode( ' ', $table_classes ); | |
| 471 | - ?> | |
| 472 | - <table class="<?php print esc_attr( $table_classes ); ?>"> | |
| 298 | + $fwp_syndicated_sources_columns = array(__('Name'), __('Feed'), __('Updated')); | |
| 299 | + | |
| 300 | + $subscribed = ('Y' == strtoupper($visible)); | |
| 301 | + if ($subscribed or (count($links) > 0)) : | |
| 302 | + ?> | |
| 303 | + <table class="widefat<?php if (!$subscribed) : ?> unsubscribed<?php endif; ?>"> | |
| 473 | 304 | <thead> |
| 474 | 305 | <tr> |
| 475 | 306 | <th class="check-column" scope="col"><input type="checkbox" /></th> |
| 476 | - <?php | |
| 477 | - foreach ( $fwp_syndicated_sources_columns as $col ) : | |
| 478 | - printf( "\t<th scope='col'>%s</th>\n", esc_html( $col ) ); | |
| 307 | +<?php | |
| 308 | + foreach ($fwp_syndicated_sources_columns as $col) : | |
| 309 | + print "\t<th scope='col'>${col}</th>\n"; | |
| 479 | 310 | endforeach; |
| 480 | - ?> | |
| 481 | - </tr> | |
| 482 | - </thead> | |
| 483 | - <tbody> | |
| 484 | - <?php | |
| 311 | + print "</tr>\n"; | |
| 312 | + print "</thead>\n"; | |
| 313 | + print "\n"; | |
| 314 | + print "<tbody>\n"; | |
| 315 | + | |
| 485 | 316 | $alt_row = true; |
| 486 | - if ( count( $links ) > 0 ) : | |
| 487 | - foreach ( $links as $link ) : | |
| 488 | - $tr_class = array(); | |
| 317 | + if (count($links) > 0): | |
| 318 | + foreach ($links as $link): | |
| 319 | + $trClass = array(); | |
| 489 | 320 | |
| 490 | - $o_s_link = new SyndicatedLink( $link->link_id ); | |
| 321 | + // Prep: Get last updated timestamp | |
| 322 | + $sLink = new SyndicatedLink($link->link_id); | |
| 323 | + if (!is_null($sLink->setting('update/last'))) : | |
| 324 | + $lastUpdated = 'Last checked '. fwp_time_elapsed($sLink->setting('update/last')); | |
| 325 | + else : | |
| 326 | + $lastUpdated = __('None yet'); | |
| 327 | + endif; | |
| 491 | 328 | |
| 492 | - if ( is_null( $o_s_link->setting( 'update/error' ) ) ) : | |
| 329 | + // Prep: get last error timestamp, if any | |
| 330 | + $fileSizeLines = array(); | |
| 331 | + $feed_type = $sLink->get_feed_type(); | |
| 332 | + if (is_null($sLink->setting('update/error'))) : | |
| 333 | + $errorsSince = ''; | |
| 334 | + if (!is_null($sLink->setting('link/item count'))) : | |
| 335 | + $N = $sLink->setting('link/item count'); | |
| 336 | + $fileSizeLines[] = sprintf((($N==1) ? __('%d item') : __('%d items')), $N) . ", " . $feed_type; | |
| 337 | + endif; | |
| 493 | 338 | |
| 494 | - $the_error = null; | |
| 339 | + if (!is_null($sLink->setting('link/filesize'))) : | |
| 340 | + $fileSizeLines[] = size_format($sLink->setting('link/filesize')). ' total'; | |
| 341 | + endif; | |
| 342 | + else : | |
| 343 | + $trClass[] = 'feed-error'; | |
| 495 | 344 | |
| 496 | - else : | |
| 497 | - $tr_class[] = 'feed-error'; | |
| 498 | - $the_error = unserialize( $o_s_link->setting( 'update/error' ) ); | |
| 345 | + $theError = unserialize($sLink->setting('update/error')); | |
| 346 | + | |
| 347 | + $errorsSince = "<div class=\"returning-errors\">" | |
| 348 | + ."<p><strong>Returning errors</strong> since " | |
| 349 | + .fwp_time_elapsed($theError['since']) | |
| 350 | + ."</p>" | |
| 351 | + ."<p>Most recent (" | |
| 352 | + .fwp_time_elapsed($theError['ts']) | |
| 353 | + ."):<br/><code>" | |
| 354 | + .implode("</code><br/><code>", $theError['object']->get_error_messages()) | |
| 355 | + ."</code></p>" | |
| 356 | + ."</div>\n"; | |
| 499 | 357 | endif; |
| 500 | 358 | |
| 501 | - $ttl = $o_s_link->setting( 'update/ttl' ); | |
| 359 | + $nextUpdate = "<div style='max-width: 30.0em; font-size: 0.9em;'><div style='font-style:italic;'>"; | |
| 502 | 360 | |
| 503 | - $alt_row = ! $alt_row; | |
| 361 | + $ttl = $sLink->setting('update/ttl'); | |
| 362 | + if (is_numeric($ttl)) : | |
| 363 | + $next = $sLink->setting('update/last') + $sLink->setting('update/fudge') + ((int) $ttl * 60); | |
| 364 | + if ('automatically'==$sLink->setting('update/timed')) : | |
| 365 | + if ($next < time()) : | |
| 366 | + $nextUpdate .= 'Ready and waiting to be updated since '; | |
| 367 | + else : | |
| 368 | + $nextUpdate .= 'Scheduled for next update '; | |
| 369 | + endif; | |
| 370 | + $nextUpdate .= fwp_time_elapsed($next); | |
| 371 | + if (FEEDWORDPRESS_DEBUG) : $nextUpdate .= " [".(($next-time())/60)." minutes]"; endif; | |
| 372 | + else : | |
| 373 | + $lastUpdated .= " · Next "; | |
| 374 | + if ($next < time()) : | |
| 375 | + $lastUpdated .= 'ASAP'; | |
| 376 | + elseif ($next - time() < 60) : | |
| 377 | + $lastUpdated .= fwp_time_elapsed($next); | |
| 378 | + elseif ($next - time() < 60*60*24) : | |
| 379 | + $lastUpdated .= gmdate('g:ia', $next + (get_option('gmt_offset') * 3600)); | |
| 380 | + else : | |
| 381 | + $lastUpdated .= gmdate('F j', $next + (get_option('gmt_offset') * 3600)); | |
| 382 | + endif; | |
| 504 | 383 | |
| 505 | - if ( $alt_row ) : | |
| 506 | - $tr_class[] = 'alternate'; | |
| 384 | + $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"; | |
| 385 | + if ($sLink->setting('update/xml')) : | |
| 386 | + $nextUpdate .= " using a standard <code style=\"font-size: inherit; padding: 0; background: transparent\"><".$sLink->setting('update/xml')."></code> element"; | |
| 387 | + endif; | |
| 388 | + $nextUpdate .= "."; | |
| 389 | + endif; | |
| 390 | + else: | |
| 391 | + $nextUpdate .= "Scheduled for update as soon as possible"; | |
| 507 | 392 | endif; |
| 393 | + $nextUpdate .= "</div></div>"; | |
| 394 | + | |
| 395 | + $fileSize = ''; | |
| 396 | + if (count($fileSizeLines) > 0) : | |
| 397 | + $fileSize = '<div>'.implode(" / ", $fileSizeLines)."</div>"; | |
| 398 | + endif; | |
| 399 | + | |
| 400 | + unset($sLink); | |
| 401 | + | |
| 402 | + $alt_row = !$alt_row; | |
| 403 | + | |
| 404 | + if ($alt_row) : | |
| 405 | + $trClass[] = 'alternate'; | |
| 406 | + endif; | |
| 508 | 407 | ?> |
| 509 | - <tr<?php fwp_form_class_attr( implode( ' ', $tr_class ) ); ?>> | |
| 408 | + <tr<?php echo ((count($trClass) > 0) ? ' class="'.implode(" ", $trClass).'"':''); ?>> | |
| 510 | 409 | <th class="check-column" scope="row"><input type="checkbox" name="link_ids[]" value="<?php echo esc_attr( $link->link_id ); ?>" /></th> |
| 511 | 410 | <?php |
| 512 | 411 | $caption = ( |
| 513 | - ( strlen( $link->link_rss ) > 0 ) | |
| 514 | - ? __( 'Switch Feed' ) | |
| 515 | - : __( 'Find Feed' ) | |
| 412 | + (strlen($link->link_rss) > 0) | |
| 413 | + ? __('Switch Feed') | |
| 414 | + : $caption=__('Find Feed') | |
| 516 | 415 | ); |
| 517 | 416 | ?> |
| 518 | 417 | <td> |
| 519 | - <strong><a href="<?php print esc_url( $page->admin_page_href( 'feeds-page.php', array(), $link ) ); ?>"><?php print esc_html( $link->link_name ); ?></a></strong> | |
| 520 | - <div class="row-actions"> | |
| 521 | - <?php | |
| 522 | - if ( $subscribed ) : | |
| 523 | - $page->display_feed_settings_page_links( | |
| 524 | - array( | |
| 525 | - 'before' => '<div><strong> ' . __( 'Settings' ) . ' ></strong> ', | |
| 526 | - 'after' => '</div>', | |
| 527 | - 'subscription' => $link, | |
| 528 | - ) | |
| 529 | - ); | |
| 530 | - endif; | |
| 531 | - ?> | |
| 418 | + <strong><a href="<?php print esc_url( $page->admin_page_href('feeds-page.php', array(), $link) ); ?>"><?php print esc_html($link->link_name); ?></a></strong> | |
| 419 | + <div class="row-actions"><?php if ($subscribed) : | |
| 420 | + $page->display_feed_settings_page_links(array( | |
| 421 | + 'before' => '<div><strong>Settings ></strong> ', | |
| 422 | + 'after' => '</div>', | |
| 423 | + 'subscription' => $link, | |
| 424 | + )); | |
| 425 | + endif; ?> | |
| 532 | 426 | |
| 533 | - <div><strong><?php esc_html_e( 'Actions' ); ?> ></strong> | |
| 534 | - <?php if ( $subscribed ) : ?> | |
| 535 | - <a href="<?php print esc_url( $page->admin_page_href( 'syndication.php', array( 'action' => 'feedfinder' ), $link ) ); ?>"><?php echo esc_html( $caption ); ?></a> | |
| 536 | - <?php else : ?> | |
| 537 | - <a href="<?php print esc_url( $page->admin_page_href( 'syndication.php', array( 'action' => FWP_RESUB_CHECKED ), $link ) ); ?>"><?php esc_html_e( 'Re-subscribe' ); ?></a> | |
| 538 | - <?php endif; ?> | |
| 539 | - | <a href="<?php print esc_url( $page->admin_page_href( 'syndication.php', array( 'action' => 'Unsubscribe' ), $link ) ); ?>"> | |
| 540 | - <?php | |
| 541 | - if ( $subscribed ) : | |
| 542 | - esc_html_e( 'Unsubscribe' ); | |
| 543 | - else : | |
| 544 | - esc_html_e( 'Delete permanently' ); | |
| 545 | - endif; | |
| 546 | - ?> | |
| 547 | - </a> | |
| 548 | - | <a href="<?php print esc_url( $link->link_url ); ?>"><?php esc_html_e( 'View' ); ?></a></div> | |
| 427 | + <div><strong>Actions ></strong> | |
| 428 | + <?php if ($subscribed) : ?> | |
| 429 | + <a href="<?php print esc_url( $page->admin_page_href('syndication.php', array('action' => 'feedfinder'), $link) ); ?>"><?php echo esc_html( $caption ); ?></a> | |
| 430 | + <?php else : ?> | |
| 431 | + <a href="<?php print esc_url( $page->admin_page_href('syndication.php', array('action' => FWP_RESUB_CHECKED), $link) ); ?>"><?php _e('Re-subscribe'); ?></a> | |
| 432 | + <?php endif; ?> | |
| 433 | + | <a href="<?php print esc_url( $page->admin_page_href( 'syndication.php', array('action' => 'Unsubscribe'), $link ) ); ?>"><?php _e( ( $subscribed ? 'Unsubscribe' : 'Delete permanently' ) ); ?></a> | |
| 434 | + | <a href="<?php print esc_url( $link->link_url ); ?>"><?php _e('View')?></a></div> | |
| 549 | 435 | </div> |
| 550 | 436 | </td> |
| 551 | - <?php if ( strlen( $link->link_rss ) > 0 ) : ?> | |
| 552 | - <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> | |
| 553 | - <?php else : ?> | |
| 554 | - <td class="feed-missing"><p><strong><?php esc_html_e( 'no feed assigned' ); ?></strong></p></td> | |
| 437 | + <?php if (strlen($link->link_rss) > 0): ?> | |
| 438 | + <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> | |
| 439 | + <?php else: ?> | |
| 440 | + <td class="feed-missing"><p><strong>no feed assigned</strong></p></td> | |
| 555 | 441 | <?php endif; ?> |
| 556 | 442 | |
| 557 | 443 | <td><div style="float: right; padding-left: 10px"> |
| 558 | - <input type="submit" class="button" name="update_uri[<?php print esc_html( $link->link_rss ); ?>]" value="<?php esc_html_e( 'Update Now' ); ?>" /> | |
| 444 | + <input type="submit" class="button" name="update_uri[<?php print esc_html($link->link_rss); ?>]" value="<?php _e('Update Now'); ?>" /> | |
| 559 | 445 | </div> |
| 560 | - <?php | |
| 561 | - fwp_links_table_rows_last_updated( $o_s_link ); | |
| 562 | - fwp_links_table_rows_file_size( $o_s_link ); | |
| 563 | - fwp_links_table_rows_errors_since( $the_error ); | |
| 564 | - fwp_links_table_rows_next_update( $o_s_link ); | |
| 565 | - ?> | |
| 446 | + <?php | |
| 447 | + print $lastUpdated; | |
| 448 | + print $fileSize; | |
| 449 | + print $errorsSince; | |
| 450 | + print $nextUpdate; | |
| 451 | + ?> | |
| 566 | 452 | </td> |
| 567 | 453 | </tr> |
| 568 | - <?php | |
| 569 | - unset( $o_s_link ); | |
| 570 | - | |
| 454 | + <?php | |
| 571 | 455 | endforeach; |
| 572 | 456 | else : |
| 573 | - ?> | |
| 574 | - <tr><td colspan="4"><p><?php esc_html_e( 'There are no websites currently listed for syndication.' ); ?></p></td></tr> | |
| 575 | - <?php | |
| 457 | +?> | |
| 458 | +<tr><td colspan="4"><p>There are no websites currently listed for syndication.</p></td></tr> | |
| 459 | +<?php | |
| 576 | 460 | endif; |
| 577 | - ?> | |
| 578 | - </tbody> | |
| 579 | - </table> <!-- <?php print esc_attr( $table_classes ); ?> --> | |
| 580 | - <?php | |
| 461 | +?> | |
| 462 | +</tbody> | |
| 463 | +</table> | |
| 464 | + <?php | |
| 581 | 465 | endif; |
| 582 | -} /* function fwp_syndication_manage_page_links_table_rows ( ) */ | |
| 466 | +} /* function fwp_syndication_manage_page_links_table_rows () */ | |
| 583 | 467 | |
| 584 | -/** | |
| 585 | - * Output HTML message indicating feed errors, if a feed has been returning errors, in Syndicated Sites table. | |
| 586 | - * | |
| 587 | - * @param mixed $the_error If last poll on this feed was successful, this is null. | |
| 588 | - * If last poll returned an error, contains an array with 'since' (timestamp of first time an error was an encountered), 'ts' (timestamp of most recent time an error was encountered), and 'object' (a WP_Error object representing the most recent error when you polled the feed). | |
| 589 | - */ | |
| 590 | -function fwp_links_table_rows_errors_since( $the_error ) { | |
| 591 | - if ( ! is_null( $the_error ) ) : | |
| 592 | - | |
| 593 | - $s_elapsed = fwp_time_elapsed( $the_error['since'] ); | |
| 594 | - $s_recent = fwp_time_elapsed( $the_error['ts'] ); | |
| 595 | - ?> | |
| 596 | - | |
| 597 | -<div class="returning-errors"><p><strong><?php esc_html_e( 'Returning errors' ); ?></strong> <?php esc_html_e( 'since' ); ?> <?php print esc_html( $s_elapsed ); ?></p> | |
| 598 | -<p><?php esc_html_e( 'Most recent' ); ?> (<?php print esc_html( $s_recent ); ?>): | |
| 599 | - <?php | |
| 600 | - foreach ( $the_error['object']->get_error_messages() as $mesg ) : | |
| 601 | - printf( '<br/><code>%s</code>', esc_html( $mesg ) ); | |
| 602 | - endforeach; | |
| 603 | - ?> | |
| 604 | -</p> | |
| 605 | -</div> | |
| 606 | - | |
| 607 | - <?php | |
| 608 | - endif; | |
| 609 | -} | |
| 610 | - | |
| 611 | -/** | |
| 612 | - * Output the "Last checked..." status message in Syndicated Sites table. | |
| 613 | - * | |
| 614 | - * @param SyndicatedLink $o_s_link The SyndicatedLink object representing the feed displayed on this row. | |
| 615 | - */ | |
| 616 | -function fwp_links_table_rows_last_updated( $o_s_link ) { | |
| 617 | - if ( ! is_null( $o_s_link->setting( 'update/last' ) ) ) : | |
| 618 | - print esc_html__( 'Last checked ') . esc_html( fwp_time_elapsed( $o_s_link->setting( 'update/last' ) ) ); | |
| 619 | - else : | |
| 620 | - print esc_html__( 'None yet' ); | |
| 621 | - endif; | |
| 622 | - | |
| 623 | - $ttl = $o_s_link->setting( 'update/ttl' ); | |
| 624 | - if ( is_numeric( $ttl ) ) : | |
| 625 | - $next = $o_s_link->setting( 'update/last' ) + $o_s_link->setting( 'update/fudge' ) + ( (int) $ttl * 60 ); | |
| 626 | - | |
| 627 | - if ( 'automatically' !== $o_s_link->setting( 'update/timed' ) ) : | |
| 628 | - | |
| 629 | - print ' · ' . esc_html__( 'Next') . ' '; | |
| 630 | - print esc_html( fwp_relative_time_string( $next ) ); | |
| 631 | - | |
| 632 | - endif; | |
| 633 | - endif; | |
| 634 | - | |
| 635 | -} | |
| 636 | - | |
| 637 | -/** | |
| 638 | - * Return a status message indicating when a feed will next be polled, based on a next-update timestamp. | |
| 639 | - * | |
| 640 | - * @param int $ts Timestamp for next updrate. | |
| 641 | - * @param bool $ago Display "[relative time] ago", or "ASAP", if the timestamp is in the past. | |
| 642 | - */ | |
| 643 | -function fwp_relative_time_string( $ts, $ago = false ) { | |
| 644 | - | |
| 645 | - $dt = ( $ts - time() ); | |
| 646 | - | |
| 647 | - if ( $dt < 0 && ! $ago ) : | |
| 648 | - $ret = __( 'ASAP' ); | |
| 649 | - elseif ( $dt < 60 * 60 ) : | |
| 650 | - $ret = fwp_time_elapsed( $ts ); | |
| 651 | - elseif ( $dt < 60 * 60 * 24 ) : | |
| 652 | - $ret = wp_date( 'g:ia', $ts ); | |
| 653 | - else : | |
| 654 | - $ret = wp_date( 'F j', $ts ); | |
| 655 | - endif; | |
| 656 | - return $ret; | |
| 657 | -} | |
| 658 | - | |
| 659 | -/** | |
| 660 | - * Output the File Size / Format status message in Syndicated Sites table. | |
| 661 | - * | |
| 662 | - * @param SyndicatedLink $o_s_link Object representing the feed displayed on this row. | |
| 663 | - */ | |
| 664 | -function fwp_links_table_rows_file_size( $o_s_link ) { | |
| 665 | - | |
| 666 | - $mesg_file_size_lines = array(); | |
| 667 | - | |
| 668 | - $feed_type = $o_s_link->get_feed_type(); | |
| 669 | - | |
| 670 | - if ( ! is_null( $o_s_link->setting( 'link/item count' ) ) ) : | |
| 671 | - $n = $o_s_link->setting( 'link/item count' ); | |
| 672 | - | |
| 673 | - // translators: %1$d is the item count; %2$s is the plural marker (if any) for item. | |
| 674 | - $mesg_file_size_lines[] = sprintf( __( '%1$d item%2$s' ), $n, _s( $n ) ) . ', ' . $feed_type; | |
| 675 | - | |
| 676 | - endif; | |
| 677 | - | |
| 678 | - if ( is_null( $o_s_link->setting( 'update/error' ) ) ) : | |
| 679 | - | |
| 680 | - if ( ! is_null( $o_s_link->setting( 'link/filesize' ) ) ) : | |
| 681 | - // size_format() _can_ return false, so we check for that first (gwyneth 20230918) | |
| 682 | - $formatted_bytes = size_format( $o_s_link->setting( 'link/filesize' ) ); | |
| 683 | - if ( $formatted_bytes ) : | |
| 684 | - $mesg_file_size_lines[] = $formatted_bytes . ' ' . __( 'total' ); | |
| 685 | - else: | |
| 686 | - $mesg_file_size_lines[] = __( '(invalid number of bytes)' ); | |
| 687 | - endif; | |
| 688 | - FeedWordPress::diagnostic( 'link/filesize', 'File size for this link was reported as being `' . $o_s_link->setting( 'link/filesize' ) . '\'' ); | |
| 689 | - else : | |
| 690 | - $mesg_file_size_lines[] = __( '(unknown bytes)' ); | |
| 691 | - FeedWordPress::diagnostic( 'link/filesize', 'No error, but link/filesize reported NULL bytes.' ); | |
| 692 | - endif; | |
| 693 | - | |
| 694 | - | |
| 695 | - endif; | |
| 696 | - | |
| 697 | - if ( count( $mesg_file_size_lines ) > 0 ) : | |
| 698 | - | |
| 699 | - print '<div>'; | |
| 700 | - $sep = ''; | |
| 701 | - foreach ( $mesg_file_size_lines as $line ) : | |
| 702 | - print esc_html( $sep ); | |
| 703 | - print esc_html( $line ); | |
| 704 | - $sep = ' / '; | |
| 705 | - endforeach; | |
| 706 | - print '</div>'; | |
| 707 | - | |
| 708 | - endif; | |
| 709 | - | |
| 710 | -} | |
| 711 | - | |
| 712 | -/** | |
| 713 | - * Output the Scheduled For Next Update status message in Syndicated Sites table. | |
| 714 | - * | |
| 715 | - * @param SyndicatedLink $o_s_link Object representing the feed displayed on this row. | |
| 716 | - */ | |
| 717 | -function fwp_links_table_rows_next_update( $o_s_link ) { | |
| 718 | - $ttl = $o_s_link->setting( 'update/ttl' ); | |
| 719 | - ?> | |
| 720 | - <div style="max-width: 30.0em; font-size: 0.9em;"><div style="font-style:italic;"> | |
| 721 | - <?php | |
| 722 | - if ( is_numeric( $ttl ) ) : | |
| 723 | - $next = $o_s_link->setting( 'update/last' ) + $o_s_link->setting( 'update/fudge' ) + ( (int) $ttl * 60 ); | |
| 724 | - if ( 'automatically' === $o_s_link->setting( 'update/timed' ) ) : | |
| 725 | - if ( $next < time() ) : | |
| 726 | - esc_html_e( 'Ready and waiting to be updated since ' ); | |
| 727 | - else : | |
| 728 | - esc_html_e( 'Scheduled for next update ' ); | |
| 729 | - endif; | |
| 730 | - | |
| 731 | - print esc_html( fwp_time_elapsed( $next ) ); | |
| 732 | - if ( FEEDWORDPRESS_DEBUG ) : | |
| 733 | - $interval = ( ( $next - time() ) / 60 ); | |
| 734 | - printf( ' [%d %s%s]', intval( $interval ), esc_html__( 'minute' ), esc_html( _s( $interval ) ) ); | |
| 735 | - endif; | |
| 736 | - else : | |
| 737 | - printf( esc_html__( 'Scheduled to be checked for updates every ' ) . '%d %s%s.', | |
| 738 | - intval( $ttl ), | |
| 739 | - esc_html__( 'minute' ), | |
| 740 | - esc_html( _s( $ttl ) ) ); | |
| 741 | - ?> | |
| 742 | - </div> | |
| 743 | - | |
| 744 | - <div style="size:0.9em; margin-top: 0.5em"><?php esc_html_e( 'This update schedule was requested by the feed provider' ); ?> | |
| 745 | - <?php | |
| 746 | - if ( $o_s_link->setting( 'update/xml' ) ) : | |
| 747 | - ?> | |
| 748 | - <?php esc_html_e( 'using a standard' ); ?> <code style="font-size: inherit; padding: 0; background: transparent"><<?php print esc_html( $o_s_link->setting( 'update/xml' ) ); ?>></code> <?php esc_html_e( 'element' ); // Note: the tricky php tags placed here try to avoid a space before the period. (gwyneth 20230918) | |
| 749 | - endif; | |
| 750 | - endif; | |
| 751 | - else : | |
| 752 | - esc_html_e( 'Scheduled for update as soon as possible' ); | |
| 753 | - endif; | |
| 754 | - print '.'; | |
| 755 | - ?> | |
| 756 | - </div></div> | |
| 757 | - <?php | |
| 758 | -} | |
