fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-28 06:42:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

Remove remaining references to getDBInfo()

Browse source
This commit is contained in:
Kijin Sung 2016-02-05 15:18:31 +09:00
parent 9895699591
commit f7aad28d2c
12 changed files with 25 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

7
classes/module/ModuleHandler.class.php
View file

@ -136,7 +136,7 @@ class ModuleHandler extends Handler
$urlInfo = parse_url($url);
$host = $urlInfo['host'];
$defaultUrl = Context::getDBInfo()->default_url;
$defaultUrl = Context::getDefaultUrl();
if($defaultUrl)
{
$defaultUrlInfo = parse_url($defaultUrl);
@ -240,8 +240,7 @@ class ModuleHandler extends Handler
}
else
{
$db_info = Context::getDBInfo();
if(!$db_info->default_url)
if(!Context::getDefaultUrl())
{
return Context::getLang('msg_default_url_is_not_defined');
}
@ -250,7 +249,7 @@ class ModuleHandler extends Handler
$redirect_url = getNotEncodedSiteUrl($db_info->default_url, 'mid', Context::get('mid'), 'document_srl', Context::get('document_srl'), 'module_srl', Context::get('module_srl'), 'entry', Context::get('entry'));
}
}
header("location:" . $redirect_url);
header("Location: $redirect_url");
return FALSE;
}

10
classes/security/EmbedFilter.class.php
View file

@ -394,18 +394,16 @@ class EmbedFilter
{
$this->whiteIframeUrlList[] = $prefix;
}
$db_info = Context::getDBInfo();
if(isset($db_info->embed_white_object) && count($db_info->embed_white_object))
if ($embedfilter_object = config('embedfilter.object'))
{
foreach ($db_info->embed_white_object as $prefix)
foreach ($embedfilter_object as $prefix)
{
$this->whiteUrlList[] = preg_match('@^https?://(.*)$@i', $prefix, $matches) ? $matches[1] : $prefix;
}
}
if(isset($db_info->embed_white_iframe) && count($db_info->embed_white_iframe))
if ($embedfilter_iframe = config('embedfilter.iframe'))
{
foreach ($db_info->embed_white_iframe as $prefix)
foreach ($embedfilter_iframe as $prefix)
{
$this->whiteIframeUrlList[] = preg_match('@^https?://(.*)$@i', $prefix, $matches) ? $matches[1] : $prefix;
}