admin-ui.php: 2017.1020 vs 2010.0528 · FeedWordPress

← All changes | admin-ui.php +963 -496 2010.0528 → 2017.1020 View file →

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