From 73cfb931cc2a13ec69ee696db20a6a810e406100 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Mon, 29 Oct 2018 20:56:09 +0900
Subject: [PATCH 01/22] =?UTF-8?q?#2325=20ckeditor=EC=9D=98=20custom=20conf?=
 =?UTF-8?q?ig=20=EC=82=AC=EC=9A=A9=20=EC=8B=9C=20=EB=B0=B0=ED=8F=AC?=
 =?UTF-8?q?=EB=B3=B8=EC=9D=98=20removePlugins=20=EC=84=A4=EC=A0=95?=
 =?UTF-8?q?=EC=9D=84=20=EB=8D=AE=EB=8A=94=20=EB=AC=B8=EC=A0=9C=EB=A1=9C=20?=
 =?UTF-8?q?#2207=20=EC=9D=B4=EC=8A=88=EC=97=90=EC=84=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=ED=95=9C=20=EB=AC=B8=EC=A0=9C=EB=A5=BC=20=EC=9E=AC?=
 =?UTF-8?q?=EB=B0=9C=EC=8B=9C=ED=82=A4=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/editor/tpl/js/editor.app.js     | 7 +++++++
 modules/editor/tpl/js/editor.app.min.js | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/editor/tpl/js/editor.app.js b/modules/editor/tpl/js/editor.app.js
index 805807af9e..9ec9d76390 100644
--- a/modules/editor/tpl/js/editor.app.js
+++ b/modules/editor/tpl/js/editor.app.js
@@ -100,6 +100,13 @@
 					instance.config.extraPlugins = extraPlugins.join(',');
 				}
 
+				if(CKEDITOR.env.iOS) {
+					var removePlugins = e.editor.config.removePlugins.split(',');
+					removePlugins.push('enterkey');
+					removePlugins = arrayUnique(removePlugins);
+					instance.config.removePlugins = removePlugins.join(',');
+				}
+
 				if(!opts.enableToolbar) instance.config.toolbar = [];
 			});
 
diff --git a/modules/editor/tpl/js/editor.app.min.js b/modules/editor/tpl/js/editor.app.min.js
index 3132704a9b..69494fbe1a 100644
--- a/modules/editor/tpl/js/editor.app.min.js
+++ b/modules/editor/tpl/js/editor.app.min.js
@@ -1 +1 @@
-!function(a){"use strict";function b(b){return a.grep(b,function(c,d){return c.length&&a.inArray(c,b)===d})}var c={bodyClass:"xe_content editable",toolbarCanCollapse:!0,toolbarGroups:[{name:"clipboard",groups:["undo","clipboard"]},{name:"editing",groups:["find","selection"]},{name:"links"},{name:"insert"},{name:"tools"},{name:"document",groups:["mode"]},"/",{name:"basicstyles",groups:["basicstyles","cleanup"]},{name:"paragraph",groups:["list","indent","blocks","align","bidi"]},"/",{name:"styles"},{name:"colors"},{name:"xecomponent"},{name:"others"}],allowedContent:!0,removePlugins:"stylescombo,language,bidi,flash,pagebreak",removeButtons:"Save,Preview,Print,Cut,Copy,Paste",uiColor:"#EFF0F0"},d=xe.createApp("XeCkEditor",{ckeconfig:{},editor_sequence:null,init:function(){var a=this;CKEDITOR.env.iOS&&(c.removePlugins+=",enterkey"),CKEDITOR.on("instanceCreated",function(b){a.cast("CKEDITOR_CREATED")}),CKEDITOR.on("ready",function(b){a.cast("CKEDITOR_READY")}),CKEDITOR.on("instanceReady",function(b){a.cast("CKEDITOR_INSTANCE_READY")}),CKEDITOR.on("instanceLoaded",function(b){a.cast("CKEDITOR_LOADED")})},editorInit:function(d,e){var f=this,g=d,h=g.closest("form"),i=h.find(e.content_field),j=g.data();g.data().editorSequence;this.ckeconfig=a.extend({},c,e.ckeconfig||{}),this.editor_sequence=j.editorSequence,h.attr("editor_sequence",j.editorSequence),CKEDITOR.env.mobile&&(CKEDITOR.env.isCompatible=!0);var k=CKEDITOR.appendTo(g[0],{},i.val());k.on("customConfigLoaded",function(d){if(k.config=a.extend({},d.editor.config,f.ckeconfig),a.isFunction(CKEDITOR.editorConfig)){var g={};CKEDITOR.editorConfig(g),a.each(g,function(a,b){k.config[a]=b})}var h=d.editor.config.bodyClass.split(" ");if(h.push(c.bodyClass),h=b(h),k.config.bodyClass=h.join(" "),e.loadXeComponent){var i=d.editor.config.extraPlugins.split(",");i.push("xe_component"),i=b(i),k.config.extraPlugins=i.join(",")}e.enableToolbar||(k.config.toolbar=[])}),g.data("cke_instance",k),window.editorRelKeys[j.editorSequence]={},window.editorRelKeys[j.editorSequence].primary=h.find("[name="+j.editorPrimaryKeyName+"]")[0],window.editorRelKeys[j.editorSequence].content=h.find("[name="+j.editorContentKeyName+"]")[0],window.editorRelKeys[j.editorSequence].func=function(a){return f.getContent.call(f,a)},window.editorRelKeys[j.editorSequence].pasteHTML=function(a){k.insertHtml(a,"html")}},getContent:function(a){var b=this,c=_getCkeInstance(a).getData();return b.cast("GET_CONTENT",[c]),c},getInstance:function(a){return CKEDITOR.instances[a]},API_EDITOR_CREATED:function(){}});a.fn.XeCkEditor=function(a){var b=new d(this.eq(0),a);return b&&(xe.registerApp(b),b.editorInit(this.eq(0),a)),b},window.xe.XeCkEditor=function(){return new d}}(jQuery);
\ No newline at end of file
+!function(a){"use strict";function b(b){return a.grep(b,function(c,d){return c.length&&a.inArray(c,b)===d})}var c={bodyClass:"xe_content editable",toolbarCanCollapse:!0,toolbarGroups:[{name:"clipboard",groups:["undo","clipboard"]},{name:"editing",groups:["find","selection"]},{name:"links"},{name:"insert"},{name:"tools"},{name:"document",groups:["mode"]},"/",{name:"basicstyles",groups:["basicstyles","cleanup"]},{name:"paragraph",groups:["list","indent","blocks","align","bidi"]},"/",{name:"styles"},{name:"colors"},{name:"xecomponent"},{name:"others"}],allowedContent:!0,removePlugins:"stylescombo,language,bidi,flash,pagebreak",removeButtons:"Save,Preview,Print,Cut,Copy,Paste",uiColor:"#EFF0F0"},d=xe.createApp("XeCkEditor",{ckeconfig:{},editor_sequence:null,init:function(){var a=this;CKEDITOR.env.iOS&&(c.removePlugins+=",enterkey"),CKEDITOR.on("instanceCreated",function(b){a.cast("CKEDITOR_CREATED")}),CKEDITOR.on("ready",function(b){a.cast("CKEDITOR_READY")}),CKEDITOR.on("instanceReady",function(b){a.cast("CKEDITOR_INSTANCE_READY")}),CKEDITOR.on("instanceLoaded",function(b){a.cast("CKEDITOR_LOADED")})},editorInit:function(d,e){var f=this,g=d,h=g.closest("form"),i=h.find(e.content_field),j=g.data();g.data().editorSequence;this.ckeconfig=a.extend({},c,e.ckeconfig||{}),this.editor_sequence=j.editorSequence,h.attr("editor_sequence",j.editorSequence),CKEDITOR.env.mobile&&(CKEDITOR.env.isCompatible=!0);var k=CKEDITOR.appendTo(g[0],{},i.val());k.on("customConfigLoaded",function(d){if(k.config=a.extend({},d.editor.config,f.ckeconfig),a.isFunction(CKEDITOR.editorConfig)){var g={};CKEDITOR.editorConfig(g),a.each(g,function(a,b){k.config[a]=b})}var h=d.editor.config.bodyClass.split(" ");if(h.push(c.bodyClass),h=b(h),k.config.bodyClass=h.join(" "),e.loadXeComponent){var i=d.editor.config.extraPlugins.split(",");i.push("xe_component"),i=b(i),k.config.extraPlugins=i.join(",")}if(CKEDITOR.env.iOS){var j=d.editor.config.removePlugins.split(",");j.push("enterkey"),j=b(j),k.config.removePlugins=j.join(",")}e.enableToolbar||(k.config.toolbar=[])}),g.data("cke_instance",k),window.editorRelKeys[j.editorSequence]={},window.editorRelKeys[j.editorSequence].primary=h.find("[name="+j.editorPrimaryKeyName+"]")[0],window.editorRelKeys[j.editorSequence].content=h.find("[name="+j.editorContentKeyName+"]")[0],window.editorRelKeys[j.editorSequence].func=function(a){return f.getContent.call(f,a)},window.editorRelKeys[j.editorSequence].pasteHTML=function(a){k.insertHtml(a,"html")}},getContent:function(a){var b=this,c=_getCkeInstance(a).getData();return b.cast("GET_CONTENT",[c]),c},getInstance:function(a){return CKEDITOR.instances[a]},API_EDITOR_CREATED:function(){}});a.fn.XeCkEditor=function(a){var b=new d(this.eq(0),a);return b&&(xe.registerApp(b),b.editorInit(this.eq(0),a)),b},window.xe.XeCkEditor=function(){return new d}}(jQuery);
\ No newline at end of file

From 8868260ce060cd3489fa74655959c7b3fa4b4dd9 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Tue, 30 Oct 2018 13:23:43 +0900
Subject: [PATCH 02/22] =?UTF-8?q?#2325=20iframe=20=EC=97=90=EB=94=94?=
 =?UTF-8?q?=ED=84=B0=20=ED=8E=B8=EC=A7=91=20=EC=98=81=EC=97=AD=EC=97=90=20?=
 =?UTF-8?q?=ED=8F=AC=EC=BB=A4=EC=8A=A4=EB=A5=BC=20=EC=9E=A1=EC=9D=B4=20?=
 =?UTF-8?q?=EC=96=B4=EB=A0=A4=EC=9A=B4=20=EB=AC=B8=EC=A0=9C=20=EA=B3=A0?=
 =?UTF-8?q?=EC=B9=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/editor/styles/ckeditor_light/editor.css     | 2 ++
 modules/editor/styles/ckeditor_recommend/editor.css | 2 ++
 modules/editor/styles/default/editor.css            | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/editor/styles/ckeditor_light/editor.css b/modules/editor/styles/ckeditor_light/editor.css
index 62fff8f8f5..acfabdcd8a 100644
--- a/modules/editor/styles/ckeditor_light/editor.css
+++ b/modules/editor/styles/ckeditor_light/editor.css
@@ -1,5 +1,7 @@
 @charset "utf-8";
 /* NAVER (developers@xpressengine.com) */
