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

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

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

@ -42,6 +42,14 @@ class layoutModel extends layout
$args->layout_type = $layout_type;
$output = executeQueryArray('layout.getLayoutList', $args, $columnList);
foreach($output->data as $no => &$val)
{
if(!$this->isExistsLayoutFile($val->layout, $layout_type))
{
unset($output->data[$no]);
}
}
$oLayoutAdminModel = getAdminModel('layout');
$siteDefaultLayoutSrl = $oLayoutAdminModel->getSiteDefaultLayout($layout_type, $site_srl);
if($siteDefaultLayoutSrl)
@ -126,9 +134,16 @@ class layoutModel extends layout
$instanceList = array();
if(is_array($output->data))
{
foreach($output->data as $iInfo)
foreach($output->data as $no => $iInfo)
{
$instanceList[] = $iInfo->layout;
if($this->isExistsLayoutFile($iInfo->layout, $layoutType))
{
$instanceList[] = $iInfo->layout;
}
else
{
unset($output->data[$no]);
}
}
}
@ -184,11 +199,56 @@ class layoutModel extends layout
if($isCreateInstance)
{
$output = executeQueryArray('layout.getLayoutList', $args, $columnList);
if(is_array($output->data))
{
foreach($output->data as $no => $iInfo)
{
if(!$this->isExistsLayoutFile($iInfo->layout, $layoutType))
{
unset($output->data[$no]);
}
}
}
}
return $output->data;
}
/**
* If exists layout file returns true
*
* @param string $layout layout name
* @param string $layoutType P or M
* @return bool
*/
function isExistsLayoutFile($layout, $layoutType)
{
//TODO If remove a support themes, remove this codes also.
if($layoutType == 'P')
{
$pathPrefix = _XE_PATH_ . 'layouts/';
$themePathFormat = _XE_PATH_ . 'themes/%s/layouts/%s';
}
else
{
$pathPrefix = _XE_PATH_ . 'm.layouts/';
$themePathFormat = _XE_PATH_ . 'themes/%s/m.layouts/%s';
}
if(strpos($layout, '|@|') !== FALSE)
{
list($themeName, $layoutName) = explode('|@|', $layout);
$path = sprintf($themePathFormat, $themeName, $layoutName);
}
else
{
$path = $pathPrefix . $layout;
}
return is_readable($path . '/layout.html');
}
/**
* Get one of layout information created in the DB
* Return DB info + XML info of the generated layout
@ -725,7 +785,7 @@ class layoutModel extends layout
* Get ini configurations and make them an array.
* @param int $layout_srl
* @param string $layout_name
* @return array
* @return array
*/
function getUserLayoutIniConfig($layout_srl, $layout_name=null)
{
@ -809,9 +869,9 @@ class layoutModel extends layout
function getUserLayoutHtml($layout_srl)
{
$src = $this->getUserLayoutPath($layout_srl). 'layout.html';
$temp = $this->getUserLayoutTempHtml($layout_srl);
if($this->useUserLayoutTemp == 'temp')
{
$temp = $this->getUserLayoutTempHtml($layout_srl);
if(!file_exists(FileHandler::getRealPath($temp))) FileHandler::copyFile($src,$temp);
return $temp;
}