diff --git a/modules/menu/menu.admin.model.php b/modules/menu/menu.admin.model.php index 7bcefb108..dae05f5f0 100644 --- a/modules/menu/menu.admin.model.php +++ b/modules/menu/menu.admin.model.php @@ -61,7 +61,7 @@ $args->menu_srl = $menu_srl; $output = executeQuery('menu.getMenu', $args); if(!$output->data) return; - + $menu_info = $output->data; $menu_info->xml_file = sprintf('./files/cache/menu/%s.xml.php',$menu_srl); $menu_info->php_file = sprintf('./files/cache/menu/%s.php',$menu_srl); @@ -77,7 +77,7 @@ $args->title = $title; $output = executeQuery('menu.getMenuByTitle', $args); if(!$output->data) return; - + $menu_info = $output->data; $menu_info->xml_file = sprintf('./files/cache/menu/%s.xml.php',$menu_info->menu_srl); $menu_info->php_file = sprintf('./files/cache/menu/%s.php',$menu_info->menu_srl); @@ -121,7 +121,7 @@ else if(!preg_match('/^http/i',$menuItem->url)) { $oModuleModel = &getModel('module'); - $moduleInfo = $oModuleModel->getModuleInfoByMid($menuItem->url); + $moduleInfo = $oModuleModel->getModuleInfoByMid($menuItem->url, 0); if(!$moduleInfo) $menuItem->moduleType = 'url'; else { @@ -216,15 +216,15 @@ } Context::set('item_info', $item_info); //Security - $security = new Security(); + $security = new Security(); $security->encodeHTML('group_list..title'); $security->encodeHTML('item_info.url'); - $security->encodeHTML('item_info.name'); + $security->encodeHTML('item_info.name'); // Compile the template file into tpl variable and then return it $oTemplate = &TemplateHandler::getInstance(); - $tpl = $oTemplate->compile($this->module_path.'tpl', 'menu_item_info'); - + $tpl = $oTemplate->compile($this->module_path.'tpl', 'menu_item_info'); + $this->add('tpl', str_replace("\n"," ",$tpl)); } diff --git a/modules/menu/menu.admin.view.php b/modules/menu/menu.admin.view.php index 1241f43aa..df7dd8424 100644 --- a/modules/menu/menu.admin.view.php +++ b/modules/menu/menu.admin.view.php @@ -30,22 +30,22 @@ Context::set('total_count', $output->total_count); Context::set('total_page', $output->total_page); - Context::set('page', $output->page); + Context::set('page', $output->page); Context::set('menu_list', $output->data); Context::set('page_navigation', $output->page_navigation); - + //Security $security = new Security(); - $security->encodeHTML('menu_list..title'); - + $security->encodeHTML('menu_list..title'); + $this->setTemplateFile('index'); } - + /** * @brief Page to insert a menu **/ function dispMenuAdminInsert() { - // Set the menu with menu information + // Set the menu with menu information $menu_srl = Context::get('menu_srl'); if($menu_srl) { @@ -57,7 +57,7 @@ $this->setTemplateFile('menu_insert'); } - + /** * @brief Menu admin page **/ @@ -75,7 +75,7 @@ //Security $security = new Security(); - $security->encodeHTML('menu_info..title'); + $security->encodeHTML('menu_info..title'); // Set the layout to be pop-up $this->setTemplateFile('menu_management'); @@ -107,7 +107,7 @@ $security->encodeHTML('module_category..title'); $security->encodeHTML('module_list..module'); $security->encodeHTML('mid_list..module'); - $security->encodeHTML('mid_list..browser_title'); + $security->encodeHTML('mid_list..browser_title'); // Set a template file $this->setTemplateFile('mid_list'); @@ -184,7 +184,7 @@ { unset($midInfo); unset($moduleInfo); - $midInfo = $oModuleModel->getModuleInfoByMid($menu['url']); + $midInfo = $oModuleModel->getModuleInfoByMid($menu['url'], 0); $moduleInfo = $oModuleModel->getModuleInfoXml($midInfo->module); if($moduleInfo->setup_index_act) { diff --git a/modules/module/module.model.php b/modules/module/module.model.php index 8df9c2b5b..11698d636 100644 --- a/modules/module/module.model.php +++ b/modules/module/module.model.php @@ -107,7 +107,7 @@ } // If no virtual website was found, get default website if($domain === '') { - if($oCacheHandler->isSupport()) $output = $oCacheHandler->get('default_site'); + if($oCacheHandler->isSupport()) $output = $oCacheHandler->get('default_site'); if(!$output){ $args->site_srl = 0; $output = executeQuery('module.getSiteInfo', $args); @@ -148,7 +148,7 @@ /** * @brief Get module information by mid **/ - function getModuleInfoByMid($mid, $site_srl = 0, $columnList = array()) { + function getModuleInfoByMid($mid, $site_srl, $columnList = array()) { $args->mid = $mid; $args->site_srl = (int)$site_srl; $oCacheHandler = &CacheHandler::getInstance('object');