my turn to break the forum (and at least pm's are no longer working - will not last long). HARRRR

git-svn-id: file:///svn/phpbb/trunk@4978 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Meik Sievertsen <acydburn@phpbb.com> 2004-09-04 19:32:23 +0000
committer: Meik Sievertsen <acydburn@phpbb.com> 2004-09-04 19:32:23 +0000
commit: 57b188b7afa66b68ef75ee69bc06cd8f14b3fed1 (patch)
tree: 676d8f5348e2c790664127dd651774543bd9bf75 /phpBB/report.php
parent: 68d73caefcf084f5f523ee7a47b84112dedd4e21 (diff)
download: forums-57b188b7afa66b68ef75ee69bc06cd8f14b3fed1.tar
forums-57b188b7afa66b68ef75ee69bc06cd8f14b3fed1.tar.gz
forums-57b188b7afa66b68ef75ee69bc06cd8f14b3fed1.tar.bz2
forums-57b188b7afa66b68ef75ee69bc06cd8f14b3fed1.tar.xz
forums-57b188b7afa66b68ef75ee69bc06cd8f14b3fed1.zip
1 files changed, 202 insertions, 63 deletions
diff --git a/phpBB/report.php b/phpBB/report.php
index 3090b9a7d6..cd4727adfa 100644
--- a/phpBB/report.php
+++ b/phpBB/report.php
@@ -21,19 +21,19 @@ $user->start();
 $auth->acl($user->data);
 $user->setup('mcp');
 
-// var definitions
-$post_id	= request_var('p', 0);
-$msg_id		= request_var('pm', 0);
-$reason_id	= request_var('reason_id', 0);
-$user_notify= (!empty($_REQUEST['notify']) && $user->data['user_id'] != ANONYMOUS) ? true : false;
-$report_text= request_var('report_text', '');
-
-if (!$post_id && !$msg_id)
+// Report PM or Post?
+$id = request_var('p', request_var('pm', 0));
+$report_post = (request_var('p', 0)) ? true : false;
+$reason_id = request_var('reason_id', 0);
+$user_notify = (!empty($_REQUEST['notify']) && $user->data['user_id'] != ANONYMOUS) ? true : false;
+$report_text = request_var('report_text', '');
+
+if (!$id)
 {
-	trigger_error('NO_MODE');
+	trigger_error('INVALID_MODE');
 }
 
-$redirect_url	= ($post_id) ? "{$phpbb_root_path}viewtopic.$phpEx$SID&p=$post_id#$post_id" : "{$phpbb_root_path}ucp.$phpEx$SID&i=pm&mode=view_messages&action=view_message&p=$msg_id";
+$redirect_url = ($report_post) ? "{$phpbb_root_path}viewtopic.$phpEx$SID&p=$id#$id" : "{$phpbb_root_path}ucp.$phpEx$SID&i=pm&p=$id";
 
 // Has the report been cancelled?
 if (isset($_POST['cancel']))
@@ -42,42 +42,39 @@ if (isset($_POST['cancel']))
 }
 
 // Grab all relevant data
-if ($post_id)
+if ($report_post)
 {
 	$sql = 'SELECT f.*, t.*, p.*
 		FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f
-		WHERE p.post_id = $post_id
+		WHERE p.post_id = $id
 			AND p.topic_id = t.topic_id
 			AND p.forum_id = f.forum_id";
 }
-else if ($msg_id)
+else
 {
 	// Only the user itself is able to report his Private Messages
 	$sql = 'SELECT p.*, t.*
 		FROM ' . PRIVMSGS_TABLE . ' p, ' . PRIVMSGS_TO_TABLE . " t
-		WHERE t.msg_id = $msg_id
+		WHERE t.msg_id = $id
 			AND t.user_id = " . $user->data['user_id'] . '
 			AND t.msg_id = p.msg_id';
 }
