diff options
| author | Nils Adermann <naderman@naderman.de> | 2006-06-04 16:30:58 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2006-06-04 16:30:58 +0000 |
| commit | 5c181bc5289c54322d61dcc008e539f7c32e882b (patch) | |
| tree | 440352ec19a1035388d00945da85a38731e04897 /phpBB/language | |
| parent | f3499d12518c38082c2ecf60958e7336195a941b (diff) | |
| download | forums-5c181bc5289c54322d61dcc008e539f7c32e882b.tar forums-5c181bc5289c54322d61dcc008e539f7c32e882b.tar.gz forums-5c181bc5289c54322d61dcc008e539f7c32e882b.tar.bz2 forums-5c181bc5289c54322d61dcc008e539f7c32e882b.tar.xz forums-5c181bc5289c54322d61dcc008e539f7c32e882b.zip | |
- permission trace correctly uses language variables now
- updated documentation for the auth class
- use cache for "SELECT forum_name FROM phpbb_forums WHERE forum_id = X" queries everywhere and not only in functions_display
- updated the permission trace to include information about global settings overwriting local ones
- take global permissions into account for local permission results on the view permission pages for users
- only allow to change the post author with m_chgposter
git-svn-id: file:///svn/phpbb/trunk@6009 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/permissions.php | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php index 6a97fad6b4..67392a4cd5 100644 --- a/phpBB/language/en/acp/permissions.php +++ b/phpBB/language/en/acp/permissions.php @@ -159,24 +159,32 @@ $lang = array_merge($lang, array( '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_FOR' => 'Trace for', + 'TRACE_GLOBAL_SETTING' => '%s (global)', '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_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_GLOBAL_YES_TOTAL_YES' => 'The forum independent user permission evaluates to YES but the total permission is already set to YES, so the the total result is kept. %sTrace global permission%s', + 'TRACE_USER_GLOBAL_YES_TOTAL_NO' => 'The forum independent user permission evaluates to YES which overwrites the current local result NO. %sTrace global permission%s', + 'TRACE_USER_GLOBAL_NO_TOTAL_KEPT' => 'The forum independent user permission evaluates to NO which doesn\'t influence the local permission. %sTrace global permission%s', 'TRACE_USER_FOUNDER' => 'The user has the founder type set, therefore admin permissions are set to YES by default.', '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_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_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.', + 'TRACE_WHO' => 'Who', + 'TRACE_TOTAL' => 'Total', 'USERS_NOT_ASSIGNED' => 'No user assigned to this role', 'USER_IS_MEMBER_OF_DEFAULT' => 'is a member of the following default groups', |