From bf2c99fbf3842e174d54cd7586100cbd86753765 Mon Sep 17 00:00:00 2001 From: Remigijus Kiminas Date: Thu, 2 May 2024 09:03:13 -0400 Subject: [PATCH] Manual sending e-mail also should use background worker. --- lhc_web/lib/core/lhmailconv/lhmailconvvalidator.php | 4 ++-- lhc_web/modules/lhmailconv/sendemail.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lhc_web/lib/core/lhmailconv/lhmailconvvalidator.php b/lhc_web/lib/core/lhmailconv/lhmailconvvalidator.php index 48f0978246..d32e66b844 100644 --- a/lhc_web/lib/core/lhmailconv/lhmailconvvalidator.php +++ b/lhc_web/lib/core/lhmailconv/lhmailconvvalidator.php @@ -844,7 +844,7 @@ public static function setWebPHPIMAPTimeouts() imap_timeout(IMAP_READTIMEOUT, 15); } - public static function sendEmail($item, & $response, $user_id = 0) { + public static function sendEmail($item, & $response, $user_id = 0, $params = []) { try { $mailReply = new PHPMailer(true); $mailReply->CharSet = "UTF-8"; @@ -888,7 +888,7 @@ public static function sendEmail($item, & $response, $user_id = 0) { $response['send'] = $mailReply->Send(); if ($item->mailbox->create_a_copy == true) { - $response['copy'] = self::makeSendCopy($mailReply, $item->mailbox); + $response['copy'] = self::makeSendCopy($mailReply, $item->mailbox, $params); } } catch (Exception $e) { diff --git a/lhc_web/modules/lhmailconv/sendemail.php b/lhc_web/modules/lhmailconv/sendemail.php index 97c1c0906c..a03ec91aa8 100644 --- a/lhc_web/modules/lhmailconv/sendemail.php +++ b/lhc_web/modules/lhmailconv/sendemail.php @@ -41,7 +41,7 @@ if (empty($Errors)) { $response = array(); - erLhcoreClassMailconvValidator::sendEmail($item, $response, $currentUser->getUserID()); + erLhcoreClassMailconvValidator::sendEmail($item, $response, $currentUser->getUserID(), ['background' => true]); if ($response['send'] == true) { $tpl->set('updated',true);