Thread: [Phpbb-checkins] r9814 [1/2] - in /branches/phpBB-3_0_0/phpBB: ./ develop/ docs/ includes/ includes

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Author: naderman
Date: Tue Jul 21 20:59:11 2009
New Revision: 9814

Log:
Users can report PMs to moderators which are then visible in a new MCP module

Added:
    branches/phpBB-3_0_0/phpBB/includes/mcp/info/mcp_pm_reports.php
    branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_pm_reports.php
    branches/phpBB-3_0_0/phpBB/language/en/email/pm_report_closed.txt
    branches/phpBB-3_0_0/phpBB/language/en/email/pm_report_deleted.txt
Modified:
    branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php
    branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
    branches/phpBB-3_0_0/phpBB/includes/acp/acp_board.php
    branches/phpBB-3_0_0/phpBB/includes/functions_privmsgs.php
    branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_front.php
    branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_reports.php
    branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php
    branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewmessage.php
    branches/phpBB-3_0_0/phpBB/install/database_update.php
    branches/phpBB-3_0_0/phpBB/install/schemas/firebird_schema.sql
    branches/phpBB-3_0_0/phpBB/install/schemas/mssql_schema.sql
    branches/phpBB-3_0_0/phpBB/install/schemas/mysql_40_schema.sql
    branches/phpBB-3_0_0/phpBB/install/schemas/mysql_41_schema.sql
    branches/phpBB-3_0_0/phpBB/install/schemas/oracle_schema.sql
    branches/phpBB-3_0_0/phpBB/install/schemas/postgres_schema.sql
    branches/phpBB-3_0_0/phpBB/install/schemas/schema_data.sql
    branches/phpBB-3_0_0/phpBB/install/schemas/sqlite_schema.sql
    branches/phpBB-3_0_0/phpBB/language/en/acp/board.php
    branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
    branches/phpBB-3_0_0/phpBB/language/en/mcp.php
    branches/phpBB-3_0_0/phpBB/mcp.php
    branches/phpBB-3_0_0/phpBB/report.php
    branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_front.html
    branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_post.html
    branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_reports.html
    branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
    branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_front.html
    branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_post.html
    branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_reports.html
    branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/report_body.html
    branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html

Modified: branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php (original)
--- branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php Tue Jul 21 20:59:11 2009
***************
*** 1332,1337 ****
--- 1332,1338 ----
  			'message_edit_count'	=> array('USINT', 0),
  			'to_address'			=> array('TEXT_UNI', ''),
  			'bcc_address'			=> array('TEXT_UNI', ''),
+ 			'message_reported'		=> array('BOOL', 0),
  		),
  		'PRIMARY_KEY'	=> 'msg_id',
  		'KEYS'			=> array(
***************
*** 1465,1470 ****
--- 1466,1472 ----
  			'report_id'				=> array('UINT', NULL, 'auto_increment'),
  			'reason_id'				=> array('USINT', 0),
  			'post_id'				=> array('UINT', 0),
+ 			'pm_id'					=> array('UINT', 0),
  			'user_id'				=> array('UINT', 0),
  			'user_notify'			=> array('BOOL', 0),
  			'report_closed'			=> array('BOOL', 0),
***************
*** 1472,1477 ****
--- 1474,1483 ----
  			'report_text'			=> array('MTEXT_UNI', ''),
  		),
  		'PRIMARY_KEY'	=> 'report_id',
