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

---
 .../member_extra_info.addon.php               | 12 ++++---
 modules/member/lang/ko.lang.php               |  2 ++
 modules/member/member.model.php               | 11 ++++++
 modules/member/queries/isAddedFriend.xml      | 12 +++++++
 modules/member/schemas/member_friend.xml      |  4 +--
 modules/member/skins/default/add_friend.html  | 36 +++++++++++++++++++
 6 files changed, 70 insertions(+), 7 deletions(-)
 create mode 100644 modules/member/queries/isAddedFriend.xml
 create mode 100644 modules/member/skins/default/add_friend.html

diff --git a/addons/member_extra_info/member_extra_info.addon.php b/addons/member_extra_info/member_extra_info.addon.php
index 610e4325d..a8dd8dcd5 100644
--- a/addons/member_extra_info/member_extra_info.addon.php
+++ b/addons/member_extra_info/member_extra_info.addon.php
@@ -87,12 +87,14 @@
             // 메뉴에 새로 만든 쪽지 발송 메뉴를 추가
             $menu_list .= sprintf("\n%s,popopen('%s','sendMessage')", $menu_str, $menu_link);
 
-            // 5. 친구 등록 메뉴를 만듬
-            $menu_str = Context::getLang('cmd_add_friend');
-            $menu_link = sprintf('./?module=member&amp;act=dispMemberAddFriend&amp;target_srl=%s',$member_srl);
+            // 5. 친구 등록 메뉴를 만듬 (이미 등록된 친구가 아닐 경우) 
+            if(!$this->isAddedFriend($member_srl)) {
+                $menu_str = Context::getLang('cmd_add_friend');
+                $menu_link = sprintf('./?module=member&amp;act=dispMemberAddFriend&amp;target_srl=%s',$member_srl);
 
-            // 메뉴에 새로 만든 쪽지 발송 메뉴를 추가
-            $menu_list .= sprintf("\n%s,popopen('%s','addFriend')", $menu_str, $menu_link);
+                // 메뉴에 새로 만든 쪽지 발송 메뉴를 추가
+                $menu_list .= sprintf("\n%s,popopen('%s','addFriend')", $menu_str, $menu_link);
+            }
         }
 
         // 템플릿에 적용되게 하기 위해 module의 variables에 재등록
diff --git a/modules/member/lang/ko.lang.php b/modules/member/lang/ko.lang.php
index 9f0033293..a5340f962 100644
--- a/modules/member/lang/ko.lang.php
+++ b/modules/member/lang/ko.lang.php
@@ -34,6 +34,8 @@
     $lang->accept_agreement = '약관동의';
     $lang->sender = '보낸이';
     $lang->receiver = '받는이';
+    $lang->friend_group = '친구 그룹';
+    $lang->member_info = '회원 정보';
 
     $lang->search_target_list = array(
         'user_id' => '아이디',
diff --git a/modules/member/member.model.php b/modules/member/member.model.php
index b6a8283b8..f2023d57e 100644
--- a/modules/member/member.model.php
+++ b/modules/member/member.model.php
@@ -582,6 +582,17 @@
             return executeQuery('member.getFriends', $args);
         }
 
+        /**
+         * @brief 이미 친구로 등록되었는지 검사
+         **/
+        function isAddedFriend($member_srl) {
+            $logged_info = Context::get('logged_info');
+
+            $args->member_srl = $logged_info->member_srl;
+            $args->target_srl = $member_srl;
+            $output = executeQuery('member.isAddedFriend', $args);
+            return $output->data->count;
+        }
 
         /**
          * @brief 그룹 목록 가져오기
diff --git a/modules/member/queries/isAddedFriend.xml b/modules/member/queries/isAddedFriend.xml
new file mode 100644
index 000000000..49c12a966
--- /dev/null
+++ b/modules/member/queries/isAddedFriend.xml
@@ -0,0 +1,12 @@
+<query id="isAddedFriend" action="select">
+    <tables>
+        <table name="member_friend" />
+    </tables>
+    <columns>
+        <column name="count(*)" alias="count" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" />
+        <condition operation="equal" column="target_srl" var="target_srl" pipe="and" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/member/schemas/member_friend.xml b/modules/member/schemas/member_friend.xml
index 911f9baba..1a1a76a70 100644
--- a/modules/member/schemas/member_friend.xml
+++ b/modules/member/schemas/member_friend.xml
@@ -1,8 +1,8 @@
 <table name="member_friend">
     <column name="friend_srl" type="number" size="11" notnull="notnull" primary_key="primary_key" />
     <column name="friend_group_srl" type="number" size="11" default="0" notnull="notnull" index="idx_friend_group_srl" />
-    <column name="member_srl" type="number" size="11" notnull="notnull" index="idx_owner_member_srl" />
-    <column name="target_srl" type="number" size="11" notnull="notnull" />
+    <column name="member_srl" type="number" size="11" notnull="notnull" index="idx_member_srl" />
+    <column name="target_srl" type="number" size="11" notnull="notnull" index="idx_target_srl" />
     <column name="list_order" type="number" size="11" notnull="notnull" index="idx_list_order" />
     <column name="regdate" type="date" />
 </table>
diff --git a/modules/member/skins/default/add_friend.html b/modules/member/skins/default/add_friend.html
new file mode 100644
index 000000000..5fbf2a44a
--- /dev/null
+++ b/modules/member/skins/default/add_friend.html
@@ -0,0 +1,36 @@
+<!--%import("js/member.js")-->
+<!--%import("filter/add_friend.js")-->
+
+<div style="width:400px;">
+    <form action="./" method="get" onsubmit="return procFilter(this, add_friend)">
+        <div>
+            <div>
+                {$lang->member_info}
+            </div>
+            <table border="1" width="100%">
+            <tr>
+                <th>{$lang->user_id}</th>
+                <td>{$target_info->user_id}</td>
+            </tr>
+            <tr>
+                <th>{$lang->user_name}</th>
+                <td>{$target_info->user_name}</td>
+            </tr>
+            <tr>
+                <th>{$lang->nick_name}</th>
+                <td><div class="member_{$target_info->member_srl}">{$target_info->nick_name}</div></td>
+            </tr>
+            </table>
+        </div>
+        <div>
+            {$lang->friend_group} : 
+                <select name="friend_group_srl">
+                </select>
+        </div>
+        <input type="submit" value="{$lang->cmd_insert}" />
+        <input type="button" value="{$lang->cmd_close}" onclick="window.close();return false;"/>
+
+
+    </form>
+
+</div>