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

Don't cache module info if DB query fails

Browse source 
xpressengine/xe-core#2308
This commit is contained in:
Kijin Sung 2018-10-10 15:56:42 +09:00
parent 666380f07f
commit f842a977a3
1 changed files with 39 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

56
modules/module/module.model.php
View file

@ -89,12 +89,12 @@ class moduleModel extends module
$domain_info->site_srl = 0;
$domain_info->settings = $domain_info->settings ? json_decode($domain_info->settings) : new stdClass;
$domain_info->default_language = $domain_info->settings->language ?: config('locale.default_lang');
Rhymix\Framework\Cache::set('site_and_module:domain_info:default', $domain_info, 0, true);
}
else
{
$domain_info = false;
}
Rhymix\Framework\Cache::set('site_and_module:domain_info:default', $domain_info, 0, true);
}
return $domain_info;
@ -118,12 +118,12 @@ class moduleModel extends module
$domain_info->site_srl = 0;
$domain_info->settings = $domain_info->settings ? json_decode($domain_info->settings) : new stdClass;
$domain_info->default_language = $domain_info->settings->language ?: config('locale.default_lang');
Rhymix\Framework\Cache::set('site_and_module:domain_info:srl:' . $domain_srl, $domain_info, 0, true);
}
else
{
$domain_info = false;
}
Rhymix\Framework\Cache::set('site_and_module:domain_info:srl:' . $domain_srl, $domain_info, 0, true);
}
return $domain_info;
@ -160,12 +160,12 @@ class moduleModel extends module
$domain_info->site_srl = 0;
$domain_info->settings = $domain_info->settings ? json_decode($domain_info->settings) : new stdClass;
$domain_info->default_language = $domain_info->settings->language ?: config('locale.default_lang');
Rhymix\Framework\Cache::set('site_and_module:domain_info:domain:' . $domain, $domain_info, 0, true);
}
else
{
$domain_info = false;
}
Rhymix\Framework\Cache::set('site_and_module:domain_info:domain:' . $domain, $domain_info, 0, true);
}
return $domain_info;
@ -243,9 +243,11 @@ class moduleModel extends module
{
$output = executeQuery('module.getMidInfo', $args);
$module_info = $output->data;
Rhymix\Framework\Cache::set('site_and_module:module_srl:' . $mid . '_' . $site_srl, $module_info->module_srl, 0, true);
Rhymix\Framework\Cache::set('site_and_module:mid_info:' . $module_info->module_srl, $module_info, 0, true);
if($module_info)
{
Rhymix\Framework\Cache::set('site_and_module:module_srl:' . $mid . '_' . $site_srl, $module_info->module_srl, 0, true);
Rhymix\Framework\Cache::set('site_and_module:mid_info:' . $module_info->module_srl, $module_info, 0, true);
}
}
$this->applyDefaultSkin($module_info);
@ -369,8 +371,11 @@ class moduleModel extends module
$output = executeQuery('module.getMidInfo', $args);
if(!$output->toBool()) return;
$mid_info = $output->data;
$this->applyDefaultSkin($mid_info);
Rhymix\Framework\Cache::set("site_and_module:mid_info:$module_srl", $mid_info, 0, true);
if($mid_info)
{
$this->applyDefaultSkin($mid_info);
Rhymix\Framework\Cache::set("site_and_module:mid_info:$module_srl", $mid_info, 0, true);
}
}
if($mid_info && count($columnList))
@ -384,7 +389,10 @@ class moduleModel extends module
}
}
}
else $module_info = $mid_info;
else
{
$module_info = $mid_info;
}
$oModuleController = getController('module');
if(isset($module_info->browser_title)) $oModuleController->replaceDefinedLangCode($module_info->browser_title);
@ -1403,11 +1411,12 @@ class moduleModel extends module
$args = new stdClass;
$args->module = $module;
$args->site_srl = $site_srl;
$output = executeQuery('module.getModuleConfig', $args);
// Only object type
if($config = executeQuery('module.getModuleConfig', $args)->data->config)
if($output->data->config)
{
$config = unserialize($config);
$config = unserialize($output->data->config);
}
else
{
@ -1415,7 +1424,10 @@ class moduleModel extends module
}
// Set cache
Rhymix\Framework\Cache::set('site_and_module:module_config:' . $module . '_' . $site_srl, $config, 0, true);
if($output->toBool())
{
Rhymix\Framework\Cache::set('site_and_module:module_config:' . $module . '_' . $site_srl, $config, 0, true);
}
}
$GLOBALS['__ModuleConfig__'][$site_srl][$module] = $config;
}
@ -1437,11 +1449,12 @@ class moduleModel extends module
$args = new stdClass;
$args->module = $module;
$args->module_srl = $module_srl;
$output = executeQuery('module.getModulePartConfig', $args);
// Object or Array(compatibility) type
if($config = executeQuery('module.getModulePartConfig', $args)->data->config)
if($output->data->config)
{
$config = unserialize($config);
$config = unserialize($output->data->config);
}
else
{
@ -1455,7 +1468,10 @@ class moduleModel extends module
}
// Set cache
Rhymix\Framework\Cache::set('site_and_module:module_part_config:' . $module . '_' . $module_srl, $config, 0, true);
if($output->toBool())
{
Rhymix\Framework\Cache::set('site_and_module:module_part_config:' . $module . '_' . $module_srl, $config, 0, true);
}
}
$GLOBALS['__ModulePartConfig__'][$module][$module_srl] = $config;
}
@ -1779,7 +1795,10 @@ class moduleModel extends module
{
$module_admins[$module_admin->member_srl] = true;
}
Rhymix\Framework\Cache::set("site_and_module:module_admins:$module_srl", $module_admins, 0, true);
if ($output->toBool())
{
Rhymix\Framework\Cache::set("site_and_module:module_admins:$module_srl", $module_admins, 0, true);
}
}
return isset($module_admins[$member_info->member_srl]);
}
@ -2319,7 +2338,10 @@ class moduleModel extends module
$args = new stdClass;
$args->module_srl = $module_srl;
$output = executeQueryArray('module.getModuleGrants', $args);
Rhymix\Framework\Cache::set("site_and_module:module_grants:$module_srl", $output, 0, true);
if($output->toBool())
{
Rhymix\Framework\Cache::set("site_and_module:module_grants:$module_srl", $output, 0, true);
}
}
return $output;
}