- removed group settings from roles

- added forum icon in front of forums in permissions acp
- added trace permissions in permission masks (thanks naderman for writing the first code and for the idea... :))
- some bugfixes
- PHP6 fix


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

phpBB/language/en/acp/common.php

@@ -123,6 +123,7 @@ $lang = array_merge($lang, array(
 	'ACP_PERMISSION_MASKS'		=> 'Permission Masks',
 	'ACP_PERMISSION_ROLES'		=> 'Permission Roles',
 	'ACP_PERMISSION_SETTINGS'	=> 'Permission Settings',
+	'ACP_PERMISSION_TRACE'		=> 'Permission Trace',
 	'ACP_PHP_INFO'				=> 'PHP Information',
 	'ACP_POST_SETTINGS'			=> 'Post Settings',
 	'ACP_PRUNE_FORUMS'			=> 'Prune Forums',

phpBB/language/en/acp/permissions.php

@@ -84,14 +84,12 @@ $lang = array_merge($lang, array(
 	'CREATE_ROLE_FROM'			=> 'Use settings from...',
 	'CUSTOM'					=> 'Custom...',
 
+	'DEFAULT'					=> 'Default',
 	'DELETE_ROLE'				=> 'Delete role',
 	'DELETE_ROLE_CONFIRM'		=> 'Are you sure you want to remove this role? Items having this role assigned will <strong>not</strong> loosing their permission settings.',
-	'DISPLAY_FOR_GROUP'			=> 'Display for group',
-	'DISPLAY_FOR_GROUP_EXPLAIN'	=> 'The role only shows up for the selected group(s). This is helpful if you set options only meant for some groups for example.',
 	'DISPLAY_ROLE_ITEMS'		=> 'View Items using this role',
 
 	'EDIT_ROLE'					=> 'Edit Role',
-	'EVERY_USER_GROUP'			=> 'Every user/group',
 
 	'GROUPS_NOT_ASSIGNED'		=> 'No group assigned to this role',
 
@@ -103,6 +101,7 @@ $lang = array_merge($lang, array(
 	'MANAGE_USERS'		=> 'Manage Users',
 
 	'NO_AUTH_SETTING_FOUND'		=> 'Permission settings not defined.',
+	'NO_ROLE_ASSIGNED'			=> 'No role assigned...',
 	'NO_ROLE_AVAILABLE'			=> 'No role available',
 	'NO_ROLE_NAME_SPECIFIED'	=> 'Please give the role a name.',
 	'NO_ROLE_SELECTED'			=> 'Role could not be found.',
@@ -111,20 +110,6 @@ $lang = array_merge($lang, array(
 
 	'PERMISSION_APPLIED_TO_ALL'		=> 'Permissions and Role will also be applied to all checked objects',
 	'PLUS_SUBFORUMS'				=> '+Subforums',
-	'PRE_ALL_CLOSED'				=> 'All closed groups',
-	'PRE_ALL_FREE'					=> 'All freely open groups',
-	'PRE_ALL_HIDDEN'				=> 'All hidden groups',
-	'PRE_ALL_OPEN'					=> 'All open groups',
-	'PRE_ALL_SPECIAL'				=> 'All special groups',
-	'PRE_NOT_CLOSED'				=> 'All groups excluding closed groups',
-	'PRE_NOT_FREE'					=> 'All groups excluding freely open groups',
-	'PRE_NOT_HIDDEN'				=> 'All groups excluding hidden groups',
-	'PRE_NOT_OPEN'					=> 'All groups excluding open groups',
-	'PRE_NOT_SPECIAL'				=> 'All groups excluding special groups',
-	'PRE_NOT_SPECIAL_GUEST'			=> 'All groups excluding special guest groups',
-	'PRE_NOT_SPECIAL_REGISTERED'	=> 'All groups excluding special registered groups',
-	'PRE_ONLY_SPECIAL_GUEST'		=> 'Only special guest groups',
-	'PRE_ONLY_SPECIAL_REGISTERED'	=> 'Only special registered groups',
 
 	'REMOVE_ROLE'					=> 'Remove Role',
 	'ROLE'							=> 'Role',
@@ -150,6 +135,25 @@ $lang = array_merge($lang, array(
 	'SET_USERS_PERMISSIONS'			=> 'Set users permissions',
 	'SET_USERS_FORUM_PERMISSIONS'	=> 'Set users forum permissions',
 
+	'TRACE_DEFAULT'					=> 'By default every permission is UNSET. So the permission can be overwritten by other settings.',
+	'TRACE_GROUP_NO_TOTAL_NO'		=> 'This group\'s permission is set to NO like the total result so the old result is kept.',
+	'TRACE_GROUP_NO_TOTAL_UNSET'	=> 'This group\'s permission is set to NO which becomes the new total value because it wasn\'t set yet.',
+	'TRACE_GROUP_NO_TOTAL_YES'		=> 'This group\'s permission is set to NO which overwrites the total YES to a NO for this user.',
+	'TRACE_GROUP_UNSET'				=> 'The permission is UNSET for this group so the old total value is kept.',
+	'TRACE_GROUP_YES_TOTAL_NO'		=> 'This group\'s permission is set to YES but the total NO cannot be overwritten.',
+	'TRACE_GROUP_YES_TOTAL_UNSET'	=> 'This group\'s permission is set to YES which becomes the new total value because it wasn\'t set yet.',
+	'TRACE_GROUP_YES_TOTAL_YES'		=> 'This group\'s permission is set to YES, and the total permission is already set to YES, so the total result is kept.',
+	'TRACE_PERMISSION'				=> 'Trace permission - %s',
+	'TRACE_SETTING'					=> 'Trace setting',
+	'TRACE_USER_KEPT'				=> 'The user permission is UNSET so the old total value is kept.',
+	'TRACE_USER_NO_TOTAL_NO'		=> 'The user permission is set to no and the total value is set to no, so nothing is changed.',
+	'TRACE_USER_NO_TOTAL_UNSET'		=> 'The user permission is set to no which becomes the total value because it wasn\'t set yet.',
+	'TRACE_USER_NO_TOTAL_YES'		=> 'The user permission is set to no and overwrites the previous yes.',
+	'TRACE_USER_UNSET_TOTAL_UNSET'	=> 'The user permission is UNSET and the total value wasn\'t set yet so it defaults to NO.',
+	'TRACE_USER_YES_TOTAL_NO'		=> 'The user permission is set to yes but the total no cannot be overwritten.',
+	'TRACE_USER_YES_TOTAL_UNSET'	=> 'The user permission is set to YES which becomes the total value because it wasn\'t set yet.',
+	'TRACE_USER_YES_TOTAL_YES'		=> 'The user permission is set to YES and the total value is set to YES, so nothing is changed.',
+
 	'USERS_NOT_ASSIGNED'			=> 'No user assigned to this role',
 	'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',

phpBB/language/en/common.php

@@ -147,6 +147,7 @@ $lang = array_merge($lang, array(
 	'FORUMS'				=> 'Forums',
 	'FORUMS_MARKED'			=> 'All forums have been marked read',
 	'FORUM_INDEX'			=> 'Board Index',
+	'FORUM_LINK'			=> 'Forum Link',
 	'FORUM_LOCATION'		=> 'Forum Location',
 	'FORUM_LOCKED'			=> 'Forum Locked',
 	'FORUM_RULES'			=> 'Forum Rules',
@@ -370,6 +371,7 @@ $lang = array_merge($lang, array(
 	'REPORTING_POST'			=> 'Reporting post',
 	'RESEND_ACTIVATION'			=> 'Resend activation email',
 	'RESET'						=> 'Reset',
+	'RESTORE_PERMISSIONS'		=> 'Restore Permissions',
 	'RETURN_INDEX'				=> 'Click %sHere%s to return to the index',
 	'RETURN_FORUM'				=> 'Click %sHere%s to return to the forum',
 	'RETURN_PAGE'				=> 'Click %sHere%s to return to the previous page',
@@ -397,13 +399,14 @@ $lang = array_merge($lang, array(
 	'SEARCH_ADV_EXPLAIN'		=> 'View the advanced search options',
 	'SEARCH_KEYWORDS'			=> 'Enter search keywords',
 	'SEARCHING_FORUMS'			=> 'Searching forums',
-	'SELECT_DESTINATION_FORUM'	=> 'Please select a forum for destination',
 	'SEARCH_ACTIVE_TOPICS'		=> 'View active topics',
 	'SEARCH_FOR'				=> 'Search for',
 	'SEARCH_NEW'				=> 'View new posts',
 	'SEARCH_SELF'				=> 'View your posts',
 	'SEARCH_UNANSWERED'			=> 'View unanswered posts',
+	'SECONDS'					=> 'Seconds',
 	'SELECT'					=> 'Select',
+	'SELECT_DESTINATION_FORUM'	=> 'Please select a forum for destination',
 	'SELECT_FORUM'				=> 'Select a forum',
 	'SEND_EMAIL'				=> 'Email',
 	'SEND_PRIVATE_MESSAGE'		=> 'Send private message',

phpBB/language/en/ucp.php

@@ -198,6 +198,8 @@ $lang = array_merge($lang, array(
 	'FWD_FROM'					=> 'From: %s',
 	'FWD_TO'					=> 'To: %s',
 
+	'GLOBAL_ANNOUNCEMENT'		=> 'Global announcement',
+
 	'HIDE_ONLINE'				=> 'Hide my online status',
 	'HOLD_NEW_MESSAGES'			=> 'Do not accept new messages (New messages will be held back until enough space is available)',