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

Merge branch 'develop' into refactor/minify-on-the-fly

Browse source
This commit is contained in:
Kijin Sung 2016-01-09 15:19:08 +09:00
commit 371f4a60b0
35 changed files with 2215 additions and 686 deletions
Download patch file Download diff file Expand all files Collapse all files

21
modules/admin/admin.admin.controller.php
View file

@ -549,17 +549,24 @@ class adminAdminController extends admin
$white_object = preg_replace("/[\r\n|\r|\n]+/", '|@|', $white_object);
$white_object = preg_replace("/[\s\'\"]+/", '', $white_object);
$white_object = explode('|@|', $white_object);
$white_object = array_unique($white_object);
$white_object = array_unique(array_map(function($item) {
return preg_match('@^https?://(.*)$@i', $item, $matches) ? $matches[1] : $item;
}, $white_object));
natcasesort($white_object);
$white_iframe = $vars->embed_white_iframe;
$white_iframe = preg_replace("/[\r\n|\r|\n]+/", '|@|', $white_iframe);
$white_iframe = preg_replace("/[\s\'\"]+/", '', $white_iframe);
$white_iframe = explode('|@|', $white_iframe);
$white_iframe = array_unique($white_iframe);
$white_iframe = array_unique(array_map(function($item) {
return preg_match('@^https?://(.*)$@i', $item, $matches) ? $matches[1] : $item;
}, $white_iframe));
natcasesort($white_iframe);
$whitelist = new stdClass;
$whitelist->object = $white_object;
$whitelist->iframe = $white_iframe;
$whitelist = array(
'object' => $white_object,
'iframe' => $white_iframe,
);
$db_info->embed_white_object = $white_object;
$db_info->embed_white_iframe = $white_iframe;
@ -570,10 +577,6 @@ class adminAdminController extends admin
return new Object(-1, 'msg_invalid_request');
}
require_once(_XE_PATH_ . 'classes/security/EmbedFilter.class.php');
$oEmbedFilter = EmbedFilter::getInstance();
$oEmbedFilter->_makeWhiteDomainList($whitelist);
if(!in_array(Context::getRequestMethod(), array('XMLRPC','JSON')))
{
$returnUrl = Context::get('success_return_url');

1
modules/admin/admin.admin.view.php
View file

@ -461,7 +461,6 @@ class adminAdminView extends admin
Context::set('htmlFooter', htmlspecialchars($config->htmlFooter));
// embed filter
require_once(_XE_PATH_ . 'classes/security/EmbedFilter.class.php');
$oEmbedFilter = EmbedFilter::getInstance();
context::set('embed_white_object', implode(PHP_EOL, $oEmbedFilter->whiteUrlList));
context::set('embed_white_iframe', implode(PHP_EOL, $oEmbedFilter->whiteIframeUrlList));

16
modules/admin/lang/lang.xml
View file

@ -920,11 +920,17 @@
<value xml:lang="tr"><![CDATA[Kısa bir adres kullanmak istiyor musunuz?]]></value>
</item>
<item name="timezone">
<value xml:lang="ko"><![CDATA[현지 표준시]]></value>
<value xml:lang="en"><![CDATA[The local standard time.]]></value>
<value xml:lang="jp"><![CDATA[現地の標準時間]]></value>
<value xml:lang="zh-CN"><![CDATA[设置本地时间.]]></value>
<value xml:lang="tr"><![CDATA[Yerel Zamanı ayarlayın.]]></value>
<value xml:lang="ko"><![CDATA[표준 시간대]]></value>
<value xml:lang="en"><![CDATA[Time Zone]]></value>
<value xml:lang="jp"><![CDATA[標準時間帯]]></value>
<value xml:lang="zh-CN"><![CDATA[时区]]></value>
<value xml:lang="zh-TW"><![CDATA[時區]]></value>
<value xml:lang="fr"><![CDATA[Fuseau horaire]]></value>
<value xml:lang="es"><![CDATA[Huso horario]]></value>
<value xml:lang="de"><![CDATA[Zeitzone]]></value>
<value xml:lang="ru"><![CDATA[Часовой пояс]]></value>
<value xml:lang="tr"><![CDATA[Saat Dilimi]]></value>
<value xml:lang="vi"><![CDATA[Múi giờ]]></value>
</item>
<item name="use_mobile_view">
<value xml:lang="ko"><![CDATA[모바일 뷰 사용]]></value>