fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-23 12:22:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix #916 show error earlier if attempting to add self as friend

Browse source
This commit is contained in:
Kijin Sung 2017-09-28 11:34:15 +09:00
parent cc0f2c5a62
commit 7b1f0b4ee2
4 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/communication/communication.controller.php
View file

@ -456,10 +456,14 @@ class communicationController extends communication
$logged_info = Context::get('logged_info');
$target_srl = (int) trim(Context::get('target_srl'));
if(!$target_srl || $target_srl == $logged_info->member_srl)
if(!$target_srl)
{
return new Object(-1, 'msg_invalid_request');
}
if($target_srl == $logged_info->member_srl)
{
return new Object(-1, 'msg_no_self_friend');
}
// Check duplicate friend
$args = new stdClass();

4
modules/communication/communication.view.php
View file

@ -347,6 +347,10 @@ class communicationView extends communication
{
return $this->stop('msg_invalid_request');
}
if($target_srl == $logged_info->member_srl)
{
return $this->stop('msg_no_self_friend');
}
// get information of the member
$oMemberModel = getModel('member');

1
modules/communication/lang/en.php
View file

@ -26,6 +26,7 @@ $lang->cmd_add_friend_group = 'Add Friend Group';
$lang->cmd_rename_friend_group = 'Rename Friend Group';
$lang->cmd_delete_friend_group = 'Delete Friend Group';
$lang->msg_already_friend = 'You are already friends with this person.';
$lang->msg_no_self_friend = 'You cannot add yourself as a friend.';
$lang->msg_no_message = 'There is no message.';
$lang->msg_cannot_send_to_yourself = 'Cannot send a message to yourself.';
$lang->message_received = 'You have a new message.';

1
modules/communication/lang/ko.php
View file

@ -26,6 +26,7 @@ $lang->cmd_add_friend_group = '친구 그룹 생성';
$lang->cmd_rename_friend_group = '친구 그룹 이름 변경';
$lang->cmd_delete_friend_group = '친구 그룹 삭제';
$lang->msg_already_friend = '이미 친구로 등록되어 있습니다.';
$lang->msg_no_self_friend = '자신을 친구로 등록할 수 없습니다.';
$lang->msg_no_message = '쪽지가 없습니다.';
$lang->msg_cannot_send_to_yourself = '자기 자신에게 쪽지를 보낼 수 없습니다.';
$lang->message_received = '쪽지가 왔습니다.';