diff --git a/modules/member/lang/ko.lang.php b/modules/member/lang/ko.lang.php
index eb5d65f9e..23d081aa0 100644
--- a/modules/member/lang/ko.lang.php
+++ b/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 = '쪽지가 없습니다';
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index c9825f92c..f61b0cf9b 100644
--- a/modules/member/member.controller.php
+++ b/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;
diff --git a/modules/member/queries/deleteFriend.xml b/modules/member/queries/deleteFriend.xml
index 169197004..32f5f5ba4 100644
--- a/modules/member/queries/deleteFriend.xml
+++ b/modules/member/queries/deleteFriend.xml
@@ -3,7 +3,7 @@
-
-
+
+
diff --git a/modules/member/queries/deleteFriendGroup.xml b/modules/member/queries/deleteFriendGroup.xml
index f4676360c..3b3df66a4 100644
--- a/modules/member/queries/deleteFriendGroup.xml
+++ b/modules/member/queries/deleteFriendGroup.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/modules/member/skins/default/add_friend_group.html b/modules/member/skins/default/add_friend_group.html
new file mode 100644
index 000000000..9b9e6db71
--- /dev/null
+++ b/modules/member/skins/default/add_friend_group.html
@@ -0,0 +1,18 @@
+
+
+
+
diff --git a/modules/member/skins/default/filter/add_friend.xml b/modules/member/skins/default/filter/add_friend.xml
index f2f6c3a23..9f48f408d 100644
--- a/modules/member/skins/default/filter/add_friend.xml
+++ b/modules/member/skins/default/filter/add_friend.xml
@@ -4,5 +4,6 @@
+
diff --git a/modules/member/skins/default/filter/add_friend_group.xml b/modules/member/skins/default/filter/add_friend_group.xml
new file mode 100644
index 000000000..2db9891e2
--- /dev/null
+++ b/modules/member/skins/default/filter/add_friend_group.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
diff --git a/modules/member/skins/default/filter/delete_checked_friend.xml b/modules/member/skins/default/filter/delete_checked_friend.xml
new file mode 100644
index 000000000..7fda453f2
--- /dev/null
+++ b/modules/member/skins/default/filter/delete_checked_friend.xml
@@ -0,0 +1 @@
+
diff --git a/modules/member/skins/default/filter/delete_friend_group.xml b/modules/member/skins/default/filter/delete_friend_group.xml
new file mode 100644
index 000000000..b6246a07f
--- /dev/null
+++ b/modules/member/skins/default/filter/delete_friend_group.xml
@@ -0,0 +1 @@
+
diff --git a/modules/member/skins/default/friends_list.html b/modules/member/skins/default/friends_list.html
index 86283119b..aeffd921a 100644
--- a/modules/member/skins/default/friends_list.html
+++ b/modules/member/skins/default/friends_list.html
@@ -1,4 +1,6 @@
+
+
diff --git a/modules/member/skins/default/js/member.js b/modules/member/skins/default/js/member.js
index c95a11a9d..7c048e171 100644
--- a/modules/member/skins/default/js/member.js
+++ b/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','');
+}