From 8978594d6d9c92be3a35f2adec138516df3670f0 Mon Sep 17 00:00:00 2001 From: Kailey M Snay Date: Fri, 29 Nov 2024 15:45:42 -0500 Subject: [PATCH 1/4] [ticket/17446] Add acp_account_activation_edit_add event Event added for additional account activation methods. PHPBB-17446 --- phpBB/includes/acp/acp_board.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index bfc2c0b97f..336c22d354 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -931,6 +931,18 @@ class acp_board ); $act_options = ''; + + /** + * Event to add and/or modify account activation configurations + * + * @event core.acp_account_activation_edit_add + * @var array act_ary Array of account activation methods + * @var string act_options Options avialbe in the activation method + * @since 3.3.15-RC1 + */ + $vars = array('act_ary', 'act_options'); + extract($phpbb_dispatcher->trigger_event('core.acp_account_activation_edit_add', compact($vars))); + foreach ($act_ary as $key => $data) { list($available, $value) = $data; From 332ecb3d9c350dcf2941dd43b92d6cea458dd111 Mon Sep 17 00:00:00 2001 From: Kailey M Snay Date: Fri, 29 Nov 2024 15:56:30 -0500 Subject: [PATCH 2/4] [ticket/17446] Use array shorthand PHPBB-17446 --- phpBB/includes/acp/acp_board.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 336c22d354..9d8a1f3bcd 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -940,7 +940,7 @@ class acp_board * @var string act_options Options avialbe in the activation method * @since 3.3.15-RC1 */ - $vars = array('act_ary', 'act_options'); + $vars = ['act_ary', 'act_options']; extract($phpbb_dispatcher->trigger_event('core.acp_account_activation_edit_add', compact($vars))); foreach ($act_ary as $key => $data) From 922fde6d53f8d6eec47b263cbe47a01c2be5b225 Mon Sep 17 00:00:00 2001 From: Kailey M Snay Date: Fri, 29 Nov 2024 23:02:40 -0500 Subject: [PATCH 3/4] [ticket/17446] Add $phpbb_dispatcher and docblock updates PHPBB-17446 --- phpBB/includes/acp/acp_board.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 9d8a1f3bcd..bb18336160 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -921,7 +921,7 @@ class acp_board */ function select_acc_activation($selected_value, $value) { - global $user, $config; + global $user, $config, $phpbb_dispatcher; $act_ary = array( 'ACC_DISABLE' => array(true, USER_ACTIVATION_DISABLE), @@ -933,13 +933,13 @@ class acp_board $act_options = ''; /** - * Event to add and/or modify account activation configurations - * - * @event core.acp_account_activation_edit_add - * @var array act_ary Array of account activation methods - * @var string act_options Options avialbe in the activation method - * @since 3.3.15-RC1 - */ + * Event to add and/or modify account activation configurations + * + * @event core.acp_account_activation_edit_add + * @var array act_ary Array of account activation methods + * @var string act_options Options avialbe in the activation method + * @since 3.3.15-RC1 + */ $vars = ['act_ary', 'act_options']; extract($phpbb_dispatcher->trigger_event('core.acp_account_activation_edit_add', compact($vars))); From a4879e924954ef69f8007ac1dd4aa9a99c4277f6 Mon Sep 17 00:00:00 2001 From: Kailey M Snay Date: Fri, 29 Nov 2024 23:57:35 -0500 Subject: [PATCH 4/4] [ticket/17446] Fix typo PHPBB-17446 --- phpBB/includes/acp/acp_board.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index bb18336160..acd2a72cf7 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -937,7 +937,7 @@ class acp_board * * @event core.acp_account_activation_edit_add * @var array act_ary Array of account activation methods - * @var string act_options Options avialbe in the activation method + * @var string act_options Options available in the activation method * @since 3.3.15-RC1 */ $vars = ['act_ary', 'act_options'];