From ddf8ae50a0cd7e727b12ddf500b88b1556c61ba4 Mon Sep 17 00:00:00 2001
From: Torben Hansen <derhansen@gmail.com>
Date: Fri, 16 Feb 2024 19:20:56 +0100
Subject: [PATCH] [TASK] Show sender email address for mailtest in ext:install
In TYPO3 versions before v9, the mailtest showed the configured
sender email address. This has been removed due to a wrong fluid
variable usage with #88523
With this change, the sender email address is now shown again in
the mailtest. Additionally, a note is added to clarify, that not
receiving the test email could be due to spam filters or the
sender domain SPF settings.
The notice about the `defaultMailFromAddress` has been removed,
since it is already checked in `EnvironmentController`, that
the value is configured and a valid email address.
Finally, the fluid variable `queueIdentifier` introduced with
#100084 has been removed, since it is not used in the template.
Resolves: #103136
Related: #88523
Related: #100084
Releases: main, 12.4
Change-Id: Ib076934732a05d9c709f6d822526e8316cf87106
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/82989
Tested-by: Oliver Bartsch <bo@cedev.de>
Tested-by: core-ci <typo3@b13.com>
Reviewed-by: Oliver Bartsch <bo@cedev.de>
---
.../Classes/Controller/EnvironmentController.php | 1 -
.../Private/Templates/Environment/MailTest.html | 10 ++++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/typo3/sysext/install/Classes/Controller/EnvironmentController.php b/typo3/sysext/install/Classes/Controller/EnvironmentController.php
index a5299cf868ee..c5ee4f633562 100644
--- a/typo3/sysext/install/Classes/Controller/EnvironmentController.php
+++ b/typo3/sysext/install/Classes/Controller/EnvironmentController.php
@@ -238,7 +238,6 @@ class EnvironmentController extends AbstractController
'mailTestToken' => $formProtection->generateToken('installTool', 'mailTest'),
'mailTestSenderAddress' => $this->getSenderEmailAddress(),
'isSendPossible' => $isSendPossible,
- 'queueIdentifier' => 'install',
]);
return new JsonResponse([
diff --git a/typo3/sysext/install/Resources/Private/Templates/Environment/MailTest.html b/typo3/sysext/install/Resources/Private/Templates/Environment/MailTest.html
index 59f4b0c61455..5e7426af09b6 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Environment/MailTest.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Environment/MailTest.html
@@ -2,6 +2,7 @@
<p>
Check the basic mail functionality by entering your email address here and clicking the button.
+ You should then receive a test email from "{mailTestSenderAddress}".
</p>
<p>
@@ -17,12 +18,13 @@
<code>$GLOBALS['TYPO3_CONF_VARS']['MAIL']['transport_smtp_*']</code> is valid. Wrong data here results in faulty
requests to the mail server. You can find the resulting messages in the mail server log.
</li>
- <li>
- <code>$GLOBALS['TYPO3_CONF_VARS']['MAIL']['transport']['defaultMailFromAddress']</code> must be a valid email
- address.
- </li>
</ul>
+<p>
+ Not receiving the test email could also be a consequence of it being intercepted by a spam filter or due to the
+ sending domain's email security settings, such as SPF record, which may prevent successful delivery.
+</p>
+
<div class="t3js-module-content" data-mail-test-token="{mailTestToken}">
<div class="t3js-mailTest-output"></div>
--
GitLab