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

[ticket/16430] Sort permissions

Browse source 
PHPBB3-16430
This commit is contained in:
mrgoldy 2020-04-09 01:04:06 +02:00
parent b29a011186
commit 00f5732a0d
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
phpBB/includes/acp/auth.php
View file

@ -1134,6 +1134,8 @@ class auth_admin extends \phpbb\auth\auth
/* @var $phpbb_permissions \phpbb\permissions */ /* @var $phpbb_permissions \phpbb\permissions */
$phpbb_permissions = $phpbb_container->get('acl.permissions'); $phpbb_permissions = $phpbb_container->get('acl.permissions');
$order = array_flip(array_keys($phpbb_permissions->get_permissions()));
foreach ($category_array as $cat => $cat_array) foreach ($category_array as $cat => $cat_array)
{ {
if (!$phpbb_permissions->category_defined($cat)) if (!$phpbb_permissions->category_defined($cat))
@ -1149,21 +1151,11 @@ class auth_admin extends \phpbb\auth\auth
'CAT_NAME' => $phpbb_permissions->get_category_lang($cat), 'CAT_NAME' => $phpbb_permissions->get_category_lang($cat),
)); ));
/* Sort permissions by name (more naturaly and user friendly than sorting by a primary key)
* Commented out due to it's memory consumption and time needed
*
$key_array = array_intersect(array_keys($user->lang), array_map(create_function('$a', 'return "acl_" . $a;'), array_keys($cat_array['permissions'])));
$values_array = $cat_array['permissions'];
$cat_array['permissions'] = array(); uksort($cat_array['permissions'], function($a, $b) use ($order) {
return $order[$a] <=> $order[$b];
});
foreach ($key_array as $key)
{
$key = str_replace('acl_', '', $key);
$cat_array['permissions'][$key] = $values_array[$key];
}
unset($key_array, $values_array);
*/
foreach ($cat_array['permissions'] as $permission => $allowed) foreach ($cat_array['permissions'] as $permission => $allowed)
{ {
if (!$phpbb_permissions->permission_defined($permission)) if (!$phpbb_permissions->permission_defined($permission))
@ -1229,7 +1221,6 @@ class auth_admin extends \phpbb\auth\auth
} }
$permissions = $permission_row[$forum_id]; $permissions = $permission_row[$forum_id];
ksort($permissions);
foreach ($permissions as $permission => $auth_setting) foreach ($permissions as $permission => $auth_setting)
{ {