From 39489ac1b715de681e2982e15c89753a798d87e1 Mon Sep 17 00:00:00 2001 From: bnu Date: Fri, 22 Nov 2013 10:57:28 +0900 Subject: [PATCH] =?UTF-8?q?#43=20=EC=84=A4=EC=A0=95=20=EA=B0=92=20?= =?UTF-8?q?=EC=A0=80=EC=9E=A5=20=EB=B0=A9=EC=8B=9D=20=EA=B0=9C=EC=84=A0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/admin/admin.admin.controller.php | 3 +-- modules/install/install.controller.php | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php index 99618fd90..b86fdc985 100644 --- a/modules/admin/admin.admin.controller.php +++ b/modules/admin/admin.admin.controller.php @@ -490,8 +490,7 @@ class adminAdminController extends admin $db_info->use_sitelock = ($vars->use_sitelock) ? $vars->use_sitelock : 'N'; $db_info->sitelock_title = $vars->sitelock_title; $db_info->sitelock_message = $vars->sitelock_message; - - $db_info->sitelock_whitelist = preg_replace("/[\r\n|\r|\n]+/", ",", $vars->sitelock_whitelist); + $db_info->sitelock_whitelist = $vars->sitelock_whitelist; FileHandler::writeFile(Context::getConfigFile(), $oInstallController->_getDBConfigFileContents($db_info)); diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php index 16e87e017..f60fc2f9c 100644 --- a/modules/install/install.controller.php +++ b/modules/install/install.controller.php @@ -559,6 +559,12 @@ class installController extends install { $tmpValue = $this->_getDbConnText($key, $val, true); } + else if($key == 'sitelock_whitelist') + { + $tmpValue = preg_split("/[\r\n|\r|\n]+/", $val); + $tmpValue = array_unique($tmpValue); + $tmpValue = sprintf('$db_info->%s = array(\'%s\');' . PHP_EOL, $key, implode('\', \'', $tmpValue)); + } else { if($key == 'default_url')