fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-02 16:52:16 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue 2119. supporting php 5.4. modules and widgets.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12706 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2013-02-05 09:45:04 +00:00
parent ff75082eee
commit 8a7c28babc
90 changed files with 572 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/layout/layout.admin.controller.php
View file

@ -143,7 +143,7 @@ class layoutAdminController extends layout
if($apply_layout=='Y' || $apply_mobile_view=='Y')
{
$menu_args = null;
$menu_args = new stdClass();
$menu_args->menu_srl = $menu_srl;
$menu_args->site_srl = $layout_info->site_srl;
$output = executeQueryArray('layout.getLayoutModules', $menu_args);
@ -157,6 +157,7 @@ class layoutAdminController extends layout
if(count($modules))
{
$update_args = new stdClass();
$update_args->module_srls = implode(',',$modules);
if($apply_layout == "Y")
{
@ -214,6 +215,7 @@ class layoutAdminController extends layout
// Save header script into "config" of layout module
$oModuleModel = &getModel('module');
$oModuleController = &getController('module');
$layout_config = new stdClass();
$layout_config->header_script = Context::get('header_script');
$oModuleController->insertModulePartConfig('layout',$args->layout_srl,$layout_config);
// Save a title of the menu
@ -318,6 +320,7 @@ class layoutAdminController extends layout
$layout_file = $oLayoutModel->getUserLayoutHtml($layout_srl);
if(file_exists($layout_file)) FileHandler::removeFile($layout_file);
// Delete Layout
$args = new stdClass();
$args->layout_srl = $layout_srl;
$output = executeQuery("layout.deleteLayout", $args);
//remove from cache
@ -730,10 +733,12 @@ class layoutAdminController extends layout
}
$output = $oLayoutModel->getLayoutRawData($sourceArgs->layout_srl, array('extra_vars'));
$args = new stdClass();
$args->extra_vars = $output->extra_vars;
$extra_vars = unserialize($args->extra_vars);
$oModuleController = &getController('module');
$layout_config = new stdClass();
$layout_config->header_script = $extra_vars->header_script;
// Get information to create a layout

1
modules/layout/layout.class.php
View file

@ -37,6 +37,7 @@ class layout extends ModuleObject
if(!$oDB->isColumnExists('layouts', 'layout_type')) return true;
$args = new stdClass();
$args->layout = '.';
$output = executeQueryArray('layout.getLayoutDotList', $args);
if($output->data && count($output->data) > 0)

4
modules/layout/layout.model.php
View file

@ -37,6 +37,7 @@ class layoutModel extends layout
$site_module_info = Context::get('site_module_info');
$site_srl = (int)$site_module_info->site_srl;
}
$args = new stdClass();
$args->site_srl = $site_srl;
$args->layout_type = $layout_type;
$output = executeQueryArray('layout.getLayoutList', $args, $columnList);
@ -115,6 +116,7 @@ class layoutModel extends layout
$siteModuleInfo = Context::get('site_module_info');
$siteSrl = (int)$siteModuleInfo->site_srl;
}
$args = new stdClass();
$args->site_srl = $siteSrl;
$args->layout_type = $layoutType;
$args->layout = $layout;
@ -205,6 +207,7 @@ class layoutModel extends layout
if(!$layout_info)
{
// Get information from the DB
$args = new stdClass();
$args->layout_srl = $layout_srl;
$output = executeQuery('layout.getLayout', $args);
if(!$output->data) return;
@ -226,6 +229,7 @@ class layoutModel extends layout
function getLayoutRawData($layout_srl, $columnList = array())
{
$args = new stdClass();
$args->layout_srl = $layout_srl;
$output = executeQuery('layout.getLayout', $args, $columnList);
if(!$output->toBool())

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

@ -82,11 +82,12 @@ class layoutView extends layout
$oModule = ModuleHandler::getModuleInstance($module, $type);
$oModule->setAct($xml_info->default_index_act);
$module_info = new stdClass();
$module_info->module = $module;
$module_info->module_type = $type;
$module_info->page_type = $page_type;
$module_info->document_srl= $document_srl;
$oModule->setModuleInfo($this->module_info, $xml_info);
$oModule->setModuleInfo($module_info, $xml_info);
$oModule->proc();
}
else