issue 2370, issue 2373, issue 2374 add the site design info.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11303 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-09-18 08:41:42 +00:00
parent abef8deda9
commit ffde9607d9
5 changed files with 233 additions and 9 deletions

View file

@ -338,12 +338,42 @@
$this->stop("msg_not_permitted_act");
return FALSE;
}
// integrate skin information of the module(change to sync skin info with the target module only by seperating its table)
$oModuleModel = &getModel('module');
$oModuleModel->syncSkinInfoToModuleInfo($this->module_info);
Context::set('module_info', $this->module_info);
// Run
$output = $this->{$this->act}();
if($this->module_info->is_skin_fix == 'N' && $this->module != 'admin' && strpos($this->act, 'Admin') === false)
{
$designInfoFile = sprintf(_XE_PATH_.'files/site_design/design_%s.php', $this->module_info->site_srl);
if(is_readable($designInfoFile))
{
@include($designInfoFile);
$skinName = $designInfo->module->{$this->module_info->module}->skin;
if($skinName)
{
$this->setTemplatePath(sprintf('%sskins/%s/', $this->module_path, $skinName));
}
$skinVars = $designInfo->module->{$this->module_info->module}->skin_vars;
if($skinVars)
{
$skinVars = unserialize($skinVars);
foreach($skinVars as $key => $val)
{
$this->module_info->{$key} = $val;
}
}
}
}
else
{
$oModuleModel = &getModel('module');
$oModuleModel->syncSkinInfoToModuleInfo($this->module_info);
}
Context::set('module_info', $this->module_info);
// Run
$output = $this->{$this->act}();
}
else {
return false;