-else
-{
-	trigger_error('INVALID_MODE');
-}
-
 $result = $db->sql_query($sql);
 
 if (!($report_data = $db->sql_fetchrow($result)))
 {
-	trigger_error($user->lang['POST_NOT_EXIST']);
+	$message = ($report_post) ? $user->lang['POST_NOT_EXIST'] : $user->lang['PM_NOT_EXIST'];
+	trigger_error($message);
 }
 
-if ($post_id)
+if ($report_post)
 {
 	$forum_id = $report_data['forum_id'];
 	$topic_id = $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');
+	
 	foreach ($acl_check_ary as $acl => $error)
 	{
 		if (!$auth->acl_get($acl, $forum_id))
@@ -98,7 +95,7 @@ else
 // Check if the post has already been reported by this user
 $sql = 'SELECT *
 	FROM ' . REPORTS_TABLE . '
-	WHERE ' . (($post_id) ? "post_id = $post_id" : "msg_id = $msg_id") . '
+	WHERE ' . (($report_post) ? "post_id = $id" : "msg_id = $id") . '
 		AND user_id = ' . $user->data['user_id'];
 $result = $db->sql_query($sql);
 
@@ -107,10 +104,9 @@ if ($row = $db->sql_fetchrow($result))
 	if ($user->data['user_id'] != ANONYMOUS)
 	{
 		// A report exists, extract $row if we're going to display the form
-
-		if (!empty($_POST['reason_id']))
+		if ($reason_id)
 		{
-			$report_id = intval($row['report_id']);
+			$report_id = (int) $row['report_id'];
 		}
 		else
 		{
@@ -120,7 +116,7 @@ if ($row = $db->sql_fetchrow($result))
 	}
 	else
 	{
-		trigger_error($user->lang['ALREADY_REPORTED'] . '<br /><br />' . sprintf($user->lang[(($post_id) ? 'RETURN_TOPIC' : 'RETURN_MESSAGE')], '<a href="' . $redirect_url . '">', '</a>'));
+		trigger_error($user->lang['ALREADY_REPORTED'] . '<br /><br />' . sprintf($user->lang[(($report_post) ? 'RETURN_TOPIC' : 'RETURN_MESSAGE')], '<a href="' . $redirect_url . '">', '</a>'));
 	}
 }
 else
@@ -129,9 +125,9 @@ else
 }
 
 // Has the report been confirmed?
-if (!empty($_POST['reason_id']))
+if (isset($_POST['submit']) && $reason_id)
 {
-	$sql = 'SELECT reason_name 
+	$sql = 'SELECT reason_name
 		FROM ' . REASONS_TABLE . " 
 		WHERE reason_id = $reason_id";
 	$result = $db->sql_query($sql);
@@ -142,10 +138,12 @@ if (!empty($_POST['reason_id']))
 	}
 	$db->sql_freeresult($result);
 
+	$reason_desc = (!empty($user->lang['report_reasons']['DESCRIPTION'][$row['reason_name']])) ? $user->lang['report_reasons']['DESCRIPTION'][$row['reason_name']] : $row['reason_name'];
+
 	$sql_ary = array(
 		'reason_id'		=> (int) $reason_id,
-		'post_id'		=> (int) $post_id,
-		'msg_id'		=> (int) $msg_id,
+		'post_id'		=> ($report_post) ? $id : 0,
+		'msg_id'		=> ($report_post) ? 0 : $id,
 		'user_id'		=> (int) $user->data['user_id'],
 		'user_notify'	=> (int) $user_notify,
 		'report_time'	=> (int) time(),
@@ -164,57 +162,108 @@ if (!empty($_POST['reason_id']))
 		$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 ($report_post)
 	{
-		if (!$row['post_reported'])
+		if (!$report_data['post_reported'])
 		{
 			$sql = 'UPDATE ' . POSTS_TABLE . ' 
 				SET post_reported = 1 
-				WHERE post_id = ' . $post_id;
+				WHERE post_id = ' . $id;
 			$db->sql_query($sql);
 		}
 
-		if (!$row['topic_reported'])
+		if (!$report_data['topic_reported'])
 		{
 			$sql = 'UPDATE ' . TOPICS_TABLE . ' 
 				SET topic_reported = 1 
-				WHERE topic_id = ' . $topic_id;
+				WHERE topic_id = ' . $report_data['topic_id'];
 			$db->sql_query($sql);
 		}
 	}
 	else
 	{
-		if (!$row['message_reported'])
+		if (!$report_data['message_reported'])
 		{
 			$sql = 'UPDATE ' . PRIVMSGS_TABLE . " 
 				SET message_reported = 1 
-				WHERE msg_id = $msg_id";
+				WHERE msg_id = $id";
 			$db->sql_query($sql);
 		}
 	}
 
-	meta_refresh(3, $redirect_url);
+	// Send Notifications
+	// PM: Reported Post is put into all admin's boxes (not notifying about 'this' PM)
+	// All persons get notified about a new report, if notified by PM, send out email notifications too
+	
+	// Send notifications to moderators
+	$acl_list = ($report_post) ? $auth->acl_get_list(false, array('m_', 'a_'), array(0, $report_data['forum_id'])) : $auth->acl_get_list(false, 'a_', 0);
+	$notify_user = ($report_post) ? $acl_list[$report_data['forum_id']]['m_'] : array();
+	$notify_user = array_unique(array_merge($notify_user, $acl_list[0]['a_']));
+	unset($acl_list);
+
+	// Send reported PM to responsible persons (admins)
+	if (!$report_post)
+	{
+		foreach ($notify_user as $user_id)
+		{
+			$db->sql_query('INSERT INTO ' . PRIVMSGS_TO_TABLE . ' ' . $db->sql_build_array('INSERT', array(
+				'msg_id'	=> (int) $id,
+				'user_id'	=> (int) $user_id,
+				'author_id'	=> (int) $report_data['author_id'],
+				'folder_id'	=> PRIVMSGS_NO_BOX,
+				'new'		=> 1,
+				'unread'	=> 1,
+				'forwarded'	=> 0))
+			);
+		}
 
-	$message = $user->lang[(($post_id) ? 'POST' : 'MESSAGE') . '_REPORTED_SUCCESS'] . '<br /><br />' . sprintf($user->lang[(($post_id) ? 'RETURN_TOPIC' : 'RETURN_MESSAGE')], '<a href="' . $redirect_url . '">', '</a>');
-	trigger_error($message);
+		// Update Status
+		$sql = 'UPDATE ' . USERS_TABLE . ' 
+			SET user_new_privmsg = user_new_privmsg + 1, user_unread_privmsg = user_unread_privmsg + 1
+			WHERE user_id IN (' . implode(', ', $notify_user) . ')';
+		$db->sql_query($sql);
+	}
 
-	// Which moderators are responsible for private messages? ;)
-	/*
-		$db->sql_query('INSERT INTO ' . PRIVMSGS_TO_TABLE . ' ' . $db->sql_build_array('INSERT', array(
-			'msg_id'	=> (int) $msg_id,
-			'user_id'	=> (int) $moderator_id,
-			'author_id'	=> (int) $row['author_id'],
-			'folder_id'	=> PRIVMSGS_NO_BOX,
-			'new'		=> 1,
-			'unread'	=> 1,
-			'forwarded'	=> 0,
-			'reported'	=> 1)
+	// How to notify them?
+	$sql = 'SELECT user_id, username, user_options, user_lang, user_email, user_notify_type, user_jabber 
+		FROM ' . USERS_TABLE . '
+		WHERE user_id IN (' . implode(', ', $notify_user) . ')';
+	$result = $db->sql_query($sql);
+
+	$notify_user = array();
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$notify_user[$row['user_id']] = array(
+			'name'	=> $row['username'],
+			'email' => $row['user_email'],
+			'jabber'=> $row['user_jabber'],
+			'lang'	=> $row['user_lang'],
+			'notify_type'	=> $row['user_notify_type'],
+			
+			'pm'	=> $user->optionget('report_pm_notify', $row['user_options'])
 		);
-	*/
-	
-	// TODO: warn moderators or something ;)
+	}
+	$db->sql_freeresult($result);
+
+	$report_data = array(
+		'id'		=> $id,
+		'report_id'	=> $report_id,
+		'reporter'	=> $user->data['username'],
+		'reason'	=> $reason_desc,
+		'text'		=> $report_text,
+		'subject'	=> ($report_post) ? $report_data['post_subject'] : $report_data['message_subject'],
+		'view_post'	=> ($report_post) ? "viewtopic.$phpEx?f={$report_data['forum_id']}&t={$report_data['topic_id']}&p=$id&e=$id" : ''
+	);
+
+	report_notification($notify_user, $report_post, $report_data);
+
+	meta_refresh(3, $redirect_url);
+
+	$message = $user->lang[(($report_post) ? 'POST' : 'MESSAGE') . '_REPORTED_SUCCESS'] . '<br /><br />' . sprintf($user->lang[(($report_post) ? 'RETURN_TOPIC' : 'RETURN_MESSAGE')], '<a href="' . $redirect_url . '">', '</a>');
+	trigger_error($message);
 }
 
 
