diff options
| author | Graham Eames <grahamje@users.sourceforge.net> | 2006-06-09 19:37:47 +0000 |
|---|---|---|
| committer | Graham Eames <grahamje@users.sourceforge.net> | 2006-06-09 19:37:47 +0000 |
| commit | 0cf31f0e2a3ad652b924ac4efbf5d7433c831397 (patch) | |
| tree | 041ebe56fb754ff6ab5ee5b5682e228b7b5848aa /phpBB/report.php | |
| parent | 898decd6cc4876269d14071431898fd8f547556e (diff) | |
| download | forums-0cf31f0e2a3ad652b924ac4efbf5d7433c831397.tar forums-0cf31f0e2a3ad652b924ac4efbf5d7433c831397.tar.gz forums-0cf31f0e2a3ad652b924ac4efbf5d7433c831397.tar.bz2 forums-0cf31f0e2a3ad652b924ac4efbf5d7433c831397.tar.xz forums-0cf31f0e2a3ad652b924ac4efbf5d7433c831397.zip | |
Fix the ability to report/view reports and warn in global announcements
git-svn-id: file:///svn/phpbb/trunk@6030 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/report.php')
| -rw-r--r-- | phpBB/report.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/report.php b/phpBB/report.php index 70912d64f1..3a0ad3e82d 100644 --- a/phpBB/report.php +++ b/phpBB/report.php @@ -22,6 +22,7 @@ $user->session_begin(); $auth->acl($user->data); $user->setup('mcp'); +$forum_id = request_var('f', 0); $post_id = request_var('p', 0); $reason_id = request_var('reason_id', 0); $report_text = request_var('report_text', '', true); @@ -33,7 +34,7 @@ if (!$post_id) trigger_error('INVALID_MODE'); } -$redirect_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "p=$post_id") . "#p$post_id"; +$redirect_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&p=$post_id") . "#p$post_id"; // Has the report been cancelled? if (isset($_POST['cancel'])) @@ -42,11 +43,10 @@ if (isset($_POST['cancel'])) } // Grab all relevant data -$sql = 'SELECT f.*, t.*, p.* - FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f +$sql = 'SELECT t.*, p.* + FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . " t WHERE p.post_id = $post_id - AND p.topic_id = t.topic_id - AND p.forum_id = f.forum_id"; + AND p.topic_id = t.topic_id"; $result = $db->sql_query($sql); $report_data = $db->sql_fetchrow($result); $db->sql_freeresult($result); @@ -56,8 +56,8 @@ if (!$report_data) trigger_error('POST_NOT_EXIST'); } -$forum_id = $report_data['forum_id']; -$topic_id = $report_data['topic_id']; +$forum_id = (int) ($report_data['forum_id']) ? $report_data['forum_id'] : $forum_id; +$topic_id = (int) $report_data['topic_id']; // Check required permissions $acl_check_ary = array('f_list' => 'POST_NOT_EXIST', 'f_read' => 'USER_CANNOT_READ', 'f_report' => 'USER_CANNOT_REPORT'); @@ -134,7 +134,7 @@ display_reasons($reason_id); $template->assign_vars(array( 'REPORT_TEXT' => $report_text, - 'S_REPORT_ACTION' => append_sid("{$phpbb_root_path}report.$phpEx", 'p=' . $post_id), + 'S_REPORT_ACTION' => append_sid("{$phpbb_root_path}report.$phpEx", 'f=' . $forum_id . '&p=' . $post_id), 'S_NOTIFY' => $user_notify, 'S_CAN_NOTIFY' => ($user->data['is_registered']) ? true : false) |