diff options
| author | Graham Eames <grahamje@users.sourceforge.net> | 2006-02-21 20:48:31 +0000 |
|---|---|---|
| committer | Graham Eames <grahamje@users.sourceforge.net> | 2006-02-21 20:48:31 +0000 |
| commit | 5cffb39239b64580230f23b1f565d773fb12cf14 (patch) | |
| tree | 01e011eb0756a9ce1cb6fe9b7c6aaffe95036896 /phpBB/includes/mcp/mcp_notes.php | |
| parent | d6c8a4a1ae4343bb98de07d643ec2247a7ba2d6a (diff) | |
| download | forums-5cffb39239b64580230f23b1f565d773fb12cf14.tar forums-5cffb39239b64580230f23b1f565d773fb12cf14.tar.gz forums-5cffb39239b64580230f23b1f565d773fb12cf14.tar.bz2 forums-5cffb39239b64580230f23b1f565d773fb12cf14.tar.xz forums-5cffb39239b64580230f23b1f565d773fb12cf14.zip | |
Fix a minor bug with deletions
git-svn-id: file:///svn/phpbb/trunk@5568 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/mcp/mcp_notes.php')
| -rwxr-xr-x | phpBB/includes/mcp/mcp_notes.php | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/phpBB/includes/mcp/mcp_notes.php b/phpBB/includes/mcp/mcp_notes.php index f1c68e10ad..992b100bbc 100755 --- a/phpBB/includes/mcp/mcp_notes.php +++ b/phpBB/includes/mcp/mcp_notes.php @@ -112,13 +112,13 @@ function mcp_notes_user_view($id, $mode, $action) $deletemark = ($action == 'del_marked') ? true : false; $deleteall = ($action == 'del_all') ? true : false; - $marked = request_var('marknote', 0); + $marked = request_var('marknote', array(0)); $usernote = request_var('usernote', ''); // Handle any actions if (($deletemark || $deleteall) && $auth->acl_get('a_clearlogs')) { - $where_sql = " AND reportee_id = $user_id"; + $where_sql = ''; if ($deletemark && $marked) { $sql_in = array(); @@ -130,17 +130,21 @@ function mcp_notes_user_view($id, $mode, $action) unset($sql_in); } - $sql = 'DELETE FROM ' . LOG_TABLE . ' - WHERE log_type = ' . LOG_USERS . " - $where_sql"; - $db->sql_query($sql); - - add_log('admin', 'LOG_CLEAR_USER', $userrow['username']); - - $msg = ($deletemark) ? 'MARKED_DELETED' : 'ALL_DELETED'; - $redirect = "mcp.$phpEx$SID&i=$id&mode=$mode&u=$user_id"; - meta_refresh(2, $redirect); - trigger_error($user->lang[$msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>')); + if ($where_sql || $deleteall) + { + $sql = 'DELETE FROM ' . LOG_TABLE . ' + WHERE log_type = ' . LOG_USERS . " + AND reportee_id = $user_id + $where_sql"; + $db->sql_query($sql); + + add_log('admin', 'LOG_CLEAR_USER', $userrow['username']); + + $msg = ($deletemark) ? 'MARKED_DELETED' : 'ALL_DELETED'; + $redirect = "mcp.$phpEx$SID&i=$id&mode=$mode&u=$user_id"; + meta_refresh(2, $redirect); + trigger_error($user->lang[$msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>')); + } } if ($usernote && $action == 'add_feedback') |