← All changes | admin-ui.php +148 -30 2008.1030 → 2009.0612 View file →

		@@ -1,29 +1,11 @@
1	1	<?php
2	2	function fwp_linkedit_single_submit ($status = NULL) {
3		- global $wp_db_version;
4		- if (isset($wp_db_version) and $wp_db_version >= FWP_SCHEMA_25) :
	3	+ if (fwp_test_wp_version(FWP_SCHEMA_25, FWP_SCHEMA_27)) :
5	4	?>
6	5	<div class="submitbox" id="submitlink">
7	6	<div id="previewview"></div>
8		-<div class="inside">
9		-<?php if (!is_null($status)) : ?>
10		- <p><strong>Publication</strong></p>
11		- <p>When a new post is syndicated from this feed...</p>
12		- <select name="feed_post_status">
13		- <option value="site-default" <?php echo $status['post']['site-default']; ?>> Use
14		- Syndication Options setting</option>
15		- <option value="publish" <?php echo $status['post']['publish']; ?>>Publish it immediately</option>
16		-
17		- <?php if (SyndicatedPost::use_api('post_status_pending')) : ?>
18		- <option value="pending" <?php echo $status['post']['pending']; ?>>Hold it Pending Review</option>
19		- <?php endif; ?>
20		-
21		- <option value="draft" <?php echo $status['post']['draft']; ?>>Save it as a draft</option>
22		- <option value="private" <?php echo $status['post']['private']; ?>>Keep it private</option>
23		- </select>
24		-<?php endif; ?>
25		-</div>
	7	+<div class="inside"></div>
26	8
27	9	<p class="submit">
28	10	<input type="submit" name="submit" value="<?php _e('Save') ?>" />
29	11	</p>
		@@ -32,10 +14,9 @@
32	14	endif;
33	15	}
34	16
35	17	function fwp_linkedit_periodic_submit ($caption = NULL) {
36		- global $wp_db_version;
37		- if (!(isset($wp_db_version) and $wp_db_version >= FWP_SCHEMA_25)) :
	18	+ if (!fwp_test_wp_version(FWP_SCHEMA_25)) :
38	19	if (is_null($caption)) : $caption = __('Save Changes &raquo;'); endif;
39	20	?>
40	21	<p class="submit">
41	22	<input type="submit" name="submit" value="<?php print $caption; ?>" />
		@@ -43,8 +24,38 @@
43	24	<?php
44	25	endif;
45	26	}
46	27
	28	+function fwp_linkedit_single_submit_closer ($caption = NULL) {
	29	+ if (fwp_test_wp_version(FWP_SCHEMA_27)) :
	30	+ if (is_null($caption)) : $caption = __('Save Changes'); endif;
	31	+?>
	32	+<p class="submit">
	33	+<input class="button-primary" type="submit" name="submit" value="<?php print $caption; ?>" />
	34	+</p>
	35	+<?php
	36	+ endif;
	37	+}
	38	+
	39	+function fwp_authors_single_submit ($link = NULL) {
	40	+ global $wp_db_version;
	41	+
	42	+ if (fwp_test_wp_version(FWP_SCHEMA_25)) :
	43	+?>
	44	+<div class="submitbox" id="submitlink">
	45	+<div id="previewview">
	46	+</div>
	47	+<div class="inside">
	48	+</div>
	49	+
	50	+<p class="submit">
	51	+<input type="submit" name="save" value="<?php _e('Save') ?>" />
	52	+</p>
	53	+</div>
	54	+<?php
	55	+ endif;
	56	+}
	57	+
