From 92509ad655ad10f9d76815e3e5f74bdc5d3ce2f4 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Thu, 15 Dec 2005 12:59:20 +0000
Subject: [PATCH] - wrong variable used for obtaining current configuration

git-svn-id: file:///svn/phpbb/trunk@5336 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/acp/acp_board.php | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 365d9226e0..7a94f2bfb6 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -13,6 +13,8 @@
 */
 class acp_board
 {
+	var $new_config = array();
+
 	function main($id, $mode)
 	{
 		global $db, $user, $auth, $template;
@@ -355,7 +357,7 @@ class acp_board
 					$method = 'admin_' . $method;
 					if (function_exists($method))
 					{
-						if ($fields = $method($new))
+						if ($fields = $method($this->new_config))
 						{
 							// Check if we need to create config fields for this plugin
 							foreach ($fields['config'] as $field)
@@ -382,7 +384,7 @@ class acp_board
 
 	function select_auth_method($selected_method, $key = '')
 	{
-		global $new, $phpbb_root_path, $phpEx;
+		global $phpbb_root_path, $phpEx;
 
 		$auth_plugins = array();
 
@@ -451,9 +453,9 @@ class acp_board
 
 	function username_length($value, $key = '')
 	{
-		global $new, $user;
+		global $user;
 
-		return '<input id="' . $key . '" type="text" size="3" maxlength="3" name="config[min_name_chars]" value="' . $value . '" /> ' . $user->lang['MIN_CHARS'] . '&nbsp;&nbsp;<input type="text" size="3" maxlength="3" name="config[max_name_chars]" value="' . $new['max_name_chars'] . '" /> ' . $user->lang['MAX_CHARS'];
+		return '<input id="' . $key . '" type="text" size="3" maxlength="3" name="config[min_name_chars]" value="' . $value . '" /> ' . $user->lang['MIN_CHARS'] . '&nbsp;&nbsp;<input type="text" size="3" maxlength="3" name="config[max_name_chars]" value="' . $this->new_config['max_name_chars'] . '" /> ' . $user->lang['MAX_CHARS'];
 	}
 
 	function select_username_chars($selected_value, $key)
@@ -473,9 +475,9 @@ class acp_board
 
 	function password_length($value, $key)
 	{
-		global $new, $user;
+		global $user;
 
-		return '<input id="' . $key . '" type="text" size="3" maxlength="3" name="config[min_pass_chars]" value="' . $value . '" /> ' . $user->lang['MIN_CHARS'] . '&nbsp;&nbsp;<input type="text" size="3" maxlength="3" name="config[max_pass_chars]" value="' . $new['max_pass_chars'] . '" /> ' . $user->lang['MAX_CHARS'];
+		return '<input id="' . $key . '" type="text" size="3" maxlength="3" name="config[min_pass_chars]" value="' . $value . '" /> ' . $user->lang['MIN_CHARS'] . '&nbsp;&nbsp;<input type="text" size="3" maxlength="3" name="config[max_pass_chars]" value="' . $this->new_config['max_pass_chars'] . '" /> ' . $user->lang['MAX_CHARS'];
 	}
 
 	function select_password_chars($selected_value, $key)
@@ -495,14 +497,14 @@ class acp_board
 
 	function bump_interval($value, $key)
 	{
-		global $new, $user;
+		global $user;
 
 		$s_bump_type = '';
 		$types = array('m' => 'MINUTES', 'h' => 'HOURS', 'd' => 'DAYS');
 		foreach ($types as $type => $lang)
 		{
-			$selected = ($new['bump_type'] == $type) ? 'selected="selected" ' : '';
-			$s_bump_type .= '<option value="' . $type . '" ' . $selected . '>' . $user->lang[$lang] . '</option>';
+			$selected = ($this->new_config['bump_type'] == $type) ? ' selected="selected"' : '';
+			$s_bump_type .= '<option value="' . $type . '"' . $selected . '>' . $user->lang[$lang] . '</option>';
 		}
 
 		return '<input id="' . $key . '" type="text" size="3" maxlength="4" name="config[bump_interval]" value="' . $value . '" />&nbsp;<select name="config[bump_type]">' . $s_bump_type . '</select>';
@@ -510,11 +512,11 @@ class acp_board
 
 	function board_disable($value, $key)
 	{
-		global $new, $user;
+		global $user;
 
 		$radio_ary = array(1 => 'YES', 0 => 'NO');
 
-		return h_radio('config[board_disable]', $radio_ary, $value) . '<br /><input id="' . $key . '" type="text" name="config[board_disable_msg]" maxlength="255" size="40" value="' . $new['board_disable_msg'] . '" />';
+		return h_radio('config[board_disable]', $radio_ary, $value) . '<br /><input id="' . $key . '" type="text" name="config[board_disable_msg]" maxlength="255" size="40" value="' . $this->new_config['board_disable_msg'] . '" />';
 	}
 }