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 @@
+
+
+
+
+
@@ -40,6 +45,13 @@
+
+
+
+
+
+
+
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 @@
-
+
-
+
-
-
+
+
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 @@
-
+
-
+
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 @@
+
+
+
+
+
+
+
+
+
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 @@
-
+
-
+
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 @@
-
-
-
-
-
-
-
-
-
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 @@
-
+
-
+
-
-
-
+
+
+
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 @@
-
+
-
+
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 @@
-
+
-
+