@@ -236,27 +285,29 @@ while ($row = $db->sql_fetchrow($result))
 		'ID'			=>	$row['reason_id'],
 		'NAME'			=>	htmlspecialchars($reason_title),
 		'DESCRIPTION'	=>	htmlspecialchars($reason_desc),
-		'S_SELECTED'	=>	($row['reason_id'] == $reason_id) ? TRUE : FALSE
-	));
+		'S_SELECTED'	=>	($row['reason_id'] == $reason_id) ? true : false)
+	);
 }
 
-$u_report = ($post_id) ? "p=$post_id" : "pm=$msg_id";
+$u_report = ($report_post) ? "p=$id" : "pm=$id";
 
 $template->assign_vars(array(
-	'REPORT_TEXT'		=>	$report_text,
-	'S_REPORT_ACTION'	=>	"report.$phpEx$SID&amp;$u_report" . (($report_id) ? "&amp;report_id=$report_id" : ''),
+	'REPORT_TEXT'		=> $report_text,
+	'S_REPORT_ACTION'	=> "{$phpbb_root_path}report.$phpEx$SID&amp;$u_report" . (($report_id) ? "&amp;report_id=$report_id" : ''),
 
-	'S_NOTIFY'			=>	(!empty($user_notify)) ? TRUE : FALSE,
-	'S_CAN_NOTIFY'		=>	($user->data['user_id'] == ANONYMOUS) ? FALSE : TRUE)
+	'S_NOTIFY'			=> (!empty($user_notify)) ? true : false,
+	'S_CAN_NOTIFY'		=> ($user->data['user_id'] == ANONYMOUS) ? false : true,
+	'S_REPORT_POST'		=> $report_post)
 );
 
