mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 23:25:30 +02:00
Code Issues Releases Wiki Activity

fix additional group related thingy (correctly display memberships)

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@5748 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-03-28 17:52:03 +00:00
parent 59921266fb
commit 1aed382e52
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
phpBB/includes/acp/acp_users.php
View File

@ -1626,7 +1626,7 @@ class acp_users
case 'groups': case 'groups':
$user->add_lang('groups'); $user->add_lang(array('groups', 'acp/groups'));
$group_id = request_var('g', 0); $group_id = request_var('g', 0);
switch ($action) switch ($action)
@ -1716,13 +1716,18 @@ class acp_users
// Select box for other groups // Select box for other groups
$sql = 'SELECT group_id, group_name, group_type $sql = 'SELECT group_id, group_name, group_type
FROM ' . GROUPS_TABLE . ' FROM ' . GROUPS_TABLE . '
WHERE group_id NOT IN (' . implode(', ', $id_ary) . ') ' . ((sizeof($id_ary)) ? 'WHERE group_id NOT IN (' . implode(', ', $id_ary) . ')' : '') . '
ORDER BY group_type DESC, group_name ASC'; ORDER BY group_type DESC, group_name ASC';
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$s_group_options = ''; $s_group_options = '';
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
if ($config['coppa_hide_groups'] && in_array($row['group_name'], array('INACTIVE_COPPA', 'REGISTERED_COPPA')))
{
continue;
}
$s_group_options .= '<option' . (($row['group_type'] == GROUP_SPECIAL) ? ' class="sep"' : '') . ' value="' . $row['group_id'] . '">' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>'; $s_group_options .= '<option' . (($row['group_type'] == GROUP_SPECIAL) ? ' class="sep"' : '') . ' value="' . $row['group_id'] . '">' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);

20
phpBB/includes/acp/auth.php
View File

@ -348,16 +348,20 @@ class auth_admin extends auth
$db->sql_freeresult($result); $db->sql_freeresult($result);
$memberships = group_memberships(false, array_keys($hold_ary), false); $memberships = group_memberships(false, array_keys($hold_ary), false);
foreach ($memberships as $row) // User is not a member of any group? Bad admin, bad bad admin...
if ($memberships)
{ {
if ($groups[$row['group_id']]['group_type'] == GROUP_SPECIAL) foreach ($memberships as $row)
{ {
$user_groups_default[$row['user_id']][] = $user->lang['G_' . $groups[$row['group_id']]['group_name']]; if ($groups[$row['group_id']]['group_type'] == GROUP_SPECIAL)
} {
else $user_groups_default[$row['user_id']][] = $user->lang['G_' . $groups[$row['group_id']]['group_name']];
{ }
$user_groups_custom[$row['user_id']][] = $groups[$row['group_id']]['group_name']; else
{
$user_groups_custom[$row['user_id']][] = $groups[$row['group_id']]['group_name'];
}
} }
} }
unset($memberships, $groups); unset($memberships, $groups);