git-svn-id: http://xe-core.googlecode.com/svn/trunk@941 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/member/conf/module.xml

@@ -14,6 +14,7 @@
 
         <action name="dispMemberFriend" type="view" standalone="true" />
         <action name="dispMemberAddFriend" 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" />

modules/member/lang/ko.lang.php

@@ -35,6 +35,7 @@
     $lang->sender = '보낸이';
     $lang->receiver = '받는이';
     $lang->friend_group = '친구 그룹';
+    $lang->default_friend_group = '기본 그룹';
     $lang->member_info = '회원 정보';
 
     $lang->search_target_list = array(
@@ -75,6 +76,7 @@
     $lang->cmd_add_friend = '친구 등록';
     $lang->cmd_view_message_box = '쪽지함 보기';
     $lang->cmd_store = "보관";
+    $lang->cmd_add_friend_group = '친구 그룹 추가';
 
     $lang->msg_cart_is_null = '삭제할 쪽지를 선택해주세요';
     $lang->msg_checked_file_is_deleted = '%d개의 첨부파일이 삭제되었습니다';

modules/member/member.class.php

@@ -26,6 +26,7 @@
 
             $oModuleController->insertActionForward('member', 'view', 'dispMemberFriend');
             $oModuleController->insertActionForward('member', 'view', 'dispMemberAddFriend');
+            $oModuleController->insertActionForward('member', 'view', 'dispMemberAddFriendGroup');
 
             $oModuleController->insertActionForward('member', 'view', 'dispMemberAdminList');
             $oModuleController->insertActionForward('member', 'view', 'dispMemberAdminConfig');

modules/member/member.controller.php

@@ -209,12 +209,15 @@
             if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
             $logged_info = Context::get('logged_info');
 
+            $target_srl = (int)trim(Context::get('target_srl'));
+            if(!$target_srl) return new Object(-1,'msg_invalid_request');
+
             // 변수 정리
             $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');
+            $args->target_srl = $target_srl;
             $output = executeQuery('member.addFriend', $args);
             if(!$output->toBool()) return $output;
 

modules/member/member.view.php

@@ -323,9 +323,27 @@
             if($member_info->member_srl != $target_srl) return $this->stop('msg_invalid_request');
             Context::set('target_info', $member_info);
 
+            // 그룹의 목록을 구함
+            $friend_group_list = $oMemberModel->getFriendGroups();
+            Context::set('friend_group_list', $friend_group_list);
+
             $this->setTemplateFile('add_friend');
         }
 
+        /**
+         * @brief 친구 그룹 추가
+         **/
+        function dispMemberAddFriendGroup() {
+            $this->initNormal();
+            $this->setLayoutFile("popup_layout");
+
+            // 로그인이 되어 있지 않으면 오류 표시
+            if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
+            $logged_info = Context::get('logged_info');
+
+            $this->setTemplateFile('add_friend_group');
+        }
+
         /**
          * @brief 회원 목록 출력
          **/

modules/member/skins/default/add_friend.html

@@ -1,11 +1,12 @@
 <!--%import("js/member.js")-->
-<!--%import("filter/add_friend.js")-->
+<!--%import("filter/add_friend.xml")-->
 
 <div style="width:400px;">
     <form action="./" method="get" onsubmit="return procFilter(this, add_friend)">
+        <input type="hidden" name="target_srl" value="{$target_info->member_srl}" />
         <div>
-            <div>
+            <div style="font-weight:bold">
-                {$lang->member_info}
+                {$lang->cmd_add_friend}
             </div>
             <table border="1" width="100%">
             <tr>
@@ -25,12 +26,15 @@
         <div>
             {$lang->friend_group} : 
                 <select name="friend_group_srl">
+                    <option value="">{$lang->default_friend_group}</option>
+                    <!--@foreach($friend_group_list as $key => $val)-->
+                    <option value="{$val->friend_group_srl}">{$val->title}</option>
+                    <!--@end-->
                 </select>
+                <a href="#" onclick="popopen('{getUrl('act','dispMemberAddFriendGroup')}');return false;">{$lang->cmd_add_friend_group}</a>
         </div>
         <input type="submit" value="{$lang->cmd_insert}" />
         <input type="button" value="{$lang->cmd_close}" onclick="window.close();return false;"/>
-
-
     </form>
 
 </div>

modules/member/skins/default/filter/add_friend.xml

@@ -0,0 +1,8 @@
+<filter name="add_friend" module="member" act="procMemberAddFriend" confirm_msg_code="confirm_submit">
+    <form />
+    <parameter />
+    <response callback_func="completeAddFriend">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>

modules/member/skins/default/friends_list.html

@@ -5,13 +5,17 @@
 
         <!-- 그룹 목록 -->
         <div style="float:left;width:150px;">
+                <div>
+                    {$lang->friend_group}
+                    <a href="#" onclick="popopen('{getUrl('act','dispMemberAddFriendGroup')}');return false;">{$lang->cmd_add_friend_group}</a>
+                </div>
+
             <!--@if(!$friend_group_srl)-->
                 <div style="font-weight:bold">
             <!--@else-->
                 <div>
             <!--@end-->
-
+                    <a href="{getUrl('friend_group_srl','',page,'')}">{$lang->default_friend_group}</a>
-                    <a href="{getUrl('friend_group_srl','',page,'')}">{$lang->cmd_view_all}</a>
                 </div>
 
             <!--@foreach($friend_group_list as $key => $val)-->

modules/member/skins/default/js/member.js

@@ -115,3 +115,9 @@ function completeStoreMessage(ret_obj) {
     alert(ret_obj['message']);
     location.href = location.href.setQuery('message_srl','');
 }
+
+/* 친구 추가 후 */
+function completeAddFriend(ret_obj) {
+    alert(ret_obj['message']);
+    window.close();
+}