blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-26 09:04:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature-6789/Messaging_answer-Button_for_assistants'

Browse Source
This commit is contained in:
Andreas Österreicher
2020-04-21 14:48:49 +02:00
parent e698485a39 35970696ca
commit 900d93fb4d
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/CL/Messages_model.php
+3 -8
View File
@@ -267,15 +267,10 @@ class Messages_model extends CI_Model
$sender = getData($senderResult)[0]; // Found sender data $sender = getData($senderResult)[0]; // Found sender data
// Check if the receiver is an employee // If the sender is not the system sender and are present configurations to reply
$isEmployee = false; // not by default
$isEmployeeResult = $this->MessageTokenModel->isEmployee($message->receiver_id);
if (isError($isEmployeeResult)) show_error(getError($isEmployeeResult));
if (hasData($isEmployeeResult)) $isEmployee = true;
// If the sender is not an employee and are present configurations to reply
$hrefReply = ''; $hrefReply = '';
if (!$isEmployee && !isEmptyString($this->config->item(MessageLib::CFG_REDIRECT_VIEW_MESSAGE_URL))) if ($message->sender_id != $this->config->item(MessageLib::CFG_SYSTEM_PERSON_ID)
&& !isEmptyString($this->config->item(MessageLib::CFG_REDIRECT_VIEW_MESSAGE_URL)))
{ {
$hrefReply = $this->config->item(MessageLib::CFG_MESSAGE_SERVER). $hrefReply = $this->config->item(MessageLib::CFG_MESSAGE_SERVER).
$this->config->item(MessageLib::CFG_REDIRECT_VIEW_MESSAGE_URL). $this->config->item(MessageLib::CFG_REDIRECT_VIEW_MESSAGE_URL).