Ensure that online profile is assigned to pushed chats

Author: remdex

lhc_web/design/defaulttheme/tpl/lhwebhooks/pushchat.tpl.php

@@ -8,7 +8,7 @@
     <?php include(erLhcoreClassDesign::designtpl('lhkernel/alert_success.tpl.php'));?>
 <?php endif; ?>
 
-<?php if (isset($chat)) : ?>
+<?php if (isset($chat) && $chat->id > 0) : ?>
     <a href="#/chat-id-<?php echo $chat->id?>" class="action-image" data-title="<?php echo erLhcoreClassDesign::shrt($chat->nick,10,'...',30,ENT_QUOTES);?>" onclick="lhinst.startChatNewWindow(<?php echo $chat->id?>,$(this).attr('data-title'))" title="<?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('webhook/push','Open chat')?>"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('webhook/push','Open chat')?></a>
 <?php endif; ?>
 

lhc_web/lib/core/lhchat/lhchatwebhookincomming.php

@@ -2672,7 +2672,7 @@ public static function parseFilesDecode($params, $chat) {
         return null;
     }
 
-    public static function sendMessage($incomingWebhook, $item) {
+    public static function sendMessage($incomingWebhook, $item, $userData) {
 
         $db = ezcDbInstance::get();
 
@@ -2692,7 +2692,17 @@ public static function sendMessage($incomingWebhook, $item) {
                 $incomingChat->incoming_id = $incomingWebhook->id;
             }
 
-            $chat = new erLhcoreClassModelChat();
+            $vid = md5($incomingWebhook->id . '_' . $incomingChat->chat_external_id);
+
+            if (($onlineUser = erLhcoreClassModelChatOnlineUser::fetchByVid($vid)) !== false) {
+                if (erLhcoreClassModelChatBlockedUser::isBlocked(['online_user_id' => $onlineUser->id])) {
+                    throw new Exception('Blocked by online visitor profile!');
+                }
+            }
+
+            if (($chat = $incomingChat->chat) === false || $chat->status === erLhcoreClassModelChat::STATUS_CLOSED_CHAT) {
+                $chat = new erLhcoreClassModelChat();
+            }
 
             if ($item->dep_id > 0) {
                 $chat->dep_id = $item->dep_id;
@@ -2737,16 +2747,14 @@ public static function sendMessage($incomingWebhook, $item) {
                 $msg->time = time();
                 $msg->saveThis();
 
-                if ($item->close_chat == 1) {
-                    $chat->status = erLhcoreClassModelChat::STATUS_CLOSED_CHAT;
-                }
-
                 /**
                  * Set appropriate chat attributes
                  */
                 $chat->last_msg_id = $msg->id;
                 $chat->last_user_msg_time = $msg->time;
                 $chat->saveThis();
+
+                self::assignOnlineVisitor($chat, $incomingChat);
             }
 
             $incomingChat->chat_id = $chat->id;
@@ -2766,6 +2774,13 @@ public static function sendMessage($incomingWebhook, $item) {
                     'chat' => & $chat,
                     'msg' => $msg
                 ));
+   	
+                if ($item->close_chat == 1) {
+                    erLhcoreClassChatHelper::closeChat(array(
+                        'user' => $userData,
+                        'chat' => $chat,
+                    ));
+                }
             }
 
         } catch (Exception $e) {

lhc_web/modules/lhwebhooks/pushchat.php

@@ -97,7 +97,11 @@
             $item->user_id = $userData->id;
             $item->name_support = (string)$userData->name_support;
 
-            $chat = erLhcoreClassChatWebhookIncoming::sendMessage(erLhcoreClassModelChatIncomingWebhook::fetch($item->incoming_api_id), $item);
+            $chat = erLhcoreClassChatWebhookIncoming::sendMessage(
+                erLhcoreClassModelChatIncomingWebhook::fetch($item->incoming_api_id), 
+                $item,
+                $userData
+            );
 
             $tpl->set('updated', true);
             $tpl->set('chat', $chat);