From 73f535929410185e42e50e8fd37312ec18eccaa6 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Wed, 6 May 2015 10:33:11 +0900
Subject: [PATCH] =?UTF-8?q?insertMember=20=EB=A9=94=EC=86=8C=EB=93=9C=20?=
 =?UTF-8?q?=EB=82=B4=20=EC=BD=94=EB=94=A9=EC=8A=A4=ED=83=80=EC=9D=BC?=
 =?UTF-8?q?=EC=9D=84=20=EC=A0=95=EB=A6=AC=ED=95=98=EC=97=AC=20=EB=B3=B4?=
 =?UTF-8?q?=EA=B8=B0=20=EC=89=BD=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.controller.php | 45 ++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 21867570e..20e325794 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -1984,16 +1984,17 @@ class memberController extends member
 		}
 
 		list($args->email_id, $args->email_host) = explode('@', $args->email_address);
+
 		// Website, blog, checks the address
 		if($args->homepage && !preg_match("/^[a-z]+:\/\//i",$args->homepage)) $args->homepage = 'http://'.$args->homepage;
 		if($args->blog && !preg_match("/^[a-z]+:\/\//i",$args->blog)) $args->blog = 'http://'.$args->blog;
+
 		// Create a model object
 		$oMemberModel = getModel('member');
 
-		// ID check is prohibited
+		// Check password strength
 		if($args->password && !$password_is_hashed)
 		{
-			// check password strength
 			if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
 			{
 				$message = Context::getLang('about_password_strength');
@@ -2001,22 +2002,43 @@ class memberController extends member
 			}
 			$args->password = $oMemberModel->hashPassword($args->password);
 		}
-		elseif(!$args->password) unset($args->password);
-		if($oMemberModel->isDeniedID($args->user_id)) return new Object(-1,'denied_user_id');
-		// ID, nickname, email address of the redundancy check
-		$member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id);
-		if($member_srl) return new Object(-1,'msg_exists_user_id');
+		elseif(!$args->password)
+		{
+			unset($args->password);
+		}
 
-		// nickname check is prohibited
+		// Check if ID is prohibited
+		if($oMemberModel->isDeniedID($args->user_id))
+		{
+			return new Object(-1,'denied_user_id');
+		}
+
+		// Check if ID is duplicate
+		$member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id);
+		if($member_srl)
+		{
+			return new Object(-1,'msg_exists_user_id');
+		}
+
+		// Check if nickname is prohibited
 		if($oMemberModel->isDeniedNickName($args->nick_name))
 		{
 			return new Object(-1,'denied_nick_name');
 		}
-		$member_srl = $oMemberModel->getMemberSrlByNickName($args->nick_name);
-		if($member_srl) return new Object(-1,'msg_exists_nick_name');
 
+		// Check if nickname is duplicate
+		$member_srl = $oMemberModel->getMemberSrlByNickName($args->nick_name);
+		if($member_srl)
+		{
+			return new Object(-1,'msg_exists_nick_name');
+		}
+
+		// Check if email address is duplicate
 		$member_srl = $oMemberModel->getMemberSrlByEmailAddress($args->email_address);
-		if($member_srl) return new Object(-1,'msg_exists_email_address');
+		if($member_srl)
+		{
+			return new Object(-1,'msg_exists_email_address');
+		}
 
 		// Insert data into the DB
 		$args->list_order = -1 * $args->member_srl;
@@ -2024,7 +2046,6 @@ class memberController extends member
 		$args->homepage = htmlspecialchars($args->homepage, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		$args->blog = htmlspecialchars($args->blog, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 
-
 		if(!$args->user_id) $args->user_id = 't'.$args->member_srl;
 		if(!$args->user_name) $args->user_name = $args->member_srl;