diff --git a/modules/member/lang/ko.php b/modules/member/lang/ko.php
index a1b10736d..6fb2a4485 100644
--- a/modules/member/lang/ko.php
+++ b/modules/member/lang/ko.php
@@ -367,3 +367,4 @@ $lang->scrap_folder_create = '폴더 추가';
$lang->scrap_folder_rename = '이름 변경';
$lang->scrap_folder_delete = '삭제';
$lang->member_unauthenticated = '미인증';
+$lang->member_number = '회원 번호';
diff --git a/modules/member/member.model.php b/modules/member/member.model.php
index 82c16d4bf..151bf980b 100644
--- a/modules/member/member.model.php
+++ b/modules/member/member.model.php
@@ -1247,10 +1247,44 @@ class memberModel extends member
function getMemberModifyNicknameLog($page = 1, $member_srl = null)
{
+ $search_keyword = Context::get('search_keyword');
+ $search_target = Context::get('search_target');
+
+ // $this->user 에 재대로 된 회원 정보가 들어 가지 않음.
+ $logged_info = Context::get('logged_info');
+
$args = new stdClass();
- $args->member_srl = $member_srl;
$args->page = $page;
- $output = executeQueryArray('member.getMemberModifyNickName', $args);
+ if($logged_info->is_admin == 'Y')
+ {
+ if($search_keyword && $search_keyword)
+ {
+ switch ($search_target)
+ {
+ case "before":
+ $args->before_nick_name = $search_keyword;
+ break;
+ case "after":
+ $args->after_nick_name = $search_keyword;
+ break;
+ case "user_id":
+ if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+ $args->user_id = $search_keyword;
+ break;
+ case "member_srl":
+ $args->member_srl = intval($search_keyword);
+ break;
+ default:
+ break;
+ }
+ $output = executeQuery('member.getMemberModifyNickName', $args);
+
+ return $output;
+ }
+ }
+
+ $args->member_srl = $member_srl;
+ $output = executeQuery('member.getMemberModifyNickName', $args);
return $output;
}
diff --git a/modules/member/queries/getMemberModifyNickName.xml b/modules/member/queries/getMemberModifyNickName.xml
index ded6b8b64..46a9ba2bd 100644
--- a/modules/member/queries/getMemberModifyNickName.xml
+++ b/modules/member/queries/getMemberModifyNickName.xml
@@ -7,6 +7,9 @@
+
+
+
diff --git a/modules/member/tpl/nick_name_log.html b/modules/member/tpl/nick_name_log.html
index 5e76c71ef..f113402f7 100644
--- a/modules/member/tpl/nick_name_log.html
+++ b/modules/member/tpl/nick_name_log.html
@@ -27,6 +27,19 @@
+
+
+