Merge branch 'release/10.2.0'

Author: einpraegsam

.project/data/fileadmin.tar.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac0afc7063785f117138db6878145b81b6b4dcce8231e2d1c580782dcf5f8d73
-size 926025
+oid sha256:866b96608d10172784cf62bdcce7358cb121dbc2e4e6a39c61eb01d39b65d8f4
+size 926099

Classes/Command/CleanupUploadsCommand.php

@@ -2,6 +2,7 @@
 declare(strict_types = 1);
 namespace In2code\Powermail\Command;
 
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;

Classes/Controller/FormController.php

@@ -59,7 +59,7 @@ class FormController extends AbstractController
     protected $dataProcessorRunner;
 
     /**
-     * @return void
+     * @return ResponseInterface
      * @throws InvalidSlotException
      * @throws InvalidSlotReturnException
      * @throws Exception
@@ -122,7 +122,7 @@ public function initializeConfirmationAction(): void
      * @ExtbaseAnnotation\Validate("In2code\Powermail\Domain\Validator\UniqueValidator", param="mail")
      * @ExtbaseAnnotation\Validate("In2code\Powermail\Domain\Validator\ForeignValidator", param="mail")
      * @ExtbaseAnnotation\Validate("In2code\Powermail\Domain\Validator\CustomValidator", param="mail")
-     * @return void
+     * @return ResponseInterface
      * @throws InvalidConfigurationTypeException
      * @throws InvalidExtensionNameException
      * @throws InvalidSlotException
@@ -180,7 +180,7 @@ public function initializeCreateAction(): void
      * @ExtbaseAnnotation\Validate("In2code\Powermail\Domain\Validator\UniqueValidator", param="mail")
      * @ExtbaseAnnotation\Validate("In2code\Powermail\Domain\Validator\ForeignValidator", param="mail")
      * @ExtbaseAnnotation\Validate("In2code\Powermail\Domain\Validator\CustomValidator", param="mail")
-     * @return void
+     * @return ResponseInterface
      * @throws IllegalObjectTypeException
      * @throws InvalidConfigurationTypeException
      * @throws InvalidExtensionNameException
@@ -322,10 +322,9 @@ protected function saveMail(Mail $mail): void
      *
      * @param int $mail mail uid
      * @param string $hash Given Hash String
-     * @return void
+     * @return ResponseInterface
      * @throws InvalidSlotException
      * @throws InvalidSlotReturnException
-     * @throws StopActionException
      * @throws IllegalObjectTypeException
      * @throws UnknownObjectException
      * @throws Exception
@@ -361,7 +360,7 @@ public function optinConfirmAction(int $mail, string $hash): ResponseInterface
     /**
      * @param int $mail
      * @param string $hash
-     * @return void
+     * @return ResponseInterface
      * @throws \Exception
      * @noinspection PhpUnused
      */
@@ -386,7 +385,7 @@ public function disclaimerAction(int $mail, string $hash): ResponseInterface
      * @param int $language Frontend Language Uid
      * @param int $pid Page Id
      * @param bool $mobileDevice Is mobile device?
-     * @return string
+     * @return ResponseInterface
      * @noinspection PhpUnused
      * @codeCoverageIgnore
      */
@@ -458,7 +457,6 @@ protected function forwardIfFormParamsDoNotMatch(): void
      * Forward to formAction if no mail param given
      *
      * @return ForwardResponse|null
