From 0cf5888332ef2a0d0bbfce463dcc418662b2a4ff Mon Sep 17 00:00:00 2001
From: BJRambo <sosifam@070805.co.kr>
Date: Wed, 8 Jul 2015 07:11:57 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=ED=95=9C=EA=B8=80=EC=9D=84=20=EC=A0=95?=
 =?UTF-8?q?=EC=83=81=EC=A0=81=EC=9C=BC=EB=A1=9C=20=ED=95=84=ED=84=B0?=
 =?UTF-8?q?=EB=A7=81=ED=95=98=EC=A7=80=20=EB=AA=BB=ED=95=98=EB=8D=98=20?=
 =?UTF-8?q?=EB=AC=B8=EC=A0=9C=EC=A0=90=20=EA=B0=9C=EC=84=A0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 4384843e3..cd7a4a302 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -331,7 +331,7 @@ class memberController extends member
 		{
 			if(isset($args->{$val}))
 			{
-				$args->{$val} = preg_replace('/[\pZ\pC]+/', '', $args->{$val});
+				$args->{$val} = preg_replace('/[\pZ\pC]+/u', '', $args->{$val});
 			}
 		}
 		$output = $this->insertMember($args);
@@ -543,7 +543,7 @@ class memberController extends member
 		{
 			if(isset($args->{$val}))
 			{
-				$args->{$val} = preg_replace('/[\pZ\pC]+/', '', $args->{$val});
+				$args->{$val} = preg_replace('/[\pZ\pC]+/u', '', $args->{$val});
 			}
 		}
 

From 50f9250d7866efbbe44a9e1d39315d7691e3da32 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Wed, 8 Jul 2015 11:09:11 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EC=95=84=EC=9D=B4=EB=94=94/=EB=8B=89?=
 =?UTF-8?q?=EB=84=A4=EC=9E=84=20=ED=95=84=ED=84=B0=EB=A7=81=20=EB=B0=A9?=
 =?UTF-8?q?=EC=8B=9D=EC=9D=84=20=EB=8D=94=20=EC=9D=BC=EA=B4=80=EC=84=B1?=
 =?UTF-8?q?=EC=9E=88=EA=B2=8C=20=EA=B3=A0=EC=B9=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/member/member.admin.controller.php |  5 ++---
 modules/member/member.controller.php       | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index 13140c91c..1ef07603a 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -80,13 +80,12 @@ class memberAdminController extends member
 		}
 
 		// remove whitespace
-		$checkInfos = array('user_id', 'nick_name', 'email_address');
-		$replaceStr = array("\r\n", "\r", "\n", " ", "\t", "\xC2\xAD");
+		$checkInfos = array('user_id', 'user_name', 'nick_name', 'email_address');
 		foreach($checkInfos as $val)
 		{
 			if(isset($args->{$val}))
 			{
-				$args->{$val} = str_replace($replaceStr, '', $args->{$val});
+				$args->{$val} = preg_replace('/[\pZ\pC]+/u', '', $args->{$val});
 			}
 		}
 
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index cd7a4a302..2bac108e1 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -2137,14 +2137,19 @@ class memberController extends member
 		if($config->identifier == 'email_address')
 		{
 			$member_srl = $oMemberModel->getMemberSrlByEmailAddress($args->email_address);
-			if($member_srl&&$args->member_srl!=$member_srl) return new Object(-1,'msg_exists_email_address');
-
+			if($member_srl && $args->member_srl != $member_srl)
+			{
+				return new Object(-1,'msg_exists_email_address');
+			}
 			$args->email_address = $orgMemberInfo->email_address;
 		}
 		else
 		{
 			$member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id);
-			if($member_srl&&$args->member_srl!=$member_srl) return new Object(-1,'msg_exists_user_id');
+			if($member_srl && $args->member_srl != $member_srl)
+			{
+				return new Object(-1,'msg_exists_user_id');
+			}
 
 			$args->user_id = $orgMemberInfo->user_id;
 		}
@@ -2157,7 +2162,7 @@ class memberController extends member
 
 		// Check if ID is duplicate
 		$member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id);
-		if($member_srl && $orgMemberInfo->user_id != $args->user_id)
+		if($member_srl && $args->member_srl != $member_srl)
 		{
 			return new Object(-1,'msg_exists_user_id');
 		}
@@ -2170,7 +2175,7 @@ class memberController extends member
 
 		// Check if nickname is duplicate
 		$member_srl = $oMemberModel->getMemberSrlByNickName($args->nick_name);
- 		if($member_srl && $orgMemberInfo->nick_name != $args->nick_name)
+ 		if($member_srl && $args->member_srl != $member_srl)
  		{
  			return new Object(-1,'msg_exists_nick_name');
  		}