Mostly changes to turn userdata into user->data, lang into user->lang + bitstring 2nd format + inheritance for permission admin and various other updates/fixes/changes ... note that user->lang & user->theme isn't final

git-svn-id: file:///svn/phpbb/trunk@2958 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/language/en/lang_admin.php

@@ -19,7 +19,7 @@
  *
  ***************************************************************************/
 
-$lang = array_merge($lang, array(
+$this->lang = array_merge($this->lang, array(
 	'Admin_title' => 'Administration Panel',
 	'No_admin' => 'You are not authorised to administer this board',
 	'No_frames' => 'Sorry, your browser does not support frames',
@@ -166,14 +166,13 @@ $lang = array_merge($lang, array(
 	'Restore_Error_filename' => 'The file you uploaded had an unsupported extension.',
 	'Compress_unsupported' => 'The version of PHP installed on this server does not support the type of compression used for your backup. Please use a compression method listed on the previous page.',
 	'Restore_Error_no_file' => 'No file was uploaded',
-	'Permissions_explain' => 'Here you can alter which users and groups can access which forums. Permissions can be set for individual operations such as; reading, posting, voting, etc via the <i>Advanced</i> form. This page only applies to forum permissions. To assign moderators or define administrators please use the appropriate page (see left hand side menu).',
-	'Permissions_extra_explain' => 'Permissions are based on a; PERMIT, ALLOW, DENY, PREVENT system. By default users and groups are set to DENY access to all operations, to do anything users or groups have to be granted ALLOW access. When conflicts exist, e.g. a user having ALLOW permissions to a function belongs to a group that is set to DENY such a function the user setting takes precidence, i.e. in this case the user would be ALLOWed access to this function. Similarly a user denied access to a function will be denied even if they belong to a group that grants them access. If a user belongs to two groups one of which grants an ALLOW while another is set to DENY the user will be denied access.',
-	'Permissions_extra2_explain' => 'There may be times when you want to deny (or allow) access to a group no matter what their individual user settings are, this is what PERMIT and PREVENT are for. By setting a user (or more likely a group) to one of these will PERMIT (ALLOW) or PREVENT (DENY) access to a function no matter what their user settings are. You may find this useful for things such as "banned" groups, etc. doing away with any need to check for individual user permissions.',
+	'ACL_explain' => 'Permissions are based on an ALLOW / INHERIT / DENY system with all options being denied by default. The precedent is DENY &gt; ALLOW &gt; INHERIT for any combination of user or group settings. The INHERIT setting causes permissions granted elsewhere for the option being used in place of a specific ALLOW / DENY setting here.',
+	'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 (see left hand side menu).',
 	'Moderators' => 'Moderators',
-	'Moderators_explain' => 'Here you can assign users and groups as forum moderators. You can give users or groups individual access to certain moderator functions as you set fit via the <i>Advanced</i> form. Moderators have additional power in a given forum and by default can post and reply even when a forum or topic is locked.',
+	'Moderators_explain' => 'Here you can assign users and groups as forum moderators. To assign users access to forums, to define super moderators or administrators please use the appropriate page (see left hand side menu).',
 	'Super_Moderators' => 'Super Moderators',
-	'Super_Moderators_explain' => 'Here you can assign users and groups as super moderators. Super Moderators are like ordinary moderators accept they have access to every forum on your board. You can give users or groups individual access to certain moderator functions as you set fit via the <i>Advanced</i> form. As with moderators, super moderators have additional power in a given forum and by default can post and reply even when a forum or topic is locked.',
-	'Administrators_explain' => 'Here you can assign administrator rights to users or groups. All users with admin permissions can view the administration panel. However you can limit selected users or groups to only certain sections if you wish by clicking <i>Advanced</i>.',
+	'Super_Moderators_explain' => 'Here you can assign users and groups as super moderators. Super Moderators are like ordinary moderators accept they have access to every forum on your board. To assign users access to forums or define administrators please use the appropriate page (see left hand side menu).',
+	'Administrators_explain' => 'Here you can assign administrator rights to users or groups. All users with admin permissions can view the administration panel.',
 	'Manage_users' => 'Manage Users',
 	'Add_users' => 'Add Users',
 	'Manage_groups' => 'Manage Groups',
@@ -190,12 +189,16 @@ $lang = array_merge($lang, array(
 	'Applies_to_Group' => 'Applies to Group ...',
 	'User_can' => 'User can ... ',
 	'Group_can' => 'Group can ... ',
-	'User_can_admin' => 'User can admin ... ',
-	'Group_can_admin' => 'Group can admin ... ',
+	'Option' => 'Option',
 	'Allow' => 'Allow',
-	'Permit' => 'Permit',
+	'Inherit' => 'Inherit',
 	'Deny' => 'Deny',
-	'Prevent' => 'Prevent',
+	'Basic' => 'Basic',
+	'All_Allow' => 'All Allow',
+	'All_Deny' => 'All Deny',
+	'All_Inherit' => 'All Inherit',
+	'Inheritance' => 'Inheritance',
+	'Inheritance_explain' => 'Select the subforums you want to inherit these permissions',
 	'acl_a_general' => 'General Settings',
 	'acl_a_user' => 'Users',
 	'acl_a_group' => 'Groups',