1 files changed, 95 insertions, 57 deletions
diff --git a/phpBB/report.php b/phpBB/report.php
index c1172ec1d5..c92ecdfdcc 100644
--- a/phpBB/report.php
+++ b/phpBB/report.php
@@ -133,9 +133,25 @@ else
 	}
 }
 
+if ($config['enable_post_confirm'] && !$user->data['is_registered'])
+{
+	include($phpbb_root_path . 'includes/captcha/captcha_factory.' . $phpEx);
+	$captcha =& phpbb_captcha_factory::get_instance($config['captcha_plugin']);
+	$captcha->init(CONFIRM_REPORT);
+}
+
+$error	= array();
+$s_hidden_fields = '';
+
 // Submit report?
 if ($submit && $reason_id)
 {
+	$visual_confirmation_response = $captcha->validate();
+	if ($visual_confirmation_response)
+	{
+		$error[] = $visual_confirmation_response;
+	}
+
 	$sql = 'SELECT *
 		FROM ' . REPORTS_REASONS_TABLE . "
 		WHERE reason_id = $reason_id";
@@ -145,78 +161,90 @@ if ($submit && $reason_id)
 
 	if (!$row || (!$report_text && strtolower($row['reason_title']) == 'other'))
 	{
-		trigger_error('EMPTY_REPORT');
+		$error[] = $user->lang('EMPTY_REPORT');
 	}
 
-	$sql_ary = array(
-		'reason_id'		=> (int) $reason_id,
-		'post_id'		=> $post_id,
-		'pm_id'			=> $pm_id,
-		'user_id'		=> (int) $user->data['user_id'],
-		'user_notify'	=> (int) $user_notify,
-		'report_closed'	=> 0,
-		'report_time'	=> (int) time(),
-		'report_text'	=> (string) $report_text
-	);
-
-	$sql = 'INSERT INTO ' . REPORTS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
-	$db->sql_query($sql);
-	$report_id = $db->sql_nextid();
-
-	if ($post_id)
+	if (!sizeof($error))
 	{
-		$sql = 'UPDATE ' . POSTS_TABLE . '
-			SET post_reported = 1
-			WHERE post_id = ' . $post_id;
-		$db->sql_query($sql);
-
-		if (!$report_data['topic_reported'])
+		if (isset($captcha))
 		{
-			$sql = 'UPDATE ' . TOPICS_TABLE . '
-				SET topic_reported = 1
-				WHERE topic_id = ' . $report_data['topic_id'] . '
-					OR topic_moved_id = ' . $report_data['topic_id'];
-			$db->sql_query($sql);
+			$captcha->reset();
 		}
 
-		$lang_return = $user->lang['RETURN_TOPIC'];
-		$lang_success = $user->lang['POST_REPORTED_SUCCESS'];
-	}
-	else
-	{
-		$sql = 'UPDATE ' . PRIVMSGS_TABLE . '
-			SET message_reported = 1
-			WHERE msg_id = ' . $pm_id;
-		$db->sql_query($sql);
-
 		$sql_ary = array(
-			'msg_id'		=> $pm_id,
-			'user_id'		=> ANONYMOUS,
-			'author_id'		=> (int) $report_data['author_id'],
-			'pm_deleted'	=> 0,
-			'pm_new'		=> 0,
-			'pm_unread'		=> 0,
-			'pm_replied'	=> 0,
-			'pm_marked'		=> 0,
-			'pm_forwarded'	=> 0,
-			'folder_id'		=> PRIVMSGS_INBOX,
+			'reason_id'		=> (int) $reason_id,
+			'post_id'		=> $post_id,
+			'pm_id'			=> $pm_id,
+			'user_id'		=> (int) $user->data['user_id'],
+			'user_notify'	=> (int) $user_notify,
+			'report_closed'	=> 0,
+			'report_time'	=> (int) time(),
+			'report_text'	=> (string) $report_text
 		);
 
-		$sql = 'INSERT INTO ' . PRIVMSGS_TO_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
+		$sql = 'INSERT INTO ' . REPORTS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
 		$db->sql_query($sql);
+		$report_id = $db->sql_nextid();
 
-		$lang_return = $user->lang['RETURN_PM'];
-		$lang_success = $user->lang['PM_REPORTED_SUCCESS'];
-	}
+		if ($post_id)
+		{
+			$sql = 'UPDATE ' . POSTS_TABLE . '
+				SET post_reported = 1
+				WHERE post_id = ' . $post_id;
+			$db->sql_query($sql);
 
-	meta_refresh(3, $redirect_url);
+			if (!$report_data['topic_reported'])
+			{
+				$sql = 'UPDATE ' . TOPICS_TABLE . '
+					SET topic_reported = 1
+					WHERE topic_id = ' . $report_data['topic_id'] . '
+						OR topic_moved_id = ' . $report_data['topic_id'];
+				$db->sql_query($sql);
+			}
+
+			$lang_return = $user->lang['RETURN_TOPIC'];
+			$lang_success = $user->lang['POST_REPORTED_SUCCESS'];
+		}
+		else
+		{
+			$sql = 'UPDATE ' . PRIVMSGS_TABLE . '
+				SET message_reported = 1
+				WHERE msg_id = ' . $pm_id;
+			$db->sql_query($sql);
+
+			$sql_ary = array(
+				'msg_id'		=> $pm_id,
+				'user_id'		=> ANONYMOUS,
+				'author_id'		=> (int) $report_data['author_id'],
+				'pm_deleted'	=> 0,
+				'pm_new'		=> 0,
+				'pm_unread'		=> 0,
+				'pm_replied'	=> 0,
+				'pm_marked'		=> 0,
+				'pm_forwarded'	=> 0,
+				'folder_id'		=> PRIVMSGS_INBOX,
+			);
+
+			$sql = 'INSERT INTO ' . PRIVMSGS_TO_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
+			$db->sql_query($sql);
+
+			$lang_return = $user->lang['RETURN_PM'];
+			$lang_success = $user->lang['PM_REPORTED_SUCCESS'];
+		}
+
+		meta_refresh(3, $redirect_url);
 
-	$message = $lang_success . '<br /><br />' . sprintf($lang_return, '<a href="' . $redirect_url . '">', '</a>');
-	if ($return_forum_url)
+		$message = $lang_success . '<br /><br />' . sprintf($lang_return, '<a href="' . $redirect_url . '">', '</a>');
+		if ($return_forum_url)
+		{
+			$message .= '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . $return_forum_url . '">', '</a>');
+		}
+		trigger_error($message);
+	}
+	else if (isset($captcha) && $captcha->is_solved() !== false)
 	{
-		$message .= '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . $return_forum_url . '">', '</a>');
+		$s_hidden_fields .= build_hidden_fields($captcha->get_hidden_fields());
 	}
