Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Use instant unsubscribe URL for List-Unsubscribe header

Browse Source 
[MAILPOET-2736]
This commit is contained in:
Rostislav Wolny
2020-04-28 16:09:14 +02:00
committed by Veljko V
parent 1f744453d4
commit d19e7714c3
7 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Cron/Workers/SendingQueue/SendingQueue.php
View File

@@ -194,7 +194,7 @@ class SendingQueue {
$subscriber
);
$preparedSubscribersIds[] = $subscriber->id;
// save personalized unsubsribe link
// create personalized instant unsubsribe link
$unsubscribeUrls[] = Links::getUnsubscribeUrl($queue, $subscriber->id);
$metas[] = $this->mailerMetaInfo->getNewsletterMetaInfo($newsletter, $subscriber);
// keep track of values for statistics purposes

4
lib/Cron/Workers/SendingQueue/Tasks/Links.php
View File

@@ -24,7 +24,7 @@ class Links {
// join HTML and TEXT rendered body into a text string
$content = Helpers::joinObject($renderedNewsletter);
list($content, $links) = NewsletterLinks::process($content, $newsletterId, $queueId);
$links = NewsletterLinks::ensureUnsubscribeLink($links);
$links = NewsletterLinks::ensureInstantUnsubscribeLink($links);
// split the processed body with hashed links back to HTML and TEXT
list($renderedNewsletter['html'], $renderedNewsletter['text'])
= Helpers::splitObject($content);
@@ -43,7 +43,7 @@ class Links {
$settings = SettingsController::getInstance();
if ((boolean)$settings->get('tracking.enabled')) {
$linkHash = NewsletterLinkModel::where('queue_id', $queue->id)
->where('url', NewsletterLinkModel::UNSUBSCRIBE_LINK_SHORT_CODE)
->where('url', NewsletterLinkModel::INSTANT_UNSUBSCRIBE_LINK_SHORT_CODE)
->findOne();
if (!$linkHash instanceof NewsletterLinkModel) {
return '';