47	58	function fwp_option_box_opener ($legend, $id, $class = "stuffbox") {
48	59	global $wp_db_version;
49	60	if (isset($wp_db_version) and $wp_db_version >= FWP_SCHEMA_25) :
50	61	?>
		@@ -89,9 +100,9 @@
89	100
90	101	function fwp_category_box ($checked, $object, $tags = array()) {
91	102	global $wp_db_version;
92	103
93		- if (isset($wp_db_version) and $wp_db_version >= FWP_SCHEMA_25) : // WordPress 2.5.x
	104	+ if (fwp_test_wp_version(FWP_SCHEMA_25)) : // WordPress 2.5.x
94	105	?>
95	106	<div id="category-adder" class="wp-hidden-children">
96	107	<h4><a id="category-add-toggle" href="#category-add" class="hide-if-no-js" tabindex="3"><?php _e( '+ Add New Category' ); ?></a></h4>
97	108	<p id="category-add" class="wp-hidden-child">
		@@ -114,9 +125,9 @@
114	125	<?php fwp_category_checklist(NULL, false, $checked) ?>
115	126	</ul>
116	127	</div>
117	128	<?php
118		- elseif (isset($wp_db_version) and $wp_db_version >= FWP_SCHEMA_20) : // WordPress 2.x
	129	+ elseif (fwp_test_wp_version(FWP_SCHEMA_20)) : // WordPress 2.x
119	130	?>
120	131	<div id="moremeta">
121	132	<div id="grabit" class="dbx-group">
122	133	<fieldset id="categorydiv" class="dbx-box">
		@@ -123,9 +134,10 @@
123	134	<h3 class="dbx-handle"><?php _e('Categories') ?></h3>
124	135	<div class="dbx-content">
125	136	<p style="font-size:smaller;font-style:bold;margin:0">Place <?php print $object; ?> under...</p>
126	137	<p id="jaxcat"></p>
127		- <ul id="categorychecklist"><?php fwp_category_checklist(NULL, false, $checked); ?></ul></div>
	138	+ <div id="categorychecklist"><?php fwp_category_checklist(NULL, false, $checked); ?></div>
	139	+ </div>
128	140	</fieldset>
129	141	</div>
130	142	</div>
131	143	<?php
		@@ -130,12 +142,12 @@
130	142	</div>
131	143	<?php
132	144	else : // WordPress 1.5
133	145	?>
134		- <fieldset id="categorydiv" style="width: 20%; margin-right: 2em">
	146	+ <fieldset style="width: 60%;">
135	147	<legend><?php _e('Categories') ?></legend>
136	148	<p style="font-size:smaller;font-style:bold;margin:0">Place <?php print $object; ?> under...</p>
137		- <div style="height: 20em"><?php fwp_category_checklist(NULL, false, $checked); ?></div>
	149	+ <div style="height: 10em; overflow: scroll;"><?php fwp_category_checklist(NULL, false, $checked); ?></div>
138	150	</fieldset>
139	151	<?php
140	152	endif;
141	153	}
		@@ -141,21 +153,127 @@
141	153	}
142	154
143	155	function update_feeds_mention ($feed) {
144	156	echo "<li>Updating <cite>".$feed['link/name']."</cite> from &lt;<a href=\""
145		- .$feed['link/uri']."\">".$feed['link/uri']."</a>&gt; ...</li>\n";
	157	+ .$feed['link/uri']."\">".$feed['link/uri']."</a>&gt; ...";
146	158	flush();
147	159	}
	160	+function update_feeds_finish ($feed, $added, $dt) {
	161	+ echo " completed in $dt second".(($dt==1)?'':'s')."</li>\n";
	162	+}
