From a0a2e2097c94e8a32d68c7b3830b5f3e1bda0b73 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Fri, 6 Apr 2018 01:04:03 +0900
Subject: [PATCH] =?UTF-8?q?StringUtil=20=EC=86=8C=EC=86=8C=ED=95=9C=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD,=20Json=20=ED=81=B4=EB=9E=98=EC=8A=A4?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=EB=B2=84=EB=A0=A4=EC=A7=84=20=ED=95=A8?=
 =?UTF-8?q?=EC=88=98=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/join_post.php        |  2 +-
 src/sammo/Json.php       |  4 ----
 src/sammo/StringUtil.php | 51 +++++++---------------------------------
 3 files changed, 10 insertions(+), 47 deletions(-)

diff --git a/hwe/join_post.php b/hwe/join_post.php
index 9d6068d3..59957e4d 100644
--- a/hwe/join_post.php
+++ b/hwe/join_post.php
@@ -44,7 +44,7 @@ $session = Session::requireLogin()->setReadOnly();
 //NOTE: 이 페이지에서는 세션에 데이터를 등록하지 않음. 로그인은 이후에.
 
 $name       = $_POST['name'];
-$name       = StringUtil::NoSpecialCharacter($name);
+$name       = StringUtil::removeSpecialCharacter($name);
 $pic        = (int)Util::array_get($_POST['pic'], 0);
 $character  = (int)Util::array_get($_POST['character'], 0);
 
diff --git a/src/sammo/Json.php b/src/sammo/Json.php
index e2f109fc..3c0d7d92 100644
--- a/src/sammo/Json.php
+++ b/src/sammo/Json.php
@@ -17,10 +17,6 @@ class Json{
         return json_encode($value, $rawFlag); 
     }
 
-    public static function encodePack($value, $pretty = false){
-
-    }
-
     public static function decode($value){
         return json_decode($value, true);
     }
diff --git a/src/sammo/StringUtil.php b/src/sammo/StringUtil.php
index 6f8e3d39..011a1d26 100644
--- a/src/sammo/StringUtil.php
+++ b/src/sammo/StringUtil.php
@@ -212,52 +212,19 @@ class StringUtil {
 
     public static function EscapeTag($str) {
         $str = htmlspecialchars($str);
-        $str = str_replace("\r\n", "<br>", $str);
-        $str = str_replace("\n", "<br>", $str);
+        $str = str_replace(["\r\n", "\r", "\n"], '<br>', $str);
 //        return nl2br(htmlspecialchars($str));
 //        return htmlspecialchars($str);
         return $str;
     }
 
-    public static function NoSpecialCharacter($str) {
-        $str = str_replace(" ", "", $str);
-        $str = str_replace("\"", "", $str);
-        $str = str_replace("'", "", $str);
-        $str = str_replace("ⓝ", "", $str);
-        $str = str_replace("ⓜ", "", $str);
-        $str = str_replace("ⓖ", "", $str);
-        $str = str_replace("\\", "", $str);
-        $str = str_replace("/", "", $str);
-        $str = str_replace("`", "", $str);
-        $str = str_replace("-", "", $str);
-        $str = str_replace("=", "", $str);
-        $str = str_replace("[", "", $str);
-        $str = str_replace("]", "", $str);
-        $str = str_replace(";", "", $str);
-        $str = str_replace(",", "", $str);
-        $str = str_replace(".", "", $str);
-        $str = str_replace("~", "", $str);
-        $str = str_replace("!", "", $str);
-        $str = str_replace("@", "", $str);
-        $str = str_replace("#", "", $str);
-        $str = str_replace("$", "", $str);
-        $str = str_replace("%", "", $str);
-        $str = str_replace("^", "", $str);
-        $str = str_replace("&", "", $str);
-        $str = str_replace("*", "", $str);
-        $str = str_replace("(", "", $str);
-        $str = str_replace(")", "", $str);
-        $str = str_replace("_", "", $str);
-        $str = str_replace("+", "", $str);
-        $str = str_replace("|", "", $str);
-        $str = str_replace("{", "", $str);
-        $str = str_replace("}", "", $str);
-        $str = str_replace(":", "", $str);
-        $str = str_replace("", "", $str);
-        $str = str_replace("<", "", $str);
-        $str = str_replace(">", "", $str);
-        $str = str_replace("?", "", $str);
-        $str = str_replace("　", "", $str);
-        return $str;
+    public static function removeSpecialCharacter($str) {
+        return str_replace([
+            ' ', '"', '\'', 'ⓝ', 'ⓜ', 'ⓖ', '\\', '/', '`', 
+            '-', '=', '[', ']', ';', ',', '.', '~', '!', '@', 
+            '#', '$', '%', '^', '&', '*', '(', ')', '_', '+', 
+            '|', '{', '}', ':', '', '<', '>', '?', '　'
+        ], '', $str);
     }
+
 }