Navigation

← Previous Changeset
Next Changeset →

Changeset 2705

Timestamp:

07/13/05 16:04:14 (3 years ago)

Author:

ryan

Message:

Move menus from levels to capabilities.

Files:

trunk/wp-admin/admin-functions.php (modified) (3 diffs)
trunk/wp-admin/menu-header.php (modified) (2 diffs)
trunk/wp-admin/menu.php (modified) (1 diff)
trunk/wp-admin/upgrade-schema.php (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/wp-admin/admin-functions.php

r2704	r2705
1004	1004	global $menu;
1005	1005	global $submenu;
1006		~~global $user_level;~~
1007	1006
1008	1007	$parent = get_admin_page_parent();
…	…
1011	1010	//echo "parent array: " . $menu_array[2];
1012	1011	if ($menu_array[2] == $parent) {
1013		if (~~$user_level < $menu_array[1]~~) {
	1012	if ( !current_user_can($menu_array[1]) ) {
1014	1013	return false;
1015	1014	} else {
…	…
1022	1021	foreach ($submenu[$parent] as $submenu_array) {
1023	1022	if ($submenu_array[2] == $pagenow) {
1024		if (~~$user_level < $submenu_array[1]~~) {
	1023	if ( !current_user_can($submenu_array[1]) ) {
1025	1024	return false;
1026	1025	} else {

trunk/wp-admin/menu-header.php

r2634	r2705
12	12	if (( strcmp($self, $item[2]) == 0 && empty($parent_file)) \|\| ($parent_file && ($item[2] == $parent_file))) $class = ' class="current"';
13	13
14		if (~~$user_level >= $item[1]~~) {
	14	if ( current_user_can($item[1]) ) {
15	15	if ( file_exists(ABSPATH . "wp-content/plugins/{$item[2]}") )
16	16	echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
…	…
32	32	<?php
33	33	foreach ($submenu["$parent_file"] as $item) :
34		if (~~$user_level < $item[1]) {~~
	34	if ( !current_user_can($item[1]) )
35	35	continue;
36		}
37	36
38	37	if ( isset($submenu_file) ) {

trunk/wp-admin/menu.php

r2234	r2705
5	5	// The minimum level the user needs to access the item: between 0 and 10
6	6	// The URL of the item's file
7		$menu[0] = array(__('Dashboard'), 0, 'index.php');
8		$menu[5] = array(__('Write'), 1, 'post.php');
9		$menu[10] = array(__('Manage'), 1, 'edit.php');
10		$menu[20] = array(__('Links'), 5, 'link-manager.php');
11		$menu[25] = array(__('Presentation'), 8, 'themes.php');
12		$menu[30] = array(__('Plugins'), 8, 'plugins.php');
13		$menu[35] = array(__('Users'), 0, 'profile.php');
14		$menu[40] = array(__('Options'), 6, 'options-general.php');
	7	$menu[0] = array(__('Dashboard'), 'read', 'index.php');
	8	$menu[5] = array(__('Write'), 'edit_posts', 'post.php');
	9	$menu[10] = array(__('Manage'), 'edit_posts', 'edit.php');
	10	$menu[20] = array(__('Links'), 'manage_links', 'link-manager.php');
	11	$menu[25] = array(__('Presentation'), 'switch_themes', 'themes.php');
	12	$menu[30] = array(__('Plugins'), 'activate_plugins', 'plugins.php');
	13	$menu[35] = array(__('Users'), 'read', 'profile.php');
	14	$menu[40] = array(__('Options'), 'manage_options', 'options-general.php');
15	15
16	16	if ( get_option('use_fileupload') )
17		$menu[45] = array(__('Upload'), ~~get_settings('fileupload_minlevel')~~, 'upload.php');
	17	$menu[45] = array(__('Upload'), 'upload_files', 'upload.php');
18	18
19		$submenu['post.php'][5] = array(__('Write Post'), 1, 'post.php');
20		$submenu['post.php'][10] = array(__('Write Page'), 5, 'page-new.php');
	19	$submenu['post.php'][5] = array(__('Write Post'), 'edit_posts', 'post.php');
	20	$submenu['post.php'][10] = array(__('Write Page'), 'edit_pages', 'page-new.php');
21	21
22		$submenu['edit.php'][5] = array(__('Posts'), 1, 'edit.php');
23		$submenu['edit.php'][10] = array(__('Pages'), 5, 'edit-pages.php');
24		$submenu['edit.php'][15] = array(__('Categories'), 1, 'categories.php');
25		$submenu['edit.php'][20] = array(__('Comments'), 1, 'edit-comments.php');
	22	$submenu['edit.php'][5] = array(__('Posts'), 'edit_posts', 'edit.php');
	23	$submenu['edit.php'][10] = array(__('Pages'), 'edit_pages', 'edit-pages.php');
	24	$submenu['edit.php'][15] = array(__('Categories'), 'manage_categories', 'categories.php');
	25	$submenu['edit.php'][20] = array(__('Comments'), 'edit_posts', 'edit-comments.php');
26	26	$awaiting_mod = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '0'");
27		$submenu['edit.php'][25] = array(sprintf(__("Awaiting Moderation (%s)"), $awaiting_mod), 1, 'moderation.php');
28		$submenu['edit.php'][30] = array(__('Files'), 8, 'templates.php');
	27	$submenu['edit.php'][25] = array(sprintf(__("Awaiting Moderation (%s)"), $awaiting_mod), 'edit_posts', 'moderation.php');
	28	$submenu['edit.php'][30] = array(__('Files'), 'edit_files', 'templates.php');
29	29
30		$submenu['link-manager.php'][5] = array(__('Manage Links'), 5, 'link-manager.php');
31		$submenu['link-manager.php'][10] = array(__('Add Link'), 5, 'link-add.php');
32		$submenu['link-manager.php'][15] = array(__('Link Categories'), 5, 'link-categories.php');
33		$submenu['link-manager.php'][20] = array(__('Import Links'), 5, 'link-import.php');
	30	$submenu['link-manager.php'][5] = array(__('Manage Links'), 'manage_links', 'link-manager.php');
	31	$submenu['link-manager.php'][10] = array(__('Add Link'), 'manage_links', 'link-add.php');
	32	$submenu['link-manager.php'][15] = array(__('Link Categories'), 'manage_links', 'link-categories.php');
	33	$submenu['link-manager.php'][20] = array(__('Import Links'), 'manage_links', 'link-import.php');
34	34
35		$submenu['profile.php'][5] = array(__('Your Profile'), 0, 'profile.php');
36		$submenu['profile.php'][10] = array(__('Authors & Users'), 5, 'users.php');
	35	$submenu['profile.php'][5] = array(__('Your Profile'), 'read', 'profile.php');
	36	$submenu['profile.php'][10] = array(__('Authors & Users'), 'edit_users', 'users.php');
37	37
38		$submenu['options-general.php'][5] = array(__('General'), 6, 'options-general.php');
39		$submenu['options-general.php'][10] = array(__('Writing'), 6, 'options-writing.php');
40		$submenu['options-general.php'][15] = array(__('Reading'), 6, 'options-reading.php');
41		$submenu['options-general.php'][20] = array(__('Discussion'), 6, 'options-discussion.php');
42		$submenu['options-general.php'][25] = array(__('Permalinks'), 6, 'options-permalink.php');
43		$submenu['options-general.php'][30] = array(__('Miscellaneous'), 6, 'options-misc.php');
	38	$submenu['options-general.php'][5] = array(__('General'), 'manage_options', 'options-general.php');
	39	$submenu['options-general.php'][10] = array(__('Writing'), 'manage_options', 'options-writing.php');
	40	$submenu['options-general.php'][15] = array(__('Reading'), 'manage_options', 'options-reading.php');
	41	$submenu['options-general.php'][20] = array(__('Discussion'), 'manage_options', 'options-discussion.php');
	42	$submenu['options-general.php'][25] = array(__('Permalinks'), 'manage_options', 'options-permalink.php');
	43	$submenu['options-general.php'][30] = array(__('Miscellaneous'), 'manage_options', 'options-misc.php');
44	44
45		$submenu['plugins.php'][5] = array(__('Plugins'), 8, 'plugins.php');
46		$submenu['plugins.php'][10] = array(__('Plugin Editor'), 8, 'plugin-editor.php');
	45	$submenu['plugins.php'][5] = array(__('Plugins'), 'activate_plugins', 'plugins.php');
	46	$submenu['plugins.php'][10] = array(__('Plugin Editor'), 'edit_plugins', 'plugin-editor.php');
47	47
48		$submenu['themes.php'][5] = array(__('Themes'), 8, 'themes.php');
49		$submenu['themes.php'][10] = array(__('Theme Editor'), 8, 'theme-editor.php');
	48	$submenu['themes.php'][5] = array(__('Themes'), 'switch_themes', 'themes.php');
	49	$submenu['themes.php'][10] = array(__('Theme Editor'), 'edit_themes', 'theme-editor.php');
50	50
51	51	// Create list of page plugin hook names.

trunk/wp-admin/upgrade-schema.php

r2704	r2705
247	247	'manage_categories' => true,
248	248	'manage_links' => true,
249		'upload_~~imag~~es' => true,
	249	'upload_files' => true,
250	250	'manage_options' => true,
251	251	'switch_themes' => true,

Navigation

Changeset 2705

Legend:

trunk/wp-admin/admin-functions.php

trunk/wp-admin/menu-header.php

trunk/wp-admin/menu.php

trunk/wp-admin/upgrade-schema.php

Download in other formats: