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

---
 modules/member/conf/module.xml                   | 12 ++++++++++++
 modules/member/member.class.php                  | 11 +++++++++++
 modules/member/member.controller.php             | 16 ++++++++--------
 modules/member/member.model.php                  | 10 +++++-----
 modules/member/member.view.php                   | 10 ++++++++--
 .../queries/{addFriends.xml => addFriend.xml}    |  8 ++++----
 modules/member/queries/addFriendGroup.xml        |  4 ++--
 modules/member/queries/deleteFriend.xml          |  9 +++++++++
 modules/member/queries/deleteFriendGroup.xml     |  4 ++--
 modules/member/queries/deleteFriends.xml         |  9 ---------
 modules/member/queries/getFriends.xml            | 10 +++++-----
 modules/member/queries/getFriendsGroups.xml      |  4 ++--
 modules/member/queries/renameFriendGroup.xml     |  4 ++--
 13 files changed, 70 insertions(+), 41 deletions(-)
 rename modules/member/queries/{addFriends.xml => addFriend.xml} (55%)
 create mode 100644 modules/member/queries/deleteFriend.xml
 delete mode 100644 modules/member/queries/deleteFriends.xml

diff --git a/modules/member/conf/module.xml b/modules/member/conf/module.xml
index a16630983..a1b97788c 100644
--- a/modules/member/conf/module.xml
+++ b/modules/member/conf/module.xml
@@ -12,6 +12,11 @@
         <action name="dispMemberSendMessage" type="view" standalone="true" />
         <action name="dispMemberNewMessage" type="view" standalone="true" />
 
+        <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" />
         <action name="dispMemberAdminInsert" type="view" standalone="true" />
@@ -40,6 +45,13 @@
         <action name="procMemberDeleteMessage" type="controller" standalone="true" />
         <action name="procMemberDeleteMessages" type="controller" standalone="true" />
 
+        <action name="procMemberAddFriend" type="controller" standalone="true" />
+        <action name="procMemberDeleteFriend" type="controller" standalone="true" />
+
+        <action name="procMemberAddFriendGroup" type="controller" standalone="true" />
+        <action name="procMemberRenameFriendGroup" type="controller" standalone="true" />
+        <action name="procMemberDeleteFriendGroup" type="controller" standalone="true" />
+
         <action name="procMemberAdminInsert" type="controller" standalone="true" />
         <action name="procMemberAdminDelete" type="controller" standalone="true" />
         <action name="procMemberAdminInsertConfig" type="controller" standalone="true" />
diff --git a/modules/member/member.class.php b/modules/member/member.class.php
index 3f2e42b16..a510546df 100644
--- a/modules/member/member.class.php
+++ b/modules/member/member.class.php
@@ -24,6 +24,11 @@
             $oModuleController->insertActionForward('member', 'view', 'dispMemberSendMessage');
             $oModuleController->insertActionForward('member', 'view', 'dispMemberNewMessage');
 
+            $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');
             $oModuleController->insertActionForward('member', 'view', 'dispMemberAdminInsert');
@@ -50,6 +55,12 @@
             $oModuleController->insertActionForward('member', 'controller', 'procMemberDeleteMessage');
             $oModuleController->insertActionForward('member', 'controller', 'procMemberDeleteMessages');
 
+            $oModuleController->insertActionForward('member', 'controller', 'procMemberAddFriend');
+            $oModuleController->insertActionForward('member', 'controller', 'procMemberDeleteFriend');
+            $oModuleController->insertActionForward('member', 'controller', 'procMemberAddFriendGroup');
+            $oModuleController->insertActionForward('member', 'controller', 'procMemberRenameFriendGroup');
+            $oModuleController->insertActionForward('member', 'controller', 'procMemberDeleteFriendGroup');
+
             $oModuleController->insertActionForward('member', 'controller', 'procMemberAdminInsert');
             $oModuleController->insertActionForward('member', 'controller', 'procMemberAdminDelete');
             $oModuleController->insertActionForward('member', 'controller', 'procMemberAdminInsertConfig');
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 9a7f32d89..5f6ed5dc4 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -210,12 +210,12 @@
             $logged_info = Context::get('logged_info');
 
             // 변수 정리
-            $args->friends_srl = getNextSequence();
-            $args->list_order = $args->friends_srl * -1;
-            $args->friends_group_srl = Context::get('friends_group_srl');
+            $args->friend_srl = getNextSequence();
+            $args->list_order = $args->friend_srl * -1;
+            $args->friend_group_srl = Context::get('friend_group_srl');
             $args->member_srl = $logged_info->member_srl;
             $args->target_srl = Context::get('target_srl');
-            $output = executeQuery('member.addFriends', $args);
+            $output = executeQuery('member.addFriend', $args);
             if(!$output->toBool()) return $output;
 
             $this->setMessage('success_registed');
