fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-05 11:32:12 +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

83
modules/module/module.admin.controller.php
View file

@ -78,7 +78,7 @@ class moduleAdminController extends module
/**
* @brief Copy Module
*/
function procModuleAdminCopyModule($args = NULL)
function procModuleAdminCopyModule($args = NULL)
{
$isProc = false;
if(!$args)
@ -93,7 +93,10 @@ class moduleAdminController extends module
$module_srl = $args->module_srl;
}
if(!$module_srl) return;
if(!$module_srl)
{
return $this->_returnByProc($isProc);
}
// Get module name to create and browser title
$clones = array();
@ -107,7 +110,10 @@ class moduleAdminController extends module
if($mid && !$browser_title) $browser_title = $mid;
$clones[$mid] = $browser_title;
}
if(!count($clones)) return;
if(!count($clones))
{
return $this->_returnByProc($isProc);
}
$oModuleModel = &getModel('module');
$oModuleController = &getController('module');
@ -164,15 +170,17 @@ class moduleAdminController extends module
$triggerObj->moduleSrlList = array();
$errorLog = array();
foreach($clones as $mid => $browser_title)
foreach($clones as $mid => $browser_title)
{
$clone_args = null;
$clone_args = clone($module_info);
$clone_args = clone $module_info;
$clone_args->module_srl = null;
$clone_args->content = null;
$clone_args->mid = $mid;
$clone_args->browser_title = $browser_title;
$clone_args->is_default = 'N';
$clone_args->isMenuCreate = $args->isMenuCreate;
unset($clone_args->menu_srl);
// Create a module
$output = $oModuleController->insertModule($clone_args);
@ -248,6 +256,16 @@ class moduleAdminController extends module
return $module_srl;
}
private function _returnByProc($isProc, $msg='msg_invalid_request')
{
if(!$isProc)
return;
else
{
return new Object(-1, $msg);
}
}
/**
* @brief Save the module permissions
*/
@ -345,17 +363,31 @@ class moduleAdminController extends module
$mode = $mode === 'P' ? 'P' : 'M';
$oModuleModel = &getModel('module');
$columnList = array('module_srl', 'module', 'skin', 'mskin');
$columnList = array('module_srl', 'module', 'skin', 'mskin', 'is_skin_fix', 'is_mskin_fix');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
if($module_info->module_srl)
if($module_info->module_srl)
{
if($mode === 'M')
{
$skin = $module_info->mskin;
if($module_info->is_mskin_fix == 'Y')
{
$skin = $module_info->mskin;
}
else
{
$skin = $oModuleModel->getModuleDefaultSkin($module_info->module, 'M');
}
}
else
{
$skin = $module_info->skin;
if($module_info->is_skin_fix == 'Y')
{
$skin = $module_info->skin;
}
else
{
$skin = $oModuleModel->getModuleDefaultSkin($module_info->module, 'P');
}
}
// Get skin information (to check extra_vars)
@ -382,9 +414,9 @@ class moduleAdminController extends module
unset($obj->module);
unset($obj->_mode);
// Separately handle if a type of extra_vars is an image in the original skin_info
if($skin_info->extra_vars)
if($skin_info->extra_vars)
{
foreach($skin_info->extra_vars as $vars)
foreach($skin_info->extra_vars as $vars)
{
if($vars->type!='image') continue;
@ -479,10 +511,10 @@ class moduleAdminController extends module
$oModuleModel = &getModel('module');
$oModuleController= &getController('module');
$columnList = array('module_srl', 'module', 'menu_srl', 'site_srl', 'mid', 'browser_title', 'is_default', 'content', 'mcontent', 'open_rss', 'regdate');
$updateList = array('module_category_srl','layout_srl','skin','mlayout_srl','mskin','description','header_text','footer_text'); //use_mobile
$updateList = array('module_category_srl','layout_srl','skin','mlayout_srl','mskin','description','header_text','footer_text', 'use_mobile');
foreach($updateList as $key=>$val)
{
if(!$vars->{$val} && $vars->{$val} !== 0)
if(!strlen($vars->{$val}))
{
unset($updateList[$key]);
$columnList[] = $val;
@ -806,7 +838,7 @@ class moduleAdminController extends module
function makeCacheDefinedLangCode($site_srl = 0)
{
$args = new stdClass();
// Get the language file of the current site
if(!$site_srl)
{
@ -887,10 +919,12 @@ class moduleAdminController extends module
$layoutSrl = Context::get('layout_srl');
$skinFixTargetValue = ($skinType == 'M') ? 'is_mskin_fix' : 'is_skin_fix';
$isSkinFix = Context::get($skinFixTargetValue);
$isSkinFix = Context::get('is_skin_fix');
$isSkinFix = ($isSkinFix == 'N') ? 'N' : 'Y';
if($isSkinFix)
{
$isSkinFix = ($isSkinFix == 'N') ? 'N' : 'Y';
}
$skinName = Context::get('skin_name');
$skinVars = Context::get('skin_vars');
@ -928,8 +962,15 @@ class moduleAdminController extends module
$layoutTargetValue = ($skinType == 'M') ? 'mlayout_srl' : 'layout_srl';
$skinFixTargetValue = ($skinType == 'M') ? 'is_mskin_fix' : 'is_skin_fix';
$moduleInfo->{$layoutTargetValue} = $layoutSrl;
$moduleInfo->{$skinFixTargetValue} = $isSkinFix;
if(strlen($layoutSrl))
{
$moduleInfo->{$layoutTargetValue} = $layoutSrl;
}
if(strlen($isSkinFix))
{
$moduleInfo->{$skinFixTargetValue} = $isSkinFix;
}
if($isSkinFix == 'Y')
{
@ -949,10 +990,6 @@ class moduleAdminController extends module
}
}
}
else
{
$moduleInfo->{$skinTargetValue} = '';
}
$oModuleController = getController('module');
$output = $oModuleController->updateModule($moduleInfo);