diff --git a/typo3/sysext/backend/Classes/Security/EmailLoginNotification.php b/typo3/sysext/backend/Classes/Security/EmailLoginNotification.php
index f476c9156ff8f310a7167a31c433cd6ea4e6299a..8f3f77a3c9aef11f062bdc7d2ff01f81fad6db9e 100644
--- a/typo3/sysext/backend/Classes/Security/EmailLoginNotification.php
+++ b/typo3/sysext/backend/Classes/Security/EmailLoginNotification.php
@@ -16,14 +16,18 @@ namespace TYPO3\CMS\Backend\Security;
* The TYPO3 project - inspiring people to share!
*/
+use Psr\Http\Message\ServerRequestInterface;
+use TYPO3\CMS\Core\Authentication\AbstractUserAuthentication;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
-use TYPO3\CMS\Core\Mail\MailMessage;
+use TYPO3\CMS\Core\Http\ServerRequestFactory;
+use TYPO3\CMS\Core\Mail\FluidEmail;
+use TYPO3\CMS\Core\Mail\Mailer;
use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
* Sends out an email if a backend user has just been logged in.
*
- * Interesting settings:
+ * Relevant settings:
* $GLOBALS['TYPO3_CONF_VARS']['BE']['warning_mode']
* $GLOBALS['TYPO3_CONF_VARS']['BE']['warning_email_addr']
* $BE_USER->uc['emailMeAtLogin']
@@ -42,6 +46,11 @@ class EmailLoginNotification
*/
private $warningEmailRecipient;
+ /**
+ * @var ServerRequestInterface
+ */
+ private $request;
+
public function __construct()
{
$this->warningMode = (int)($GLOBALS['TYPO3_CONF_VARS']['BE']['warning_mode'] ?? 0);
@@ -57,28 +66,21 @@ class EmailLoginNotification
public function emailAtLogin(array $parameters, BackendUserAuthentication $currentUser): void
{
$user = $parameters['user'];
-
- $subject = 'At "' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'] . '" from ' . GeneralUtility::getIndpEnv('REMOTE_ADDR');
- $emailBody = $this->compileEmailBody(
- $user,
- GeneralUtility::getIndpEnv('REMOTE_ADDR'),
- GeneralUtility::getIndpEnv('HTTP_HOST'),
- $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename']
- );
+ $this->request = $parameters['request'] ?? $GLOBALS['TYPO3_REQUEST'] ?? ServerRequestFactory::fromGlobals();
if ($this->warningMode > 0 && !empty($this->warningEmailRecipient)) {
$prefix = $currentUser->isAdmin() ? '[AdminLoginWarning]' : '[LoginWarning]';
if ($this->warningMode & 1) {
// First bit: Send warning email on any login
- $this->sendEmail($this->warningEmailRecipient, $prefix . ' ' . $subject, $emailBody);
+ $this->sendEmail($this->warningEmailRecipient, $currentUser, $prefix);
} elseif ($currentUser->isAdmin() && $this->warningMode & 2) {
// Second bit: Only send warning email when an admin logs in
- $this->sendEmail($this->warningEmailRecipient, $prefix . ' ' . $subject, $emailBody);
+ $this->sendEmail($this->warningEmailRecipient, $currentUser, $prefix);
}
}
// Trigger an email to the current BE user, if this has been enabled in the user configuration
if (($currentUser->uc['emailMeAtLogin'] ?? null) && GeneralUtility::validEmail($user['email'])) {
- $this->sendEmail($user['email'], $subject, $emailBody);
+ $this->sendEmail($user['email'], $currentUser);
}
}
@@ -86,27 +88,20 @@ class EmailLoginNotification
* Sends an email.
*
* @param string $recipient
- * @param string $subject
- * @param string $body
+ * @param AbstractUserAuthentication $user
+ * @param string|null $subjectPrefix
*/
- protected function sendEmail(string $recipient, string $subject, string $body): void
+ protected function sendEmail(string $recipient, AbstractUserAuthentication $user, string $subjectPrefix = null): void
{
+ $subject = $subjectPrefix . ' New TYPO3 Login at "' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'] . '" from ' . GeneralUtility::getIndpEnv('REMOTE_ADDR');
+ $headline = 'TYPO3 Backend Login notification';
$recipients = explode(',', $recipient);
- GeneralUtility::makeInstance(MailMessage::class)
+ $email = GeneralUtility::makeInstance(FluidEmail::class)
->to(...$recipients)
->subject($subject)
- ->text($body)
- ->send();
- }
-
- protected function compileEmailBody(array $user, string $ipAddress, string $httpHost, string $siteName): string
- {
- return sprintf(
- 'User "%s" logged in from %s at "%s" (%s)',
- $user['username'] ?? 'unknown',
- $ipAddress,
- $siteName,
- $httpHost
- );
+ ->setRequest($this->request)
+ ->setTemplate('Security/LoginNotification')
+ ->assignMultiple(['user' => $user->user, 'headline' => $headline]);
+ GeneralUtility::makeInstance(Mailer::class)->send($email);
}
}
diff --git a/typo3/sysext/backend/Resources/Private/Templates/Email/Security/LoginNotification.html b/typo3/sysext/backend/Resources/Private/Templates/Email/Security/LoginNotification.html
new file mode 100644
index 0000000000000000000000000000000000000000..7e0db4d42a555d56bea2b48619db770e1b420b17
--- /dev/null
+++ b/typo3/sysext/backend/Resources/Private/Templates/Email/Security/LoginNotification.html
@@ -0,0 +1,6 @@
+<f:layout name="SystemEmail" />
+<f:section name="Title">{headline}</f:section>
+<f:section name="Main">
+ <h4>{introduction}</h4>
+ <p>The user <em>"{user.username}"</em> logged in from the IP address <strong>{normalizedParams.remoteAddress}</strong> at "{typo3.sitename}".</p>
+</f:section>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/Email/Security/LoginNotification.txt b/typo3/sysext/backend/Resources/Private/Templates/Email/Security/LoginNotification.txt
new file mode 100644
index 0000000000000000000000000000000000000000..2f991f4e65b4fdbaf3e7fc841f3bd08bc3e226d2
--- /dev/null
+++ b/typo3/sysext/backend/Resources/Private/Templates/Email/Security/LoginNotification.txt
@@ -0,0 +1,5 @@
+<f:layout name="SystemEmail" />
+<f:section name="Title">{headline}</f:section>
+<f:section name="Main">{introduction}
+The user "{user.username}" logged in from the IP address "{normalizedParams.remoteAddress}" at the site "{typo3.sitename}".
+</f:section>
diff --git a/typo3/sysext/backend/Tests/Unit/Security/EmailLoginNotificationTest.php b/typo3/sysext/backend/Tests/Unit/Security/EmailLoginNotificationTest.php
index dcd01e7fec7930908812fc73d1d9c2774015e349..bf898e899b42aeba319d8a1aafadadba706e442b 100644
--- a/typo3/sysext/backend/Tests/Unit/Security/EmailLoginNotificationTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Security/EmailLoginNotificationTest.php
@@ -19,7 +19,8 @@ namespace TYPO3\CMS\Backend\Tests\Unit\Security;
use Prophecy\Argument;
use TYPO3\CMS\Backend\Security\EmailLoginNotification;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
-use TYPO3\CMS\Core\Mail\MailMessage;
+use TYPO3\CMS\Core\Mail\FluidEmail;
+use TYPO3\CMS\Core\Mail\Mailer;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
@@ -43,11 +44,12 @@ class EmailLoginNotificationTest extends UnitTestCase
];
$mailMessage = $this->setUpMailMessageProphecy();
+ $mailerProphecy = $this->prophesize(Mailer::class);
+ $mailerProphecy->send($mailMessage)->shouldBeCalledOnce();
+ GeneralUtility::addInstance(Mailer::class, $mailerProphecy->reveal());
$subject = new EmailLoginNotification();
$subject->emailAtLogin(['user' => $userData], $backendUser);
-
- $mailMessage->send()->shouldHaveBeenCalled();
}
/**
@@ -118,13 +120,15 @@ class EmailLoginNotificationTest extends UnitTestCase
];
$mailMessage = $this->setUpMailMessageProphecy();
+ $mailerProphecy = $this->prophesize(Mailer::class);
+ $mailerProphecy->send($mailMessage)->shouldBeCalledOnce();
+ GeneralUtility::addInstance(Mailer::class, $mailerProphecy->reveal());
$subject = new EmailLoginNotification();
$subject->emailAtLogin(['user' => $userData], $backendUser);
- $mailMessage->send()->shouldHaveBeenCalledOnce();
$mailMessage->to('typo3-admin@acme.com')->shouldHaveBeenCalled();
- $mailMessage->subject('[AdminLoginWarning] At "My TYPO3 Inc." from 127.0.0.1')->shouldHaveBeenCalled();
+ $mailMessage->subject('[AdminLoginWarning] New TYPO3 Login at "My TYPO3 Inc." from 127.0.0.1')->shouldHaveBeenCalled();
}
/**
@@ -147,13 +151,15 @@ class EmailLoginNotificationTest extends UnitTestCase
];
$mailMessage = $this->setUpMailMessageProphecy();
+ $mailerProphecy = $this->prophesize(Mailer::class);
+ $mailerProphecy->send($mailMessage)->shouldBeCalledOnce();
+ GeneralUtility::addInstance(Mailer::class, $mailerProphecy->reveal());
$subject = new EmailLoginNotification();
$subject->emailAtLogin(['user' => $userData], $backendUser);
- $mailMessage->subject('[AdminLoginWarning] At "My TYPO3 Inc." from 127.0.0.1')->shouldHaveBeenCalled();
+ $mailMessage->subject('[AdminLoginWarning] New TYPO3 Login at "My TYPO3 Inc." from 127.0.0.1')->shouldHaveBeenCalled();
$mailMessage->to('typo3-admin@acme.com')->shouldHaveBeenCalled();
- $mailMessage->send()->shouldHaveBeenCalled();
}
/**
@@ -176,13 +182,15 @@ class EmailLoginNotificationTest extends UnitTestCase
];
$mailMessage = $this->setUpMailMessageProphecy();
+ $mailerProphecy = $this->prophesize(Mailer::class);
+ $mailerProphecy->send($mailMessage)->shouldBeCalledOnce();
+ GeneralUtility::addInstance(Mailer::class, $mailerProphecy->reveal());
$subject = new EmailLoginNotification();
$subject->emailAtLogin(['user' => $userData], $backendUser);
$mailMessage->to('typo3-admin@acme.com')->shouldHaveBeenCalled();
- $mailMessage->subject('[LoginWarning] At "My TYPO3 Inc." from 127.0.0.1')->shouldHaveBeenCalled();
- $mailMessage->send()->shouldHaveBeenCalled();
+ $mailMessage->subject('[LoginWarning] New TYPO3 Login at "My TYPO3 Inc." from 127.0.0.1')->shouldHaveBeenCalled();
}
/**
@@ -211,17 +219,18 @@ class EmailLoginNotificationTest extends UnitTestCase
}
/**
- * @return \Prophecy\Prophecy\ObjectProphecy|\TYPO3\CMS\Core\Mail\MailMessage
+ * @return \Prophecy\Prophecy\ObjectProphecy|FluidEmail
*/
protected function setUpMailMessageProphecy()
{
- $mailMessage = $this->prophesize(MailMessage::class);
+ $mailMessage = $this->prophesize(FluidEmail::class);
$mailMessage->subject(Argument::any())->willReturn($mailMessage->reveal());
$mailMessage->to(Argument::any())->willReturn($mailMessage->reveal());
+ $mailMessage->setTemplate(Argument::any())->willReturn($mailMessage->reveal());
$mailMessage->from(Argument::any())->willReturn($mailMessage->reveal());
- $mailMessage->text(Argument::any())->willReturn($mailMessage->reveal());
- $mailMessage->send()->willReturn(true);
- GeneralUtility::addInstance(MailMessage::class, $mailMessage->reveal());
+ $mailMessage->setRequest(Argument::any())->willReturn($mailMessage->reveal());
+ $mailMessage->assignMultiple(Argument::cetera())->willReturn($mailMessage->reveal());
+ GeneralUtility::addInstance(FluidEmail::class, $mailMessage->reveal());
return $mailMessage;
}
}
diff --git a/typo3/sysext/core/Classes/Mail/FluidEmail.php b/typo3/sysext/core/Classes/Mail/FluidEmail.php
new file mode 100644
index 0000000000000000000000000000000000000000..def7cdb93991a1582380001e19dbcd26115e7270
--- /dev/null
+++ b/typo3/sysext/core/Classes/Mail/FluidEmail.php
@@ -0,0 +1,157 @@
+<?php
+declare(strict_types = 1);
+namespace TYPO3\CMS\Core\Mail;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+use Psr\Http\Message\ServerRequestInterface;
+use Symfony\Component\Mime\Email;
+use Symfony\Component\Mime\Header\Headers;
+use Symfony\Component\Mime\Part\AbstractPart;
+use TYPO3\CMS\Core\Http\NormalizedParams;
+use TYPO3\CMS\Core\Information\Typo3Information;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Fluid\View\StandaloneView;
+use TYPO3\CMS\Fluid\View\TemplatePaths;
+
+/**
+ * Send out templated HTML/plain text emails with Fluid.
+ */
+class FluidEmail extends Email
+{
+ public const FORMAT_HTML = 'html';
+ public const FORMAT_PLAIN = 'plain';
+ public const FORMAT_BOTH = 'both';
+
+ protected $format = ['html', 'plain'];
+
+ /**
+ * @var string
+ */
+ protected $templateName = 'Default';
+
+ /**
+ * @var StandaloneView
+ */
+ protected $view;
+
+ public function __construct(TemplatePaths $templatePaths = null, Headers $headers = null, AbstractPart $body = null)
+ {
+ parent::__construct($headers, $body);
+ $this->initializeView($templatePaths);
+ }
+
+ protected function initializeView(TemplatePaths $templatePaths = null): void
+ {
+ $templatePaths = $templatePaths ?? new TemplatePaths($GLOBALS['TYPO3_CONF_VARS']['MAIL']);
+ $this->view = GeneralUtility::makeInstance(StandaloneView::class);
+ $this->view->getRenderingContext()->setTemplatePaths($templatePaths);
+ $this->view->assignMultiple($this->getDefaultVariables());
+ $this->format($GLOBALS['TYPO3_CONF_VARS']['MAIL']['format'] ?? self::FORMAT_BOTH);
+ }
+
+ public function format(string $format)
+ {
+ switch ($format) {
+ case self::FORMAT_BOTH:
+ $this->format = [self::FORMAT_HTML, self::FORMAT_PLAIN];
+ break;
+ case self::FORMAT_HTML:
+ $this->format = [self::FORMAT_HTML];
+ break;
+ case self::FORMAT_PLAIN:
+ $this->format = [self::FORMAT_PLAIN];
+ break;
+ default:
+ throw new \InvalidArgumentException('Setting FluidEmail->format() must be either "html", "plain" or "both", no other formats are currently supported', 1580743847);
+ }
+ return $this;
+ }
+
+ public function setTemplate(string $templateName)
+ {
+ $this->templateName = $templateName;
+ return $this;
+ }
+
+ public function assign($key, $value)
+ {
+ $this->view->assign($key, $value);
+ return $this;
+ }
+
+ public function assignMultiple(array $values)
+ {
+ $this->view->assignMultiple($values);
+ return $this;
+ }
+
+ /*
+ * Shorthand setters
+ */
+ public function setRequest(ServerRequestInterface $request): self
+ {
+ $this->view->assign('request', $request);
+ if ($request->getAttribute('normalizedParams') instanceof NormalizedParams) {
+ $this->view->assign('normalizedParams', $request->getAttribute('normalizedParams'));
+ } else {
+ $this->view->assign('normalizedParams', NormalizedParams::createFromServerParams($_SERVER));
+ }
+ return $this;
+ }
+
+ protected function getDefaultVariables(): array
+ {
+ return [
+ 'typo3' => [
+ 'sitename' => $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'],
+ 'formats' => [
+ 'date' => $GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'],
+ 'time' => $GLOBALS['TYPO3_CONF_VARS']['SYS']['hhmm']
+ ],
+ 'systemConfiguration' => $GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS'],
+ 'information' => GeneralUtility::makeInstance(Typo3Information::class),
+ ]
+ ];
+ }
+
+ public function ensureValidity()
+ {
+ $this->generateTemplatedBody();
+ parent::ensureValidity();
+ }
+
+ public function getBody(): AbstractPart
+ {
+ $this->generateTemplatedBody();
+ return parent::getBody();
+ }
+
+ protected function generateTemplatedBody(): void
+ {
+ if (in_array(static::FORMAT_HTML, $this->format, true)) {
+ $this->html($this->renderContent('html'));
+ }
+ if (in_array(static::FORMAT_PLAIN, $this->format, true)) {
+ $this->text(trim($this->renderContent('txt')));
+ }
+ }
+
+ protected function renderContent(string $format): string
+ {
+ $this->view->setFormat($format);
+ $this->view->setTemplate($this->templateName);
+ return $this->view->render();
+ }
+}
diff --git a/typo3/sysext/core/Configuration/DefaultConfiguration.php b/typo3/sysext/core/Configuration/DefaultConfiguration.php
index 5e688cc47f5540df504bc8fd3cf4bddd7a594f22..891b0f9cab918e5ec5d26b4b600c48869cfc9a28 100644
--- a/typo3/sysext/core/Configuration/DefaultConfiguration.php
+++ b/typo3/sysext/core/Configuration/DefaultConfiguration.php
@@ -1316,6 +1316,19 @@ return [
'defaultMailFromName' => '',
'defaultMailReplyToAddress' => '',
'defaultMailReplyToName' => '',
+ 'format' => 'both',
+ 'layoutRootPaths' => [
+ 0 => 'EXT:core/Resources/Private/Layouts/',
+ 10 => 'EXT:backend/Resources/Private/Layouts/'
+ ],
+ 'partialRootPaths' => [
+ 0 => 'EXT:core/Resources/Private/Partials/',
+ 10 => 'EXT:backend/Resources/Private/Partials/'
+ ],
+ 'templateRootPaths' => [
+ 0 => 'EXT:core/Resources/Private/Templates/Email/',
+ 10 => 'EXT:backend/Resources/Private/Templates/Email/'
+ ],
],
'HTTP' => [ // HTTP configuration to tune how TYPO3 behaves on HTTP requests made by TYPO3. Have a look at http://docs.guzzlephp.org/en/latest/request-options.html for some background information on those settings.
'allow_redirects' => [ // Mixed, set to false if you want to allow redirects, or use it as an array to add more values,
diff --git a/typo3/sysext/core/Configuration/DefaultConfigurationDescription.yaml b/typo3/sysext/core/Configuration/DefaultConfigurationDescription.yaml
index 41274d8c1427f16e74e0aa93f4b33092fcc381e5..7ca838dd83bea6ddf1dedb0fd5ea48cd518e17f9 100644
--- a/typo3/sysext/core/Configuration/DefaultConfigurationDescription.yaml
+++ b/typo3/sysext/core/Configuration/DefaultConfigurationDescription.yaml
@@ -521,6 +521,22 @@ MAIL:
type: container
description: 'Mail'
items:
+ format:
+ type: dropdown
+ allowedValues:
+ 'html': 'Send emails only in HTML format'
+ 'txt': 'Send emails only in plain text format'
+ 'both': 'Send emails in HTML and plain text format'
+ description: 'The Mailer API allows to send out templated emails, which can be configured on a system-level to send out HTML-based emails or plain text emails, or emails with both variants.'
+ layoutRootPaths:
+ type: array
+ description: 'List of paths to look for layouts for templated emails. Should be specified as .txt and .html files.'
+ partialRootPaths:
+ type: array
+ description: 'List of paths to look for partials for templated emails. Should be specified as .txt and .html files.'
+ templateRootPaths:
+ type: array
+ description: 'List of paths to look for template files for templated emails. Should be specified as .txt and .html files.'
transport:
type: text
description: '<dl><dt>smtp</dt><dd>Sends messages over the (standardized) Simple Message Transfer Protocol. It can deal with encryption and authentication. Most flexible option, requires a mail server and configurations in transport_smtp_* settings below. Works the same on Windows, Unix and MacOS.</dd><dt>sendmail</dt><dd>Sends messages by communicating with a locally installed MTA - such as sendmail. See setting transport_sendmail_command bellow.<dd><dt>mbox</dt><dd>This doesn''t send any mail out, but instead will write every outgoing mail to a file adhering to the RFC 4155 mbox format, which is a simple text file where the mails are concatenated. Useful for debugging the mail sending process and on development machines which cannot send mails to the outside. Configure the file to write to in the ''transport_mbox_file'' setting below</dd><dt><classname></dt><dd>Custom class which implements Swift_Transport. The constructor receives all settings from the MAIL section to make it possible to add custom settings.</dd></dl>'
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Feature-90266-Fluid-basedTemplatedEmails.rst b/typo3/sysext/core/Documentation/Changelog/master/Feature-90266-Fluid-basedTemplatedEmails.rst
new file mode 100644
index 0000000000000000000000000000000000000000..7dea169e5f277158d5905e24ccf369f5da7e56fb
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/master/Feature-90266-Fluid-basedTemplatedEmails.rst
@@ -0,0 +1,54 @@
+.. include:: ../../Includes.txt
+
+==============================================
+Feature: #90266 - Fluid-based templated emails
+==============================================
+
+See :issue:`90266`
+
+Description
+===========
+
+TYPO3 now supports sending template-based emails for multi-part and HTML-based
+emails out-of-the-box. The email contents are built with Fluid Templating Engine.
+
+TYPO3's backend functionality already ships with a default layout
+for templated emails, which can be tested out in TYPO3's install tool test email functionality.
+
+It is also possible to set a default mode for sending out emails via :php:`$GLOBALS['TYPO3_CONF_VARS']['MAIL']['format']` which can be `both`, `plain` or `html`.
+
+This option can however overridden by Extension authors in their use cases.
+
+All Fluid-based template paths can be configured via
+
+* :php:`$GLOBALS['TYPO3_CONF_VARS']['MAIL']['layoutRootPaths']`
+* :php:`$GLOBALS['TYPO3_CONF_VARS']['MAIL']['partialRootPaths']`
+* :php:`$GLOBALS['TYPO3_CONF_VARS']['MAIL']['templateRootPaths']`
+
+where TYPO3 reserves all array keys below `100` for internal purposes. If you want to provide custom templates or layouts,
+set this in your LocalConfiguration.php / AdditionalConfiguration.php file:
+
+* :php:`$GLOBALS['TYPO3_CONF_VARS']['MAIL']['templateRootPaths'][700] = 'EXT:my_site_extension/Resources/Private/Templates/Email';`
+* :php:`$GLOBALS['TYPO3_CONF_VARS']['MAIL']['layoutRootPaths'][700] = 'EXT:my_site_extension/Resources/Private/Layouts';`
+
+
+Impact
+======
+
+TYPO3 now sends out templated emails for system emails in both plaintext and HTML formats.
+
+It is possible to use the same API in your custom extension like this:
+
+.. code-block:: php
+
+ $email = GeneralUtility::makeInstance(FluidEmail::class);
+ $email
+ ->to('contact@acme.com')
+ ->from(new Address('jeremy@acme.com', 'Jeremy'))
+ ->subject('TYPO3 loves you - here is why')
+ ->setFormat('html') // only HTML mail
+ ->setTemplate('TipsAndTricks')
+ ->assign('mySecretIngredient', 'Tomato and TypoScript');
+ GeneralUtility::makeInstance(Mailer::class)->send($email);
+
+.. index:: Fluid, ext:core
diff --git a/typo3/sysext/core/Resources/Private/Layouts/SystemEmail.html b/typo3/sysext/core/Resources/Private/Layouts/SystemEmail.html
new file mode 100644
index 0000000000000000000000000000000000000000..d571575d0c4d23b144a224ac57d8849550051452
--- /dev/null
+++ b/typo3/sysext/core/Resources/Private/Layouts/SystemEmail.html
@@ -0,0 +1,432 @@
+<!doctype html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true" >
+<head>
+ <!--[if gte mso 15]>
+ <xml>
+ <o:OfficeDocumentSettings>
+ <o:AllowPNG/>
+ <o:PixelsPerInch>96</o:PixelsPerInch>
+ </o:OfficeDocumentSettings>
+ </xml>
+ <![endif]-->
+ <meta charset="UTF-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <title></title>
+ <style type="text/css">
+ p {
+ margin:10px 0;
+ padding:0;
+ }
+ table {
+ border-collapse:collapse;
+ }
+ h1,
+ h2,
+ h3,
+ h4,
+ h5,
+ h6 {
+ display:block;
+ margin:0;
+ padding:0;
+ }
+ img,
+ a img {
+ border:0;
+ height:auto;
+ outline:none;
+ text-decoration:none;
+ }
+ body,
+ #bodyTable,
+ #bodyCell {
+ height:100%;
+ margin:0;
+ padding:0;
+ width:100%;
+ }
+ #outlook a {
+ padding:0;
+ }
+ img {
+ -ms-interpolation-mode:bicubic;
+ }
+ table {
+ mso-table-lspace:0pt;
+ mso-table-rspace:0pt;
+ }
+ .ReadMsgBody {
+ width:100%;
+ }
+ .ExternalClass {
+ width:100%;
+ }
+ p,
+ a,
+ td {
+ mso-line-height-rule:exactly;
+ }
+ a[href^=tel],
+ a[href^=sms] {
+ color:inherit;
+ cursor:default;
+ text-decoration:none;
+ }
+ p,
+ a,
+ td,
+ body,
+ table,
+ blockquote {
+ -ms-text-size-adjust:100%;
+ -webkit-text-size-adjust:100%;
+ }
+ .ExternalClass,
+ .ExternalClass p,
+ .ExternalClass td,
+ .ExternalClass div,
+ .ExternalClass span,
+ .ExternalClass font {
+ line-height:100%;
+ }
+ a[x-apple-data-detectors]{
+ color:inherit !important;
+ text-decoration:none !important;
+ font-size:inherit !important;
+ font-family:inherit !important;
+ font-weight:inherit !important;
+ line-height:inherit !important;
+ }
+
+ .templateContainer {
+ max-width:600px !important;
+ }
+ a.button {
+ display:block;
+ }
+ .image,.retinaImage {
+ vertical-align:bottom;
+ }
+ .textContent {
+ word-break:break-word;
+ }
+ .textContent img {
+ height:auto !important;
+ }
+ .dividerBlock {
+ table-layout:fixed !important;
+ }
+ h1 {
+ color:#222222;
+ font-family:'Helvetica Neue', Helvetica, Arial, Verdana, sans-serif;
+ font-size:40px;
+ font-style:normal;
+ font-weight:bold;
+ line-height:150%;
+ letter-spacing:normal;
+ text-align:center;
+ }
+ h2 {
+ color:#222222;
+ font-family:'Helvetica Neue', Helvetica, Arial, Verdana, sans-serif;
+ font-size:34px;
+ font-style:normal;
+ font-weight:bold;
+ line-height:150%;
+ letter-spacing:normal;
+ text-align:left;
+ }
+ h3 {
+ color:#444444;
+ font-family:'Helvetica Neue', Helvetica, Arial, Verdana, sans-serif;
+ font-size:22px;
+ font-style:normal;
+ font-weight:bold;
+ line-height:150%;
+ letter-spacing:normal;
+ text-align:left;
+ }
+ h4 {
+ color:#999999;
+ font-family:'Helvetica Neue', Helvetica, Arial, Verdana, sans-serif;
+ font-size:20px;
+ font-style:italic;
+ font-weight:normal;
+ line-height:125%;
+ letter-spacing:normal;
+ text-align:left;
+ }
+ #templateHeader {
+ background-image:none;
+ background-repeat:no-repeat;
+ background-position:center;
+ background-size:cover;
+ border-top:0;
+ border-bottom:0;
+ padding-top:36px;
+ padding-bottom:0;
+ }
+ .headerContainer {
+ background-color:#ffffff;
+ background-image:none;
+ background-repeat:no-repeat;
+ background-position:center;
+ background-size:cover;
+ border-top:1px none ;
+ border-bottom:0;
+ padding-top:36px;
+ padding-bottom:36px;
+ }
+ .headerContainer .textContent,
+ .headerContainer .textContent p {
+ color:#808080;
+ font-family:'Helvetica Neue', Helvetica, Arial, Verdana, sans-serif;
+ font-size:16px;
+ line-height:150%;
+ text-align:left;
+ }
+ .headerContainer .textContent a,
+ .headerContainer .textContent p a {
+ color:#538bb3;
+ font-weight:normal;
+ text-decoration:underline;
+ }
+ #templateBody {
+ background-color:#f2f2f2;
+ background-image:none;
+ background-repeat:no-repeat;
+ background-position:center;
+ background-size:cover;
+ border-top:0;
+ border-bottom:0;
+ padding-top:0;
+ padding-bottom:0;
+ }
+ .bodyContainer {
+ background-color:#ffffff;
+ background-image:none;
+ background-repeat:no-repeat;
+ background-position:center;
+ background-size:cover;
+ border-top:0;
+ border-bottom:0;
+ padding-top:0;
+ padding-bottom:18px;
+ }
+ .bodyContainer .textContent,
+ .bodyContainer .textContent p {
+ color:#808080;
+ font-family:'Helvetica Neue', Helvetica, Arial, Verdana, sans-serif;
+ font-size:16px;
+ line-height:150%;
+ text-align:left;
+ }
+ .bodyContainer .textContent a,
+ .bodyContainer .textContent p a {
+ color:#538bb3;
+ font-weight:normal;
+ text-decoration:underline;
+ }
+ #templateFooter{
+ background-color:#f2f2f2;
+ background-image:none;
+ background-repeat:no-repeat;
+ background-position:center;
+ background-size:cover;
+ border-top:1px none ;
+ border-bottom:0;
+ padding-top:0;
+ padding-bottom:36px;
+ }
+ .footerContainer{
+ background-color:#313131;
+ background-image:none;
+ background-repeat:no-repeat;
+ background-position:center;
+ background-size:cover;
+ border-top:0;
+ border-bottom:0;
+ padding-top:45px;
+ padding-bottom:45px;
+ }
+ .footerContainer .textContent,
+ .footerContainer .textContent p {
+ color:#FFFFFF;
+ font-family:'Helvetica Neue', Helvetica, Arial, Verdana, sans-serif;
+ font-size:12px;
+ line-height:150%;
+ text-align:center;
+ }
+ .footerContainer .textContent a,
+ .footerContainer .textContent p a {
+ color:#FFFFFF;
+ font-weight:normal;
+ text-decoration:underline;
+ }
+ @media only screen and (min-width:768px){
+ .templateContainer {
+ width:600px !important;
+ }
+ }
+ @media only screen and (max-width: 480px){
+ body,
+ table,
+ td,
+ p,
+ a {
+ -webkit-text-size-adjust:none !important;
+ }
+ body {
+ width:100% !important;
+ min-width:100% !important;
+ }
+ h1 {
+ font-size:30px !important;
+ line-height:125% !important;
+ }
+ h2 {
+ font-size:26px !important;
+ line-height:125% !important;
+ }
+ h3 {
+ font-size:20px !important;
+ line-height:150% !important;
+ }
+ h4 {
+ font-size:18px !important;
+ line-height:150% !important;
+ }
+ .headerContainer .textContent,
+ .headerContainer .textContent p {
+ font-size:16px !important;
+ line-height:150% !important;
+ }
+ .bodyContainer .textContent,
+ .bodyContainer .textContent p {
+ font-size:16px !important;
+ line-height:150% !important;
+ }
+ }
+ </style>
+</head>
+<body>
+
+
+<center>
+ <table align="center" border="0" cellpadding="0" cellspacing="0" height="100%" width="100%" id="bodyTable"><tr><td align="center" valign="top" id="bodyCell">
+ <table border="0" cellpadding="0" cellspacing="0" width="100%">
+
+ <f:if condition="{typo3.systemConfiguration.backend.loginHighlightColor}">
+ <f:then>
+ <f:variable name="backgroundColor" value="{typo3.systemConfiguration.backend.loginHighlightColor}" />
+ </f:then>
+ <f:else>
+ <f:variable name="backgroundColor" value="#ff8700" />
+ </f:else>
+ </f:if>
+
+ <!-- HEADER START -->
+ <tr><td align="center" valign="top" id="templateHeader" style="background-color: {backgroundColor}">
+
+ <!--[if (gte mso 9)|(IE)]><table align="center" border="0" cellspacing="0" cellpadding="0" width="600" style="width:600px;"><tr><td align="center" valign="top" width="600" style="width:600px;"><![endif]-->
+ <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" class="templateContainer"><tr><td valign="top" class="headerContainer">
+ <table border="0" cellpadding="0" cellspacing="0" width="100%" class="textBlock" style="min-width:100%;"><tbody class="textBlockOuter"><tr><td valign="top" class="textBlockInner" style="padding-top:9px;">
+
+ <!--[if mso]><table align="left" border="0" cellspacing="0" cellpadding="0" width="100%" style="width:100%;"><tr><td valign="top" width="600" style="width:600px;"><![endif]-->
+ <table align="left" border="0" cellpadding="0" cellspacing="0" style="max-width:100%; min-width:100%;" width="100%" class="textContentContainer">
+ <tbody>
+ <tr>
+ <td valign="top" class="image" align="center" style="padding: 0px 36px; padding-bottom: 20px; color: #222222;text-align: center;">
+ <f:if condition="{typo3.systemConfiguration.backend.loginLogo}">
+ <f:then>
+ <f:image src="{typo3.systemConfiguration.backend.loginLogo}" absolute="1" alt="TYPO3 Logo" height="41" width="150" />
+ </f:then>
+ <f:else if="{typo3.systemConfiguration.backend.loginHighlightColor}">
+ <f:image src="EXT:backend/Resources/Public/Images/typo3_black.svg" absolute="1" alt="TYPO3 Logo" height="41" width="150" />
+ </f:else>
+ <f:else>
+ <img src="{normalizedParams.siteUrl}{f:uri.resource(extensionName: 'backend', path: 'Images/typo3_orange.svg')}" alt="TYPO3 Logo" height="41" width="150" />
+ </f:else>
+ </f:if>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" class="textContent" style="padding: 0px 36px;color: #222222;font-family: "Helvetica Neue", Helvetica, Arial, Verdana, sans-serif;font-size: 24px;text-align: center;">
+ <strong><f:render section="Title" optional="true" /></strong>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <!--[if mso]></td></tr></table><![endif]-->
+
+ </td></tr></tbody></table>
+ </td></tr></table>
+ <!--[if (gte mso 9)|(IE)]></td></tr></table><![endif]-->
+
+ </td></tr>
+ <!-- HEADER END -->
+
+
+ <!-- BODY START -->
+ <tr><td align="center" valign="top" id="templateBody">
+
+ <!--[if (gte mso 9)|(IE)]><table align="center" border="0" cellspacing="0" cellpadding="0" width="600" style="width:600px;"><tr><td align="center" valign="top" width="600" style="width:600px;"><![endif]-->
+ <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" class="templateContainer"><tr><td valign="top" class="bodyContainer">
+ <table border="0" cellpadding="0" cellspacing="0" width="100%" class="textBlock" style="min-width:100%;"><tbody class="textBlockOuter"><tr><td valign="top" class="textBlockInner" style="padding: 36px 0px;">
+
+ <!--[if mso]><table align="left" border="0" cellspacing="0" cellpadding="0" width="100%" style="width:100%;"><tr><td valign="top" width="600" style="width:600px;"><![endif]-->
+ <table align="left" border="0" cellpadding="0" cellspacing="0" style="max-width:100%; min-width:100%;" width="100%" class="textContentContainer">
+ <tbody>
+ <tr>
+ <td valign="top" class="textContent" style="padding: 0px 36px;">
+
+ <f:render section="Main" />
+
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <!--[if mso]></td></tr></table><![endif]-->
+
+ </td></tr></tbody></table>
+ </td></tr></table>
+ <!--[if (gte mso 9)|(IE)]></td></tr></table><![endif]-->
+
+ </td></tr>
+ <!-- BODY END -->
+
+ <!-- FOOTER START -->
+ <tr><td align="center" valign="top" id="templateFooter">
+
+ <!--[if (gte mso 9)|(IE)]><table align="center" border="0" cellspacing="0" cellpadding="0" width="600" style="width:600px;"><tr><td align="center" valign="top" width="600" style="width:600px;"><![endif]-->
+ <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" class="templateContainer"><tr><td valign="top" class="footerContainer">
+ <table border="0" cellpadding="0" cellspacing="0" width="100%" class="textBlock" style="min-width:100%;"><tbody class="textBlockOuter"><tr><td valign="top" class="textBlockInner">
+
+ <!--[if mso]><table align="left" border="0" cellspacing="0" cellpadding="0" width="100%" style="width:100%;"><tr><td valign="top" width="600" style="width:600px;"><![endif]-->
+ <table align="left" border="0" cellpadding="0" cellspacing="0" style="max-width:100%; min-width:100%;" width="100%" class="textContentContainer"><tbody><tr><td valign="top" class="textContent" style="padding:0 36px;">
+
+ <p style="margin-top: 0;">
+ This email was sent by <strong>{typo3.sitename}</strong> from URL: <a href="{normalizedParams.siteUrl}" target="_blank" rel="noopener">{normalizedParams.siteUrl}</a> - Please contact your site administrator if you feel you received this email by accident.
+ </p>
+ <p style="margin-top: 0;">
+ {typo3.information.copyrightNotice -> f:format.raw()}
+ </p>
+
+ </td></tr></tbody></table>
+ <!--[if mso]></td></tr></table><![endif]-->
+
+ </td></tr></tbody></table>
+ </td></tr></table>
+ <!--[if (gte mso 9)|(IE)]></td></tr></table><![endif]-->
+
+
+ </td></tr>
+ <!-- FOOTER END -->
+
+ </table>
+ </td></tr></table>
+</center>
+
+</body>
+</html>
diff --git a/typo3/sysext/core/Resources/Private/Layouts/SystemEmail.txt b/typo3/sysext/core/Resources/Private/Layouts/SystemEmail.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1ebfb8f2592c7fec4f7b6a51b3139575230a2b65
--- /dev/null
+++ b/typo3/sysext/core/Resources/Private/Layouts/SystemEmail.txt
@@ -0,0 +1,8 @@
+<f:spaceless><f:render section="Title" />
+<f:render section="Main" /></f:spaceless>
+
+This email was sent by {typo3.sitename} from URL: {normalizedParams.siteUrl}
+
+Please contact your site administrator if you feel you received this email by accident.
+
+{typo3.information.copyrightNotice -> f:format.stripTags() -> f:format.htmlentitiesDecode()}
diff --git a/typo3/sysext/core/Resources/Private/Templates/Email/Default.html b/typo3/sysext/core/Resources/Private/Templates/Email/Default.html
new file mode 100644
index 0000000000000000000000000000000000000000..4b82b35432458394804b319e4fa043eb45f5c515
--- /dev/null
+++ b/typo3/sysext/core/Resources/Private/Templates/Email/Default.html
@@ -0,0 +1,8 @@
+<f:layout name="SystemEmail" />
+<f:section name="Title">{headline}</f:section>
+<f:section name="Main">
+ <f:if condition="{introduction}">
+ <h4>{introduction}</h4>
+ </f:if>
+ <p>{content}</p>
+</f:section>
diff --git a/typo3/sysext/core/Resources/Private/Templates/Email/Default.txt b/typo3/sysext/core/Resources/Private/Templates/Email/Default.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0c43f3a37c631e9bbfb875b420b1ad5adcea58a2
--- /dev/null
+++ b/typo3/sysext/core/Resources/Private/Templates/Email/Default.txt
@@ -0,0 +1,5 @@
+<f:layout name="SystemEmail" />
+<f:section name="Title">{headline}</f:section>
+<f:section name="Main">{introduction}
+
+{content}</f:section>
diff --git a/typo3/sysext/core/Tests/Functional/Mail/FluidEmailTest.php b/typo3/sysext/core/Tests/Functional/Mail/FluidEmailTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..ac92ced917cda9c1135a1f93d8f294129d406279
--- /dev/null
+++ b/typo3/sysext/core/Tests/Functional/Mail/FluidEmailTest.php
@@ -0,0 +1,76 @@
+<?php
+declare(strict_types = 1);
+namespace TYPO3\CMS\Core\Tests\Functional\Mail;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+use TYPO3\CMS\Core\Mail\FluidEmail;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
+
+class FluidEmailTest extends FunctionalTestCase
+{
+ /**
+ * @test
+ */
+ public function settingFormatWithTextOnlyGeneratesTextEmail()
+ {
+ $subject = new FluidEmail();
+ $subject
+ ->format(FluidEmail::FORMAT_PLAIN)
+ ->setTemplate('Default')
+ ->from('benniYYYY@typo3.org')
+ ->assign('content', 'Plain content from Functional test');
+ $result = $subject->getBody();
+ self::assertEquals('plain', $result->getMediaSubtype());
+ self::assertStringContainsString('Plain content from Functional test', $result->bodyToString());
+ self::assertEmpty($subject->getHtmlBody());
+ self::assertNotEmpty($subject->getTextBody());
+ }
+
+ /**
+ * @test
+ */
+ public function settingFormatWithHtmlOnlyGeneratesHtmlEmail()
+ {
+ $subject = new FluidEmail();
+ $subject
+ ->format(FluidEmail::FORMAT_HTML)
+ ->setTemplate('Default')
+ ->from('benniYYYY@typo3.org')
+ ->assign('content', 'HTML content <strong>from</strong> Functional test');
+ $result = $subject->getBody();
+ self::assertEquals('html', $result->getMediaSubtype());
+ self::assertStringContainsString('<strong>from</strong>', $result->bodyToString());
+ self::assertNotEmpty($subject->getHtmlBody());
+ self::assertEmpty($subject->getTextBody());
+ }
+
+ /**
+ * @test
+ */
+ public function settingFormatWithTextAndHtmlGeneratesTwoBodies()
+ {
+ $subject = new FluidEmail();
+ $subject
+ ->format(FluidEmail::FORMAT_BOTH)
+ ->setTemplate('Default')
+ ->from('benniYYYY@typo3.org')
+ ->assign('content', 'Plain content <strong>from</strong> Functional test');
+ $result = $subject->getBody();
+ self::assertEquals('alternative', $result->getMediaSubtype());
+ self::assertStringContainsString('<strong>from</strong>', $result->bodyToString());
+ self::assertNotEmpty($subject->getHtmlBody());
+ self::assertNotEmpty($subject->getTextBody());
+ }
+}
diff --git a/typo3/sysext/install/Classes/Authentication/AuthenticationService.php b/typo3/sysext/install/Classes/Authentication/AuthenticationService.php
index 8d92165faf9f8574384d9ff73ddd61f833dd36f5..80bf5645e806f202a3083c576b37fb8859bc1e48 100644
--- a/typo3/sysext/install/Classes/Authentication/AuthenticationService.php
+++ b/typo3/sysext/install/Classes/Authentication/AuthenticationService.php
@@ -17,8 +17,10 @@ namespace TYPO3\CMS\Install\Authentication;
use Symfony\Component\Mime\Address;
use TYPO3\CMS\Core\Crypto\PasswordHashing\PasswordHashFactory;
-use TYPO3\CMS\Core\Mail\MailMessage;
+use TYPO3\CMS\Core\Mail\FluidEmail;
+use TYPO3\CMS\Core\Mail\Mailer;
use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Core\Utility\MailUtility;
use TYPO3\CMS\Install\Service\SessionService;
/**
@@ -72,18 +74,16 @@ class AuthenticationService
protected function sendLoginSuccessfulMail()
{
$warningEmailAddress = $GLOBALS['TYPO3_CONF_VARS']['BE']['warning_email_addr'];
- if ($warningEmailAddress) {
- $mailMessage = GeneralUtility::makeInstance(MailMessage::class);
- $mailMessage
- ->to($warningEmailAddress)
- ->subject('Install Tool Login at \'' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'] . '\'')
- ->from(new Address($this->getSenderEmailAddress(), $this->getSenderEmailName()))
- ->text('There has been an Install Tool login at TYPO3 site'
- . ' \'' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'] . '\''
- . ' (' . GeneralUtility::getIndpEnv('HTTP_HOST') . ')'
- . ' from remote address \'' . GeneralUtility::getIndpEnv('REMOTE_ADDR') . '\'')
- ->send();
+ if (!$warningEmailAddress) {
+ return;
}
+ $email = GeneralUtility::makeInstance(FluidEmail::class);
+ $email
+ ->to($warningEmailAddress)
+ ->subject('Install Tool Login at \'' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'] . '\'')
+ ->from(new Address($this->getSenderEmailAddress(), $this->getSenderEmailName()))
+ ->setTemplate('Security/InstallToolLogin');
+ GeneralUtility::makeInstance(Mailer::class)->send($email);
}
/**
@@ -91,21 +91,19 @@ class AuthenticationService
*/
protected function sendLoginFailedMail()
{
- $formValues = GeneralUtility::_GP('install');
$warningEmailAddress = $GLOBALS['TYPO3_CONF_VARS']['BE']['warning_email_addr'];
- if ($warningEmailAddress) {
- $mailMessage = GeneralUtility::makeInstance(MailMessage::class);
- $mailMessage
- ->to($warningEmailAddress)
- ->subject('Install Tool Login ATTEMPT at \'' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'] . '\'')
- ->from(new Address($this->getSenderEmailAddress(), $this->getSenderEmailName()))
- ->text('There has been an Install Tool login attempt at TYPO3 site'
- . ' \'' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'] . '\''
- . ' (' . GeneralUtility::getIndpEnv('HTTP_HOST') . ')'
- . ' The last 5 characters of the MD5 hash of the password tried was \'' . substr(md5($formValues['password']), -5) . '\''
- . ' remote address was \'' . GeneralUtility::getIndpEnv('REMOTE_ADDR') . '\'')
- ->send();
+ if (!$warningEmailAddress) {
+ return;
}
+ $formValues = GeneralUtility::_GP('install');
+ $email = GeneralUtility::makeInstance(FluidEmail::class);
+ $email
+ ->to($warningEmailAddress)
+ ->subject('Install Tool Login ATTEMPT at \'' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'] . '\'')
+ ->from(new Address($this->getSenderEmailAddress(), $this->getSenderEmailName()))
+ ->setTemplate('Security/InstallToolLoginAttempt')
+ ->assign('lastCharactersOfPassword', substr(md5($formValues['password']), -5));
+ GeneralUtility::makeInstance(Mailer::class)->send($email);
}
/**
@@ -117,9 +115,7 @@ class AuthenticationService
*/
protected function getSenderEmailAddress()
{
- return !empty($GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'])
- ? $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress']
- : 'no-reply@example.com';
+ return MailUtility::getSystemFromAddress();
}
/**
@@ -131,8 +127,6 @@ class AuthenticationService
*/
protected function getSenderEmailName()
{
- return !empty($GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromName'])
- ? $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromName']
- : 'TYPO3 CMS install tool';
+ return MailUtility::getSystemFromName() ?: 'TYPO3 CMS install tool';
}
}
diff --git a/typo3/sysext/install/Classes/Controller/EnvironmentController.php b/typo3/sysext/install/Classes/Controller/EnvironmentController.php
index c5a39203073bd532bbb4dea2a4bdce7c64384751..e90801cd7a01e29dba308b4ed2ca699c91b38ec4 100644
--- a/typo3/sysext/install/Classes/Controller/EnvironmentController.php
+++ b/typo3/sysext/install/Classes/Controller/EnvironmentController.php
@@ -24,7 +24,8 @@ use TYPO3\CMS\Core\FormProtection\FormProtectionFactory;
use TYPO3\CMS\Core\FormProtection\InstallToolFormProtection;
use TYPO3\CMS\Core\Http\JsonResponse;
use TYPO3\CMS\Core\Imaging\GraphicalFunctions;
-use TYPO3\CMS\Core\Mail\MailMessage;
+use TYPO3\CMS\Core\Mail\FluidEmail;
+use TYPO3\CMS\Core\Mail\Mailer;
use TYPO3\CMS\Core\Messaging\FlashMessage;
use TYPO3\CMS\Core\Messaging\FlashMessageQueue;
use TYPO3\CMS\Core\Utility\CommandUtility;
@@ -236,7 +237,6 @@ class EnvironmentController extends AbstractController
{
$messages = new FlashMessageQueue('install');
$recipient = $request->getParsedBody()['install']['email'];
- $delivered = false;
if (empty($recipient) || !GeneralUtility::validEmail($recipient)) {
$messages->enqueue(new FlashMessage(
'Given address is not a valid email address.',
@@ -245,19 +245,24 @@ class EnvironmentController extends AbstractController
));
} else {
try {
- $mailMessage = GeneralUtility::makeInstance(MailMessage::class);
+ $variables = [
+ 'headline' => 'TYPO3 Test Mail',
+ 'introduction' => 'Hey TYPO3 Administrator',
+ 'content' => 'Seems like your favorite TYPO3 installation can send out emails!'
+ ];
+ $mailMessage = GeneralUtility::makeInstance(FluidEmail::class);
$mailMessage
->to($recipient)
->from(new Address($this->getSenderEmailAddress(), $this->getSenderEmailName()))
->subject($this->getEmailSubject())
- ->html('<html><body>html test content</body></html>')
- ->text('plain test content')
- ->send();
+ ->setRequest($request)
+ ->assignMultiple($variables);
+
+ GeneralUtility::makeInstance(Mailer::class)->send($mailMessage);
$messages->enqueue(new FlashMessage(
'Recipient: ' . $recipient,
'Test mail sent'
));
- $delivered = true;
} catch (\Symfony\Component\Mime\Exception\RfcComplianceException $exception) {
$messages->enqueue(new FlashMessage(
'Please verify $GLOBALS[\'TYPO3_CONF_VARS\'][\'MAIL\'][\'defaultMailFromAddress\'] is a valid mail address.'
diff --git a/typo3/sysext/install/Resources/Private/Templates/Email/Security/InstallToolLogin.html b/typo3/sysext/install/Resources/Private/Templates/Email/Security/InstallToolLogin.html
new file mode 100644
index 0000000000000000000000000000000000000000..22a00b93a7a96a678a60188b7449cdfa73427761
--- /dev/null
+++ b/typo3/sysext/install/Resources/Private/Templates/Email/Security/InstallToolLogin.html
@@ -0,0 +1,6 @@
+<f:layout name="SystemEmail" />
+<f:section name="Title">{headline}</f:section>
+<f:section name="Main">
+ <h4>{introduction}</h4>
+ <p>There has been a successful Install Tool login at TYPO3 site "{typo3.sitename}" from the IP address <strong>{normalizedParams.remoteAddress}</strong>.</p>
+</f:section>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Email/Security/InstallToolLogin.txt b/typo3/sysext/install/Resources/Private/Templates/Email/Security/InstallToolLogin.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c36b33e958edd01a7344f46b2b5a72bdfb857cf6
--- /dev/null
+++ b/typo3/sysext/install/Resources/Private/Templates/Email/Security/InstallToolLogin.txt
@@ -0,0 +1,5 @@
+<f:layout name="SystemEmail" />
+<f:section name="Title">{headline}</f:section>
+<f:section name="Main">{introduction}
+There has been a successful Install Tool login at TYPO3 site "{typo3.sitename}" from the IP address "{normalizedParams.remoteAddress}".
+</f:section>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Email/Security/InstallToolLoginAttempt.html b/typo3/sysext/install/Resources/Private/Templates/Email/Security/InstallToolLoginAttempt.html
new file mode 100644
index 0000000000000000000000000000000000000000..745007c48bda34c087faa7ab1df87244d9540383
--- /dev/null
+++ b/typo3/sysext/install/Resources/Private/Templates/Email/Security/InstallToolLoginAttempt.html
@@ -0,0 +1,7 @@
+<f:layout name="SystemEmail" />
+<f:section name="Title">{headline}</f:section>
+<f:section name="Main">
+ <h4>{introduction}</h4>
+ <p>There has been an Install Tool login attempt at TYPO3 site "{typo3.sitename}" from the IP address <strong>{normalizedParams.remoteAddress}</strong>.</p>
+ <p>The last 5 characters of the password hash tried was <strong>"{lastCharactersOfPassword}"</strong>.</p>
+</f:section>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Email/Security/InstallToolLoginAttempt.txt b/typo3/sysext/install/Resources/Private/Templates/Email/Security/InstallToolLoginAttempt.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d1f96d73fed1241c100c032519a5fcfd9042ec8a
--- /dev/null
+++ b/typo3/sysext/install/Resources/Private/Templates/Email/Security/InstallToolLoginAttempt.txt
@@ -0,0 +1,7 @@
+<f:layout name="SystemEmail" />
+<f:section name="Title">{headline}</f:section>
+<f:section name="Main">{introduction}
+There has been an Install Tool login attempt at TYPO3 site "{typo3.sitename}" from the IP address "{normalizedParams.remoteAddress}".
+
+The last 5 characters of the password hash tried was "{lastCharactersOfPassword}".
+</f:section>