From fb9a502b2be0ee72867b1136d27100a8848b0f74 Mon Sep 17 00:00:00 2001 From: bnu Date: Tue, 24 Feb 2015 20:18:50 +0900 Subject: [PATCH] =?UTF-8?q?#1087=20=EA=B8=B0=EB=B3=B8=20=EC=97=90=EB=94=94?= =?UTF-8?q?=ED=84=B0=EB=A5=BC=20ckeditor=EB=A1=9C=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/editor/editor.admin.view.php | 8 ++++---- modules/editor/editor.model.php | 9 +++++---- modules/member/member.controller.php | 4 ++-- modules/member/member.model.php | 6 +++--- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/modules/editor/editor.admin.view.php b/modules/editor/editor.admin.view.php index ad87a8660..e7cd87ae4 100644 --- a/modules/editor/editor.admin.view.php +++ b/modules/editor/editor.admin.view.php @@ -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'); diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php index 383df47ae..29a54ba24 100644 --- a/modules/editor/editor.model.php +++ b/modules/editor/editor.model.php @@ -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); diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index aba6df5df..c617fb9c1 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -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'; diff --git a/modules/member/member.model.php b/modules/member/member.model.php index aa9a4781d..271146431 100644 --- a/modules/member/member.model.php +++ b/modules/member/member.model.php @@ -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;