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

#1087 기본 에디터를 ckeditor로 설정 변경

Browse source
This commit is contained in:
bnu 2015-02-24 20:18:50 +09:00
parent 58c8a726ce
commit fb9a502b2b
4 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/editor/editor.admin.view.php
View file

@ -37,10 +37,10 @@ class editorAdminView extends editor
//editor_config init
if(!$editor_config->editor_height) $editor_config->editor_height = 300;
if(!$editor_config->comment_editor_height) $editor_config->comment_editor_height = 100;
if(!$editor_config->editor_skin) $editor_config->editor_skin = 'xpresseditor';
if(!$editor_config->comment_editor_skin) $editor_config->comment_editor_skin = 'xpresseditor';
if(!$editor_config->sel_editor_colorset) $editor_config->sel_editor_colorset= 'white';
if(!$editor_config->sel_comment_editor_colorset) $editor_config->sel_comment_editor_colorset= 'white';
if(!$editor_config->editor_skin) $editor_config->editor_skin = 'ckeditor';
if(!$editor_config->comment_editor_skin) $editor_config->comment_editor_skin = 'ckeditor';
if(!$editor_config->sel_editor_colorset) $editor_config->sel_editor_colorset= 'moono';
if(!$editor_config->sel_comment_editor_colorset) $editor_config->sel_comment_editor_colorset= 'moono';
$component_list = $oEditorModel->getComponentList(false, $site_srl, true);
$editor_skin_list = FileHandler::readDir(_XE_PATH_.'modules/editor/skins');

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

@ -49,8 +49,8 @@ class editorModel extends editor
if(!$editor_config->editor_height) if($editor_default_config->editor_height? $editor_config->editor_height = $editor_default_config->editor_height : $editor_config->editor_height = 300);
if(!$editor_config->comment_editor_height) if($editor_default_config->comment_editor_height? $editor_config->comment_editor_height = $editor_default_config->comment_editor_height : $editor_config->comment_editor_height = 100);
if(!$editor_config->editor_skin) if($editor_default_config->editor_skin? $editor_config->editor_skin = $editor_default_config->editor_skin : $editor_config->editor_skin = 'xpresseditor');
if(!$editor_config->comment_editor_skin) if($editor_default_config->comment_editor_skin? $editor_config->comment_editor_skin = $editor_default_config->comment_editor_skin : $editor_config->comment_editor_skin = 'xpresseditor');
if(!$editor_config->editor_skin) if($editor_default_config->editor_skin? $editor_config->editor_skin = $editor_default_config->editor_skin : $editor_config->editor_skin = 'ckeditor');
if(!$editor_config->comment_editor_skin) if($editor_default_config->comment_editor_skin? $editor_config->comment_editor_skin = $editor_default_config->comment_editor_skin : $editor_config->comment_editor_skin = 'ckeditor');
if(!$editor_config->content_style) if($editor_default_config->content_style? $editor_config->content_style = $editor_default_config->content_style : $editor_config->content_style = 'default');
if(!$editor_config->content_font && $editor_default_config->content_font) $editor_config->content_font = $editor_default_config->content_font;
@ -202,9 +202,10 @@ class editorModel extends editor
else $editor_height = $option->height;
// Skin Setting
$skin = $option->skin;
if(!$skin) $skin = 'xpresseditor';
if(!$skin) $skin = 'ckeditor';
$colorset = $option->colorset;
if(!$colorset) $colorset = 'moono';
Context::set('colorset', $colorset);
Context::set('skin', $skin);
@ -306,7 +307,7 @@ class editorModel extends editor
if(!file_exists($tpl_path.$tpl_file))
{
$skin = 'xpresseditor';
$skin = 'ckeditor';
$tpl_path = sprintf('%sskins/%s/', $this->module_path, $skin);
}
Context::set('editor_path', $tpl_path);

4
modules/member/member.controller.php
View file

@ -1463,8 +1463,8 @@ class memberController extends member
{
if(!$args->skin) $args->skin = "default";
if(!$args->colorset) $args->colorset = "white";
if(!$args->editor_skin) $args->editor_skin= "xpresseditor";
if(!$args->editor_colorset) $args->editor_colorset = "white";
if(!$args->editor_skin) $args->editor_skin= "ckeditor";
if(!$args->editor_colorset) $args->editor_colorset = "moono";
if($args->enable_join!='Y') $args->enable_join = 'N';
$args->enable_openid= 'N';
if($args->profile_image !='Y') $args->profile_image = 'N';

6
modules/member/member.model.php
View file

@ -61,7 +61,7 @@ class memberModel extends member
if(!$config->profile_image_max_height) $config->profile_image_max_height = 90;
if(!$config->skin) $config->skin = 'default';
if(!$config->colorset) $config->colorset = 'white';
if(!$config->editor_skin || $config->editor_skin == 'default') $config->editor_skin = 'xpresseditor';
if(!$config->editor_skin || $config->editor_skin == 'default') $config->editor_skin = 'ckeditor';
if(!$config->group_image_mark) $config->group_image_mark = "N";
if(!$config->identifier) $config->identifier = 'user_id';
@ -69,8 +69,8 @@ class memberModel extends member
if(!$config->max_error_count) $config->max_error_count = 10;
if(!$config->max_error_count_time) $config->max_error_count_time = 300;
if(!$config->signature_editor_skin || $config->signature_editor_skin == 'default') $config->signature_editor_skin = 'xpresseditor';
if(!$config->sel_editor_colorset) $config->sel_editor_colorset = 'white';
if(!$config->signature_editor_skin || $config->signature_editor_skin == 'default') $config->signature_editor_skin = 'ckeditor';
if(!$config->sel_editor_colorset) $config->sel_editor_colorset = 'moono';
$member_config = $config;