mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-04-15 00:12:43 +09:00
Close Connection when there is no connection value.
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13161 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
parent
034a5c0288
commit
f70ce644ce
1410 changed files with 7188 additions and 53541 deletions
|
|
@ -96,11 +96,23 @@ class module extends ModuleObject
|
|||
}
|
||||
|
||||
// XE 1.7
|
||||
$output = executeQueryArray('module.getNotLinkedModuleGroupSiteSrl');
|
||||
$args->site_srl = 0;
|
||||
$output = executeQueryArray('module.getNotLinkedModuleBySiteSrl',$args);
|
||||
|
||||
if($output->toBool() && $output->data && count($output->data) > 0) return true;
|
||||
|
||||
// check fix mskin
|
||||
if(!$oDB->isColumnExists("modules", "is_mskin_fix")) return true;
|
||||
|
||||
$oModuleModel = getModel('module');
|
||||
$moduleConfig = $oModuleModel->getModuleConfig('module');
|
||||
if(!$moduleConfig->isUpdateFixedValue) return true;
|
||||
|
||||
// check lost module
|
||||
if(!$moduleConfig->isUpdateLostModule)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -356,19 +368,7 @@ class module extends ModuleObject
|
|||
if(!$oDB->isColumnExists("modules", "is_skin_fix"))
|
||||
{
|
||||
$oDB->addColumn('modules', 'is_skin_fix', 'char', 1, 'N');
|
||||
$output = executeQueryArray('module.getAllSkinSetModule');
|
||||
if($output->toBool() && $output->data)
|
||||
{
|
||||
$module_srls = array();
|
||||
foreach($output->data as $val)
|
||||
{
|
||||
$module_srls[] = $val->module_srl;
|
||||
}
|
||||
unset($args);
|
||||
$args->module_srls = implode(',', $module_srls);
|
||||
$args->is_skin_fix = 'Y';
|
||||
$output = executeQuery('module.updateSkinFixModules', $args);
|
||||
}
|
||||
$output = executeQuery('module.updateSkinFixModules');
|
||||
}
|
||||
if(!$oDB->isColumnExists("module_config", "site_srl"))
|
||||
{
|
||||
|
|
@ -398,51 +398,101 @@ class module extends ModuleObject
|
|||
if(!$oDB->isColumnExists("modules", "is_mskin_fix"))
|
||||
{
|
||||
$oDB->addColumn('modules', 'is_mskin_fix', 'char', 1, 'N');
|
||||
$output = executeQueryArray('module.getAllMobileSkinSetModule');
|
||||
if($output->toBool() && $output->data)
|
||||
{
|
||||
$module_srls = array();
|
||||
foreach($output->data as $val)
|
||||
{
|
||||
$module_srls[] = $val->module_srl;
|
||||
}
|
||||
unset($args);
|
||||
$args->module_srls = implode(',', $module_srls);
|
||||
$args->is_mskin_fix = 'Y';
|
||||
$output = executeQuery('module.updateMobileSkinFixModules', $args);
|
||||
}
|
||||
$output = executeQuery('module.updateMobileSkinFixModules');
|
||||
}
|
||||
|
||||
$output = executeQueryArray('module.getNotLinkedModuleGroupSiteSrl');
|
||||
unset($args);
|
||||
$args->site_srl = 0;
|
||||
$output = executeQueryArray('module.getNotLinkedModuleBySiteSrl',$args);
|
||||
|
||||
if($output->toBool() && $output->data && count($output->data) > 0)
|
||||
{
|
||||
foreach($output->data as $siteInfo)
|
||||
//create temp menu.
|
||||
$args->title = 'Temporary menu';
|
||||
$menuSrl = $args->menu_srl = getNextSequence();
|
||||
$args->listorder = $args->menu_srl * -1;
|
||||
|
||||
$ioutput = executeQuery('menu.insertMenu', $args);
|
||||
|
||||
if(!$ioutput->toBool())
|
||||
{
|
||||
unset($args);
|
||||
$args->site_srl = $siteInfo->site_srl;
|
||||
return $ioutput;
|
||||
}
|
||||
|
||||
//create temp menu.
|
||||
$args->title = 'Temporary menu';
|
||||
$menuSrl = $args->menu_srl = getNextSequence();
|
||||
$args->listorder = $args->menu_srl * -1;
|
||||
//getNotLinkedModuleBySiteSrl
|
||||
$soutput = executeQueryArray('module.getNotLinkedModuleBySiteSrl', $args);
|
||||
$uoutput = $this->updateLinkModule($soutput->data, $menuSrl);
|
||||
}
|
||||
|
||||
$ioutput = executeQuery('menu.insertMenu', $args);
|
||||
$oModuleModel = getModel('module');
|
||||
$moduleConfig = $oModuleModel->getModuleConfig('module');
|
||||
if(!$moduleConfig->isUpdateFixedValue)
|
||||
{
|
||||
$output = executeQuery('module.updateSkinFixModules');
|
||||
$output = executeQuery('module.updateMobileSkinFixModules');
|
||||
|
||||
if(!$ioutput->toBool())
|
||||
$oModuleController = getController('module');
|
||||
$moduleConfig->isUpdateFixedValue = TRUE;
|
||||
$output = $oModuleController->updateModuleConfig('module', $moduleConfig);
|
||||
}
|
||||
|
||||
// check lost module
|
||||
if(!$moduleConfig->isUpdateLostModule)
|
||||
{
|
||||
$args = new stdClass();
|
||||
$args->site_srl = 0;
|
||||
$output = executeQueryArray('module.getMidList', $args);
|
||||
if(!$output->toBool())
|
||||
{
|
||||
return $output;
|
||||
}
|
||||
if($output->data)
|
||||
{
|
||||
$oMenuAdminModel = getAdminModel('menu'); /* @var $oMenuAdminModel menuAdminModel */
|
||||
foreach($output->data as $row)
|
||||
{
|
||||
return $ioutput;
|
||||
}
|
||||
$args = new stdClass();
|
||||
$args->url = $row->mid;
|
||||
$output2 = executeQuery('module.getMenuItem', $args);
|
||||
|
||||
//getNotLinkedModuleBySiteSrl
|
||||
$soutput = executeQueryArray('module.getNotLinkedModuleBySiteSrl', $args);
|
||||
$uoutput = $this->updateLinkModule($soutput->data, $menuSrl);
|
||||
if(!$output2->data->count)
|
||||
{
|
||||
$menuInfo = $oMenuAdminModel->getMenuByTitle('Temporary menu');
|
||||
|
||||
if(!$uoutput->toBool())
|
||||
{
|
||||
return $uoutput;
|
||||
if(!$menuInfo)
|
||||
{
|
||||
$args = new stdClass();
|
||||
$args->title = 'Temporary menu';
|
||||
$menuSrl = $args->menu_srl = getNextSequence();
|
||||
$args->listorder = $args->menu_srl * -1;
|
||||
|
||||
$ioutput = executeQuery('menu.insertMenu', $args);
|
||||
if(!$ioutput->toBool())
|
||||
{
|
||||
return $ioutput;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$menuSrl = $menuInfo->menu_srl;
|
||||
}
|
||||
|
||||
$uoutput = $this->updateLinkModule(array($row), $menuSrl);
|
||||
if(!$uoutput->toBool())
|
||||
{
|
||||
return $uoutput;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$oModuleController = getController('module');
|
||||
$moduleConfig->isUpdateLostModule = TRUE;
|
||||
$output = $oModuleController->updateModuleConfig('module', $moduleConfig);
|
||||
if(!$output->toBool())
|
||||
{
|
||||
return $output;
|
||||
}
|
||||
}
|
||||
|
||||
return new Object(0, 'success_updated');
|
||||
|
|
@ -454,7 +504,7 @@ class module extends ModuleObject
|
|||
* @param array $moduleInfos
|
||||
* @param int $menuSrl
|
||||
*
|
||||
* @return Object
|
||||
* @return Object
|
||||
*/
|
||||
private function updateLinkModule($moduleInfos, $menuSrl)
|
||||
{
|
||||
|
|
@ -468,6 +518,7 @@ class module extends ModuleObject
|
|||
// search menu.
|
||||
$args->url = $moduleInfo->mid;
|
||||
$args->site_srl = $moduleInfo->site_srl;
|
||||
$args->is_shortcut = 'N';
|
||||
|
||||
$output = executeQuery('menu.getMenuItemByUrl', $args);
|
||||
|
||||
|
|
@ -485,7 +536,7 @@ class module extends ModuleObject
|
|||
$item_args->listorder = -1*$item_args->menu_item_srl;
|
||||
|
||||
$output = executeQuery('menu.insertMenuItem', $item_args);
|
||||
if(!$output->toBool())
|
||||
if(!$output->toBool())
|
||||
{
|
||||
return $output;
|
||||
}
|
||||
|
|
@ -493,7 +544,7 @@ class module extends ModuleObject
|
|||
}
|
||||
|
||||
$output = executeQuery('module.updateModule', $moduleInfo);
|
||||
if(!$output->toBool())
|
||||
if(!$output->toBool())
|
||||
{
|
||||
return $output;
|
||||
}
|
||||
|
|
@ -519,7 +570,7 @@ class module extends ModuleObject
|
|||
$bFirst = true;
|
||||
foreach($output2->data as $site)
|
||||
{
|
||||
if($bFirst)
|
||||
if($bFirst)
|
||||
{
|
||||
$bFirst = false;
|
||||
continue;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue