From 2e025f1655293d3032f04907e5d74a812e1a659a Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Tue, 6 May 2014 17:50:22 -0700
Subject: [ticket/9388] Add support for making <select> options able to toggle
 settings.

PHPBB3-9388
---
 phpBB/includes/functions_acp.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index 2c66f6009c..0d19fc4d6a 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -364,8 +364,9 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 			if ($tpl_type[0] == 'select')
 			{
 				$size = (isset($tpl_type[1])) ? (int) $tpl_type[1] : 1;
+				$data_toggle = (!empty($tpl_type[2])) ? ' data-toggable-settings="true"' : '';
 
-				$tpl = '<select id="' . $key . '" name="' . $name . '"' . (($size > 1) ? ' size="' . $size . '"' : '') . '>' . $return . '</select>';
+				$tpl = '<select id="' . $key . '" name="' . $name . '"' . (($size > 1) ? ' size="' . $size . '"' : '') . $data_toggle . '>' . $return . '</select>';
 			}
 			else
 			{
-- 
cgit v1.2.1


From d95164e64155ea3bdbca69532af5dd49c093b351 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Tue, 6 May 2014 17:52:12 -0700
Subject: [ticket/9388] Display only the settings for the auth method that's
 selected.

PHPBB3-9388
---
 phpBB/includes/acp/acp_board.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index cf0f23a16e..f054e82de3 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -363,7 +363,7 @@ class acp_board
 					'title'	=> 'ACP_AUTH_SETTINGS',
 					'vars'	=> array(
 						'legend1'		=> 'ACP_AUTH_SETTINGS',
-						'auth_method'	=> array('lang' => 'AUTH_METHOD',	'validate' => 'string',	'type' => 'select', 'method' => 'select_auth_method', 'explain' => false),
+						'auth_method'	=> array('lang' => 'AUTH_METHOD',	'validate' => 'string',	'type' => 'select:1:toggable', 'method' => 'select_auth_method', 'explain' => false),
 					)
 				);
 			break;
@@ -715,7 +715,7 @@ class acp_board
 		foreach ($auth_plugins as $method)
 		{
 			$selected = ($selected_method == $method) ? ' selected="selected"' : '';
-			$auth_select .= '<option value="' . $method . '"' . $selected . '>' . ucfirst($method) . '</option>';
+			$auth_select .= "<option value=\"$method\"$selected data-toggle-setting=\"#auth_{$method}_settings\">" . ucfirst($method) . '</option>';
 		}
 
 		return $auth_select;
-- 
cgit v1.2.1


From e378037516903ed612c88e8ad0138ec956077b58 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Tue, 6 May 2014 17:57:33 -0700
Subject: [ticket/9388] Display only the settings for the selected search
 backend.

PHPBB3-9388
---
 phpBB/includes/acp/acp_search.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php
index 11a2511aee..ce1e4afa9b 100644
--- a/phpBB/includes/acp/acp_search.php
+++ b/phpBB/includes/acp/acp_search.php
@@ -79,7 +79,8 @@ class acp_search
 			$name = $search->get_name();
 
 			$selected = ($config['search_type'] == $type) ? ' selected="selected"' : '';
-			$search_options .= '<option value="' . $type . '"' . $selected . '>' . $name . '</option>';
+			$identifier = substr($type, strrpos($type, '\\') + 1);
+			$search_options .= "<option value=\"$type\"$selected data-toggle-setting=\"#search_{$identifier}_settings\">$name</option>";
 
 			if (method_exists($search, 'acp'))
 			{
@@ -88,9 +89,10 @@ class acp_search
 				if (!$submit)
 				{
 					$template->assign_block_vars('backend', array(
-						'NAME'		=> $name,
-						'SETTINGS'	=> $vars['tpl'])
-					);
+						'NAME'			=> $name,
+						'SETTINGS'		=> $vars['tpl'],
+						'IDENTIFIER'	=> $identifier,
+					));
 				}
 				else if (is_array($vars['config']))
 				{
-- 
cgit v1.2.1


From e233f0af3615070a003a49bf055ae9fa582cc899 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Fri, 9 May 2014 13:49:41 -0700
Subject: [ticket/9388] Use "togglable" instead of "toggable"

PHPBB3-9388
---
 phpBB/includes/functions_acp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index 0d19fc4d6a..1c4d6966da 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -364,7 +364,7 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 			if ($tpl_type[0] == 'select')
 			{
 				$size = (isset($tpl_type[1])) ? (int) $tpl_type[1] : 1;
-				$data_toggle = (!empty($tpl_type[2])) ? ' data-toggable-settings="true"' : '';
+				$data_toggle = (!empty($tpl_type[2])) ? ' data-togglable-settings="true"' : '';
 
 				$tpl = '<select id="' . $key . '" name="' . $name . '"' . (($size > 1) ? ' size="' . $size . '"' : '') . $data_toggle . '>' . $return . '</select>';
 			}
-- 
cgit v1.2.1