From 60b3dce21d96ebe1335003fb695703fb3b56c34d Mon Sep 17 00:00:00 2001
From: Ronald Q <ronald.quenta@processmaker.com>
Date: Tue, 3 Sep 2019 08:49:37 -0400
Subject: [PATCH] PMC-1160

---
 .../ActionsByEmail/ResponseReader.php         | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail/ResponseReader.php b/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail/ResponseReader.php
index c0fe78ccb..5fd4a2045 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail/ResponseReader.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail/ResponseReader.php
@@ -135,7 +135,20 @@ class ResponseReader
                     if (!empty($mail->textPlain)) {
                         preg_match("/{(.*)}/", $mail->textPlain, $matches);
                         if ($matches) {
-                            $dataEmail = G::json_decode(Crypt::decryptString($matches[1]), true);
+                            try {
+                                $dataEmail = G::json_decode(Crypt::decryptString($matches[1]), true);
+                            } catch (Exception $e) {
+                                Bootstrap::registerMonolog(
+                                    $this->channel,
+                                    300,
+                                    G::LoadTranslation('ID_ABE_RESPONSE_CANNOT_BE_IDENTIFIED'),
+                                    [],
+                                    config("system.workspace"),
+                                    'processmaker.log'
+                                );
+                                $mailbox->markMailAsRead($mailId);
+                                continue;
+                            }
                             $dataAbeReq = loadAbeRequest($dataEmail['ABE_REQ_UID']);
                             if (config("system.workspace") === $dataEmail['workspace']
                                 && (array_key_exists('ABE_UID', $dataAbeReq) && $dataAbeReq['ABE_UID'] == $dataAbe['ABE_UID'])) {
@@ -149,7 +162,6 @@ class ResponseReader
                                         throw (new Exception(G::LoadTranslation('ID_CASE_DELEGATION_ALREADY_CLOSED'), 400));
                                     }
                                     $this->processABE($this->case, $mail, $dataAbe);
-                                    $mailbox->markMailAsRead($mailId);
                                     Bootstrap::registerMonolog(
                                         $this->channel,
                                         100, // DEBUG
@@ -174,6 +186,7 @@ class ResponseReader
                                         'processmaker.log'
                                     );
                                 }
+                                $mailbox->markMailAsRead($mailId);
                             }
                         }
                     }
@@ -347,7 +360,8 @@ class ResponseReader
             true,
             $caseInf['delIndex'],
             $emailSetup,
-            0
+            0,
+            WsBase::MESSAGE_TYPE_ACTIONS_BY_EMAIL
         );
         return $result;
     }