Merge branch 'release/8.2.3'

einpraegsam · einpraegsam · commit 79052fd140b6 · 2020-11-08T16:31:24.000+01:00
diff --git a/Classes/Domain/Factory/MailFactory.php b/Classes/Domain/Factory/MailFactory.php
@@ -72,7 +72,7 @@ protected function setFeuser(Mail $mail): void
             $userRepository = ObjectUtility::getObjectManager()->get(UserRepository::class);
             $feUserUid = FrontendUtility::getPropertyFromLoggedInFrontendUser('uid');
             $user = $userRepository->findByUid($feUserUid);
-            if ($user instanceof User) {
+            if ($user !== null) {
                 $mail->setFeuser($user);
             }
         }
diff --git a/Classes/Domain/Repository/MailRepository.php b/Classes/Domain/Repository/MailRepository.php
@@ -131,10 +131,6 @@ public function findByUid($uid)
      * @param Form $form
      * @param int $pageUid
      * @return QueryResultInterface
-     * @throws Exception
-     * @throws InvalidQueryExceptionAlias
-     * @throws ExtensionConfigurationExtensionNotConfiguredException
-     * @throws ExtensionConfigurationPathDoesNotExistException
      */
     public function findByMarkerValueForm(string $marker, string $value, Form $form, int $pageUid): QueryResultInterface
     {
diff --git a/Classes/Domain/Validator/UniqueValidator.php b/Classes/Domain/Validator/UniqueValidator.php
@@ -7,54 +7,44 @@
 use In2code\Powermail\Domain\Repository\MailRepository;
 use In2code\Powermail\Utility\FrontendUtility;
 use In2code\Powermail\Utility\ObjectUtility;
-use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationExtensionNotConfiguredException;
-use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationPathDoesNotExistException;
 use TYPO3\CMS\Extbase\Object\Exception;
-use TYPO3\CMS\Extbase\Persistence\Exception\InvalidQueryException;
 
 /**
  * Class UniqueValidator
+ * @noinspection PhpUnused
  */
 class UniqueValidator extends AbstractValidator
 {
-
     /**
-     * Validation of given Params
-     *
      * @param Mail $mail
      * @return bool
      * @throws Exception
-     * @throws ExtensionConfigurationExtensionNotConfiguredException
-     * @throws ExtensionConfigurationPathDoesNotExistException
-     * @throws InvalidQueryException
      */
     public function isValid($mail)
     {
-        if (empty($this->settings['validation']['unique'])) {
-            return $this->isValidState();
-        }
-        foreach ($this->settings['validation']['unique'] as $marker => $amount) {
-            if ((int)$amount === 0) {
-                continue;
-            }
-            foreach ($mail->getAnswers() as $answer) {
-                /** @var Answer $answer */
-                if ($answer->getField()->getMarker() === $marker) {
-                    $mailRepository = ObjectUtility::getObjectManager()->get(MailRepository::class);
-                    $numberOfMails = $mailRepository->findByMarkerValueForm(
-                        $marker,
-                        $answer->getValue(),
-                        $mail->getForm(),
-                        FrontendUtility::getStoragePage($this->getStoragePid())
-                    )->count();
+        if (!empty($this->settings['validation']['unique'])) {
+            foreach ($this->settings['validation']['unique'] as $marker => $amount) {
+                if ($amount > 0) {
+                    foreach ($mail->getAnswers() as $answer) {
+                        /** @var Answer $answer */
+                        if ($answer->getField()->getMarker() === $marker) {
+                            /** @var MailRepository $mailRepository */
+                            $mailRepository = ObjectUtility::getObjectManager()->get(MailRepository::class);
+                            $numberOfMails = $mailRepository->findByMarkerValueForm(
+                                $marker,
+                                $answer->getValue(),
+                                $mail->getForm(),
+                                FrontendUtility::getStoragePage($this->getStoragePid())
+                            )->count();
 
-                    if ($amount <= $numberOfMails) {
-                        $this->setErrorAndMessage($answer->getField(), 'unique');
+                            if ($amount <= $numberOfMails) {
+                                $this->setErrorAndMessage($answer->getField(), 'unique');
+                            }
+                        }
                     }
                 }
             }
         }
-
         return $this->isValidState();
     }
 
diff --git a/Classes/Hook/PluginPreview.php b/Classes/Hook/PluginPreview.php
@@ -158,14 +158,8 @@ protected function getReceiverEmail(): string
     protected function getFormTitleByUid(int $uid): string
     {
         $uid = $this->getLocalizedFormUid($uid, $this->getSysLanguageUid());
-        $row = BackendUtilityCore::getRecord(
-            Form::TABLE_NAME,
-            $uid,
-            'title',
-            '',
-            false
-        );
-        return $row['title'];
+        $row = BackendUtilityCore::getRecord(Form::TABLE_NAME, $uid, 'title', '', false);
+        return (string)$row['title'];
     }
 
     /**
diff --git a/Documentation/Changelog/Readme.md b/Documentation/Changelog/Readme.md
@@ -4,6 +4,12 @@
 
 | Version     | Release Date | Description                                                                                                           |
 |------------ |--------------|-----------------------------------------------------------------------------------------------------------------------|
+| 8.2.3       | 2020-11-08   | Bugfix: Set tx_powermail_domain_model_mail.fe_user value for logged in users                                          |
+|             |              | Bugfix: Fix link from PluginPreview to powermail module                                                               |
+|             |              | Bugfix: Prevent possible exception if not existing form is selected in a plugin (e.g. from old data garbage)          |
+|             |              | Bugfix: Re-add english mail label for backend list view                                                               |
+|             |              | Task: Small code cleanup                                                                                              |
+|             |              | Task: Small documentation update                                                                                      |
 | 8.2.2       | 2020-10-21   | Bugfix: Fix false positive error message in frontend "TypoScript is missing" together with marketing information      |
 |             |              | Bugfix: Fix a possible type hint error logs when no referrer is available                                             |
 |             |              | Bugfix: Fix a possible type hint exception if TSFE is not available                                                   |
diff --git a/Documentation/ForDevelopers/AddNewFields.md b/Documentation/ForDevelopers/AddNewFields.md
@@ -30,10 +30,10 @@ With this TSConfig a new Option is available:
 ![developer_new_fields2](../Images/developer_new_fields2.png)
 
 If an editor chose the new field, powermail searches by default for a Partial with Name New.html
-(Default Path is powermail/Resources/Private/Partials/Form/New.html).
+(Default Path is powermail/Resources/Private/Partials/Form/Field/New.html).
 
 Because you should not modify anything within an extension-folder (because of upcoming extension-updates),
-you should create a new file in your fileadmin folder - e.g.: fileadmin/powermail/Partials/Form/New.html
+you should create a new file in your fileadmin folder - e.g.: fileadmin/powermail/Partials/Form/Field/New.html
 
 ### Example Content:
 
diff --git a/Resources/Private/Language/locallang_db.xlf b/Resources/Private/Language/locallang_db.xlf
@@ -6,6 +6,9 @@
 			<trans-unit id="tabs.access" resname="tabs.access">
 				<source>Access</source>
 			</trans-unit>
+			<trans-unit id="tx_powermail_domain_model_mail">
+				<source>Mails</source>
+			</trans-unit>
 			<trans-unit id="tx_powermail_domain_model_mail.palette1" resname="tx_powermail_domain_model_mail.palette1">
 				<source>Sender</source>
 			</trans-unit>
diff --git a/Resources/Private/Templates/Hook/PluginPreview.html b/Resources/Private/Templates/Hook/PluginPreview.html
@@ -163,15 +163,10 @@ <h3><f:translate key="LLL:EXT:powermail/Resources/Private/Language/locallang_db.
 					<f:if condition="{index.isLast}">
 						<tr>
 							<td colspan="4" style="padding: 2px 10px 2px 5px">
-								<f:link.action
-										action="list"
-										controller="Module"
-										extensionName="Powermail"
-										additionalParams="{M:'web_PowermailM1',id:mail.pid}"
-										pluginName="web_powermailm1">
+								<f:be.link route="web_PowermailM1" parameters="{id:mail.pid}">
 									<f:translate key="LLL:EXT:powermail/Resources/Private/Language/locallang_db.xlf:pluginInfo.more">more ...</f:translate>
 									<core:Icon identifier="actions-search" />
-								</f:link.action>
+								</f:be.link>
 							</td>
 						</tr>
 					</f:if>
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' => '8.2.2',
+    'version' => '8.2.3',
     'state' => 'stable',
     'author' => 'Powermail Development Team',
     'author_email' => 'alexander.kellner@in2code.de',

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ protected function setFeuser(Mail $mail): void`
`72`	`72`	`$userRepository = ObjectUtility::getObjectManager()->get(UserRepository::class);`
`73`	`73`	`$feUserUid = FrontendUtility::getPropertyFromLoggedInFrontendUser('uid');`
`74`	`74`	`$user = $userRepository->findByUid($feUserUid);`
`75`		`- if ($user instanceof User) {`
	`75`	`+ if ($user !== null) {`
`76`	`76`	`$mail->setFeuser($user);`
`77`	`77`	`}`
`78`	`78`	`}`