← All changes | admin-ui.php +1078 -637 trunk → 2011.0512 View file →

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