EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
ref, deprecate
Yuri Kuznetsov1224e778d4c0
diff --git a/application/Espo/Classes/RecordHooks/Email/BeforeCreate.php b/application/Espo/Classes/RecordHooks/Email/BeforeCreate.phpindex 66af071cd6..60528a1b67 100644--- a/application/Espo/Classes/RecordHooks/Email/BeforeCreate.php+++ b/application/Espo/Classes/RecordHooks/Email/BeforeCreate.php@@ -29,7 +29,7 @@namespace Espo\Classes\RecordHooks\Email;-use Espo\Core\Mail\Sender;+use Espo\Core\Mail\EmailSender;use Espo\Core\Record\Hook\SaveHook;use Espo\Entities\Email;use Espo\ORM\Entity;@@ -42,7 +42,7 @@ class BeforeCreate implements SaveHookpublic function process(Entity $entity): void{if ($entity->getStatus() === Email::STATUS_SENDING) {- $messageId = Sender::generateMessageId($entity);+ $messageId = EmailSender::generateMessageId($entity);$entity->setMessageId('<' . $messageId . '>');}diff --git a/application/Espo/Classes/RecordHooks/Email/BeforeUpdate.php b/application/Espo/Classes/RecordHooks/Email/BeforeUpdate.phpindex e9e9e1a1a0..911c6cc475 100644--- a/application/Espo/Classes/RecordHooks/Email/BeforeUpdate.php+++ b/application/Espo/Classes/RecordHooks/Email/BeforeUpdate.php@@ -29,7 +29,7 @@namespace Espo\Classes\RecordHooks\Email;-use Espo\Core\Mail\Sender;+use Espo\Core\Mail\EmailSender;use Espo\Core\Name\Field;use Espo\Core\Record\Hook\SaveHook;use Espo\Core\Utils\FieldUtil;@@ -94,7 +94,7 @@ class BeforeUpdate implements SaveHook}if ($entity->getStatus() == Email::STATUS_SENDING) {- $messageId = Sender::generateMessageId($entity);+ $messageId = EmailSender::generateMessageId($entity);$entity->setMessageId('<' . $messageId . '>');}diff --git a/application/Espo/Core/Mail/EmailSender.php b/application/Espo/Core/Mail/EmailSender.phpindex 9123c8cfc0..937e4a0c2b 100644--- a/application/Espo/Core/Mail/EmailSender.php+++ b/application/Espo/Core/Mail/EmailSender.php@@ -32,6 +32,7 @@ namespace Espo\Core\Mail;use Espo\Core\Binding\BindingContainerBuilder;use Espo\Core\InjectableFactory;use Espo\Core\Mail\Account\SendingAccountProvider;+use Espo\Core\Name\Field;use Espo\Core\Utils\Config;use Espo\Entities\Attachment;use Espo\Entities\Email;@@ -148,6 +149,16 @@ class EmailSender*/static public function generateMessageId(Email $email): string{- return Sender::generateMessageId($email);+ $rand = mt_rand(1000, 9999);++ $messageId = $email->getParentType() && $email->getParentId() ?+ sprintf("%s/%s/%s/%s@espo", $email->getParentType(), $email->getParentId(), time(), $rand) :+ sprintf("%s/%s/%s@espo", md5($email->get(Field::NAME)), time(), $rand);++ if ($email->get('isSystem')) {+ $messageId .= '-system';+ }++ return $messageId;}}diff --git a/application/Espo/Core/Mail/Sender.php b/application/Espo/Core/Mail/Sender.phpindex 7783964040..229114394d 100644--- a/application/Espo/Core/Mail/Sender.php+++ b/application/Espo/Core/Mail/Sender.php@@ -32,7 +32,6 @@ namespace Espo\Core\Mail;use Espo\Core\FileStorage\Manager as FileStorageManager;use Espo\Core\Mail\Exceptions\NoSmtp;use Espo\Core\Mail\Smtp\TransportFactory;-use Espo\Core\Name\Field;use Espo\Core\ORM\Repository\Option\SaveOption;use Espo\ORM\EntityCollection;use Espo\Core\Field\DateTime;@@ -407,19 +406,14 @@ class Senderthrow new SendingError($e->getMessage());}+ /**+ * @deprecated Since v9.1.0. Use EmailSender::generateMessageId.+ * @noinspection PhpUnused+ * @todo Remove in v10.0.+ */static public function generateMessageId(Email $email): string{- $rand = mt_rand(1000, 9999);-- $messageId = $email->getParentType() && $email->getParentId() ?- sprintf("%s/%s/%s/%s@espo", $email->getParentType(), $email->getParentId(), time(), $rand) :- sprintf("%s/%s/%s@espo", md5($email->get(Field::NAME)), time(), $rand);-- if ($email->get('isSystem')) {- $messageId .= '-system';- }-- return $messageId;+ return EmailSender::generateMessageId($email);}/**@@ -588,7 +582,7 @@ class Senderstrlen($messageId) < 4 ||str_starts_with($messageId, 'dummy:')) {- $messageId = $this->generateMessageId($email);+ $messageId = EmailSender::generateMessageId($email);$email->setMessageId('<' . $messageId . '>');