-if ($post_id)
+if ($report_post)
 {
 	generate_forum_nav($report_data);
 }
 
 // Start output of page
-page_header($user->lang['REPORT_POST']);
+$page_title = ($report_post) ? $user->lang['REPORT_POST'] : $user->lang['REPORT_MESSAGE'];
+page_header($page_title);
 
 $template->set_filenames(array(
 	'body' => 'report_body.html')
@@ -264,4 +315,92 @@ $template->set_filenames(array(
 
 page_footer();
 
+function report_notification($notify_user, $report_post, $report_data)
+{
+	global $config, $phpbb_root_path, $phpEx;
+
+	include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
+	include_once($phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx);
+	$messenger = new messenger();
+
+	$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
+	$email_template = ($report_post) ? 'new_report_post' : 'new_report_pm';
+	$view_report_url = ($report_post) ? "mcp.$phpEx?i=queue&r=" . $report_data['report_id'] : "ucp.$phpEx?i=pm&p=" . $report_data['id'] . "&r=" . $report_data['report_id'];
+
+	foreach ($notify_user as $user_id => $notify_row)
+	{
+		// Send notification by email
+		if (!$notify_row['pm'])
+		{
+			$messenger->to($notify_row['email'], $notify_row['name']);
+			$messenger->im($notify_row['jabber'], $notify_row['name']);
+			$messenger->replyto($config['board_email']);
+
+			$messenger->template($email_template, $notify_row['lang']);
+
+			$messenger->assign_vars(array(
+				'EMAIL_SIG'		=> $email_sig,
+				'SITENAME'		=> $config['sitename'],
+				'USERNAME'		=> $notify_row['name'],
+				'SUBJECT'		=> $report_data['subject'],
+				'REPORTER'		=> $report_data['reporter'],
+
+				'REPORT_REASON'	=> $report_data['reason'],
+				'REPORT_TEXT'	=> $report_data['text'],
+
+				'U_VIEW_REPORT'	=> generate_board_url() . '/' . $view_report_url,
+				'U_VIEW_POST'	=> generate_board_url() . '/' . $report_data['view_post'])
+			);
+
+			$messenger->send($notify_row['notify_type']);
+			$messenger->reset();
+
+			if ($messenger->queue)
+			{
+				$messenger->queue->save();
+			}
+		}
+		else
+		{
+			// Use messenger for getting the correct message, we use the email template
+			$messenger->template($email_template, $notify_row['lang']);
+			
+			$messenger->assign_vars(array(
+				'EMAIL_SIG'		=> $email_sig,
+				'SITENAME'		=> $config['sitename'],
+				'USERNAME'		=> $notify_row['name'],
+				'SUBJECT'		=> $report_data['subject'],
+				'REPORTER'		=> $report_data['reporter'],
+
+				'REPORT_REASON'	=> $report_data['reason'],
+				'REPORT_TEXT'	=> $report_data['text'],
+
+				'U_VIEW_REPORT'	=> generate_board_url() . '/' . $view_report_url)
+			);
+
+			// break the sending process...
+			$messenger->send(false, true);
+			$messenger->reset();
+			
+			// do not put in reporters outbox
+			submit_pm('post', $report_data['subject'], '', array(), array(), array(
+				'address_list'	=> array('u' => array($user_id => 'to')),
+				'icon_id'		=> 0,
+				'enable_bbcode' 	=> 0,
+				'enable_html' 		=> 0,
+				'enable_smilies' 	=> 0,
+				'enable_magic_url' 	=> 1,
+				'enable_sig' 		=> 0,
+				'message_md5'		=> md5($messenger->msg),
+				'bbcode_bitfield'	=> 0,
+				'bbcode_uid'		=> 0,
+				'attachment_data'	=> array(),
+				'filename_data'		=> array(),
+				'message'			=> $messenger->msg				
+				), true, false);
+		}
+	}
+	unset($messenger);
+}
+
 ?>
 \ No newline at end of file
author	Meik Sievertsen <acydburn@phpbb.com>	2004-09-04 19:32:23 +0000
committer	Meik Sievertsen <acydburn@phpbb.com>	2004-09-04 19:32:23 +0000
commit	57b188b7afa66b68ef75ee69bc06cd8f14b3fed1 (patch)
tree	676d8f5348e2c790664127dd651774543bd9bf75 /phpBB/report.php
parent	68d73caefcf084f5f523ee7a47b84112dedd4e21 (diff)
download	forums-57b188b7afa66b68ef75ee69bc06cd8f14b3fed1.tar forums-57b188b7afa66b68ef75ee69bc06cd8f14b3fed1.tar.gz forums-57b188b7afa66b68ef75ee69bc06cd8f14b3fed1.tar.bz2 forums-57b188b7afa66b68ef75ee69bc06cd8f14b3fed1.tar.xz forums-57b188b7afa66b68ef75ee69bc06cd8f14b3fed1.zip