From 5d66d4c91f51cb1239deed978e79552b22c9276a Mon Sep 17 00:00:00 2001
From: pasha <smanst3r@gmail.com>
Date: Tue, 13 Oct 2020 10:46:07 +0300
Subject: [PATCH 1/3] [ticket/16617] Events for posting/pm statuses

PHPBB3-16617
---
 phpBB/includes/ucp/ucp_pm_compose.php | 20 ++++++++++++++++++++
 phpBB/posting.php                     | 22 ++++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 9edb5be623..d85a6ec22a 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -687,6 +687,26 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 	$flash_status	= ($config['auth_flash_pm'] && $auth->acl_get('u_pm_flash')) ? true : false;
 	$url_status		= ($config['allow_post_links']) ? true : false;
 
+	/**
+	 * Adds an opportunity to rewrite in private messages content statuses with extensions
+	 *
+	 * @event core.pm_content_statuses_settings
+	 *
+	 * @var bool bbcode_status
+	 * @var bool smilies_status
+	 * @var bool img_status
+	 * @var bool url_status
+	 * @var bool flash_status
+	 */
+	$vars = [
+		'bbcode_status',
+		'smilies_status',
+		'img_status',
+		'url_status',
+		'flash_status',
+	];
+	extract($phpbb_dispatcher->trigger_event('core.pm_content_statuses_settings', compact($vars)));
+
 	// Save Draft
 	if ($save && $auth->acl_get('u_savedrafts'))
 	{
diff --git a/phpBB/posting.php b/phpBB/posting.php
index d3633cf2d8..ef7833771a 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -729,6 +729,28 @@ $url_status		= ($config['allow_post_links']) ? true : false;
 $flash_status	= ($bbcode_status && $auth->acl_get('f_flash', $forum_id) && $config['allow_post_flash']) ? true : false;
 $quote_status	= true;
 
+/**
+ * Adds an opportunity to rewrite in posting content statuses with extensions
+ *
+ * @event core.posting_content_statuses_settings
+ *
+ * @var bool bbcode_status
+ * @var bool smilies_status
+ * @var bool img_status
+ * @var bool url_status
+ * @var bool flash_status
+ * @var bool quote_status
+ */
+$vars = [
+	'bbcode_status',
+	'smilies_status',
+	'img_status',
+	'url_status',
+	'flash_status',
+	'quote_status',
+];
+extract($phpbb_dispatcher->trigger_event('core.posting_content_statuses_settings', compact($vars)));
+
 // Save Draft
 if ($save && $user->data['is_registered'] && $auth->acl_get('u_savedrafts') && ($mode == 'reply' || $mode == 'post' || $mode == 'quote'))
 {

From 5d270319e55b9d7a6457470f48dbbb131d61d7a6 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sat, 21 Nov 2020 10:56:31 +0700
Subject: [PATCH 2/3] [ticket/16617] Add events to override message/PM BBCode
 status indications

PHPBB3-16617
---
 phpBB/includes/ucp/ucp_pm_compose.php | 19 ++++++++++---------
 phpBB/posting.php                     | 19 ++++++++++---------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index d85a6ec22a..0df50c2632 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -688,24 +688,25 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 	$url_status		= ($config['allow_post_links']) ? true : false;
 
 	/**
-	 * Adds an opportunity to rewrite in private messages content statuses with extensions
+	 * Event to override private message BBCode status indications
 	 *
-	 * @event core.pm_content_statuses_settings
+	 * @event core.ucp_pm_compose_modify_bbcode_status_indications
 	 *
-	 * @var bool bbcode_status
-	 * @var bool smilies_status
-	 * @var bool img_status
-	 * @var bool url_status
-	 * @var bool flash_status
+	 * @var bool	bbcode_status	BBCode status
+	 * @var bool	smilies_status	Smilies status
+	 * @var bool	img_status		Image BBCode status
+	 * @var bool	flash_status	Flash BBCode status
+	 * @var bool	url_status		URL BBCode status
+	 * @since 3.3.3-RC1
 	 */
 	$vars = [
 		'bbcode_status',
 		'smilies_status',
 		'img_status',
-		'url_status',
 		'flash_status',
+		'url_status',
 	];
-	extract($phpbb_dispatcher->trigger_event('core.pm_content_statuses_settings', compact($vars)));
+	extract($phpbb_dispatcher->trigger_event('core.ucp_pm_compose_modify_bbcode_status_indications', compact($vars)));
 
 	// Save Draft
 	if ($save && $auth->acl_get('u_savedrafts'))
diff --git a/phpBB/posting.php b/phpBB/posting.php
index ef7833771a..85d1b10966 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -730,16 +730,17 @@ $flash_status	= ($bbcode_status && $auth->acl_get('f_flash', $forum_id) && $conf
 $quote_status	= true;
 
 /**
- * Adds an opportunity to rewrite in posting content statuses with extensions
+ * Event to override message BBCode status indications
  *
- * @event core.posting_content_statuses_settings
+ * @event core.posting_modify_bbcode_status_indications
  *
- * @var bool bbcode_status
- * @var bool smilies_status
- * @var bool img_status
- * @var bool url_status
- * @var bool flash_status
- * @var bool quote_status
+ * @var bool	bbcode_status	BBCode status
+ * @var bool	smilies_status	Smilies status
+ * @var bool	img_status		Image BBCode status
+ * @var bool	url_status		URL BBCode status
+ * @var bool	flash_status	Flash BBCode status
+ * @var bool	quote_status	Quote BBCode status
+ * @since 3.3.3-RC1
  */
 $vars = [
 	'bbcode_status',
@@ -749,7 +750,7 @@ $vars = [
 	'flash_status',
 	'quote_status',
 ];
-extract($phpbb_dispatcher->trigger_event('core.posting_content_statuses_settings', compact($vars)));
+extract($phpbb_dispatcher->trigger_event('core.posting_modify_bbcode_status_indications', compact($vars)));
 
 // Save Draft
 if ($save && $user->data['is_registered'] && $auth->acl_get('u_savedrafts') && ($mode == 'reply' || $mode == 'post' || $mode == 'quote'))

From 812ba990ac0ff1b53b9baab7ce396107fc05ddcf Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sat, 21 Nov 2020 13:33:04 +0700
Subject: [PATCH 3/3] [ticket/16617] Shorten event names

PHPBB3-16617
---
 phpBB/includes/ucp/ucp_pm_compose.php | 4 ++--
 phpBB/posting.php                     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 0df50c2632..7cb4c85916 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -690,7 +690,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 	/**
 	 * Event to override private message BBCode status indications
 	 *
-	 * @event core.ucp_pm_compose_modify_bbcode_status_indications
+	 * @event core.ucp_pm_compose_modify_bbcode_status
 	 *
 	 * @var bool	bbcode_status	BBCode status
 	 * @var bool	smilies_status	Smilies status
@@ -706,7 +706,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 		'flash_status',
 		'url_status',
 	];
-	extract($phpbb_dispatcher->trigger_event('core.ucp_pm_compose_modify_bbcode_status_indications', compact($vars)));
+	extract($phpbb_dispatcher->trigger_event('core.ucp_pm_compose_modify_bbcode_status', compact($vars)));
 
 	// Save Draft
 	if ($save && $auth->acl_get('u_savedrafts'))
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 85d1b10966..696c3346cb 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -732,7 +732,7 @@ $quote_status	= true;
 /**
  * Event to override message BBCode status indications
  *
- * @event core.posting_modify_bbcode_status_indications
+ * @event core.posting_modify_bbcode_status
  *
  * @var bool	bbcode_status	BBCode status
  * @var bool	smilies_status	Smilies status
@@ -750,7 +750,7 @@ $vars = [
 	'flash_status',
 	'quote_status',
 ];
-extract($phpbb_dispatcher->trigger_event('core.posting_modify_bbcode_status_indications', compact($vars)));
+extract($phpbb_dispatcher->trigger_event('core.posting_modify_bbcode_status', compact($vars)));
 
 // Save Draft
 if ($save && $user->data['is_registered'] && $auth->acl_get('u_savedrafts') && ($mode == 'reply' || $mode == 'post' || $mode == 'quote'))