Skip to content

EspoCRM – Open Source CRM Application

mass email auto submitted header skip for email type

Yuri Kuznetsovc6185036d9e2
diff --git a/application/Espo/Modules/Crm/Tools/MassEmail/DefaultMessageHeadersPreparator.php b/application/Espo/Modules/Crm/Tools/MassEmail/DefaultMessageHeadersPreparator.php
index 829d70c71a..c3556d3640 100644
--- a/application/Espo/Modules/Crm/Tools/MassEmail/DefaultMessageHeadersPreparator.php
+++ b/application/Espo/Modules/Crm/Tools/MassEmail/DefaultMessageHeadersPreparator.php
@@ -43,7 +43,17 @@ class DefaultMessageHeadersPreparator implements MessageHeadersPreparator
{
$headers->addTextHeader('X-Queue-Item-Id', $data->getId());
$headers->addTextHeader('Precedence', 'bulk');
- $headers->addTextHeader('Auto-Submitted', 'auto-generated');
+
+ $campaignType = $this->getCampaignType($data);
+
+ if (
+ $campaignType === Campaign::TYPE_INFORMATIONAL_EMAIL ||
+ $campaignType === Campaign::TYPE_NEWSLETTER
+ ) {
+ $headers->addTextHeader('Auto-Submitted', 'auto-generated');
+ }
+
+ $headers->addTextHeader('X-Auto-Response-Suppress', 'AutoReply');
$this->addMandatoryOptOut($headers, $data);
}
@@ -57,9 +67,7 @@ class DefaultMessageHeadersPreparator implements MessageHeadersPreparator
private function addMandatoryOptOut(Headers $headers, Data $data): void
{
- $campaignType = $data->getQueueItem()->getMassEmail()?->getCampaign()?->getType();
-
- if ($campaignType === Campaign::TYPE_INFORMATIONAL_EMAIL) {
+ if ($this->getCampaignType($data) === Campaign::TYPE_INFORMATIONAL_EMAIL) {
return;
}
@@ -74,4 +82,9 @@ class DefaultMessageHeadersPreparator implements MessageHeadersPreparator
$headers->addTextHeader('List-Unsubscribe-Post', 'List-Unsubscribe=One-Click');
$headers->addTextHeader('List-Unsubscribe', "<$url>");
}
+
+ private function getCampaignType(Data $data): ?string
+ {
+ return $data->getQueueItem()->getMassEmail()?->getCampaign()?->getType();
+ }
}