diff options
Diffstat (limited to 'phpBB/includes/mcp/mcp_post.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_post.php | 30 | 
1 files changed, 17 insertions, 13 deletions
diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php index 1cf4a74234..60ec3b8f5a 100644 --- a/phpBB/includes/mcp/mcp_post.php +++ b/phpBB/includes/mcp/mcp_post.php @@ -25,13 +25,13 @@ if (!defined('IN_PHPBB'))  function mcp_post_details($id, $mode, $action)  {  	global $phpEx, $phpbb_root_path, $config, $request; -	global $template, $db, $user, $auth, $cache, $phpbb_container; -	global $phpbb_dispatcher; +	global $template, $db, $user, $auth; +	global $phpbb_container, $phpbb_dispatcher;  	$user->add_lang('posting'); -	$post_id = request_var('p', 0); -	$start	= request_var('start', 0); +	$post_id = $request->variable('p', 0); +	$start	= $request->variable('start', 0);  	// Get post data  	$post_info = phpbb_get_post_data(array($post_id), false, true); @@ -52,7 +52,7 @@ function mcp_post_details($id, $mode, $action)  			if ($auth->acl_get('m_info', $post_info['forum_id']))  			{ -				$ip = request_var('ip', ''); +				$ip = $request->variable('ip', '');  				if (!function_exists('user_ipwhois'))  				{  					include($phpbb_root_path . 'includes/functions_user.' . $phpEx); @@ -76,12 +76,12 @@ function mcp_post_details($id, $mode, $action)  			if ($action == 'chgposter')  			{ -				$username = request_var('username', '', true); +				$username = $request->variable('username', '', true);  				$sql_where = "username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'";  			}  			else  			{ -				$new_user_id = request_var('u', 0); +				$new_user_id = $request->variable('u', 0);  				$sql_where = 'user_id = ' . $new_user_id;  			} @@ -131,7 +131,6 @@ function mcp_post_details($id, $mode, $action)  	$users_ary = $usernames_ary = array();  	$attachments = $extensions = array();  	$post_id = $post_info['post_id']; -	$topic_tracking_info = array();  	// Get topic tracking info  	if ($config['load_db_lastread']) @@ -153,8 +152,6 @@ function mcp_post_details($id, $mode, $action)  	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 . ' @@ -263,7 +260,7 @@ function mcp_post_details($id, $mode, $action)  		'POST_SUBJECT'			=> $post_info['post_subject'],  		'POST_DATE'				=> $user->format_date($post_info['post_time']),  		'POST_IP'				=> $post_info['poster_ip'], -		'POST_IPADDR'			=> ($auth->acl_get('m_info', $post_info['forum_id']) && request_var('lookup', '')) ? @gethostbyaddr($post_info['poster_ip']) : '', +		'POST_IPADDR'			=> ($auth->acl_get('m_info', $post_info['forum_id']) && $request->variable('lookup', '')) ? @gethostbyaddr($post_info['poster_ip']) : '',  		'POST_ID'				=> $post_info['post_id'],  		'U_LOOKUP_IP'			=> ($auth->acl_get('m_info', $post_info['forum_id'])) ? "$url&i=$id&mode=$mode&lookup={$post_info['poster_ip']}#ip" : '', @@ -556,7 +553,7 @@ function phpbb_get_num_ips_for_poster(\phpbb\db\driver\driver_interface $db, $po  */  function change_poster(&$post_info, $userdata)  { -	global $auth, $db, $config, $phpbb_root_path, $phpEx, $user, $phpbb_dispatcher; +	global $auth, $db, $config, $phpbb_root_path, $phpEx, $user, $phpbb_log, $phpbb_dispatcher;  	if (empty($userdata) || $userdata['user_id'] == $post_info['user_id'])  	{ @@ -667,5 +664,12 @@ function change_poster(&$post_info, $userdata)  	$post_info = $post_info[$post_id];  	// Now add log entry -	add_log('mod', $post_info['forum_id'], $post_info['topic_id'], 'LOG_MCP_CHANGE_POSTER', $post_info['topic_title'], $from_username, $to_username); +	$phpbb_log->add('mod', $user->data['user_id'], $user->ip, 'LOG_MCP_CHANGE_POSTER', false, array( +		'forum_id' => $post_info['forum_id'], +		'topic_id' => $post_info['topic_id'], +		'post_id'  => $post_info['post_id'], +		$post_info['topic_title'], +		$from_username, +		$to_username +	));  }  | 
