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

Fix #936 always show messages to/from deleted members

Browse source 
- 탈퇴환 회원과 주고받은 쪽지도 표시하도록 변경
- 탈퇴환 회원의 원래 닉네임이 기록되지 않는 구조이므로
  수신자/발신자 이름에 닉네임 대신 "탈퇴한 회원"이라고만 표시
This commit is contained in:
Kijin Sung 2018-12-13 12:31:51 +09:00
parent 3c34e26cb7
commit a2c9274681
9 changed files with 59 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

34
modules/communication/communication.model.php
View file

@ -163,7 +163,7 @@ class communicationModel extends communication
$member_info = $oMemberModel->getMemberInfoByMemberSrl($message->sender_srl);
}
if($member_info)
if($member_info->member_srl)
{
foreach($member_info as $key => $val)
{
@ -176,6 +176,13 @@ class communicationModel extends communication
$message->{$key} = $val;
}
}
else
{
$message->member_srl = ($message->sender_srl == $logged_info->member_srl) ? $message->receiver_srl : $message->sender_srl;
$message->user_id = '';
$message->nick_name = lang('communication.cmd_message_from_non_member');
$message->user_name = $message->nick_name;
}
// change the status if is a received and not yet read message
if($message->message_type == 'R' && $message->readed != 'Y')
@ -210,6 +217,14 @@ class communicationModel extends communication
$oCommunicationController = getController('communication');
$oCommunicationController->setMessageReaded($message->message_srl);
if (!$message->member_srl)
{
$message->member_srl = $message->sender_srl;
$message->user_id = '';
$message->nick_name = lang('communication.cmd_message_from_non_member');
$message->user_name = $message->nick_name;
}
return $message;
}
@ -274,7 +289,22 @@ class communicationModel extends communication
$args->list_count = 20;
$args->page_count = 10;
return executeQueryArray($query_id, $args, $columnList);
// Get messages from DB
$output = executeQueryArray($query_id, $args, $columnList);
// Add placeholder for non-members
foreach ($output->data as $message)
{
if (!$message->member_srl)
{
$message->member_srl = ($message->sender_srl == $logged_info->member_srl) ? $message->receiver_srl : $message->sender_srl;
$message->user_id = '';
$message->nick_name = lang('communication.cmd_message_from_non_member');
$message->user_name = $message->nick_name;
}
}
return $output;
}
/**