Merge pull request #11 from nitsan-technologies/email-bug-fix

Email bug fix
nitsan-technologies · Oct 5, 2022 · c549f61 · c549f61
2 parents 1891f6f + 7a39083
commit c549f61
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/Classes/Controller/NsguestbookController.php b/Classes/Controller/NsguestbookController.php
@@ -81,6 +81,7 @@ public function newAction()
             $GLOBALS['TSFE']->additionalFooterData[$this->request->getControllerExtensionKey()] .= "
             <script src='https://www.google.com/recaptcha/api.js' type='text/javascript'></script>";
         }
+        $request['tx_nsguestbook_form']['newNsguestbook'] = isset($request['tx_nsguestbook_form']['newNsguestbook']) ? $request['tx_nsguestbook_form']['newNsguestbook'] : '';
         $this->view->assign('nsguestbookdata', $request['tx_nsguestbook_form']['newNsguestbook']);
     }
 
@@ -112,6 +113,7 @@ public function createAction(\Nitsan\NsGuestbook\Domain\Model\Nsguestbook $newNs
         if (isset($_POST['g-recaptcha-response'])) {
             $captcha = $_POST['g-recaptcha-response'];
         }
+        $captcha = isset($captcha) ? $captcha : '';
         if (!$captcha && $settings['captcha'] == 0) {
             $checkcaptchamsg = \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate(
                 'controller.checkcaptcha.msg',
@@ -189,13 +191,16 @@ public function createAction(\Nitsan\NsGuestbook\Domain\Model\Nsguestbook $newNs
                     $emailSubject = $this->settings['emailSubject'];
 
                     $confirmationVariables = ['guest' => $confirmationContent];
-                    $sendSenderMail = $this->sendTemplateEmail(
-                        [$adminEmail => $adminName],
-                        [$adminEmail => $adminName],
-                        $emailSubject,
-                        'MailTemplate',
-                        $confirmationVariables
-                    );
+
+                    if(filter_var($adminEmail, FILTER_VALIDATE_EMAIL) == TRUE){
+                        $sendSenderMail = $this->sendTemplateEmail(
+                            [$adminEmail => $adminName],
+                            [$adminEmail => $adminName],
+                            $emailSubject,
+                            'MailTemplate',
+                            $confirmationVariables
+                        );
+                    }
                 }
             }
         }

diff --git a/Configuration/FlexForm/flexform.xml b/Configuration/FlexForm/flexform.xml
@@ -44,7 +44,7 @@
                             <config>
                                 <type>input</type>
                                 <size>40</size>
-                                <eval>trim,email,required</eval>
+                                <eval>trim,required</eval>
                             </config>
                         </TCEforms>
                     </settings.adminName>
@@ -55,7 +55,7 @@
                             <config>
                                 <type>input</type>
                                 <size>40</size>
-                                <eval>trim,required</eval>
+                                <eval>trim,email,required</eval>
                             </config>
                         </TCEforms>
                     </settings.adminEmail>

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -12,7 +12,7 @@
     'uploadfolder' => '0',
     'createDirs' => '',
     'clearCacheOnLoad' => 0,
-    'version' => '3.2.1',
+    'version' => '3.2.2',
     'constraints' => [
         'depends' => [
             'typo3' => '6.0.0-11.5.99',