-     * @throws StopActionException
      */
     protected function forwardIfMailParamEmpty(): ?ForwardResponse
     {
@@ -478,7 +476,6 @@ protected function forwardIfMailParamEmpty(): ?ForwardResponse
      *
      * @param Mail|null $mail
      * @return ResponseInterface|null
-     * @throws StopActionException
      */
     protected function forwardIfFormParamsDoNotMatchForOptinConfirm(Mail $mail = null): ?ResponseInterface
     {
@@ -500,8 +497,7 @@ protected function forwardIfFormParamsDoNotMatchForOptinConfirm(Mail $mail = nul
      * a validator for createAction fails, confirmationAction is called (if function is turned on) and same validators
      * are firing again
      *
-     * @return void
-     * @throws StopActionException
+     * @return ResponseInterface|null
      */
     protected function forwardToReferringRequest(): ?ResponseInterface
     {

Classes/Controller/ModuleController.php

@@ -110,7 +110,7 @@ public function exportXlsAction(): ResponseInterface
 
         $fileName = StringUtility::conditionalVariable($this->settings['export']['filenameXls'], 'export.xls');
         header('Content-Type: application/vnd.ms-excel');
-        header('Content-Disposition: inline; filename="' . $fileName . '"');
+        header('Content-Disposition: attachment; filename="' . $fileName . '"');
         header('Pragma: no-cache');
         return $this->htmlResponse();
     }

Classes/Domain/Factory/FileFactory.php

@@ -12,6 +12,7 @@
 use In2code\Powermail\Utility\StringUtility;
 use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationExtensionNotConfiguredException;
 use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationPathDoesNotExistException;
+use TYPO3\CMS\Core\Type\File\FileInfo;
 use TYPO3\CMS\Extbase\Object\Exception;
 use TYPO3\CMS\Extbase\Persistence\Exception\InvalidQueryException;
 use TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotException;
@@ -131,11 +132,11 @@ protected function makeFileInstance(
         $file->setNewName(StringUtility::cleanString($originalName));
         $file->setUploadFolder($this->getUploadFolder());
         if ($size === 0) {
-            $size = filesize($file->getNewPathAndFilename(true));
+            $size = filesize($file->getTemporaryName());
         }
         $file->setSize((int)$size);
         if ($type === '') {
-            $type = mime_content_type($file->getNewPathAndFilename(true));
+            $type = (new FileInfo($file->getTemporaryName()))->getMimeType() ?: 'application/octet-stream';
         }
         $file->setType($type);
         $file->setUploaded($uploaded);
@@ -161,7 +162,7 @@ protected function getUploadFolder(): string
     protected function getFormUid(Form $form = null): int
     {
         if ($form === null) {
-            $arguments = FrontendUtility::getArguments();
+            $arguments = FrontendUtility::getArguments(FrontendUtility::getPluginName());
             return (int)$arguments['mail']['form'];
         }
         return $form->getUid();

Classes/Domain/Service/Mail/SendMailService.php

@@ -507,7 +507,9 @@ protected function initialize(Mail $mail, array $settings, string $type): void
         $this->mail = $mail;
         $this->settings = $settings;
         $this->configuration = $this->getConfigurationFromSettings($settings);
-        $this->overwriteConfig = $this->configuration[$type . '.']['overwrite.'];
+        if (\TYPO3\CMS\Core\Utility\ArrayUtility::isValidPath($this->configuration, $type . './overwrite')) {
+            $this->overwriteConfig = $this->configuration[$type . '.']['overwrite.'];
+        }
         $mailRepository = ObjectUtility::getObjectManager()->get(MailRepository::class);
         ObjectUtility::getContentObject()->start($mailRepository->getVariablesWithMarkersFromMail($mail));
         $this->type = $type;

Classes/Hook/CreateMarker.php

@@ -371,7 +371,7 @@ protected function shouldProcessField(): bool
      */
     protected function shouldRenameMarker(array $markers): bool
     {
-        return !empty($markers[$this->uid]) && !empty($this->properties['marker'])
-            && $markers[$this->uid] !== $this->properties['marker'];
+        return !empty($markers[$this->uid]) && isset($this->properties['marker'])
+          && $markers[$this->uid] !== $this->properties['marker'];
     }
 }

Classes/Tca/ShowFormNoteEditForm.php

@@ -18,6 +18,7 @@
 use TYPO3\CMS\Backend\Utility\BackendUtility as BackendUtilityCore;
 use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationExtensionNotConfiguredException;
 use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationPathDoesNotExistException;
+use TYPO3\CMS\Core\Utility\ArrayUtility as CoreArrayUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\Exception\InvalidConfigurationTypeException;
 use TYPO3\CMS\Extbase\Mvc\Exception\InvalidExtensionNameException;
@@ -147,6 +148,9 @@ protected function getLabel(string $key): string
      */
     protected function getEditFormLink(): string
     {
+        if (!CoreArrayUtility::isValidPath($this->getFormProperties(), 'uid')) {
+            return '';
+        }
         return BackendUtility::createEditUri(Form::TABLE_NAME, (int)$this->getFormProperties()['uid']);
     }
 
@@ -218,7 +222,7 @@ protected function getFormProperties(): array
     protected function getRelatedFormUid(): int
     {
         $flexFormArray = (array)$this->data['databaseRow']['pi_flexform']['data']['main']['lDEF'];
-        $formUid = (int)$flexFormArray['settings.flexform.main.form']['vDEF'][0];
+        $formUid = (int)($flexFormArray['settings.flexform.main.form']['vDEF'][0] ?? 0);
         $language = (int)($this->data['databaseRow']['sys_language_uid'][0] ?? $this->data['databaseRow']['sys_language_uid'] ?? 0);
         $formUid = $this->getLocalizedFormUid($formUid, $language);
         return $formUid;
@@ -231,7 +235,17 @@ protected function getRelatedFormUid(): int
      */
     protected function getStoragePageProperties(): array
     {
-        return (array)BackendUtilityCore::getRecord('pages', (int)$this->getFormProperties()['pid'], '*', '', false);
+        if (!CoreArrayUtility::isValidPath($this->getFormProperties(), 'pid')) {
+            return [];
+        }
+
+        return (array)BackendUtilityCore::getRecord(
+            'pages',
+            (int)$this->getFormProperties()['pid'],
+            '*',
+            '',
+            false
+        );
     }
 
     /**
@@ -248,6 +262,9 @@ protected function getRelatedPages(): array
             return $this->getRelatedPagesAlternative();
         }
 
+        if (!CoreArrayUtility::isValidPath($this->getFormProperties(), 'uid')) {
+            return [];
+        }
         $queryBuilder = DatabaseUtility::getQueryBuilderForTable(Form::TABLE_NAME, true);
         $rows = (array)$queryBuilder
             ->select('p.title')
@@ -306,6 +323,9 @@ protected function getRelatedFields(): array
             return $this->getRelatedFieldsAlternative();
         }
 
+        if (!CoreArrayUtility::isValidPath($this->getFormProperties(), 'uid')) {
+            return [];
+        }
         $titles = [];
         $queryBuilder = DatabaseUtility::getQueryBuilderForTable(Form::TABLE_NAME, true);
         $rows = $queryBuilder

Classes/ViewHelpers/Condition/IsNotExcludedFromPowermailAllViewHelper.php

@@ -90,6 +90,7 @@ protected function getExcludedValues(
         string $configurationType = 'excludeFromFieldTypes'
     ): array {
         if (
+            isset($this->typeToTypoScriptType[$type]) &&
             ArrayUtility::isValidPath($settings, 'excludeFromPowermailAllMarker/' . $this->typeToTypoScriptType[$type] . '/' . $configurationType)
             && !empty($settings['excludeFromPowermailAllMarker'][$this->typeToTypoScriptType[$type]][$configurationType])
         ) {

Classes/ViewHelpers/Misc/ManipulateValueWithTypoScriptViewHelper.php

@@ -58,7 +58,9 @@ public function render(): string
         $type = $this->arguments['type'];
         $value = $this->renderChildren();
         if ($answer->getField()) {
-            if (!empty($this->typoScriptContext[$this->typeToTsType[$type] . '.'][$answer->getField()->getMarker()])) {
+            if (
+                isset($this->typeToTypoScriptType[$type]) &&
+                !empty($this->typoScriptContext[$this->typeToTsType[$type] . '.'][$answer->getField()->getMarker()])) {
                 $this->contentObjectRenderer->start($answer->_getProperties());
                 $value = $this->contentObjectRenderer->cObjGetSingle(
                     $this->typoScriptContext[$this->typeToTsType[$type] . '.'][$answer->getField()->getMarker()],