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

Always use object cache for editor components

Browse source
This commit is contained in:
Kijin Sung 2018-12-18 17:36:12 +09:00
parent 0978a3298d
commit 4f9c80e424
2 changed files with 40 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

49
modules/editor/editor.model.php
View file

@ -178,12 +178,11 @@ class editorModel extends editor
Context::set('editor_focus', toBool($option->editor_focus));
// Load editor components.
$site_srl = Context::get('site_module_info')->site_srl ?: 0;
if($option->enable_component)
{
if(!Context::get('component_list'))
{
$component_list = $this->getComponentList(true, $site_srl);
$component_list = $this->getComponentList(true);
Context::set('component_list', $component_list);
}
}
@ -518,35 +517,19 @@ class editorModel extends editor
return FileHandler::readDir('./modules/editor/skins');
}
/**
* @brief Return the cache file name of editor component list
*/
function getCacheFile($filter_enabled= true, $site_srl = 0)
{
$lang = Context::getLangType();
$cache_path = _XE_PATH_.'files/cache/editor/cache/';
FileHandler::makeDir($cache_path);
$cache_file = $cache_path . 'component_list.' . $lang .'.';
if($filter_enabled) $cache_file .= 'filter.';
if($site_srl) $cache_file .= $site_srl.'.';
$cache_file .= 'php';
return $cache_file;
}
/**
* @brief Return a component list (DB Information included)
*/
function getComponentList($filter_enabled = true, $site_srl=0, $from_db=false)
function getComponentList($filter_enabled = true, $site_srl = 0, $from_db = false)
{
$cache_file = $this->getCacheFile(false, $site_srl);
if($from_db || !file_exists($cache_file))
$cache_key = 'editor:components:' . ($filter_enabled ? 'enabled' : 'all');
$component_list = $from_db ? null : Rhymix\Framework\Cache::get($cache_key);
if (!$component_list)
{
$oEditorController = getController('editor');
$oEditorController->makeCache(false, $site_srl);
$component_list = $oEditorController->makeCache(false);
}
if(!file_exists($cache_file)) return;
include($cache_file);
$logged_info = Context::get('logged_info');
if($logged_info && is_array($logged_info->group_list))
{
@ -562,10 +545,9 @@ class editorModel extends editor
foreach($component_list as $key => $val)
{
if(!trim($key)) continue;
if(!is_dir(_XE_PATH_.'modules/editor/components/'.$key))
if(!is_dir(\RX_BASEDIR.'modules/editor/components/'.$key))
{
FileHandler::removeFile($cache_file);
return $this->getComponentList($filter_enabled, $site_srl);
return $this->getComponentList($filter_enabled, 0, true);
}
if(!$filter_enabled) continue;
if($val->enabled == "N")
@ -573,7 +555,7 @@ class editorModel extends editor
unset($component_list->{$key});
continue;
}
if($logged_info->is_admin == "Y" || $logged_info->is_site_admin == "Y") continue;
if($logged_info->is_admin == "Y") continue;
if($val->target_group)
{
if(!Context::get('is_logged'))
@ -608,20 +590,11 @@ class editorModel extends editor
/**
* @brief Get xml and db information of the component
*/
function getComponent($component_name, $site_srl = 0)
function getComponent($component_name)
{
$args = new stdClass();
$args->component_name = $component_name;
if($site_srl)
{
$args->site_srl = $site_srl;
$output = executeQuery('editor.getSiteComponent', $args);
}
else
{
$output = executeQuery('editor.getComponent', $args);
}
$output = executeQuery('editor.getComponent', $args);
$component = $output->data;
if(!$output->data) return false;