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

modules/member/lang/ko.lang.php

@@ -78,7 +78,7 @@
     $lang->cmd_store = "보관";
     $lang->cmd_add_friend_group = '친구 그룹 추가';
 
-    $lang->msg_cart_is_null = '삭제할 쪽지를 선택해주세요';
+    $lang->msg_cart_is_null = '삭제할 대상을  선택해주세요';
     $lang->msg_checked_file_is_deleted = '%d개의 첨부파일이 삭제되었습니다';
 
     $lang->msg_no_message = '쪽지가 없습니다';

modules/member/member.controller.php

@@ -221,6 +221,7 @@
             $output = executeQuery('member.addFriend', $args);
             if(!$output->toBool()) return $output;
 
+            $this->add('member_srl', $target_srl);
             $this->setMessage('success_registed');
         }
 
@@ -250,9 +251,26 @@
             // 로그인 정보 체크
             if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
             $logged_info = Context::get('logged_info');
+            $member_srl = $logged_info->member_srl;
 
-            // 변수 정리
+            // 변수 체크
-            $args->friend_srl = Context::get('friend_srl');
+            $friend_srl_list = trim(Context::get('friend_srl_list'));
+            if(!$friend_srl_list) return new Object(-1, 'msg_cart_is_null');
+
+            $friend_srl_list = explode('|@|', $friend_srl_list);
+            if(!count($friend_srl_list)) return new Object(-1, 'msg_cart_is_null');
+
+            $friend_count = count($friend_srl_list);
+            $target = array();
+            for($i=0;$i<$friend_count;$i++) {
+                $friend_srl = (int)trim($friend_srl_list[$i]);
+                if(!$friend_srl) continue;
+                $target[] = $friend_srl;
+            }
+            if(!count($target)) return new Object(-1,'msg_cart_is_null');
+
+            // 삭제
+            $args->friend_srls = implode(',',$target);
             $args->member_srl = $logged_info->member_srl;
             $output = executeQuery('member.deleteFriend', $args);
             if(!$output->toBool()) return $output;

modules/member/queries/deleteFriend.xml

@@ -3,7 +3,7 @@
         <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" />
-        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number" pipe="and" />
+        <condition operation="in" column="friend_srl" var="friend_srls" notnull="notnull" pipe="and" />
     </conditions>
 </query>

modules/member/queries/deleteFriendGroup.xml

@@ -1,6 +1,6 @@
 <query id="deleteFriendGroup" action="delete">
     <tables>
-        <table name="member_friend_gruop" />
+        <table name="member_friend_group" />
     </tables>
     <conditions>
         <condition operation="equal" column="friend_group_srl" var="friend_group_srl" notnull="notnull" filter="number" />

modules/member/skins/default/add_friend_group.html

@@ -0,0 +1,18 @@
+<!--%import("js/member.js")-->
+<!--%import("filter/add_friend_group.xml")-->
+
+<div style="width:400px;">
+    <form action="./" method="get" onsubmit="return procFilter(this, add_friend_group)">
+        <div style="font-weight:bold">
+            {$lang->cmd_add_friend_group}
+        </div>
+        <div>
+            {$lang->friend_group} : <input type="text" name="title" value="" />
+        </div>
+        <div>
+            <input type="submit" value="{$lang->cmd_insert}" />
+            <input type="button" value="{$lang->cmd_close}" onclick="window.close();return false;"/>
+        </div>
+    </form>
+
+</div>

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

@@ -4,5 +4,6 @@
     <response callback_func="completeAddFriend">
         <tag name="error" />
         <tag name="message" />
+        <tag name="member_srl" />
     </response>
 </filter>

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

@@ -0,0 +1,10 @@
+<filter name="add_friend_group" module="member" act="procMemberAddFriendGroup" confirm_msg_code="confirm_submit">
+    <form>
+        <node target="title" required="true" minlength="1" maxlength="240" />
+    </form>
+    <parameter />
+    <response callback_func="completeAddFriendGroup">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>

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

@@ -0,0 +1 @@
+<filter name="delete_checked_friend" module="member" act="procMemberDeleteFriend" confirm_msg_code="confirm_delete" />

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

@@ -0,0 +1 @@
+<filter name="delete_friend_group" module="member" act="procMemberDeleteFriendGroup" confirm_msg_code="confirm_delete" />

modules/member/skins/default/friends_list.html

@@ -1,4 +1,6 @@
 <!--%import("js/member.js")-->
+<!--%import("filter/delete_checked_friend.xml")-->
+<!--%import("filter/delete_friend_group.xml")-->
 
 <div style="width:500px;">
     <form action="./" method="get" onsubmit="return procFilter(this, delete_checked_friend)">
@@ -25,7 +27,7 @@
                 <!--@else-->
                 <div>
                 <!--@end-->
-                    <a href="{getUrl('friend_group_srl',$val->friend_group_srl)}">{$val->title}</a>
+                    <a href="{getUrl('friend_group_srl',$val->friend_group_srl)}">{$val->title}</a> [<a href="#" onclick="doDeleteFriendGroup('{$val->friend_group_srl}');return false;">{$lang->cmd_delete}</a>]
                 </div>
 
             <!--@end-->
@@ -75,4 +77,9 @@
 
     </form>
 
+    <!-- 그룹 삭제를 위한 빈 form -->
+    <form action="./" method="get" id="for_delete_group">
+        <input type="hidden" name="friend_group_srl" value="" />
+    </form>
+
 </div>

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

@@ -119,5 +119,28 @@ function completeStoreMessage(ret_obj) {
 /* 친구 추가 후 */
 function completeAddFriend(ret_obj) {
     alert(ret_obj['message']);
+    var member_srl = ret_obj['member_srl'];
+    if(opener && opener.loaded_member_menu_list) {
+        opener.loaded_member_menu_list[ret_obj['member_srl']] = '';
+    }
     window.close();
 }
+
+/* 친구 그룹 추가 후 */
+function completeAddFriendGroup(ret_obj) {
+    alert(ret_obj['message']);
+    if(opener) opener.location.href = opener.location.href;
+    window.close();
+}
+
+/* 친구 그룹 삭제 */
+function doDeleteFriendGroup(friend_group_srl) {
+    var fo_obj = xGetElementById('for_delete_group');
+    fo_obj.friend_group_srl.value = friend_group_srl;
+    procFilter(fo_obj, delete_friend_group);
+}
+
+function completeDeleteFriendGroup(ret_obj) {
+    alert(ret_obj['message']);
+    location.href = location.href.setQuery('friend_group_srl','');
+}