From b537875f0ea13e34e8678f5f446d0e034e46e199 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 3 Apr 2007 10:58:41 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@937
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/member/conf/module.xml        |  3 +--
 modules/member/member.class.php       |  3 +--
 modules/member/member.controller.php  | 19 +++++++++++++++++++
 modules/member/member.view.php        | 12 ------------
 modules/member/queries/moveFriend.xml | 10 ++++++++++
 5 files changed, 31 insertions(+), 16 deletions(-)
 create mode 100644 modules/member/queries/moveFriend.xml

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 @@
 
         <action name="dispMemberFriend" type="view" standalone="true" />
         <action name="dispMemberAddFriend" type="view" standalone="true" />
-        <action name="dispMemberFriendGroup" type="view" standalone="true" />
-        <action name="dispMemberAddFriendGroup" type="view" standalone="true" />
 
         <action name="dispMemberAdminList" type="view" standalone="true" index="true" admin_index="true" />
         <action name="dispMemberAdminConfig" type="view" standalone="true" />
@@ -46,6 +44,7 @@
         <action name="procMemberDeleteMessages" type="controller" standalone="true" />
 
         <action name="procMemberAddFriend" type="controller" standalone="true" />
+        <action name="procMemberMoveFriend" type="controller" standalone="true" />
         <action name="procMemberDeleteFriend" type="controller" standalone="true" />
 
         <action name="procMemberAddFriendGroup" type="controller" standalone="true" />
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 @@
+<query id="moveFriend" action="update">
+    <tables>
+        <table name="member_friend" />
+    </tables>
+    <columns>
+        <column name="friend_srl" var="friend_srl" notnull="notnull" />
+        <column name="friend_group_srl" var="friend_group_srl" default="0" notnull="notnull" />
+        <column name="member_srl" var="member_srl" notnull="notnull" />
+    </columns>
+</query>