From e05df3bf3d478a7442698f810b9ad01d872e2310 Mon Sep 17 00:00:00 2001 From: Stanislav Atanasov Date: Wed, 11 Jun 2014 03:27:14 +0300 Subject: [PATCH 1/4] [ticket/12690] Add core.submit_pm_after event Add core.submit_pm_after to funtion submit_pm. Event will return just submited msg_id. It should be plased just before return $data['msg_id']; Justification: Using only core.submit_pm_before does not allow to follow up after message submission. The message ID is recieved at DB submission. Some times we need the MSG_ID as identifier PHPBB3-12690 --- phpBB/includes/functions_privmsgs.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 92655cd035..2965143055 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -1906,6 +1906,17 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true) $phpbb_notifications->add_notifications('pm', $pm_data); } + /** + * Get PM message ID after submission to DB + * + * @event core.submit_pm_after + * @var int msg_id message ID + * @since 3.1.0-b5 + */ + $msg_id = $data['msg_id']; + $vars = array('msg_id'); + extract($phpbb_dispatcher->trigger_event('core.submit_pm_after', compact($vars))); + return $data['msg_id']; } From 9c6f74daff55b46e92e5f84f920ecb1b01728ee2 Mon Sep 17 00:00:00 2001 From: Stanislav Atanasov Date: Wed, 11 Jun 2014 10:47:12 +0300 Subject: [PATCH 2/4] [ticket/12690] Add other info to core.submit_pm_after Added $mode Added $subject Added $data Added $pm_data PHPBB3-12690 --- phpBB/includes/functions_privmsgs.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 2965143055..cfa6ba06c7 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -1911,10 +1911,14 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true) * * @event core.submit_pm_after * @var int msg_id message ID + * @var string mode PM Post mode - post|reply|quote|quotepost|forward|edit + * @var string subject Subject of the private message + * @var array data The whole row data of the PM. + * @var array pm_data The data sent to notification class * @since 3.1.0-b5 */ $msg_id = $data['msg_id']; - $vars = array('msg_id'); + $vars = array('msg_id', 'mode', 'subject', 'data', 'pm_data'); extract($phpbb_dispatcher->trigger_event('core.submit_pm_after', compact($vars))); return $data['msg_id']; From 85b37a5f4d1b0fc6d5aaa15f0e2f5f6b09b9db22 Mon Sep 17 00:00:00 2001 From: Stanislav Atanasov Date: Wed, 11 Jun 2014 17:18:52 +0300 Subject: [PATCH 3/4] [ticket/12690] Remove $msg_id and chmod Remove inneded $msg_id Chmod file to 644 PHPBB3-12690 --- phpBB/includes/functions_privmsgs.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 cfa6ba06c7..b5a99968d2 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -1910,15 +1910,13 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true) * Get PM message ID after submission to DB * * @event core.submit_pm_after - * @var int msg_id message ID * @var string mode PM Post mode - post|reply|quote|quotepost|forward|edit * @var string subject Subject of the private message * @var array data The whole row data of the PM. * @var array pm_data The data sent to notification class * @since 3.1.0-b5 */ - $msg_id = $data['msg_id']; - $vars = array('msg_id', 'mode', 'subject', 'data', 'pm_data'); + $vars = array('mode', 'subject', 'data', 'pm_data'); extract($phpbb_dispatcher->trigger_event('core.submit_pm_after', compact($vars))); return $data['msg_id']; From 2ee8b738e529fe575556660d3515e536ec387451 Mon Sep 17 00:00:00 2001 From: Stanislav Atanasov Date: Sun, 22 Jun 2014 23:22:15 +0300 Subject: [PATCH 4/4] [ticket/12690] Find a space Lost a spce there ... found it ... PHPBB3-12690 --- phpBB/includes/functions_privmsgs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index b5a99968d2..9d4abaa5f7 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -1918,7 +1918,7 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true) */ $vars = array('mode', 'subject', 'data', 'pm_data'); extract($phpbb_dispatcher->trigger_event('core.submit_pm_after', compact($vars))); - + return $data['msg_id']; }