Merge branch 'release/10.3.2'

einpraegsam · einpraegsam · commit e64061b1f181 · 2022-06-08T14:36:32.000+02:00
diff --git a/Classes/Domain/Service/SaveToAnyTableService.php b/Classes/Domain/Service/SaveToAnyTableService.php
@@ -308,7 +308,7 @@ public function setAdditionalWhere(string $additionalWhere): void
     /**
      * Remove not allowed signs
      *
-     * @param $string
+     * @param string $string
      * @return void
      */
     protected function removeNotAllowedSigns(string &$string): void
diff --git a/Classes/Finisher/AbstractFinisher.php b/Classes/Finisher/AbstractFinisher.php
@@ -10,7 +10,6 @@
  */
 abstract class AbstractFinisher implements FinisherInterface
 {
-
     /**
      * @var Mail
      */
@@ -49,6 +48,30 @@ abstract class AbstractFinisher implements FinisherInterface
      */
     protected $contentObject;
 
+    /**
+     * @param Mail $mail
+     * @param array $configuration
+     * @param array $settings
+     * @param bool $formSubmitted
+     * @param string $actionMethodName
+     * @param ContentObjectRenderer $contentObject
+     */
+    public function __construct(
+        Mail $mail,
+        array $configuration,
+        array $settings,
+        bool $formSubmitted,
+        string $actionMethodName,
+        ContentObjectRenderer $contentObject
+    ) {
+        $this->setMail($mail);
+        $this->setConfiguration($configuration);
+        $this->setSettings($settings);
+        $this->setFormSubmitted($formSubmitted);
+        $this->setActionMethodName($actionMethodName);
+        $this->contentObject = $contentObject;
+    }
+
     /**
      * @return Mail
      */
@@ -147,28 +170,4 @@ public function setActionMethodName(string $actionMethodName): FinisherInterface
     public function initializeFinisher(): void
     {
     }
-
-    /**
-     * @param Mail $mail
-     * @param array $configuration
-     * @param array $settings
-     * @param bool $formSubmitted
-     * @param string $actionMethodName
-     * @param ContentObjectRenderer $contentObject
-     */
-    public function __construct(
-        Mail $mail,
-        array $configuration,
-        array $settings,
-        bool $formSubmitted,
-        string $actionMethodName,
-        ContentObjectRenderer $contentObject
-    ) {
-        $this->setMail($mail);
-        $this->setConfiguration($configuration);
-        $this->setSettings($settings);
-        $this->setFormSubmitted($formSubmitted);
-        $this->setActionMethodName($actionMethodName);
-        $this->contentObject = $contentObject;
-    }
 }
diff --git a/Classes/Finisher/RedirectFinisher.php b/Classes/Finisher/RedirectFinisher.php
@@ -4,7 +4,7 @@
 
 use In2code\Powermail\Domain\Service\RedirectUriService;
 use In2code\Powermail\Utility\FrontendUtility;
-use In2code\Powermail\Utility\ObjectUtility;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\HttpUtility;
 use TYPO3\CMS\Extbase\Object\Exception;
 
