devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

sendMessage sendRawMessage에 $validUntil 추가

Browse Source
This commit is contained in:
Hide_D
2018-02-21 22:47:07 +09:00
parent 86e42bb986
commit 7ac82d2293
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
twe/func_message.php
+9 -4
View File
@@ -96,7 +96,7 @@ function getMessage($msgType, $limit=30, $fromTime=NULL){
} }
} }
function sendRawMessage($msgType, $isSender, $mailbox, $src, $dest, $msg, $date, $msgOption){ function sendRawMessage($msgType, $isSender, $mailbox, $src, $dest, $msg, $date, $validUntil, $msgOption){
getDB()->insert('message', array( getDB()->insert('message', array(
'address' => $dest, 'address' => $dest,
@@ -105,6 +105,7 @@ function sendRawMessage($msgType, $isSender, $mailbox, $src, $dest, $msg, $date,
'src' => $src['id'], 'src' => $src['id'],
'dest' => $dest['id'], 'dest' => $dest['id'],
'time' => $date, 'time' => $date,
'valid_until' => $validUntil,
'message' => json_encode(eraseNullValue([ 'message' => json_encode(eraseNullValue([
'src' => $src, 'src' => $src,
'dest' =>$dest, 'dest' =>$dest,
@@ -114,11 +115,15 @@ function sendRawMessage($msgType, $isSender, $mailbox, $src, $dest, $msg, $date,
)); ));
} }
function sendMessage($msgType, $src, $dest, $msg, $date = null, $msgOption = null){ function sendMessage($msgType, $src, $dest, $msg, $date = null, $validUntil = null, $msgOption = null){
if($date === null){ if($date === null){
$date = $datetime->format('Y-m-d H:i:s'); $date = $datetime->format('Y-m-d H:i:s');
} }
if($validUntil === null){
$validUntil = '9999-12-31 12:59:59';
}
if($msgType === 'public'){ if($msgType === 'public'){
//dest는 필요하지 않음 //dest는 필요하지 않음
$srcMailbox = null; $srcMailbox = null;
@@ -150,9 +155,9 @@ function sendMessage($msgType, $src, $dest, $msg, $date = null, $msgOption = nul
} }
if($srcMailbox !== null){ if($srcMailbox !== null){
sendRawMessage($msgType, true, $srcMailbox, $src, $dest, $msg, $date); sendRawMessage($msgType, true, $srcMailbox, $src, $dest, $msg, $date, $validUntil, null);
} }
sendRawMessage($msgType, false, $destMailbox, $src, $dest, $msg, $date); sendRawMessage($msgType, false, $destMailbox, $src, $dest, $msg, $date, $validUntil, null);
} }
function getMailboxList(){ function getMailboxList(){