From a1884ff568ac0ac8bdb621c8a363046b3ed98b83 Mon Sep 17 00:00:00 2001
From: BJRambo <sosifam@070805.co.kr>
Date: Tue, 5 Jul 2016 15:42:32 +0900
Subject: [PATCH 1/2] Fix not to output the encrypted password

---
 modules/member/member.admin.controller.php | 40 ++++++++++++++--------
 modules/member/tpl/insert_member.html      |  1 -
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index b57fd2688..45051ccfc 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -47,10 +47,31 @@ class memberAdminController extends member
 		{
 			$args->{$val} = Context::get($val);
 		}
-		$args->member_srl = Context::get('member_srl');
-		if(Context::get('reset_password'))
-			$args->password = Context::get('reset_password');
-		else unset($args->password);
+		$member_srl = Context::get('member_srl');
+		// Check if an original member exists having the member_srl
+		$args->member_srl = $member_srl;
+		if($args->member_srl)
+		{
+			// Create a member model object
+			$oMemberModel = getModel('member');
+			// Get memebr profile
+			$columnList = array('member_srl', 'user_id', 'password');
+			$member_info = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl, 0, $columnList);
+			// If no original member exists, make a new one
+			if($member_info->member_srl != $member_srl)
+			{
+				unset($args->member_srl);
+			}
+
+			if(Context::get('reset_password'))
+			{
+				$args->password = Context::get('reset_password');
+			}
+			else
+			{
+				unset($args->password);
+			}
+		}
 
 		// Remove some unnecessary variables from all the vars
 		$all_args = Context::getRequestVars();
@@ -67,17 +88,6 @@ class memberAdminController extends member
 		// Add extra vars after excluding necessary information from all the requested arguments
 		$extra_vars = delObjectVars($all_args, $args);
 		$args->extra_vars = serialize($extra_vars);
-		// Check if an original member exists having the member_srl
-		if($args->member_srl)
-		{
-			// Create a member model object
-			$oMemberModel = getModel('member');
-			// Get memebr profile
-			$columnList = array('member_srl');
-			$member_info = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl, 0, $columnList);
-			// If no original member exists, make a new one
-			if($member_info->member_srl != $args->member_srl) unset($args->member_srl);
-		}
 
 		// remove whitespace
 		$checkInfos = array('user_id', 'user_name', 'nick_name', 'email_address');
diff --git a/modules/member/tpl/insert_member.html b/modules/member/tpl/insert_member.html
index 552c3d62d..861826f18 100644
--- a/modules/member/tpl/insert_member.html
+++ b/modules/member/tpl/insert_member.html
@@ -36,7 +36,6 @@
 	<div cond="$member_srl" class="x_control-group">
 		<label class="x_control-label" for="password"><em style="color:red">*</em> {$lang->password}</label>
 		<div class="x_controls">
-			<input type="hidden" name="password" value="{$member_info->password}" />
 			<input id="password" type="text" name="reset_password" value="" />
 		</div>
 	</div>

From b37ba29696db0d620eff766d9d9773e4fbedae86 Mon Sep 17 00:00:00 2001
From: BJRambo <sosifam@070805.co.kr>
Date: Tue, 5 Jul 2016 15:45:59 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20?=
 =?UTF-8?q?=EC=B9=BC=EB=9F=BC=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=A0=9C?=
 =?UTF-8?q?=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/member/member.admin.controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index 45051ccfc..df1ea43dc 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -55,7 +55,7 @@ class memberAdminController extends member
 			// Create a member model object
 			$oMemberModel = getModel('member');
 			// Get memebr profile
-			$columnList = array('member_srl', 'user_id', 'password');
+			$columnList = array('member_srl');
 			$member_info = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl, 0, $columnList);
 			// If no original member exists, make a new one
 			if($member_info->member_srl != $member_srl)