fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-09 11:44:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

Miscellaneous fixes to new config handling

Browse source
This commit is contained in:
Kijin Sung 2016-02-03 11:16:49 +09:00
parent ff3600b63c
commit 0fba6ea226
1 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

30
common/framework/config.php
View file

@ -28,6 +28,17 @@ class Config
self::$_config = self::convert();
self::save();
}
return self::$_config;
}
/**
* Get all system configuration.
*
* @return array
*/
public static function getAll()
{
return self::$_config;
}
/**
@ -42,18 +53,15 @@ class Config
{
self::init();
}
$data = &self::$_config;
$data = self::$_config;
$key = explode('.', $key);
foreach ($key as $step)
{
if (isset($data[$step]))
{
$data = &$data[$step];
}
else
if ($key === '' || !isset($data[$step]))
{
return null;
}
$data = $data[$step];
}
return $data;
}
@ -273,7 +281,15 @@ class Config
$config['lock']['locked'] = $db_info->use_sitelock === 'Y' ? true : false;
$config['lock']['title'] = strval($db_info->sitelock_title);
$config['lock']['message'] = strval($db_info->sitelock_message);
$config['lock']['allow'] = is_array($db_info->sitelock_whitelist) ? array_values($db_info->sitelock_whitelist) : array();
if (!is_array($db_info->sitelock_whitelist))
{
$db_info->sitelock_whitelist = array_map('trim', explode(',', trim($db_info->sitelock_whitelist)));
}
if (!in_array('127.0.0.1', $db_info->sitelock_whitelist))
{
$db_info->sitelock_whitelist[] = '127.0.0.1';
}
$config['lock']['allow'] = array_values($db_info->sitelock_whitelist);
// Convert debug configuration.
$config['debug']['enabled'] = true;