From 6c45c1ff6bbdb4d000c804e7e2d4ba36c30c0fdc Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 25 Sep 2023 22:04:02 +0200 Subject: [PATCH] [ticket/15325] Do not show non-local permissions for local data PHPBB3-15325 --- phpBB/includes/acp/auth.php | 2 +- phpBB/phpbb/auth/auth.php | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php index efe0f0e5d1..8506289655 100644 --- a/phpBB/includes/acp/auth.php +++ b/phpBB/includes/acp/auth.php @@ -95,7 +95,7 @@ class auth_admin extends \phpbb\auth\auth } else { - $hold_ary = ($group_id !== false) ? $this->acl_group_raw_data($group_id, $auth_option . '%', ($scope == 'global') ? 0 : false) : $this->$acl_user_function($user_id, $auth_option . '%', ($scope == 'global') ? 0 : false); + $hold_ary = ($group_id !== false) ? $this->acl_group_raw_data($group_id, $auth_option . '%') : $this->$acl_user_function($user_id, $auth_option . '%', ($scope == 'global') ? 0 : false); } } diff --git a/phpBB/phpbb/auth/auth.php b/phpBB/phpbb/auth/auth.php index 55917ea967..7e866bc20c 100644 --- a/phpBB/phpbb/auth/auth.php +++ b/phpBB/phpbb/auth/auth.php @@ -776,6 +776,7 @@ class auth $sql_group = ($group_id !== false) ? ((!is_array($group_id)) ? 'group_id = ' . (int) $group_id : $db->sql_in_set('group_id', array_map('intval', $group_id))) : ''; $sql_forum = ($forum_id !== false) ? ((!is_array($forum_id)) ? 'AND a.forum_id = ' . (int) $forum_id : 'AND ' . $db->sql_in_set('a.forum_id', array_map('intval', $forum_id))) : ''; + $is_local = $forum_id !== false ? 'AND ao.is_local <> 0' : ''; $sql_opts = ''; $hold_ary = $sql_ary = array(); @@ -787,9 +788,10 @@ class auth // Grab group settings - non-role specific... $sql_ary[] = 'SELECT a.group_id, a.forum_id, a.auth_setting, a.auth_option_id, ao.auth_option - FROM ' . ACL_GROUPS_TABLE . ' a, ' . ACL_OPTIONS_TABLE . ' ao + FROM ' . ACL_GROUPS_TABLE . ' a, ' . ACL_OPTIONS_TABLE . " ao WHERE a.auth_role_id = 0 - AND a.auth_option_id = ao.auth_option_id ' . + AND a.auth_option_id = ao.auth_option_id + $is_local " . (($sql_group) ? 'AND a.' . $sql_group : '') . " $sql_forum $sql_opts @@ -797,9 +799,10 @@ class auth // Now grab group settings - role specific... $sql_ary[] = 'SELECT a.group_id, a.forum_id, r.auth_setting, r.auth_option_id, ao.auth_option - FROM ' . ACL_GROUPS_TABLE . ' a, ' . ACL_ROLES_DATA_TABLE . ' r, ' . ACL_OPTIONS_TABLE . ' ao + FROM ' . ACL_GROUPS_TABLE . ' a, ' . ACL_ROLES_DATA_TABLE . ' r, ' . ACL_OPTIONS_TABLE . " ao WHERE a.auth_role_id = r.role_id - AND r.auth_option_id = ao.auth_option_id ' . + $is_local + AND r.auth_option_id = ao.auth_option_id " . (($sql_group) ? 'AND a.' . $sql_group : '') . " $sql_forum $sql_opts