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

issue 449, removed default value of 2nd argument of getModuleInfoByMid()

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9636 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-10-13 07:46:58 +00:00
parent cbaa09ea3d
commit 3ea1e07541
3 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/menu/menu.admin.model.php
View file

@ -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));
}

20
modules/menu/menu.admin.view.php
View file

@ -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)
{

4
modules/module/module.model.php
View file

@ -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');