diff --git a/modules/member/conf/module.xml b/modules/member/conf/module.xml index a1b97788c..46847d0f9 100644 --- a/modules/member/conf/module.xml +++ b/modules/member/conf/module.xml @@ -14,8 +14,6 @@ - - @@ -46,6 +44,7 @@ + diff --git a/modules/member/member.class.php b/modules/member/member.class.php index a510546df..ee98e09b2 100644 --- a/modules/member/member.class.php +++ b/modules/member/member.class.php @@ -26,8 +26,6 @@ $oModuleController->insertActionForward('member', 'view', 'dispMemberFriend'); $oModuleController->insertActionForward('member', 'view', 'dispMemberAddFriend'); - $oModuleController->insertActionForward('member', 'view', 'dispMemberFriendGroup'); - $oModuleController->insertActionForward('member', 'view', 'dispMemberAddFriendGroup'); $oModuleController->insertActionForward('member', 'view', 'dispMemberAdminList'); $oModuleController->insertActionForward('member', 'view', 'dispMemberAdminConfig'); @@ -56,6 +54,7 @@ $oModuleController->insertActionForward('member', 'controller', 'procMemberDeleteMessages'); $oModuleController->insertActionForward('member', 'controller', 'procMemberAddFriend'); + $oModuleController->insertActionForward('member', 'controller', 'procMemberMoveFriend'); $oModuleController->insertActionForward('member', 'controller', 'procMemberDeleteFriend'); $oModuleController->insertActionForward('member', 'controller', 'procMemberAddFriendGroup'); $oModuleController->insertActionForward('member', 'controller', 'procMemberRenameFriendGroup'); diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index 5f6ed5dc4..16e1d8824 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -221,6 +221,25 @@ $this->setMessage('success_registed'); } + /** + * @brief 등록된 친구의 그룹 이동 + **/ + function procMemberMoveFriend() { + // 로그인 정보 체크 + if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged'); + $logged_info = Context::get('logged_info'); + + // 변수 정리 + $args->friend_srl = Context::get('friend_srl'); + $args->member_srl = $logged_info->member_srl; + $args->friend_group_srl = Context::get('friend_group_srl'); + + $output = executeQuery('member.moveFriend', $args); + if(!$output->toBool()) return $output; + + $this->setMessage('success_moved'); + } + /** * @brief 친구 삭제 **/ diff --git a/modules/member/member.view.php b/modules/member/member.view.php index f8d7f99d9..9e4923493 100644 --- a/modules/member/member.view.php +++ b/modules/member/member.view.php @@ -285,18 +285,6 @@ function dispMemberAddFriend() { } - /** - * @brief 친구 그룹 보기 - **/ - function dispMemberFriendGroup() { - } - - /** - * @brief 친구 목록 보기 - **/ - function dispMemberAddFriendGroup() { - } - /** * @brief 회원 목록 출력 **/ diff --git a/modules/member/queries/moveFriend.xml b/modules/member/queries/moveFriend.xml new file mode 100644 index 000000000..05e27a810 --- /dev/null +++ b/modules/member/queries/moveFriend.xml @@ -0,0 +1,10 @@ + + + + + + + + + +