[TASK] Replace flogin email templates by core

Lacr1ma · Oct 4, 2021 · ee55045 · ee55045
1 parent b54f5ff
commit ee55045
Show file tree

Hide file tree

Showing 29 changed files with 183 additions and 698 deletions.
diff --git a/Classes/Notification/AbstractNotificationSender.php b/Classes/Notification/AbstractNotificationSender.php
@@ -1,4 +1,6 @@
 <?php
+/** @noinspection PhpUnhandledExceptionInspection */
+
 declare(strict_types = 1);
 
 namespace LMS\Flogin\Notification;
@@ -26,50 +28,41 @@
  *  This copyright notice MUST APPEAR in all copies of the script!
  * ************************************************************* */
 
+use TYPO3\CMS\Core\Mail\Mailer;
 use LMS\Flogin\Support\TypoScript;
-use TYPO3\CMS\Core\Core\Environment;
-use TYPO3\CMS\Core\Mail\MailMessage;
-use LMS\Flogin\Support\Helper\HtmlView;
+use TYPO3\CMS\Core\Mail\FluidEmail;
+use Symfony\Component\Mime\Address;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
-use TijsVerkoyen\CssToInlineStyles\CssToInlineStyles;
 
 /**
  * @author Sergey Borulko <borulkosergey@icloud.com>
  */
 abstract class AbstractNotificationSender
 {
-    use HtmlView;
-
-    protected MailMessage $mail;
+    protected Mailer $mailer;
 
-    public function __construct(MailMessage $message)
+    public function __construct(Mailer $mailer)
     {
-        $this->mail = $message;
+        $this->mailer = $mailer;
     }
 
     /**
      * Sends the email to proper location based on abstract functions
      */
     protected function sendViaMail(array $receiver, array $variables = []): void
     {
-        $view = $this->getExtensionView($this->getTemplateSuffix(), $variables);
-        $html = $this->applyStyles($view->render());
-
-        $this->mail
-            ->setSubject($this->getSubject())
-            ->setTo($receiver)
-            ->html($html)
-            ->send();
-    }
-
-    protected function applyStyles(string $html): string
-    {
-        $css = GeneralUtility::makeInstance(CssToInlineStyles::class);
+        $to = new Address(array_key_first($receiver) ?: '', array_shift($receiver));
 
-        $cssPath = Environment::getPublicPath() . '/' . $this->getSettings()['stylesPath'];
+        $mail = GeneralUtility::makeInstance(FluidEmail::class)
+            ->to($to)
+            ->format('html')
+            ->subject($this->getSubject())
+            ->setTemplate($this->getTemplateSuffix())
+            ->assign('data', $variables)
+            ->assign('headline', $this->getSubject());
 
-        return $css->convert($html, file_get_contents($cssPath));
+        $this->mailer->send($mail);
     }
 
     /**

diff --git a/Classes/Slot/Notification/LockoutNotification.php b/Classes/Slot/Notification/LockoutNotification.php
@@ -59,6 +59,6 @@ protected function getSubject(): string
      */
     protected function getTemplateSuffix(): string
     {
-        return 'Email/Lockout';
+        return 'Lockout';
     }
 }
diff --git a/Classes/Slot/Notification/LoginNotification.php b/Classes/Slot/Notification/LoginNotification.php
@@ -73,6 +73,6 @@ protected function getSubject(): string
      */
     protected function getTemplateSuffix(): string
     {
-        return 'Email/Login';
+        return 'Login';
     }
 }
diff --git a/Classes/Slot/Notification/MagicLinkNotification.php b/Classes/Slot/Notification/MagicLinkNotification.php
@@ -59,6 +59,6 @@ protected function getSubject(): string
      */
     protected function getTemplateSuffix(): string
     {
-        return 'Email/MagicLink';
+        return 'MagicLink';
     }
 }
diff --git a/Classes/Slot/Notification/PasswordChangedNotification.php b/Classes/Slot/Notification/PasswordChangedNotification.php
@@ -59,6 +59,6 @@ protected function getSubject(): string
      */
     protected function getTemplateSuffix(): string
     {
-        return 'Email/Password/Changed';
+        return 'Password/Changed';
     }
 }
diff --git a/Classes/Slot/Notification/ResetPasswordNotification.php b/Classes/Slot/Notification/ResetPasswordNotification.php
@@ -59,6 +59,6 @@ protected function getSubject(): string
      */
     protected function getTemplateSuffix(): string
     {
-        return 'Email/Password/ResetRequest';
+        return 'Password/ResetRequest';
     }
 }
