EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
Email messageIdInternal truncate
Yuriib31826e56f03
diff --git a/application/Espo/Core/Mail/Importer/DefaultImporter.php b/application/Espo/Core/Mail/Importer/DefaultImporter.phpindex de82eb8703..87393184bc 100644--- a/application/Espo/Core/Mail/Importer/DefaultImporter.php+++ b/application/Espo/Core/Mail/Importer/DefaultImporter.php@@ -56,6 +56,7 @@ use Espo\Entities\EmailFilter;use Espo\Entities\GroupEmailFolder;use Espo\Entities\Team;use Espo\Entities\User;+use Espo\ORM\Defs\Params\AttributeParam;use Espo\ORM\Name\Attribute;use Espo\ORM\Query\Part\Condition;use Espo\ORM\Query\Part\Expression;@@ -481,7 +482,15 @@ class DefaultImporter implements Importerif ($parser->hasHeader($message, 'delivered-To')) {$deliveredTo = $parser->getHeader($message, 'delivered-To') ?? '';- $email->set('messageIdInternal', "$messageId-$deliveredTo");+ $messageIdInternal = "$messageId-$deliveredTo";++ $messageIdInternalMaxLength = $email->getAttributeParam('messageIdInternal', AttributeParam::LEN);++ if ($messageIdInternalMaxLength) {+ $messageIdInternal = mb_substr($messageIdInternal, 0, $messageIdInternalMaxLength);+ }++ $email->set('messageIdInternal', $messageIdInternal);}if (stripos($messageId, '@espo-system') !== false) {diff --git a/tests/unit/Espo/Core/Mail/ImporterTest.php b/tests/unit/Espo/Core/Mail/ImporterTest.phpindex 3fadeeb66d..c2b057de85 100644--- a/tests/unit/Espo/Core/Mail/ImporterTest.php+++ b/tests/unit/Espo/Core/Mail/ImporterTest.php@@ -220,6 +220,9 @@ class ImporterTest extends TestCase$this->assertStringContainsString('<br>Admin Test', $email->get('body'));$this->assertStringContainsString('Admin Test', $email->get('bodyPlain'));- $this->assertEquals('<e558c4dfc2a0f0d60f5ebff474c97ffc/1466410740/1950@espo>', $email->get('messageId'));+ $messageId = '<e558c4dfc2a0f0d60f5ebff474c97ffc/1466410740/1950@espo>';++ $this->assertEquals($messageId, $email->get('messageId'));+ $this->assertEquals($messageId . '[email protected]', $email->get('messageIdInternal'));}}