Merge branch 'release/10.3.1'

Author: einpraegsam

Classes/Finisher/SaveToAnyTableFinisher.php

@@ -10,19 +10,12 @@
 use TYPO3\CMS\Extbase\Object\Exception;
 use TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotException;
 use TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotReturnException;
-use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 
 /**
  * Class SaveToAnyTableFinisher
  */
 class SaveToAnyTableFinisher extends AbstractFinisher implements FinisherInterface
 {
-
-    /**
-     * @var ContentObjectRenderer
-     */
-    protected $contentObject;
-
     /**
      * @var array
      */
@@ -234,13 +227,4 @@ public function initializeFinisher(): void
             $this->addArrayToDataArray($mailRepository->getVariablesWithMarkersFromMail($this->mail));
         }
     }
-
-    /**
-     * @param ContentObjectRenderer $contentObject
-     * @return void
-     */
-    public function injectContentObject(ContentObjectRenderer $contentObject): void
-    {
-        $this->contentObject = $contentObject;
-    }
 }

Classes/Finisher/SendParametersFinisher.php

@@ -15,17 +15,11 @@
  */
 class SendParametersFinisher extends AbstractFinisher implements FinisherInterface
 {
-
     /**
      * @var ConfigurationManagerInterface
      */
     protected $configurationManager;
 
-    /**
-     * @var \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
-     */
-    protected $contentObject = null;
-
     /**
      * TypoScript configuration part sendPost
      *
@@ -129,8 +123,6 @@ protected function isEnabled(): bool
      */
     public function initializeFinisher(): void
     {
-        // @extensionScannerIgnoreLine Seems to be a false positive: getContentObject() is still correct in 9.0
-        $this->contentObject = $this->configurationManager->getContentObject();
         $mailRepository = ObjectUtility::getObjectManager()->get(MailRepository::class);
         $this->contentObject->start($mailRepository->getVariablesWithMarkersFromMail($this->mail));
         $configurationService = ObjectUtility::getObjectManager()->get(ConfigurationService::class);

Configuration/TypoScript/Powermail_Frontend/setup.typoscript

@@ -114,8 +114,12 @@ powermail_frontend_rss {
 }
 
 [getTSFE().type == 31311 || getTSFE().type == 31312 || getTSFE().type == 31319]
-# we don't want the wrapper div in our export files
-tt_content.stdWrap.innerWrap >
+# overwrite the default content element layout, because we don't want the wrapper div in our export files
+tt_content.list {
+  layoutRootPaths {
+    99 = EXT:powermail/Resources/Private/Layouts/ContentElements/Export/
+  }
+}
 [end]
 
 

Documentation/Changelog/Readme.md

@@ -7,6 +7,7 @@ breaking changes and how to handle them
 
 | Version      | Release Date | Description                                                                                                                                                                                                           |
 |--------------|--------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 10.3.1       | 2022-06-07   | Small bugfix update: Prevent exception on form submit, repair CSV/XLS/RSS in Pi2                                                                                                                                      |
 | 10.3.0       | 2022-06-06   | JS validation opens tab with first error field on morestep forms, Fix overrule TS settings, Fix pagebrowser in backend module, Fix finisher runner, Some more smaller fixes and code cleanups                         |
 | 10.2.0       | 2022-05-25   | Fix some tests, XLS export should be opened in a new window, fix some undefined array keys                                                                                                                            |
 | 10.1.0       | 2022-04-13   | Feature: New form validation: Add callbacks on form submits with errors, scroll to error field on submit                                                                                                              |

Resources/Private/Layouts/ContentElements/Export/Default.html

@@ -0,0 +1,8 @@
+<f:spaceless>
+
+    <f:comment>
+        Overwrite the default content element layout for export files to remove the wrapper div
+    </f:comment>
+
+    <f:render section="Main" optional="true" />
+</f:spaceless>

ext_emconf.php

@@ -9,7 +9,7 @@
         and easy to use mailform extension with a lots of features
         (spam prevention, marketing information, optin, ajax submit, diagram analysis, etc...)',
     'category' => 'plugin',
-    'version' => '10.3.0',
+    'version' => '10.3.1',
     'state' => 'stable',
     'author' => 'Powermail Development Team',
     'author_email' => 'service@in2code.de',