Merge branch '4.9' into 4.10

# Conflicts: # calendar-bundle/src/Resources/contao/dca/tl_calendar.php # calendar-bundle/src/Resources/contao/dca/tl_calendar_events.php # calendar-bundle/src/Resources/contao/dca/tl_calendar_feed.php # calendar-bundle/src/Resources/contao/dca/tl_content.php # core-bundle/src/Command/ResizeImagesCommand.php # core-bundle/src/Resources/contao/dca/tl_files.php # core-bundle/src/Resources/contao/languages/en/default.xlf # core-bundle/src/Resources/contao/library/Contao/Controller.php # core-bundle/tests/ContaoManager/PluginTest.php # manager-bundle/tests/Command/DebugPluginsCommandTest.php # news-bundle/src/Resources/contao/dca/tl_content.php # news-bundle/src/Resources/contao/dca/tl_news.php # news-bundle/src/Resources/contao/dca/tl_news_archive.php # news-bundle/src/Resources/contao/dca/tl_news_feed.php # newsletter-bundle/src/Resources/contao/classes/Newsletter.php
contao · Sep 2, 2020 · ab855d7 · ab855d7
2 parents 202216a + 454aa6c
commit ab855d7
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/src/Resources/contao/classes/Newsletter.php b/src/Resources/contao/classes/Newsletter.php
@@ -356,6 +356,9 @@ protected function generateEmailObject(Result $objNewsletter, $arrAttachments)
 			$objEmail->addHeader('X-Transport', $objNewsletter->mailerTransport ?: $objNewsletter->channelMailerTransport);
 		}
 
+		// Newsletters with an unsubscribe header are less likely to be blocked (see #2174)
+		$objEmail->addHeader('List-Unsubscribe', '<mailto:' . $objNewsletter->sender . '?subject=' . rawurlencode($GLOBALS['TL_LANG']['MSC']['unsubscribe']) . '>');
+
 		return $objEmail;
 	}
 

diff --git 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
@@ -36,7 +36,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
@@ -40,7 +40,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
@@ -38,7 +38,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]) . ' ###';