diff --git a/modules/member/conf/module.xml b/modules/member/conf/module.xml index d7d7c9550..b8670f010 100644 --- a/modules/member/conf/module.xml +++ b/modules/member/conf/module.xml @@ -32,6 +32,7 @@ + diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php index a2a3e4b5a..954fd81da 100644 --- a/modules/member/member.admin.view.php +++ b/modules/member/member.admin.view.php @@ -679,6 +679,20 @@ class memberAdminView extends member } $this->setTemplateFile('insert_join_form'); } + + function dispMemberAdminNickNameLog() + { + $page = Context::get('page'); + $output = getModel('member')->getMemberModifyNicknameLog($page); + + Context::set('total_count', $output->total_count); + Context::set('total_page', $output->total_page); + Context::set('page', $output->page); + Context::set('nickname_list', $output->data); + Context::set('page_navigation', $output->page_navigation); + + $this->setTemplateFile('nick_name_log'); + } } /* End of file member.admin.view.php */ /* Location: ./modules/member/member.admin.view.php */ diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index 38b90874c..3de91d867 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -1897,7 +1897,7 @@ class memberController extends member $this->addMemberMenu( 'dispMemberScrappedDocument', 'cmd_view_scrapped_document'); $this->addMemberMenu( 'dispMemberSavedDocument', 'cmd_view_saved_document'); $this->addMemberMenu( 'dispMemberOwnDocument', 'cmd_view_own_document'); - if($config->update_nick_log == 'Y') + if($config->update_nickname_log == 'Y') { $this->addMemberMenu( 'dispMemberModifyNicknameLog', 'cmd_modify_nickname_log'); } @@ -2401,7 +2401,7 @@ class memberController extends member } else { - if($args->nick_name != $orgMemberInfo->nick_name && $config->update_nick_log == 'Y') + if($args->nick_name != $orgMemberInfo->nick_name && $config->update_nickname_log == 'Y') { $log_args = new stdClass(); $log_args->member_srl = $args->member_srl; diff --git a/modules/member/member.model.php b/modules/member/member.model.php index 01750966f..dc7d6aed4 100644 --- a/modules/member/member.model.php +++ b/modules/member/member.model.php @@ -1218,6 +1218,16 @@ class memberModel extends member } return $groupSrl; } + + function getMemberModifyNicknameLog($page = 1, $member_srl = null) + { + $args = new stdClass(); + $args->member_srl = $member_srl; + $args->page = $page; + $output = executeQueryArray('member.getMemberModifyNickName', $args); + + return $output; + } } /* End of file member.model.php */ /* Location: ./modules/member/member.model.php */ diff --git a/modules/member/member.view.php b/modules/member/member.view.php index 09241b3ad..9cae49896 100644 --- a/modules/member/member.view.php +++ b/modules/member/member.view.php @@ -709,10 +709,8 @@ class memberView extends member } } - $args = new stdClass(); - $args->member_srl = $member_srl; - $args->page = Context::get('page'); - $output = executeQuery('member.getMemberModifyNickName', $args); + $page = Context::get('page'); + $output = getModel('member')->getMemberModifyNicknameLog($page, $member_srl); Context::set('total_count', $output->page_navigation->total_count); Context::set('total_page', $output->page_navigation->total_page); diff --git a/modules/member/queries/getMemberModifyNickName.xml b/modules/member/queries/getMemberModifyNickName.xml index c3162f109..ded6b8b64 100644 --- a/modules/member/queries/getMemberModifyNickName.xml +++ b/modules/member/queries/getMemberModifyNickName.xml @@ -6,7 +6,7 @@ - + @@ -14,4 +14,4 @@ - \ No newline at end of file + diff --git a/modules/member/tpl/header.html b/modules/member/tpl/header.html index 98dba615e..cf2d0a07e 100644 --- a/modules/member/tpl/header.html +++ b/modules/member/tpl/header.html @@ -10,6 +10,7 @@
  • {$lang->cmd_signup}
  • {$lang->cmd_login}
  • {$lang->cmd_set_design_info}
  • +
  • {$lang->cmd_modify_nickname_log}