[wp-cvs] wordpress/wp-admin admin-functions.php, 1.62, 1.63 menu.php, 1.34, 1.35 user-edit.php, 1.6, 1.7

[Ryan Boren]

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7638

Modified Files:
	admin-functions.php menu.php user-edit.php 
Log Message:
Rationalize menu access levels.  Submenus should have an access level greater than or equal to its parent.  Require level 8 for all file editing pages.

Index: menu.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/menu.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** menu.php	25 Nov 2004 15:45:16 -0000	1.34
--- menu.php	8 Dec 2004 22:32:49 -0000	1.35
***************
*** 9,13 ****
  $menu[10] = array(__('Manage'), 1, 'edit.php');
  $menu[20] = array(__('Links'), 5, 'link-manager.php');
! $menu[25] = array(__('Users'), 3, 'users.php');
  $menu[30] = array(__('Options'), 6, 'options-general.php');
  $menu[35] = array(__('Plugins'), 8, 'plugins.php');
--- 9,13 ----
  $menu[10] = array(__('Manage'), 1, 'edit.php');
  $menu[20] = array(__('Links'), 5, 'link-manager.php');
! $menu[25] = array(__('Users'), 0, 'profile.php');
  $menu[30] = array(__('Options'), 6, 'options-general.php');
  $menu[35] = array(__('Plugins'), 8, 'plugins.php');
***************
*** 24,28 ****
  $awaiting_mod = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '0'");
  $submenu['edit.php'][25] = array(sprintf(__("Awaiting Moderation (%s)"), $awaiting_mod), 1, 'moderation.php');
! $submenu['edit.php'][30] = array(__('Files'), 5, 'templates.php');
  
  $submenu['link-manager.php'][5] = array(__('Manage Links'), 5, 'link-manager.php');
--- 24,28 ----
  $awaiting_mod = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '0'");
  $submenu['edit.php'][25] = array(sprintf(__("Awaiting Moderation (%s)"), $awaiting_mod), 1, 'moderation.php');
! $submenu['edit.php'][30] = array(__('Files'), 8, 'templates.php');
  
  $submenu['link-manager.php'][5] = array(__('Manage Links'), 5, 'link-manager.php');
***************
*** 31,49 ****
  $submenu['link-manager.php'][20] = array(__('Import Links'), 5, 'link-import.php');
  
! $submenu['users.php'][5] = array(__('Authors & Users'), 5, 'users.php');
! $submenu['users.php'][10] = array(__('Your Profile'), 5, 'profile.php');
  
! $submenu['options-general.php'][5] = array(__('General'), 5, 'options-general.php');
! $submenu['options-general.php'][10] = array(__('Writing'), 5, 'options-writing.php');
! $submenu['options-general.php'][15] = array(__('Reading'), 5, 'options-reading.php');
! $submenu['options-general.php'][20] = array(__('Discussion'), 5, 'options-discussion.php');
! $submenu['options-general.php'][25] = array(__('Permalinks'), 5, 'options-permalink.php');
! $submenu['options-general.php'][30] = array(__('Miscellaneous'), 5, 'options-misc.php');
  
! $submenu['plugins.php'][5] = array(__('Plugins'), 5, 'plugins.php');
! $submenu['plugins.php'][10] = array(__('Plugin Editor'), 5, 'plugin-editor.php');
  
! $submenu['themes.php'][5] = array(__('Themes'), 5, 'themes.php');
! $submenu['themes.php'][10] = array(__('Theme Editor'), 5, 'theme-editor.php');
  
  do_action('admin_menu', '');
--- 31,49 ----
  $submenu['link-manager.php'][20] = array(__('Import Links'), 5, 'link-import.php');
  
! $submenu['users.php'][5] = array(__('Your Profile'), 0, 'profile.php');
! $submenu['users.php'][10] = array(__('Authors & Users'), 5, 'users.php');
  
! $submenu['options-general.php'][5] = array(__('General'), 6, 'options-general.php');
! $submenu['options-general.php'][10] = array(__('Writing'), 6, 'options-writing.php');
! $submenu['options-general.php'][15] = array(__('Reading'), 6, 'options-reading.php');
! $submenu['options-general.php'][20] = array(__('Discussion'), 6, 'options-discussion.php');
! $submenu['options-general.php'][25] = array(__('Permalinks'), 6, 'options-permalink.php');
! $submenu['options-general.php'][30] = array(__('Miscellaneous'), 6, 'options-misc.php');
  
! $submenu['plugins.php'][5] = array(__('Plugins'), 8, 'plugins.php');
! $submenu['plugins.php'][10] = array(__('Plugin Editor'), 8, 'plugin-editor.php');
  
! $submenu['themes.php'][5] = array(__('Themes'), 8, 'themes.php');
! $submenu['themes.php'][10] = array(__('Theme Editor'), 8, 'theme-editor.php');
  
  do_action('admin_menu', '');

Index: admin-functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/admin-functions.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** admin-functions.php	4 Dec 2004 06:53:10 -0000	1.62
--- admin-functions.php	8 Dec 2004 22:32:48 -0000	1.63
***************
*** 640,644 ****
  
  function user_can_access_admin_page() {
- 	global $parent_file;
  	global $pagenow;
  	global $menu;
--- 640,643 ----
***************
*** 646,654 ****
  	global $user_level;
  
! 	if (! isset($parent_file)) {
! 		$parent = $pagenow;
! 	} else {
! 		$parent = $parent_file;
! 	}
  
  	foreach ($menu as $menu_array) {
--- 645,649 ----
  	global $user_level;
  
! 	$parent = get_admin_page_parent();
  
  	foreach ($menu as $menu_array) {

Index: user-edit.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/user-edit.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** user-edit.php	1 Dec 2004 16:12:53 -0000	1.6
--- user-edit.php	8 Dec 2004 22:32:49 -0000	1.7
***************
*** 84,89 ****
  ?>
  <ul id="adminmenu2">
  	<li><a href="users.php" class="current"><?php _e('Authors &amp; Users') ?></a></li>
-     <li><a href="profile.php"><?php _e('Your Profile') ?></a></li>
  </ul>
  
--- 84,89 ----
  ?>
  <ul id="adminmenu2">
+ 	<li><a href="profile.php"><?php _e('Your Profile') ?></a></li>
  	<li><a href="users.php" class="current"><?php _e('Authors &amp; Users') ?></a></li>
  </ul>