← All changes | admin-ui.php +567 -75 2009.0613 → 2010.0602 View file →

		@@ -1,7 +1,255 @@
1	1	<?php
2		-function fwp_linkedit_single_submit ($status = NULL) {
	2	+class FeedWordPressAdminPage {
	3	+ var $context;
	4	+ var $updated = false;
	5	+ var $link = NULL;
	6	+ var $dispatch = NULL;
	7	+ var $filename = NULL;
	8	+
	9	+ /**
	10	+ * Construct the admin page object.
	11	+ *
	12	+ * @param mixed $link An object of class {@link SyndicatedLink} if created for one feed's settings, NULL if created for global default settings
	13	+ */
	14	+ function FeedWordPressAdminPage ($page = 'feedwordpressadmin', $link = NULL) {
	15	+ $this->link = $link;
	16	+
	17	+ // Set meta-box context name
	18	+ $this->context = $page;
	19	+ if ($this->for_feed_settings()) :
	20	+ $this->context .= 'forfeed';
	21	+ endif;
	22	+ } /* FeedWordPressAdminPage constructor */
	23	+
	24	+ function for_feed_settings () { return (is_object($this->link) and method_exists($this->link, 'found') and $this->link->found()); }
	25	+ function for_default_settings () { return !$this->for_feed_settings(); }
	26	+
	27	+ /*static*/ function submitted_link_id () {
	28	+ global $fwp_post;
	29	+
	30	+ // Presume global unless we get a specific link ID
	31	+ $link_id = NULL;
	32	+
	33	+ $submit_buttons = array(
	34	+ 'save',
	35	+ 'submit',
	36	+ 'fix_mismatch',
	37	+ 'feedfinder',
	38	+ );
	39	+ foreach ($submit_buttons as $field) :
	40	+ if (isset($fwp_post[$field])) :
	41	+ $link_id = $_REQUEST['save_link_id'];
	42	+ endif;
	43	+ endforeach;
	44	+
	45	+ if (is_null($link_id) and isset($_REQUEST['link_id'])) :
	46	+ $link_id = $_REQUEST['link_id'];
	47	+ endif;
	48	+
	49	+ return $link_id;
	50	+ } /* FeedWordPressAdminPage::submitted_link_id() */
	51	+
	52	+ /*static*/ function submitted_link () {
	53	+ $link_id = FeedWordPressAdminPage::submitted_link_id();
	54	+ if (is_numeric($link_id) and $link_id) :
	55	+ $link = new SyndicatedLink($link_id);
	56	+ else :
	57	+ $link = NULL;
	58	+ endif;
	59	+ return $link;
	60	+ } /* FeedWordPressAdminPage::submitted_link () */
	61	+
	62	+ function stamp_link_id ($field = null) {
	63	+ if (is_null($field)) : $field = 'save_link_id'; endif;
	64	+ ?>
	65	+ <input type="hidden" name="<?php print esc_html($field); ?>" value="<?php print ($this->for_feed_settings() ? $this->link->id : '*'); ?>" />
	66	+ <?php
	67	+ } /* FeedWordPressAdminPage::stamp_link_id () */
	68	+
	69	+ function these_posts_phrase () {
	70	+ if ($this->for_feed_settings()) :
	71	+ $phrase = __('posts from this feed');
	72	+ else :
	73	+ $phrase = __('syndicated posts');
	74	+ endif;
	75	+ return $phrase;
	76	+ } /* FeedWordPressAdminPage::these_posts_phrase() */
	77	+
	78	+ /**
	79	+ * Provides a uniquely identifying name for the interface context for
	80	+ * use with add_meta_box() and do_meta_boxes(),
	81	+ *
	82	+ * @return string the context name
	83	+ *
	84	+ * @see add_meta_box()
	85	+ * @see do_meta_boxes()
	86	+ */
	87	+ function meta_box_context () {
	88	+ return $this->context;
	89	+ } /* FeedWordPressAdminPage::meta_box_context () */
	90	+
	91	+ /**
	92	+ * Outputs JavaScript to fix AJAX toggles settings.
	93	+ *
	94	+ * @uses FeedWordPressAdminPage::meta_box_context()
	95	+ */
	96	+ function fix_toggles () {
	97	+ FeedWordPressSettingsUI::fix_toggles_js($this->meta_box_context());
	98	+ } /* FeedWordPressAdminPage::fix_toggles() */
	99	+
	100	+ function ajax_interface_js () {
	101	+?>
	102	+<script type="text/javascript">
	103	+ function contextual_appearance (item, appear, disappear, value, visibleStyle, checkbox) {
	104	+ if (typeof(visibleStyle)=='undefined') visibleStyle = 'block';
	105	+
	106	+ var rollup=document.getElementById(item);
	107	+ var newuser=document.getElementById(appear);
	108	+ var sitewide=document.getElementById(disappear);
	109	+ if (rollup) {
	110	+ if ((checkbox && rollup.checked) || (!checkbox && value==rollup.value)) {
	111	+ if (newuser) newuser.style.display=visibleStyle;
	112	+ if (sitewide) sitewide.style.display='none';
	113	+ } else {
	114	+ if (newuser) newuser.style.display='none';
	115	+ if (sitewide) sitewide.style.display=visibleStyle;
	116	+ }
	117	+ }
	118	+ }
	119	+</script>
	120	+
	121	+<?php
	122	+ } /* FeedWordPressAdminPage::ajax_interface_js () */
	123	+
	124	+ function display_feed_select_dropdown() {
	125	+ $links = FeedWordPress::syndicated_links();
	126	+ ?>
	127	+ <p id="post-search">
	128	+ <select name="link_id" class="fwpfs" style="max-width: 20.0em;">
	129	+ <option value="*"<?php if ($this->for_default_settings()) : ?> selected="selected"<?php endif; ?>>- defaults for all feeds -</option>
	130	+ <?php if ($links) : foreach ($links as $ddlink) : ?>
	131	+ <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>
	132	+ <?php endforeach; endif; ?>
	133	+ </select>
	134	+ <input class="button" type="submit" name="go" value="<?php _e('Go') ?> &raquo;" />
	135	+ </p>
	136	+ <?php
	137	+ } /* FeedWordPressAdminPage::display_feed_select_dropdown() */
	138	+
	139	+ function display_sheet_header ($pagename = 'Syndication', $all = false) {
	140	+ if (FeedWordPressCompatibility::test_version(FWP_SCHEMA_27)) :
	141	+ ?>
	142	+ <div class="icon32"><img src="<?php print esc_html(WP_PLUGIN_URL.'/'.$GLOBALS['fwp_path'].'/feedwordpress.png'); ?>" alt="" /></div>
	143	+ <?php
	144	+ endif;
	145	+ ?>
	146	+
	147	+ <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>
	148	+ <?php
	149	+ }
	150	+
	151	+ function display_update_notice_if_updated ($pagename = 'Syndication', $mesg = NULL) {
	152	+ if ($this->updated) :
	153	+ if ($this->updated === true) :
	154	+ $mesg = $pagename . ' settings updated.';
	155	+ else :
	156	+ $mesg = $this->updated;
	157	+ endif;
	158	+ endif;
	159	+
	160	+ if (!is_null($mesg)) :
	161	+ ?>
	162	+ <div class="updated">
	163	+ <p><?php print esc_html($mesg); ?></p>
	164	+ </div>
	165	+ <?php
	166	+ endif;
	167	+ } /* FeedWordPressAdminPage::display_update_notice_if_updated() */
	168	+
	169	+ function display_settings_scope_message () {
	170	+ if ($this->for_feed_settings()) :
	171	+ ?>
	172	+ <p>These settings only affect posts syndicated from
	173	+ <strong><?php echo esc_html($this->link->link->link_name); ?></strong>.</p>
	174	+ <?php
	175	+ else :
	176	+ ?>
	177	+ <p>These settings affect posts syndicated from any feed unless they are overridden
	178	+ by settings for that specific feed.</p>
	179	+ <?php
	180	+ endif;
	181	+ } /* FeedWordPressAdminPage::display_settings_scope_message () */
	182	+
	183	+ /*static*/ function has_link () { return true; }
	184	+
	185	+ function open_sheet ($header) {
	186	+ // Set up prepatory AJAX stuff
	187	+ $this->ajax_interface_js();
	188	+ if (function_exists('add_meta_box')) :
	189	+ add_action(
	190	+ FeedWordPressCompatibility::bottom_script_hook($this->filename),
	191	+ /*callback=*/ array($this, 'fix_toggles'),
	192	+ /*priority=*/ 10000
	193	+ );
	194	+ FeedWordPressSettingsUI::ajax_nonce_fields();
	195	+ endif;
	196	+
	197	+ ?>
	198	+ <div class="wrap" style="position:relative">
	199	+ <?php
	200	+ if (!is_null($header)) :
	201	+ $this->display_sheet_header($header);
	202	+ endif;
	203	+
	204	+ if (!is_null($this->dispatch)) :
	205	+ ?>
	206	+ <form action="admin.php?page=<?php print $GLOBALS['fwp_path']; ?>/<?php echo basename($this->filename); ?>" method="post">
	207	+ <div><?php
	208	+ FeedWordPressCompatibility::stamp_nonce($this->dispatch);
	209	+ $this->stamp_link_id();
	210	+ ?></div>
	211	+ <?php
	212	+ endif;
	213	+
	214	+ if ($this->has_link()) :
	215	+ $this->display_feed_select_dropdown();
	216	+ $this->display_settings_scope_message();
	217	+ endif;
	218	+
	219	+ if (function_exists('do_meta_boxes')) :
	220	+ ?>
	221	+ <div id="poststuff">
	222	+ <?php
	223	+ else :
	224	+ ?>
	225	+ </div> <!-- class="wrap" -->
	226	+ <?php
	227	+ endif;
	228	+
	229	+ if (!is_null($this->dispatch)) :
	230	+ fwp_settings_form_single_submit();
	231	+ endif;
	232	+ } /* FeedWordPressAdminPage::open_sheet () */
	233	+
	234	+ function close_sheet () {
	235	+ // WordPress 2.5+
	236	+ if (function_exists('do_meta_boxes')) :
	237	+ ?>
	238	+ </div> <!-- id="poststuff" -->
	239	+ <?php if (!is_null($this->dispatch)) : ?>
	240	+ <?php fwp_settings_form_single_submit_closer(); ?>
	241	+ </form>
	242	+ <?php endif; ?>
	243	+ </div> <!-- class="wrap" -->
	244	+ <?php
	245	+ endif;
	246	+ }
	247	+} /* class FeedWordPressAdminPage */
	248	+
	249	+function fwp_settings_form_single_submit ($caption = NULL) {
3	250	if (fwp_test_wp_version(FWP_SCHEMA_25, FWP_SCHEMA_27)) :
	251	+ if (is_null($caption)) : $caption = __('Save'); endif;
4	252	?>
5	253	<div class="submitbox" id="submitlink">
6	254	<div id="previewview"></div>
7	255	<div class="inside"></div>
		@@ -6,9 +254,9 @@
6	254	<div id="previewview"></div>
7	255	<div class="inside"></div>
8	256
9	257	<p class="submit">
10		-<input type="submit" name="submit" value="<?php _e('Save') ?>" />
	258	+<input type="submit" name="save" value="<?php print $caption; ?>" />
11	259	</p>
12	260	</div>
13	261	<?php
14	262	endif;
		@@ -13,25 +261,25 @@
13	261	<?php
14	262	endif;
15	263	}
16	264
17		-function fwp_linkedit_periodic_submit ($caption = NULL) {
	265	+function fwp_settings_form_periodic_submit ($caption = NULL) {
18	266	if (!fwp_test_wp_version(FWP_SCHEMA_25)) :
19	267	if (is_null($caption)) : $caption = __('Save Changes &raquo;'); endif;
20	268	?>
21	269	<p class="submit">
22		-<input type="submit" name="submit" value="<?php print $caption; ?>" />
	270	+<input type="submit" name="save" value="<?php print $caption; ?>" />
23	271	</p>
24	272	<?php
25	273	endif;
26	274	}
27	275
28		-function fwp_linkedit_single_submit_closer ($caption = NULL) {
	276	+function fwp_settings_form_single_submit_closer ($caption = NULL) {
29	277	if (fwp_test_wp_version(FWP_SCHEMA_27)) :
30	278	if (is_null($caption)) : $caption = __('Save Changes'); endif;
31	279	?>
32	280	<p class="submit">
33		-<input class="button-primary" type="submit" name="submit" value="<?php print $caption; ?>" />
	281	+<input class="button-primary" type="submit" name="save" value="<?php print $caption; ?>" />
34	282	</p>
35	283	<?php
36	284	endif;
37	285	}
		@@ -55,10 +303,10 @@
55	303	endif;
56	304	}
57	305
58	306	function fwp_option_box_opener ($legend, $id, $class = "stuffbox") {
59		- global $wp_db_version;
60		- if (isset($wp_db_version) and $wp_db_version >= FWP_SCHEMA_25) :
	307	+ // WordPress 2.5+
	308	+ if (FeedWordPressCompatibility::test_version(FWP_SCHEMA_25)) :
61	309	?>
62	310	<div id="<?php print $id; ?>" class="<?php print $class; ?>">
63	311	<h3><?php print htmlspecialchars($legend); ?></h3>
64	312	<div class="inside">
		@@ -64,9 +312,10 @@
64	312	<div class="inside">
65	313	<?php
66	314	else :
67	315	?>
68		-<fieldset class="options"><legend><?php print htmlspecialchars($legend); ?></legend>
	316	+ <div class="wrap">
	317	+ <h2><?php print htmlspecialchars($legend); ?></h2>
69	318	<?php
70	319	endif;
71	320	}
72	321
		@@ -78,81 +327,135 @@
78	327	</div> <!-- class="stuffbox" -->
79	328	<?php
80	329	else :
81	330	?>
82		-</fieldset>
	331	+ </div> <!-- class="wrap" -->
83	332	<?php
84	333	endif;
85	334	}
86	335
87		-function fwp_tags_box ($tags) {
	336	+function fwp_tags_box ($tags, $object) {
88	337	if (!is_array($tags)) : $tags = array(); endif;
	338	+
	339	+ $desc = "<p style=\"font-size:smaller;font-style:bold;margin:0\">Tag $object as...</p>";
	340	+
	341	+ if (fwp_test_wp_version(FWP_SCHEMA_29)) : // WordPress 2.9+
	342	+ print $desc;
	343	+ $tax_name = 'post_tag';
	344	+ $helps = __('Separate tags with commas.');
	345	+ $box['title'] = __('Tags');
	346	+ ?>
	347	+ <div class="tagsdiv" id="<?php echo $tax_name; ?>">
	348	+ <div class="jaxtag">
	349	+ <div class="nojs-tags hide-if-js">
	350	+ <p><?php _e('Add or remove tags'); ?></p>
	351	+ <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>
	352	+
	353	+ <div class="ajaxtag hide-if-no-js">
	354	+ <label class="screen-reader-text" for="new-tag-<?php echo $tax_name; ?>"><?php echo $box['title']; ?></label>
	355	+ <div class="taghint"><?php _e('Add new tag'); ?></div>
	356	+ <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="" />
	357	+ <input type="button" class="button tagadd" value="<?php esc_attr_e('Add'); ?>" tabindex="3" />
	358	+ </div></div>
	359	+ <p class="howto"><?php echo $helps; ?></p>
	360	+ <div class="tagchecklist"></div>
	361	+ </div>
	362	+ <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>
	363	+<?php
	364	+ elseif (fwp_test_wp_version(FWP_SCHEMA_28)) : // WordPress 2.8+
89	365	?>
90		-<div id="tagsdiv" class="postbox">
91		- <h3><?php _e('Tags') ?></h3>
92		- <p style="font-size:smaller;font-style:bold;margin:0">Place <?php print $object; ?> under...</p>
93		- <div class="inside">
94		- <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>
95		- <div id="tagchecklist"></div>
96		- </div>
97		-</div>
	366	+ <?php print $desc; ?>
	367	+ <div class="tagsdiv" id="post_tag">
	368	+ <div class="jaxtag">
	369	+ <div class="nojs-tags hide-if-js">
	370	+ <p><?php _e('Add or remove tags'); ?></p>
	371	+ <textarea name="tax_input[post_tag]" class="the-tags" id="tax-input[post_tag]"><?php echo implode(",", $tags); ?></textarea>
	372	+ </div>
	373	+
	374	+ <span class="ajaxtag hide-if-no-js">
	375	+ <label class="screen-reader-text" for="new-tag-post_tag"><?php _e('Tags'); ?></label>
	376	+ <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'); ?>" />
	377	+ <input type="button" class="button tagadd" value="<?php esc_attr_e('Add'); ?>" />
	378	+ </span>
	379	+ </div>
	380	+ <p class="howto"><?php echo __('Separate tags with commas.'); ?></p>
	381	+ <div class="tagchecklist"></div>
	382	+ </div>
	383	+ <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>
	384	+ </div>
	385	+ </div>
98	386	<?php
	387	+ else :
	388	+?>
	389	+ <?php print $desc; ?>
	390	+ <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>
	391	+ <div id="tagchecklist"></div>
	392	+ </div>
	393	+ </div>
	394	+<?php
	395	+ endif;
99	396	}
100	397
101		-function fwp_category_box ($checked, $object, $tags = array()) {
	398	+function fwp_category_box ($checked, $object, $tags = array(), $prefix = '') {
102	399	global $wp_db_version;
103	400
104		- if (fwp_test_wp_version(FWP_SCHEMA_25)) : // WordPress 2.5.x
	401	+ if (strlen($prefix) > 0) :
	402	+ $idPrefix = $prefix.'-';
	403	+ $idSuffix = "-".$prefix;
	404	+ $namePrefix = $prefix . '_';
	405	+ else :
	406	+ $idPrefix = 'feedwordpress-';
	407	+ $idSuffix = "-feedwordpress";
	408	+ $namePrefix = 'feedwordpress_';
	409	+ endif;
	410	+
105	411	?>
106		-<div id="category-adder" class="wp-hidden-children">
107		- <h4><a id="category-add-toggle" href="#category-add" class="hide-if-no-js" tabindex="3"><?php _e( '+ Add New Category' ); ?></a></h4>
108		- <p id="category-add" class="wp-hidden-child">
109		- <input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" tabindex="3" />
110		- <?php wp_dropdown_categories( array( 'hide_empty' => 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('Parent category'), 'tab_index' => 3 ) ); ?>
111		- <input type="button" id="category-add-sumbit" class="add:categorychecklist:category-add button" value="<?php _e( 'Add' ); ?>" tabindex="3" />
112		- <?php wp_nonce_field( 'add-category', '_ajax_nonce', false ); ?>
113		- <span id="category-ajax-response"></span>
	412	+<div id="<?php print $idPrefix; ?>taxonomy-category" class="feedwordpress-category-div">
	413	+ <ul id="<?php print $idPrefix; ?>category-tabs" class="category-tabs">
	414	+ <li class="ui-tabs-selected tabs"><a href="#<?php print $idPrefix; ?>categories-all" tabindex="3"><?php _e( 'All posts' ); ?></a>
	415	+ <p style="font-size:smaller;font-style:bold;margin:0">Give <?php print $object; ?> these categories</p>
	416	+ </li>
	417	+ </ul>
	418	+
	419	+<div id="<?php print $idPrefix; ?>categories-all" class="tabs-panel">
	420	+ <ul id="<?php print $idPrefix; ?>categorychecklist" class="list:category categorychecklist form-no-clear">
	421	+ <?php fwp_category_checklist(NULL, false, $checked, $prefix) ?>
	422	+ </ul>
	423	+</div>
	424	+
	425	+<div id="<?php print $idPrefix; ?>category-adder" class="category-adder wp-hidden-children">
	426	+ <h4><a id="<?php print $idPrefix; ?>category-add-toggle" class="category-add-toggle" href="#<?php print $idPrefix; ?>category-add" class="hide-if-no-js" tabindex="3"><?php _e( '+ Add New Category' ); ?></a></h4>
	427	+ <p id="<?php print $idPrefix; ?>category-add" class="wp-hidden-child">
	428	+ <?php
	429	+ if (FeedWordPressCompatibility::test_version(FWP_SCHEMA_30)) :
	430	+ $newcat = 'newcategory'; // Well, thank God they added "egory" before WP 3.0 came out.
	431	+ else :
	432	+ $newcat = 'newcat';
	433	+ endif;
	434	+ ?>
	435	+
	436	+ <input type="text" name="<?php print $newcat; ?>" id="<?php print $idPrefix; ?>newcategory" class="newcategory form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" tabindex="3" />
	437	+ <label class="screen-reader-text" for="<?php print $idPrefix; ?>newcategory-parent"><?php _e('Parent Category:'); ?></label>
	438	+ <?php wp_dropdown_categories( array(
	439	+ 'hide_empty' => 0,
	440	+ 'id' => $idPrefix.'newcategory-parent',
	441	+ 'class' => 'newcategory-parent',
	442	+ 'name' => $newcat.'_parent',
	443	+ 'orderby' => 'name',
	444	+ 'hierarchical' => 1,
	445	+ 'show_option_none' => __('Parent category'),
	446	+ 'tab_index' => 3,
	447	+ ) ); ?>
	448	+ <input type="button" id="<?php print $idPrefix; ?>category-add-sumbit" class="add:<?php print $idPrefix; ?>categorychecklist:category-add add-categorychecklist-category-add button" value="<?php _e( 'Add' ); ?>" tabindex="3" />
	449	+ <?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 */ ?>
	450	+ <input type="hidden" id="_ajax_nonce<?php print esc_html($idSuffix); ?>" name="_ajax_nonce" value="<?php print wp_create_nonce('add-category'); ?>" />
	451	+ <input type="hidden" id="_ajax_nonce-add-category<?php print esc_html($idSuffix); ?>" name="_ajax_nonce-add-category" value="<?php print wp_create_nonce('add-category'); ?>" />
	452	+ <span id="<?php print $idPrefix; ?>category-ajax-response" class="category-ajax-response"></span>
114	453	</p>
115	454	</div>
116	455
117		-<ul id="category-tabs">
118		- <?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... */ ?>
119		- <li class="ui-tabs-selected tabs"><a href="#categories-all" tabindex="3"><?php _e( 'All posts' ); ?></a>
120		- <p style="font-size:smaller;font-style:bold;margin:0">Give <?php print $object; ?> these categories</p>
121		-</li>
122		-</ul>
123		-
124		-<?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... */ ?>
125		-<div id="categories-all" class="ui-tabs-panel tabs-panel">
126		- <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
127		- <?php fwp_category_checklist(NULL, false, $checked) ?>
128		- </ul>
129	456	</div>
130	457	<?php
131		- elseif (fwp_test_wp_version(FWP_SCHEMA_20)) : // WordPress 2.x
132		-?>
133		- <div id="moremeta">
134		- <div id="grabit" class="dbx-group">
135		- <fieldset id="categorydiv" class="dbx-box">
136		- <h3 class="dbx-handle"><?php _e('Categories') ?></h3>
137		- <div class="dbx-content">
138		- <p style="font-size:smaller;font-style:bold;margin:0">Place <?php print $object; ?> under...</p>
139		- <p id="jaxcat"></p>
140		- <div id="categorychecklist"><?php fwp_category_checklist(NULL, false, $checked); ?></div>
141		- </div>
142		- </fieldset>
143		- </div>
144		- </div>
145		-<?php
146		- else : // WordPress 1.5
147		-?>
148		- <fieldset style="width: 60%;">
149		- <legend><?php _e('Categories') ?></legend>
150		- <p style="font-size:smaller;font-style:bold;margin:0">Place <?php print $object; ?> under...</p>
151		- <div style="height: 10em; overflow: scroll;"><?php fwp_category_checklist(NULL, false, $checked); ?></div>
152		- </fieldset>
153		-<?php
154		- endif;
155	458	}
156	459
157	460	function update_feeds_mention ($feed) {
158	461	echo "<li>Updating <cite>".$feed['link/name']."</cite> from &lt;<a href=\""
		@@ -159,9 +462,17 @@
159	462	.$feed['link/uri']."\">".$feed['link/uri']."</a>&gt; ...";
160	463	flush();
161	464	}
162	465	function update_feeds_finish ($feed, $added, $dt) {
163		- echo " completed in $dt second".(($dt==1)?'':'s')."</li>\n";
	466	+ if (is_wp_error($added)) :
	467	+ $mesgs = $added->get_error_messages();
	468	+ foreach ($mesgs as $mesg) :
	469	+ echo "<br/><strong>Feed error:</strong> <code>$mesg</code>";
	470	+ endforeach;
	471	+ echo "</li>\n";
	472	+ else :
	473	+ echo " completed in $dt second".(($dt==1)?'':'s')."</li>\n";
	474	+ endif;
164	475	}
165	476
166	477	function fwp_author_list () {
167	478	global $wpdb;
		@@ -188,9 +499,8 @@
188	499	}
189	500
190	501	class FeedWordPressSettingsUI {
191	502	function instead_of_posts_box ($link_id = null) {
192		- fwp_option_box_opener('Syndicated Posts, Comments & Pings', 'syndicatedpostsdiv', 'postbox');
193	503	if (!is_null($link_id)) :
194	504	$from_this_feed = 'from this feed';
195	505	$by_default = '';
196	506	$id_param = "&amp;link_id=".$link_id;
		@@ -199,13 +509,12 @@
199	509	$by_default = " by default";
200	510	$id_param = "";
201	511	endif;
202	512	?>
203		-<p>Use the <a href="admin.php?page=<?php print $GLOBALS['fwp_path'] ?>/posts-page.php<?php print $id_param; ?>"><?php _e('Posts'); ?></a>
	513	+<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>
204	514	settings page to set up how new posts <?php print $from_this_feed; ?> will be published<?php $by_default; ?>, whether they will accept
205	515	comments and pings, any custom fields that should be set on each post, etc.</p>
206	516	<?php
207		- fwp_option_box_closer();
208	517	} /* FeedWordPressSettingsUI::instead_of_posts_box () */
209	518
210	519	function instead_of_authors_box ($link_id = null) {
211	520	if (!is_null($link_id)) :
		@@ -217,9 +526,8 @@
217	526	$by_default = " by default";
218	527	$id_param = "";
219	528	endif;
220	529
221		- fwp_option_box_opener('Syndicated Authors', 'authordiv', 'postbox')
222	530	?>
223	531	<p>Use the <a
224	532	href="admin.php?page=<?php print $GLOBALS['fwp_path']
225	533	?>/authors-page.php<?php print $id_param; ?>"><?php _e('Authors');
		@@ -226,9 +534,8 @@
226	534	?></a> settings page to set up how new posts
227	535	<?php print $from_this_feed; ?> will be assigned to
228	536	authors.</p>
229	537	<?php
230		- fwp_option_box_closer();
231	538	} /* FeedWordPressSettingsUI::instead_of_authors_box () */
232	539
233	540	function instead_of_categories_box ($link_id = null) {
234	541	if (!is_null($link_id)) :
		@@ -240,16 +547,73 @@
240	547	$by_default = " by default";
241	548	$id_param = "";
242	549	endif;
243	550
244		- fwp_option_box_opener(__('Categories & Tags'), 'categorydiv', 'postbox');
245	551	?>
246		-<p>Use the <a href="admin.php?page=<?php print $GLOBALS['fwp_path'] ?>/categories-page.php<?php print $id_param; ?>"><?php _e('Categories & Tags'); ?></a>
247		-settings page to set up how new posts <?php print $from_this_feed; ?> are assigned categories or tags<?php print $by_default; ?>.</p>
	552	+<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>
	553	+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>
248	554	<?php
249		- fwp_option_box_closer();
250	555	} /* FeedWordPressSettingsUI::instead_of_categories_box () */
251	556
	557	+ /*static*/ function ajax_nonce_fields () {
	558	+ if (function_exists('wp_nonce_field')) :
	559	+ echo "<form style='display: none' method='get' action=''>\n<p>\n";
	560	+ wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
	561	+ wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
	562	+ echo "</p>\n</form>\n";
	563	+ endif;
	564	+ } /* FeedWordPressSettingsUI::ajax_nonce_fields () */
	565	+
	566	+ /*static*/ function fix_toggles_js ($context) {
	567	+ ?>
	568	+ <script type="text/javascript">
	569	+ jQuery(document).ready( function($) {
	570	+ <?php if (FeedWordPressCompatibility::test_version(FWP_SCHEMA_29)) : ?>
	571	+ if ( $('#post_tag').length ) {
	572	+ tagBox.init();
	573	+ }
	574	+ <?php endif; ?>
	575	+ <?php if (FeedWordPressCompatibility::test_version(FWP_SCHEMA_25, FWP_SCHEMA_27)) : ?>
	576	+ // In case someone got here first...
	577	+ jQuery('.postbox h3').unbind('click');
	578	+
	579	+ add_postbox_toggles('<?php print $context; ?>');
	580	+ <?php elseif (FeedWordPressCompatibility::test_version(FWP_SCHEMA_27)) : ?>
	581	+ // In case someone got here first...
	582	+ $('.postbox h3, .postbox .handlediv').unbind('click');
	583	+ $('.postbox h3 a').unbind('click');
	584	+ $('.hide-postbox-tog').unbind('click');
	585	+ $('.columns-prefs input[type="radio"]').unbind('click');
	586	+ $('.meta-box-sortables').sortable('destroy');
	587	+
	588	+ postboxes.add_postbox_toggles('<?php print $context; ?>');
	589	+ <?php endif; ?>
	590	+ } );
	591	+ </script>
	592	+ <?php
	593	+ } /* FeedWordPressSettingsUI::fix_toggles_js () */
	594	+
	595	+ function magic_input_tip_js ($id) {
	596	+ if (FeedWordPressCompatibility::test_version(FWP_SCHEMA_25)) :
	597	+ ?>
	598	+ <script type="text/javascript">
	599	+ jQuery(document).ready( function () {
	600	+ var inputBox = jQuery("#<?php print $id; ?>");
	601	+ var boxEl = inputBox.get(0);
	602	+ if (boxEl.value==boxEl.defaultValue) { inputBox.addClass('form-input-tip'); }
	603	+ inputBox.focus(function() {
	604	+ if ( this.value == this.defaultValue )
	605	+ jQuery(this).val( '' ).removeClass( 'form-input-tip' );
	606	+ });
	607	+ inputBox.blur(function() {
	608	+ if ( this.value == '' )
	609	+ jQuery(this).val( this.defaultValue ).addClass( 'form-input-tip' );
	610	+ });
	611	+ } );
	612	+ </script>
	613	+ <?php
	614	+ endif;
	615	+ } /* FeedWordPressSettingsUI::magic_input_tip_js () */
252	616	} /* class FeedWordPressSettingsUI */
253	617
254	618	function fwp_insert_new_user ($newuser_name) {
255	619	global $wpdb;
		@@ -277,5 +641,133 @@
277	641	// TODO: Add some error reporting
278	642	endif;
279	643	return $ret;
280	644	} /* fwp_insert_new_user () */
	645	+
	646	+function fwp_add_meta_box ($id, $title, $callback, $page, $context = 'advanced', $priority = 'default', $callback_args = null) {
	647	+ if (function_exists('add_meta_box')) :
	648	+ return add_meta_box($id, $title, $callback, $page, $context, $priority, $callback_args);
	649	+ else :
	650	+ /* Re-used as per terms of the GPL from add_meta_box() in WordPress 2.8.1 wp-admin/includes/template.php. */
	651	+ global $wp_meta_boxes;
	652	+
	653	+ if ( !isset($wp_meta_boxes) )
	654	+ $wp_meta_boxes = array();
	655	+ if ( !isset($wp_meta_boxes[$page]) )
	656	+ $wp_meta_boxes[$page] = array();
	657	+ if ( !isset($wp_meta_boxes[$page][$context]) )
	658	+ $wp_meta_boxes[$page][$context] = array();
	659	+
	660	+ foreach ( array_keys($wp_meta_boxes[$page]) as $a_context ) {
	661	+ foreach ( array('high', 'core', 'default', 'low') as $a_priority ) {
	662	+ if ( !isset($wp_meta_boxes[$page][$a_context][$a_priority][$id]) )
	663	+ continue;
	664	+
	665	+ // If a core box was previously added or removed by a plugin, don't add.
	666	+ if ( 'core' == $priority ) {
	667	+ // If core box previously deleted, don't add
	668	+ if ( false === $wp_meta_boxes[$page][$a_context][$a_priority][$id] )
	669	+ return;
	670	+ // If box was added with default priority, give it core priority to maintain sort order
	671	+ if ( 'default' == $a_priority ) {
	672	+ $wp_meta_boxes[$page][$a_context]['core'][$id] = $wp_meta_boxes[$page][$a_context]['default'][$id];
	673	+ unset($wp_meta_boxes[$page][$a_context]['default'][$id]);
	674	+ }
	675	+ return;
	676	+ }
	677	+ // If no priority given and id already present, use existing priority
	678	+ if ( empty($priority) ) {
	679	+ $priority = $a_priority;
	680	+ // 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.
	681	+ } elseif ( 'sorted' == $priority ) {
	682	+ $title = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['title'];
	683	+ $callback = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['callback'];
	684	+ $callback_args = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['args'];
	685	+ }
	686	+ // An id can be in only one priority and one context
	687	+ if ( $priority != $a_priority || $context != $a_context )
	688	+ unset($wp_meta_boxes[$page][$a_context][$a_priority][$id]);
	689	+ }
	690	+ }
	691	+
	692	+ if ( empty($priority) )
	693	+ $priority = 'low';
	694	+
	695	+ if ( !isset($wp_meta_boxes[$page][$context][$priority]) )
	696	+ $wp_meta_boxes[$page][$context][$priority] = array();
	697	+
	698	+ $wp_meta_boxes[$page][$context][$priority][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback, 'args' => $callback_args);
	699	+ endif;
	700	+} /* function fwp_add_meta_box () */
	701	+
	702	+function fwp_do_meta_boxes($page, $context, $object) {
	703	+ if (function_exists('do_meta_boxes')) :
	704	+ $ret = do_meta_boxes($page, $context, $object);
	705	+
	706	+ // Avoid JavaScript error from WordPress 2.5 bug
	707	+?>
	708	+ <div style="display: none">
	709	+ <div id="tags-input"></div> <!-- avoid JS error from WP 2.5 bug -->
	710	+ </div>
	711	+<?php
	712	+ return $ret;
	713	+ else :
	714	+ /* Derived as per terms of the GPL from do_meta_boxes() in WordPress 2.8.1 wp-admin/includes/template.php. */
	715	+ global $wp_meta_boxes;
	716	+ static $already_sorted = false;
	717	+
	718	+ //do_action('do_meta_boxes', $page, $context, $object);
	719	+
	720	+ echo "<div id='$context-sortables' class='meta-box-sortables'>\n";
	721	+
	722	+ $i = 0;
	723	+ do {
	724	+ if ( !isset($wp_meta_boxes) || !isset($wp_meta_boxes[$page]) || !isset($wp_meta_boxes[$page][$context]) )
	725	+ break;
	726	+
	727	+ foreach ( array('high', 'sorted', 'core', 'default', 'low') as $priority ) {
	728	+ if ( isset($wp_meta_boxes[$page][$context][$priority]) ) {
	729	+ foreach ( (array) $wp_meta_boxes[$page][$context][$priority] as $box ) {
	730	+ if ( false == $box || ! $box['title'] )
	731	+ continue;
	732	+ $i++;
	733	+ fwp_option_box_opener($box['title'], $box['id'], 'postbox' /*. postbox_classes($box['id'], $page)*/);
	734	+ call_user_func($box['callback'], $object, $box);
	735	+ fwp_option_box_closer();
	736	+
	737	+ if (is_object($object) and method_exists($object, 'interstitial')) :
	738	+ $object->interstitial();
	739	+ else :
	740	+ // Submit button for WP 1.5, early 2.x style
	741	+ fwp_settings_form_periodic_submit();
	742	+ endif;
	743	+ }
	744	+ }
	745	+ }
	746	+ } while(0);
	747	+
	748	+ echo "</div>";
	749	+
	750	+ return $i;
	751	+ endif;
	752	+} /* function fwp_do_meta_boxes() */
	753	+
	754	+function fwp_remove_meta_box($id, $page, $context) {
	755	+ if (function_exists('remove_meta_box')) :
	756	+ return remove_meta_box($id, $page, $context);
	757	+ else :
	758	+ /* Re-used as per terms of the GPL from remove_meta_box() in WordPress 2.8.1 wp-admin/includes/template.php */
	759	+ global $wp_meta_boxes;
	760	+
	761	+ if ( !isset($wp_meta_boxes) )
	762	+ $wp_meta_boxes = array();
	763	+ if ( !isset($wp_meta_boxes[$page]) )
	764	+ $wp_meta_boxes[$page] = array();
	765	+ if ( !isset($wp_meta_boxes[$page][$context]) )
	766	+ $wp_meta_boxes[$page][$context] = array();
	767	+
	768	+ foreach ( array('high', 'core', 'default', 'low') as $priority )
	769	+ $wp_meta_boxes[$page][$context][$priority][$id] = false;
	770	+ endif;
	771	+} /* function fwp_remove_meta_box() */
	772	+
281	773