From e3541c046b771a47f07cde65bf0cfb85a3c0210b Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Fri, 31 Dec 2021 00:06:13 +0900
Subject: [PATCH] Prevent disabled editor component in editor popup

---
 modules/editor/editor.model.php | 4 ++++
 modules/editor/editor.view.php  | 3 ++-
 modules/editor/lang/en.php      | 1 +
 modules/editor/lang/ko.php      | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php
index 15eb1a131..ab72aa252 100644
--- a/modules/editor/editor.model.php
+++ b/modules/editor/editor.model.php
@@ -532,6 +532,10 @@ class editorModel extends editor
 
 			// Add configuration information
 			$component_info = self::getComponent($component, $site_srl);
+			if ($component_info->enabled !== 'Y')
+			{
+				return new BaseObject(-1, 'msg_component_is_disabled', $component);
+			}
 			$oComponent->setInfo($component_info);
 			self::$_loaded_component_list[$component][$editor_sequence] = $oComponent;
 		}
diff --git a/modules/editor/editor.view.php b/modules/editor/editor.view.php
index c50254528..a07dfb8ec 100644
--- a/modules/editor/editor.view.php
+++ b/modules/editor/editor.view.php
@@ -66,7 +66,8 @@ class editorView extends editor
 		$oComponent = &$oEditorModel->getComponentObject($component, $editor_sequence, $site_srl);
 		if(!$oComponent->toBool())
 		{
-			Context::set('message', sprintf(lang('msg_component_is_not_founded'), $component));
+			Context::set('message', sprintf($oComponent->getMessage(), $component));
+			$this->setLayoutFile('popup_layout');
 			$this->setTemplatePath($this->module_path.'tpl');
 			$this->setTemplateFile('component_not_founded');
 		}
diff --git a/modules/editor/lang/en.php b/modules/editor/lang/en.php
index dd635ef48..5694b9d6b 100644
--- a/modules/editor/lang/en.php
+++ b/modules/editor/lang/en.php
@@ -61,6 +61,7 @@ $lang->content_font_size = 'Content Font Size';
 $lang->about_component = 'About component';
 $lang->about_component_mid = 'Editor components can select targets.(All targets will be selected when nothing is selected.)';
 $lang->msg_component_is_not_founded = 'Cannot find editor component %s.';
+$lang->msg_component_is_disabled = 'Editor component %s is disabled.';
 $lang->msg_component_is_inserted = 'Selected component is already inserted.';
 $lang->msg_component_is_first_order = 'Selected component is located at the first position.';
 $lang->msg_component_is_last_order = 'Selected component is located at the last position.';
diff --git a/modules/editor/lang/ko.php b/modules/editor/lang/ko.php
index 144c2331b..409ccb0bc 100644
--- a/modules/editor/lang/ko.php
+++ b/modules/editor/lang/ko.php
@@ -59,6 +59,7 @@ $lang->content_font_size = '문서 폰트 크기';
 $lang->about_component = '컴포넌트 소개';
 $lang->about_component_mid = '에디터 컴포넌트가 사용될 대상을 지정할 수 있습니다.(모두 해제 시 모든 대상에서 사용 가능합니다)';
 $lang->msg_component_is_not_founded = '%s 에디터 컴포넌트를 찾을 수 없습니다.';
+$lang->msg_component_is_disabled = '%s 에디터 컴포넌트는 사용하지 않도록 설정되어 있습니다.';
 $lang->msg_component_is_inserted = '선택한 컴포넌트는 이미 입력되어 있습니다.';
 $lang->msg_component_is_first_order = '선택한 컴포넌트는 첫 번째에 위치하고 있습니다.';
 $lang->msg_component_is_last_order = '선택한 컴포넌트는 마지막에 위치하고 있습니다.';