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

issue 2367 added login that not used layout.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11654 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-10-10 08:39:37 +00:00
parent b5486fcc91
commit e1286d8b24
1 changed files with 48 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

85
modules/layout/layout.view.php
View file

@ -56,40 +56,43 @@
$skinVars = json_decode($skinVars);
// Get the layout information.
if(!$layoutSrl || !$module)
if(!$mid && !$moduleSrl)
{
return new Object(-1, 'msg_invalid_request');
}
$oLayoutModel = getModel('layout');
$layoutInfo = $oLayoutModel->getLayout($layoutSrl);
if(!$layoutInfo)
if($layoutSrl)
{
return new Object(-1, 'msg_invalid_request');
$oLayoutModel = getModel('layout');
$layoutInfo = $oLayoutModel->getLayout($layoutSrl);
if(!$layoutInfo)
{
return new Object(-1, 'msg_invalid_request');
}
// Set names and values of extra_vars to $layout_info
if($layoutInfo->extra_var_count)
{
foreach($layoutInfo->extra_var as $var_id => $val)
{
$layoutInfo->{$var_id} = $val->value;
}
}
// menu in layout information becomes an argument for Context:: set
if($layoutInfo->menu_count)
{
foreach($layoutInfo->menu as $menu_id => $menu)
{
if(file_exists($menu->php_file)) @include($menu->php_file);
Context::set($menu_id, $menu);
}
}
Context::set('layout_info', $layoutInfo);
}
// Set names and values of extra_vars to $layout_info
if($layoutInfo->extra_var_count)
{
foreach($layoutInfo->extra_var as $var_id => $val)
{
$layoutInfo->{$var_id} = $val->value;
}
}
// menu in layout information becomes an argument for Context:: set
if($layoutInfo->menu_count)
{
foreach($layoutInfo->menu as $menu_id => $menu)
{
if(file_exists($menu->php_file)) @include($menu->php_file);
Context::set($menu_id, $menu);
}
}
Context::set('layout_info', $layoutInfo);
// Get the module information.
$oModuleHandler = new ModuleHandler($module, '', $mid, '', $moduleSrl);
$oModuleHandler->act = '';
@ -121,17 +124,25 @@
Context::set('content', Context::getLang('layout_preview_content'));
}
// Compile
$oTemplate = &TemplateHandler::getInstance();
$layout_path = $layoutInfo->path;
$layout_file = 'layout';
$layout_tpl = $oTemplate->compile($layout_path, $layout_file);
Context::set('layout','none');
// Compile
$oTemplate = &TemplateHandler::getInstance();
if($layoutSrl)
{
$layout_path = $layoutInfo->path;
$layout_file = 'layout';
}
else
{
$layout_path = './common/tpl';
$layout_file = 'default_layout';
}
$layout_tpl = $oTemplate->compile($layout_path, $layout_file);
Context::set('layout','none');
// Convert widgets and others
$oContext = &Context::getInstance();
Context::set('layout_tpl', $layout_tpl);
$this->setTemplateFile('layout_preview');
// Convert widgets and others
$oContext = &Context::getInstance();
Context::set('layout_tpl', $layout_tpl);
$this->setTemplateFile('layout_preview');
}
/**
* Preview a layout