@@ -13,7 +13,6 @@
  */
 class RedirectFinisher extends AbstractFinisher implements FinisherInterface
 {
-
     /**
      * @var array
      */
@@ -27,8 +26,7 @@ class RedirectFinisher extends AbstractFinisher implements FinisherInterface
      */
     public function redirectToUriFinisher(): void
     {
-        /** @var RedirectUriService $redirectService */
-        $redirectService = ObjectUtility::getObjectManager()->get(RedirectUriService::class, $this->contentObject);
+        $redirectService = GeneralUtility::makeInstance(RedirectUriService::class, $this->contentObject);
         $uri = $redirectService->getRedirectUri();
         if (!empty($uri) && $this->isRedirectEnabled()) {
             HttpUtility::redirect($uri);
diff --git a/Classes/Finisher/SaveToAnyTableFinisher.php b/Classes/Finisher/SaveToAnyTableFinisher.php
@@ -2,36 +2,72 @@
 declare(strict_types = 1);
 namespace In2code\Powermail\Finisher;
 
+use Doctrine\DBAL\DBALException;
+use In2code\Powermail\Domain\Model\Mail;
 use In2code\Powermail\Domain\Repository\MailRepository;
 use In2code\Powermail\Domain\Service\SaveToAnyTableService;
+use In2code\Powermail\Exception\DatabaseFieldMissingException;
+use In2code\Powermail\Exception\PropertiesMissingException;
 use In2code\Powermail\Utility\ObjectUtility;
 use In2code\Powermail\Utility\StringUtility;
 use TYPO3\CMS\Core\TypoScript\TypoScriptService;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 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
+     * local instance that can be manipulated via start() and has no influence to parent::contentObject
+     */
+    protected $contentObjectLocal;
+
     /**
      * @var array
      */
     protected $dataArray = [];
 
+    /**
+     * @param Mail $mail
+     * @param array $configuration
+     * @param array $settings
+     * @param bool $formSubmitted
+     * @param string $actionMethodName
+     * @param ContentObjectRenderer $contentObject
+     */
+    public function __construct(
+        Mail $mail,
+        array $configuration,
+        array $settings,
+        bool $formSubmitted,
+        string $actionMethodName,
+        ContentObjectRenderer $contentObject
+    ) {
+        parent::__construct($mail, $configuration, $settings, $formSubmitted, $actionMethodName, $contentObject);
+        $configurationManager = GeneralUtility::makeInstance(ConfigurationManagerInterface::class);
+        $this->contentObjectLocal = $configurationManager->getContentObject();
+    }
+
     /**
      * Preperation function for every table
      *
      * @return void
-     * @throws Exception
+     * @throws DBALException
+     * @throws DatabaseFieldMissingException
+     * @throws PropertiesMissingException
      */
     public function savePreflightFinisher(): void
     {
         if ($this->isConfigurationAvailable()) {
             foreach (array_keys($this->configuration) as $key) {
-                $this->contentObject->start($this->getDataArray());
+                $this->contentObjectLocal->start($this->getDataArray());
                 $tableConfiguration = $this->configuration[$key];
                 $numberKey = (int)StringUtility::removeLastDot($key);
                 if ($this->isSaveToAnyTableActivatedForSpecifiedTable($tableConfiguration)) {
@@ -47,12 +83,14 @@ public function savePreflightFinisher(): void
      * @param int $numberKey
      * @param array $tableConfiguration
      * @return void
-     * @throws Exception
+     * @throws DBALException
+     * @throws DatabaseFieldMissingException
+     * @throws PropertiesMissingException
      */
     protected function saveSpecifiedTablePreflight(int $numberKey, array $tableConfiguration): void
     {
         /* @var $saveService SaveToAnyTableService */
-        $saveService = ObjectUtility::getObjectManager()->get(
+        $saveService = GeneralUtility::makeInstance(
             SaveToAnyTableService::class,
             $this->getTableName($tableConfiguration)
         );
@@ -73,7 +111,7 @@ protected function setPropertiesInSaveService(SaveToAnyTableService $saveService
     {
         foreach (array_keys($tableConfiguration) as $field) {
             if (!$this->isSkippedKey($field)) {
-                $value = $this->contentObject->cObjGetSingle(
+                $value = $this->contentObjectLocal->cObjGetSingle(
                     $tableConfiguration[$field],
                     $tableConfiguration[$field . '.']
                 );
@@ -123,7 +161,7 @@ protected function addAdditionalWhereClause(SaveToAnyTableService $saveService,
         }
         if (!empty($tableConfiguration['_ifUniqueWhereClause'])
             && !empty($tableConfiguration['_ifUniqueWhereClause.'])) {
-            $whereClause = $this->contentObject->cObjGetSingle(
+            $whereClause = $this->contentObjectLocal->cObjGetSingle(
                 $tableConfiguration['_ifUniqueWhereClause'],
                 $tableConfiguration['_ifUniqueWhereClause.']
             );
@@ -143,7 +181,7 @@ protected function addAdditionalWhereClause(SaveToAnyTableService $saveService,
      */
     protected function getTableName(array $tableConfiguration): string
     {
-        return $this->contentObject->cObjGetSingle($tableConfiguration['_table'], $tableConfiguration['_table.']);
+        return $this->contentObjectLocal->cObjGetSingle($tableConfiguration['_table'], $tableConfiguration['_table.']);
     }
 
     /**
@@ -152,7 +190,10 @@ protected function getTableName(array $tableConfiguration): string
      */
     protected function isSaveToAnyTableActivatedForSpecifiedTable($tableConfiguration): bool
     {
-        $enable = $this->contentObject->cObjGetSingle($tableConfiguration['_enable']??'', $tableConfiguration['_enable.']??null);
+        $enable = $this->contentObjectLocal->cObjGetSingle(
+            $tableConfiguration['_enable'] ?? '',
+            $tableConfiguration['_enable.'] ?? null
+        );
         return !empty($enable);
     }
 
diff --git a/Classes/Finisher/SendParametersFinisher.php b/Classes/Finisher/SendParametersFinisher.php
@@ -2,13 +2,16 @@
 declare(strict_types = 1);
 namespace In2code\Powermail\Finisher;
 
+use In2code\Powermail\Domain\Model\Mail;
 use In2code\Powermail\Domain\Repository\MailRepository;
 use In2code\Powermail\Domain\Service\ConfigurationService;
 use In2code\Powermail\Utility\ObjectUtility;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 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;
 
 /**
  * SendParametersFinisher to send params via CURL
@@ -17,9 +20,15 @@ class SendParametersFinisher extends AbstractFinisher implements FinisherInterfa
 {
     /**
      * @var ConfigurationManagerInterface
+     * local instance that can be manipulated via start() and has no influence to parent::contentObject
      */
     protected $configurationManager;
 
+    /**
+     * @var ContentObjectRenderer
+     */
+    protected $contentObjectLocal = null;
+
     /**
      * TypoScript configuration part sendPost
      *
@@ -42,6 +51,27 @@ class SendParametersFinisher extends AbstractFinisher implements FinisherInterfa
      */
     protected $configuration;
 
+    /**
+     * @param Mail $mail
+     * @param array $configuration
+     * @param array $settings
+     * @param bool $formSubmitted
+     * @param string $actionMethodName
+     * @param ContentObjectRenderer $contentObject
+     */
+    public function __construct(
+        Mail $mail,
+        array $configuration,
+        array $settings,
+        bool $formSubmitted,
+        string $actionMethodName,
+        ContentObjectRenderer $contentObject
+    ) {
+        parent::__construct($mail, $configuration, $settings, $formSubmitted, $actionMethodName, $contentObject);
+        $configurationManager = GeneralUtility::makeInstance(ConfigurationManagerInterface::class);
+        $this->contentObjectLocal = $configurationManager->getContentObject();
+    }
+
     /**
      * Send values via curl to a third party software
      *
@@ -97,7 +127,10 @@ protected function getCurlSettings(): array
      */
     protected function getValues(): string
     {
-        return $this->contentObject->cObjGetSingle($this->configuration['values'], $this->configuration['values.']);
+        return $this->contentObjectLocal->cObjGetSingle(
+            $this->configuration['values'],
+            $this->configuration['values.']
+        );
     }
 
     /**
@@ -109,7 +142,7 @@ protected function getValues(): string
      */
     protected function isEnabled(): bool
     {
-        return $this->contentObject->cObjGetSingle(
+        return $this->contentObjectLocal->cObjGetSingle(
             $this->configuration['_enable'],
             $this->configuration['_enable.']
         ) === '1' && $this->isFormSubmitted();
@@ -124,18 +157,9 @@ protected function isEnabled(): bool
     public function initializeFinisher(): void
     {
         $mailRepository = ObjectUtility::getObjectManager()->get(MailRepository::class);
-        $this->contentObject->start($mailRepository->getVariablesWithMarkersFromMail($this->mail));
+        $this->contentObjectLocal->start($mailRepository->getVariablesWithMarkersFromMail($this->mail));
         $configurationService = ObjectUtility::getObjectManager()->get(ConfigurationService::class);
         $configuration = $configurationService->getTypoScriptConfiguration();
         $this->configuration = $configuration['marketing.']['sendPost.'];
     }
-
-    /**
-     * @param ConfigurationManagerInterface $configurationManager
-     * @return void
-     */
-    public function injectConfigurationManager(ConfigurationManagerInterface $configurationManager): void
-    {
-        $this->configurationManager = $configurationManager;
-    }
 }
diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml
@@ -7,8 +7,6 @@ services:
   In2code\Powermail\:
     resource: '../Classes/*'
 
-  # Commands
-
   In2code\Powermail\Command\CleanupExportsCommand:
     tags:
       - name: 'console.command'
diff --git a/Documentation/Changelog/Readme.md b/Documentation/Changelog/Readme.md
@@ -7,6 +7,7 @@ breaking changes and how to handle them
 
 | Version      | Release Date | Description                                                                                                                                                                                                           |
 |--------------|--------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 10.3.2       | 2022-06-08   | Fix regression that prevented redirects after submit, Fix JS validation with reset buttons                                                                                                                            |
 | 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                                                                                                                            |
diff --git a/Resources/Private/Build/JavaScript/FormValidation.js b/Resources/Private/Build/JavaScript/FormValidation.js
@@ -473,7 +473,7 @@ class Form {
 
   #getFieldsFromForm() {
     return this.#form.querySelectorAll(
-      'input:not([data-powermail-validation="disabled"]):not([type="hidden"]):not([type="submit"])'
+      'input:not([data-powermail-validation="disabled"]):not([type="hidden"]):not([type="reset"]):not([type="submit"])'
       + ', textarea:not([data-powermail-validation="disabled"])'
       + ', select:not([data-powermail-validation="disabled"])'
     );
diff --git a/Resources/Public/JavaScript/Powermail/Form.min.js b/Resources/Public/JavaScript/Powermail/Form.min.js
diff --git a/ext_emconf.php b/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.1',
+    'version' => '10.3.2',
     'state' => 'stable',
     'author' => 'Powermail Development Team',
     'author_email' => 'service@in2code.de',

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ public function setAdditionalWhere(string $additionalWhere): void`
`308`	`308`	`/**`
`309`	`309`	`* Remove not allowed signs`
`310`	`310`	`*`
`311`		`- * @param $string`
	`311`	`+ * @param string $string`
`312`	`312`	`* @return void`
`313`	`313`	`*/`
`314`	`314`	`protected function removeNotAllowedSigns(string &$string): void`