diff --git a/modules/integration_search/integration_search.admin.controller.php b/modules/integration_search/integration_search.admin.controller.php index 1c035635e..7d2ab6bb8 100644 --- a/modules/integration_search/integration_search.admin.controller.php +++ b/modules/integration_search/integration_search.admin.controller.php @@ -29,6 +29,7 @@ class integration_searchAdminController extends integration_search $config = (object)get_object_vars($config); $config->skin = Context::get('skin'); + $config->mskin = Context::get('mskin'); $config->target = Context::get('target'); $config->target_module_srl = Context::get('target_module_srl'); if(!$config->target_module_srl) $config->target_module_srl = ''; diff --git a/modules/integration_search/integration_search.admin.view.php b/modules/integration_search/integration_search.admin.view.php index daaa3c641..91136461a 100644 --- a/modules/integration_search/integration_search.admin.view.php +++ b/modules/integration_search/integration_search.admin.view.php @@ -36,12 +36,16 @@ class integration_searchAdminView extends integration_search */ function dispIntegration_searchAdminContent() { - // Get a list of skins(themes) + // Get a list of skins $oModuleModel = getModel('module'); $skin_list = $oModuleModel->getSkins($this->module_path); Context::set('skin_list',$skin_list); + $mskin_list = $oModuleModel->getSkins($this->module_path, 'm.skins'); + Context::set('mskin_list', $mskin_list); + // Get a list of module categories $module_categories = $oModuleModel->getModuleCategories(); + // Generated mid Wanted list $obj = new stdClass(); $obj->site_srl = 0; @@ -60,7 +64,7 @@ class integration_searchAdminView extends integration_search Context::set('mid_list',$module_categories);*/ $security = new Security(); - $security->encodeHTML('skin_list..title'); + $security->encodeHTML('skin_list..title', 'mskin_list..title'); // Sample Code Context::set('sample_code', htmlspecialchars('
', ENT_COMPAT | ENT_HTML401, 'UTF-8', false) ); diff --git a/modules/integration_search/integration_search.view.php b/modules/integration_search/integration_search.view.php index 45567e810..2e3660201 100644 --- a/modules/integration_search/integration_search.view.php +++ b/modules/integration_search/integration_search.view.php @@ -53,32 +53,50 @@ class integration_searchView extends integration_search { throw new Rhymix\Framework\Exceptions\NotPermitted; } - - $config = $oModuleModel->getModuleConfig('integration_search'); - if(!$config) $config = new stdClass; - if(!$config->skin) + + // Set skin path + $config = $oModuleModel->getModuleConfig('integration_search') ?: new stdClass; + if(ends_with('Mobile', get_class($this), false)) { - $config->skin = 'default'; - $template_path = sprintf('%sskins/%s', $this->module_path, $config->skin); - } - else - { - //check theme - $config_parse = explode('|@|', $config->skin); - if (count($config_parse) > 1) + if(!$config->mskin || $config->mskin === '/USE_RESPONSIVE/') { - $template_path = sprintf('./themes/%s/modules/integration_search/', $config_parse[0]); + $template_path = sprintf('%sskins/%s/', $this->module_path, $config->skin); + if(!is_dir($template_path) || !$config->skin) + { + $template_path = sprintf('%sskins/%s/', $this->module_path, 'default'); + $config->mskin = 'default'; + } } else { - $template_path = sprintf('%sskins/%s', $this->module_path, $config->skin); + $template_path = sprintf('%sm.skins/%s/', $this->module_path, $config->mskin); + if(!is_dir($template_path) || !$config->mskin) + { + $template_path = sprintf('%sm.skins/%s/', $this->module_path, 'default'); + $config->mskin = 'default'; + } + if(!is_dir($template_path)) + { + $template_path = sprintf('%sskins/%s/', $this->module_path, 'default'); + $config->mskin = 'default'; + } } } - // Template path + else + { + $template_path = sprintf('%sskins/%s/', $this->module_path, $config->skin); + if(!is_dir($template_path) || !$config->skin) + { + $template_path = sprintf('%sskins/%s/', $this->module_path, 'default'); + $config->skin = 'default'; + } + } + $this->setTemplatePath($template_path); $skin_vars = ($config->skin_vars) ? unserialize($config->skin_vars) : new stdClass; Context::set('module_info', $skin_vars); + // Include or exclude target modules. $target = $config->target; if(!$target) $target = 'include'; @@ -91,13 +109,7 @@ class integration_searchView extends integration_search // 검색 대상을 지정하지 않았을 때 검색 제한 if($target === 'include' && !count($module_srl_list)) { - $oMessageObject = ModuleHandler::getModuleInstance('message'); - $oMessageObject->setError(-1); - $oMessageObject->setMessage('msg_not_enabled'); - $oMessageObject->dispMessage(); - $this->setTemplatePath($oMessageObject->getTemplatePath()); - $this->setTemplateFile($oMessageObject->getTemplateFile()); - return; + throw new Rhymix\Framework\Exception('msg_not_enabled'); } // Set a variable for search keyword diff --git a/modules/integration_search/tpl/index.html b/modules/integration_search/tpl/index.html index 16f6d641d..8dc567fc7 100644 --- a/modules/integration_search/tpl/index.html +++ b/modules/integration_search/tpl/index.html @@ -23,7 +23,14 @@ -

{$lang->about_skin}

+ + +
+ +
+
diff --git a/modules/module/module.model.php b/modules/module/module.model.php index 0d732ce9b..292ff7ec5 100644 --- a/modules/module/module.model.php +++ b/modules/module/module.model.php @@ -1071,9 +1071,10 @@ class moduleModel extends module $path = substr($path, 0, -1); } + $skin_list = array(); $skin_path = sprintf("%s/%s/", $path, $dir); $list = FileHandler::readDir($skin_path); - if(!count($list)) return; + //if(!count($list)) return; natcasesort($list);