my turn to break things... harharhar

- checking in permission settings and permission masks - permission presets and documentation not finished yet - added backtrace function to determine file/line for sql errors - fixed marlist for orphan attachments/groups/logs/users - able to change anonymous user settings/permissions now - re-arranged admin permissions a bit (added some and removed some) - setting forum permissions after creating/editing forum now selects every default group (copy permisson/dropdown to be added for adding forums) - finished user permissions in users acp note: the layout for permissions might change devs: please empty the user_permissions in phpbb_users. Also, first change your auth_options table, remove all cache files and then re-set admin permissions. After having set the admin permissions you can update your modules table (else you will not see the permission tabs) - or empty the auth setting within the modules table to be able to see the permission modules (they rely on newly added permission options) git-svn-id: file:///svn/phpbb/trunk@5553 89ea8834-ac86-4346-8a33-228a782c2dd0
2025-07-30 21:40:43 +02:00 · 2006-02-12 19:21:00 +00:00
parent 3f323153b5
commit 81f78690db
46 changed files with 3237 additions and 210 deletions
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -112,6 +112,10 @@ $lang = array_merge($lang, array(
 	'ACP_PERMISSION_MASKS'		=> 'Permission Masks',
 	'ACP_PERMISSION_SETTINGS'	=> 'Permission Settings',
 	'ACP_PHP_INFO'				=> 'PHP Information',
+	'ACP_PRESET_ADMIN'			=> 'Admin Permission Presets',
+	'ACP_PRESET_FORUM'			=> 'Forum Permission Presets',
+	'ACP_PRESET_MOD'			=> 'Mod Permission Presets',
+	'ACP_PRESET_USER'			=> 'User Permission Presets',
 	'ACP_PRUNE_FORUMS'			=> 'Prune Forums',
 	'ACP_PRUNE_USERS'			=> 'Prune Users',
 	'ACP_PRUNING'				=> 'Pruning',
@@ -212,6 +216,7 @@ $lang = array_merge($lang, array(
 	'REORDER'				=> 'Reorder',
 	'RETURN_TO'				=> 'Return to ...',

+	'SELECT_ANONYMOUS'		=> 'Select Anonymous User',
 	'SELECT_OPTION'			=> 'Select option',

 	'UCP'					=> 'User Control Panel',
@@ -421,6 +426,9 @@ $lang = array_merge($lang, array(
 	'LOG_MODULE_ADD'		=> '<b>Module added</b><br />&#187; %s',
 	'LOG_MODULE_EDIT'		=> '<b>Module edited</b><br />&#187; %s',

+	'LOG_PRESET_ADD'		=> '<b>Preset added</b><br />&#187; %s',
+	'LOG_PRESET_EDIT'		=> '<b>Preset edited</b><br />&#187; %s',
+
 	'LOG_PROFILE_FIELD_ACTIVATE'	=> '<b>Profile field activated</b><br />&#187; %s',
 	'LOG_PROFILE_FIELD_CREATE'		=> '<b>Profile field added</b><br />&#187; %s',
 	'LOG_PROFILE_FIELD_DEACTIVATE'	=> '<b>Profile field deactivated</b><br />&#187; %s',
--- a/phpBB/language/en/acp/permissions.php
+++ b/phpBB/language/en/acp/permissions.php
@@ -0,0 +1,127 @@
+<?php
+/** 
+*
+* acp_permissions [English]
+*
+* @package language
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE 
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+
+$lang = array_merge($lang, array(
+	'ACL_NO'				=> 'No',
+	'ACL_SET'				=> 'Setting Permissions',
+	'ACL_SET_EXPLAIN'		=> 'Permissions are based on a simple YES/NO system. Setting an option to NO for a user or usergroup overrides any other value assigned to it. If you do not wish to assign a value for an option for this user or group select UNSET. If values are assigned for this option elsewhere they will be used in preference, else NO is assumed. All objects marked (with the checkbox in front of them) will inherit the permission set you defined.',
+	'ACL_SETTING'			=> 'Setting',
+
+	'ACL_TYPE_A_'			=> 'Administrative Permissions',
+	'ACL_TYPE_F_'			=> 'Forum Permissions',
+	'ACL_TYPE_M_'			=> 'Moderative Permissions',
+	'ACL_TYPE_U_'			=> 'User Permissions',
+
+	'ACL_TYPE_GLOBAL_A_'	=> 'Administrative Permissions',
+	'ACL_TYPE_GLOBAL_U_'	=> 'User Permissions',
+	'ACL_TYPE_GLOBAL_M_'	=> 'Global Moderator Permissions',
+	'ACL_TYPE_LOCAL_M_'		=> 'Forum Moderator Permissions',
+	'ACL_TYPE_LOCAL_F_'		=> 'Forum Permissions',
+	
+	'ACL_UNSET'				=> 'Unset',
+	'ACL_VIEW'				=> 'Viewing Permissions',
+	'ACL_VIEW_EXPLAIN'		=> 'Here you can see the effective permissions the user/group is having. A red square indicates that the user/group does not have the permission, a green square indicates that the user/group does have the permission.',
+	'ACL_YES'				=> 'Yes',
+
+	'ACP_ADMINISTRATORS_EXPLAIN'				=> 'Here you can assign administrator rights to users or groups. All users with admin permissions can view the administration panel.',
+	'ACP_FORUM_MODERATORS_EXPLAIN'				=> 'Here you can assign users and groups as forum moderators. To assign users access to forums, to define global moderative rights or administrators please use the appropriate page.',
+	'ACP_FORUM_PERMISSIONS_EXPLAIN'				=> 'Here you can alter which users and groups can access which forums. To assign moderators or define administrators please use the appropriate page.',
+	'ACP_GLOBAL_MODERATORS_EXPLAIN'				=> 'Here you can assign global moderator rights to users or groups. These moderators are like ordinary moderators except they have access to every forum on your board.',
+	'ACP_GROUPS_FORUM_PERMISSIONS_EXPLAIN'		=> 'Here you can assign forum permissions to groups.',
+	'ACP_GROUPS_PERMISSIONS_EXPLAIN'			=> 'Here you can assign global permissions to groups - user permissions, global moderator permissions and admin permissions. User permissions include capabilities such as the use of avatars, sending private messages, etc. Global moderator permissions are blabla, administrative permissions blabla. Individual users permissions should only be changed in rare occassions, the preferred method is putting users in groups and assigning the groups permissions.',
+	'ACP_PRESET_ADMIN_EXPLAIN'					=> 'Here you are able to manage the presets for administrative permissions. Presets are effective permissions, if you change a preset the items having this preset assigned will change it\'s permissions too.',
+	'ACP_PRESET_FORUM_EXPLAIN'					=> 'Here you are able to manage the presets for forum permissions. Presets are effective permissions, if you change a preset the items having this preset assigned will change it\'s permissions too.',
+	'ACP_PRESET_MOD_EXPLAIN'					=> 'Here you are able to manage the presets for moderative permissions. Presets are effective permissions, if you change a preset the items having this preset assigned will change it\'s permissions too.',
+	'ACP_PRESET_USER_EXPLAIN'					=> 'Here you are able to manage the presets for user permissions. Presets are effective permissions, if you change a preset the items having this preset assigned will change it\'s permissions too.',
+	'ACP_USERS_FORUM_PERMISSIONS_EXPLAIN'		=> 'Here you can assign forum permissions to users.',
+	'ACP_USERS_PERMISSIONS_EXPLAIN'				=> 'Here you can assign global permissions to users - user permissions, global moderator permissions and admin permissions. User permissions include capabilities such as the use of avatars, sending private messages, etc. Global moderator permissions are blabla, administrative permissions blabla. To alter these settings for large numbers of users the Group permissions system is the prefered method. Users permissions should only be changed in rare occassions, the preferred method is putting users in groups and assigning the groups permissions.',
+	'ACP_VIEW_ADMIN_PERMISSIONS_EXPLAIN'		=> 'Here you can view the effective administrative permissions assigned to the selected users/groups',
+	'ACP_VIEW_GLOBAL_MOD_PERMISSIONS_EXPLAIN'	=> 'Here you can view the global moderative permissions assigned to the selected users/groups',
+	'ACP_VIEW_FORUM_PERMISSIONS_EXPLAIN'		=> 'Here you can view the forum permissions assigned to the selected users/groups and forums',
+	'ACP_VIEW_FORUM_MOD_PERMISSIONS_EXPLAIN'	=> 'Here you can view the forum moderator permissions assigned to the selected users/groups and forums',
+	'ACP_VIEW_USER_PERMISSIONS_EXPLAIN'			=> 'Here you can view the effective user permissions assigned to the selected users/groups',
+
+	'ADD_GROUPS'				=> 'Add Groups',
+	'ADD_USERS'					=> 'Add Users',
+	'ALL_NO'					=> 'All No',
+	'ALL_UNSET'					=> 'All Unset',
+	'ALL_YES'					=> 'All Yes',
+	'APPLY_ALL_PERMISSIONS'		=> 'Apply all Permissions',
+	'APPLY_PERMISSIONS'			=> 'Apply Permissions',
+	'APPLY_PERMISSIONS_EXPLAIN'	=> 'The Permissions and Preset defined for this item will only be applied to this item and all checked items.',
+	'AUTH_UPDATED'				=> 'Permissions have been updated',
+
+	'CREATE_PRESET'				=> 'Create Preset',
+	'CREATE_PRESET_FROM'		=> 'Use settings from...',
+	
+	'EDIT_PRESET'				=> 'Edit Preset',
+	'EVERY_USER_GROUP'			=> 'Every user/group',
+
+	'GROUP_BINDING'				=> 'Group Binding',
+	'GROUP_BINDING_EXPLAIN'		=> 'If a group is selected here the preset only shows up for the selected group. This is helpful if you set options only meant for administrators for example.',
+
+	'LOOK_UP_FORUMS_EXPLAIN'	=> 'You are able to select more than one forum',
+	'LOOK_UP_GROUP'				=> 'Look up Usergroup',
+	'LOOK_UP_USER'				=> 'Look up User',
+
+	'MANAGE_GROUPS'		=> 'Manage Groups',
+	'MANAGE_USERS'		=> 'Manage Users',
+
+	'NO_AUTH_SETTING_FOUND'		=> 'Permission settings not defined.',
+	'NO_PRESET_NAME_SPECIFIED'	=> 'Please give the preset a name.',
+	'NO_PRESET_SELECTED'		=> 'Preset could not be found.',
+
+	'ONLY_FORUM_DEFINED'	=> 'You only defined forums in your selection. Please also select at least one user or one group.',
+
+	'PERM_PRESET_APPLIED_TO_ALL'	=> 'Permissions and Preset will also be applied to all checked objects',
+	'PRESET'						=> 'Preset',
+	'PRESET_ADD_SUCCESS'			=> 'Preset successfully added.',
+	'PRESET_DETAILS'				=> 'Preset Details',
+	'PRESET_EDIT_SUCCESS'			=> 'Preset successfully edited.',
+	'PRESET_NAME'					=> 'Preset Name',
+	'PRESET_NAME_ALREADY_EXIST'		=> 'A preset named <strong>%s</strong> already exist for the specified settings.',
+
+	'SELECTED_FORUM_NOT_EXIST'		=> 'The selected forum(s) do not exist',
+	'SELECTED_GROUP_NOT_EXIST'		=> 'The selected group(s) do not exist',
+	'SELECTED_USER_NOT_EXIST'		=> 'The selected user(s) do not exist',
+	'SELECT_TYPE'					=> 'Select type',
+	'SET_PERMISSIONS'				=> 'Set permissions',
+	'SET_USERS_PERMISSIONS'			=> 'Set users permissions',
+	'SET_USERS_FORUM_PERMISSIONS'	=> 'Set users forum permissions',
+
+	'USER_IS_MEMBER_OF_DEFAULT'		=> 'is a member of the following default groups',
+	'USER_IS_MEMBER_OF_CUSTOM'		=> 'is a member of the following custom groups',
+
+	'VIEW_PERMISSIONS'		=> 'View permissions',
+
+	'WRONG_PERMISSION_TYPE'	=> 'Wrong permission type selected',
+));
+
+?>
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -0,0 +1,222 @@
+<?php
+/** 
+*
+* acp_permissions (phpBB Permission Set) [English]
+*
+* @package language
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE 
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+
+/*
+	MODDERS PLEASE NOTE
+	
+	Please add your permission settings this way:
+
+	// Adding new category
+	$lang['permission_cats']['bugs'] = 'Bugs';
+
+	// Adding new permission set
+	$lang['permission_sets']['bug_'] = 'Bug Permissions';
+
+	// Adding the permissions
+	$lang = array_merge($lang, array(
+		'acl_bug_view'		=> array('lang' => 'Can view bug reports', 'cat' => 'bugs'),
+		'acl_bug_post'		=> array('lang' => 'Can post bugs', 'cat' => 'post'), // Using a phpBB category here
+	));
+
+	TODO:
+	You are able to put your permission sets into a seperate file too by
+	prefixing it with permissions_ and putting it into the acp language folder.
+*/
+
+// Define categories and permission types
+$lang = array_merge($lang, array(
+	'permission_cat'	=> array(
+		'actions'		=> 'Actions',
+		'forums'		=> 'Forums',
+		'post'			=> 'Post',
+		'posting'		=> 'Posting',
+		'polls'			=> 'Polls',
+		'content'		=> 'Content',
+		'pm'			=> 'Private Messages',
+		'misc'			=> 'Misc',
+		'profile'		=> 'Profile',
+		'permissions'	=> 'Permissions',
+		'settings'		=> 'Settings',
+		'user_group'	=> 'Users &amp; Groups',
+	),
+
+	'permission_type'	=> array(
+		'u_'			=> 'User Permissions',
+		'a_'			=> 'Admin Permissions',
+		'm_'			=> 'Moderator Permissions',
+		'f_'			=> 'Forum Permissions',
+	),
+));
+
+// User Permissions
+$lang = array_merge($lang, array(
+	'acl_u_viewprofile'	=> array('lang' => 'Can view profiles', 'cat' => 'profile'),
+	'acl_u_chgname'		=> array('lang' => 'Can change username', 'cat' => 'profile'),
+	'acl_u_chgpasswd'	=> array('lang' => 'Can change password', 'cat' => 'profile'),
+	'acl_u_chgemail'	=> array('lang' => 'Can change email address', 'cat' => 'profile'),
+	'acl_u_chgavatar'	=> array('lang' => 'Can change avatar', 'cat' => 'profile'),
+	'acl_u_chggrp'		=> array('lang' => 'Can change default usergroup', 'cat' => 'profile'),
+
+	'acl_u_attach'		=> array('lang' => 'Can attach files', 'cat' => 'post'),
+	'acl_u_download'	=> array('lang' => 'Can download files', 'cat' => 'post'),
+	'acl_u_savedrafts'	=> array('lang' => 'Can save drafts', 'cat' => 'post'),
+	'acl_u_chgcensors'	=> array('lang' => 'Can disable word censors', 'cat' => 'post'),
+	'acl_u_sig'			=> array('lang' => 'Can use signature', 'cat' => 'post'),
+
+	'acl_u_sendpm'		=> array('lang' => 'Can send private messages', 'cat' => 'pm'),
+	'acl_u_readpm'		=> array('lang' => 'Can read private messages', 'cat' => 'pm'),
+	'acl_u_pm_edit'		=> array('lang' => 'Can edit own private messages', 'cat' => 'pm'),
+	'acl_u_pm_delete'	=> array('lang' => 'Can remove private messages from own folder', 'cat' => 'pm'),
+	'acl_u_pm_report'	=> array('lang' => 'Can report private messages', 'cat' => 'pm'),
+	'acl_u_pm_forward'	=> array('lang' => 'Can forward private messages', 'cat' => 'pm'),
+	'acl_u_pm_emailpm'	=> array('lang' => 'Can email private messages', 'cat' => 'pm'),
+	'acl_u_pm_printpm'	=> array('lang' => 'Can print private messages', 'cat' => 'pm'),
+	'acl_u_pm_attach'	=> array('lang' => 'Can attach files in private messages', 'cat' => 'pm'),
+	'acl_u_pm_download'	=> array('lang' => 'Can download files in private messages', 'cat' => 'pm'),
+	'acl_u_pm_bbcode'	=> array('lang' => 'Can post BBCode in private messages', 'cat' => 'pm'),
+	'acl_u_pm_html'		=> array('lang' => 'Can post HTML in private messages', 'cat' => 'pm'),
+	'acl_u_pm_smilies'	=> array('lang' => 'Can post smilies in private messages', 'cat' => 'pm'),
+	'acl_u_pm_img'		=> array('lang' => 'Can post images in private messages', 'cat' => 'pm'),
+	'acl_u_pm_flash'	=> array('lang' => 'Can post Flash in private messages', 'cat' => 'pm'),
+
+	'acl_u_sendemail'	=> array('lang' => 'Can send emails', 'cat' => 'misc'),
+	'acl_u_sendim'		=> array('lang' => 'Can send instant messages', 'cat' => 'misc'),
+	'acl_u_ignoreflood'	=> array('lang' => 'Can ignore flood limit', 'cat' => 'misc'),
+	'acl_u_hideonline'	=> array('lang' => 'Can hide online status', 'cat' => 'misc'),
+	'acl_u_viewonline'	=> array('lang' => 'Can view all online', 'cat' => 'misc'),
+	'acl_u_search'		=> array('lang' => 'Can search board', 'cat' => 'misc'),
+));
+
+// Forum Permissions
+$lang = array_merge($lang, array(
+	'acl_f_list'		=> array('lang' => 'Can see forum', 'cat' => 'post'),
+	'acl_f_read'		=> array('lang' => 'Can read forum', 'cat' => 'post'),
+	'acl_f_post'		=> array('lang' => 'Can post in forum', 'cat' => 'post'),
+	'acl_f_announce'	=> array('lang' => 'Can post announcements', 'cat' => 'post'),
+	'acl_f_sticky'		=> array('lang' => 'Can post stickies', 'cat' => 'post'),
+	'acl_f_reply'		=> array('lang' => 'Can reply to posts', 'cat' => 'post'),
+	'acl_f_quote'		=> array('lang' => 'Can quote posts', 'cat' => 'post'),
+	'acl_f_icons'		=> array('lang' => 'Can use post icons', 'cat' => 'post'),
+
+	'acl_f_poll'		=> array('lang' => 'Can create polls', 'cat' => 'polls'),
+	'acl_f_vote'		=> array('lang' => 'Can vote in polls', 'cat' => 'polls'),
+	'acl_f_votechg'		=> array('lang' => 'Can change existing vote', 'cat' => 'polls'),
+
+	'acl_f_attach'		=> array('lang' => 'Can attach files', 'cat' => 'content'),
+	'acl_f_download'	=> array('lang' => 'Can download files', 'cat' => 'content'),
+	'acl_f_sigs'		=> array('lang' => 'Can use signatures', 'cat' => 'content'),
+	'acl_f_html'		=> array('lang' => 'Can post HTML', 'cat' => 'content'),
+	'acl_f_bbcode'		=> array('lang' => 'Can post BBCode', 'cat' => 'content'),
+	'acl_f_smilies'		=> array('lang' => 'Can post smilies', 'cat' => 'content'),
+	'acl_f_img'			=> array('lang' => 'Can post images', 'cat' => 'content'),
+	'acl_f_flash'		=> array('lang' => 'Can post Flash', 'cat' => 'content'),
+
+	'acl_f_edit'		=> array('lang' => 'Can edit own posts', 'cat' => 'actions'),
+	'acl_f_delete'		=> array('lang' => 'Can delete own posts', 'cat' => 'actions'),
+	'acl_f_user_lock'	=> array('lang' => 'Can lock own topics', 'cat' => 'actions'),
+	'acl_f_bump'		=> array('lang' => 'Can bump topics', 'cat' => 'actions'),
+	'acl_f_rate'		=> array('lang' => 'Can rate posts', 'cat' => 'actions'),
+	'acl_f_report'		=> array('lang' => 'Can report posts', 'cat' => 'actions'),
+	'acl_f_subscribe'	=> array('lang' => 'Can subscribe forum', 'cat' => 'actions'),
+	'acl_f_print'		=> array('lang' => 'Can print topics', 'cat' => 'actions'),
+	'acl_f_email'		=> array('lang' => 'Can email topics', 'cat' => 'actions'),
+
+	'acl_f_search'		=> array('lang' => 'Can search the forum', 'cat' => 'misc'),
+	'acl_f_ignoreflood' => array('lang' => 'Can ignore flood limit', 'cat' => 'misc'),
+	'acl_f_postcount'	=> array('lang' => 'Increment post counter', 'cat' => 'misc'),
+	'acl_f_moderate'	=> array('lang' => 'Posts are moderated', 'cat' => 'misc'),
+));
+
+// Moderator Permissions
+$lang = array_merge($lang, array(
+	'acl_m_edit'	=> array('lang' => 'Can edit posts', 'cat' => 'actions'),
+	'acl_m_delete'	=> array('lang' => 'Can delete posts', 'cat' => 'actions'),
+	'acl_m_move'	=> array('lang' => 'Can move topics', 'cat' => 'actions'),
+	'acl_m_lock'	=> array('lang' => 'Can lock topics', 'cat' => 'actions'),
+	'acl_m_split'	=> array('lang' => 'Can split topics', 'cat' => 'actions'),
+	'acl_m_merge'	=> array('lang' => 'Can merge topics', 'cat' => 'actions'),
+	'acl_m_approve' => array('lang' => 'Can approve posts', 'cat' => 'actions'),
+	'acl_m_unrate'	=> array('lang' => 'Can un-rate posts', 'cat' => 'actions'),
+
+	'acl_m_auth'	=> array('lang' => 'Can set permissions', 'cat' => 'misc'),
+	'acl_m_ip'		=> array('lang' => 'Can view IP\'s', 'cat' => 'misc'),
+	'acl_m_info'	=> array('lang' => 'Can alter forum info', 'cat' => 'misc'),
+));
+
+// Admin Permissions
+$lang = array_merge($lang, array(
+	'acl_a_defaults'	=> array('lang' => 'Can alter board defaults', 'cat' => 'settings'),
+	'acl_a_board'		=> array('lang' => 'Can alter board settings', 'cat' => 'settings'),
+	'acl_a_cookies'		=> array('lang' => 'Can alter cookie settings', 'cat' => 'settings'),
+	'acl_a_server'		=> array('lang' => 'Can alter server/email/load/auth settings', 'cat' => 'settings'),
+	'acl_a_jabber'		=> array('lang' => 'Can alter jabber settings', 'cat' => 'settings'),
+	'acl_a_phpinfo'		=> array('lang' => 'Can view php settings', 'cat' => 'settings'),
+
+	'acl_a_forum'		=> array('lang' => 'Can manage forums', 'cat' => 'forums'),
+	'acl_a_forumadd'	=> array('lang' => 'Can add new forums', 'cat' => 'forums'),
+	'acl_a_forumdel'	=> array('lang' => 'Can delete forums', 'cat' => 'forums'),
+	'acl_a_prune'		=> array('lang' => 'Can prune forums', 'cat' => 'forums'),
+
+	'acl_a_icons'		=> array('lang' => 'Can alter topic icons and smilies', 'cat' => 'posting'),
+	'acl_a_words'		=> array('lang' => 'Can alter word censors', 'cat' => 'posting'),
+	'acl_a_bbcode'		=> array('lang' => 'Can define BBCode tags', 'cat' => 'posting'),
+	'acl_a_attach'		=> array('lang' => 'Can alter attachment related settings', 'cat' => 'posting'),
+
+	'acl_a_user'		=> array('lang' => 'Can manage users', 'cat' => 'user_group'),
+	'acl_a_userdel'		=> array('lang' => 'Can delete/prune users', 'cat' => 'user_group'),
+	'acl_a_group'		=> array('lang' => 'Can manage groups', 'cat' => 'user_group'),
+	'acl_a_groupadd'	=> array('lang' => 'Can add new groups', 'cat' => 'user_group'),
+	'acl_a_groupdel'	=> array('lang' => 'Can delete groups', 'cat' => 'user_group'),
+	'acl_a_ranks'		=> array('lang' => 'Can manage ranks', 'cat' => 'user_group'),
+	'acl_a_profile'		=> array('lang' => 'Can manage custom profile fields', 'cat' => 'user_group'),
+	'acl_a_names'		=> array('lang' => 'Can manage disallowed names', 'cat' => 'user_group'),
+	'acl_a_ban'			=> array('lang' => 'Can manage bans', 'cat' => 'user_group'),
+
+	'acl_a_viewauth'	=> array('lang' => 'Can view permission masks', 'cat' => 'permissions'),
+	'acl_a_fauth'		=> array('lang' => 'Can alter forum permissions', 'cat' => 'permissions'),
+	'acl_a_mauth'		=> array('lang' => 'Can alter moderator permissions', 'cat' => 'permissions'),
+	'acl_a_aauth'		=> array('lang' => 'Can alter admin permissions', 'cat' => 'permissions'),
+	'acl_a_uauth'		=> array('lang' => 'Can alter user permissions', 'cat' => 'permissions'),
+	'acl_a_authgroups'	=> array('lang' => 'Can alter permissions for groups', 'cat' => 'permissions'),
+	'acl_a_authusers'	=> array('lang' => 'Can alter permissions for users', 'cat' => 'permissions'),
+
+	'acl_a_styles'		=> array('lang' => 'Can manage styles', 'cat' => 'misc'),
+	'acl_a_viewlogs'	=> array('lang' => 'Can view logs', 'cat' => 'misc'),
+	'acl_a_clearlogs'	=> array('lang' => 'Can clear logs', 'cat' => 'misc'),
+	'acl_a_modules'		=> array('lang' => 'Can manage modules', 'cat' => 'misc'),
+	'acl_a_language'	=> array('lang' => 'Can manage language packs', 'cat' => 'misc'),
+	'acl_a_email'		=> array('lang' => 'Can send mass email', 'cat' => 'misc'),
+	'acl_a_bots'		=> array('lang' => 'Can manage bots', 'cat' => 'misc'),
+#	'acl_a_backup'		=> array('lang' => 'Can backup database', 'cat' => 'misc'),
+#	'acl_a_restore'		=> array('lang' => 'Can restore database', 'cat' => 'misc'),
+#	'acl_a_search'		=> array('lang' => 'Can re-index search tables', 'cat' => 'misc'),
+));
+
+?>
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -144,6 +144,7 @@ $lang = array_merge($lang, array(
 	'GO'						=> 'Go',
 	'GOTO_PAGE'					=> 'Goto page',
 	'GROUP'						=> 'Group',
+	'GROUPS'					=> 'Groups',
 	'GROUP_ERR_DESC_LONG'		=> 'Group description too long.',
 	'GROUP_ERR_TYPE'			=> 'Inappropriate group type specified.',
 	'GROUP_ERR_USERNAME'		=> 'No group name specified.',