fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-03 16:51:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix #1683 모바일 스킨의 설정이 PC와 동일한 반응형 스킨 사용 옵션일 경우 재대로 작동되지 않는 문제 고침

Browse source
This commit is contained in:
BJRambo 2021-04-10 19:12:19 +09:00
parent 9d5795ca93
commit b7eaab3fc7
1 changed files with 24 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

55
modules/ncenterlite/ncenterlite.controller.php
View file

@ -1098,11 +1098,21 @@ class ncenterliteController extends ncenterlite
if(Mobile::isFromMobilePhone())
{
$this->template_path = sprintf('%sm.skins/%s/', $this->module_path, $config->mskin);
if(!is_dir($this->template_path) || !$config->mskin)
if(!$config->mskin)
{
$config->mskin = 'default';
$this->template_path = sprintf('%sm.skins/%s/', $this->module_path, $config->mskin);
}
// If use to same PC skin set.
else if ($config->mskin === '/USE_RESPONSIVE/')
{
$this->template_path = sprintf('%sskins/%s/', $this->module_path, $config->skin);
if(!$config->skin)
{
$config->skin = 'default';
$this->template_path = sprintf('%sskins/%s/', $this->module_path, $config->skin);
}
}
}
else
{
@ -1114,9 +1124,10 @@ class ncenterliteController extends ncenterlite
}
}
$oTemplateHandler = TemplateHandler::getInstance();
$result = $oTemplateHandler->compile($this->template_path, 'ncenterlite.html');
$this->_addFile();
$html = $this->_getTemplate();
$output_display = $html . $output_display;
$output_display = $result . $output_display;
}
function triggerAddMemberMenu()
@ -1163,14 +1174,8 @@ class ncenterliteController extends ncenterlite
}
$config = NcenterliteModel::getConfig();
if(!Mobile::isFromMobilePhone())
{
if($config->colorset && file_exists(FileHandler::getRealPath($this->template_path . 'ncenterlite.' . $config->colorset . '.css')))
{
Context::loadFile(array($this->template_path . 'ncenterlite.' . $config->colorset . '.css', '', '', 100));
}
}
elseif(Mobile::isFromMobilePhone())
if(Mobile::isFromMobilePhone() && $config->mskin !== '/USE_RESPONSIVE/')
{
if($config->mcolorset && file_exists(FileHandler::getRealPath($this->template_path . 'ncenterlite.' . $config->mcolorset . '.css')))
{
@ -1181,32 +1186,20 @@ class ncenterliteController extends ncenterlite
Context::loadFile(array('./common/js/xe.min.js', 'head', '', -100000));
Context::loadFile(array($this->template_path . 'ncenterlite.mobile.css', '', '', 100));
}
else
{
if($config->colorset && file_exists(FileHandler::getRealPath($this->template_path . 'ncenterlite.' . $config->colorset . '.css')))
{
Context::loadFile(array($this->template_path . 'ncenterlite.' . $config->colorset . '.css', '', '', 100));
}
}
if($config->zindex)
{
Context::set('ncenterlite_zindex', ' style="z-index:' . $config->zindex . ';" ');
}
}
function _getTemplate()
{
$oNcenterModel = getModel('ncenterlite');
$config = $oNcenterModel->getConfig();
$oTemplateHandler = TemplateHandler::getInstance();
if(Mobile::isFromMobilePhone())
{
$path = sprintf('%sm.skins/%s/', $this->module_path, $config->mskin);
}
else
{
$path = sprintf('%sskins/%s/', $this->module_path, $config->skin);
}
$result = $oTemplateHandler->compile($path, 'ncenterlite.html');
return $result;
}
function updateNotifyRead($notify, $member_srl)
{
$args = new stdClass();