diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-02-18 13:42:08 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-02-18 13:42:08 +0000 |
| commit | 5c6653717f0a9adce905d1417c8adb4f0f3a5b73 (patch) | |
| tree | c5e3b65b409ae33d52055e33cfed0ee169684023 /phpBB/memberlist.php | |
| parent | 652d349b75262dd8e0db8405d5ca1b7fa654364a (diff) | |
| download | forums-5c6653717f0a9adce905d1417c8adb4f0f3a5b73.tar forums-5c6653717f0a9adce905d1417c8adb4f0f3a5b73.tar.gz forums-5c6653717f0a9adce905d1417c8adb4f0f3a5b73.tar.bz2 forums-5c6653717f0a9adce905d1417c8adb4f0f3a5b73.tar.xz forums-5c6653717f0a9adce905d1417c8adb4f0f3a5b73.zip | |
fixing some bugs
more mcp links for easier moderating different aspects (all, forum, topic)
i may have introduced new bugs with this commit due to me having fixed some things weeks ago and some code changed in between - please report if you see something not working as expected.
git-svn-id: file:///svn/phpbb/trunk@7007 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/memberlist.php')
| -rw-r--r-- | phpBB/memberlist.php | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 3d8c2bf767..425a710e65 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -355,18 +355,9 @@ switch ($mode) } // Get user... - if ($username) - { - $sql = 'SELECT * - FROM ' . USERS_TABLE . " - WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'"; - } - else - { - $sql = 'SELECT * - FROM ' . USERS_TABLE . " - WHERE user_id = $user_id"; - } + $sql = 'SELECT * + FROM ' . USERS_TABLE . ' + WHERE ' . (($username) ? "username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'" : "user_id = $user_id"); // a_user admins and founder are able to view inactive users and bots to be able to // manage them more easily @@ -390,8 +381,9 @@ switch ($mode) $sql = 'SELECT g.group_id, g.group_name, g.group_type FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . " ug WHERE ug.user_id = $user_id - AND g.group_id = ug.group_id" . ((!$auth->acl_get('a_group')) ? ' AND group_type <> ' . GROUP_HIDDEN : '') . ' - ORDER BY group_type, group_name'; + AND g.group_id = ug.group_id" . ((!$auth->acl_get('a_group')) ? ' AND g.group_type <> ' . GROUP_HIDDEN : '') . ' + AND ug.user_pending = 0 + ORDER BY g.group_type, g.group_name'; $result = $db->sql_query($sql); $group_options = ''; |