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

Close Connection when there is no connection value.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13161 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
misol 2013-09-25 15:29:32 +00:00
parent 034a5c0288
commit f70ce644ce
1410 changed files with 7188 additions and 53541 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -92,11 +92,16 @@ class menuAdminModel extends menu
* @param string $title
* @return object
*/
function getMenuByTitle($title)
function getMenuByTitle($title, $site_srl = 0)
{
// Get information from the DB
if(!is_array($title))
{
$title = array($title);
}
$args = new stdClass();
$args->title = $title;
$args->site_srl = $site_srl;
$output = executeQuery('menu.getMenuByTitle', $args);
if(!$output->data) return;
@ -111,6 +116,26 @@ class menuAdminModel extends menu
return $menu_info;
}
/**
* Get information of a new menu from the DB, search condition is menu title
* Return DB and XML information of the menu(list Type)
* @param string $title
* @return object
*/
function getMenuListByTitle($title)
{
// Get information from the DB
$args = new stdClass();
$args->title = $title;
$output = executeQueryArray('menu.getMenuByTitle', $args);
if(!$output->data)
{
return array();
}
return $output->data;
}
/**
* Return item information of the menu_srl
* group_srls uses a seperator with comma(,) and converts to an array by explode
@ -249,7 +274,7 @@ class menuAdminModel extends menu
}
// Get language code
$oModuleAdminModel = &getAdminModel('module');
return $oModuleAdminModel->getLangCode($site_srl, $source_name);
return $oModuleAdminModel->getLangCode($site_srl, $source_name, TRUE);
}
/**
@ -306,7 +331,56 @@ class menuAdminModel extends menu
*/
function getMenuAdminInstalledMenuType()
{
$oModuleModel = getModel('module');
$oAutoinstallModel = getModel('autoinstall');
$this->add('menu_types', $this->getModuleListInSitemap(0));
$_allModules = $oModuleModel->getModuleList();
$allModules = array();
Context::loadLang('modules/page/lang');
foreach($_allModules AS $key=>$value)
{
//$moduleInfo = $oModuleModel->getModuleInfoXml($value->module);
$defaultSkin = $oModuleModel->getModuleDefaultSkin($value->module, 'P');
$defaultMobileSkin = $oModuleModel->getModuleDefaultSkin($value->module, 'M');
$skinInfo = $oModuleModel->loadSkinInfo(ModuleHandler::getModulePath($value->module), $defaultSkin);
$mobileSkinInfo = $oModuleModel->loadSkinInfo(ModuleHandler::getModulePath($value->module), $defaultMobileSkin, 'm.skins');
$value->defaultSkin = new stdClass();
$value->defaultSkin->skin = $defaultSkin;
$value->defaultSkin->title = $skinInfo->title ? $skinInfo->title : $defaultSkin;
$value->defaultMobileSkin = new stdClass();
$value->defaultMobileSkin->skin = $defaultMobileSkin;
$value->defaultMobileSkin->title = $mobileSkinInfo->title ? $mobileSkinInfo->title : $defaultMobileSkin;
$value->package_srl = $oAutoinstallModel->getPackageSrlByPath('./modules/' . $value->module);
$value->url = _XE_LOCATION_SITE_ . '?mid=download&package_srl=' . $value->package_srl;
if($value->module == 'page')
{
$pageTypeName = Context::getLang('page_type_name');
$value->title = $pageTypeName['ARTICLE'];
$allModules['ARTICLE'] = $value;
$wModuleInfo = clone $value;
unset($wModuleInfo->default_skin);
unset($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);
$oModuleInfo->title = $pageTypeName['OUTSIDE'];
$oModuleInfo->no_skin = 'Y';
$allModules['OUTSIDE'] = $oModuleInfo;
}
else
{
$allModules[$value->module] = $value;
}
}
$this->add('all_modules', $allModules);
}
/**
@ -318,15 +392,17 @@ class menuAdminModel extends menu
function getModuleListInSitemap($site_srl = 0)
{
$oModuleModel = &getModel('module');
$columnList = array('module');
$moduleList = array('page');
$output = $oModuleModel->getModuleListByInstance($site_srl, $columnList);
$output = $oModuleModel->getModuleListByInstance($site_srl);
if(is_array($output->data))
{
foreach($output->data AS $key=>$value)
{
array_push($moduleList, $value->module);
if($value->instanceCount > 1)
{
array_push($moduleList, $value->module);
}
}
}
@ -337,7 +413,7 @@ class menuAdminModel extends menu
$localModuleList = array_unique($moduleList);
$oAutoinstallModel = getModel('autoinstall');
// get have instance
$remotePackageList = $oAutoinstallModel->getHaveInstance(array('path'));
$remoteModuleList = array();
@ -354,9 +430,10 @@ class menuAdminModel extends menu
// union have instance and all module list
$haveInstance = array_intersect($remoteModuleList, $allModuleList);
$haveDirectory = array_intersect($localModuleList, $allModuleList);
// union
$moduleList = array_unique(array_merge($localModuleList, $haveInstance));
$moduleList = array_unique(array_merge($haveDirectory, $haveInstance));
$moduleInfoList = array();
Context::loadLang('modules/page/lang');
@ -365,19 +442,6 @@ class menuAdminModel extends menu
foreach($moduleList AS $key=>$value)
{
$moduleInfo = $oModuleModel->getModuleInfoXml($value);
$defaultSkin = $oModuleModel->getModuleDefaultSkin($value, 'P');
$defaultMobileSkin = $oModuleModel->getModuleDefaultSkin($value, 'M');
$skinInfo = $oModuleModel->loadSkinInfo(ModuleHandler::getModulePath($value), $defaultSkin);
$mobileSkinInfo = $oModuleModel->loadSkinInfo(ModuleHandler::getModulePath($value), $defaultMobileSkin, 'm.skins');
$moduleInfo->defaultSkin = new stdClass();
$moduleInfo->defaultSkin->skin = $defaultSkin;
$moduleInfo->defaultSkin->title = $skinInfo->title ? $skinInfo->title : $defaultSkin;
$moduleInfo->defaultMobileSkin = new stdClass();
$moduleInfo->defaultMobileSkin->skin = $defaultMobileSkin;
$moduleInfo->defaultMobileSkin->title = $mobileSkinInfo->title ? $mobileSkinInfo->title : $defaultMobileSkin;
$moduleInfo->package_srl = $oAutoinstallModel->getPackageSrlByPath('./modules/' . $value);
$moduleInfo->url = _XE_LOCATION_SITE_ . '?mid=download&package_srl=' . $moduleInfo->package_srl;
if($value == 'page')
{
@ -538,7 +602,11 @@ class menuAdminModel extends menu
// get xml info
$moduleConfInfo = $oModuleModel->getModuleInfoXml($moduleInfo->module);
$setupUrl = getNotEncodedUrl('', 'module', 'admin', 'act', $moduleConfInfo->setup_index_act, 'module_srl', $moduleInfo->module_srl, 'isLayoutDrop', '1');
if($moduleConfInfo->setup_index_act)
{
$setupUrl = getNotEncodedUrl('', 'module', 'admin', 'act', $moduleConfInfo->setup_index_act, 'module_srl', $moduleInfo->module_srl, 'isLayoutDrop', '1');
}
if($moduleConfInfo->simple_setup_index_act)
{
$oTargetmoduleAdminModel = &getAdminModel($moduleInfo->module);
@ -584,7 +652,8 @@ class menuAdminModel extends menu
unset($moduleInfo);
$midInfo = $oModuleModel->getModuleInfoByMid($menu['url'], $siteSrl);
$moduleInfo = $oModuleModel->getModuleInfoXml($midInfo->module);
if($moduleInfo->setup_index_act)
if($midInfo)
{
$menu['module_srl'] = $midInfo->module_srl;
$menu['module'] = $midInfo->module;
@ -596,8 +665,17 @@ class menuAdminModel extends menu
{
$menu['module_type'] = $midInfo->module;
}
}
if($moduleInfo->setup_index_act)
{
$menu['setup_index_act'] = $moduleInfo->setup_index_act;
}
else if($moduleInfo->default_index_act)
{
$menu['setup_index_act'] = $moduleInfo->default_index_act;
}
if($menu['is_shortcut'] == 'N' && $midInfo->mid == $start_module->mid)
{
$menu['is_start_module'] = true;