[BUGFIX] Remove extbase debugger markup in MailFactory.php

There is the rare chance that some extbase debugger code is saved in the database in the body field of mails. Switching to another function solves the issue. Related in2code-pro/powermail#3 Related #897 Fixes #920
in2code-de · Nov 3, 2023 · 45950c9 · 45950c9
1 parent 4fc5e40
commit 45950c9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Classes/Domain/Factory/MailFactory.php b/Classes/Domain/Factory/MailFactory.php
@@ -11,7 +11,7 @@
 use In2code\Powermail\Utility\SessionUtility;
 use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationExtensionNotConfiguredException;
 use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationPathDoesNotExistException;
-use TYPO3\CMS\Core\Utility\DebugUtility;
+use TYPO3\CMS\Core\Utility\ArrayUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Object\Exception;
 use TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotException;
@@ -42,7 +42,7 @@ public function prepareMailForPersistence(Mail $mail, array $settings): void
             ->setSenderName($mailRepository->getSenderNameFromArguments($mail))
             ->setSubject($settings['receiver']['subject'])
             ->setReceiverMail($settings['receiver']['email'])
-            ->setBody(DebugUtility::viewArray($mailRepository->getVariablesWithMarkersFromMail($mail)))
+            ->setBody(ArrayUtility::arrayExport($mailRepository->getVariablesWithMarkersFromMail($mail)))
             ->setSpamFactor(SessionUtility::getSpamFactorFromSession())
             ->setTime((time() - SessionUtility::getFormStartFromSession($mail->getForm()->getUid(), $settings)))
             ->setUserAgent(GeneralUtility::getIndpEnv('HTTP_USER_AGENT'))

diff --git a/Classes/Utility/ArrayUtility.php b/Classes/Utility/ArrayUtility.php
@@ -148,7 +148,7 @@ public static function arrayMergeRecursiveOverrule(
                             $firstArray[$key] = $value;
                         }
                     }
-                // @codeCoverageIgnoreEnd
+                    // @codeCoverageIgnoreEnd
                 } else {
                     if ($emptyValuesOverride || !empty($value)) {
                         $firstArray[$key] = $value;

diff --git a/Classes/Utility/StringUtility.php b/Classes/Utility/StringUtility.php
@@ -27,7 +27,7 @@ public static function isNotEmpty($value): bool
             if (isset($value) && strlen((string)$value)) {
                 return true;
             }
-        // array (checkboxes)
+            // array (checkboxes)
         } else {
             foreach ($value as $subValue) {
                 if (isset($value) && strlen((string)$subValue)) {