From c7bbcd7b84ad142a1fb804558c549a1e295a21ee Mon Sep 17 00:00:00 2001 From: Richard McGirr Date: Fri, 6 May 2016 06:31:35 -0400 Subject: [PATCH 1/3] [ticket/14630] Add event to modify pm message https://tracker.phpbb.com/browse/PHPBB3-14630 PHPBB3-14630 --- phpBB/includes/ucp/ucp_pm_compose.php | 28 +++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index aae80b0c06..62ea82bf1f 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -751,6 +751,34 @@ function compose_pm($id, $mode, $action, $user_folders = array()) $enable_urls = (isset($_POST['disable_magic_url'])) ? 0 : 1; $enable_sig = (!$config['allow_sig'] ||!$config['allow_sig_pm']) ? false : ((isset($_POST['attach_sig'])) ? true : false); + /** + * Modify Private message + * + * @event core.ucp_pm_compose_modify_private_message + * @var bool enable_bbcode Whether or not bbcode is enabled + * @var bool enable_smilies Whether or not smilies are enabled + * @var bool enable_urls Whether or not urls are enabled + * @var bool enable_sig Whether or not signature is enabled + * @var string subject PM subject text + * @var object message_parser The message parser object + * @var bool submit Whether or not the form has been sumitted + * @var bool preview Whether or not the signature is being previewed + * @var string error Any error strings + * @since 3.1.10-RC1 + */ + $vars = array( + 'enable_bbcode', + 'enable_smilies', + 'enable_urls', + 'enable_sig', + 'subject', + 'message_parser', + 'submit', + 'preview', + 'error', + ); + extract($phpbb_dispatcher->trigger_event('core.ucp_pm_compose_modify_private_message', compact($vars))); + if ($submit) { $status_switch = (($enable_bbcode+1) << 8) + (($enable_smilies+1) << 4) + (($enable_urls+1) << 2) + (($enable_sig+1) << 1); From 06507f9fa63ddacc3aec611247cfaaaa06ea3231 Mon Sep 17 00:00:00 2001 From: Richard McGirr Date: Mon, 16 May 2016 17:57:26 -0400 Subject: [PATCH 2/3] [ticket/14630] Change event name and fix capitalization PHPBB3-14630 --- phpBB/includes/ucp/ucp_pm_compose.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 62ea82bf1f..f9990a7ad0 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -752,9 +752,9 @@ function compose_pm($id, $mode, $action, $user_folders = array()) $enable_sig = (!$config['allow_sig'] ||!$config['allow_sig_pm']) ? false : ((isset($_POST['attach_sig'])) ? true : false); /** - * Modify Private message + * Modify private message * - * @event core.ucp_pm_compose_modify_private_message + * @event core.ucp_pm_compose_modify_submit_before * @var bool enable_bbcode Whether or not bbcode is enabled * @var bool enable_smilies Whether or not smilies are enabled * @var bool enable_urls Whether or not urls are enabled @@ -777,7 +777,7 @@ function compose_pm($id, $mode, $action, $user_folders = array()) 'preview', 'error', ); - extract($phpbb_dispatcher->trigger_event('core.ucp_pm_compose_modify_private_message', compact($vars))); + extract($phpbb_dispatcher->trigger_event('core.ucp_pm_compose_modify_submit_before', compact($vars))); if ($submit) { From 08acf2acba01d997239712acd245ff96e2770acb Mon Sep 17 00:00:00 2001 From: Richard McGirr Date: Thu, 2 Jun 2016 05:18:14 -0400 Subject: [PATCH 3/3] [ticket/14630] Rename core event PHPBB3-14630 --- phpBB/includes/ucp/ucp_pm_compose.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index f9990a7ad0..d365e8b489 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -754,7 +754,7 @@ function compose_pm($id, $mode, $action, $user_folders = array()) /** * Modify private message * - * @event core.ucp_pm_compose_modify_submit_before + * @event core.ucp_pm_compose_modify_parse_before * @var bool enable_bbcode Whether or not bbcode is enabled * @var bool enable_smilies Whether or not smilies are enabled * @var bool enable_urls Whether or not urls are enabled @@ -763,7 +763,7 @@ function compose_pm($id, $mode, $action, $user_folders = array()) * @var object message_parser The message parser object * @var bool submit Whether or not the form has been sumitted * @var bool preview Whether or not the signature is being previewed - * @var string error Any error strings + * @var array error Any error strings * @since 3.1.10-RC1 */ $vars = array( @@ -777,7 +777,7 @@ function compose_pm($id, $mode, $action, $user_folders = array()) 'preview', 'error', ); - extract($phpbb_dispatcher->trigger_event('core.ucp_pm_compose_modify_submit_before', compact($vars))); + extract($phpbb_dispatcher->trigger_event('core.ucp_pm_compose_modify_parse_before', compact($vars))); if ($submit) {