Merge pull request #78 from aeyoll/fix-stop-execution-on-error

stop contact form process if there's an error in the controller
PrestaShop · Jul 4, 2024 · 98f4722 · 98f4722
2 parents 15587b7 + f922f40
commit 98f4722
Showing 1 changed file with 2 additions and 12 deletions.
diff --git a/contactform.php b/contactform.php
@@ -406,26 +406,20 @@ public function sendMessage()
                 [],
                 'Shop.Notifications.Error'
             );
-
-            return;
         }
         if (empty($message)) {
             $this->context->controller->errors[] = $this->trans(
                 'The message cannot be blank.',
                 [],
                 'Shop.Notifications.Error'
             );
-
-            return;
         }
         if (!Validate::isCleanHtml($message)) {
             $this->context->controller->errors[] = $this->trans(
                 'Invalid message',
                 [],
                 'Shop.Notifications.Error'
             );
-
-            return;
         }
 
         $id_contact = (int) Tools::getValue('id_contact');
@@ -437,8 +431,6 @@ public function sendMessage()
                 [],
                 'Modules.Contactform.Shop'
             );
-
-            return;
         }
 
         if (!empty($file_attachment['name']) && $file_attachment['error'] != 0) {
@@ -447,8 +439,6 @@ public function sendMessage()
                 [],
                 'Modules.Contactform.Shop'
             );
-
-            return;
         }
         if (!empty($file_attachment['name']) &&
                   !in_array(Tools::strtolower(Tools::substr($file_attachment['name'], -4)), $extension) &&
@@ -459,8 +449,6 @@ public function sendMessage()
                 [],
                 'Modules.Contactform.Shop'
             );
-
-            return;
         }
         if ($url !== ''
             || empty($serverToken)
@@ -473,7 +461,9 @@ public function sendMessage()
                 'Modules.Contactform.Shop'
             );
             $this->createNewToken();
+        }
 
+        if (!empty($this->context->controller->errors)) {
             return;
         }