From 51600b8f181b20d88c42ea2fb6893200e4e955e7 Mon Sep 17 00:00:00 2001
From: Zoddo <zoddo.ino@gmail.com>
Date: Sun, 30 Aug 2015 16:49:25 +0200
Subject: [PATCH] [ticket/9485] Add post_id to relevant $phpbb_log->add()

PHPBB3-9485
---
 phpBB/includes/functions_posting.php | 2 ++
 phpBB/includes/mcp/mcp_main.php      | 3 +++
 phpBB/includes/mcp/mcp_post.php      | 1 +
 phpBB/includes/mcp/mcp_queue.php     | 2 ++
 phpBB/includes/mcp/mcp_reports.php   | 1 +
 phpBB/includes/mcp/mcp_warn.php      | 1 +
 6 files changed, 10 insertions(+)

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index e4520d7f03..0f42f1950a 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1700,6 +1700,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				$phpbb_log->add('mod', $user->data['user_id'], $user->ip, 'LOG_POST_EDITED', false, array(
 					'forum_id' => $data['forum_id'],
 					'topic_id' => $data['topic_id'],
+					'post_id'  => $data['post_id'],
 					$log_subject,
 					(!empty($username)) ? $username : $user->lang['GUEST'],
 					$data['post_edit_reason']
@@ -2666,6 +2667,7 @@ function phpbb_handle_post_delete($forum_id, $topic_id, $post_id, &$post_data, $
 				$phpbb_log->add('mod', $user->data['user_id'], $user->ip, (($is_soft) ? 'LOG_SOFTDELETE_POST' : 'LOG_DELETE_POST'), false, array(
 					'forum_id' => $forum_id,
 					'topic_id' => $topic_id,
+					'post_id'  => $post_id,
 					$post_data['post_subject'],
 					$post_username,
 					$delete_reason
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index 66e59bb74d..b0579d8995 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -322,6 +322,7 @@ function lock_unlock($action, $ids)
 			$phpbb_log->add('mod', $user->data['user_id'], $user->ip, 'LOG_' . strtoupper($action), false, array(
 				'forum_id' => $row['forum_id'],
 				'topic_id' => $row['topic_id'],
+				'post_id'  => isset($row['post_id']) ? $row['post_id'] : 0,
 				$row['topic_title']
 			));
 		}
@@ -1022,6 +1023,7 @@ function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '',
 			$phpbb_log->add('mod', $user->data['user_id'], $user->ip, 'LOG_SOFTDELETE_POST', false, array(
 				'forum_id' => $row['forum_id'],
 				'topic_id' => $row['topic_id'],
+				'post_id'  => $row['post_id'],
 				$row['post_subject'],
 				$post_username,
 				$soft_delete_reason
@@ -1071,6 +1073,7 @@ function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '',
 			$phpbb_log->add('mod', $user->data['user_id'], $user->ip, 'LOG_DELETE_POST', false, array(
 				'forum_id' => $row['forum_id'],
 				'topic_id' => $row['topic_id'],
+				'post_id'  => $row['post_id'],
 				$row['post_subject'],
 				$post_username,
 				$soft_delete_reason
diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php
index f53f40d66a..e59f0abb04 100644
--- a/phpBB/includes/mcp/mcp_post.php
+++ b/phpBB/includes/mcp/mcp_post.php
@@ -574,6 +574,7 @@ function change_poster(&$post_info, $userdata)
 	$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
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 3488ea326d..ac82c9f2ad 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -678,6 +678,7 @@ class mcp_queue
 				$approve_log[] = array(
 					'forum_id'		=> $post_data['forum_id'],
 					'topic_id'		=> $post_data['topic_id'],
+					'post_id'		=> $post_id,
 					'post_subject'	=> $post_data['post_subject'],
 				);
 			}
@@ -694,6 +695,7 @@ class mcp_queue
 				$phpbb_log->add('mod', $user->data['user_id'], $user->ip, 'LOG_POST_' . strtoupper($action) . 'D', false, array(
 					'forum_id' => $log_data['forum_id'],
 					'topic_id' => $log_data['topic_id'],
+					'post_id'  => $log_data['post_id'],
 					$log_data['post_subject']
 				));
 			}
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index 3970237058..45265c89e7 100644
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -716,6 +716,7 @@ function close_report($report_id_list, $mode, $action, $pm = false)
 				$phpbb_log->add('mod', $user->data['user_id'], $user->ip, 'LOG_REPORT_' .  strtoupper($action) . 'D', false, array(
 					'forum_id' => $post_info[$report['post_id']]['forum_id'],
 					'topic_id' => $post_info[$report['post_id']]['topic_id'],
+					'post_id'  => $report['post_id'],
 					$post_info[$report['post_id']]['post_subject']
 				));
 				$phpbb_notifications->delete_notifications('notification.type.report_post', $report['post_id']);
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index 970bdc6174..d4c5486ed4 100644
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -589,6 +589,7 @@ function add_warning($user_row, $warning, $send_pm = true, $post_id = 0)
 	$phpbb_log->add('mod', $user->data['user_id'], $user->ip, 'LOG_USER_WARNING', false, array(
 		'forum_id' => $row['forum_id'],
 		'topic_id' => $row['topic_id'],
+		'post_id'  => $post_id,
 		$user_row['username']
 	));
 }