isCrawler, 관리자페이지 IP잠금, 사이트잠금 기능에서 ipfilter를 사용하도록 변경

This commit is contained in:
khongchi 2013-11-28 17:01:01 +09:00
parent 98d3408919
commit 5fae27d53c
11 changed files with 85 additions and 67 deletions

View file

@ -49,15 +49,25 @@ class installAdminController extends install
*/
function procInstallAdminSaveTimeZone()
{
$db_info = Context::getDBInfo();
$admin_ip_list = Context::get('admin_ip_list');
$admin_ip_list = preg_replace("/[\r|\n|\r\n]+/",",",$admin_ip_list);
$admin_ip_list = preg_replace("/\s+/","",$admin_ip_list);
if(preg_match('/(<\?|<\?php|\?>)/xsm', $admin_ip_list))
if($admin_ip_list)
{
$admin_ip_list = '';
$admin_ip_list = preg_replace("/[\r|\n|\r\n]+/",",",$admin_ip_list);
$admin_ip_list = preg_replace("/\s+/","",$admin_ip_list);
if(preg_match('/(<\?|<\?php|\?>)/xsm', $admin_ip_list))
{
$admin_ip_list = '';
}
$admin_ip_list = explode(',',trim($admin_ip_list, ','));
$admin_ip_list = array_unique($admin_ip_list);
if(!IpFilter::validate($admin_ip_list)) {
return new Object(-1, 'msg_invalid_ip');
}
}
$default_url = Context::get('default_url');
if($default_url && strncasecmp('http://', $default_url, 7) !== 0 && strncasecmp('https://', $default_url, 8) !== 0) $default_url = 'http://'.$default_url;
@ -82,7 +92,6 @@ class installAdminController extends install
$use_html5 = Context::get('use_html5');
if(!$use_html5) $use_html5 = 'N';
$db_info = Context::getDBInfo();
$db_info->default_url = $default_url;
$db_info->qmail_compatibility = $qmail_compatibility;
$db_info->use_db_session = $use_db_session;

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);
}