Merge pull request #82 from PrestaShop/dev

Release 4.4.3

config.xml

@@ -2,7 +2,7 @@
 <module>
     <name>contactform</name>
     <displayName><![CDATA[Contact form]]></displayName>
-    <version><![CDATA[4.4.2]]></version>
+    <version><![CDATA[4.4.3]]></version>
     <description><![CDATA[Adds a contact form to the "Contact us" page.]]></description>
     <author><![CDATA[PrestaShop]]></author>
     <tab><![CDATA[front_office_features]]></tab>

contactform.php

@@ -54,7 +54,7 @@ public function __construct()
         $this->name = 'contactform';
         $this->author = 'PrestaShop';
         $this->tab = 'front_office_features';
-        $this->version = '4.4.2';
+        $this->version = '4.4.3';
         $this->bootstrap = true;
 
         parent::__construct();
@@ -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;
         }