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

Merge branch 'feature/ipfilter' into develop

Browse source
This commit is contained in:
khongchi 2013-12-05 10:40:11 +09:00
commit 8a7e5a8794
11 changed files with 165 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/install/install.controller.php
View file

@ -553,10 +553,8 @@ class installController extends install
{
$tmpValue = $this->_getDbConnText($key, $val, true);
}
else if($key == 'sitelock_whitelist')
else if($key == 'sitelock_whitelist' || $key == 'admin_ip_list')
{
if(!is_array($val)) $val = preg_split("/[\r\n|\r|\n]+/", $val);
$val = array_unique($val);
$tmpValue = sprintf('$db_info->%s = array(\'%s\');' . PHP_EOL, $key, implode('\', \'', $val));
}
else
@ -578,7 +576,6 @@ class installController extends install
$buff[] = $tmpValue;
}
$buff[] = "?>";
return implode(PHP_EOL, $buff);
}