diff options
| author | Graham Eames <grahamje@users.sourceforge.net> | 2006-05-20 15:12:32 +0000 |
|---|---|---|
| committer | Graham Eames <grahamje@users.sourceforge.net> | 2006-05-20 15:12:32 +0000 |
| commit | 91282dde1b4363c0f2cfd37e3dd62292af449af1 (patch) | |
| tree | 7efe214dae7ae5dce0cfaabbec174071d1e37525 /phpBB | |
| parent | badcfdd1ed4a8a560964c76012cec71070f9dd49 (diff) | |
| download | forums-91282dde1b4363c0f2cfd37e3dd62292af449af1.tar forums-91282dde1b4363c0f2cfd37e3dd62292af449af1.tar.gz forums-91282dde1b4363c0f2cfd37e3dd62292af449af1.tar.bz2 forums-91282dde1b4363c0f2cfd37e3dd62292af449af1.tar.xz forums-91282dde1b4363c0f2cfd37e3dd62292af449af1.zip | |
A few top level changes to the module structure.
More will follow since the quick access section is currently broken
git-svn-id: file:///svn/phpbb/trunk@5948 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/info/acp_permissions.php | 8 | ||||
| -rwxr-xr-x | phpBB/install/install_install.php | 21 | ||||
| -rw-r--r-- | phpBB/language/en/acp/common.php | 1 |
3 files changed, 15 insertions, 15 deletions
diff --git a/phpBB/includes/acp/info/acp_permissions.php b/phpBB/includes/acp/info/acp_permissions.php index c14c125980..37bce5b62d 100644 --- a/phpBB/includes/acp/info/acp_permissions.php +++ b/phpBB/includes/acp/info/acp_permissions.php @@ -23,12 +23,12 @@ class acp_permissions_info 'intro' => array('title' => 'ACP_PERMISSIONS', 'auth' => 'acl_a_authusers || acl_a_authgroups || acl_a_viewauth', 'cat' => array('ACP_CAT_PERMISSIONS')), 'trace' => array('title' => 'ACP_PERMISSION_TRACE', 'auth' => 'acl_a_viewauth', 'display' => false, 'cat' => array('ACP_PERMISSION_MASKS')), - 'setting_user_global' => array('title' => 'ACP_USERS_PERMISSIONS', 'auth' => 'acl_a_authusers && (acl_a_aauth || acl_a_mauth || acl_a_uauth)', 'cat' => array('ACP_BASIC_PERMISSIONS', 'ACP_CAT_USERS')), + 'setting_user_global' => array('title' => 'ACP_USERS_PERMISSIONS', 'auth' => 'acl_a_authusers && (acl_a_aauth || acl_a_mauth || acl_a_uauth)', 'cat' => array('ACP_GLOBAL_PERMISSIONS', 'ACP_CAT_USERS')), 'setting_user_local' => array('title' => 'ACP_USERS_FORUM_PERMISSIONS', 'auth' => 'acl_a_authusers && (acl_a_mauth || acl_a_fauth)', 'cat' => array('ACP_FORUM_BASED_PERMISSIONS', 'ACP_CAT_USERS')), - 'setting_group_global' => array('title' => 'ACP_GROUPS_PERMISSIONS', 'auth' => 'acl_a_authgroups && (acl_a_aauth || acl_a_mauth || acl_a_uauth)', 'cat' => array('ACP_BASIC_PERMISSIONS', 'ACP_GROUPS')), + 'setting_group_global' => array('title' => 'ACP_GROUPS_PERMISSIONS', 'auth' => 'acl_a_authgroups && (acl_a_aauth || acl_a_mauth || acl_a_uauth)', 'cat' => array('ACP_GLOBAL_PERMISSIONS', 'ACP_GROUPS')), 'setting_group_local' => array('title' => 'ACP_GROUPS_FORUM_PERMISSIONS', 'auth' => 'acl_a_authgroups && (acl_a_mauth || acl_a_fauth)', 'cat' => array('ACP_FORUM_BASED_PERMISSIONS', 'ACP_GROUPS')), - 'setting_admin_global' => array('title' => 'ACP_ADMINISTRATORS', 'auth' => 'acl_a_aauth && (acl_a_authusers || acl_a_authgroups)', 'cat' => array('ACP_SPECIAL_PERMISSIONS')), - 'setting_mod_global' => array('title' => 'ACP_GLOBAL_MODERATORS', 'auth' => 'acl_a_mauth && (acl_a_authusers || acl_a_authgroups)', 'cat' => array('ACP_SPECIAL_PERMISSIONS')), + 'setting_admin_global' => array('title' => 'ACP_ADMINISTRATORS', 'auth' => 'acl_a_aauth && (acl_a_authusers || acl_a_authgroups)', 'cat' => array('ACP_GLOBAL_PERMISSIONS')), + 'setting_mod_global' => array('title' => 'ACP_GLOBAL_MODERATORS', 'auth' => 'acl_a_mauth && (acl_a_authusers || acl_a_authgroups)', 'cat' => array('ACP_GLOBAL_PERMISSIONS')), 'setting_mod_local' => array('title' => 'ACP_FORUM_MODERATORS', 'auth' => 'acl_a_mauth && (acl_a_authusers || acl_a_authgroups)', 'cat' => array('ACP_FORUM_BASED_PERMISSIONS')), 'setting_forum_local' => array('title' => 'ACP_FORUM_PERMISSIONS', 'auth' => 'acl_a_fauth && (acl_a_authusers || acl_a_authgroups)', 'cat' => array('ACP_FORUM_BASED_PERMISSIONS')), diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 355a1e0639..7bd12f7f60 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1623,15 +1623,10 @@ class install_install extends module var $module_categories = array( 'acp' => array( 'ACP_CAT_GENERAL' => array( + 'ACP_QUICK_ACCESS', 'ACP_BOARD_CONFIGURATION', - 'ACP_SERVER_CONFIGURATION', 'ACP_CLIENT_COMMUNICATION', - 'ACP_QUICK_ACCESS', - ), - 'ACP_CAT_USERGROUP' => array( - 'ACP_CAT_USERS', - 'ACP_GROUPS', - 'ACP_USER_SECURITY', + 'ACP_SERVER_CONFIGURATION', ), 'ACP_CAT_FORUMS' => array( 'ACP_CAT_FORUMS', @@ -1641,9 +1636,13 @@ class install_install extends module 'ACP_MESSAGES', 'ACP_ATTACHMENTS', ), + 'ACP_CAT_USERGROUP' => array( + 'ACP_CAT_USERS', + 'ACP_GROUPS', + 'ACP_USER_SECURITY', + ), 'ACP_CAT_PERMISSIONS' => array( - 'ACP_BASIC_PERMISSIONS', - 'ACP_SPECIAL_PERMISSIONS', + 'ACP_GLOBAL_PERMISSIONS', 'ACP_FORUM_BASED_PERMISSIONS', 'ACP_PERMISSION_ROLES', 'ACP_PERMISSION_MASKS', @@ -1665,10 +1664,10 @@ class install_install extends module ), 'mcp' => array( 'MCP_MAIN' => null, - 'MCP_NOTES' => null, 'MCP_QUEUE' => null, - 'MCP_WARN' => null, 'MCP_REPORTS' => null, + 'MCP_NOTES' => null, + 'MCP_WARN' => null, 'MCP_LOGS' => null, 'MCP_BAN' => null, ), diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 1fbe814872..16fa8c07b1 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -86,6 +86,7 @@ $lang = array_merge($lang, array( 'ACP_GENERAL_CONFIGURATION' => 'General Configuration', 'ACP_GENERAL_TASKS' => 'General Tasks', 'ACP_GLOBAL_MODERATORS' => 'Global Moderators', + 'ACP_GLOBAL_PERMISSIONS' => 'Global Permissions', 'ACP_GROUPS' => 'Groups', 'ACP_GROUPS_FORUM_PERMISSIONS' => 'Groups Forum Permissions', 'ACP_GROUPS_MANAGE' => 'Manage Groups', |