-	trigger_error($message);
 }
 
 // Generate the reasons
@@ -224,10 +252,20 @@ display_reasons($reason_id);
 
 $page_title = ($pm_id) ? $user->lang['REPORT_MESSAGE'] : $user->lang['REPORT_POST'];
 
+if (isset($captcha) && $captcha->is_solved() === false)
+{
+	$template->assign_vars(array(
+		'S_CONFIRM_CODE'	=> true,
+		'CAPTCHA_TEMPLATE'	=> $captcha->get_template(),
+	));
+}
+
 $template->assign_vars(array(
+	'ERROR'				=> (sizeof($error)) ? implode('<br />', $error) : '',
 	'S_REPORT_POST'		=> ($pm_id) ? false : true,
 	'REPORT_TEXT'		=> $report_text,
 	'S_REPORT_ACTION'	=> append_sid("{$phpbb_root_path}report.$phpEx", 'f=' . $forum_id . '&amp;p=' . $post_id . '&amp;pm=' . $pm_id),
+	'S_HIDDEN_FIELDS'	=> (sizeof($s_hidden_fields)) ? $s_hidden_fields : null,
 
 	'S_NOTIFY'			=> $user_notify,
 	'S_CAN_NOTIFY'		=> ($user->data['is_registered']) ? true : false)