+html { height: 100%; }
+body { min-height: 100%; }
 .xe_content.editable {color:#000;font-size:13px;font-family:sans-serif;line-height:1.5;word-break:break-all;word-wrap:break-word}
 .xe_content.editable img{border:0;max-width:100%;}
 .xe_content.editable blockquote.q1,
diff --git a/modules/editor/styles/ckeditor_recommend/editor.css b/modules/editor/styles/ckeditor_recommend/editor.css
index bb51a135af..2cb84cbf81 100644
--- a/modules/editor/styles/ckeditor_recommend/editor.css
+++ b/modules/editor/styles/ckeditor_recommend/editor.css
@@ -1,5 +1,7 @@
 @charset "utf-8";
 /* NAVER (developers@xpressengine.com) */
+html { height: 100%; }
+body { min-height: 100%; }
 .xe_content.editable {color:#000;font-size:14px;font-family:sans-serif;line-height:1.6;word-break:break-all;word-wrap:break-word}
 .xe_content.editable img{border:0;max-width:100%;}
 .xe_content.editable blockquote.q1,
diff --git a/modules/editor/styles/default/editor.css b/modules/editor/styles/default/editor.css
index b6b7abf7f1..59486b4282 100644
--- a/modules/editor/styles/default/editor.css
+++ b/modules/editor/styles/default/editor.css
@@ -19,4 +19,4 @@ body{margin:0;padding:0}
 .xe_content blockquote.q6{border:1px dashed #707070}
 .xe_content blockquote.q7{border:1px dashed #707070;background:#fbfbfb}
 .xe_content table .xe_selected_cell{background-color:#d6e9ff}
-.xe_content p{margin:0}
\ No newline at end of file
+.xe_content p{margin:0}

From d91cf465e465054622d174228e71fab46befffb6 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Tue, 30 Oct 2018 13:28:53 +0900
Subject: [PATCH 03/22] =?UTF-8?q?#2325=20config=20=EC=B2=98=EB=A6=AC=20?=
 =?UTF-8?q?=EC=8B=9C=20=EC=98=A4=EB=A5=98=EA=B0=80=20=EB=B0=9C=EC=83=9D?=
 =?UTF-8?q?=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8A=94=20=EB=AC=B8=EC=A0=9C?=
 =?UTF-8?q?=20=EA=B3=A0=EC=B9=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/editor/tpl/js/editor.app.js     | 13 +++++++------
 modules/editor/tpl/js/editor.app.min.js |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/modules/editor/tpl/js/editor.app.js b/modules/editor/tpl/js/editor.app.js
index 9ec9d76390..11953e4931 100644
--- a/modules/editor/tpl/js/editor.app.js
+++ b/modules/editor/tpl/js/editor.app.js
@@ -87,20 +87,21 @@
 					});
 				}
 
-				var bodyClass = e.editor.config.bodyClass.split(' ');
-				bodyClass.push(default_ckeconfig.bodyClass);
-				bodyClass = arrayUnique(bodyClass);
-				instance.config.bodyClass = bodyClass.join(' ');
+				if(e.editor.config.bodyClass) {
+					var bodyClass = e.editor.config.bodyClass.split(' ');
+					bodyClass.push(default_ckeconfig.bodyClass);
+					bodyClass = arrayUnique(bodyClass);
+					instance.config.bodyClass = bodyClass.join(' ');
+				}
 
 				if(opts.loadXeComponent) {
 					var extraPlugins = e.editor.config.extraPlugins.split(',');
-
 					extraPlugins.push('xe_component');
 					extraPlugins = arrayUnique(extraPlugins);
 					instance.config.extraPlugins = extraPlugins.join(',');
 				}
 
-				if(CKEDITOR.env.iOS) {
+				if(CKEDITOR.env.iOS && e.editor.config.removePlugins) {
 					var removePlugins = e.editor.config.removePlugins.split(',');
 					removePlugins.push('enterkey');
 					removePlugins = arrayUnique(removePlugins);
diff --git a/modules/editor/tpl/js/editor.app.min.js b/modules/editor/tpl/js/editor.app.min.js
index 69494fbe1a..4daafd3ef5 100644
--- a/modules/editor/tpl/js/editor.app.min.js
+++ b/modules/editor/tpl/js/editor.app.min.js
@@ -1 +1 @@
-!function(a){"use strict";function b(b){return a.grep(b,function(c,d){return c.length&&a.inArray(c,b)===d})}var c={bodyClass:"xe_content editable",toolbarCanCollapse:!0,toolbarGroups:[{name:"clipboard",groups:["undo","clipboard"]},{name:"editing",groups:["find","selection"]},{name:"links"},{name:"insert"},{name:"tools"},{name:"document",groups:["mode"]},"/",{name:"basicstyles",groups:["basicstyles","cleanup"]},{name:"paragraph",groups:["list","indent","blocks","align","bidi"]},"/",{name:"styles"},{name:"colors"},{name:"xecomponent"},{name:"others"}],allowedContent:!0,removePlugins:"stylescombo,language,bidi,flash,pagebreak",removeButtons:"Save,Preview,Print,Cut,Copy,Paste",uiColor:"#EFF0F0"},d=xe.createApp("XeCkEditor",{ckeconfig:{},editor_sequence:null,init:function(){var a=this;CKEDITOR.env.iOS&&(c.removePlugins+=",enterkey"),CKEDITOR.on("instanceCreated",function(b){a.cast("CKEDITOR_CREATED")}),CKEDITOR.on("ready",function(b){a.cast("CKEDITOR_READY")}),CKEDITOR.on("instanceReady",function(b){a.cast("CKEDITOR_INSTANCE_READY")}),CKEDITOR.on("instanceLoaded",function(b){a.cast("CKEDITOR_LOADED")})},editorInit:function(d,e){var f=this,g=d,h=g.closest("form"),i=h.find(e.content_field),j=g.data();g.data().editorSequence;this.ckeconfig=a.extend({},c,e.ckeconfig||{}),this.editor_sequence=j.editorSequence,h.attr("editor_sequence",j.editorSequence),CKEDITOR.env.mobile&&(CKEDITOR.env.isCompatible=!0);var k=CKEDITOR.appendTo(g[0],{},i.val());k.on("customConfigLoaded",function(d){if(k.config=a.extend({},d.editor.config,f.ckeconfig),a.isFunction(CKEDITOR.editorConfig)){var g={};CKEDITOR.editorConfig(g),a.each(g,function(a,b){k.config[a]=b})}var h=d.editor.config.bodyClass.split(" ");if(h.push(c.bodyClass),h=b(h),k.config.bodyClass=h.join(" "),e.loadXeComponent){var i=d.editor.config.extraPlugins.split(",");i.push("xe_component"),i=b(i),k.config.extraPlugins=i.join(",")}if(CKEDITOR.env.iOS){var j=d.editor.config.removePlugins.split(",");j.push("enterkey"),j=b(j),k.config.removePlugins=j.join(",")}e.enableToolbar||(k.config.toolbar=[])}),g.data("cke_instance",k),window.editorRelKeys[j.editorSequence]={},window.editorRelKeys[j.editorSequence].primary=h.find("[name="+j.editorPrimaryKeyName+"]")[0],window.editorRelKeys[j.editorSequence].content=h.find("[name="+j.editorContentKeyName+"]")[0],window.editorRelKeys[j.editorSequence].func=function(a){return f.getContent.call(f,a)},window.editorRelKeys[j.editorSequence].pasteHTML=function(a){k.insertHtml(a,"html")}},getContent:function(a){var b=this,c=_getCkeInstance(a).getData();return b.cast("GET_CONTENT",[c]),c},getInstance:function(a){return CKEDITOR.instances[a]},API_EDITOR_CREATED:function(){}});a.fn.XeCkEditor=function(a){var b=new d(this.eq(0),a);return b&&(xe.registerApp(b),b.editorInit(this.eq(0),a)),b},window.xe.XeCkEditor=function(){return new d}}(jQuery);
\ No newline at end of file
+!function(a){"use strict";function b(b){return a.grep(b,function(c,d){return c.length&&a.inArray(c,b)===d})}var c={bodyClass:"xe_content editable",toolbarCanCollapse:!0,toolbarGroups:[{name:"clipboard",groups:["undo","clipboard"]},{name:"editing",groups:["find","selection"]},{name:"links"},{name:"insert"},{name:"tools"},{name:"document",groups:["mode"]},"/",{name:"basicstyles",groups:["basicstyles","cleanup"]},{name:"paragraph",groups:["list","indent","blocks","align","bidi"]},"/",{name:"styles"},{name:"colors"},{name:"xecomponent"},{name:"others"}],allowedContent:!0,removePlugins:"stylescombo,language,bidi,flash,pagebreak",removeButtons:"Save,Preview,Print,Cut,Copy,Paste",uiColor:"#EFF0F0"},d=xe.createApp("XeCkEditor",{ckeconfig:{},editor_sequence:null,init:function(){var a=this;CKEDITOR.env.iOS&&(c.removePlugins+=",enterkey"),CKEDITOR.on("instanceCreated",function(b){a.cast("CKEDITOR_CREATED")}),CKEDITOR.on("ready",function(b){a.cast("CKEDITOR_READY")}),CKEDITOR.on("instanceReady",function(b){a.cast("CKEDITOR_INSTANCE_READY")}),CKEDITOR.on("instanceLoaded",function(b){a.cast("CKEDITOR_LOADED")})},editorInit:function(d,e){var f=this,g=d,h=g.closest("form"),i=h.find(e.content_field),j=g.data();g.data().editorSequence;this.ckeconfig=a.extend({},c,e.ckeconfig||{}),this.editor_sequence=j.editorSequence,h.attr("editor_sequence",j.editorSequence),CKEDITOR.env.mobile&&(CKEDITOR.env.isCompatible=!0);var k=CKEDITOR.appendTo(g[0],{},i.val());k.on("customConfigLoaded",function(d){if(k.config=a.extend({},d.editor.config,f.ckeconfig),a.isFunction(CKEDITOR.editorConfig)){var g={};CKEDITOR.editorConfig(g),a.each(g,function(a,b){k.config[a]=b})}if(d.editor.config.bodyClass){var h=d.editor.config.bodyClass.split(" ");h.push(c.bodyClass),h=b(h),k.config.bodyClass=h.join(" ")}if(e.loadXeComponent){var i=d.editor.config.extraPlugins.split(",");i.push("xe_component"),i=b(i),k.config.extraPlugins=i.join(",")}if(CKEDITOR.env.iOS&&d.editor.config.removePlugins){var j=d.editor.config.removePlugins.split(",");j.push("enterkey"),j=b(j),k.config.removePlugins=j.join(",")}e.enableToolbar||(k.config.toolbar=[])}),g.data("cke_instance",k),window.editorRelKeys[j.editorSequence]={},window.editorRelKeys[j.editorSequence].primary=h.find("[name="+j.editorPrimaryKeyName+"]")[0],window.editorRelKeys[j.editorSequence].content=h.find("[name="+j.editorContentKeyName+"]")[0],window.editorRelKeys[j.editorSequence].func=function(a){return f.getContent.call(f,a)},window.editorRelKeys[j.editorSequence].pasteHTML=function(a){k.insertHtml(a,"html")}},getContent:function(a){var b=this,c=_getCkeInstance(a).getData();return b.cast("GET_CONTENT",[c]),c},getInstance:function(a){return CKEDITOR.instances[a]},API_EDITOR_CREATED:function(){}});a.fn.XeCkEditor=function(a){var b=new d(this.eq(0),a);return b&&(xe.registerApp(b),b.editorInit(this.eq(0),a)),b},window.xe.XeCkEditor=function(){return new d}}(jQuery);
\ No newline at end of file

From a8fc03f02a34d43164cceadc9551153b730c36f6 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Tue, 30 Oct 2018 13:38:52 +0900
Subject: [PATCH 04/22] =?UTF-8?q?contentcss=20=ED=8C=8C=EC=9D=BC=EC=9D=98?=
 =?UTF-8?q?=20=EC=BA=90=EC=8B=9C=20=EA=B0=B1=EC=8B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/editor/skins/ckeditor/editor.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/editor/skins/ckeditor/editor.html b/modules/editor/skins/ckeditor/editor.html
index 2b71093ea6..f8e2abcaed 100755
--- a/modules/editor/skins/ckeditor/editor.html
+++ b/modules/editor/skins/ckeditor/editor.html
@@ -29,6 +29,10 @@
 	<include target="file_upload.html" />
 </block>
 
+{@
+	$editorContentCssFilemtime = filemtime(_XE_PATH_ . $content_style_path . '/editor.css');
+}
+
 <script>
 (function($){
 	"use strict";
@@ -39,7 +43,7 @@
 			ckeconfig: {
 				height: '{$editor_height}',
 				skin: '{$colorset}',
-				contentsCss: '{$content_style_path}/editor.css',
+				contentsCss: '{$content_style_path}/editor.css?{$editorContentCssFilemtime}',
 				xe_editor_sequence: {$editor_sequence},
 				toolbarCanCollapse: true,
 				language: "{str_replace('jp','ja',$lang_type)}"

From 1873635c1aa5242749933c06804d5d75e83f49aa Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sat, 24 Nov 2018 16:14:27 +0900
Subject: [PATCH 05/22] Add triggers to comment list

---
 modules/comment/comment.model.php  | 14 ++++++++++++++
 modules/document/document.item.php |  3 +++
 2 files changed, 17 insertions(+)

diff --git a/modules/comment/comment.model.php b/modules/comment/comment.model.php
index a643de3367..a2b1aadb5b 100644
--- a/modules/comment/comment.model.php
+++ b/modules/comment/comment.model.php
@@ -508,6 +508,13 @@ function getCommentList($document_srl, $page = 0, $is_admin = FALSE, $count = 0)
 			$args->status = 1;
 		}
 
+		// call trigger (before)
+		$trigger_output = ModuleHandler::triggerCall('comment.getCommentList', 'before', $args);
+		if($trigger_output instanceof BaseObject && !$trigger_output->toBool())
+		{
+			return $output;
+		}
+
 		$output = executeQueryArray('comment.getCommentPageList', $args);
 
 		// return if an error occurs in the query results
@@ -527,6 +534,13 @@ function getCommentList($document_srl, $page = 0, $is_admin = FALSE, $count = 0)
 			}
 		}
 
+		// call trigger (after)
+		$trigger_output = ModuleHandler::triggerCall('comment.getCommentList', 'after', $output);
+		if($trigger_output instanceof BaseObject && !$trigger_output->toBool())
+		{
+			return $trigger_output;
+		}
+
 		return $output;
 	}
 
diff --git a/modules/document/document.item.php b/modules/document/document.item.php
index 6f4fb2dcff..fcf0e094a7 100644
--- a/modules/document/document.item.php
+++ b/modules/document/document.item.php
@@ -781,6 +781,9 @@ function getComments()
 		Context::set('cpage', $output->page_navigation->cur_page);
 		if($output->total_page>1) $this->comment_page_navigation = $output->page_navigation;
 
+		// Call trigger (after)
+		$output = ModuleHandler::triggerCall('document.getComments', 'after', $comment_list);
+
 		return $comment_list;
 	}
 

From aa3c0c2faaf969f32ef8df306034008bf460ff54 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sat, 24 Nov 2018 16:21:31 +0900
Subject: [PATCH 06/22] Automatically use mysqli if PHP >= 7.0

---
 classes/context/Context.class.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 623ecad7d2..b61bbacbb6 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -487,6 +487,15 @@ function loadDBInfo()
 			$oInstallController->makeConfigFile();
 		}
 
+		if(version_compare(PHP_VERSION, '7.0', '>='))
+		{
+			$db_info->master_db["db_type"] = preg_replace('/^mysql(_.+)$/', 'mysqli$1', $db_info->master_db["db_type"]);
+			foreach($db_info->slave_db as &$slave_db_info)
+			{
+				$slave_db_info["db_type"] = preg_replace('/^mysql(_.+)$/', 'mysqli$1', $slave_db_info["db_type"]);
+			}
+		}
+
 		if(!$db_info->use_prepared_statements)
 		{
 			$db_info->use_prepared_statements = 'Y';

From 368a0497f1f97a72bbf07113218b4d096b27c328 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Fri, 30 Nov 2018 15:13:06 +0900
Subject: [PATCH 07/22] Add triggers before updateVotedCount

---
 modules/comment/comment.controller.php   | 31 +++++++++++++++---------
 modules/document/document.controller.php | 30 ++++++++++++++---------
 2 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php
index a202ac1e1b..971e7229b4 100644
--- a/modules/comment/comment.controller.php
+++ b/modules/comment/comment.controller.php
@@ -1095,6 +1095,22 @@ function updateVotedCount($comment_srl, $point = 1)
 			return new BaseObject(-1, $failed_voted);
 		}
 
+		// Call a trigger (before)
+		$trigger_obj = new stdClass;
+		$trigger_obj->member_srl = $oComment->get('member_srl');
+		$trigger_obj->module_srl = $oComment->get('module_srl');
+		$trigger_obj->document_srl = $oComment->get('document_srl');
+		$trigger_obj->comment_srl = $oComment->get('comment_srl');
+		$trigger_obj->update_target = ($point < 0) ? 'blamed_count' : 'voted_count';
+		$trigger_obj->point = $point;
+		$trigger_obj->before_point = ($point < 0) ? $oComment->get('blamed_count') : $oComment->get('voted_count');
+		$trigger_obj->after_point = $trigger_obj->before_point + $point;
+		$trigger_output = ModuleHandler::triggerCall('comment.updateVotedCount', 'before', $trigger_obj);
+		if(!$trigger_output->toBool())
+		{
+			return $trigger_output;
+		}
+
 		// begin transaction
 		$oDB = DB::getInstance();
 		$oDB->begin();
@@ -1115,15 +1131,8 @@ function updateVotedCount($comment_srl, $point = 1)
 		$args->point = $point;
 		$output = executeQuery('comment.insertCommentVotedLog', $args);
 
-		$obj = new stdClass();
-		$obj->member_srl = $oComment->get('member_srl');
-		$obj->module_srl = $oComment->get('module_srl');
-		$obj->comment_srl = $oComment->get('comment_srl');
-		$obj->update_target = ($point < 0) ? 'blamed_count' : 'voted_count';
-		$obj->point = $point;
-		$obj->before_point = ($point < 0) ? $oComment->get('blamed_count') : $oComment->get('voted_count');
-		$obj->after_point = ($point < 0) ? $args->blamed_count : $args->voted_count;
-		$trigger_output = ModuleHandler::triggerCall('comment.updateVotedCount', 'after', $obj);
+		// Call a trigger (after)
+		$trigger_output = ModuleHandler::triggerCall('comment.updateVotedCount', 'after', $trigger_obj);
 		if(!$trigger_output->toBool())
 		{
 			$oDB->rollback();
@@ -1139,11 +1148,11 @@ function updateVotedCount($comment_srl, $point = 1)
 		$output = new BaseObject(0, $success_message);
 		if($point > 0)
 		{
-			$output->add('voted_count', $obj->after_point);
+			$output->add('voted_count', $trigger_obj->after_point);
 		}
 		else
 		{
-			$output->add('blamed_count', $obj->after_point);
+			$output->add('blamed_count', $trigger_obj->after_point);
 		}
 
 		return $output;
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index c51f1722c7..8d3376d8f0 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -1120,6 +1120,21 @@ function updateVotedCount($document_srl, $point = 1)
 			return new BaseObject(-1, $failed_voted);
 		}
 
+		// Call a trigger (before)
+		$trigger_obj = new stdClass;
+		$trigger_obj->member_srl = $oDocument->get('member_srl');
+		$trigger_obj->module_srl = $oDocument->get('module_srl');
+		$trigger_obj->document_srl = $oDocument->get('document_srl');
+		$trigger_obj->update_target = ($point < 0) ? 'blamed_count' : 'voted_count';
+		$trigger_obj->point = $point;
+		$trigger_obj->before_point = ($point < 0) ? $oDocument->get('blamed_count') : $oDocument->get('voted_count');
+		$trigger_obj->after_point = $trigger_obj->before_point + $point;
+		$trigger_output = ModuleHandler::triggerCall('document.updateVotedCount', 'before', $trigger_obj);
+		if(!$trigger_output->toBool())
+		{
+			return $trigger_output;
+		}
+
 		// begin transaction
 		$oDB = DB::getInstance();
 		$oDB->begin();
@@ -1141,15 +1156,8 @@ function updateVotedCount($document_srl, $point = 1)
 		$output = executeQuery('document.insertDocumentVotedLog', $args);
 		if(!$output->toBool()) return $output;
 
-		$obj = new stdClass;
-		$obj->member_srl = $oDocument->get('member_srl');
-		$obj->module_srl = $oDocument->get('module_srl');
-		$obj->document_srl = $oDocument->get('document_srl');
-		$obj->update_target = ($point < 0) ? 'blamed_count' : 'voted_count';
-		$obj->point = $point;
-		$obj->before_point = ($point < 0) ? $oDocument->get('blamed_count') : $oDocument->get('voted_count');
-		$obj->after_point = ($point < 0) ? $args->blamed_count : $args->voted_count;
-		$trigger_output = ModuleHandler::triggerCall('document.updateVotedCount', 'after', $obj);
+		// Call a trigger (after)
+		$trigger_output = ModuleHandler::triggerCall('document.updateVotedCount', 'after', $trigger_obj);
 		if(!$trigger_output->toBool())
 		{
 			$oDB->rollback();
@@ -1174,12 +1182,12 @@ function updateVotedCount($document_srl, $point = 1)
 		if($point > 0)
 		{
 			$output->setMessage('success_voted');
-			$output->add('voted_count', $obj->after_point);
+			$output->add('voted_count', $trigger_obj->after_point);
 		}
 		else
 		{
 			$output->setMessage('success_blamed');
-			$output->add('blamed_count', $obj->after_point);
+			$output->add('blamed_count', $trigger_obj->after_point);
 		}
 		
 		return $output;

From e3d03ae2736733d7ff0b0c0a357256df42e96fbd Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Fri, 30 Nov 2018 15:22:03 +0900
Subject: [PATCH 08/22] Reference trigger result when calculating vote points

---
 modules/comment/comment.controller.php   | 8 ++++----
 modules/document/document.controller.php | 9 +++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php
index 971e7229b4..a84947ddc2 100644
--- a/modules/comment/comment.controller.php
+++ b/modules/comment/comment.controller.php
@@ -1116,19 +1116,19 @@ function updateVotedCount($comment_srl, $point = 1)
 		$oDB->begin();
 
 		// update the number of votes
-		if($point < 0)
+		if($trigger_obj->update_target === 'blamed_count')
 		{
-			$args->blamed_count = $oComment->get('blamed_count') + $point;
+			$args->blamed_count = $trigger_obj->after_point;
 			$output = executeQuery('comment.updateBlamedCount', $args);
 		}
 		else
 		{
-			$args->voted_count = $oComment->get('voted_count') + $point;
+			$args->voted_count = $trigger_obj->after_point;
 			$output = executeQuery('comment.updateVotedCount', $args);
 		}
 
 		// leave logs
-		$args->point = $point;
+		$args->point = $trigger_obj->point;
 		$output = executeQuery('comment.insertCommentVotedLog', $args);
 
 		// Call a trigger (after)
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 8d3376d8f0..afbd0f8ea9 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -1140,19 +1140,20 @@ function updateVotedCount($document_srl, $point = 1)
 		$oDB->begin();
 
 		// Update the voted count
-		if($point < 0)
+		if($trigger_obj->update_target === 'blamed_count')
 		{
-			$args->blamed_count = $oDocument->get('blamed_count') + $point;
+			$args->blamed_count = $trigger_obj->after_point;
 			$output = executeQuery('document.updateBlamedCount', $args);
 		}
 		else
 		{
-			$args->voted_count = $oDocument->get('voted_count') + $point;
+			$args->voted_count = $trigger_obj->after_point;
 			$output = executeQuery('document.updateVotedCount', $args);
 		}
 		if(!$output->toBool()) return $output;
+
 		// Leave logs
-		$args->point = $point;
+		$args->point = $trigger_obj->point;
 		$output = executeQuery('document.insertDocumentVotedLog', $args);
 		if(!$output->toBool()) return $output;
 

From 636f3389149bd6aaec3e1f6e95acb87f788236c9 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Fri, 30 Nov 2018 15:29:15 +0900
Subject: [PATCH 09/22] Result of updateVotedCount can be changed by 'before'
 trigger

---
 modules/comment/comment.controller.php   | 2 +-
 modules/document/document.controller.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php
index a84947ddc2..c000f4a238 100644
--- a/modules/comment/comment.controller.php
+++ b/modules/comment/comment.controller.php
@@ -1146,7 +1146,7 @@ function updateVotedCount($comment_srl, $point = 1)
 
 		// Return the result
 		$output = new BaseObject(0, $success_message);
-		if($point > 0)
+		if($trigger_obj->update_target === 'voted_count')
 		{
 			$output->add('voted_count', $trigger_obj->after_point);
 		}
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index afbd0f8ea9..1bcf3123fe 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -1180,7 +1180,7 @@ function updateVotedCount($document_srl, $point = 1)
 
 		// Return result
 		$output = new BaseObject();
-		if($point > 0)
+		if($trigger_obj->update_target === 'voted_count')
 		{
 			$output->setMessage('success_voted');
 			$output->add('voted_count', $trigger_obj->after_point);

From 535e6e404f860359073dde6d7c825a252c2b8989 Mon Sep 17 00:00:00 2001
From: BJRambo <qw5414@naver.com>
Date: Mon, 3 Dec 2018 21:25:34 +0900
Subject: [PATCH 10/22] =?UTF-8?q?=ED=8F=AC=EC=9D=B8=ED=8A=B8=EB=A5=BC=20?=
 =?UTF-8?q?=EC=A0=80=EC=9E=A5=ED=95=98=EB=8A=94=20=EB=B6=80=EB=B6=84?=
 =?UTF-8?q?=EC=97=90=20=EC=A0=81=EC=9A=A9=EC=97=AC=EB=B6=80=EB=A5=BC=20?=
 =?UTF-8?q?=ED=99=95=EC=9D=B8=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20?=
 =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=EA=B3=A0=EC=B9=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/point/point.controller.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php
index 68a0a6bd56..a1e6533694 100644
--- a/modules/point/point.controller.php
+++ b/modules/point/point.controller.php
@@ -564,8 +564,14 @@ function setPoint($member_srl, $point, $mode = null)
 
 		// If there are points, update, if no, insert
 		$oPointModel = getModel('point');
-		if($oPointModel->isExistsPoint($member_srl)) executeQuery("point.updatePoint", $args);
-		else executeQuery("point.insertPoint", $args);
+		if($oPointModel->isExistsPoint($member_srl))
+		{
+			$output = executeQuery("point.updatePoint", $args);
+		}
+		else
+		{
+			$output = executeQuery("point.insertPoint", $args);
+		}
 
 		// Get a new level
 		$level = $oPointModel->getLevel($point, $config->level_step);

From a915dbcc664c1ff35832bba93be2f287b69a42b2 Mon Sep 17 00:00:00 2001
From: BJRambo <qw5414@naver.com>
Date: Mon, 10 Dec 2018 14:57:55 +0900
Subject: [PATCH 11/22] =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=98?=
 =?UTF-8?q?=EA=B2=8C=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=EC=97=AC=EB=B6=80?=
 =?UTF-8?q?=EB=A5=BC=20=ED=95=9C=EB=B2=88=20=EB=8D=94=20=EB=94=94=EB=B9=84?=
 =?UTF-8?q?=20=EC=BF=BC=EB=A6=AC=20=ED=95=98=EC=A7=80=EC=95=8A=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=ED=95=A8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

보통 기존에 기록이 있을 경우 $current_point의 값이 0보다 이상이기 때문에 먼저 가져온 값을 이용하고 $current_point가 0 일 경우에만 insert를 먼저 실행하도록함.

member_srl칼럼이 primary_key 이기 때문에 이미 디비상에서 존재할경우 insert가 되지 않기 때문에 다시 update를 실행하여 확실한 작동을 유도함. (이때 리턴을 시키지 않음)
---
 modules/point/point.controller.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php
index a1e6533694..ce6aed61ea 100644
--- a/modules/point/point.controller.php
+++ b/modules/point/point.controller.php
@@ -563,14 +563,24 @@ function setPoint($member_srl, $point, $mode = null)
 		$oDB->begin();
 
 		// If there are points, update, if no, insert
-		$oPointModel = getModel('point');
-		if($oPointModel->isExistsPoint($member_srl))
+		if($current_point > 0)
 		{
 			$output = executeQuery("point.updatePoint", $args);
 		}
 		else
 		{
+			// 많은 동접시 넣는 과정에서 insert가 미리 이루어졌지만 이 공간으로 넘어올 경우 다시 한번 더 업데이트를 처리.
 			$output = executeQuery("point.insertPoint", $args);
+			if(!$output->toBool())
+			{
+				$output = executeQuery("point.updatePoint", $args);
+			}
+		}
+
+		if(!$output->toBool())
+		{
+			$oDB->rollback();
+			return $output;
 		}
 
 		// Get a new level

From 530f6145482526595afcf62a1b7525471afc36f5 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Mon, 10 Dec 2018 18:16:32 +0900
Subject: [PATCH 12/22] =?UTF-8?q?#2351=20core=EC=97=90=EC=84=9C=20syndicat?=
 =?UTF-8?q?ion=20=EB=AA=A8=EB=93=88=20=EC=A0=9C=EA=B1=B0=20-=20NAVER=20Syn?=
 =?UTF-8?q?dication=20=EC=84=9C=EB=B9=84=EC=8A=A4=EC=9D=98=20=EC=A0=95?=
 =?UTF-8?q?=EC=B1=85=20=EB=B3=80=EA=B2=BD=EC=9C=BC=EB=A1=9C=20=EC=82=AC?=
 =?UTF-8?q?=EC=9A=A9=EC=9D=B4=20=EC=A0=9C=ED=95=9C=EB=90=A8=20-=20?=
 =?UTF-8?q?=EC=9D=B4=EB=8F=99=EB=90=A8=20:=20https://github.com/xpressengi?=
 =?UTF-8?q?ne/xe-module-syndication?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/syndication/conf/info.xml             |  18 -
 modules/syndication/conf/module.xml           |  11 -
 modules/syndication/lang/lang.xml             | 167 -----
 .../queries/deleteExceptModules.xml           |   5 -
 modules/syndication/queries/deleteLog.xml     |   9 -
 .../syndication/queries/getDeletedList.xml    |  20 -
 .../syndication/queries/getDocumentList.xml   |  31 -
 .../syndication/queries/getExceptModule.xml   |  11 -
 .../queries/getExceptModuleSrls.xml           |   8 -
 .../syndication/queries/getExceptModules.xml  |  14 -
 .../syndication/queries/getGrantedModule.xml  |  17 -
 .../syndication/queries/getGrantedModules.xml |  19 -
 modules/syndication/queries/getLang.xml       |  12 -
 .../syndication/queries/getModuleSiteInfo.xml |  15 -
 modules/syndication/queries/getModules.xml    |  26 -
 .../queries/getSiteUpdatedTime.xml            |  14 -
 .../queries/insertExceptModule.xml            |   9 -
 modules/syndication/queries/insertLog.xml     |  13 -
 modules/syndication/ruleset/insertConfig.xml  |   9 -
 .../schemas/syndication_except_modules.xml    |   4 -
 .../syndication/schemas/syndication_logs.xml  |   8 -
 .../syndication.admin.controller.php          |  86 ---
 .../syndication/syndication.admin.view.php    |  72 --
 modules/syndication/syndication.class.php     |  94 ---
 .../syndication/syndication.controller.php    | 225 ------
 modules/syndication/syndication.model.php     | 658 ------------------
 modules/syndication/tpl/channel.html          |  16 -
 modules/syndication/tpl/channel.info.html     |   5 -
 modules/syndication/tpl/config.html           |  89 ---
 modules/syndication/tpl/css/syndication.css   |  17 -
 modules/syndication/tpl/error.html            |   5 -
 .../syndication/tpl/filter/insert_service.xml |   8 -
 modules/syndication/tpl/include.articles.html |  12 -
 modules/syndication/tpl/include.channel.html  |   8 -
 modules/syndication/tpl/include.channels.html |   8 -
 modules/syndication/tpl/include.deleted.html  |   1 -
 modules/syndication/tpl/include.site.html     |   7 -
 modules/syndication/tpl/js/syndication.js     |  55 --
 modules/syndication/tpl/naver_result.html     |  41 --
 modules/syndication/tpl/site.html             |  21 -
 modules/syndication/tpl/site.info.html        |   4 -
 41 files changed, 1872 deletions(-)
 delete mode 100644 modules/syndication/conf/info.xml
 delete mode 100644 modules/syndication/conf/module.xml
 delete mode 100644 modules/syndication/lang/lang.xml
 delete mode 100644 modules/syndication/queries/deleteExceptModules.xml
 delete mode 100644 modules/syndication/queries/deleteLog.xml
 delete mode 100644 modules/syndication/queries/getDeletedList.xml
 delete mode 100644 modules/syndication/queries/getDocumentList.xml
 delete mode 100644 modules/syndication/queries/getExceptModule.xml
 delete mode 100644 modules/syndication/queries/getExceptModuleSrls.xml
 delete mode 100644 modules/syndication/queries/getExceptModules.xml
 delete mode 100644 modules/syndication/queries/getGrantedModule.xml
 delete mode 100644 modules/syndication/queries/getGrantedModules.xml
 delete mode 100644 modules/syndication/queries/getLang.xml
 delete mode 100644 modules/syndication/queries/getModuleSiteInfo.xml
 delete mode 100644 modules/syndication/queries/getModules.xml
 delete mode 100644 modules/syndication/queries/getSiteUpdatedTime.xml
 delete mode 100644 modules/syndication/queries/insertExceptModule.xml
 delete mode 100644 modules/syndication/queries/insertLog.xml
 delete mode 100644 modules/syndication/ruleset/insertConfig.xml
 delete mode 100644 modules/syndication/schemas/syndication_except_modules.xml
 delete mode 100644 modules/syndication/schemas/syndication_logs.xml
 delete mode 100644 modules/syndication/syndication.admin.controller.php
 delete mode 100644 modules/syndication/syndication.admin.view.php
 delete mode 100644 modules/syndication/syndication.class.php
 delete mode 100644 modules/syndication/syndication.controller.php
 delete mode 100644 modules/syndication/syndication.model.php
 delete mode 100644 modules/syndication/tpl/channel.html
 delete mode 100644 modules/syndication/tpl/channel.info.html
 delete mode 100644 modules/syndication/tpl/config.html
 delete mode 100644 modules/syndication/tpl/css/syndication.css
 delete mode 100644 modules/syndication/tpl/error.html
 delete mode 100644 modules/syndication/tpl/filter/insert_service.xml
 delete mode 100644 modules/syndication/tpl/include.articles.html
 delete mode 100644 modules/syndication/tpl/include.channel.html
 delete mode 100644 modules/syndication/tpl/include.channels.html
 delete mode 100644 modules/syndication/tpl/include.deleted.html
 delete mode 100644 modules/syndication/tpl/include.site.html
 delete mode 100644 modules/syndication/tpl/js/syndication.js
 delete mode 100644 modules/syndication/tpl/naver_result.html
 delete mode 100644 modules/syndication/tpl/site.html
 delete mode 100644 modules/syndication/tpl/site.info.html

diff --git a/modules/syndication/conf/info.xml b/modules/syndication/conf/info.xml
deleted file mode 100644
index 730c68911a..0000000000
--- a/modules/syndication/conf/info.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-	<title xml:lang="ko">Syndication</title>
-	<title xml:lang="zh-TW">聯合供搞</title>
-	<title xml:lang="tr">İçerik Paylaşımı</title>
-	<description xml:lang="ko">검색서비스업체와 직접 통신을 통해 컨텐츠를 잘 검색되도록 하는 Syndication 규약을 따라 정보를 주고받는 모듈</description>
-	<description xml:lang="zh-TW">검색서비스업체와 직접 통신을 통해 컨텐츠를 잘 검색되도록 하는 Syndication 규약을 따라 정보를 주고받는 모듈</description>
-	<description xml:lang="tr">검색서비스업체와 직접 통신을 통해 컨텐츠를 잘 검색되도록 하는 Syndication 규약을 따라 정보를 주고받는 모듈</description>
-	<version>6.0.0</version>
-	<date>2017-11-30</date>
-	<category>interlock</category>
-
-	<author email_address="developers@xpressengine.com" link="https://www.xpressengine.com/">
-		<name xml:lang="ko">NAVER</name>
-		<name xml:lang="zh-TW">NAVER</name>
-		<name xml:lang="tr">NAVER</name>
-	</author>
-</module>
diff --git a/modules/syndication/conf/module.xml b/modules/syndication/conf/module.xml
deleted file mode 100644
index 22737f34ee..0000000000
--- a/modules/syndication/conf/module.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<module>
-	<grants />
-	<permissions />
-	<actions>
-		<action name="getSyndicationList" type="model" />
-		<action name="dispSyndicationAdminConfig" type="view" admin_index="true" />
-		<action name="procSyndicationAdminInsertConfig" type="controller" ruleset="insertService" />
-		<action name="procSyndicationAdminCheckPingResult" type="controller" />
-	</actions>
-</module>
diff --git a/modules/syndication/lang/lang.xml b/modules/syndication/lang/lang.xml
deleted file mode 100644
index 39d856a95e..0000000000
--- a/modules/syndication/lang/lang.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<lang>
-	<item name="syndication">
-		<value xml:lang="ko"><![CDATA[신디케이션]]></value>
-		<value xml:lang="en"><![CDATA[Syndication]]></value>
-		<value xml:lang="jp"><![CDATA[シンディケーション]]></value>
-		<value xml:lang="zh-TW"><![CDATA[聯合供搞]]></value>
-		<value xml:lang="tr"><![CDATA[İçerik Paylaşımı]]></value>
-	</item>
-	<item name="about_syndication">
-		<value xml:lang="ko"><![CDATA[신디케이션이란 검색 서비스 업체와 syndication 이라는 표준 규약을 통해서 보다 더 잘 검색되게 하는 기능입니다.<br/>최소한의 요청만으로 효과적으로 컨텐츠를 검색 서비스 업체와 동기화합니다]]></value>
-		<value xml:lang="en"><![CDATA[Syndication communicates with search service providers with standard protocol called "syndication", and makes it much better to search any information.<br/>It will synchronize contents with search service providers with the least requests.]]></value>
-		<value xml:lang="jp"><![CDATA[シンディケーションとは、検索サービス業者とsyndicationという標準規約を通じて検索の品質を向上させる機能です。<br/>最小限の要求だけで、検索サービス業者とコンテンツを効果的に同期させます。]]></value>
-		<value xml:lang="tr"><![CDATA[İçerik Paylaşımı, adı "sendikasyon" olan standard bir protokole bağlı arama hizmeti sunucularıyla iletişime geçer ve her türlü bilgiye ulaşmayı daha kolay hale getirir.<br/>Gerekli olan şeyleri en aza indirerek, arama hizmeti sunucusunu içeriklerle uygun hale getirir.]]></value>
-	</item>
-	<item name="syndication_service">
-		<value xml:lang="ko"><![CDATA[신디케이션 서비스]]></value>
-		<value xml:lang="en"><![CDATA[Syndication Service]]></value>
-		<value xml:lang="zh-TW"><![CDATA[供稿服務]]></value>
-		<value xml:lang="tr"><![CDATA[İçerik Paylaşım Hizmeti]]></value>
-	</item>
-	<item name="naver_syndication_token">
-		<value xml:lang="ko"><![CDATA[NAVER 신디케이션 Token]]></value>
-		<value xml:lang="en"><![CDATA[NAVER Syndication Token]]></value>
-		<value xml:lang="jp"><![CDATA[NAVER シンディケーション Token]]></value>
-		<value xml:lang="zh-TW"><![CDATA[NAVER 聯合供搞 Token]]></value>
-		<value xml:lang="tr"><![CDATA[NAVER İçerik Paylaşımı Token]]></value>
-	</item>
-	<item name="about_syndication_service">
-		<value xml:lang="ko"><![CDATA[신디케이션 표준 규약에 맞춰 신디케이션 서비스를 제공하는 곳입니다.<br/>[적용하기] 버튼을 선택하시면 선택 또는 해제된 서비스에 Ping 을 통해서 결과를 통보하게 됩니다]]></value>
-		<value xml:lang="en"><![CDATA[Syndication Service provides syndication services according to a standard protocol.<br/>You will get Ping result from the selected (deselected) services if you apply.]]></value>
-		<value xml:lang="jp"><![CDATA[シンディケーション標準規約に沿ってシンディケーションサービスを提供します。<br/>[適用]ボタンをクリックすると、選択、または解除されているサービスにPingを通じて結果を通報します。]]></value>
-		<value xml:lang="zh-TW"><![CDATA[提供根據標準協議的聯合供搞服務。<br/>[應用] 透過 Ping 的方式]]></value>
-		<value xml:lang="tr"><![CDATA[İçerik Paylaşım Hizmeti, sendikasyon hizmetlerini standard bir protokole göre sağlar.<br/>Tercih edilen(edilmeyen) hizmetlerin Ping sonuçlarını başvurarak alabilirsiniz.]]></value>
-	</item>
-	<item name="my_syndication_url">
-		<value xml:lang="ko"><![CDATA[사이트 주소]]></value>
-		<value xml:lang="en"><![CDATA[URL]]></value>
-		<value xml:lang="jp"><![CDATA[サイトアドレス]]></value>
-		<value xml:lang="zh-TW"><![CDATA[供稿網址]]></value>
-	</item>
-	<item name="my_syndication_password">
-		<value xml:lang="ko"><![CDATA[신디케이션 비밀번호]]></value>
-		<value xml:lang="en"><![CDATA[Syndication Password]]></value>
-		<value xml:lang="jp"><![CDATA[シンジケーションパスワード]]></value>
-		<value xml:lang="zh-TW"><![CDATA[聚合密碼]]></value>
-	</item>
-	<item name="about_my_syndication_url">
-		<value xml:lang="ko"><![CDATA[신디케이션 정보를 제공할때 사용되는 사이트의 주소를 입력해주세요. 이 주소는 대표 주소를 이용해주시고 가능한 바꾸시지 않는 것이 좋습니다]]></value>
-		<value xml:lang="en"><![CDATA[Please enter the URL which will be used when providing syndication information. It is recommended to use representative URL and keep it as long as you can.]]></value>
-		<value xml:lang="jp"><![CDATA[シンディケーション情報を提供するときに使用されるサイトのアドレスを入力してください。このアドレスは、代表アドレスを利用し、できれば変更しないでください。]]></value>
-		<value xml:lang="tr"><![CDATA[Lütfen sendikasyon bilgilerini sağlarken kullanılacak URLyi girin. Temsili bir URLyi mümkün olduğu sürece kullanmak daha uygun olabilir.]]></value>
-	</item>
-	<item name="about_my_syndication_password">
-		<value xml:lang="ko"><![CDATA[신디케이션 비밀번호를 설정하여 허용되지 않은 곳에서의 접근을 차단합니다.]]></value>
-		<value xml:lang="en"><![CDATA[Set syndication password for block access where not allowed.]]></value>
-		<value xml:lang="jp"><![CDATA[許可されていないブロックアクセスのための設定シンジケーションパスワード。]]></value>
-		<value xml:lang="zh-TW"><![CDATA[銀團設置密碼的地方不允許的訪問。]]></value>
-	</item>
-	<item name="except_module">
-		<value xml:lang="ko"><![CDATA[제외시킬 모듈]]></value>
-		<value xml:lang="en"><![CDATA[Modules to exclude]]></value>
-		<value xml:lang="jp"><![CDATA[除くモジュール]]></value>
-		<value xml:lang="tr"><![CDATA[Dahil edilmeyecek modüller]]></value>
-	</item>
-	<item name="about_except_module">
-		<value xml:lang="ko"><![CDATA[신디케이션 대상에서 제외시켜 검색서비스 업체와 동기화를 시키지 않을 모듈을 선택해주세요]]></value>
-		<value xml:lang="en"><![CDATA[Selected modules will not be synchronized with search service providers.]]></value>
-		<value xml:lang="jp"><![CDATA[シンディケーション対象から除き、検索サービス業者と同期化させないモジュールを選択してください。]]></value>
-		<value xml:lang="tr"><![CDATA[Seçili modüller arama hizmeti sağlayıcısıyla uyumlu hale getirilmeyecek.]]></value>
-	</item>
-	<item name="msg_site_url_is_null">
-		<value xml:lang="ko"><![CDATA[사이트 주소를 입력해주세요]]></value>
-		<value xml:lang="en"><![CDATA[Please enter URL.]]></value>
-		<value xml:lang="jp"><![CDATA[サイトアドレスを入力してください。]]></value>
-		<value xml:lang="zh-TW"><![CDATA[請輸入網站網址]]></value>
-		<value xml:lang="tr"><![CDATA[Lütfen URL girişi yapın]]></value>
-	</item>
-	<item name="msg_syndication_token_is_null">
-		<value xml:lang="ko"><![CDATA[신디케이션 Token을 입력해주세요]]></value>
-		<value xml:lang="en"><![CDATA[Please enter Syndication Token.]]></value>
-		<value xml:lang="jp"><![CDATA[シンジケートTokenを入力してください]]></value>
-		<value xml:lang="zh-TW"><![CDATA[請輸入辛迪加令牌]]></value>
-		<value xml:lang="tr"><![CDATA[Sendikasyon Token'ı girin.]]></value>
-	</item>
-	<item name="success_applied">
-		<value xml:lang="ko"><![CDATA[적용되었습니다]]></value>
-		<value xml:lang="en"><![CDATA[Successfully Applied]]></value>
-		<value xml:lang="jp"><![CDATA[適用しました。]]></value>
-		<value xml:lang="tr"><![CDATA[Başarıyla Uygulandı]]></value>
-	</item>
-	<item name="msg_ping_test_error">
-		<value xml:lang="ko"><![CDATA[Ping 테스트 에러입니다. 도메인 및 서버 설정을 확인해주세요]]></value>
-		<value xml:lang="en"><![CDATA[Ping test error found. Please check domain and server configurations.]]></value>
-		<value xml:lang="jp"><![CDATA[Ping テストエラーです。ドメイン、およびサーバー設定を確認してください。]]></value>
-		<value xml:lang="tr"><![CDATA[Ping testi hatası bulundu. Lütfen alan adı ve sunucu yapılandırmasını kontrol edin.]]></value>
-	</item>
-	<item name="msg_success_ping_test">
-		<value xml:lang="ko"><![CDATA[정상적 동작으로 확인되었습니다.]]></value>
-		<value xml:lang="en"><![CDATA[Ping test works fine.]]></value>
-		<value xml:lang="jp"><![CDATA[正常動作を確認しました。]]></value>
-		<value xml:lang="tr"><![CDATA[Ping test gayet iyi çalışıyor.]]></value>
-	</item>
-	<item name="cmd_check_syndication_echo">
-		<value xml:lang="ko"><![CDATA[Syndication 문서 출력 동작확인]]></value>
-		<value xml:lang="en"><![CDATA[Check Syndication ariticle printing]]></value>
-		<value xml:lang="jp"><![CDATA[Syndication記事の出力動作確認]]></value>
-		<value xml:lang="tr"><![CDATA[İçerik paylaşımlı yazı yazdırmayı kontrol et.]]></value>
-	</item>
-	<item name="cmd_check_syndication_status">
-		<value xml:lang="ko"><![CDATA[연결상태 확인]]></value>
-		<value xml:lang="en"><![CDATA[Check connection status]]></value>
-		<value xml:lang="jp"><![CDATA[接続状態確認]]></value>
-		<value xml:lang="tr"><![CDATA[Bağlantı statülerini kontrol et]]></value>
-	</item>
-	<item name="site">
-		<value xml:lang="ko"><![CDATA[사이트]]></value>
-		<value xml:lang="jp"><![CDATA[サイト]]></value>
-		<value xml:lang="en"><![CDATA[Site]]></value>
-	</item>
-	<item name="syndication_synic_start_date">
-		<value xml:lang="ko"><![CDATA[서버 등록일]]></value>
-		<value xml:lang="en"><![CDATA[Server registered]]></value>
-		<value xml:lang="jp"><![CDATA[サーバー登録日]]></value>
-		<value xml:lang="tr"><![CDATA[Sunucu kaydedildi.]]></value>
-	</item>
-	<item name="syndication_synic_last_date">
-		<value xml:lang="ko"><![CDATA[마지막 업데이트]]></value>
-		<value xml:lang="en"><![CDATA[Latest updates]]></value>
-		<value xml:lang="jp"><![CDATA[最後のアップデート]]></value>
-		<value xml:lang="tr"><![CDATA[Son Güncellemeler]]></value>
-	</item>
-	<item name="syndication_visit_ok_count">
-		<value xml:lang="ko"><![CDATA[Ping 연속접속 성공 횟수]]></value>
-		<value xml:lang="en"><![CDATA[Ping successed]]></value>
-		<value xml:lang="jp"><![CDATA[Ping連続接続成功回数]]></value>
-		<value xml:lang="tr"><![CDATA[Ping tamamlandı]]></value>
-	</item>
-	<item name="syndication_visit_fail_count">
-		<value xml:lang="ko"><![CDATA[Ping 실패 횟수]]></value>
-		<value xml:lang="en"><![CDATA[Ping failed]]></value>
-		<value xml:lang="jp"><![CDATA[失敗回数]]></value>
-		<value xml:lang="tr"><![CDATA[Ping tamamlanamadı]]></value>
-	</item>
-	<item name="syndication_status_result">
-		<value xml:lang="ko"><![CDATA[상태정보]]></value>
-		<value xml:lang="en"><![CDATA[Status]]></value>
-		<value xml:lang="jp"><![CDATA[状態情報]]></value>
-		<value xml:lang="tr"><![CDATA[Statüler]]></value>
-	</item>
-	<item name="syndication_sync_article">
-		<value xml:lang="ko"><![CDATA[동기화 문서]]></value>
-		<value xml:lang="en"><![CDATA[Synchronized Articles]]></value>
-		<value xml:lang="jp"><![CDATA[同期化された書き込み]]></value>
-		<value xml:lang="tr"><![CDATA[Eş zamanlı hale getirilmiş yazılar]]></value>
-	</item>
-	<item name="syndication_status">
-		<value xml:lang="ko"><![CDATA[동기화 상태]]></value>
-		<value xml:lang="en"><![CDATA[Synchronization Status]]></value>
-		<value xml:lang="jp"><![CDATA[同期化状態]]></value>
-		<value xml:lang="tr"><![CDATA[Eş zamanlama statüleri]]></value>
-	</item>
-	<item name="msg_need_openssl_support">
-		<value xml:lang="ko"><![CDATA[OpenSSL(http://php.net/manual/en/book.openssl.php)이 필요합니다. 서버 관리자에게 문의하세요.]]></value>
-		<value xml:lang="en"><![CDATA[Need OpenSSL(http://php.net/manual/en/book.openssl.php) support. Please contact to your server administrator.]]></value>
-	</item>
-</lang>
diff --git a/modules/syndication/queries/deleteExceptModules.xml b/modules/syndication/queries/deleteExceptModules.xml
deleted file mode 100644
index 981cf5149a..0000000000
--- a/modules/syndication/queries/deleteExceptModules.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<query id="deleteExceptModules" action="delete">
-    <tables>
-        <table name="syndication_except_modules" />
-    </tables>
-</query>
diff --git a/modules/syndication/queries/deleteLog.xml b/modules/syndication/queries/deleteLog.xml
deleted file mode 100644
index 8dd3e1d800..0000000000
--- a/modules/syndication/queries/deleteLog.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<query id="deleteLog" action="delete">
-    <tables>
-        <table name="syndication_logs" />
-    </tables>
-    <conditions>
-        <condition operation="equal" column="module_srl" var="module_srl" filter="number" />
-        <condition operation="equal" column="document_srl" var="document_srl" filter="number" pipe="and" />
-    </conditions>
-</query>
diff --git a/modules/syndication/queries/getDeletedList.xml b/modules/syndication/queries/getDeletedList.xml
deleted file mode 100644
index be8dc2386b..0000000000
--- a/modules/syndication/queries/getDeletedList.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<query id="getDeletedList" action="select">
-    <tables>
-        <table name="syndication_logs" />
-    </tables>
-    <columns>
-        <column name="*" />
-    </columns>
-    <conditions>
-        <condition operation="equal" column="module_srl" var="module_srl" filter="number" />
-        <condition operation="equal" column="document_srl" var="document_srl" filter="number" />
-        <condition operation="more" column="regdate" var="start_date" filter="number" pipe="and" />
-        <condition operation="less" column="regdate" var="end_date" filter="number" pipe="and" />
-    </conditions>
-    <navigation>
-        <index var="sort_index" default="log_srl" order="desc" />
-        <list_count var="list_count" default="100" />
-        <page_count var="page_count" default="10" />
-        <page var="page" default="1" />
-    </navigation>
-</query>
diff --git a/modules/syndication/queries/getDocumentList.xml b/modules/syndication/queries/getDocumentList.xml
deleted file mode 100644
index a5916f0a6f..0000000000
--- a/modules/syndication/queries/getDocumentList.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<query id="getDocumentList" action="select">
-    <tables>
-        <table name="documents" alias="doc" />
-        <table name="modules" alias="modules" />
-        <table name="syndication_except_modules" alias="except_modules" type="left join">
-            <conditions>
-                <condition operation="equal" column="modules.module_srl" default="except_modules.module_srl" />
-            </conditions>
-        </table>
-    </tables>
-    <columns>
-        <column name="doc.*" />
-        <column name="modules.mid" alias="mid" />
-    </columns>
-    <conditions>
-        <condition operation="equal" column="doc.module_srl" var="module_srl" filter="number" />
-        <condition operation="notin" column="doc.module_srl" var="except_module_srls" pipe="and" />
-        <condition operation="null" column="except_modules.module_srl" default="1" pipe="and" />
-        <condition operation="equal" column="doc.status" default="PUBLIC" pipe="and" />
-        <condition operation="equal" column="modules.module_srl" default="doc.module_srl" filter="number" pipe="and" />
-        <condition operation="notin" column="modules.module_srl" var="except_modules" filter="numbers" pipe="and" />
-        <condition operation="more" column="doc.last_update" var="start_date" filter="number" pipe="and" />
-        <condition operation="less" column="doc.last_update" var="end_date" filter="number" pipe="and" />
-    </conditions>
-    <navigation>
-        <index var="sort_index" default="doc.update_order" order="asc" />
-        <list_count var="list_count" default="100" />
-        <page_count var="page_count" default="10" />
-        <page var="page" default="1" />
-    </navigation>
-</query>
diff --git a/modules/syndication/queries/getExceptModule.xml b/modules/syndication/queries/getExceptModule.xml
deleted file mode 100644
index 68aec543d7..0000000000
--- a/modules/syndication/queries/getExceptModule.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<query id="getExceptModule" action="select">
-    <tables>
-        <table name="syndication_except_modules" />
-    </tables>
-    <columns>
-        <column name="count(*)" alias="count" />
-    </columns>
-    <conditions>
-        <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
-    </conditions>
-</query>
diff --git a/modules/syndication/queries/getExceptModuleSrls.xml b/modules/syndication/queries/getExceptModuleSrls.xml
deleted file mode 100644
index 8742b68940..0000000000
--- a/modules/syndication/queries/getExceptModuleSrls.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<query id="getExceptModuleSrls" action="select">
-    <tables>
-        <table name="syndication_except_modules" />
-    </tables>
-    <columns>
-        <column name="module_srl" />
-    </columns>
-</query>
diff --git a/modules/syndication/queries/getExceptModules.xml b/modules/syndication/queries/getExceptModules.xml
deleted file mode 100644
index 5833501859..0000000000
--- a/modules/syndication/queries/getExceptModules.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<query id="getExceptModules" action="select">
-    <tables>
-        <table name="syndication_except_modules" />
-        <table name="modules" />
-    </tables>
-    <columns>
-        <column name="syndication_except_modules.*" />
-        <column name="modules.mid" alias="mid" />
-        <column name="modules.browser_title" alias="browser_title" />
-    </columns>
-    <conditions>
-        <condition operation="equal" column="syndication_except_modules.module_srl" default="modules.module_srl" filter="number" notnull="notnull" />
-    </conditions>
-</query>
diff --git a/modules/syndication/queries/getGrantedModule.xml b/modules/syndication/queries/getGrantedModule.xml
deleted file mode 100644
index 4bb67c2965..0000000000
--- a/modules/syndication/queries/getGrantedModule.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<query id="getGrantedModule" action="select">
-    <tables>
-        <table name="module_grants" />
-    </tables>
-    <columns>
-        <column name="count(*)" alias="count" />
-    </columns>
-    <conditions>
-        <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
-        <condition operation="in" column="name" default="'access','view','list'" notnull="notnull" pipe="and" />
-        <group pipe="and">
-            <condition operation="more" column="group_srl" default="1" notnull="notnull" />
-            <condition operation="equal" column="group_srl" default="-1" notnull="notnull" pipe="or" />
-            <condition operation="equal" column="group_srl" default="-2" notnull="notnull" pipe="or" />
-        </group>
-    </conditions>
-</query>
diff --git a/modules/syndication/queries/getGrantedModules.xml b/modules/syndication/queries/getGrantedModules.xml
deleted file mode 100644
index c72bd0a8a3..0000000000
--- a/modules/syndication/queries/getGrantedModules.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<query id="getGrantedModules" action="select">
-    <tables>
-        <table name="module_grants" />
-    </tables>
-    <columns>
-        <column name="module_srl" />
-    </columns>
-    <conditions>
-        <condition operation="in" column="name" default="'access','view','list'" notnull="notnull" />
-        <group pipe="and">
-            <condition operation="more" column="group_srl" default="1" notnull="notnull" />
-            <condition operation="equal" column="group_srl" default="-1" notnull="notnull" pipe="or" />
-            <condition operation="equal" column="group_srl" default="-2" notnull="notnull" pipe="or" />
-        </group>
-    </conditions>
-    <groups>
-        <group column="module_srl" />
-    </groups>
-</query>
diff --git a/modules/syndication/queries/getLang.xml b/modules/syndication/queries/getLang.xml
deleted file mode 100644
index eb0c596722..0000000000
--- a/modules/syndication/queries/getLang.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<query id="getLang" action="select">
-    <tables>
-        <table name="lang" />
-    </tables>
-    <columns>
-        <column name="*" />
-    </columns>
-    <conditions>
-        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" filter="number" />
-        <condition operation="equal" column="lang_code" var="lang_code" pipe="and" />
-    </conditions>
-</query>
diff --git a/modules/syndication/queries/getModuleSiteInfo.xml b/modules/syndication/queries/getModuleSiteInfo.xml
deleted file mode 100644
index 921e334310..0000000000
--- a/modules/syndication/queries/getModuleSiteInfo.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<query id="getModuleSiteInfo" action="select">
-    <tables>
-        <table name="modules" alias="modules" />
-        <table name="sites" alias="sites" />
-    </tables>
-    <columns>
-        <column name="modules.module_srl" alias="module_srl" />
-        <column name="modules.mid" alias="mid" />
-        <column name="sites.domain" alias="domain" />
-    </columns>
-    <conditions>
-        <condition operation="equal" column="modules.module_srl" var="module_srl" filter="number" />
-        <condition operation="equal" column="sites.site_srl" default="modules.site_srl" notnull="notnull" filter="number" pipe="and" />
-    </conditions>
-</query>
diff --git a/modules/syndication/queries/getModules.xml b/modules/syndication/queries/getModules.xml
deleted file mode 100644
index ecb397cf4b..0000000000
--- a/modules/syndication/queries/getModules.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<query id="getModules" action="select">
-    <tables>
-        <table name="sites" />
-        <table name="modules" />
-        <table name="syndication_except_modules" alias="except_modules" type="left join">
-            <conditions>
-                <condition operation="equal" column="modules.module_srl" default="except_modules.module_srl" />
-            </conditions>
-        </table>
-    </tables>
-    <columns>
-        <column name="modules.site_srl" alias="site_srl" />
-        <column name="modules.module_srl" alias="module_srl" />
-        <column name="sites.domain" alias="domain" />
-        <column name="modules.mid" alias="mid" />
-        <column name="modules.module" alias="module" />
-        <column name="modules.browser_title" alias="browser_title" />
-        <column name="modules.description" alias="description" />
-    </columns>
-    <conditions>
-        <condition operation="in" column="modules.module_srl" var="module_srls" />
-        <condition operation="notin" column="modules.module_srl" var="except_module_srls" pipe="and" />
-        <condition operation="equal" column="sites.site_srl" default="modules.site_srl" notnull="notnull" pipe="and" />
-        <condition operation="null" column="except_modules.module_srl" default="1" pipe="and" />
-    </conditions>
-</query>
diff --git a/modules/syndication/queries/getSiteUpdatedTime.xml b/modules/syndication/queries/getSiteUpdatedTime.xml
deleted file mode 100644
index e5ead1bbc9..0000000000
--- a/modules/syndication/queries/getSiteUpdatedTime.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<query id="getSiteUpdatedTime" action="select">
-    <tables>
-        <table name="documents" alias="doc" />
-    </tables>
-    <columns>
-        <column name="max(doc.last_update)" alias="last_update" />
-    </columns>
-    <conditions>
-        <condition operation="equal" column="doc.module_srl" var="module_srl" filter="number" />
-        <condition operation="more" column="doc.last_update" var="start_date" filter="number" pipe="and" />
-        <condition operation="less" column="doc.last_update" var="end_date" filter="number" pipe="and" />
-        <condition operation="notin" column="doc.module_srl" var="except_modules" pipe="and" />
-    </conditions>
-</query>
diff --git a/modules/syndication/queries/insertExceptModule.xml b/modules/syndication/queries/insertExceptModule.xml
deleted file mode 100644
index f50e0b818d..0000000000
--- a/modules/syndication/queries/insertExceptModule.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<query id="insertExceptModule" action="insert">
-    <tables>
-        <table name="syndication_except_modules" />
-    </tables>
-    <columns>
-        <column name="module_srl" var="module_srl" filter="number" notnull="notnull" />
-        <column name="regdate" default="curdate()" notnull="notnull" />
-    </columns>
-</query>
diff --git a/modules/syndication/queries/insertLog.xml b/modules/syndication/queries/insertLog.xml
deleted file mode 100644
index d8bd170866..0000000000
--- a/modules/syndication/queries/insertLog.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<query id="insertLog" action="insert">
-    <tables>
-        <table name="syndication_logs" />
-    </tables>
-    <columns>
-        <column name="log_srl" default="sequence()" />
-        <column name="module_srl" var="module_srl" />
-        <column name="document_srl" var="document_srl" />
-        <column name="title" var="title" />
-        <column name="summary" var="summary" />
-        <column name="regdate" default="curdate()" notnull="notnull" />
-    </columns>
-</query>
diff --git a/modules/syndication/ruleset/insertConfig.xml b/modules/syndication/ruleset/insertConfig.xml
deleted file mode 100644
index c65f13bcb3..0000000000
--- a/modules/syndication/ruleset/insertConfig.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ruleset version="1.5.0">
-    <customrules>
-    </customrules>
-    <fields>
-		<field name="site_url" required="true" />
-		<field name="syndication_token" required="true" />
-    </fields>
-</ruleset>
diff --git a/modules/syndication/schemas/syndication_except_modules.xml b/modules/syndication/schemas/syndication_except_modules.xml
deleted file mode 100644
index b7ae105a45..0000000000
--- a/modules/syndication/schemas/syndication_except_modules.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<table name="syndication_except_modules">
-	<column name="module_srl" type="number" size="11" notnull="notnull" primary_key="primary_key" />
-	<column name="regdate" type="date" />
-</table>
diff --git a/modules/syndication/schemas/syndication_logs.xml b/modules/syndication/schemas/syndication_logs.xml
deleted file mode 100644
index 1473face2a..0000000000
--- a/modules/syndication/schemas/syndication_logs.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<table name="syndication_logs">
-	<column name="log_srl" type="number" size="11" notnull="notnull" unique="primary_key" />
-	<column name="module_srl" type="number" size="11" default="0" />
-	<column name="document_srl" type="number" size="11" default="0" />
-	<column name="title" type="varchar" size="255" />
-	<column name="summary" type="varchar" size="255" />
-	<column name="regdate" type="date" index="idx_regdate" />
-</table>
diff --git a/modules/syndication/syndication.admin.controller.php b/modules/syndication/syndication.admin.controller.php
deleted file mode 100644
index 2daf564b92..0000000000
--- a/modules/syndication/syndication.admin.controller.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * @class  syndicationAdminController
- * @author NAVER (developers@xpressengine.com)
- * @brief syndication module admin Controller class
- **/
-
-class syndicationAdminController extends syndication {
-
-	function init() 
-	{
-	}
-
-	function procSyndicationAdminInsertConfig() 
-	{
-		$oModuleController = getController('module');
-		$oSyndicationController = getController('syndication');
-		$oSyndicationModel = getModel('syndication');
-
-		$config = new stdClass;
-		$config->syndication_use = Context::get('syndication_use');
-		$config->site_url = preg_replace('/\/+$/is','',Context::get('site_url'));
-		$config->year = Context::get('year');
-		$config->syndication_token = Context::get('syndication_token');
-		$config->syndication_password = urlencode(Context::get('syndication_password'));
-
-		if(!$config->site_url) return $this->makeObject(-1,'msg_site_url_is_null');
-		if(!$config->syndication_token) return $this->makeObject(-1,'msg_syndication_token_is_null');
-
-		$oModuleController->updateModuleConfig('syndication',$config);
-
-		$except_module = Context::get('except_module');
-		$output = executeQuery('syndication.deleteExceptModules');
-		if(!$output->toBool()) return $output;
-
-		if ($except_module){
-			$modules = explode(',',$except_module);
-			for($i=0,$c=count($modules);$i<$c;$i++) {
-				$args->module_srl = $modules[$i];
-				$output = executeQuery('syndication.insertExceptModule',$args);
-				if(!$output->toBool()) return $output;
-			}
-		}
-
-		if(!$this->checkOpenSSLSupport())
-		{
-			return $this->makeObject(-1, 'msg_need_openssl_support');
-		}
-
-		$this->setMessage('success_applied');
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
-			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSyndicationAdminConfig');
-			$this->setRedirectUrl($returnUrl);
-			return;
-		}
-	}
-
-	function procSyndicationAdminCheckPingResult()
-	{
-		$oModuleModel = getModel('module');
-
-		$oSyndicationController = getController('syndication');
-		$oSyndicationModel= getModel('syndication');
-
-		$module_config = $oModuleModel->getModuleConfig('syndication');
-
-		$site_url = trim(Context::get('site_url'));
-		if(!$module_config->site_url) return $this->makeObject(-1,'msg_site_url_is_null');
-		if(!$module_config->syndication_token) return $this->makeObject(-1,'msg_syndication_token_is_null');
-
-		$id = $oSyndicationModel->getID('site');
-
-		// site_url 정보와 token 정보를 이용해서 ping 전송 테스트
-		if($oSyndicationController->ping($id, 'site')===FALSE)
-		{
-			$this->setError(-1);
-			$this->setMessage($oSyndicationController->ping_message);
-		}
-		else
-		{
-			$this->setMessage('msg_success_ping_test');
-		}
-	}
-}
diff --git a/modules/syndication/syndication.admin.view.php b/modules/syndication/syndication.admin.view.php
deleted file mode 100644
index 44c3d1a179..0000000000
--- a/modules/syndication/syndication.admin.view.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * @class  syndicationAdminView
- * @author NAVER (developers@xpressengine.com)
- * @brief  syndication admin view class
- **/
-class syndicationAdminView extends syndication
-{
-	function init() 
-	{
-	}
-
-	public function dispSyndicationAdminConfig()
-	{
-		$oModuleModel = getModel('module');
-
-		$module_config = $oModuleModel->getModuleConfig('syndication');
-
-		$oSyndicationModel = getModel('syndication');
-		Context::set('ping_log', $oSyndicationModel->getResentPingLog());
-
-		if(!$module_config->syndication_use)
-		{
-			$module_config->syndication_use = 'Y';
-		}
-
-		if(!$module_config->site_url)
-		{
-			$module_config->site_url = Context::getDefaultUrl()?Context::getDefaultUrl():getFullUrl();
-		}
-
-		if(!$module_config->year)
-		{
-			$module_config->year = date("Y");
-		}
-
-		if(!isset($module_config->syndication_password))
-		{
-			$module_config->syndication_password = uniqid();
-		}
-
-		Context::set('syndication_use', $module_config->syndication_use);
-		Context::set('site_url', preg_replace('/^(http|https):\/\//i','',$module_config->site_url));
-		Context::set('year', $module_config->year);
-		Context::set('syndication_token', $module_config->syndication_token);
-		Context::set('syndication_password', $module_config->syndication_password);
-		Context::set('uri_scheme', (Context::getSslStatus() == 'always') ? 'https://' : 'http://');
-
-		$output = executeQueryArray('syndication.getExceptModules');
-		$except_module_list = array();
-		if($output->data && count($output->data) > 0)
-		{
-			foreach($output->data as $item)
-			{
-				$except_module_list[] = $item;
-			}
-		}
-		Context::set('except_module', $except_module_list);
-		
-
-		//Security
-		$security = new Security();
-		$security->encodeHTML('services..service','except_module..ping');
-		$security->encodeHTML('except_module..mid','except_module..browser_title');
-
-		$this->setTemplatePath($this->module_path.'tpl');
-		$this->setTemplateFile('config');
-	}
-
-}
diff --git a/modules/syndication/syndication.class.php b/modules/syndication/syndication.class.php
deleted file mode 100644
index c203fe5f9a..0000000000
--- a/modules/syndication/syndication.class.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * @class  syndication
- * @author NAVER (developers@xpressengine.com)
- * @brief syndication module's high class
- * @todo site 전체의 문서를 연동하거나 게시판 메뉴 삭제 시 관련 게시판 내용 전체를 syndication과 연동하는 처리가 되어있지 않음.
- *			model 파일에서 처리 방식은 구현했으나 한번 시작되면 전체 문서를 종료할 때까지 계속 ping을 전송해야 하는 부담이 있음.
- **/
-
-define('SyndicationModule', 'M');
-define('SyndicationDocument', 'D');
-
-define('SyndicationInserted', 'I');
-define('SyndicationUpdated', 'U');
-define('SyndicationDeleted', 'D');
-
-class syndication extends ModuleObject {
-
-	var $services = array(
-		'Naver' => 'http://syndication.openapi.naver.com/ping/',
-	);
-
-	var $statuses = array(
-		'Naver' => 'http://syndication.openapi.naver.com/status/?site=%s',
-	);
-
-	function moduleInstall() {
-		$oModuleController = getController('module');
-		$oModuleController->insertTrigger('document.insertDocument', 'syndication', 'controller', 'triggerInsertDocument', 'after');
-		$oModuleController->insertTrigger('document.updateDocument', 'syndication', 'controller', 'triggerUpdateDocument', 'after');
-		$oModuleController->insertTrigger('document.deleteDocument', 'syndication', 'controller', 'triggerDeleteDocument', 'after');
-		$oModuleController->insertTrigger('module.deleteModule', 'syndication', 'controller', 'triggerDeleteModule', 'after');
-
-		$oModuleController->insertTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after');
-		// $oModuleController->insertTrigger('document.restoreTrash', 'syndication', 'controller', 'triggerRestoreTrash', 'after');
-		$oModuleController->insertTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after');
-
-		$oAddonAdminModel = getAdminModel('addon');
-		if($oAddonAdminModel->getAddonInfoXml('catpcha')){
-			$oAddonAdminController = &addonAdminController::getInstance();
-			$oAddonAdminController->doActivate('catpcha');
-			$oAddonAdminController->makeCacheFile();
-		}
-	}
-
-	function checkUpdate() {
-		$oModuleModel = getModel('module');
-		if(!$oModuleModel->getTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after')) return true;
-		// if(!$oModuleModel->getTrigger('document.restoreTrash', 'syndication', 'controller', 'triggerRestoreTrash', 'after')) return true;
-		if(!$oModuleModel->getTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after')) return true;
-
-		return false;
-	}
-
-	function moduleUpdate() {
-		$oModuleModel = getModel('module');
-		$oModuleController = getController('module');
-
-		if(!$oModuleModel->getTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after')){
-			$oModuleController->insertTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after');
-		}
-		// if(!$oModuleModel->getTrigger('document.restoreTrash', 'syndication', 'controller', 'triggerRestoreTrash', 'after')){
-		// 	$oModuleController->insertTrigger('document.restoreTrash', 'syndication', 'controller', 'triggerRestoreTrash', 'after');
-		// }
-		if(!$oModuleModel->getTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after')){
-			$oModuleController->insertTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after');
-		}
-
-		$oAddonAdminModel = getAdminModel('addon');
-		if($oAddonAdminModel->getAddonInfoXml('catpcha')){
-			$oAddonAdminController = &addonAdminController::getInstance();
-			$oAddonAdminController->doActivate('catpcha');
-			$oAddonAdminController->makeCacheFile();
-		}
-	}
-
-	function recompileCache() {
-	}
-
-	function checkOpenSSLSupport()
-	{
-		if(!in_array('ssl', stream_get_transports())) {
-			return FALSE;
-		}
-		return TRUE;
-	}
-
-	public function makeObject($code = 0, $message = 'success')
-	{
-		return class_exists('BaseObject') ? new BaseObject($code, $message) : new Object($code, $message);
-	}
-}
diff --git a/modules/syndication/syndication.controller.php b/modules/syndication/syndication.controller.php
deleted file mode 100644
index 5fcca8b7ac..0000000000
--- a/modules/syndication/syndication.controller.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * @class  syndicationController
- * @author NAVER (developers@xpressengine.com)
- * @brief syndication module's Controller class
- **/
-
-class syndicationController extends syndication
-{
-	var $ping_message = '';
-
-	function triggerInsertDocument(&$obj) {
-		if($obj->module_srl < 1) return $this->makeObject();
-		if($obj->status !== 'PUBLIC') return $this->makeObject();
-
-		$oSyndicationModel = getModel('syndication');
-		$oModuleModel = getModel('module');
-
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
-
-		$config = $oModuleModel->getModuleConfig('syndication');
-
-		if($config->syndication_use!='Y') return $this->makeObject();
-
-		$target_id = sprintf('%s-%s', $obj->module_srl, $obj->document_srl);
-		$id = $oSyndicationModel->getID('article', $target_id);
-		$this->ping($id, 'article');
-
-		return $this->makeObject();
-	}
-
-	function triggerUpdateDocument(&$obj) {
-		if($obj->module_srl < 1) return $this->makeObject();
-
-		$oSyndicationModel = getModel('syndication');
-		$oModuleModel = getModel('module');
-
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
-
-		$config = $oModuleModel->getModuleConfig('syndication');
-
-		if($config->syndication_use!='Y') return $this->makeObject();
-
-		$target_id = sprintf('%s-%s', $obj->module_srl, $obj->document_srl);
-		$id = $oSyndicationModel->getID('article', $target_id);
-
-		// PUBLIC 외 삭제
-		if($obj->status === 'PUBLIC')
-		{
-			$this->ping($id, 'article');
-		}
-		else
-		{
-			$this->ping($id, 'deleted');
-		}
-
-		return $this->makeObject();
-	}
-
-	function triggerDeleteDocument(&$obj) {
-		if($obj->module_srl < 1) return $this->makeObject();
-
-		$oModuleModel = getModel('module');
-		$oSyndicationModel = getModel('syndication');
-
-		$config = $oModuleModel->getModuleConfig('syndication');
-		if($config->syndication_use != 'Y') return $this->makeObject();
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
-
-		$this->insertLog($obj->module_srl, $obj->document_srl, $obj->title, $obj->content);
-
-		$target_id = sprintf('%s-%s', $obj->module_srl, $obj->document_srl);
-		$id = $oSyndicationModel->getID('article', $target_id);
-		$this->ping($id, 'deleted');
-
-		return $this->makeObject();
-	}
-
-	// @DEPRECATED
-	function triggerDeleteModule(&$obj) {
-		return $this->makeObject();
-	}
-
-	function triggerMoveDocumentModule(&$obj)
-	{
-		if($obj->module_srl < 1) return $this->makeObject();
-
-		$oSyndicationModel = getModel('syndication');
-		$oModuleModel = getModel('module');
-
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
-
-		$config = $oModuleModel->getModuleConfig('syndication');
-
-		if($config->syndication_use!='Y') return $this->makeObject();
-
-		$arr_document_srl = explode(',', $obj->document_srls);
-		if(!$arr_document_srl) return $this->makeObject();
-
-		foreach($arr_document_srl as $document_srl)
-		{
-			// 기존 문서 삭제
-			$source_module_srl = $obj->source_module_srl[$document_srl];
-			if(!!$source_module_srl)
-			{
-				$target_id = sprintf('%s-%s', $source_module_srl, $document_srl);
-				$id = $oSyndicationModel->getID('article', $target_id);
-				$this->ping($id, 'deleted');
-			}
-
-			// 옮겨진 문서 추가
-			$target_id = sprintf('%s-%s', $obj->module_srl, $document_srl);
-			$id = $oSyndicationModel->getID('article', $target_id);
-			$this->ping($id, 'article');
-		}
-
-		return $this->makeObject();
-	}
-
-	function triggerMoveDocumentToTrash(&$obj) {
-		$oSyndicationModel = getModel('syndication');
-		$oModuleModel = getModel('module');
-
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
-
-		$config = $oModuleModel->getModuleConfig('syndication');
-
-		if($config->syndication_use!='Y') return $this->makeObject();
-
-		$this->insertLog($obj->module_srl, $obj->document_srl, '', '');
-
-		$target_id = sprintf('%s-%s', $obj->module_srl, $obj->document_srl);
-		$id = $oSyndicationModel->getID('article', $target_id);
-		$this->ping($id, 'deleted');
-
-		return $this->makeObject();
-	}
-
-	// @deprecated
-	function triggerRestoreTrash(&$obj) {
-		// 중복 전송으로 인해 중단
-		return $this->makeObject();
-	}
-
-	function insertLog($module_srl, $document_srl, $title = null, $summary = null)
-	{
-		$args = new stdClass;
-		$args->module_srl = $module_srl;
-		$args->document_srl = $document_srl;
-		$args->title = $title;
-		$args->summary = $summary;
-		$output = executeQuery('syndication.insertLog', $args);
-	}
-
-	function deleteLog($module_srl, $document_srl)
-	{
-		$args = new stdClass;
-		$args->module_srl = $module_srl;
-		$args->document_srl = $document_srl;
-		$output = executeQuery('syndication.deleteLog', $args);
-	}
-
-	function ping($id, $type, $page=1) {
-		$this->ping_message = '';
-		$oSyndicationModel = getModel('syndication');
-
-		$oModuleModel = getModel('module');
-		$config = $oModuleModel->getModuleConfig('syndication');
-
-		if(!$config->syndication_token)
-		{
-			$this->ping_message = 'Syndication Token empty';
-			$oSyndicationModel->setResentPingLog($this->ping_message);
-			return false;
-		}
-
-		if(!$this->checkOpenSSLSupport())
-		{
-			$lang = Context::get('lang');
-			$this->ping_message = $lang->msg_need_openssl_support;
-			$oSyndicationModel->setResentPingLog($this->ping_message);
-			return false;
-		}
-
-		if(substr($config->site_url,-1)!='/')
-		{
-			$config->site_url .= '/';
-		}
-
-		$ping_url = 'https://apis.naver.com/crawl/nsyndi/v2';
-		$ping_header = array();
-		$ping_header['Host'] = 'apis.naver.com';
-		$ping_header['Pragma'] = 'no-cache';
-		$ping_header['Accept'] = '*/*';
-		$ping_header['Authorization'] = sprintf("Bearer %s", $config->syndication_token);
-
-		$request_config = array();
-		$request_config['ssl_verify_peer'] = false;
-
-		$ping_body = getNotEncodedFullUrl('', 'module', 'syndication', 'act', 'getSyndicationList', 'id', $id, 'type', $type, 'page', $page, 'syndication_password', $config->syndication_password);
-
-		$buff = FileHandler::getRemoteResource($ping_url, null, 10, 'POST', 'application/x-www-form-urlencoded', $ping_header, array(), array('ping_url'=>$ping_body), $request_config);
-
-		$xml = new XmlParser();
-		$xmlDoc= $xml->parse($buff);
-
-		if($xmlDoc->result->error_code->body != '000')
-		{
-			if(!$buff)
-			{
-				$this->ping_message = 'Socket connection error. Check your Server Environment.';
-			}
-			else
-			{
-				$this->ping_message = $xmlDoc->result->message->body;
-			}
-
-			$oSyndicationModel->setResentPingLog($this->ping_message);
-			return false;
-		}
-		return true;
-	}
-}
diff --git a/modules/syndication/syndication.model.php b/modules/syndication/syndication.model.php
deleted file mode 100644
index a35d0f5939..0000000000
--- a/modules/syndication/syndication.model.php
+++ /dev/null
@@ -1,658 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * @class  getSyndicationList
- * @author NAVER (developers@xpressengine.com)
- * @brief syndication model class of the module
- **/
-
-class syndicationModel extends syndication
-{
-	private $site_url = null;
-	private $uri_scheme = 'http://';
-	private $syndication_password= null;
-	private $year = null;
-	private $langs = array();
-	private $granted_modules = array();
-	static private $modules = array();
-
-	function init() {
-		$oModuleModel = getModel('module');
-		$config = $oModuleModel->getModuleConfig('syndication');
-		if(Context::getSslStatus() == 'always') $this->uri_scheme = 'https://';
-
-		$this->site_url = preg_replace('/\/+$/is', '', $config->site_url);
-		$this->syndication_password = $config->syndication_password;
-		$this->year = $config->year;
-
-		$output = executeQueryArray('syndication.getGrantedModules');
-		if($output->data) {
-			foreach($output->data as $key => $val) {
-				$this->granted_modules[] = $val->module_srl;
-			}
-		}
-
-		$this->gzhandler_enable = FALSE;
-	}
-
-	function isExceptedModules($module_srl) {
-		$args = new stdClass;
-		$args->module_srl = $module_srl;
-
-		$output = executeQuery('syndication.getExceptModule', $args);
-		if($output->data->count) return TRUE;
-
-		$output = executeQuery('syndication.getGrantedModule', $args);
-		if($output->data->count) return TRUE;
-
-		return FALSE;
-	}
-
-	function getExceptModuleSrls()
-	{
-		$output = executeQueryArray('syndication.getExceptModuleSrls');
-		$module_srls = array();
-		if (is_array($output->data))
-		{
-			foreach($output->data as $val)
-			{
-				$module_srls[] = $val->module_srl;
-			}
-		}
-		return $module_srls;
-	}
-
-	function getLang($key, $site_srl)
-	{
-		if(!$this->langs[$site_srl])
-		{
-			$this->langs[$site_srl] = array();
-			$args = new stdClass;
-			$args->site_srl = $site_srl;
-			$args->lang_code = Context::getLangType();
-			$output = executeQueryArray("syndication.getLang", $args);
-			if(!$output->toBool() || !$output->data) return $key;
-
-			foreach($output->data as $value)
-			{
-				$this->langs[$site_srl][$value->name] = $value->value;
-			}
-		}
-		if($this->langs[$site_srl][$key])
-		{
-			return $this->langs[$site_srl][$key];
-		}
-		else return $key;
-	}
-
-	function handleLang($title, $site_srl)
-	{
-		$matches = NULL;
-		if(!preg_match("/\\\$user_lang->(.+)/", $title, $matches))
-		{
-			return $title;
-		}
-		else
-		{
-			return $this->getLang($matches[1], $site_srl);
-		}
-	}
-
-	function getSyndicationList() {
-		$oModuleModel = getModel('module');
-		$config = $oModuleModel->getModuleConfig('syndication');
-		if(!$config->year || !$config->site_url || !$config->syndication_token) 
-		{
-			return $this->makeObject(-1,'msg_check_syndication_config');
-		}
-
-		$id = Context::get('id');
-		$type = Context::get('type');
-
-		$startTime = Context::get('start-time');
-		$endTime = Context::get('end-time');
-
-		$page = Context::get('page');
-		if(!$page)
-		{
-			$page = 1;
-		}
-		$vars = Context::getRequestVars();
-		if(!$id || !$type)
-		{
-			return $this->makeObject(-1,'msg_invalid_request');
-		}
-
-		if(!preg_match('/^tag:([^,]+),([0-9]+):(site|channel|article)(.*)$/i',$id,$matches)) 
-		{
-			return $this->makeObject(-1,'msg_invalid_request');
-		}
-
-		if($config->syndication_password != Context::get('syndication_password'))
-		{
-			return $this->makeObject(-1,'msg_invalid_request');
-		}
-
-		$url = $matches[1];
-		$year = $matches[2];
-		$target = $matches[3];
-		$id = $matches[4];
-		if($id && $id{0}==':')
-		{
-			$id = substr($id, 1);
-		}
-
-		$module_srl = null;
-		$document_srl = null;
-		if($id && strpos($id,'-')!==false) 
-		{
-			list($module_srl, $document_srl) = explode('-', $id);
-		}
-		elseif($id) 
-		{
-			$module_srl = $id;
-		}
-
-		if(!$url || !$year || !$target)
-		{
-			return $this->makeObject(-1,'msg_invalid_request');
-		}
-
-		$time_zone = substr($GLOBALS['_time_zone'], 0, 3).':'.substr($GLOBALS['_time_zone'], 3);
-		Context::set('time_zone', $time_zone);
-
-		$site_module_info = Context::get('site_module_info');
-
-		if($target == 'channel' && !$module_srl)
-		{
-			$target = 'site';
-		}
-
-		if($module_srl)
-		{
-			$args = new stdClass;
-			$args->module_srls = $module_srl;
-			$output = executeQuery('syndication.getModules', $args);
-			$module_info = $output->data;
-			self::$modules[$module_srl] = $output->data;
-		}
-
-		if($target == 'channel' && $module_srl)
-		{
-			if($module_info) 
-			{
-				$args->module_srl = $module_srl;
-				$output = executeQuery('syndication.getExceptModules', $args);
-				if($output->data->count) 
-				{
-					$error = 'target is not founded';
-				}
-			} 
-			else 
-			{
-				$error = 'target is not founded';
-			}
-
-			unset($args);
-		}
-
-		if(!$error) 
-		{
-			Context::set('target', $target);
-			Context::set('type', $type);
-
-			$oMemberModel = getModel('member');
-			$member_config = $oMemberModel->getMemberConfig();
-
-			$oModuleModel = getModel('module');
-			$site_config = $oModuleModel->getModuleConfig('module');
-
-			switch($target) 
-			{
-				case 'site' :
-						$site_info = new stdClass;
-						$site_info->id = $this->getID('site');
-						$site_info->site_url = getFullSiteUrl($this->uri_scheme . $this->site_url, '');
-						$site_info->site_title = $this->handleLang($site_module_info->browser_title, $site_module_info->site_srl);
-						$site_info->title = $site_info->site_title;
-
-						if($module_srl)
-						{
-							$args->module_srl = $module_srl;
-							$site_info->title = $this->handleLang($module_info->browser_title, $module_info->site_srl);
-							if(!$site_info->title)
-							{
-								$site_info->title = $site_info->site_title;
-							}
-						}
-						else
-						{
-							$except_module_output = executeQueryArray('syndication.getExceptModuleSrls');
-							if(is_array($except_module_output->data))
-							{
-								$except_module_srls = array();
-								foreach($except_module_output->data as $val)
-								{
-									$except_module_srls[] = $val->module_srl;
-								}
-								$args->except_modules = implode(',', $except_module_srls);
-							}
-						}
-
-						$output = executeQuery('syndication.getSiteUpdatedTime', $args);
-
-						if($output->data)
-						{
-							$site_info->updated = date("Y-m-d\\TH:i:s", ztime($output->data->last_update)).$time_zone;
-						}
-
-						$site_info->self_href = $this->getSelfHref($site_info->id,$type);
-						Context::set('site_info', $site_info);
-
-						$this->setTemplateFile('site');
-						switch($type) {
-							case 'article' :
-								// 문서 전체를 신디케이션에 추가
-								Context::set('articles', $this->getArticles($module_srl, $page, $startTime, $endTime, 'article',$site_info->id));
-								$next_url = Context::get('articles')->next_url;
-								
-								break;
-							case 'deleted' :
-								// 문서 전체를 신디케이션에서 삭제
-								Context::set('deleted', $this->getArticles($module_srl, $page, $startTime, $endTime, 'deleted',$site_info->id));
-								$next_url = Context::get('deleted')->next_url;
-								break;
-							default :
-								$this->setTemplateFile('site.info');
-								break;
-						}
-
-						// 다음 페이지가 있다면 다시 신디케이션 호출
-						if($next_url)
-						{
-							$oSyndicationController = getController('syndication');
-							$oSyndicationController->ping(Context::get('id'), Context::get('type'), ++$page);
-						}
-					break;
-				case 'channel' :
-						$channel_info = new stdClass;
-						$channel_info->id = $this->getID('channel', $module_info->module_srl);
-						$channel_info->site_title = $this->handleLang($site_module_info->browser_title, $site_module_info->site_srl);
-						$channel_info->title = $this->handleLang($module_info->browser_title, $module_info->site_srl);
-						$channel_info->updated = date("Y-m-d\\TH:i:s").$time_zone;
-						$channel_info->self_href = $this->getSelfHref($channel_info->id, $type);
-						$channel_info->site_url = getFullSiteUrl($this->uri_scheme . $this->site_url, '');
-						$channel_info->alternative_href = $this->getChannelAlternativeHref($module_info->module_srl);
-						$channel_info->summary = $module_info->description;
-						if($module_info->module == "textyle")
-						{
-							$channel_info->type = "blog";
-							$channel_info->rss_href = getFullSiteUrl($module_info->domain, '', 'mid', $module_info->mid, 'act', 'rss');
-						}
-						else
-						{
-							$channel_info->type = "web";
-						}
-						$except_module_srls = $this->getExceptModuleSrls();
-						if($except_module_srls)
-						{
-							$args->except_modules = implode(',',$except_module_srls);
-						}
-
-						$output = executeQuery('syndication.getSiteUpdatedTime', $args);
-						if($output->data) $channel_info->updated = date("Y-m-d\\TH:i:s", ztime($output->data->last_update)).$time_zone;
-						Context::set('channel_info', $channel_info);
-
-						$this->setTemplateFile('channel');
-						switch($type) {
-							case 'article' :
-									Context::set('articles', $this->getArticles($module_srl, $page, $startTime, $endTime, 'article', $channel_info->id));
-								break;
-							case 'deleted' :
-									Context::set('deleted', $this->getDeleted($module_srl, $page, $startTime, $endTime, 'deleted', $channel_info->id));
-								break;
-							default :
-									$this->setTemplateFile('channel.info');
-								break;
-						}
-					break;
-
-					case 'article':
-						$channel_info = new stdClass;
-						$channel_info->id = $this->getID('channel', $module_info->module_srl);
-						$channel_info->title = $this->handleLang($module_info->browser_title, $module_info->site_srl);
-						$channel_info->site_title = $site_config->siteTitle;
-						if(!$channel_info->site_title) {
-							$channel_info->site_title = $channel_info->title;
-						}
-						$channel_info->updated = date("Y-m-d\\TH:i:s").$time_zone;
-						$channel_info->self_href = $this->getSelfHref($channel_info->id, $type);
-						$channel_info->site_url = getFullSiteUrl($this->uri_scheme . $this->site_url, '');
-						$channel_info->alternative_href = $this->getChannelAlternativeHref($module_info->module_srl);
-						$channel_info->webmaster_name = $member_config->webmaster_name;
-						$channel_info->webmaster_email = $member_config->webmaster_email;
-
-						$except_module_srls = $this->getExceptModuleSrls();
-						if($except_module_srls)
-						{
-							$args->except_modules = implode(',',$except_module_srls);
-						}
-
-						$output = executeQuery('syndication.getSiteUpdatedTime', $args);
-						if($output->data) $channel_info->updated = date("Y-m-d\\TH:i:s", ztime($output->data->last_update)).$time_zone;
-						Context::set('channel_info', $channel_info);
-						Context::set('member_config', $member_config);
-
-						$this->setTemplateFile('channel');
-						switch($type) {
-							case "article" :
-								$articles = new stdClass; 
-								$articles->list = array($this->getArticle($document_srl));
-								Context::set('articles', $articles);
-							break;
-
-							case "deleted" :
-								$deleted = new stdClass; 
-								$deleted->list = $this->getDeletedByDocumentSrl($document_srl);
-								Context::set('deleted', $deleted);
-							break;
-						}
-					break;
-			}
-		} else {
-			Context::set('message', $error);
-			$this->setTemplateFile('error');
-		}
-
-		$this->setTemplatePath($this->module_path.'tpl');
-		Context::setResponseMethod('XMLRPC');
-	}
-
-	// @DEPRECATED
-	function getChannels() {
-		if($module_srls) $args->module_srls = $module_srls;
-		if(count($this->granted_modules)) $args->except_module_srls = implode(',',$this->granted_modules);
-		$output = executeQueryArray('syndication.getModules', $args);
-
-		$time_zone = substr($GLOBALS['_time_zone'],0,3).':'.substr($GLOBALS['_time_zone'],3);
-		Context::set('time_zone', $time_zone);
-
-		if($output->data) {
-			foreach($output->data as $module_info) {
-				unset($obj);
-				$obj = new stdClass;
-				$obj->id = $this->getID('channel', $module_info->module_srl);
-				$obj->title = $this->handleLang($module_info->browser_title, $module_info->site_srl);
-				$obj->updated = date("Y-m-d\\TH:i:s").$time_zone;
-				$obj->self_href = $this->getSelfHref($obj->id, 'channel');
-				$obj->alternative_href = $this->getChannelAlternativeHref($module_info);
-				$obj->summary = $module_info->description;
-				if($module_info->module == "textyle")
-				{
-					$obj->type = "blog";
-					$obj->rss_href = getFullSiteUrl($module_info->domain, '', 'mid', $module_info->mid, 'act', 'rss');
-				}
-				else
-				{
-					$obj->type = "web";
-				}
-
-				$list[] = $obj;
-			}
-		}
-		return $list;
-	}
-
-	function getArticle($document_srl) {
-		if($this->site_url==null) $this->init();
-
-		$oDocumentModel = getModel('document');
-		$oDocument = $oDocumentModel->getDocument($document_srl,false,false);
-		if(!$oDocument->isExists()) return;
-
-		$val = $oDocument->getObjectVars();
-
-		$time_zone = substr($GLOBALS['_time_zone'],0,3).':'.substr($GLOBALS['_time_zone'],3);
-		Context::set('time_zone', $time_zone);
-
-		$mdoule_info = self::$modules[$oDocument->get('module_srl')];
-
-		$article = new stdClass();
-		$article->id = $this->getID('article', $oDocument->get('module_srl').'-'.$oDocument->get('document_srl'));
-		$article->updated = date("Y-m-d\\TH:i:s", ztime($oDocument->get('last_update'))).$time_zone;
-		$article->published = date("Y-m-d\\TH:i:s", ztime($oDocument->get('regdate'))).$time_zone;
-		$article->alternative_href = $this->getAlternativeHref($oDocument->get('document_srl'), $oDocument->get('module_srl'));
-		$article->channel_alternative_href = $this->getChannelAlternativeHref($oDocument->get('module_srl'));
-		$article->nick_name = (!$oDocument->get('nick_name')) ? $oDocument->get('user_name') : $oDocument->get('nick_name');
-		$article->title = $oDocument->getTitle();
-		$article->content = $oDocument->get('content');
-		if($val->category_srl) {
-			$category = $oDocumentModel->getCategory($val->category_srl);
-			$category_title = $category->title;
-			$article->category = new stdClass();
-			$article->category->term = $val->category_srl;
-			$article->category->label = $category_title;
-		}
-
-		return $article;
-	}
-
-	function getArticles($module_srl = null, $page=1, $startTime = null, $endTime = null, $type = null, $id = null) {
-		if($this->site_url==null) $this->init();
-
-		$args = new stdClass;
-		if($module_srl) $args->module_srl = $module_srl;
-		if($startTime) $args->start_date = $this->getDate($startTime);
-		if($endTime) $args->end_date = $this->getDate($endTime);
-		if(count($this->granted_modules)) $args->except_module_srls = implode(',',$this->granted_modules);
-		$args->page = $page;
-		$output = executeQueryArray('syndication.getDocumentList', $args);
-		$cur_page = $output->page_navigation->cur_page;
-		$total_page = $output->page_navigation->last_page;
-
-		$result = new stdClass;
-		$result->next_url = null;
-		$result->list = array();
-
-		$time_zone = substr($GLOBALS['_time_zone'],0,3).':'.substr($GLOBALS['_time_zone'],3);
-		Context::set('time_zone', $time_zone);
-
-		if($cur_page<$total_page) {
-			$next_url = $this->getSelfHref($id, $type);
-			if($startTime) $next_url .= '&startTime='.$startTime;
-			if($endTime) $next_url .= '&endTime='.$endTime;
-			$result->next_url = $next_url.'&page='.($cur_page+1);
-		}
-
-		if($output->data) {
-			foreach($output->data as $key => $val) {
-				$article = new stdClass();
-				$article->id = $this->getID('article', $val->module_srl.'-'.$val->document_srl);
-				$article->updated = date("Y-m-d\\TH:i:s", ztime($val->last_update)).$time_zone;
-				$article->published = date("Y-m-d\\TH:i:s", ztime($val->regdate)).$time_zone;
-				$article->alternative_href = getFullSiteUrl($this->uri_scheme . $this->site_url, '', 'document_srl', $val->document_srl);
-				$article->channel_alternative_href = $this->getChannelAlternativeHref($val->module_srl);
-				$article->nick_name = (!$val->nick_name) ? $val->user_name : $val->nick_name;
-				$article->content = $val->content;
-				$result->list[] = $article;
-			}
-		}
-		return $result;
-	}
-
-	function getDeleted($module_srl = null, $page = 1, $startTime = null, $endTime = null, $type = null, $id = null) {
-		if($this->site_url==null) $this->init();
-
-		$args = new stdClass;
-		if($module_srl) $args->module_srl= $module_srl;
-		if($startTime) $args->start_date = $this->getDate($startTime);
-		if($endTime) $args->end_date = $this->getDate($endTime);
-		$args->page = $page;
-
-		$output = executeQueryArray('syndication.getDeletedList', $args);
-
-		$cur_page = $output->page_navigation->cur_page;
-		$total_page = $output->page_navigation->last_page;
-
-		$result = new stdClass;
-		$result->next_url = null;
-		$result->list = array();
-
-		$time_zone = substr($GLOBALS['_time_zone'],0,3).':'.substr($GLOBALS['_time_zone'],3);
-		Context::set('time_zone', $time_zone);
-
-		if($cur_page<$total_page) {
-			$next_url = $this->getSelfHref($id, $type);
-			if($startTime) $next_url .= '&startTime='.$startTime;
-			if($endTime) $next_url .= '&endTime='.$endTime;
-			$result->next_url = $next_url . '&page='.($cur_page+1);
-		}
-
-		if($output->data) {
-			foreach($output->data as $key => $val) {
-				$val->id = $this->getID('article', $val->module_srl.'-'.$val->document_srl);
-				$val->deleted = date("Y-m-d\\TH:i:s", ztime($val->regdate)).$time_zone;
-				$val->alternative_href = getFullSiteUrl($this->uri_scheme . $this->site_url, '', 'document_srl', $val->document_srl);
-				$val->channel_id = $this->getID('channel', $val->module_srl.'-'.$val->document_srl);
-				$output->data[$key] = $val;
-			}
-			$result->list = $output->data;
-		}
-		return $result;
-	}
-
-	function getDeletedByDocumentSrl($document_srl)
-	{
-		static $module_info = array();
-
-		$args = new stdClass;
-		$args->document_srl = $document_srl;
-		$output = executeQueryArray('syndication.getDeletedList', $args);
-
-		$time_zone = substr($GLOBALS['_time_zone'],0,3).':'.substr($GLOBALS['_time_zone'],3);
-		Context::set('time_zone', $time_zone);
-
-		foreach($output->data as $key => $val)
-		{
-			$module_srl = $val->module_srl;
-
-			if(!isset($module_info[$module_srl]))
-			{
-				$args = new stdClass;
-				$args->module_srl = $module_srl;
-				$module_output = executeQuery('syndication.getModuleSiteInfo', $args);
-				if($module_output->data) $module_info[$module_srl] = $module_output->data;
-				else $module_info[$module_srl] = null;
-			}
-
-			$val->id = $this->getID('article', $val->module_srl.'-'.$val->document_srl);
-			$val->deleted = date("Y-m-d\\TH:i:s", ztime($val->regdate)).$time_zone;
-			$val->alternative_href = getFullSiteUrl($this->uri_scheme . $this->site_url, '', 'mid', $module_info[$module_srl]->mid, 'document_srl', $val->document_srl);
-			$val->channel_id = $this->getID('channel', $val->module_srl.'-'.$val->document_srl);
-			$output->data[$key] = $val;
-		}
-
-		return $output->data;
-	}
-
-	function getID($type, $target_id = null) {
-		if($this->site_url==null) $this->init();
-
-		return sprintf('tag:%s,%d:%s', $this->site_url, $this->year, $type) . ($target_id?':'.$target_id:'');
-	}
-
-	function getChannelAlternativeHref($module_srl) {
-		static $module_info = array();
-		if(!isset($module_info[$module_srl])) {
-			$args = new stdClass;
-			$args->module_srl = $module_srl;
-			$output = executeQuery('syndication.getModuleSiteInfo', $args);
-			if($output->data) $module_info[$module_srl] = $output->data;
-			else $module_info[$module_srl] = null;
-		}
-
-		if(is_null($module_info[$module_srl])) return $this->site_url;
-
-		$domain = $module_info[$module_srl]->domain;
-		$url = getFullSiteUrl($domain, '', 'mid', $module_info[$module_srl]->mid);
-		if(substr($url,0,1)=='/') $domain = $this->uri_scheme . $this->site_url . $url;
-		return $url;
-	}
-
-	function getSelfHref($id, $type = null) {
-		if($this->site_url==null) $this->init();
-
-		return  sprintf('%s/?module=syndication&act=getSyndicationList&id=%s&type=%s&syndication_password=%s', $this->uri_scheme . $this->site_url, $id, $type, $this->syndication_password);
-	}
-
-	/**
-	 * 문서의 고유 URL 반환
-	 */
-	function getAlternativeHref($document_srl, $module_srl) {
-		if($this->site_url==null) $this->init();
-
-		if(!self::$modules[$module_srl]) {
-			$args = new stdClass;
-			$args->module_srls = $module_srl;
-			$output = executeQuery('syndication.getModules', $args);
-			$module_info = $output->data;
-			self::$modules[$module_srl] = $module_info;
-		} else {
-			$module_info = self::$modules[$module_srl];
-		}
-
-		$domain = $module_info->domain;
-		$url = getFullSiteUrl($domain, '', 'mid', $module_info->mid, 'document_srl', $document_srl);
-		if(substr($url,0,1)=='/') $domain = $this->uri_scheme . $this->site_url.$url;
-		return $url;
-	}
-
-	function getDate($date) {
-		$time = strtotime($date);
-		if($time == -1) $time = ztime(str_replace(array('-','T',':'),'',$date));
-		return date('YmdHis', $time);
-	}
-
-	function getResentPingLogPath()
-	{
-		$target_filename = _XE_PATH_.'files/cache/tmp/syndication_ping_log';
-		if(!file_exists($target_filename))
-		{
-			FileHandler::writeFile($target_filename, '');
-		}
-		return $target_filename;
-	}
-
-	function setResentPingLog($msg)
-	{
-		$file_path = $this->getResentPingLogPath();
-
-		$args = new stdClass;
-		$args->regdate = date('YmdHis');
-		$args->message = urlencode($msg);
-
-		$list = $this->getResentPingLog();
-		if(count($list)>=10)
-		{
-			array_pop($list);
-		}
-		array_unshift($list, $args);
-		FileHandler::writeFile($file_path, serialize($list));
-
-		return true;
-	}
-
-	function getResentPingLog()
-	{
-		$file_path = $this->getResentPingLogPath();
-		$str = FileHandler::readFile($file_path);
-		$list = array();
-		if($str)
-		{
-			$list = unserialize($str);
-		}
-
-		return $list;
-	}
-}
diff --git a/modules/syndication/tpl/channel.html b/modules/syndication/tpl/channel.html
deleted file mode 100644
index c5699cea85..0000000000
--- a/modules/syndication/tpl/channel.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{'<?xml version="1.0" encoding="utf-8"?>'}
-<feed xmlns="http://webmastertool.naver.com">
-	<include target="./include.channel.html" />
-
-	<block cond="$articles->list">
-		<block loop="$articles->list => $key, $article">
-			<include target="./include.articles.html" />
-		</block>
-	</block>
-
-	<block cond="$deleted->list">
-		<block loop="$deleted->list => $key, $delete">
-			<include target="./include.deleted.html" />
-		</block>
-	</block>
-</feed>
diff --git a/modules/syndication/tpl/channel.info.html b/modules/syndication/tpl/channel.info.html
deleted file mode 100644
index c8543d9794..0000000000
--- a/modules/syndication/tpl/channel.info.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{'<?xml version="1.0" encoding="utf-8"?>'}
-
-<entry xmlns="http://www.w3.org/2005/Atom">
-    <!--#include("./include.channel.html")-->
-</entry>
diff --git a/modules/syndication/tpl/config.html b/modules/syndication/tpl/config.html
deleted file mode 100644
index e23500136a..0000000000
--- a/modules/syndication/tpl/config.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<load target="css/syndication.css" />
-<load target="js/syndication.js" />
-
-<div class="x_page-header">
-	<h1>{$lang->syndication} {$lang->cmd_management} </h1>
-</div>
-{@$form_id = "modules/syndication/tpl/config.html"}
-<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == $form_id" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
-	<p>{$XE_VALIDATOR_MESSAGE}</p>
-</div>
-<form ruleset="insertService" class="x_form-horizontal" action="./" method="post">
-	<input type="hidden" name="xe_validator_id" value="{$form_id}" />
-	<input type="hidden" name="act" value="procSyndicationAdminInsertConfig" />
-    <input type="hidden" name="year" value="{$year}" />
-
-	<div class="x_control-group">
-        <div class="x_control-label">{$lang->help}</div>
-        <div class="x_controls">
-            <p>{$lang->about_syndication}</p>
-            <p><a href="http://webmastertool.naver.com/guide/syndi_guide.naver" target="_blank">http://webmastertool.naver.com/guide/syndi_guide.naver</a></p>
-        </div>
-	</div>
-
-	<div class="x_control-group">
-        <div class="x_control-label">{$lang->use}</div>
-        <div class="x_controls">
-			<select name="syndication_use">
-				<option value="Y" selected="selected"|cond="$syndication_use=='Y'">{$lang->use}</option>
-				<option value="N" selected="selected"|cond="$syndication_use=='N'">{$lang->notuse}</option>
-			</select>
-        </div>
-	</div>
-
-	<div class="x_control-group">
-        <div class="x_control-label">{$lang->my_syndication_url}</div>
-        <div class="x_controls">
-            {$uri_scheme}<input type="text" id="site_url" name="site_url" value="{$site_url}" />
-            <input type="button" value="{$lang->cmd_check_syndication_echo}" onclick="pingCheck(jQuery('#site_url').val())" class="x_btn" />
-            <p class="x_help-inline">{$lang->about_my_syndication_url}</p>
-			<p class="ping_test_result"></p>
-        </div>
-	</div>
-
-	<div class="x_control-group">
-        <div class="x_control-label">{$lang->naver_syndication_token}</div>
-        <div class="x_controls">
-			<input type="text" name="syndication_token" value="{$syndication_token}" id="syndication_token" style="width:90%"/>
-        </div>
-	</div>
-
-	<div class="x_control-group">
-        <div class="x_control-label">{$lang->my_syndication_password}</div>
-        <div class="x_controls">
-            <input type="text" id="syndication_password" name="syndication_password" value="{$syndication_password}" />
-            <p class="x_help-inline">{$lang->about_my_syndication_password}</p>
-        </div>
-	</div>
-
-	<div class="x_control-group">
-        <div class="x_control-label">{$lang->except_module}</div>
-        <div class="x_controls">
-            <select name="_except_module" id="_except_module" size="10" class="exceptModuleList">
-                {@$except_module_srls = array()}
-                <!--@foreach($except_module as $v)-->
-                {@$except_module_srls[] = $v->module_srl}
-                <option value="{$v->module_srl}">{$v->browser_title} ({$v->mid})</option>
-                <!--@end-->
-            </select>
-			<div>
-                <a href="{getUrl('','module','module','act','dispModuleSelectList','id','except_module')}" onclick="popopen(this.href, 'ModuleSelect');return false;" class="x_btn">{$lang->cmd_insert}</a>
-                <a href="#" onclick="removeExceptModule('except_module');return false;" class="x_btn">{$lang->cmd_delete}</a>
-			</div>
-            <p>{$lang->about_except_module}</p>
-            <input type="hidden" name="except_module" id="except_module" value="{implode(',',$except_module_srls)}" />
-		</div>
-	</div>
-	<div class="x_clearfix btnArea">
-		<button type="submit" class="x_btn x_btn-primary x_pull-right">{$lang->cmd_save}</button>
-	</div>
-</form>
-
-<div>
-	<h2>Ping Fail log</h2>
-	<ul>
-		<li loop="$ping_log=>$obj">
-			<span>{zdate($obj->regdate)}</span> / <span>{urldecode($obj->message)}</span>
-		</li>
-	</ul>
-</div>
diff --git a/modules/syndication/tpl/css/syndication.css b/modules/syndication/tpl/css/syndication.css
deleted file mode 100644
index 1a62136808..0000000000
--- a/modules/syndication/tpl/css/syndication.css
+++ /dev/null
@@ -1,17 +0,0 @@
-@charset "utf-8";
-
-input.siteUrl { width:400px; }
-ul.syndiService { list-style:none; margin:0; padding:0;}
-ul.syndiService li { padding:10px 0; margin:0;}
-select.exceptModuleList { width:400px; }
-ul.midCommand { margin:20px 0 0 0; padding:0; list-style:none; }
-ul.midCommand li { display:inline; margin:0 20px 0 0; padding:0;}
-
-/* Vertical Bar Graph */
-.vGraph{ padding:20px 0;}
-.vGraph ul{ margin:0; padding:0; height:100px; border:1px solid #ddd; border-top:0; border-right:0; font-size:11px; font-family:Tahoma, Geneva, sans-serif; list-style:none;}
-.vGraph ul:after{ content:""; display:block; clear:both;}
-.vGraph li{ float:left; display:inline; width:8%; height:100%; margin:0 3%; position:relative; text-align:center; white-space:nowrap;}
-.vGraph .gTerm{ position:relative; display:inline-block; width:100%; height:20px; line-height:20px; margin:0 -100% -20px 0; padding:100px 0 0 0; vertical-align:bottom; color:#767676; font-weight:bold;}
-.vGraph .gBar{ position:relative; display:inline-block; width:100%; margin:-1px 0 0 0; border:1px solid #ccc; border-bottom:0; background:#e9e9e9; vertical-align:bottom;}
-.vGraph .gBar span{ position:absolute; width:100%; top:-20px; left:0; color:#767676;}
diff --git a/modules/syndication/tpl/error.html b/modules/syndication/tpl/error.html
deleted file mode 100644
index e641f1dcbd..0000000000
--- a/modules/syndication/tpl/error.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{'<?xml version="1.0" encoding="utf-8"?>'}
-<feed xmlns="http://www.w3.org/2005/Atom">
-    <error>-1</error>
-    <message>{$message}</message>
-</feed>
diff --git a/modules/syndication/tpl/filter/insert_service.xml b/modules/syndication/tpl/filter/insert_service.xml
deleted file mode 100644
index b81953e601..0000000000
--- a/modules/syndication/tpl/filter/insert_service.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<filter name="insert_service" module="syndication" act="procSyndicationAdminInsertService" confirm_msg_code="confirm_submit">
-  <form />
-  <parameter />
-  <response>
-    <tag name="error" />
-    <tag name="message" />
-  </response>
-</filter>
diff --git a/modules/syndication/tpl/include.articles.html b/modules/syndication/tpl/include.articles.html
deleted file mode 100644
index af9171b5a9..0000000000
--- a/modules/syndication/tpl/include.articles.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<entry>
-	<id>{$article->alternative_href|noescape}</id>
-	<title><![CDATA[{$article->title|noescape}]]></title>
-	<author>
-		<name><![CDATA[{$article->nick_name|noescape}]]></name>
-	</author>
-	<updated>{$article->updated|noescape}</updated>
-	<published>{$article->published|noescape}</published>
-	<link rel="via" href="{$article->channel_alternative_href|noescape}" title="{escape($channel_info->title)}" />
-	<content type="html"><![CDATA[{$article->content|noescape}]]></content>
-	<category cond="$article->category" term="{$article->category->term|noescape}" label="{escape($article->category->label)}" />
-</entry>
diff --git a/modules/syndication/tpl/include.channel.html b/modules/syndication/tpl/include.channel.html
deleted file mode 100644
index 716799fd47..0000000000
--- a/modules/syndication/tpl/include.channel.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<id><![CDATA[{$channel_info->self_href|noescape}]]></id>
-<title><![CDATA[{$channel_info->site_title|noescape}]]></title>
-<author>
-	<name><![CDATA[{$channel_info->webmaster_name|noescape}]]></name>
-	<url><![CDATA[{$channel_info->site_url|noescape}]]></url>
-</author>
-<updated>{$channel_info->updated|noescape}</updated>
-<link rel="site" href="{escape($channel_info->site_url)}" title="{escape($channel_info->site_title)}" />
diff --git a/modules/syndication/tpl/include.channels.html b/modules/syndication/tpl/include.channels.html
deleted file mode 100644
index e025c4a5e9..0000000000
--- a/modules/syndication/tpl/include.channels.html
+++ /dev/null
@@ -1,8 +0,0 @@
-    <entry>
-        <id>{escape($channel_info->id)}</id>
-        <title>{escape($channel_info->title)}</title>
-        <updated>{$channel_info->updated|noescape}</updated>
-        <link rel="self" href="{escape($channel_info->self_href)}" />
-        <link rel="alternative" href="{$channel_info->alternative_href|noescape}" />
-        <summary>{escape($channel_info->summary)}</summary>
-    </entry>
diff --git a/modules/syndication/tpl/include.deleted.html b/modules/syndication/tpl/include.deleted.html
deleted file mode 100644
index 122688c1cb..0000000000
--- a/modules/syndication/tpl/include.deleted.html
+++ /dev/null
@@ -1 +0,0 @@
-<deleted-entry ref="{$delete->alternative_href|noescape}" when="{$delete->deleted}" />    
diff --git a/modules/syndication/tpl/include.site.html b/modules/syndication/tpl/include.site.html
deleted file mode 100644
index 7cb5d8f495..0000000000
--- a/modules/syndication/tpl/include.site.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<id>{escape($site_info->id)}</id>
-<title>{escape($site_info->title)}</title>
-<author>
-	<name>{$site_info->site_title|noescape}</name>
-</author>
-<updated>{$site_info->updated|noescape}</updated>
-<link rel="site" href="{escape($site_info->site_url)}" title="{escape($site_info->title)}"/>
diff --git a/modules/syndication/tpl/js/syndication.js b/modules/syndication/tpl/js/syndication.js
deleted file mode 100644
index ce61a697b5..0000000000
--- a/modules/syndication/tpl/js/syndication.js
+++ /dev/null
@@ -1,55 +0,0 @@
-function insertSelectedModules(id, module_srl, mid, browser_title) {
-    var sel_obj = get_by_id('_'+id);
-    for(var i=0;i<sel_obj.options.length;i++) if(sel_obj.options[i].value==module_srl) return;
-    var opt = new Option(browser_title+' ('+mid+')', module_srl, false, false);
-    sel_obj.options[sel_obj.options.length] = opt;
-    if(sel_obj.options.length>8) sel_obj.size = sel_obj.options.length;
-
-    doSyncExceptModules(id);
-}
-
-function removeExceptModule(id) {
-    var sel_obj = get_by_id('_'+id);
-    sel_obj.remove(sel_obj.selectedIndex);
-    if(sel_obj.options.length) sel_obj.selectedIndex = sel_obj.options.length-1;
-    doSyncExceptModules(id);
-}
-
-function doSyncExceptModules(id) {
-    var selected_module_srls = new Array();
-    var sel_obj = get_by_id('_'+id);
-    for(var i=0;i<sel_obj.options.length;i++) {
-        selected_module_srls.push(sel_obj.options[i].value);
-    }
-    get_by_id(id).value = selected_module_srls.join(',');
-}
-
-
-function pingCheck(site_url){
-
-	jQuery('p.ping_test_result').html('');
-	var response_tags = new Array('error','message','ping_result');
-	exec_xml('syndication','procSyndicationAdminCheckPingResult',{'site_url':site_url},function(ret_obj,response_tags){
-		var error = ret_obj['error'];
-		var message = ret_obj['message'];
-		var ping_result = ret_obj['ping_result'];
-		if(ping_result) jQuery('p.ping_test_result').text(ping_result);
-		alert(message);
-
-	},response_tags);
-}
-
-function checkSyndicationStatus(service){
-
-	jQuery('p.print_result_status').html('');
-	var response_tags = new Array('error','message','result_status');
-	exec_xml('syndication','procSyndicationAdminCheckApiStatus',{target_service:service},function(ret_obj,response_tags){
-		var error = ret_obj['error'];
-		var message = ret_obj['message'];
-		var result = ret_obj['result_status'];
-
-		if(result) jQuery('div.print_result_status').html(result);
-		if(error!=0) alert(message);
-
-	},response_tags);
-}
diff --git a/modules/syndication/tpl/naver_result.html b/modules/syndication/tpl/naver_result.html
deleted file mode 100644
index 29171b78b8..0000000000
--- a/modules/syndication/tpl/naver_result.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<h3>Naver Syndication Status</h3>
-
-<h4>{$lang->syndication_status_result}</h4>
-<table>
-<tbody>
-<tr>
-	<th>{$lang->site}</th>
-	<td>{$result->site_name}</td>
-</tr>
-<tr>
-	<th>{$lang->syndication_status}</th>
-	<td><strong>{$result->status}</strong></td>
-</tr>
-<tr>
-	<th>{$lang->syndication_synic_start_date}</th>
-	<td>{$result->first_update}</td>
-</tr>
-<tr>
-	<th>{$lang->syndication_synic_last_date}</th>
-	<td>{$result->last_update}</td>
-</tr>
-<tr>
-	<th>{$lang->syndication_visit_ok_count}</th>
-	<td>{number_format($result->visit_ok_count)}</td>
-</tr>
-<tr>
-	<th>{$lang->syndication_visit_fail_count}</th>
-	<td>{number_format($result->visit_fail_count)}</td>
-</tr>
-</tbody>
-</table>
-<h4>{$lang->syndication_sync_article}</h4>
-<div class="vGraph"> 
-<!--@if($result->article_count)-->
-<ul> 
-<!--@foreach($result->article_count as $date => $count)-->
-	<li><span class="gTerm">{$date}</span><span class="gBar" style="height:{intval(($count/$result->max_article_count)*100)}%"><span>{number_format($count)}</span></span></li> 
-<!--@end-->
-</ul> 
-<!--@end-->
-</div>
diff --git a/modules/syndication/tpl/site.html b/modules/syndication/tpl/site.html
deleted file mode 100644
index dfe029baa6..0000000000
--- a/modules/syndication/tpl/site.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{'<?xml version="1.0" encoding="utf-8"?>'}
-<feed xmlns="http://webmastertool.naver.com">
-    <!--#include("./include.site.html")-->
-    <!--@if(count($channels))-->
-        <!--@foreach($channels as $key => $channel_info)-->
-        <entry>
-        <!--#include("./include.channel.html")-->
-        </entry>
-        <!--@end-->
-    <!--@elseif(count($articles->list))-->
-    <!--@if($articles->next_url)--><link rel="next-in-thread" href="{htmlspecialchars($articles->next_url)}" /><!--@end-->
-        <!--@foreach($articles->list as $key => $article)-->
-        <!--#include("./include.articles.html")-->
-        <!--@end-->
-    <!--@elseif(count($deleted->list))-->
-    <!--@if($deleted->next_url)--><link rel="next-in-thread" href="{htmlspecialchars($deleted->next_url)}" /><!--@end-->
-        <!--@foreach($deleted->list as $key => $delete)-->
-        <!--#include("./include.deleted.html")-->
-        <!--@end-->
-    <!--@end-->
-</feed>
diff --git a/modules/syndication/tpl/site.info.html b/modules/syndication/tpl/site.info.html
deleted file mode 100644
index 741690f286..0000000000
--- a/modules/syndication/tpl/site.info.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{'<?xml version="1.0" encoding="utf-8"?>'}
-<feed xmlns="http://webmastertool.naver.com">
-    <!--#include("./include.site.html")-->
-</feed>

From 7f058e3348739069603d6ac37672cac6b8da5f70 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Mon, 10 Dec 2018 18:33:11 +0900
Subject: [PATCH 13/22] =?UTF-8?q?#2347=20=ED=9A=8C=EC=9B=90=20=EC=9E=91?=
 =?UTF-8?q?=EC=84=B1=EA=B8=80=20=EB=AA=A9=EB=A1=9D=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EB=8C=93=EA=B8=80=20=EC=88=98=EB=A5=BC=20=ED=91=9C=EC=8B=9C?=
 =?UTF-8?q?=ED=95=98=EC=A7=80=20=EB=AA=BB=ED=95=98=EB=8A=94=20=EB=AC=B8?=
 =?UTF-8?q?=EC=A0=9C=20=EA=B3=A0=EC=B9=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/document/document.admin.view.php        | 2 +-
 modules/member/skins/default/document_list.html | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/modules/document/document.admin.view.php b/modules/document/document.admin.view.php
index 696ac78847..258b227d4d 100644
--- a/modules/document/document.admin.view.php
+++ b/modules/document/document.admin.view.php
@@ -50,7 +50,7 @@ function dispDocumentAdminList()
 
 		// get a list
 		$oDocumentModel = getModel('document');
-		$columnList = array('document_srl', 'module_srl', 'title', 'member_srl', 'nick_name', 'readed_count', 'voted_count', 'blamed_count', 'regdate', 'ipaddress', 'status', 'category_srl');
+		$columnList = array('document_srl', 'module_srl', 'title', 'member_srl', 'nick_name', 'readed_count', 'voted_count', 'blamed_count', 'regdate', 'ipaddress', 'status', 'category_srl', 'comment_count');
 		$output = $oDocumentModel->getDocumentList($args, false, true, $columnList);
 
 		// get Status name list
diff --git a/modules/member/skins/default/document_list.html b/modules/member/skins/default/document_list.html
index ef5b48748e..e4b23426ad 100644
--- a/modules/member/skins/default/document_list.html
+++ b/modules/member/skins/default/document_list.html
@@ -21,10 +21,6 @@ <h1>{$member_title = $lang->cmd_view_own_document }</h1>
 				<!--@if($oDocument->getCommentCount())-->
 					[{$oDocument->getCommentCount()}]
 				<!--@end-->
-	
-				<!--@if($oDocument->getTrackbackCount())-->
-					[{$oDocument->getTrackbackCount()}]
-				<!--@end-->
 			</td>
 			<td>{$oDocument->getRegdate("Y-m-d")}</td>
 			<td>{$oDocument->get('readed_count')}</td>

From 67887f51b8d21b31762b5a66c72ae752e5c53975 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Tue, 11 Dec 2018 11:18:37 +0900
Subject: [PATCH 14/22] =?UTF-8?q?#2341=20=EB=AA=A8=EB=B0=94=EC=9D=BC?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=AA=BD=EC=A7=80=20=EB=8B=B5=EC=9E=A5?=
 =?UTF-8?q?=EC=97=90=20=EC=9C=84=EC=A7=80=EC=9C=85=20=EC=97=90=EB=94=94?=
 =?UTF-8?q?=ED=84=B0=20=EC=A0=81=EC=9A=A9=20-=20=EC=AA=BD=EC=A7=80=20?=
 =?UTF-8?q?=EB=B0=9C=EC=8B=A0=20=ED=9B=84=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?=
 =?UTF-8?q?=EC=9D=B4=EB=8F=99=20=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communication.controller.php              | 11 +++++++---
 .../communication/communication.mobile.php    | 17 ++++++++++++++
 .../m.skins/default/js/communication.js       | 22 ++++++++++++++-----
 .../m.skins/default/send_message.html         |  9 ++++----
 .../skins/default/send_message.html           |  3 ++-
 5 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/modules/communication/communication.controller.php b/modules/communication/communication.controller.php
index 88a04b26ac..7abfd9f848 100644
--- a/modules/communication/communication.controller.php
+++ b/modules/communication/communication.controller.php
@@ -125,6 +125,8 @@ function procCommunicationSendMessage()
 			return $output;
 		}
 
+		$message_srl = $output->get('message_srl');
+
 		// send an e-mail
 		if($send_mail == 'Y')
 		{
@@ -140,7 +142,7 @@ function procCommunicationSendMessage()
 
 		if(!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
-			if(Context::get('is_popup') != 'Y')
+			if(Context::get('is_popup') === 'Y')
 			{
 				global $lang;
 				htmlHeader();
@@ -153,7 +155,7 @@ function procCommunicationSendMessage()
 			else
 			{
 				$this->setMessage('success_sended');
-				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('','act', 'dispCommunicationMessages', 'message_type', 'S', 'receiver_srl', $receiver_srl, 'message_srl', '');
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('act', 'dispCommunicationMessages', 'message_type', 'S', 'message_srl', $message_srl);
 				$this->setRedirectUrl($returnUrl);
 			}
 		}
@@ -262,7 +264,10 @@ function sendMessage($sender_srl, $receiver_srl, $title, $content, $sender_log =
 
 		$oDB->commit();
 
-		return new BaseObject(0, 'success_sended');
+		$result = new BaseObject(0, 'success_sended');
+		$result->add('message_srl', $message_srl);
+
+		return $result;
 	}
 
 	/**
diff --git a/modules/communication/communication.mobile.php b/modules/communication/communication.mobile.php
index e131da444d..bd5ef2de0c 100644
--- a/modules/communication/communication.mobile.php
+++ b/modules/communication/communication.mobile.php
@@ -178,7 +178,24 @@ function dispCommunicationSendMessage()
 			return $this->stop('msg_invalid_request');
 		}
 
+		$oEditorModel = getModel('editor');
+		$option = new stdClass();
+		$option->primary_key_name = 'receiver_srl';
+		$option->content_key_name = 'new_content';
+		$option->allow_fileupload = FALSE;
+		$option->enable_autosave = FALSE;
+		$option->enable_default_component = TRUE;
+		$option->enable_component = FALSE;
+		$option->resizable = FALSE;
+		$option->disable_html = TRUE;
+		$option->height = 150;
+		$option->skin = $this->communication_config->editor_skin;
+		$option->colorset = $this->communication_config->editor_colorset;
+		$editor = $oEditorModel->getEditor($logged_info->member_srl, $option);
+
 		Context::set('receiver_info', $receiver_info);
+		Context::set('editor', $editor);
+
 		$this->setTemplateFile('send_message');
 	}
 
diff --git a/modules/communication/m.skins/default/js/communication.js b/modules/communication/m.skins/default/js/communication.js
index e37272d415..65c0e810b3 100644
--- a/modules/communication/m.skins/default/js/communication.js
+++ b/modules/communication/m.skins/default/js/communication.js
@@ -13,10 +13,20 @@ function completeDeleteMessage(ret_obj) {
 	location.href = current_url.setQuery('message_srl','');
 }
 
-function mergeContents()
-{
-	var $form = jQuery('#fo_comm');
-	var content = $form.find('textarea[name=new_content]').val() + $form.find('input[name=source_content]').val();
-	$form.find('input[name=content]').val(content);
-	$form.submit();
+function mergeContents(data) {
+	var $form = jQuery('#fo_comm')
+	var editotSequence = data.editor_sequence || null
+	var content = ''
+	var sourceContent = $form.find('input[name=source_content]').val() || ''
+
+	if (editotSequence) {
+		content = editorGetContent(editotSequence)
+	} else {
+		content = $form.find('[name=new_content]').val()
+	}
+
+	content += sourceContent
+
+	$form.find('input[name=content]').val(content)
+	$form.submit()
 }
diff --git a/modules/communication/m.skins/default/send_message.html b/modules/communication/m.skins/default/send_message.html
index 1b7c1834ca..c3d4f1470d 100644
--- a/modules/communication/m.skins/default/send_message.html
+++ b/modules/communication/m.skins/default/send_message.html
@@ -9,13 +9,11 @@ <h2>{$lang->cmd_send_message}</h2>
 </div>
 <form ruleset="sendMessage" action="./" method="post" class="ff" id="fo_comm">
 	<input type="hidden" name="module" value="communication" />
-	<input type="hidden" name="is_popup" value="Y" />
 	<input type="hidden" name="act" value="procCommunicationSendMessage" />
 	<input type="hidden" name="receiver_srl" value="{$receiver_info->member_srl}" />
-	<input type="hidden" name="source_content" value="{$source_message->content}" />
+	<input type="hidden" name="source_content" value="{$source_message->content|autoescape}" />
 	<input type="hidden" name="content" value="" />
 	<input type="hidden" name="xe_validator_id" value="modules/communication/m.skins/default/send_message/1" />
-	<input type="hidden" name="success_return_url" value="{getNotEncodedUrl('','act', 'dispCommunicationSendMessage', 'receiver_srl', $receiver_info->member_srl)}" />
 	<ul>
 		<li>
 			<span class="memberInfo">{$receiver_info->nick_name}</span>
@@ -29,7 +27,8 @@ <h2>{$lang->cmd_send_message}</h2>
 		</li>
 		<li>
 			<label for="message_content">{$lang->content}</label>
-			<textarea id="message_content" name="new_content" rows="8" style="width:100%"></textarea>
+			<textarea name="new_content" style="display:none;"></textarea>
+			{$editor}
 		</li>
 		<li>
 			<span id="message_send_mail"><input type="checkbox" value="Y" name="send_mail" /> {$lang->cmd_send_mail}</span>
@@ -37,7 +36,7 @@ <h2>{$lang->cmd_send_message}</h2>
 	</ul>
 	<div class="bna">
 		<span class="fl"><a href="{getUrl('act', 'dispCommunicationMessages')}" class="bn white">{$lang->cmd_back}</a></span>
-		<span class="fr"><button type="button" class="bn white" onClick="mergeContents();">{$lang->cmd_send_message}</button></span>
+		<span class="fr"><button type="button" class="bn white" onClick="mergeContents({editor_sequence: '{$editor_sequence}'});">{$lang->cmd_send_message}</button></span>
 	</div>
 </form>
 
diff --git a/modules/communication/skins/default/send_message.html b/modules/communication/skins/default/send_message.html
index 1adf2984ee..aabf5cfd23 100644
--- a/modules/communication/skins/default/send_message.html
+++ b/modules/communication/skins/default/send_message.html
@@ -8,7 +8,8 @@ <h1>{$lang->cmd_send_message}</h1>
 	<form ruleset="sendMessage" action="./" method="post">
 		<input type="hidden" name="module" value="communication" />
 		<input type="hidden" name="act" value="procCommunicationSendMessage" />
-		<input type="hidden" name="content" value="{$source_message->content}" />
+		<input type="hidden" name="is_popup" value="Y" />
+		<input type="hidden" name="content" value="{$source_message->content|autoescape}" />
 		<input type="hidden" name="receiver_srl" value="{$receiver_info->member_srl}" />
 		<input type="hidden" name="xe_validator_id" value="modules/communication/skins/default/send_message/1" />
 		<table class="table table-striped table-hover">

From 4153dd3122449d7bc7947440572def532cd8b7df Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Tue, 11 Dec 2018 11:32:21 +0900
Subject: [PATCH 15/22] =?UTF-8?q?#2340=20=ED=9A=8C=EC=9B=90=20=EA=B0=80?=
 =?UTF-8?q?=EC=9E=85=20=ED=8F=BC=20=EC=84=A4=EC=A0=95=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EC=84=A0=ED=83=9D=20=EC=98=B5=EC=85=98=20=ED=95=AD=EB=AA=A9?=
 =?UTF-8?q?=EC=9D=98=20=EA=B0=92=EC=9D=B4=20=EC=9E=98=EB=AA=BB=20=ED=91=9C?=
 =?UTF-8?q?=EC=8B=9C=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EA=B3=A0?=
 =?UTF-8?q?=EC=B9=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/member/tpl/insert_join_form.html | 2 +-
 modules/member/tpl/js/signup_config.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/member/tpl/insert_join_form.html b/modules/member/tpl/insert_join_form.html
index e8765a4487..a344f6d84b 100644
--- a/modules/member/tpl/insert_join_form.html
+++ b/modules/member/tpl/insert_join_form.html
@@ -29,7 +29,7 @@ <h1>{$lang->cmd_input_extend_form}</h1>
 		<div class="x_control-group multiExample">
 			<label for="multiSelect" class="x_control-label"><em style="color:red">*</em> {$lang->options}</label>
 			<div class="x_controls">
-				<textarea rows="4" cols="42" id="multiSelect" name="default_value" style="vertical-align:top"><block cond="$default_value">{implode('<enter>', $default_value)}</block></textarea>
+				<textarea rows="4" cols="42" id="multiSelect" name="default_value" style="vertical-align:top"><block cond="$default_value">{implode('|@|', $default_value)}</block></textarea>
 				<p class="x_help-inline">{$lang->about_multi_type}</p>
 			</div>
 		</div>
diff --git a/modules/member/tpl/js/signup_config.js b/modules/member/tpl/js/signup_config.js
index 37619e1bb2..bcf7f7c57b 100644
--- a/modules/member/tpl/js/signup_config.js
+++ b/modules/member/tpl/js/signup_config.js
@@ -81,7 +81,7 @@ jQuery(function($){
 			'getMemberAdminInsertJoinForm',
 			{member_join_form_srl:memberFormSrl},
 			function(ret){
-				var tpl = ret.tpl.replace(/<enter>/g, '\n');
+				var tpl = ret.tpl.replace(/\|@\|/g, '\n');
 				$('#extendForm').html(tpl);
 
 				if (checked)$('#extendForm #radio_'+checked).attr('checked', 'checked');

From b242eeb661d8782e4290e83d60a2cf4b00468956 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Tue, 11 Dec 2018 12:03:14 +0900
Subject: [PATCH 16/22] Update Context.class.php

---
 classes/context/Context.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index b61bbacbb6..42e1698959 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -489,10 +489,10 @@ function loadDBInfo()
 
 		if(version_compare(PHP_VERSION, '7.0', '>='))
 		{
-			$db_info->master_db["db_type"] = preg_replace('/^mysql(_.+)$/', 'mysqli$1', $db_info->master_db["db_type"]);
+			$db_info->master_db["db_type"] = preg_replace('/^mysql(_.+)?$/', 'mysqli$1', $db_info->master_db["db_type"]);
 			foreach($db_info->slave_db as &$slave_db_info)
 			{
-				$slave_db_info["db_type"] = preg_replace('/^mysql(_.+)$/', 'mysqli$1', $slave_db_info["db_type"]);
+				$slave_db_info["db_type"] = preg_replace('/^mysql(_.+)?$/', 'mysqli$1', $slave_db_info["db_type"]);
 			}
 		}
 

From f7485254a66fdf55c0ca5455d4c079820998d231 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Wed, 12 Dec 2018 13:50:14 +0900
Subject: [PATCH 17/22] Force session.serialize_handler to 'php' if using DB
 session #2017 #2357

---
 classes/context/Context.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 42e1698959..3960963e26 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -336,6 +336,7 @@ function init()
 		{
 			$oSessionModel = getModel('session');
 			$oSessionController = getController('session');
+			ini_set('session.serialize_handler', 'php');
 			session_set_save_handler(
 					array(&$oSessionController, 'open'), array(&$oSessionController, 'close'), array(&$oSessionModel, 'read'), array(&$oSessionController, 'write'), array(&$oSessionController, 'destroy'), array(&$oSessionController, 'gc')
 			);

From e0aa8d07dee1a67330e1b6ffc99ec23ea3e457a3 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Tue, 11 Dec 2018 17:23:52 +0900
Subject: [PATCH 18/22] XEVE-18-006

---
 modules/document/document.controller.php | 14 +++---
 modules/document/document.model.php      |  2 +
 modules/document/tpl/checked_list.html   |  4 +-
 modules/editor/editor.controller.php     | 56 +++++++++++++-----------
 modules/editor/editor.model.php          | 28 +++++++++---
 5 files changed, 66 insertions(+), 38 deletions(-)

diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 1bcf3123fe..b2c03e27a3 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -1847,6 +1847,9 @@ function makeCategoryFile($module_srl)
 	{
 		// Return if there is no information you need for creating a cache file
 		if(!$module_srl) return false;
+
+		$module_srl = (int)$module_srl;
+
 		// Get module information (to obtain mid)
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'mid', 'site_srl');
@@ -2238,16 +2241,17 @@ function procDocumentManageCheckedDocument()
 		}
 
 		$type = Context::get('type');
-		$target_module = Context::get('target_module');
+		$target_module = Context::get('target_module_srl');
 		$module_srl = Context::get('module_srl');
 		if($target_module && !$module_srl) $module_srl = $target_module;
-		$category_srl = Context::get('target_category');
-		$message_content = Context::get('message_content');
+		$category_srl = Context::get('target_category_srl');
+		$message_content = strip_tags(Context::get('message_content'));
 		if($message_content) $message_content = nl2br($message_content);
 
 		$cart = Context::get('cart');
-		if(!is_array($cart)) $document_srl_list = explode('|@|', $cart);
-		else $document_srl_list = $cart;
+		$document_srl_list = (!is_array($cart)) ? explode('|@|', $cart) : $cart;
+
+		array_map(function ($value) { return (int)$value; }, $document_srl_list);
 
 		$document_srl_count = count($document_srl_list);
 
diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index 81405c7c3b..f14354a5fd 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -747,6 +747,8 @@ function getCategoryChlidCount($category_srl)
 	 */
 	function getCategoryList($module_srl, $columnList = array())
 	{
+		$module_srl = (int)$module_srl;
+
 		// Category of the target module file swollen
 		$filename = sprintf("%sfiles/cache/document_category/%s.php", _XE_PATH_, $module_srl);
 		// If the target file to the cache file regeneration category
diff --git a/modules/document/tpl/checked_list.html b/modules/document/tpl/checked_list.html
index 2814b3afb6..9add61a116 100644
--- a/modules/document/tpl/checked_list.html
+++ b/modules/document/tpl/checked_list.html
@@ -24,7 +24,7 @@ <h1>{$lang->cmd_manage_document}</h1>
 			<label class="x_control-label" for="_target_module">{$lang->move_target_module}</label>
 			<div class="x_controls">
 				<span class="x_input-append">
-					<input type="hidden" name="target_module" id="target_module" value="{$module_srl}" />
+					<input type="hidden" name="target_module_srl" id="target_module" value="{$module_srl}" />
 					<input type="text" name="_target_module" id="_target_module" value="{$mid}({$browser_title})" readonly="readonly" />
 					<a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="x_btn">{$lang->cmd_select}</a>
 				</span>
@@ -33,7 +33,7 @@ <h1>{$lang->cmd_manage_document}</h1>
 		<div class="x_control-group">
 			<label class="x_control-label" for="target_category">{$lang->category}</label>
 			<div class="x_controls">
-				<select id="target_category" name="target_category"></select>
+				<select id="target_category" name="target_category_srl"></select>
 			</div>
 		</div>
 		<div class="x_control-group">
diff --git a/modules/editor/editor.controller.php b/modules/editor/editor.controller.php
index 2700100e93..c40972bd1e 100644
--- a/modules/editor/editor.controller.php
+++ b/modules/editor/editor.controller.php
@@ -476,36 +476,32 @@ function makeCache($filter_enabled = true, $site_srl)
 		}
 
 		// Return if it checks enabled only
-		if($filter_enabled)
-		{
-			$cache_file = $oEditorModel->getCacheFile($filter_enabled, $site_srl);
-			$buff = sprintf('<?php if(!defined("__XE__")) exit(); $component_list = unserialize("%s"); ?>', str_replace('"','\\"',serialize($component_list)));
-			FileHandler::writeFile($cache_file, $buff);
-			return $component_list;
+		if(!$filter_enabled) {
+			// Get xml_info of downloaded list
+			foreach($downloaded_list as $component_name)
+			{
+				if(!is_dir(_XE_PATH_.'modules/editor/components/'.$component_name)) continue;
+				if(in_array($component_name, array('colorpicker_text','colorpicker_bg'))) continue;
+				// Pass if configured
+				if($component_list->{$component_name}) continue;
+				// Insert data into the DB
+				$oEditorController = getAdminController('editor');
+				$oEditorController->insertComponent($component_name, false, $site_srl);
+				// Add to component_list
+				unset($xml_info);
+				$xml_info = $oEditorModel->getComponentXmlInfo($component_name);
+				$xml_info->enabled = 'N';
+
+				$component_list->{$component_name} = $xml_info;
+			}
 		}
 
-		// Get xml_info of downloaded list
-		foreach($downloaded_list as $component_name)
-		{
-			if(!is_dir(_XE_PATH_.'modules/editor/components/'.$component_name)) continue;
-			if(in_array($component_name, array('colorpicker_text','colorpicker_bg'))) continue;
-			// Pass if configured
-			if($component_list->{$component_name}) continue;
-			// Insert data into the DB
-			$oEditorController = getAdminController('editor');
-			$oEditorController->insertComponent($component_name, false, $site_srl);
-			// Add to component_list
-			unset($xml_info);
-			$xml_info = $oEditorModel->getComponentXmlInfo($component_name);
-			$xml_info->enabled = 'N';
-
-			$component_list->{$component_name} = $xml_info;
+		$oCacheHandler = CacheHandler::getInstance('object', null, true);
+		if($oCacheHandler->isSupport()) {
+			$cache_key = $oEditorModel->getComponentListCacheKey($filter_enabled, $site_srl);
+			$oCacheHandler->put($cache_key, $component_list);
 		}
 
-		$cache_file = $oEditorModel->getCacheFile($filter_enabled, $site_srl);
-		$buff = sprintf('<?php if(!defined("__XE__")) exit(); $component_list = unserialize("%s"); ?>', str_replace('"','\\"',serialize($component_list)));
-		FileHandler::writeFile($cache_file, $buff);
-
 		return $component_list;
 	}
 
@@ -517,6 +513,14 @@ function removeCache($site_srl = 0)
 		$oEditorModel = getModel('editor');
 		FileHandler::removeFile($oEditorModel->getCacheFile(true, $site_srl));
 		FileHandler::removeFile($oEditorModel->getCacheFile(false, $site_srl));
+
+		$oCacheHandler = CacheHandler::getInstance('object', null, true);
+		if($oCacheHandler->isSupport()) {
+			$cache_key = $oEditorModel->getComponentListCacheKey(true, $site_srl);
+			$oCacheHandler->delete($cache_key);
+			$cache_key = $oEditorModel->getComponentListCacheKey(false, $site_srl);
+			$oCacheHandler->delete($cache_key);
+		}
 	}
 
 	function triggerCopyModule(&$obj)
diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php
index 0a5dc34084..ae7dcac25b 100644
--- a/modules/editor/editor.model.php
+++ b/modules/editor/editor.model.php
@@ -594,20 +594,38 @@ function getCacheFile($filter_enabled= true, $site_srl = 0)
 		return $cache_file;
 	}
 
+	function getComponentListCacheKey($filter_enabled = true, $site_srl = 0)
+	{
+		$cache_key = array();
+		$cache_key[] = Context::getLangType();
+		if ($filter_enabled) $cache_key[] = 'filter';
+		if ($site_srl) $cache_key[] = $site_srl;
+
+		return 'editor.component_list:' . implode('.', $cache_key);
+	}
+
 	/**
 	 * @brief Return a component list (DB Information included)
 	 */
 	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))
+		$component_list = false;
+
+		$oCacheHandler = CacheHandler::getInstance('object', null, true);
+		if($oCacheHandler->isSupport()) {
+			$cache_key = $this->getComponentListCacheKey(false, $site_srl);
+			$component_list = $oCacheHandler->get($cache_key);
+		}
+
+		if($from_db || $component_list === false)
 		{
 			$oEditorController = getController('editor');
-			$oEditorController->makeCache(false, $site_srl);
+			$component_list = $oEditorController->makeCache(false, $site_srl);
+
 		}
 
-		if(!file_exists($cache_file)) return;
-		include($cache_file);
+		if(!$component_list) return array();
+
 		$logged_info = Context::get('logged_info');
 		if($logged_info && is_array($logged_info->group_list))
 		{

From 87ace50629f89aff73418bc888cf4636f248b5ba Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Tue, 11 Dec 2018 18:43:11 +0900
Subject: [PATCH 19/22] XEVE-18-007

---
 classes/cache/CacheFile.class.php | 7 +++++--
 classes/context/Context.class.php | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/classes/cache/CacheFile.class.php b/classes/cache/CacheFile.class.php
index 7dcd5cea98..bbd222b1fa 100644
--- a/classes/cache/CacheFile.class.php
+++ b/classes/cache/CacheFile.class.php
@@ -73,10 +73,13 @@ function isSupport()
 	function put($key, $obj, $valid_time = 0)
 	{
 		$cache_file = $this->getCacheFileName($key);
+		$data = serialize($obj);
+		$data = str_replace('\\', '\\\\', $data);
+		$data = str_replace('\'', '\\\'', $data);
 		$content = array();
 		$content[] = '<?php';
 		$content[] = 'if(!defined(\'__XE__\')) { exit(); }';
-		$content[] = 'return \'' . addslashes(serialize($obj)) . '\';';
+		$content[] = 'return \'' . $data . '\';';
 		FileHandler::writeFile($cache_file, implode(PHP_EOL, $content));
 		if(function_exists('opcache_invalidate'))
 		{
@@ -131,7 +134,7 @@ function get($key, $modified_time = 0)
 
 		$content = include($cache_file);
 
-		return unserialize(stripslashes($content));
+		return unserialize($content);
 	}
 
 	/**
diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 3960963e26..0c9962f6ae 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -1297,6 +1297,7 @@ function _setJSONRequestArgument()
 
 		foreach($params as $key => $val)
 		{
+			$key = htmlentities($key);
 			$this->set($key, $this->_filterRequestVar($key, $val, 1), TRUE);
 		}
 	}

From 820dd4008a2de90ee3a98e1690d7cda830b3fe2d Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Tue, 11 Dec 2018 19:12:17 +0900
Subject: [PATCH 20/22] version 1.11.2

---
 config/config.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/config.inc.php b/config/config.inc.php
index 4caa8f7908..981ec4d167 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -29,7 +29,7 @@
 /**
  * Display XE's full version.
  */
-define('__XE_VERSION__', '1.11.1');
+define('__XE_VERSION__', '1.11.2');
 define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false));
 define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false));
 define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false));

From 60cd7a4902d7fc8c4978fa6558f42c82b4e0d311 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Fri, 14 Dec 2018 18:45:33 +0900
Subject: [PATCH 21/22] =?UTF-8?q?#2349=20=EC=82=AC=EC=9D=B4=ED=8A=B8?=
 =?UTF-8?q?=EB=A7=B5=20=EA=B4=80=EB=A6=AC=EC=97=90=EC=84=9C=20=ED=81=B4?=
 =?UTF-8?q?=EB=A6=AD=20=EC=8B=9C=20=EC=8A=A4=ED=81=AC=EB=A1=A4=ED=95=98?=
 =?UTF-8?q?=EB=8A=94=20=EB=8F=99=EC=9E=91=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/menu/tpl/sitemap.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/menu/tpl/sitemap.html b/modules/menu/tpl/sitemap.html
index 8c4ebe5996..c20fd0f051 100644
--- a/modules/menu/tpl/sitemap.html
+++ b/modules/menu/tpl/sitemap.html
@@ -870,9 +870,6 @@ <h1>{$lang->full_settings}</h1>
 		.bind("select_node.jstree", function(event, data){
 			// move scroll
 			var ul = $($("#siteMapTree").jstree("get_container")[0]);
-			ul.parent("div.cnt").stop().animate({
-				scrollTop: data.rslt.obj.offset().top - ul.offset().top
-			}, 800);
 
 			$("#siteMapTree input").blur();
 			//console.log($("#siteMapTree input"));

From 2b151577e230dca5728295e2752a9a969a4937b4 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Tue, 18 Dec 2018 14:08:18 +0900
Subject: [PATCH 22/22] =?UTF-8?q?#2337=20=EB=AA=A8=EB=B0=94=EC=9D=BC=20?=
 =?UTF-8?q?=EA=B8=B0=EA=B8=B0=EC=97=90=EC=84=9C=20=EC=82=AC=EC=9A=A9=20?=
 =?UTF-8?q?=EC=8B=9C=20=EC=97=90=EB=94=94=ED=84=B0=20=EB=86=92=EC=9D=B4=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.model.php                     | 3 +++
 modules/editor/styles/ckeditor_light/editor.css     | 2 +-
 modules/editor/styles/ckeditor_recommend/editor.css | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php
index ae7dcac25b..2248607ebe 100644
--- a/modules/editor/editor.model.php
+++ b/modules/editor/editor.model.php
@@ -228,6 +228,9 @@ function getEditor($upload_target_srl = 0, $option = null)
 		// Set Height
 		if(!$option->height) $editor_height = 300;
 		else $editor_height = $option->height;
+		if(Mobile::isFromMobilePhone()) {
+			$editor_height = 150;
+		}
 		// Skin Setting
 		$skin = $option->skin;
 		if(!$skin) $skin = 'ckeditor';
diff --git a/modules/editor/styles/ckeditor_light/editor.css b/modules/editor/styles/ckeditor_light/editor.css
index acfabdcd8a..bad41fdcee 100644
--- a/modules/editor/styles/ckeditor_light/editor.css
+++ b/modules/editor/styles/ckeditor_light/editor.css
@@ -1,7 +1,7 @@
 @charset "utf-8";
 /* NAVER (developers@xpressengine.com) */
 html { height: 100%; }
-body { min-height: 100%; }
+body { min-height: 100%; min-height: calc(100% - 16px); }
 .xe_content.editable {color:#000;font-size:13px;font-family:sans-serif;line-height:1.5;word-break:break-all;word-wrap:break-word}
 .xe_content.editable img{border:0;max-width:100%;}
 .xe_content.editable blockquote.q1,
diff --git a/modules/editor/styles/ckeditor_recommend/editor.css b/modules/editor/styles/ckeditor_recommend/editor.css
index 2cb84cbf81..9e6762b836 100644
--- a/modules/editor/styles/ckeditor_recommend/editor.css
+++ b/modules/editor/styles/ckeditor_recommend/editor.css
@@ -1,7 +1,7 @@
 @charset "utf-8";
 /* NAVER (developers@xpressengine.com) */
 html { height: 100%; }
-body { min-height: 100%; }
+body { min-height: 100%; min-height: calc(100% - 16px); }
 .xe_content.editable {color:#000;font-size:14px;font-family:sans-serif;line-height:1.6;word-break:break-all;word-wrap:break-word}
 .xe_content.editable img{border:0;max-width:100%;}
 .xe_content.editable blockquote.q1,