diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-05-15 20:17:35 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-05-15 20:17:35 +0000 |
| commit | 918914926b13253ef3a9af40bcdb0ea8b900f497 (patch) | |
| tree | 2d1e0313e99f45e82a2f5081dfb450de352dad28 /phpBB/adm/index.php | |
| parent | 4c207e5510a77931d3eed6fc065f294c8f675f82 (diff) | |
| download | forums-918914926b13253ef3a9af40bcdb0ea8b900f497.tar forums-918914926b13253ef3a9af40bcdb0ea8b900f497.tar.gz forums-918914926b13253ef3a9af40bcdb0ea8b900f497.tar.bz2 forums-918914926b13253ef3a9af40bcdb0ea8b900f497.tar.xz forums-918914926b13253ef3a9af40bcdb0ea8b900f497.zip | |
- request_var updates
- added group selection to pm filter
- fixed activation/deletion of inactive user accounts in admin index
- fixed some color swatch bugs
git-svn-id: file:///svn/phpbb/trunk@5152 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm/index.php')
| -rw-r--r-- | phpBB/adm/index.php | 35 |
1 files changed, 28 insertions, 7 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index c7fd63253b..a1f683b4bb 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -129,7 +129,7 @@ else if ($pane == 'left') elseif ($pane == 'right') { $action = request_var('action', ''); - $mark = (isset($_REQUEST['mark'])) ? implode(', ', request_var('mark', 0)) : ''; + $mark = (isset($_REQUEST['mark'])) ? implode(', ', request_var('mark', array(0))) : ''; if ($mark) { @@ -142,16 +142,37 @@ elseif ($pane == 'right') trigger_error($user->lang['NO_ADMIN']); } - $sql = ($action == 'activate') ? 'UPDATE ' . USERS_TABLE . ' SET user_type = ' . USER_NORMAL . " WHERE user_id IN ($mark)" : 'DELETE FROM ' . USERS_TABLE . " WHERE user_id IN ($mark)"; - $db->sql_query($sql); + $sql = 'SELECT username + FROM ' . USERS_TABLE . " + WHERE user_id IN ($mark)"; + $result = $db->sql_query($sql); + + $user_affected = array(); + while ($row = $db->sql_fetchrow($result)) + { + $user_affected[] = $row['username']; + } + $db->sql_freeresult($result); + + if ($action == 'activate') + { + $sql = 'UPDATE ' . USERS_TABLE . ' SET user_type = ' . USER_NORMAL . " WHERE user_id IN ($mark)" + $db->sql_query($sql); + } + else if ($action == 'delete') + { + $sql = 'DELETE FROM ' . USER_GROUP_TABLE . " WHERE user_id IN ($mark)"; + $db->sql_query($sql); + $sql = 'DELETE FROM ' . USERS_TABLE . " WHERE user_id IN ($mark)"; + $db->sql_query($sql); + } - if (!$delete) + if ($action != 'delete') { set_config('num_users', $config['num_users'] + $db->sql_affectedrows(), true); } - $log_action = ($activate) ? 'log_index_activate' : 'log_index_delete'; - add_log('admin', $log_action, $db->sql_affectedrows()); + add_log('admin', 'LOG_INDEX_' . strtoupper($action), implode(', ', $user_affected)); break; case 'remind': @@ -617,7 +638,7 @@ elseif ($pane == 'right') } -?><option value="delete"><?php echo $user->lang['DELETE']; ?></option> <input class="btnlite" type="submit" name="submit" value="<?php echo $user->lang['SUBMIT']; ?>" /> </td> +?><option value="delete"><?php echo $user->lang['DELETE']; ?></option></select> <input class="btnlite" type="submit" name="submit" value="<?php echo $user->lang['SUBMIT']; ?>" /> </td> </tr> <?php |