@@ -230,9 +230,9 @@
             $logged_info = Context::get('logged_info');
 
             // 변수 정리
-            $args->friends_srl = Context::get('friends_srl');
+            $args->friend_srl = Context::get('friend_srl');
             $args->member_srl = $logged_info->member_srl;
-            $output = executeQuery('member.deleteFriends', $args);
+            $output = executeQuery('member.deleteFriend', $args);
             if(!$output->toBool()) return $output;
 
             $this->setMessage('success_deleted');
@@ -266,7 +266,7 @@
             $logged_info = Context::get('logged_info');
 
             // 변수 정리
-            $args->friends_group_srl= Context::get('friends_group_srl');
+            $args->friend_group_srl= Context::get('friend_group_srl');
             $args->member_srl = $logged_info->member_srl;
             $args->title = Context::get('title');
             if(!$args->title) return new Object(-1, 'msg_invalid_request');
@@ -286,7 +286,7 @@
             $logged_info = Context::get('logged_info');
 
             // 변수 정리
-            $args->friends_group_srl = Context::get('friends_group_srl');
+            $args->friend_group_srl = Context::get('friend_group_srl');
             $args->member_srl = $logged_info->member_srl;
             $output = executeQuery('member.deleteFriendGroup', $args);
             if(!$output->toBool()) return $output;
diff --git a/modules/member/member.model.php b/modules/member/member.model.php
index 2cd8db02a..76ab730a1 100644
--- a/modules/member/member.model.php
+++ b/modules/member/member.model.php
@@ -568,15 +568,15 @@
         /**
          * @brief 친구 목록 가져오기
          **/