diff --git a/Configuration/Commands.php b/Configuration/Commands.php
diff --git a/Configuration/TCA/Overrides/sys_template.php b/Configuration/TCA/Overrides/sys_template.php
@@ -26,4 +26,8 @@
 
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 
-ExtensionManagementUtility::addStaticFile('flogin', 'Configuration/TypoScript', 'LMS: Login');
+ExtensionManagementUtility::addStaticFile(
+    'flogin',
+    'Configuration/TypoScript',
+    'LMS: Login'
+);
diff --git a/Configuration/TypoScript/Constants/Settings/email.typoscript b/Configuration/TypoScript/Constants/Settings/email.typoscript
@@ -1,14 +1,5 @@
 plugin.tx_flogin.settings.email {
 
-    # cat=plugin.tx_flogin//a; type=string; label=Used inside the bottom area of the mail. Basically link to owner website.
-    site = https://typo3.org
-
-    # cat=plugin.tx_flogin//a; type=string; label=Full path to the logo image.
-    logoPath = EXT:flogin/Resources/Public/Icons/Logo.svg
-
-    # cat=plugin.tx_flogin//a; type=string; label=Full path to the css file that should be connected in email
-    stylesPath = typo3conf/ext/flogin/Resources/Public/Css/Email.css
-
     magicLink {
         # cat=plugin.tx_flogin//a; type=string; label=Translation file path with key, that contains subject for magic link notification.
         subject = LLL:EXT:flogin/Resources/Private/Language/email.xlf:magic_link.subject

diff --git a/Configuration/TypoScript/Setup/settings.typoscript b/Configuration/TypoScript/Setup/settings.typoscript
@@ -36,10 +36,6 @@ plugin.tx_flogin.settings {
     }
 
     email {
-        site = {$plugin.tx_flogin.settings.email.site}
-        logoPath = {$plugin.tx_flogin.settings.email.logoPath}
-        stylesPath = {$plugin.tx_flogin.settings.email.stylesPath}
-
         magicLink {
             subject = {$plugin.tx_flogin.settings.email.magicLink.subject}
             linkLifetimeInMinutes = {$plugin.tx_flogin.settings.email.magicLink.linkLifetimeInMinutes}

diff --git a/Resources/Private/Layouts/Email.html b/Resources/Private/Layouts/Email.html
diff --git a/Resources/Private/Templates/Email/Lockout.html b/Resources/Private/Templates/Email/Lockout.html
@@ -1,55 +1,24 @@
-<f:layout name="Email"/>
+<f:layout name="SystemEmail" />
 
-<f:section name="Header">
-    <img src="{f:uri.image(src: '{email.logoPath}', absolute: 1)}" class="logo" width="250"/>
-</f:section>
+<f:section name="Title">{headline}</f:section>
 
 <f:section name="Main">
-    <table width="100%" cellspacing="0" cellpadding="0" bgcolor="#fcfcfc">
-
-        <tr>
-            <td class="es-m-txt-c" align="center">
-                <h2>
-                    <strong>
-                        <f:translate key="LLL:EXT:flogin/Resources/Private/Language/email.xlf:lockout.caption"/>
-                    </strong>
-                </h2>
-            </td>
-        </tr>
-
-        <tr>
-            <td class="es-m-txt-l" bgcolor="transparent" align="left">
-                <span>
-                    <f:translate arguments="{0: '{user.lockMinutesInterval}'}" key="LLL:EXT:flogin/Resources/Private/Language/email.xlf:lockout.caption_description"/>
-                </span>
-            </td>
-        </tr>
-
-        <tr>
-            <td align="center" class="es-m-txt-c">
-                <span class="es-button-border">
-                    <f:cache.disable>
-                         <a href="{user.unlockActionUrl}" class="es-button" target="_blank">
-                            <f:translate key="LLL:EXT:flogin/Resources/Private/Language/email.xlf:lockout.button_unlock"/>
-                        </a>
-                    </f:cache.disable>
-                </span>
-            </td>
-        </tr>
-
-        <tr>
-            <td class="es-m-txt-l" bgcolor="transparent" align="left">
-                <span>
-                    <f:translate key="LLL:EXT:flogin/Resources/Private/Language/email.xlf:lockout.help"/>
-                </span>
-            </td>
-        </tr>
-
-    </table>
-</f:section>
-
-<f:section name="Footer">
-    <f:format.raw>
-        <f:translate arguments="{0: '{email.site}'}" key="LLL:EXT:flogin/Resources/Private/Language/email.xlf:common.signature"/>
-    </f:format.raw>
-</f:section>
+    <h3>
+        <f:translate key="LLL:EXT:flogin/Resources/Private/Language/email.xlf:lockout.caption"/>
+    </h3>
+
+    <p>
+        <f:translate arguments="{0: '{data.user.lockMinutesInterval}'}" key="LLL:EXT:flogin/Resources/Private/Language/email.xlf:lockout.caption_description"/>
+
+        <f:cache.disable>
+            <a href="{data.user.unlockActionUrl}" class="es-button" target="_blank">
+                <f:translate key="LLL:EXT:flogin/Resources/Private/Language/email.xlf:lockout.button_unlock"/>
+            </a>
+        </f:cache.disable>
+        <br/>
+    </p>
+
+    <p>
+        <f:translate key="LLL:EXT:flogin/Resources/Private/Language/email.xlf:lockout.help"/>
+    </p>
+</f:section>