From 73806f934271140508caabf73dd219ee5ac4ef1b Mon Sep 17 00:00:00 2001
From: Christian Schnegelberger <mail@crizzo.de>
Date: Sun, 4 Feb 2024 15:15:22 +0100
Subject: [PATCH] [ticket/17093] Use acp twig macro for display of acp board
 setting

PHPBB3-17093
---
 phpBB/includes/acp/acp_board.php              | 23 +++++++++++++++++--
 .../add_disable_board_access_config.php       |  4 ++--
 2 files changed, 23 insertions(+), 4 deletions(-)
 rename phpBB/phpbb/db/migration/data/{v33x => v400}/add_disable_board_access_config.php (86%)

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index ce7b6871b5..f161c308b7 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -1051,11 +1051,30 @@ class acp_board
 	/**
 	 * Board disable access for which group: admins: 0; plus global moderators: 1 and plus all moderators: 2
 	 */
-	function board_disable_access($value, $key = '')
+	public function board_disable_access($value, $key = '') : array
 	{
 		global $user;
 
-		return '<option value="0"' . (($value == 0) ? ' selected="selected"' : '') . '>' . $user->lang['DISABLE_BOARD_ACCESS_ADMIN'] . '</option><option value="1"' . (($value == 1) ? ' selected="selected"' : '') . '>' . $user->lang['DISABLE_BOARD_ACCESS_ADMIN_GLOB_MODS'] . '</option><option value="2"' . (($value == 2) ? ' selected="selected"' : '') . '>' . $user->lang['DISABLE_BOARD_ACCESS_ADMIN_ALL_MODS'] . '</option>';
+		return [
+			[
+				'tag' 		=> 'select',
+				'value'		=> 0,
+				'selected'	=> ($value == 0) ? ' selected="selected"' : '',
+				'label'		=> $user->lang['DISABLE_BOARD_ACCESS_ADMIN'],
+			],
+			[
+				'tag'		=> 'select',
+				'value'		=> 1,
+				'selected'	=> ($value == 1) ? ' selected="selected"' : '',
+				'label'		=> $user->lang['DISABLE_BOARD_ACCESS_ADMIN_GLOB_MODS'],
+			],
+			[
+				'tag'		=> 'select',
+				'value'		=> 2,
+				'selected'	=> ($value == 2) ? ' selected="selected"' : '',
+				'label'		=> $user->lang['DISABLE_BOARD_ACCESS_ADMIN_ALL_MODS'],
+			]
+		];
 	}
 
 	/**
diff --git a/phpBB/phpbb/db/migration/data/v33x/add_disable_board_access_config.php b/phpBB/phpbb/db/migration/data/v400/add_disable_board_access_config.php
similarity index 86%
rename from phpBB/phpbb/db/migration/data/v33x/add_disable_board_access_config.php
rename to phpBB/phpbb/db/migration/data/v400/add_disable_board_access_config.php
index 2cb580d532..d7a7214cae 100644
--- a/phpBB/phpbb/db/migration/data/v33x/add_disable_board_access_config.php
+++ b/phpBB/phpbb/db/migration/data/v400/add_disable_board_access_config.php
@@ -11,14 +11,14 @@
 *
 */
 
-namespace phpbb\db\migration\data\v33x;
+namespace phpbb\db\migration\data\v400;
 
 class add_disable_board_access_config extends \phpbb\db\migration\migration
 {
 	static public function depends_on()
 	{
 		return [
-			'\phpbb\db\migration\data\v33x\v3310',
+			'\phpbb\db\migration\data\v400\dev',
 		];
 	}