--- user.module 2005-06-21 21:00:04.000000000 +0100 +++ newuser.module 2005-06-22 17:26:03.017301112 +0100 @@ -411,7 +411,7 @@ * Implementation of hook_perm(). */ function user_perm() { - return array('administer users', 'access user profiles'); + return array('administer users', 'administer permissions', 'access user profiles'); } /** @@ -641,6 +641,7 @@ $items = array(); $admin_access = user_access('administer users'); + $permissions_access = user_access('administer permissions'); // users should always be allowed to see their own user page $view_access = (user_access('access user profiles') || ($user->uid == arg(1))); @@ -675,32 +676,32 @@ 'callback' => 'user_configure', 'access' => $admin_access, 'type' => MENU_LOCAL_TASK); $items[] = array('path' => 'admin/access', 'title' => t('access control'), - 'callback' => 'user_admin_perm', 'access' => $admin_access); + 'callback' => 'user_admin_perm', 'access' => $permissions_access); $items[] = array('path' => 'admin/access/permissions', 'title' => t('permissions'), - 'callback' => 'user_admin_perm', 'access' => $admin_access, + 'callback' => 'user_admin_perm', 'access' => $permissions_access, 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); $items[] = array('path' => 'admin/access/roles', 'title' => t('roles'), - 'callback' => 'user_admin_role', 'access' => $admin_access, + 'callback' => 'user_admin_role', 'access' => $permissions_access, 'type' => MENU_LOCAL_TASK); $items[] = array('path' => 'admin/access/roles/edit', 'title' => t('edit role'), - 'callback' => 'user_admin_role', 'access' => $admin_access, + 'callback' => 'user_admin_role', 'access' => $permissions_access, 'type' => MENU_CALLBACK); - $items[] = array('path' => 'admin/access/rules', 'title' => t('access rules'), - 'callback' => 'user_admin_access', 'access' => $admin_access, + $items[] = array('path' => 'admin/access/rules', 'title' => t('account rules'), + 'callback' => 'user_admin_access', 'access' => $permissions_access, 'type' => MENU_LOCAL_TASK, 'weight' => 10); $items[] = array('path' => 'admin/access/rules/list', 'title' => t('list'), - 'access' => $admin_access, 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); + 'access' => $permissions_access, 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); $items[] = array('path' => 'admin/access/rules/add', 'title' => t('add rule'), - 'callback' => 'user_admin_access_add', 'access' => $admin_access, + 'callback' => 'user_admin_access_add', 'access' => $permissions_access, 'type' => MENU_LOCAL_TASK); $items[] = array('path' => 'admin/access/rules/check', 'title' => t('check rules'), - 'callback' => 'user_admin_access_check', 'access' => $admin_access, + 'callback' => 'user_admin_access_check', 'access' => $permissions_access, 'type' => MENU_LOCAL_TASK); $items[] = array('path' => 'admin/access/rules/edit', 'title' => t('edit rule'), - 'callback' => 'user_admin_access_edit', 'access' => $admin_access, + 'callback' => 'user_admin_access_edit', 'access' => $permissions_access, 'type' => MENU_CALLBACK); $items[] = array('path' => 'admin/access/rules/delete', 'title' => t('delete rule'), - 'callback' => 'user_admin_access_delete', 'access' => $admin_access, + 'callback' => 'user_admin_access_delete', 'access' => $permissions_access, 'type' => MENU_CALLBACK); if (module_exist('search')) {