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

Reduce unnecessary use of site_srl

Browse source
This commit is contained in:
Kijin Sung 2018-12-29 10:45:37 +09:00
parent e25e2df6a8
commit f844d30690
9 changed files with 38 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,13 +27,7 @@ class menuAdminModel extends menu
*/
function getMenuList($obj)
{
if(!$obj->site_srl)
{
$site_module_info = Context::get('site_module_info');
$obj->site_srl = (int)$site_module_info->site_srl;
}
$args = new stdClass;
$args->site_srl = $obj->site_srl;
$args->sort_index = $obj->sort_index;
$args->page = $obj->page?$obj->page:1;
$args->list_count = $obj->list_count?$obj->list_count:20;
@ -48,19 +42,12 @@ class menuAdminModel extends menu
/**
* Return all menus
* @param int $site_srl
* @return array
*/
function getMenus($site_srl = null)
function getMenus()
{
if(!isset($site_srl))
{
$site_module_info = Context::get('site_module_info');
$site_srl = (int)$site_module_info->site_srl;
}
// Get information from the DB
$args = new stdClass();
$args->site_srl = $site_srl ;
$args->menu_srl = $menu_srl;
$output = executeQueryArray('menu.getMenus', $args);
if(!$output->data) return;
@ -94,7 +81,7 @@ class menuAdminModel extends menu
* @param string $title
* @return object
*/
function getMenuByTitle($title, $site_srl = 0)
function getMenuByTitle($title)
{
// Get information from the DB
if(!is_array($title))
@ -103,7 +90,6 @@ class menuAdminModel extends menu
}
$args = new stdClass();
$args->title = $title;
$args->site_srl = $site_srl;
$output = executeQuery('menu.getMenuByTitle', $args);
if(!$output->data) return;
@ -264,19 +250,13 @@ class menuAdminModel extends menu
/**
* Return menu name in each language to support multi-language
* @param string $source_name
* @param int $site_srl
* @return array
*/
function getMenuItemNames($source_name, $site_srl = null)
function getMenuItemNames($source_name)
{
if(!$site_srl)
{
$site_module_info = Context::get('site_module_info');
$site_srl = (int)$site_module_info->site_srl;
}
// Get language code
$oModuleAdminModel = getAdminModel('module');
return $oModuleAdminModel->getLangCode($site_srl, $source_name, TRUE);
return $oModuleAdminModel->getLangCode(0, $source_name, TRUE);
}
/**
@ -397,15 +377,14 @@ class menuAdminModel extends menu
/**
* @brief when menu add in sitemap, select module list
* this menu showing with trigger
* @param int $site_srl
* @return array
*/
function getModuleListInSitemap($site_srl = 0)
function getModuleListInSitemap()
{
$oModuleModel = getModel('module');
$moduleList = array('page');
$output = $oModuleModel->getModuleListByInstance($site_srl);
$output = $oModuleModel->getModuleListByInstance();
if(is_array($output->data))
{
foreach($output->data as $value)
@ -481,14 +460,7 @@ class menuAdminModel extends menu
public function getMenuAdminSiteMap()
{
$siteSrl = Context::get('site_srl');
$menuSrl = Context::get('menu_srl');
if(!isset($siteSrl))
{
$site_module_info = Context::get('site_module_info');
$siteSrl = (int)$site_module_info->site_srl;
}
$menuSrl = intval(Context::get('menu_srl'));
$oModuleModel = getModel('module');
$oMenuAdminController = getAdminController('menu');
@ -521,7 +493,7 @@ class menuAdminModel extends menu
{
foreach($menu->list AS $key=>$value)
{
$this->_menuInfoSetting($menu->list[$key], $start_module, $isMenuFixed, $menuSrl,$siteSrl);
$this->_menuInfoSetting($menu->list[$key], $start_module, $isMenuFixed, $menuSrl);
}
$menu->list = array_values($menu->list);
}
@ -543,7 +515,7 @@ class menuAdminModel extends menu
}
else
{
$menuListFromDB = $this->getMenus($siteSrl);
$menuListFromDB = $this->getMenus();
if(is_array($menuListFromDB))
{
$oAdmin = getClass('admin');
@ -572,7 +544,7 @@ class menuAdminModel extends menu
{
foreach($menu->list AS $key2=>$value2)
{
$this->_menuInfoSetting($menu->list[$key2], $start_module, $isMenuFixed, $value->menu_srl,$siteSrl);
$this->_menuInfoSetting($menu->list[$key2], $start_module, $isMenuFixed, $value->menu_srl);
}
$menu->list = array_values($menu->list);
}
@ -661,7 +633,7 @@ class menuAdminModel extends menu
* @param array $menu
* @return void
*/
private function _menuInfoSetting(&$menu, &$start_module, &$isMenuFixed, $menuSrl,$siteSrl = 0)
private function _menuInfoSetting(&$menu, &$start_module, &$isMenuFixed, $menuSrl)
{
$oModuleModel = getModel('module');
if(!is_array($start_module))
@ -689,7 +661,7 @@ class menuAdminModel extends menu
if($menu['is_shortcut'] != 'Y')
{
unset($midInfo, $moduleInfo);
$midInfo = $oModuleModel->getModuleInfoByMid($menu['url'], $siteSrl);
$midInfo = $oModuleModel->getModuleInfoByMid($menu['url']);
$moduleInfo = $oModuleModel->getModuleInfoXml($midInfo->module);
if($midInfo)
@ -740,7 +712,7 @@ class menuAdminModel extends menu
{
foreach($menu['list'] as $key=>$value)
{
$this->_menuInfoSetting($menu['list'][$key], $start_module, $isMenuFixed, $menuSrl, $siteSrl);
$this->_menuInfoSetting($menu['list'][$key], $start_module, $isMenuFixed, $menuSrl);
}
$menu['list'] = array_values($menu['list']);
}