issue 160, Modify checking manager ip on genaral config

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9367 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
chschy 2011-09-27 09:30:16 +00:00
parent 4cb4047975
commit 3dc8f5161e
8 changed files with 83 additions and 48 deletions

View file

@ -75,9 +75,12 @@
$use_mobile_view = Context::get('use_mobile_view');
if($use_mobile_view!='Y') $use_mobile_view = 'N';
$admin_ip = Context::get('admin_ip');
$admin_ip_list = Context::get('admin_ip_list');
$db_info = Context::getDBInfo();
$admin_ip_list = preg_replace("/[\r|\n|\r\n]+/",",",$admin_ip_list);
$admin_ip_list = preg_replace("/\s+/","",$admin_ip_list);
$db_info = Context::getDBInfo();
$db_info->default_url = Context::get('default_url');
if($db_info->default_url && !preg_match('/^(http|https):\/\//i', $db_info->default_url)) $db_info->default_url = 'http://'.$db_info->default_url;
$db_info->time_zone = $time_zone;
@ -89,7 +92,7 @@
$db_info->use_cdn = $use_cdn;
$db_info->use_html5 = $use_html5;
$db_info->use_mobile_view = $use_mobile_view;
$db_info->admin_ip = $admin_ip;
$db_info->admin_ip_list = $admin_ip_list;
if($http_port) $db_info->http_port = (int) $http_port;
else if($db_info->http_port) unset($db_info->http_port);