From e445d78dcf1670d456ec37956c0d8106f706364c Mon Sep 17 00:00:00 2001
From: MinSoo Kim <misol.kr@gmail.com>
Date: Mon, 25 May 2015 20:06:38 +0900
Subject: [PATCH 1/3] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=EB=8F=84=20=EC=97=90=EB=94=94=ED=84=B0=EB=A5=BC=20?=
 =?UTF-8?q?=EC=93=B8=20=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=20=ED=95=A9?=
 =?UTF-8?q?=EB=8B=88=EB=8B=A4.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

현재는 모바일에서 작성시 nl2br 처리를 피해갈 수 없습니다. 변수(use_editor)를 추가하여 HTML 작성을 가능하게
합니다.
---
 modules/document/document.controller.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 56012a96e..57240f509 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -282,11 +282,14 @@ class documentController extends document
 		$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
 		if(Mobile::isFromMobilePhone())
 		{
-			if($obj->use_html != 'Y')
+			if($obj->use_editor != 'Y' && $obj->use_html != 'Y')
 			{
-				$obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
+				if($obj->use_html != 'Y')
+				{
+					$obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
+				}
+				$obj->content = nl2br($obj->content);
 			}
-			$obj->content = nl2br($obj->content);
 		}
 		// Remove iframe and script if not a top adminisrator in the session.
 		if($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content);
@@ -480,11 +483,14 @@ class documentController extends document
 		$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
 		if(Mobile::isFromMobilePhone())
 		{
-			if($obj->use_html != 'Y')
+			if($obj->use_editor != 'Y' && $obj->use_html != 'Y')
 			{
-				$obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
+				if($obj->use_html != 'Y')
+				{
+					$obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
+				}
+				$obj->content = nl2br($obj->content);
 			}
-			$obj->content = nl2br($obj->content);
 		}
 		// Change not extra vars but language code of the original document if document's lang_code is different from author's setting.
 		if($source_obj->get('lang_code') != Context::getLangType())

From a3e307a6d026d36e486105c7d137e834c73542a7 Mon Sep 17 00:00:00 2001
From: MinSoo Kim <misol.kr@gmail.com>
Date: Mon, 25 May 2015 20:12:18 +0900
Subject: [PATCH 2/3] =?UTF-8?q?=EC=9E=98=EB=AA=BB=20=EC=88=98=EC=A0=95?=
 =?UTF-8?q?=ED=95=9C=20=EC=A1=B0=EA=B1=B4=EC=8B=9D=EC=9D=84=20=EC=9D=98?=
 =?UTF-8?q?=EB=8F=84=EC=97=90=20=EB=A7=9E=EA=B2=8C=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/document/document.controller.php | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 57240f509..60fdb51f9 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -280,16 +280,13 @@ class documentController extends document
 		if($obj->title == '') $obj->title = 'Untitled';
 		// Remove XE's own tags from the contents.
 		$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
-		if(Mobile::isFromMobilePhone())
+		if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
 		{
-			if($obj->use_editor != 'Y' && $obj->use_html != 'Y')
+			if($obj->use_html != 'Y')
 			{
-				if($obj->use_html != 'Y')
-				{
-					$obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
-				}
-				$obj->content = nl2br($obj->content);
+				$obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 			}
+			$obj->content = nl2br($obj->content);
 		}
 		// Remove iframe and script if not a top adminisrator in the session.
 		if($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content);
@@ -481,16 +478,13 @@ class documentController extends document
 		if($obj->title == '') $obj->title = 'Untitled';
 		// Remove XE's own tags from the contents.
 		$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
-		if(Mobile::isFromMobilePhone())
+		if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
 		{
-			if($obj->use_editor != 'Y' && $obj->use_html != 'Y')
+			if($obj->use_html != 'Y')
 			{
-				if($obj->use_html != 'Y')
-				{
-					$obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
-				}
-				$obj->content = nl2br($obj->content);
+				$obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 			}
+			$obj->content = nl2br($obj->content);
 		}
 		// Change not extra vars but language code of the original document if document's lang_code is different from author's setting.
 		if($source_obj->get('lang_code') != Context::getLangType())

From f0ca8850163378ac1432dae2b2883e5e018f0aa9 Mon Sep 17 00:00:00 2001
From: MinSoo Kim <misol.kr@gmail.com>
Date: Wed, 3 Jun 2015 21:53:23 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=EB=8C=93=EA=B8=80=EC=97=90=EC=84=9C?=
 =?UTF-8?q?=EB=8F=84=20=EC=97=90=EB=94=94=ED=84=B0=EB=A5=BC=20=EC=93=B8=20?=
 =?UTF-8?q?=EC=88=98=20=EC=9E=88=EB=8A=94=20=EC=84=A4=EC=A0=95=EC=9D=84=20?=
 =?UTF-8?q?=EB=A7=8C=EB=93=A4=EC=96=B4=EB=91=A1=EB=8B=88=EB=8B=A4.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/comment/comment.controller.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php
index bed4696d9..f8f6365e6 100644
--- a/modules/comment/comment.controller.php
+++ b/modules/comment/comment.controller.php
@@ -318,7 +318,7 @@ class commentController extends comment
 		// remove XE's own tags from the contents
 		$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
 
-		if(Mobile::isFromMobilePhone())
+		if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
 		{
 			if($obj->use_html != 'Y')
 			{
@@ -721,7 +721,7 @@ class commentController extends comment
 		// remove XE's wn tags from contents
 		$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
 
-		if(Mobile::isFromMobilePhone())
+		if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
 		{
 			if($obj->use_html != 'Y')
 			{