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

Eliminate unnecessary duplication of config values (Part 2)

Browse source
This commit is contained in:
Kijin Sung 2017-06-27 17:28:21 +09:00
parent 2d90ea38e9
commit 2562dee8e9
1 changed files with 29 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -197,28 +197,32 @@ class editorModel extends editor
Context::set('editor_sequence', $option->editor_sequence); Context::set('editor_sequence', $option->editor_sequence);
// Check that the skin and content style exist. // Check that the skin and content style exist.
if (!$option->skin || !file_exists($this->module_path . 'skins/' . $option->skin . '/editor.html')) if (!$option->editor_skin)
{ {
$option->skin = $this->default_editor_config['editor_skin']; $option->editor_skin = $option->skin;
}
if (!$option->editor_skin || !file_exists($this->module_path . 'skins/' . $option->editor_skin . '/editor.html'))
{
$option->editor_skin = $this->default_editor_config['editor_skin'];
} }
if (!$option->content_style || !file_exists($this->module_path . 'styles/' . $option->content_style)) if (!$option->content_style || !file_exists($this->module_path . 'styles/' . $option->content_style))
{ {
$option->content_style = $this->default_editor_config['content_style']; $option->content_style = $this->default_editor_config['content_style'];
} }
if (!$option->colorset) if (!$option->sel_editor_colorset)
{ {
$option->colorset = $this->default_editor_config['sel_editor_colorset']; $option->sel_editor_colorset = $option->colorset ?: $this->default_editor_config['sel_editor_colorset'];
} }
if (!$option->height) if (!$option->editor_height)
{ {
$option->height = $this->default_editor_config['editor_height']; $option->editor_height = $option->height ?: $this->default_editor_config['editor_height'];
} }
Context::set('skin', $option->skin); Context::set('skin', $option->editor_skin);
Context::set('editor_path', $this->module_path . 'skins/' . $option->skin . '/'); Context::set('editor_path', $this->module_path . 'skins/' . $option->editor_skin . '/');
Context::set('content_style', $option->content_style); Context::set('content_style', $option->content_style);
Context::set('content_style_path', $this->module_path . 'styles/' . $option->content_style); Context::set('content_style_path', $this->module_path . 'styles/' . $option->content_style);
Context::set('colorset', $option->colorset); Context::set('colorset', $option->sel_editor_colorset);
Context::set('editor_height', $option->height); Context::set('editor_height', $option->editor_height);
Context::set('module_type', $option->module_type); Context::set('module_type', $option->module_type);
// Default font setting // Default font setting
@ -237,7 +241,7 @@ class editorModel extends editor
Context::set('editor_content_key_name', $option->content_key_name); Context::set('editor_content_key_name', $option->content_key_name);
// Set autosave (do not use if the post is edited) // Set autosave (do not use if the post is edited)
$option->enable_autosave = $option->enable_autosave && !Context::get($option->primary_key_name); $option->enable_autosave = toBool($option->enable_autosave) && !Context::get($option->primary_key_name);
if ($option->enable_autosave) if ($option->enable_autosave)
{ {
Context::set('saved_doc', $this->getSavedDoc($upload_target_srl)); Context::set('saved_doc', $this->getSavedDoc($upload_target_srl));
@ -246,7 +250,7 @@ class editorModel extends editor
// Load editor components. // Load editor components.
$site_srl = Context::get('site_module_info')->site_srl ?: 0; $site_srl = Context::get('site_module_info')->site_srl ?: 0;
if($option->skin === 'dreditor') if($option->editor_skin === 'dreditor')
{ {
$this->loadDrComponents(); $this->loadDrComponents();
} }
@ -298,7 +302,7 @@ class editorModel extends editor
} }
// Do not allow chunked uploads in XpressEditor. // Do not allow chunked uploads in XpressEditor.
if (starts_with($option->skin, 'xpresseditor')) if (starts_with($option->editor_skin, 'xpresseditor'))
{ {
$file_config->allowed_filesize = min(FileHandler::returnBytes(ini_get('upload_max_filesize')), FileHandler::returnBytes(ini_get('post_max_size'))); $file_config->allowed_filesize = min(FileHandler::returnBytes(ini_get('upload_max_filesize')), FileHandler::returnBytes(ini_get('post_max_size')));
$file_config->allowed_chunk_size = 0; $file_config->allowed_chunk_size = 0;
@ -338,6 +342,10 @@ class editorModel extends editor
// Get editor settings of the module // Get editor settings of the module
$editor_config = $this->getEditorConfig($module_srl); $editor_config = $this->getEditorConfig($module_srl);
// Check mobile status
$is_mobile = Mobile::isFromMobilePhone() || \Rhymix\Framework\UA::isMobile();
// Initialize options
$option = new stdClass(); $option = new stdClass();
$option->module_type = $type; $option->module_type = $type;
@ -348,6 +356,10 @@ class editorModel extends editor
{ {
$option->$key = $val; $option->$key = $val;
} }
if ($is_mobile)
{
$option->editor_height = $option->mobile_editor_height;
}
} }
else else
{ {
@ -364,11 +376,11 @@ class editorModel extends editor
$option->enable_html_grant = $option->enable_comment_html_grant; $option->enable_html_grant = $option->enable_comment_html_grant;
$option->editor_height = $option->comment_editor_height; $option->editor_height = $option->comment_editor_height;
$option->enable_autosave = 'N'; $option->enable_autosave = 'N';
if ($is_mobile)
{
$option->editor_height = $option->mobile_comment_editor_height;
}
} }
$option->skin = $option->editor_skin;
$option->colorset = $option->sel_editor_colorset;
$option->height = $option->editor_height;
$option->enable_autosave = toBool($option->enable_autosave);
// Check a group_list of the currently logged-in user for permission check // Check a group_list of the currently logged-in user for permission check
if(Context::get('is_logged')) if(Context::get('is_logged'))