Decode IDNA domains in any system mail (see #5932)

contao · Aug 15, 2013 · 1cc5c07 · 1cc5c07
1 parent c643b9f
commit 1cc5c07
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/contao/modules/ModuleSubscribe.php b/contao/modules/ModuleSubscribe.php
@@ -275,15 +275,15 @@ protected function addRecipient()
 
 		// Prepare the e-mail text
 		$strText = str_replace('##token##', $strToken, $this->nl_subscribe);
-		$strText = str_replace('##domain##', \Environment::get('host'), $strText);
-		$strText = str_replace('##link##', \Environment::get('base') . \Environment::get('request') . (($GLOBALS['TL_CONFIG']['disableAlias'] || strpos(\Environment::get('request'), '?') !== false) ? '&' : '?') . 'token=' . $strToken, $strText);
+		$strText = str_replace('##domain##', \Idna::decode(\Environment::get('host')), $strText);
+		$strText = str_replace('##link##', \Idna::decode(\Environment::get('base')) . \Environment::get('request') . (($GLOBALS['TL_CONFIG']['disableAlias'] || strpos(\Environment::get('request'), '?') !== false) ? '&' : '?') . 'token=' . $strToken, $strText);
 		$strText = str_replace(array('##channel##', '##channels##'), implode("\n", $objChannel->fetchEach('title')), $strText);
 
 		// Activation e-mail
 		$objEmail = new \Email();
 		$objEmail->from = $GLOBALS['TL_ADMIN_EMAIL'];
 		$objEmail->fromName = $GLOBALS['TL_ADMIN_NAME'];
-		$objEmail->subject = sprintf($GLOBALS['TL_LANG']['MSC']['nl_subject'], \Environment::get('host'));
+		$objEmail->subject = sprintf($GLOBALS['TL_LANG']['MSC']['nl_subject'], \Idna::decode(\Environment::get('host')));
 		$objEmail->text = $strText;
 		$objEmail->sendTo($varInput);
 

diff --git a/contao/modules/ModuleUnsubscribe.php b/contao/modules/ModuleUnsubscribe.php
@@ -204,14 +204,14 @@ protected function removeRecipient()
 		}
 
 		// Prepare the e-mail text
-		$strText = str_replace('##domain##', \Environment::get('host'), $this->nl_unsubscribe);
+		$strText = str_replace('##domain##', \Idna::decode(\Environment::get('host')), $this->nl_unsubscribe);
 		$strText = str_replace(array('##channel##', '##channels##'), implode("\n", $arrChannels), $strText);
 
 		// Confirmation e-mail
 		$objEmail = new \Email();
 		$objEmail->from = $GLOBALS['TL_ADMIN_EMAIL'];
 		$objEmail->fromName = $GLOBALS['TL_ADMIN_NAME'];
-		$objEmail->subject = sprintf($GLOBALS['TL_LANG']['MSC']['nl_subject'], \Environment::get('host'));
+		$objEmail->subject = sprintf($GLOBALS['TL_LANG']['MSC']['nl_subject'], \Idna::decode(\Environment::get('host')));
 		$objEmail->text = $strText;
 		$objEmail->sendTo($varInput);