diff options
| author | Zoddo <zoddo.ino@gmail.com> | 2015-10-10 15:57:33 +0200 |
|---|---|---|
| committer | Zoddo <zoddo.ino@gmail.com> | 2015-10-12 17:11:22 +0200 |
| commit | c5752be50c5d62ceaee59efa8067fadae5bc89d6 (patch) | |
| tree | df7ee2dc61667e7f0167e0ffa3d84a935e1b6dc9 /phpBB/memberlist.php | |
| parent | 0947bda39d907d41994e27e88e538bfc4bff0a35 (diff) | |
| download | forums-c5752be50c5d62ceaee59efa8067fadae5bc89d6.tar forums-c5752be50c5d62ceaee59efa8067fadae5bc89d6.tar.gz forums-c5752be50c5d62ceaee59efa8067fadae5bc89d6.tar.bz2 forums-c5752be50c5d62ceaee59efa8067fadae5bc89d6.tar.xz forums-c5752be50c5d62ceaee59efa8067fadae5bc89d6.zip | |
[ticket/10343] Add a distinction for inactive users on memberlist
PHPBB3-10343
Diffstat (limited to 'phpBB/memberlist.php')
| -rw-r--r-- | phpBB/memberlist.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 5e05009825..66bea5dd8c 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -151,7 +151,7 @@ switch ($mode) $db->sql_freeresult($result); $sql_ary = array( - 'SELECT' => 'u.user_id, u.group_id as default_group, u.username, u.username_clean, u.user_colour, u.user_rank, u.user_posts, u.user_allow_pm, g.group_id', + 'SELECT' => 'u.user_id, u.group_id as default_group, u.username, u.username_clean, u.user_colour, u.user_type, u.user_rank, u.user_posts, u.user_allow_pm, g.group_id', 'FROM' => array( USER_GROUP_TABLE => 'ug', @@ -314,6 +314,8 @@ switch ($mode) 'RANK_IMG' => $user_rank_data['img'], 'RANK_IMG_SRC' => $user_rank_data['img_src'], + 'S_INACTIVE' => $row['user_type'] == USER_INACTIVE, + 'U_PM' => ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($row['user_allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&u=' . $row['user_id']) : '', 'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']), @@ -1346,7 +1348,7 @@ switch ($mode) } $user_types = array(USER_NORMAL, USER_FOUNDER); - if ($auth->acl_get('a_user') || $user->data['user_type'] == USER_FOUNDER) + if ($auth->acl_get('a_user')) { $user_types[] = USER_INACTIVE; } @@ -1357,7 +1359,7 @@ switch ($mode) $sql = "SELECT u.user_id FROM " . USERS_TABLE . " u $sql_from - WHERE u.user_type IN (" . implode(', ', $user_types) . ") + WHERE " . $db->sql_in_set('u.user_type', $user_types) . " $sql_where ORDER BY $order_by"; $result = $db->sql_query_limit($sql, $config['topics_per_page'], $start); @@ -1472,6 +1474,7 @@ switch ($mode) 'S_CUSTOM_PROFILE' => (isset($cp_row['row']) && sizeof($cp_row['row'])) ? true : false, 'S_GROUP_LEADER' => $is_leader, + 'S_INACTIVE' => $row['user_type'] == USER_INACTIVE, 'U_VIEW_PROFILE' => get_username_string('profile', $user_id, $row['username']), )); |