-        function getFriends($friends_group_srl = 0) {
+        function getFriend($friend_group_srl = 0) {
             $logged_info = Context::get('logged_info');
 
-            $args->friends_group_srl = $friends_group_srl;
+            $args->friend_group_srl = $friend_group_srl;
             $args->member_srl = $logged_info->member_srl;
 
             // 기타 변수들 정리
             $args->page = Context::get('page');
-            $args->sort_index = 'friends.list_order';
+            $args->sort_index = 'friend.list_order';
             $args->list_count = 10;
             $args->page_count = 10;
             return executeQuery('member.getMessages', $args);
@@ -586,12 +586,12 @@
         /**
          * @brief 그룹 목록 가져오기
          **/
-        function getFriendsGroups() {
+        function getFriendGroups() {
             $logged_info = Context::get('logged_info');
 
             $args->member_srl = $logged_info->member_srl;
 
-            return executeQuery('member.getFriendsGroups', $args);
+            return executeQuery('member.getFriendGroups', $args);
         }
     }
 ?>
diff --git a/modules/member/member.view.php b/modules/member/member.view.php
index 801e42722..f8d7f99d9 100644
--- a/modules/member/member.view.php
+++ b/modules/member/member.view.php
@@ -276,7 +276,7 @@
         /**
          * @brief 친구 목록 보기
          **/
-        function dispMemberFriends() {
+        function dispMemberFriend() {
         }
 
         /**
@@ -286,11 +286,17 @@
         }
 
         /**
-         * @brief 친구 그룹 추가
+         * @brief 친구 그룹 보기
          **/
         function dispMemberFriendGroup() {
         }
 
+        /**
+         * @brief 친구 목록 보기
+         **/
+        function dispMemberAddFriendGroup() {
+        }
+
         /**
          * @brief 회원 목록 출력
          **/
diff --git a/modules/member/queries/addFriends.xml b/modules/member/queries/addFriend.xml
similarity index 55%
rename from modules/member/queries/addFriends.xml
rename to modules/member/queries/addFriend.xml
index 7807d9433..2ee71cadc 100644
--- a/modules/member/queries/addFriends.xml
+++ b/modules/member/queries/addFriend.xml
@@ -1,10 +1,10 @@
-<query id="addFriends" action="insert">
+<query id="addFriend" action="insert">
     <tables>
-        <table name="member_friends" />
+        <table name="member_friend" />
     </tables>
     <columns>
-        <column name="friends_srl" var="friends_srl" notnull="notnull" />
-        <column name="friends_group_srl" var="friends_group_srl" default="0" notnull="notnull" />
+        <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" />
         <column name="target_srl" var="target_srl" notnull="notnull" />
         <column name="list_order" var="list_order" />
diff --git a/modules/member/queries/addFriendGroup.xml b/modules/member/queries/addFriendGroup.xml
index c547d2998..f03307dc6 100644
--- a/modules/member/queries/addFriendGroup.xml
+++ b/modules/member/queries/addFriendGroup.xml
@@ -1,9 +1,9 @@
 <query id="addFriendGroup" action="insert">
     <tables>
-        <table name="member_friends_group" />
+        <table name="member_friend_group" />
     </tables>
     <columns>
-        <column name="friends_group_srl" var="friends_group_srl" default="sequence()" notnull="notnull" />
+        <column name="friend_group_srl" var="friend_group_srl" default="sequence()" notnull="notnull" />
         <column name="member_srl" var="member_srl" notnull="notnull" />
         <column name="title" var="title" notnull="notnull" />
         <column name="regdate" default="curdate()" />
diff --git a/modules/member/queries/deleteFriend.xml b/modules/member/queries/deleteFriend.xml
new file mode 100644
index 000000000..169197004
--- /dev/null
+++ b/modules/member/queries/deleteFriend.xml
@@ -0,0 +1,9 @@
+<query id="deleteFriend" action="delete">
+    <tables>
+        <table name="member_friend" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="friend_srl" var="friend_srl" notnull="notnull" filter="number" />
+        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/member/queries/deleteFriendGroup.xml b/modules/member/queries/deleteFriendGroup.xml
index f25c631c4..f4676360c 100644
--- a/modules/member/queries/deleteFriendGroup.xml
+++ b/modules/member/queries/deleteFriendGroup.xml
@@ -1,9 +1,9 @@
 <query id="deleteFriendGroup" action="delete">
     <tables>
-        <table name="member_friends_gruop" />
+        <table name="member_friend_gruop" />
     </tables>
     <conditions>
-        <condition operation="equal" column="friends_group_srl" var="friends_group_srl" notnull="notnull" filter="number" />
+        <condition operation="equal" column="friend_group_srl" var="friend_group_srl" notnull="notnull" filter="number" />
         <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number" pipe="and" />
     </conditions>
 </query>
diff --git a/modules/member/queries/deleteFriends.xml b/modules/member/queries/deleteFriends.xml
deleted file mode 100644
index c77b09668..000000000
--- a/modules/member/queries/deleteFriends.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<query id="deleteFriends" action="delete">
-    <tables>
-        <table name="member_friends" />
-    </tables>
-    <conditions>
-        <condition operation="equal" column="friends_srl" var="friends_srl" notnull="notnull" filter="number" />
-        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number" pipe="and" />
-    </conditions>
-</query>
diff --git a/modules/member/queries/getFriends.xml b/modules/member/queries/getFriends.xml
index 619177486..72cf2c07b 100644
--- a/modules/member/queries/getFriends.xml
+++ b/modules/member/queries/getFriends.xml
@@ -1,15 +1,15 @@
-<query id="getFriends" action="select">
+<query id="getFriend" action="select">
     <tables>
-        <table name="member_friends" alias="friends" />
+        <table name="member_friend" alias="friend" />
         <table name="member" alias="member" />
     </tables>
     <columns>
         <column name="*" />
     </columns>
     <conditions>
-        <condition operation="equal" column="friends.friends_group_srl" var="friends_group_srl" />
-        <condition operation="equal" column="friends.member_srl" var="member_srl" pipe="and" />
-        <condition operation="equal" column="member.member_srl" var="friends.target_srl" pipe="and" />
+        <condition operation="equal" column="friend.friend_group_srl" var="friend_group_srl" />
+        <condition operation="equal" column="friend.member_srl" var="member_srl" pipe="and" />
+        <condition operation="equal" column="member.member_srl" var="friend.target_srl" pipe="and" />
     </conditions>
     <navigation>
         <index var="sort_index" order="asc" />
diff --git a/modules/member/queries/getFriendsGroups.xml b/modules/member/queries/getFriendsGroups.xml
index 1eef8985b..6c649088a 100644
--- a/modules/member/queries/getFriendsGroups.xml
+++ b/modules/member/queries/getFriendsGroups.xml
@@ -1,6 +1,6 @@
-<query id="getFriendsGroups" action="select">
+<query id="getFriendGroups" action="select">
     <tables>
-        <table name="member_friends_group" />
+        <table name="member_friend_group" />
     </tables>
     <columns>
         <column name="*" />
diff --git a/modules/member/queries/renameFriendGroup.xml b/modules/member/queries/renameFriendGroup.xml
index 4e8b1dd2d..3a28d8f3e 100644
--- a/modules/member/queries/renameFriendGroup.xml
+++ b/modules/member/queries/renameFriendGroup.xml
@@ -1,12 +1,12 @@
 <query id="renameFriendGroup" action="update">
     <tables>
-        <table name="member_friends_group" />
+        <table name="member_friend_group" />
     </tables>
     <columns>
         <column name="title" var="title" notnull="notnull" />
     </columns>
     <conditions>
-        <condition operation="equal" column="friends_group_srl" var="friends_group_srl" notnull="notnull" filter="number" />
+        <condition operation="equal" column="friend_group_srl" var="friend_group_srl" notnull="notnull" filter="number" />
         <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number" pipe="and" />
     </conditions>
 </query>