148	163
149	164	function fwp_author_list () {
150	165	global $wpdb;
151	166	$ret = array();
152		- $users = $wpdb->get_results("SELECT * FROM $wpdb->users ORDER BY display_name");
	167	+
	168	+ // display_name introduced in WP 2.0
	169	+ if (fwp_test_wp_version(FWP_SCHEMA_20)) :
	170	+ $name_column = 'display_name';
	171	+ else :
	172	+ $name_column = 'user_nickname';
	173	+ endif;
	174	+
	175	+ $users = $wpdb->get_results("SELECT * FROM $wpdb->users ORDER BY {$name_column}");
153	176	if (is_array($users)) :
154	177	foreach ($users as $user) :
155	178	$id = (int) $user->ID;
156		- $ret[$id] = $user->display_name;
	179	+ $ret[$id] = $user->{$name_column};
	180	+ if (strlen(trim($ret[$id])) == 0) :
	181	+ $ret[$id] = $user->user_login;
	182	+ endif;
157	183	endforeach;
158	184	endif;
159	185	return $ret;
160	186	}
	187	+
	188	+class FeedWordPressSettingsUI {
	189	+ function instead_of_posts_box ($link_id = null) {
	190	+ fwp_option_box_opener('Syndicated Posts, Comments & Pings', 'syndicatedpostsdiv', 'postbox');
	191	+ if (!is_null($link_id)) :
	192	+ $from_this_feed = 'from this feed';
	193	+ $by_default = '';
	194	+ $id_param = "&amp;link_id=".$link_id;
	195	+ else :
	196	+ $from_this_feed = 'from syndicated feeds';
	197	+ $by_default = " by default";
	198	+ $id_param = "";
	199	+ endif;
	200	+?>
	201	+<p>Use the <a href="admin.php?page=<?php print $GLOBALS['fwp_path'] ?>/posts-page.php<?php print $id_param; ?>"><?php _e('Posts'); ?></a>
	202	+settings page to set up how new posts <?php print $from_this_feed; ?> will be published<?php $by_default; ?>, whether they will accept
	203	+comments and pings, any custom fields that should be set on each post, etc.</p>
	204	+<?php
	205	+ fwp_option_box_closer();
	206	+ } /* FeedWordPressSettingsUI::instead_of_posts_box () */
	207	+
	208	+ function instead_of_authors_box ($link_id = null) {
	209	+ if (!is_null($link_id)) :
	210	+ $from_this_feed = 'from this feed';
	211	+ $by_default = '';
	212	+ $id_param = "&amp;link_id=".$link_id;
	213	+ else :
	214	+ $from_this_feed = 'from syndicated feeds';
	215	+ $by_default = " by default";
	216	+ $id_param = "";
	217	+ endif;
	218	+
	219	+ fwp_option_box_opener('Syndicated Authors', 'authordiv', 'postbox')
	220	+?>
	221	+<p>Use the <a
	222	+href="admin.php?page=<?php print $GLOBALS['fwp_path']
	223	+?>/authors-page.php<?php print $id_param; ?>"><?php _e('Authors');
	224	+?></a> settings page to set up how new posts
	225	+<?php print $from_this_feed; ?> will be assigned to
	226	+authors.</p>
	227	+<?php
	228	+ fwp_option_box_closer();
	229	+ } /* FeedWordPressSettingsUI::instead_of_authors_box () */
	230	+
	231	+ function instead_of_categories_box ($link_id = null) {
	232	+ if (!is_null($link_id)) :
	233	+ $from_this_feed = 'from this feed';
	234	+ $by_default = '';
	235	+ $id_param = "&amp;link_id=".$link_id;
	236	+ else :
	237	+ $from_this_feed = 'from syndicated feeds';
	238	+ $by_default = " by default";
	239	+ $id_param = "";
	240	+ endif;
	241	+
	242	+ fwp_option_box_opener(__('Categories & Tags'), 'categorydiv', 'postbox');
	243	+?>
	244	+<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>
	245	+settings page to set up how new posts <?php print $from_this_feed; ?> are assigned categories or tags<?php print $by_default; ?>.</p>
	246	+<?php
	247	+ fwp_option_box_closer();
	248	+ } /* FeedWordPressSettingsUI::instead_of_categories_box () */
	249	+
	250	+} /* class FeedWordPressSettingsUI */
	251	+
	252	+function fwp_insert_new_user ($newuser_name) {
	253	+ global $wpdb;
	254	+
	255	+ $ret = null;
	256	+ if (strlen($newuser_name) > 0) :
	257	+ $userdata = array();
	258	+ $userdata['ID'] = NULL;
	259	+
	260	+ $userdata['user_login'] = sanitize_user($newuser_name);
	261	+ $userdata['user_login'] = apply_filters('pre_user_login', $userdata['user_login']);
	262	+
	263	+ $userdata['user_nicename'] = sanitize_title($newuser_name);
	264	+ $userdata['user_nicename'] = apply_filters('pre_user_nicename', $userdata['user_nicename']);
	265	+
	266	+ $userdata['display_name'] = $wpdb->escape($newuser_name);
	267	+
	268	+ $newuser_id = wp_insert_user($userdata);
	269	+ if (is_numeric($newuser_id)) :
	270	+ $ret = $newuser_id;
	271	+ else :
	272	+ // TODO: Add some error detection and reporting
	273	+ endif;
	274	+ else :
	275	+ // TODO: Add some error reporting
	276	+ endif;
	277	+ return $ret;
	278	+} /* fwp_insert_new_user () */
161	279