diff options
Diffstat (limited to 'phpBB/includes/acp/acp_inactive.php')
| -rwxr-xr-x | phpBB/includes/acp/acp_inactive.php | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index 84387b4f5c..5663979f1c 100755 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -26,6 +26,8 @@ class acp_inactive global $config, $db, $user, $auth, $template; global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix; + include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + $user->add_lang('memberlist'); $action = request_var('action', ''); @@ -43,7 +45,8 @@ class acp_inactive { case 'activate': case 'delete': - $sql = 'SELECT username + + $sql = 'SELECT user_id, username FROM ' . USERS_TABLE . ' WHERE ' . $db->sql_in_set('user_id', $mark); $result = $db->sql_query($sql); @@ -51,13 +54,12 @@ class acp_inactive $user_affected = array(); while ($row = $db->sql_fetchrow($result)) { - $user_affected[] = $row['username']; + $user_affected[$row['user_id']] = $row['username']; } $db->sql_freeresult($result); if ($action == 'activate') { - include_once($phpbb_root_path . 'includes/functions_user.' . $phpEx); user_active_flip('activate', $mark); } else if ($action == 'delete') @@ -67,14 +69,14 @@ class acp_inactive trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING); } - $sql = 'DELETE FROM ' . USER_GROUP_TABLE . ' WHERE ' . $db->sql_in_set('user_id', $mark); - $db->sql_query($sql); - $sql = 'DELETE FROM ' . USERS_TABLE . ' WHERE ' . $db->sql_in_set('user_id', $mark); - $db->sql_query($sql); - - add_log('admin', 'LOG_INACTIVE_' . strtoupper($action), implode(', ', $user_affected)); + foreach ($mark as $user_id) + { + user_delete('retain', $user_id, $user_affected[$user_id]); + } } + add_log('admin', 'LOG_INACTIVE_' . strtoupper($action), implode(', ', $user_affected)); + break; case 'remind': |