From cd31aea4beeb8075c199ad43c2d14e79e2a6955c Mon Sep 17 00:00:00 2001
From: Stanislav Atanasov <lucifer@anavaro.com>
Date: Wed, 11 Jun 2014 05:04:32 +0300
Subject: [PATCH 1/3] [ticket/12691] Add core.delete_pm to funtion delete_pm

Add core.delete_pm to funtion delete_pm.
Event will return:
int $user_id - ID of the user requested the message delete
array $msg_ids - array of all messages to be deleted
int $folder_id - ID of the user folder where the messages are stored
Justification:
Allow extensions to capture this event
and act as intended by ext author

PHPBB3-12691
---
 phpBB/includes/functions_privmsgs.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 92655cd035..1fd4b1c98c 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -988,7 +988,7 @@ function handle_mark_actions($user_id, $mark_action)
 */
 function delete_pm($user_id, $msg_ids, $folder_id)
 {
-	global $db, $user, $phpbb_root_path, $phpEx, $phpbb_container;
+	global $db, $user, $phpbb_root_path, $phpEx, $phpbb_container, $phpbb_dispatcher;
 
 	$user_id	= (int) $user_id;
 	$folder_id	= (int) $folder_id;
@@ -1012,6 +1012,18 @@ function delete_pm($user_id, $msg_ids, $folder_id)
 		return false;
 	}
 
+	/**
+	* Get all info for PM(s) that are to be deleted
+	*
+	* @event core.delete_pm
+	* @var	int	user_id	 ID of the user requested the message delete
+	* @var	array	msg_ids	array of all messages to be deleted
+	* @var	int	folder_id	ID of the user folder where the messages are stored
+	* @since 3.1.0-b5
+	*/
+	$vars = array('user_id', 'msg_ids', 'folder_id');
+	extract($phpbb_dispatcher->trigger_event('core.delete_pm', compact($vars)));
+
 	// Get PM Information for later deleting
 	$sql = 'SELECT msg_id, pm_unread, pm_new
 		FROM ' . PRIVMSGS_TO_TABLE . '

From e8dd7904e9c6fb3404a803af1e84a4bce692c3e3 Mon Sep 17 00:00:00 2001
From: Stanislav Atanasov <lucifer@anavaro.com>
Date: Wed, 11 Jun 2014 10:41:52 +0300
Subject: [PATCH 2/3] [ticket/12691] Change event to core.delete_pm_before

Just a requested change by nickvergessen

PHPBB3-12691
---
 phpBB/includes/functions_privmsgs.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 phpBB/includes/functions_privmsgs.php

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
old mode 100644
new mode 100755
index 1fd4b1c98c..a86c46151d
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1013,16 +1013,16 @@ function delete_pm($user_id, $msg_ids, $folder_id)
 	}
 
 	/**
-	* Get all info for PM(s) that are to be deleted
+	* Get all info for PM(s) that are to be deleted before deletion
 	*
-	* @event core.delete_pm
+	* @event core.delete_pm_before
 	* @var	int	user_id	 ID of the user requested the message delete
 	* @var	array	msg_ids	array of all messages to be deleted
 	* @var	int	folder_id	ID of the user folder where the messages are stored
 	* @since 3.1.0-b5
 	*/
 	$vars = array('user_id', 'msg_ids', 'folder_id');
-	extract($phpbb_dispatcher->trigger_event('core.delete_pm', compact($vars)));
+	extract($phpbb_dispatcher->trigger_event('core.delete_pm_before', compact($vars)));
 
 	// Get PM Information for later deleting
 	$sql = 'SELECT msg_id, pm_unread, pm_new

From 992fb8e4525a655857f24329f42a07070e36c4db Mon Sep 17 00:00:00 2001
From: Stanislav Atanasov <lucifer@anavaro.com>
Date: Wed, 11 Jun 2014 17:21:46 +0300
Subject: [PATCH 3/3] [ticket/12691] Comment change

Change a bit the core event comment

PHPBB3-12691
---
 phpBB/includes/functions_privmsgs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100755 => 100644 phpBB/includes/functions_privmsgs.php

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
old mode 100755
new mode 100644
index a86c46151d..f9e80d5df1
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1013,7 +1013,7 @@ function delete_pm($user_id, $msg_ids, $folder_id)
 	}
 
 	/**
-	* Get all info for PM(s) that are to be deleted before deletion
+	* Get all info for PM(s) before they are deleted
 	*
 	* @event core.delete_pm_before
 	* @var	int	user_id	 ID of the user requested the message delete