mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-30 21:40:43 +02:00
- fix some oddities (doubled spaces for example)
- changed the way make_forum_select() is returning the forum list - now including skipped forums but being disabled. This should make identifying the correct forum much more easier. - Changed some permission namings based on suggestions by the community - Tried to comply to the permission field ordering within the language files while displaying permission sets. Hopefully it's worth the additional processing time. - Disable submit buttons after clicking for installation and conversions. git-svn-id: file:///svn/phpbb/trunk@6930 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -323,6 +323,16 @@ class auth_admin extends auth
|
||||
if ($local)
|
||||
{
|
||||
$forum_names_ary = make_forum_select(false, false, true, false, false, false, true);
|
||||
|
||||
// Remove the disabled ones, since we do not create an option field here...
|
||||
foreach ($forum_names_ary as $key => $value)
|
||||
{
|
||||
if (!$value['disabled'])
|
||||
{
|
||||
continue;
|
||||
}
|
||||
unset($forum_names_ary[$key]);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -956,7 +966,7 @@ class auth_admin extends auth
|
||||
|
||||
$option_id_ary = array();
|
||||
$table = ($mode == 'user') ? ACL_USERS_TABLE : ACL_GROUPS_TABLE;
|
||||
$id_field = $mode . '_id';
|
||||
$id_field = $mode . '_id';
|
||||
|
||||
$where_sql = array();
|
||||
|
||||
@@ -1070,6 +1080,19 @@ class auth_admin extends auth
|
||||
'CAT_NAME' => $user->lang['permission_cat'][$cat])
|
||||
);
|
||||
|
||||
// Sort array
|
||||
$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();
|
||||
|
||||
foreach ($key_array as $key)
|
||||
{
|
||||
$key = str_replace('acl_', '', $key);
|
||||
$cat_array['permissions'][$key] = $values_array[$key];
|
||||
}
|
||||
unset($key_array, $values_array);
|
||||
|
||||
@reset($cat_array['permissions']);
|
||||
while (list($permission, $allowed) = each($cat_array['permissions']))
|
||||
{
|
||||
|
Reference in New Issue
Block a user