mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3551 from rxu/ticket/13779

Browse Source 
[ticket/13779] Set new auth options to the role only if matching the role type
This commit is contained in:
Joas Schilling
2015-06-09 20:23:08 +02:00
parent 405681f138 c221571963
commit 832c9f64e0
3 changed files with 213 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
phpBB/phpbb/db/migration/tool/permission.php
View File

@@ -425,13 +425,27 @@ class permission implements \phpbb\db\migration\tool\tool_interface
$role_id = (int) $this->db->sql_fetchfield('auth_role_id');
if ($role_id)
{
$sql = 'SELECT role_name
$sql = 'SELECT role_name, role_type
FROM ' . ACL_ROLES_TABLE . '
WHERE role_id = ' . $role_id;
$this->db->sql_query($sql);
$role_name = $this->db->sql_fetchfield('role_name');
$role_data = $this->db->sql_fetchrow();
$role_name = $role_data['role_name'];
$role_type = $role_data['role_type'];
return $this->permission_set($role_name, $auth_option, 'role', $has_permission);
// Filter new auth options to match the role type: a_ | f_ | m_ | u_
// Set new auth options to the role only if options matching the role type were found
$auth_option = array_filter($auth_option,
function ($option) use ($role_type)
{
return strpos($option, $role_type) === 0;
}
);
if (sizeof($auth_option))
{
return $this->permission_set($role_name, $auth_option, 'role', $has_permission);
}
}
$sql = 'SELECT auth_option_id, auth_setting