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

NOISSUE code rearrange

Browse source
This commit is contained in:
ngleader 2013-11-22 06:46:26 +09:00
parent b146e48ff5
commit bc47f19615
22 changed files with 130 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/menu/menu.admin.controller.php
View file

@ -1110,7 +1110,7 @@ class menuAdminController extends menu
{
$this->_copyButton($insertedMenuItemSrl, $menuItemInfo);
}
array_push($this->insertedMenuItemSrlList, $insertedMenuItemSrl);
$this->insertedMenuItemSrlList[] = $insertedMenuItemSrl;
}
// if have a child menu, copy child menu also

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

@ -340,7 +340,7 @@ class menuAdminModel extends menu
$allModules = array();
Context::loadLang('modules/page/lang');
foreach($_allModules AS $key=>$value)
foreach($_allModules as $value)
{
//$moduleInfo = $oModuleModel->getModuleInfoXml($value->module);
$defaultSkin = $oModuleModel->getModuleDefaultSkin($value->module, 'P');
@ -363,14 +363,12 @@ class menuAdminModel extends menu
$value->title = $pageTypeName['ARTICLE'];
$allModules['ARTICLE'] = $value;
$wModuleInfo = clone $value;
unset($wModuleInfo->default_skin);
unset($wModuleInfo->default_mskin);
unset($wModuleInfo->default_skin, $wModuleInfo->default_mskin);
$wModuleInfo->title = $pageTypeName['WIDGET'];
$wModuleInfo->no_skin = 'Y';
$allModules['WIDGET'] = $wModuleInfo;
$oModuleInfo = clone $value;
unset($oModuleInfo->default_skin);
unset($oModuleInfo->default_mskin);
unset($oModuleInfo->default_skin, $oModuleInfo->default_mskin);
$oModuleInfo->title = $pageTypeName['OUTSIDE'];
$oModuleInfo->no_skin = 'Y';
$allModules['OUTSIDE'] = $oModuleInfo;
@ -398,11 +396,11 @@ class menuAdminModel extends menu
$output = $oModuleModel->getModuleListByInstance($site_srl);
if(is_array($output->data))
{
foreach($output->data AS $key=>$value)
foreach($output->data as $value)
{
if($value->instanceCount > 1)
{
array_push($moduleList, $value->module);
$moduleList[] = $value->module;
}
}
}
@ -440,7 +438,7 @@ class menuAdminModel extends menu
Context::loadLang('modules/page/lang');
if(is_array($moduleList))
{
foreach($moduleList AS $key=>$value)
foreach($moduleList as $value)
{
$moduleInfo = $oModuleModel->getModuleInfoXml($value);
@ -450,14 +448,12 @@ class menuAdminModel extends menu
$moduleInfo->title = $pageTypeName['ARTICLE'];
$moduleInfoList['ARTICLE'] = $moduleInfo;
$wModuleInfo = clone $moduleInfo;
unset($wModuleInfo->default_skin);
unset($wModuleInfo->default_mskin);
unset($wModuleInfo->default_skin, $wModuleInfo->default_mskin);
$wModuleInfo->title = $pageTypeName['WIDGET'];
$wModuleInfo->no_skin = 'Y';
$moduleInfoList['WIDGET'] = $wModuleInfo;
$oModuleInfo = clone $moduleInfo;
unset($oModuleInfo->default_skin);
unset($oModuleInfo->default_mskin);
unset($oModuleInfo->default_skin, $oModuleInfo->default_mskin);
$oModuleInfo->title = $pageTypeName['OUTSIDE'];
$oModuleInfo->no_skin = 'Y';
$moduleInfoList['OUTSIDE'] = $oModuleInfo;
@ -514,7 +510,7 @@ class menuAdminModel extends menu
$menuItems->menuSrl = $output->menu_srl;
$menuItems->title = $output->title;
$menuItems->menuItems = $menu;
array_push($menuList, $menuItems);
$menuList[] = $menuItems;
}
else
{
@ -566,7 +562,7 @@ class menuAdminModel extends menu
}
else
{
array_push($menuList, $menuItems);
$menuList[] = $menuItems;
}
}
}
@ -649,8 +645,7 @@ class menuAdminModel extends menu
//if(!empty($menu['url']) && !preg_match('/^http/i', $menu['url']))
if($menu['is_shortcut'] != 'Y')
{
unset($midInfo);
unset($moduleInfo);
unset($midInfo, $moduleInfo);
$midInfo = $oModuleModel->getModuleInfoByMid($menu['url'], $siteSrl);
$moduleInfo = $oModuleModel->getModuleInfoXml($midInfo->module);
@ -688,7 +683,7 @@ class menuAdminModel extends menu
}
if(count($menu['list']) > 0)
{
foreach($menu['list'] AS $key=>$value)
foreach($menu['list'] as $key=>$value)
{
$this->_menuInfoSetting($menu['list'][$key], $start_module, $isMenuFixed, $menuSrl);
}

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

@ -49,20 +49,19 @@ class menuAdminView extends menu
if(is_array($output))
{
$menuItems = array();
foreach($output AS $key=>$value)
foreach($output as $key=>$value)
{
if($value->title == $oAdmin->getAdminMenuName()) unset($output[$key]);
else
{
unset($menu);
unset($menuItems);
unset($menu, $menuItems);
//$value->xml_file = sprintf('./files/cache/menu/%s.xml.php',$value->menu_srl);
$value->php_file = sprintf(_XE_PATH_ . 'files/cache/menu/%s.php',$value->menu_srl);
if(file_exists($value->php_file)) include($value->php_file);
if(count($menu->list)>0)
{
foreach($menu->list AS $key2=>$value2)
foreach($menu->list as $key2=>$value2)
{
$this->_menuInfoSetting($menu->list[$key2]);
}
@ -73,7 +72,7 @@ class menuAdminView extends menu
$menuItems->menuSrl = $value->menu_srl;
$menuItems->title = $value->title;
$menuItems->menuItems = $menu;
array_push($menuList, $menuItems);
$menuList[] = $menuItems;
}
}
}
@ -92,7 +91,7 @@ class menuAdminView extends menu
$theme_file = _XE_PATH_.'files/theme/theme_info.php';
if(is_readable($theme_file))
{
@include($theme_file);
include($theme_file);
Context::set('current_layout', $theme_info->layout);
}
else
@ -108,7 +107,7 @@ class menuAdminView extends menu
if(is_array($output))
{
$groupList = array();
foreach($output AS $key=>$value)
foreach($output as $value)
{
$groupList[$value->group_srl] = new stdClass();
$groupList[$value->group_srl]->group_srl = $value->group_srl;
@ -153,7 +152,7 @@ class menuAdminView extends menu
}
if(count($menu['list']) > 0)
{
foreach($menu['list'] AS $key=>$value)
foreach($menu['list'] as $key=>$value)
{
$this->_menuInfoSetting($menu['list'][$key]);
}
@ -170,7 +169,7 @@ class menuAdminView extends menu
if(is_array($menuItems))
{
$arrangedMenuItemList = array();
foreach($menuItems AS $key=>$value)
foreach($menuItems as $value)
{
if($value->parent_srl == 0)
{