makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 05:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/17093] Fix wording, variable name and && => ||

Browse source 
PHPBB3-17093
This commit is contained in:
Christian Schnegelberger 2023-01-17 20:20:57 +01:00
parent 31d30ae01d
commit 54f9b95bea
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/language/en/acp/board.php
View file

@ -50,8 +50,8 @@ $lang = array_merge($lang, array(
'DEFAULT_STYLE_EXPLAIN' => 'The default style for new users.',
'DISABLE_BOARD' => 'Disable board',
'DISABLE_BOARD_EXPLAIN' => 'This will make the board unavailable to users who are neither administrators nor moderators. You can also enter a short (255 character) message to display if you wish.',
'DISABLE_BOARD_ACCESS' => 'Limit access of disabled board',
'DISABLE_BOARD_ACCESS_EXPLAIN' => 'This setting limits the access to a disable board to only administrators, or administrators plus global moderators or administrators and all moderators',
'DISABLE_BOARD_ACCESS' => 'Limit access to disabled board',
'DISABLE_BOARD_ACCESS_EXPLAIN' => 'This setting limits the access to a disabled board to only administrators, or administrators plus global moderators or administrators and all moderators.',
'DISABLE_BOARD_ACCESS_ADMIN' => 'Only administrators',
'DISABLE_BOARD_ACCESS_ADMIN_GLOB_MODS' => 'Only administrators and global moderators',
'DISABLE_BOARD_ACCESS_ADMIN_ALL_MODS' => 'Only administrators and all moderators',

8
phpBB/phpbb/user.php
View file

@ -373,18 +373,18 @@ class user extends \phpbb\session
// Is board disabled and user not an admin or moderator?
// Check acp setting who has access: only admins "case: 0", plus global moderators "case: 1" and plus moderators "case: 2"
$disable_board_access = (int) $config['add_disable_board_access_config'];
$board_disable_access = (int) $config['board_disable_access'];
switch ($disable_board_access) {
switch ($board_disable_access) {
case 0:
$access_disabled_board = $auth->acl_gets('a_');
break;
case 1:
$access_disabled_board = $auth->acl_gets('a_') && $auth->acl_getf_global('m_');
$access_disabled_board = $auth->acl_gets('a_') || $auth->acl_getf_global('m_');
break;
default:
case 2:
$access_disabled_board = $auth->acl_gets('a_', 'm_') && $auth->acl_getf_global('m_');
$access_disabled_board = $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_');
break;
}