1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 03:04:09 +02:00

- allow reporting posts that have a closed report

- show multiple reports for one post correctly
- Bug #1389


git-svn-id: file:///svn/phpbb/trunk@5771 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Nils Adermann
2006-04-08 14:30:46 +00:00
parent fc167b2e42
commit c5b203b485
4 changed files with 11 additions and 20 deletions

View File

@@ -69,17 +69,9 @@ foreach ($acl_check_ary as $acl => $error)
}
unset($acl_check_ary);
// Check if the post has already been reported...
$sql = 'SELECT report_id, report_closed
FROM ' . REPORTS_TABLE . "
WHERE post_id = $post_id";
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
if ($row)
if ($report_data['post_reported'])
{
$message = ($row['report_closed']) ? $user->lang['REPORT_ALREADY_DEALT_WITH'] : $user->lang['ALREADY_REPORTED'];
$message = $user->lang['ALREADY_REPORTED'];
$message .= '<br /><br />' . sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $phpbb_root_path . $redirect_url . '">', '</a>');
trigger_error($message);
}
@@ -88,7 +80,7 @@ if ($row)
if (isset($_POST['submit']) && $reason_id)
{
$sql = 'SELECT *
FROM ' . REASONS_TABLE . "
FROM ' . REASONS_TABLE . "
WHERE reason_id = $reason_id";
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
@@ -115,16 +107,16 @@ if (isset($_POST['submit']) && $reason_id)
if (!$report_data['post_reported'])
{
$sql = 'UPDATE ' . POSTS_TABLE . '
SET post_reported = 1
$sql = 'UPDATE ' . POSTS_TABLE . '
SET post_reported = 1
WHERE post_id = ' . $post_id;
$db->sql_query($sql);
}
if (!$report_data['topic_reported'])
{
$sql = 'UPDATE ' . TOPICS_TABLE . '
SET topic_reported = 1
$sql = 'UPDATE ' . TOPICS_TABLE . '
SET topic_reported = 1
WHERE topic_id = ' . $report_data['topic_id'];
$db->sql_query($sql);
}