[BUGFIX] Use default sender email as fallback for optin forms

Related: #630
in2code-de · Sep 25, 2024 · a2c1eb9 · a2c1eb9
1 parent ade965d
commit a2c1eb9
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/Classes/Domain/Service/Mail/SendOptinConfirmationMailPreflight.php b/Classes/Domain/Service/Mail/SendOptinConfirmationMailPreflight.php
@@ -56,17 +56,20 @@ public function __construct(array $settings, array $conf, Request $request)
      */
     public function sendOptinConfirmationMail(Mail $mail): void
     {
+        /** @var SenderMailPropertiesService $senderService */
+        $senderService = GeneralUtility::makeInstance(SenderMailPropertiesService::class, $this->settings);
+
         $email = [
             'template' => 'Mail/OptinMail',
             'receiverEmail' => $this->mailRepository->getSenderMailFromArguments($mail),
             'receiverName' => $this->mailRepository->getSenderNameFromArguments(
                 $mail,
                 [$this->conf['sender.']['default.'], 'senderName']
             ),
-            'senderEmail' => $this->settings['sender']['email'],
-            'senderName' => $this->settings['sender']['name'],
-            'replyToEmail' => $this->settings['sender']['email'],
-            'replyToName' => $this->settings['sender']['name'],
+            'senderEmail' => $senderService->getSenderEmail(),
+            'senderName' => $senderService->getSenderName(),
+            'replyToEmail' => $senderService->getSenderEmail(),
+            'replyToName' => $senderService->getSenderName(),
             'subject' => ObjectUtility::getContentObject()->cObjGetSingle(
                 $this->conf['optin.']['subject'],
                 $this->conf['optin.']['subject.']