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

some fixes

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@6538 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-10-30 16:20:11 +00:00
parent 7e55e53d10
commit c44f6ca080
10 changed files with 71 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
phpBB/memberlist.php
View File

@@ -52,7 +52,8 @@ switch ($mode)
$start = request_var('start', 0);
$submit = (isset($_POST['submit'])) ? true : false;
$sort_key = request_var('sk', 'c');
$default_key = 'c';
$sort_key = request_var('sk', $default_key);
$sort_dir = request_var('sd', 'a');
@@ -168,6 +169,7 @@ switch ($mode)
}
$s_forum_select = '';
$undisclosed_forum = false;
if (isset($forum_id_ary[$row['user_id']]))
{
@@ -175,14 +177,28 @@ switch ($mode)
{
foreach ($forum_id_ary[$row['user_id']] as $forum_id)
{
if (isset($forums[$forum_id]) && $auth->acl_get('f_list', $forum_id))
if (isset($forums[$forum_id]))
{
$s_forum_select .= '<option value="">' . $forums[$forum_id] . '</option>';
if ($auth->acl_get('f_list', $forum_id))
{
$s_forum_select .= '<option value="">' . $forums[$forum_id] . '</option>';
}
else
{
$undisclosed_forum = true;
}
}
}
}
}
// If the mod is only moderating non-viewable forums let us display this circumstance
// instead of saying they are moderating all forums
if (!$s_forum_select && $undisclosed_forum)
{
$s_forum_select = $user->lang['FORUM_UNDISCLOSED'];
}
if ($row['group_type'] == GROUP_HIDDEN && !$auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel') && $row['ug_user_id'] != $user->data['user_id'])
{
$group_name = $user->lang['GROUP_UNDISCLOSED'];
@@ -1049,6 +1065,11 @@ switch ($mode)
}
// Sorting and order
if (!isset($sort_key_sql[$sort_key]))
{
$sort_key = $default_key;
}
$order_by .= $sort_key_sql[$sort_key] . ' ' . (($sort_dir == 'a') ? 'ASC' : 'DESC');
// Count the users ...