From 333a0b3848d99dd387e068dc6e9740b80858fcf9 Mon Sep 17 00:00:00 2001 From: Leo Feyer Date: Mon, 10 Aug 2020 15:24:57 +0200 Subject: [PATCH 1/3] Update the changelog and the language files (see #2140) Description ----------- - Commits ------- e4fff198 Update the changelog and the language files --- src/Resources/contao/languages/cs/tl_newsletter.xlf | 1 + src/Resources/contao/languages/cs/tl_newsletter_channel.xlf | 1 + src/Resources/contao/languages/cs/tl_newsletter_recipients.xlf | 1 + src/Resources/contao/languages/fa/tl_module.xlf | 1 + src/Resources/contao/languages/fa/tl_newsletter.xlf | 1 + src/Resources/contao/languages/fa/tl_newsletter_channel.xlf | 1 + src/Resources/contao/languages/it/tl_module.xlf | 1 + src/Resources/contao/languages/it/tl_newsletter.xlf | 1 + src/Resources/contao/languages/it/tl_newsletter_channel.xlf | 1 + src/Resources/contao/languages/it/tl_newsletter_recipients.xlf | 1 + src/Resources/contao/languages/pl/tl_module.xlf | 1 + src/Resources/contao/languages/pl/tl_newsletter.xlf | 1 + src/Resources/contao/languages/pl/tl_newsletter_channel.xlf | 1 + 13 files changed, 13 insertions(+) diff --git a/src/Resources/contao/languages/cs/tl_newsletter.xlf b/src/Resources/contao/languages/cs/tl_newsletter.xlf index 76b154ad2..ba8f89938 100644 --- a/src/Resources/contao/languages/cs/tl_newsletter.xlf +++ b/src/Resources/contao/languages/cs/tl_newsletter.xlf @@ -202,6 +202,7 @@ New + Nové Create a new newsletter diff --git a/src/Resources/contao/languages/cs/tl_newsletter_channel.xlf b/src/Resources/contao/languages/cs/tl_newsletter_channel.xlf index 9c3879085..90ce9a5d3 100644 --- a/src/Resources/contao/languages/cs/tl_newsletter_channel.xlf +++ b/src/Resources/contao/languages/cs/tl_newsletter_channel.xlf @@ -62,6 +62,7 @@ New + Nové Create a new channel diff --git a/src/Resources/contao/languages/cs/tl_newsletter_recipients.xlf b/src/Resources/contao/languages/cs/tl_newsletter_recipients.xlf index 39973358b..c892d47d6 100644 --- a/src/Resources/contao/languages/cs/tl_newsletter_recipients.xlf +++ b/src/Resources/contao/languages/cs/tl_newsletter_recipients.xlf @@ -71,6 +71,7 @@ New + Nové Create a new recipient diff --git a/src/Resources/contao/languages/fa/tl_module.xlf b/src/Resources/contao/languages/fa/tl_module.xlf index 5fdf0fc26..b765bd466 100644 --- a/src/Resources/contao/languages/fa/tl_module.xlf +++ b/src/Resources/contao/languages/fa/tl_module.xlf @@ -55,6 +55,7 @@ Here you can select a newsletter template. + اینجا می‌توانید قالب خبرنامه را انتخاب کنید. Custom text diff --git a/src/Resources/contao/languages/fa/tl_newsletter.xlf b/src/Resources/contao/languages/fa/tl_newsletter.xlf index 8c1dc8dbe..206fb25e6 100644 --- a/src/Resources/contao/languages/fa/tl_newsletter.xlf +++ b/src/Resources/contao/languages/fa/tl_newsletter.xlf @@ -55,6 +55,7 @@ Here you can override the e-mail template of the channel. + اینجا می‌توانید قابل ایمیل کانال را رونویسی کنید. Send as plain text diff --git a/src/Resources/contao/languages/fa/tl_newsletter_channel.xlf b/src/Resources/contao/languages/fa/tl_newsletter_channel.xlf index 1f8937be7..cd9466d69 100644 --- a/src/Resources/contao/languages/fa/tl_newsletter_channel.xlf +++ b/src/Resources/contao/languages/fa/tl_newsletter_channel.xlf @@ -23,6 +23,7 @@ Here you can select an e-mail template. + اینجا می‌توانید قالب ایمیل را انتخاب کنید. Sender e-mail address diff --git a/src/Resources/contao/languages/it/tl_module.xlf b/src/Resources/contao/languages/it/tl_module.xlf index fdc5ffe27..021f25774 100644 --- a/src/Resources/contao/languages/it/tl_module.xlf +++ b/src/Resources/contao/languages/it/tl_module.xlf @@ -55,6 +55,7 @@ Here you can select a newsletter template. + Qui puoi selezionare il template della newsletter Custom text diff --git a/src/Resources/contao/languages/it/tl_newsletter.xlf b/src/Resources/contao/languages/it/tl_newsletter.xlf index c954b174b..4a23b8ff8 100644 --- a/src/Resources/contao/languages/it/tl_newsletter.xlf +++ b/src/Resources/contao/languages/it/tl_newsletter.xlf @@ -55,6 +55,7 @@ Here you can override the e-mail template of the channel. + Qui è possibile sovrascrivere il template di default dell'email in questo canale. Send as plain text diff --git a/src/Resources/contao/languages/it/tl_newsletter_channel.xlf b/src/Resources/contao/languages/it/tl_newsletter_channel.xlf index 7adc52b3c..174fc8d43 100644 --- a/src/Resources/contao/languages/it/tl_newsletter_channel.xlf +++ b/src/Resources/contao/languages/it/tl_newsletter_channel.xlf @@ -23,6 +23,7 @@ Here you can select an e-mail template. + Seleziona una template per l'email. Sender e-mail address diff --git a/src/Resources/contao/languages/it/tl_newsletter_recipients.xlf b/src/Resources/contao/languages/it/tl_newsletter_recipients.xlf index 9122b6b1d..4b7cec812 100644 --- a/src/Resources/contao/languages/it/tl_newsletter_recipients.xlf +++ b/src/Resources/contao/languages/it/tl_newsletter_recipients.xlf @@ -75,6 +75,7 @@ Create a new recipient + Crea un nuovo destinatario Show the details of recipient ID %s diff --git a/src/Resources/contao/languages/pl/tl_module.xlf b/src/Resources/contao/languages/pl/tl_module.xlf index 8983c0709..eff9c413c 100644 --- a/src/Resources/contao/languages/pl/tl_module.xlf +++ b/src/Resources/contao/languages/pl/tl_module.xlf @@ -55,6 +55,7 @@ Here you can select a newsletter template. + Tutaj możesz wybrać szablon newslettera. Custom text diff --git a/src/Resources/contao/languages/pl/tl_newsletter.xlf b/src/Resources/contao/languages/pl/tl_newsletter.xlf index 505adc78a..2fb71aac9 100644 --- a/src/Resources/contao/languages/pl/tl_newsletter.xlf +++ b/src/Resources/contao/languages/pl/tl_newsletter.xlf @@ -55,6 +55,7 @@ Here you can override the e-mail template of the channel. + Tutaj możesz nadpisać szablon e-maila kanału. Send as plain text diff --git a/src/Resources/contao/languages/pl/tl_newsletter_channel.xlf b/src/Resources/contao/languages/pl/tl_newsletter_channel.xlf index 1c6432936..700468ae0 100644 --- a/src/Resources/contao/languages/pl/tl_newsletter_channel.xlf +++ b/src/Resources/contao/languages/pl/tl_newsletter_channel.xlf @@ -23,6 +23,7 @@ Here you can select an e-mail template. + Tutaj możesz wybrać szablon e-maila. Sender e-mail address From 45d60732479a571c1afab5399d0c0cbdbf6bba0c Mon Sep 17 00:00:00 2001 From: Leo Feyer Date: Tue, 25 Aug 2020 11:55:51 +0200 Subject: [PATCH 2/3] Add a List-Unsubscribe header to newsletters (see #2189) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Description ----------- | Q | A | -----------------| --- | Fixed issues | Fixes #2174 | Docs PR or issue | - Commits ------- c5ac3711 Add a List-Unsubscribe header to newsletters 1e5f2fce Encode the unsubscribe subject Co-authored-by: Martin Auswöger --- src/Resources/contao/classes/Newsletter.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Resources/contao/classes/Newsletter.php b/src/Resources/contao/classes/Newsletter.php index 9a2514ca1..9a602c6d4 100644 --- a/src/Resources/contao/classes/Newsletter.php +++ b/src/Resources/contao/classes/Newsletter.php @@ -339,6 +339,9 @@ protected function generateEmailObject(Database\Result $objNewsletter, $arrAttac } } + // Newsletters with an unsubscribe header are less likely to be blocked (see #2174) + $objEmail->addHeader('List-Unsubscribe', 'sender . '?subject=' . rawurlencode($GLOBALS['TL_LANG']['MSC']['unsubscribe']) . '>'); + return $objEmail; } From b1a4aa28962c8c8b5a9960990f2264748ce324e5 Mon Sep 17 00:00:00 2001 From: Leo Feyer Date: Wed, 2 Sep 2020 08:30:14 +0200 Subject: [PATCH 3/3] Use the scope matcher if an element renders differently in BE and FE (see #2206) Description ----------- | Q | A | -----------------| --- | Fixed issues | Fixes #1187 | Docs PR or issue | - Shall I also try to fix https://github.com/contao/core/issues/7587 here? Commits ------- 8a87974e Use the scope matcher if an element renders differently in BE and FE 97d08ecf Merge branch '4.9' into fix/tl_mode cb3e80f6 Do not require a request object and render elements in FE mode by default 947d77ab Also use the scope matcher for back end wildcards --- src/Resources/contao/modules/ModuleNewsletterList.php | 4 +++- src/Resources/contao/modules/ModuleNewsletterReader.php | 4 +++- src/Resources/contao/modules/ModuleSubscribe.php | 4 +++- src/Resources/contao/modules/ModuleUnsubscribe.php | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/Resources/contao/modules/ModuleNewsletterList.php b/src/Resources/contao/modules/ModuleNewsletterList.php index ef568078c..a1d75b018 100644 --- a/src/Resources/contao/modules/ModuleNewsletterList.php +++ b/src/Resources/contao/modules/ModuleNewsletterList.php @@ -34,7 +34,9 @@ class ModuleNewsletterList extends Module */ public function generate() { - if (TL_MODE == 'BE') + $request = System::getContainer()->get('request_stack')->getCurrentRequest(); + + if ($request && System::getContainer()->get('contao.routing.scope_matcher')->isBackendRequest($request)) { $objTemplate = new BackendTemplate('be_wildcard'); $objTemplate->wildcard = '### ' . Utf8::strtoupper($GLOBALS['TL_LANG']['FMD']['newsletterlist'][0]) . ' ###'; diff --git a/src/Resources/contao/modules/ModuleNewsletterReader.php b/src/Resources/contao/modules/ModuleNewsletterReader.php index 43842d9df..4577b197e 100644 --- a/src/Resources/contao/modules/ModuleNewsletterReader.php +++ b/src/Resources/contao/modules/ModuleNewsletterReader.php @@ -35,7 +35,9 @@ class ModuleNewsletterReader extends Module */ public function generate() { - if (TL_MODE == 'BE') + $request = System::getContainer()->get('request_stack')->getCurrentRequest(); + + if ($request && System::getContainer()->get('contao.routing.scope_matcher')->isBackendRequest($request)) { $objTemplate = new BackendTemplate('be_wildcard'); $objTemplate->wildcard = '### ' . Utf8::strtoupper($GLOBALS['TL_LANG']['FMD']['newsletterreader'][0]) . ' ###'; diff --git a/src/Resources/contao/modules/ModuleSubscribe.php b/src/Resources/contao/modules/ModuleSubscribe.php index 17154303d..032edcd0b 100644 --- a/src/Resources/contao/modules/ModuleSubscribe.php +++ b/src/Resources/contao/modules/ModuleSubscribe.php @@ -39,7 +39,9 @@ class ModuleSubscribe extends Module */ public function generate() { - if (TL_MODE == 'BE') + $request = System::getContainer()->get('request_stack')->getCurrentRequest(); + + if ($request && System::getContainer()->get('contao.routing.scope_matcher')->isBackendRequest($request)) { $objTemplate = new BackendTemplate('be_wildcard'); $objTemplate->wildcard = '### ' . Utf8::strtoupper($GLOBALS['TL_LANG']['FMD']['subscribe'][0]) . ' ###'; diff --git a/src/Resources/contao/modules/ModuleUnsubscribe.php b/src/Resources/contao/modules/ModuleUnsubscribe.php index f9558d9d6..357b8939d 100644 --- a/src/Resources/contao/modules/ModuleUnsubscribe.php +++ b/src/Resources/contao/modules/ModuleUnsubscribe.php @@ -37,7 +37,9 @@ class ModuleUnsubscribe extends Module */ public function generate() { - if (TL_MODE == 'BE') + $request = System::getContainer()->get('request_stack')->getCurrentRequest(); + + if ($request && System::getContainer()->get('contao.routing.scope_matcher')->isBackendRequest($request)) { $objTemplate = new BackendTemplate('be_wildcard'); $objTemplate->wildcard = '### ' . Utf8::strtoupper($GLOBALS['TL_LANG']['FMD']['unsubscribe'][0]) . ' ###';