+ 		'KEYS'			=> array(
+ 			'post_id'			=> array('INDEX', 'post_id'),
+ 			'pm_id'				=> array('INDEX', 'pm_id'),
+ 		),
  	);
  
  	$schema_data['phpbb_reports_reasons'] = array(

Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Tue Jul 21 20:59:11 2009
***************
*** 217,222 ****
--- 217,223 ----
  		<li>[Feature] Ability to delete warnings and keep warnings permanently (Bug #43375 - Patch by nickvergessen)</li>
  		<li>[Feature] Ability to empty a user's outbox from the user ACP quick tools.</li>
  		<li>[Feature] Ability to filter ACP / MCP logs</li>
+ 		<li>[Feature] Users can report PMs to moderators which are then visible in a new MCP module</li>
  	</ul>
  
  	<a name="v304"></a><h3>1.ii. Changes since 3.0.4</h3>

Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_board.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_board.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_board.php Tue Jul 21 20:59:11 2009
***************
*** 81,86 ****
--- 81,87 ----
  						'allow_namechange'		=> array('lang' => 'ALLOW_NAME_CHANGE',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
  						'allow_attachments'		=> array('lang' => 'ALLOW_ATTACHMENTS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
  						'allow_pm_attach'		=> array('lang' => 'ALLOW_PM_ATTACHMENTS',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
+ 						'allow_pm_report'		=> array('lang' => 'ALLOW_PM_REPORT',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
  						'allow_bbcode'			=> array('lang' => 'ALLOW_BBCODE',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
  						'allow_smilies'			=> array('lang' => 'ALLOW_SMILIES',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
  						'allow_sig'				=> array('lang' => 'ALLOW_SIG',				'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),

Modified: branches/phpBB-3_0_0/phpBB/includes/functions_privmsgs.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_privmsgs.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_privmsgs.php Tue Jul 21 20:59:11 2009
***************
*** 1405,1411 ****
  				'bbcode_bitfield'	=> $data['bbcode_bitfield'],
  				'bbcode_uid'		=> $data['bbcode_uid'],
  				'to_address'		=> implode(':', $to),
! 				'bcc_address'		=> implode(':', $bcc)
  			);
  		break;
  
--- 1405,1412 ----
  				'bbcode_bitfield'	=> $data['bbcode_bitfield'],
  				'bbcode_uid'		=> $data['bbcode_uid'],
  				'to_address'		=> implode(':', $to),
! 				'bcc_address'		=> implode(':', $bcc),
! 				'message_reported'	=> 0,
  			);
  		break;
  
***************
*** 1880,1883 ****
--- 1881,1973 ----
  	$user->data['message_limit'] = (!$message_limit) ? $config['pm_max_msgs'] : $message_limit;
  }
  
+ /**
+ * Generates an array of coloured recipient names from a list of PMs - (groups & users)
+ *
+ * @param	array	$pm_by_id	An array of rows from PRIVMSGS_TABLE, keys are the msg_ids.
+ *
+ * @return	array				2D Array: array(msg_id => array('username or group string', ...), ...)
+ *								Usernames are generated with {@link get_username_string get_username_string}
+ *								Groups are coloured and have a link to the membership page
+ */
+ function get_recipient_strings($pm_by_id)
+ {
+ 	global $user, $db;
+ 
+ 	$address_list = $recipient_list = $address = array();
+ 
+ 	$_types = array('u', 'g');
+ 
+ 	foreach ($pm_by_id as $message_id => $row)
+ 	{
+ 		$address[$message_id] = rebuild_header(array('to' => $row['to_address'], 'bcc' => $row['bcc_address']));
+ 		
+ 		foreach ($_types as $ug_type)
+ 		{
+ 			if (isset($address[$message_id][$ug_type]) && sizeof($address[$message_id][$ug_type]))
+ 			{
+ 				foreach ($address[$message_id][$ug_type] as $ug_id => $in_to)
+ 				{
+ 					$recipient_list[$ug_type][$ug_id] = array('name' => $user->lang['NA'], 'colour' => '');
+ 				}
+ 			}
+ 		}
+ 	}
+ 
+ 	foreach ($_types as $ug_type)
+ 	{
+ 		if (!empty($recipient_list[$ug_type]))
+ 		{
+ 			if ($ug_type == 'u')
+ 			{
+ 				$sql = 'SELECT user_id as id, username as name, user_colour as colour
+ 					FROM ' . USERS_TABLE . '
+ 					WHERE ';
+ 			}
+ 			else
+ 			{
+ 				$sql = 'SELECT group_id as id, group_name as name, group_colour as colour, group_type
+ 					FROM ' . GROUPS_TABLE . '
+ 					WHERE ';
+ 			}
+ 			$sql .= $db->sql_in_set(($ug_type == 'u') ? 'user_id' : 'group_id', array_map('intval', array_keys($recipient_list[$ug_type])));
+ 
+ 			$result = $db->sql_query($sql);
+ 
+ 			while ($row = $db->sql_fetchrow($result))
+ 			{
+ 				if ($ug_type == 'g')
+ 				{
+ 					$row['name'] = ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['name']] : $row['name'];
+ 				}
+ 
+ 				$recipient_list[$ug_type][$row['id']] = array('name' => $row['name'], 'colour' => $row['colour']);
+ 			}
+ 			$db->sql_freeresult($result);
+ 		}
+ 	}
+ 
+ 	foreach ($address as $message_id => $adr_ary)
+ 	{
+ 		foreach ($adr_ary as $type => $id_ary)
+ 		{
+ 			foreach ($id_ary as $ug_id => $_id)
+ 			{
+ 				if ($type == 'u')
+ 				{
+ 					$address_list[$message_id][] = get_username_string('full', $ug_id, $recipient_list[$type][$ug_id]['name'], $recipient_list[$type][$ug_id]['colour']);
+ 				}
+ 				else
+ 				{
+ 					$user_colour = ($recipient_list[$type][$ug_id]['colour']) ? ' style="font-weight: bold; color:#' . $recipient_list[$type][$ug_id]['colour'] . '"' : '';
+ 					$link = '<a href="' . append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&amp;g=' . $ug_id) . '"' . $user_colour . '>';
+ 					$address_list[$message_id][] = $link . $recipient_list[$type][$ug_id]['name'] . (($link) ? '</a>' : '');
+ 				}
+ 			}
+ 		}
+ 	}
+ 
+ 	return $address_list;
+ }
+ 
  ?>
\ No newline at end of file

Added: branches/phpBB-3_0_0/phpBB/includes/mcp/info/mcp_pm_reports.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/info/mcp_pm_reports.php (added)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/info/mcp_pm_reports.php Tue Jul 21 20:59:11 2009
***************
*** 0 ****
--- 1,39 ----
+ <?php
+ /**
+ *
+ * @package mcp
+ * @version $Id$
+ * @copyright (c) 2005 phpBB Group
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ *
+ */
+ 
+ /**
+ * @package module_install
+ */
+ class mcp_pm_reports_info
+ {
+ 	function module()
+ 	{
+ 		return array(
+ 			'filename'	=> 'mcp_pm_reports',
+ 			'title'		=> 'MCP_PM_REPORTS',
+ 			'version'	=> '1.0.0',
+ 			'modes'		=> array(
+ 				'pm_reports'			=> array('title' => 'MCP_PM_REPORTS_OPEN', 'auth' => 'aclf_m_report', 'cat' => array('MCP_REPORTS')),
+ 				'pm_reports_closed'	=> array('title' => 'MCP_PM_REPORTS_CLOSED', 'auth' => 'aclf_m_report', 'cat' => array('MCP_REPORTS')),
+ 				'pm_report_details'	=> array('title' => 'MCP_PM_REPORT_DETAILS', 'auth' => 'aclf_m_report', 'cat' => array('MCP_REPORTS')),
+ 			),
+ 		);
+ 	}
+ 
+ 	function install()
+ 	{
+ 	}
+ 
+ 	function uninstall()
+ 	{
+ 	}
+ }
+ 
+ ?>
\ No newline at end of file

Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_front.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_front.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_front.php Tue Jul 21 20:59:11 2009
***************
*** 152,157 ****
--- 152,158 ----
  			$sql = 'SELECT COUNT(r.report_id) AS total
  				FROM ' . REPORTS_TABLE . ' r, ' . POSTS_TABLE . ' p
  				WHERE r.post_id = p.post_id
+ 					AND r.pm_id = 0
  					AND r.report_closed = 0
  					AND p.forum_id IN (0, ' . implode(', ', $forum_list) . ')';
  			$result = $db->sql_query($sql);
***************
*** 181,186 ****
--- 182,188 ----
  					),
  
  					'WHERE'		=> 'r.post_id = p.post_id
+ 						AND r.pm_id = 0
  						AND r.report_closed = 0
  						AND r.reason_id = rr.reason_id
  						AND p.topic_id = t.topic_id
***************
*** 243,248 ****
--- 245,340 ----
  		}
  	}
  
+ 	// Latest 5 reported PMs
+ 	if ($module->loaded('pm_reports') && $auth->acl_getf_global('m_report'))
+ 	{
+ 		$template->assign_var('S_SHOW_PM_REPORTS', true);
+ 
+ 		$sql = 'SELECT COUNT(r.report_id) AS total
+ 			FROM ' . REPORTS_TABLE . ' r, ' . PRIVMSGS_TABLE . ' p
+ 			WHERE r.post_id = 0
+ 				AND r.pm_id = p.msg_id
+ 				AND r.report_closed = 0';
+ 		$result = $db->sql_query($sql);
+ 		$total = (int) $db->sql_fetchfield('total');
+ 		$db->sql_freeresult($result);
+ 
+ 		if ($total)
+ 		{
+ 			include($phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx);
+ 			$user->add_lang(array('ucp'));
+ 
+ 			$sql = $db->sql_build_query('SELECT', array(
+ 				'SELECT'	=> 'r.report_id, r.report_time, p.msg_id, p.message_subject, p.message_time, p.to_address, p.bcc_address, u.username, u.username_clean, u.user_colour, u.user_id, u2.username as author_name, u2.username_clean as author_name_clean, u2.user_colour as author_colour, u2.user_id as author_id',
+ 
+ 				'FROM'		=> array(
+ 					REPORTS_TABLE			=> 'r',
+ 					REPORTS_REASONS_TABLE	=> 'rr',
+ 					USERS_TABLE				=> array('u', 'u2'),
+ 					PRIVMSGS_TABLE				=> 'p'
+ 				),
+ 
+ 				'WHERE'		=> 'r.pm_id = p.msg_id
+ 					AND r.post_id = 0
+ 					AND r.report_closed = 0
+ 					AND r.reason_id = rr.reason_id
+ 					AND r.user_id = u.user_id
+ 					AND p.author_id = u2.user_id',
+ 
+ 				'ORDER_BY'	=> 'p.message_time DESC'
+ 			));
+ 			$result = $db->sql_query_limit($sql, 5);
+ 
+ 			$pm_by_id = $pm_list = array();
+ 			while ($row = $db->sql_fetchrow($result))
+ 			{
+ 				$pm_by_id[(int) $row['msg_id']] = $row;
+ 				$pm_list[] = (int) $row['msg_id'];
+ 			}
+ 
+ 			$address_list = get_recipient_strings($pm_by_id);
+ 
+ 			foreach ($pm_list as $message_id)
+ 			{
+ 				$row = $pm_by_id[$message_id];
+ 
+ 				$template->assign_block_vars('pm_report', array(
+ 					'U_PM_DETAILS'	=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'r=' . $row['report_id'] . "&amp;i=pm_reports&amp;mode=pm_report_details"),
+ 					
+ 					'REPORTER_FULL'		=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
+ 					'REPORTER'			=> get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']),
+ 					'REPORTER_COLOUR'	=> get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']),
+ 					'U_REPORTER'		=> get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']),
+ 
+ 					'PM_AUTHOR_FULL'		=> get_username_string('full', $row['author_id'], $row['author_name'], $row['author_colour']),
+ 					'PM_AUTHOR'			=> get_username_string('username', $row['author_id'], $row['author_name'], $row['author_colour']),
+ 					'PM_AUTHOR_COLOUR'		=> get_username_string('colour', $row['author_id'], $row['author_name'], $row['author_colour']),
+ 					'U_PM_AUTHOR'			=> get_username_string('profile', $row['author_id'], $row['author_name'], $row['author_colour']),
+ 
+ 					'PM_SUBJECT'		=> $row['message_subject'],
+ 					'REPORT_TIME'		=> $user->format_date($row['report_time']),
+ 					'PM_TIME'			=> $user->format_date($row['message_time']),
+ 					'RECIPIENTS'		=> implode(', ', $address_list[$row['msg_id']]),
+ 				));
+ 			}
+ 		}
+ 
+ 		if ($total == 0)
+ 		{
+ 			$template->assign_vars(array(
+ 				'L_REPORTS_TOTAL'	=>	$user->lang['REPORTS_ZERO_TOTAL'],
+ 				'S_HAS_PM_REPORTS'		=>	false)
+ 			);
+ 		}
+ 		else
+ 		{
+ 			$template->assign_vars(array(
+ 				'L_REPORTS_TOTAL'	=> ($total == 1) ? $user->lang['REPORT_TOTAL'] : sprintf($user->lang['REPORTS_TOTAL'], $total),
+ 				'S_HAS_REPORTS'		=> true)
+ 			);
+ 		}
+ 	}
+ 
  	// Latest 5 logs
  	if ($module->loaded('logs'))
  	{

Added: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_pm_reports.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_pm_reports.php (added)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_pm_reports.php Tue Jul 21 20:59:11 2009
***************
*** 0 ****
--- 1,323 ----
+ <?php
+ /**
+ *
+ * @package mcp
+ * @version $Id$
+ * @copyright (c) 2005 phpBB Group
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ *
+ */
+ 
+ /**
+ * @ignore
+ */
+ if (!defined('IN_PHPBB'))
+ {
+ 	exit;
+ }
+ 
+ /**
+ * mcp_reports
+ * Handling the reports queue
+ * @package mcp
+ */
+ class mcp_pm_reports
+ {
+ 	var $p_master;
+ 	var $u_action;
+ 
+ 	function mcp_pm_reports(&$p_master)
+ 	{
+ 		$this->p_master = &$p_master;
+ 	}
+ 
+ 	function main($id, $mode)
+ 	{
+ 		global $auth, $db, $user, $template, $cache;
+ 		global $config, $phpbb_root_path, $phpEx, $action;
+ 
+ 		include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
+ 		include_once($phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx);
+ 
+ 		$start = request_var('start', 0);
+ 
+ 		$this->page_title = 'MCP_PM_REPORTS';
+ 
+ 		switch ($action)
+ 		{
+ 			case 'close':
+ 			case 'delete':
+ 				include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
+ 
+ 				$report_id_list = request_var('report_id_list', array(0));
+ 
+ 				if (!sizeof($report_id_list))
+ 				{
+ 					trigger_error('NO_REPORT_SELECTED');
+ 				}
+ 
+ 				if (!function_exists('close_report'))
+ 				{
+ 					include($phpbb_root_path . 'includes/mcp/mcp_reports.' . $phpEx);
+ 				}
+ 
+ 				close_report($report_id_list, $mode, $action, true);
+ 
+ 			break;
+ 		}
+ 
+ 		switch ($mode)
+ 		{
+ 			case 'pm_report_details':
+ 
+ 				$user->add_lang(array('posting', 'viewforum', 'viewtopic', 'ucp'));
+ 
+ 				$report_id = request_var('r', 0);
+ 
+ 				$sql = 'SELECT r.pm_id, r.user_id, r.report_id, r.report_closed, report_time, r.report_text, rr.reason_title, rr.reason_description, u.username, u.username_clean, u.user_colour
+ 					FROM ' . REPORTS_TABLE . ' r, ' . REPORTS_REASONS_TABLE . ' rr, ' . USERS_TABLE . ' u
+ 					WHERE r.report_id = ' . $report_id . '
+ 						AND rr.reason_id = r.reason_id
+ 						AND r.user_id = u.user_id
+ 						AND r.post_id = 0
+ 					ORDER BY report_closed ASC';
+ 				$result = $db->sql_query_limit($sql, 1);
+ 				$report = $db->sql_fetchrow($result);
+ 				$db->sql_freeresult($result);
+ 
+ 				if (!$report_id || !$report)
+ 				{
+ 					trigger_error('NO_REPORT');
+ 				}
+ 
+ 				$pm_id = $report['pm_id'];
+ 				$report_id = $report['report_id'];
+ 
+ 				$pm_info = get_pm_data(array($pm_id));
+ 
+ 				if (!sizeof($pm_info))
+ 				{
+ 					trigger_error('NO_REPORT_SELECTED');
+ 				}
+ 
+ 				$pm_info = $pm_info[$pm_id];
+ 
+ 				write_pm_addresses(array('to' => $pm_info['to_address'], 'bcc' => $pm_info['bcc_address']), (int) $pm_info['author_id']);
+ 
+ 				$reason = array('title' => $report['reason_title'], 'description' => $report['reason_description']);
+ 				if (isset($user->lang['report_reasons']['TITLE'][strtoupper($reason['title'])]) && isset($user->lang['report_reasons']['DESCRIPTION'][strtoupper($reason['title'])]))
+ 				{
+ 					$reason['description'] = $user->lang['report_reasons']['DESCRIPTION'][strtoupper($reason['title'])];
+ 					$reason['title'] = $user->lang['report_reasons']['TITLE'][strtoupper($reason['title'])];
+ 				}
+ 
+ 				// Process message, leave it uncensored
+ 				$message = $pm_info['message_text'];
+ 
+ 				if ($pm_info['bbcode_bitfield'])
+ 				{
+ 					include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx);
+ 					$bbcode = new bbcode($pm_info['bbcode_bitfield']);
+ 					$bbcode->bbcode_second_pass($message, $pm_info['bbcode_uid'], $pm_info['bbcode_bitfield']);
+ 				}
+ 
+ 				$message = bbcode_nl2br($message);
+ 				$message = smiley_text($message);
+ 
+ 				if ($pm_info['message_attachment'] && $auth->acl_get('u_pm_download'))
+ 				{
+ 					$sql = 'SELECT *
+ 						FROM ' . ATTACHMENTS_TABLE . '
+ 						WHERE post_msg_id = ' . $pm_id . '
+ 							AND in_message = 1
+ 						ORDER BY filetime DESC';
+ 					$result = $db->sql_query($sql);
+ 
+ 					while ($row = $db->sql_fetchrow($result))
+ 					{
+ 						$attachments[] = $row;
+ 					}
+ 					$db->sql_freeresult($result);
+ 
+ 					if (sizeof($attachments))
+ 					{
+ 						$update_count = array();
+ 						parse_attachments(0, $message, $attachments, $update_count);
+ 					}
+ 
+ 					// Display not already displayed Attachments for this post, we already parsed them. ;)
+ 					if (!empty($attachments))
+ 					{
+ 						$template->assign_var('S_HAS_ATTACHMENTS', true);
+ 
+ 						foreach ($attachments as $attachment)
+ 						{
+ 							$template->assign_block_vars('attachment', array(
+ 								'DISPLAY_ATTACHMENT'	=> $attachment)
+ 							);
+ 						}
+ 					}
+ 				}
+ 
+ 				$template->assign_vars(array(
+ 					'S_MCP_REPORT'			=> true,
+ 					'S_PM'					=> true,
+ 					'S_CLOSE_ACTION'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=pm_reports&amp;mode=pm_report_details&amp;r=' . $report_id),
+ 					'S_CAN_VIEWIP'			=> $auth->acl_getf_global('m_info'),
+ 					'S_POST_REPORTED'		=> $pm_info['message_reported'],
+ 					'S_USER_NOTES'			=> true,
+ 
+ 					'U_MCP_REPORT'				=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=pm_reports&amp;mode=pm_report_details&amp;r=' . $report_id),
+ 					'U_MCP_REPORTER_NOTES'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&amp;mode=user_notes&amp;u=' . $report['user_id']),
+ 					'U_MCP_USER_NOTES'			=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&amp;mode=user_notes&amp;u=' . $pm_info['author_id']),
+ 					'U_MCP_WARN_REPORTER'		=> ($auth->acl_get('m_warn')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&amp;mode=warn_user&amp;u=' . $report['user_id']) : '',
+ 					'U_MCP_WARN_USER'			=> ($auth->acl_get('m_warn')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&amp;mode=warn_user&amp;u=' . $pm_info['author_id']) : '',
+ 					
+ 					'EDIT_IMG'				=> $user->img('icon_post_edit', $user->lang['EDIT_POST']),
+ 					'MINI_POST_IMG'			=> $user->img('icon_post_target', 'POST'),
+ 
+ 					'RETURN_REPORTS'			=> sprintf($user->lang['RETURN_REPORTS'], '<a href="' . append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=pm_reports' . (($pm_info['message_reported']) ? '&amp;mode=pm_reports' : '&amp;mode=pm_reports_closed') . '&amp;start=' . $start) . '">', '</a>'),
+ 					'REPORTED_IMG'				=> $user->img('icon_topic_reported', $user->lang['POST_REPORTED']),
+ 					'REPORT_DATE'				=> $user->format_date($report['report_time']),
+ 					'REPORT_ID'					=> $report_id,
+ 					'REPORT_REASON_TITLE'		=> $reason['title'],
+ 					'REPORT_REASON_DESCRIPTION'	=> $reason['description'],
+ 					'REPORT_TEXT'				=> $report['report_text'],
+ 
+ 					'POST_AUTHOR_FULL'		=> get_username_string('full', $pm_info['author_id'], $pm_info['username'], $pm_info['user_colour']),
+ 					'POST_AUTHOR_COLOUR'	=> get_username_string('colour', $pm_info['author_id'], $pm_info['username'], $pm_info['user_colour']),
+ 					'POST_AUTHOR'			=> get_username_string('username', $pm_info['author_id'], $pm_info['username'], $pm_info['user_colour']),
+ 					'U_POST_AUTHOR'			=> get_username_string('profile', $pm_info['author_id'], $pm_info['username'], $pm_info['user_colour']),
+ 
+ 					'REPORTER_FULL'				=> get_username_string('full', $report['user_id'], $report['username'], $report['user_colour']),
+ 					'REPORTER_COLOUR'			=> get_username_string('colour', $report['user_id'], $report['username'], $report['user_colour']),
+ 					'REPORTER_NAME'				=> get_username_string('username', $report['user_id'], $report['username'], $report['user_colour']),
+ 					'U_VIEW_REPORTER_PROFILE'	=> get_username_string('profile', $report['user_id'], $report['username'], $report['user_colour']),
+ 
+ 					'POST_PREVIEW'			=> $message,
+ 					'POST_SUBJECT'			=> ($pm_info['message_subject']) ? $pm_info['message_subject'] : $user->lang['NO_SUBJECT'],
+ 					'POST_DATE'				=> $user->format_date($pm_info['message_time']),
+ 					'POST_IP'				=> $pm_info['author_ip'],
+ 					'POST_IPADDR'			=> ($auth->acl_getf_global('m_info') && request_var('lookup', '')) ? @gethostbyaddr($pm_info['author_ip']) : '',
+ 					'POST_ID'				=> $pm_info['msg_id'],
+ 
+ 					'U_LOOKUP_IP'			=> ($auth->acl_getf_global('m_info')) ? $this->u_action . '&amp;r=' . $report_id . '&amp;pm=' . $pm_id . '&amp;lookup=' . $pm_info['author_ip'] . '#ip' : '',
+ 				));
+ 
+ 				$this->tpl_name = 'mcp_post';
+ 
+ 			break;
+ 
+ 			case 'pm_reports':
+ 			case 'pm_reports_closed':
+ 				$user->add_lang(array('ucp'));
+ 
+ 				$sort_days = $total = 0;
+ 				$sort_key = $sort_dir = '';
+ 				$sort_by_sql = $sort_order_sql = array();
+ 				mcp_sorting($mode, $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total);
+ 
+ 				$limit_time_sql = ($sort_days) ? 'AND r.report_time >= ' . (time() - ($sort_days * 86400)) : '';
+ 
+ 				if ($mode == 'pm_reports')
+ 				{
+ 					$report_state = 'pm.message_reported = 1 AND r.report_closed = 0';
+ 				}
+ 				else
+ 				{
+ 					$report_state = 'r.report_closed = 1';
+ 				}
+ 
+ 				$sql = 'SELECT r.report_id
+ 					FROM ' . PRIVMSGS_TABLE . ' pm, ' . REPORTS_TABLE . ' r ' . (($sort_order_sql[0] == 'u') ? ', ' . USERS_TABLE . ' u' : '') . (($sort_order_sql[0] == 'r') ? ', ' . USERS_TABLE . ' ru' : '') . "
+ 					WHERE $report_state
+ 						AND r.pm_id = pm.msg_id
+ 						" . (($sort_order_sql[0] == 'u') ? 'AND u.user_id = pm.author_id' : '') . '
+ 						' . (($sort_order_sql[0] == 'r') ? 'AND ru.user_id = r.user_id' : '') . "
+ 						AND r.post_id = 0
+ 						$limit_time_sql
+ 					ORDER BY $sort_order_sql";
+ 				$result = $db->sql_query_limit($sql, $config['topics_per_page'], $start);
+ 
+ 				$i = 0;
+ 				$report_ids = array();
+ 				while ($row = $db->sql_fetchrow($result))
+ 				{
+ 					$report_ids[] = $row['report_id'];
+ 					$row_num[$row['report_id']] = $i++;
+ 				}
+ 				$db->sql_freeresult($result);
+ 
+ 				if (sizeof($report_ids))
+ 				{
+ 					$sql = 'SELECT p.*, u.username, u.username_clean, u.user_colour, r.user_id as reporter_id, ru.username as reporter_name, ru.user_colour as reporter_colour, r.report_time, r.report_id
+ 						FROM ' . REPORTS_TABLE . ' r, ' . PRIVMSGS_TABLE . ' p, ' . USERS_TABLE . ' u, ' . USERS_TABLE . ' ru
+ 						WHERE ' . $db->sql_in_set('r.report_id', $report_ids) . "
+ 							AND r.pm_id = p.msg_id
+ 							AND p.author_id = u.user_id
+ 							AND ru.user_id = r.user_id
+ 						ORDER BY $sort_order_sql";
+ 					$result = $db->sql_query($sql);
+ 
+ 					$pm_list = $pm_by_id = array();
+ 					while ($row = $db->sql_fetchrow($result))
+ 					{
+ 						$pm_by_id[(int) $row['msg_id']] = $row;
+ 						$pm_list[] = (int) $row['msg_id'];
+ 					}
+ 					$db->sql_freeresult($result);
+ 
+ 					if (sizeof($pm_list))
+ 					{
+ 						$address_list = get_recipient_strings($pm_by_id);
+ 
+ 						foreach ($pm_list as $message_id)
+ 						{
+ 							$row = $pm_by_id[$message_id];
+ 							$template->assign_block_vars('postrow', array(
+ 								'U_VIEW_DETAILS'			=> append_sid("{$phpbb_root_path}mcp.$phpEx", "i=pm_reports&amp;mode=pm_report_details&amp;r={$row['report_id']}"),
+ 
+ 								'PM_AUTHOR_FULL'		=> get_username_string('full', $row['author_id'], $row['username'], $row['user_colour']),
+ 								'PM_AUTHOR_COLOUR'		=> get_username_string('colour', $row['author_id'], $row['username'], $row['user_colour']),
+ 								'PM_AUTHOR'				=> get_username_string('username', $row['author_id'], $row['username'], $row['user_colour']),
+ 								'U_PM_AUTHOR'			=> get_username_string('profile', $row['author_id'], $row['username'], $row['user_colour']),
+ 
+ 								'REPORTER_FULL'			=> get_username_string('full', $row['reporter_id'], $row['reporter_name'], $row['reporter_colour']),
+ 								'REPORTER_COLOUR'		=> get_username_string('colour', $row['reporter_id'], $row['reporter_name'], $row['reporter_colour']),
+ 								'REPORTER'				=> get_username_string('username', $row['reporter_id'], $row['reporter_name'], $row['reporter_colour']),
+ 								'U_REPORTER'			=> get_username_string('profile', $row['reporter_id'], $row['reporter_name'], $row['reporter_colour']),
+ 
+ 								'PM_SUBJECT'			=> ($row['message_subject']) ? $row['message_subject'] : $user->lang['NO_SUBJECT'],
+ 								'PM_TIME'				=> $user->format_date($row['message_time']),
+ 								'REPORT_ID'				=> $row['report_id'],
+ 								'REPORT_TIME'			=> $user->format_date($row['report_time']),
+ 
+ 								'RECIPIENTS'			=> implode(', ', $address_list[$row['msg_id']]),
+ 							));
+ 						}
+ 					}
+ 				}
+ 
+ 				// Now display the page
+ 				$template->assign_vars(array(
+ 					'L_EXPLAIN'				=> ($mode == 'pm_reports') ? $user->lang['MCP_PM_REPORTS_OPEN_EXPLAIN'] : $user->lang['MCP_PM_REPORTS_CLOSED_EXPLAIN'],
+ 					'L_TITLE'				=> ($mode == 'pm_reports') ? $user->lang['MCP_PM_REPORTS_OPEN'] : $user->lang['MCP_PM_REPORTS_CLOSED'],
+ 					
+ 					'S_PM'					=> true,
+ 					'S_MCP_ACTION'			=> $this->u_action,
+ 					'S_CLOSED'				=> ($mode == 'pm_reports_closed') ? true : false,
+ 
+ 					'PAGINATION'			=> generate_pagination($this->u_action . "&amp;st=$sort_days&amp;sk=$sort_key&amp;sd=$sort_dir", $total, $config['topics_per_page'], $start),
+ 					'PAGE_NUMBER'			=> on_page($total, $config['topics_per_page'], $start),
+ 					'TOTAL'					=> $total,
+ 					'TOTAL_REPORTS'			=> ($total == 1) ? $user->lang['LIST_REPORT'] : sprintf($user->lang['LIST_REPORTS'], $total),					
+ 					)
+ 				);
+ 
+ 				$this->tpl_name = 'mcp_reports';
+ 			break;
+ 		}
+ 	}
+ }
+ 
+ ?>
\ No newline at end of file

Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_reports.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_reports.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_reports.php Tue Jul 21 20:59:11 2009
***************
*** 77,82 ****
--- 77,83 ----
  					WHERE ' . (($report_id) ? 'r.report_id = ' . $report_id : "r.post_id = $post_id") . '
  						AND rr.reason_id = r.reason_id
  						AND r.user_id = u.user_id
+ 						AND r.pm_id = 0
  					ORDER BY report_closed ASC';
  				$result = $db->sql_query_limit($sql, 1);
  				$report = $db->sql_fetchrow($result);
***************
*** 149,161 ****
  
  				if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))
  				{
- 					$extensions = $cache->obtain_attach_extensions($post_info['forum_id']);
- 
  					$sql = 'SELECT *
  						FROM ' . ATTACHMENTS_TABLE . '
  						WHERE post_msg_id = ' . $post_id . '
  							AND in_message = ...
 
[truncated message content]

Thread: [Phpbb-checkins] r9814 [1/2] - in /branches/phpBB-3_0_0/phpBB: ./ develop/ docs/ includes/ includes

phpBB is the world's leading open source discussion forum software.

phpbb-checkins