diff --git a/php/cl_contactform_input.php b/php/cl_contactform_input.php
index 87a7724..d93a781 100644
--- a/php/cl_contactform_input.php
+++ b/php/cl_contactform_input.php
@@ -26,14 +26,6 @@ $oField = new cHTMLTextbox("CMS_VAR[4]", "CMS_VALUE[4]");
 $oField->setWidth(8);
 $oCfgTable->setCell(4, 0, mi18n("Hintergrundfarbe bei Fehlern (z.B. red):"));
 $oCfgTable->setCell(4, 1, $oField->render());
-/*
-$oField = new cHTMLCheckbox("CMS_VAR[5]", "true");
-$bHasJQuery = ("CMS_VALUE[5]" == 'true')?true:false;
-$oField->setChecked($bHasJQuery);
-$oField->setLabelText(' ');
-$oCfgTable->setCell(5, 0, mi18n("jQuery Script vorhanden:"));
-$oCfgTable->setCell(5, 1, $oField->render());
-*/
 $oCfgTable->render(true);
 
 ?><?php
\ No newline at end of file
diff --git a/php/cl_contactform_output.php b/php/cl_contactform_output.php
index 6421ead..20ad6ea 100644
--- a/php/cl_contactform_output.php
+++ b/php/cl_contactform_output.php
@@ -11,35 +11,24 @@
  * Modified    :     24-08-2013, Murat Purc, adapted to newer CONTENIDO (4.8) and PHP (5.3/5.4) versions
  * *********************************************** */
 
-$sFrontEndPath = cRegistry::getClientConfig(cRegistry::getClientId())['path']['frontend'] . 'securimage';
-require_once $sFrontEndPath . '/securimage.php';
-require_once $sFrontEndPath . '/CaptchaObject.php';
-require_once $sFrontEndPath . '/StorageAdapter/AdapterInterface.php';
+$sFrontEndPath = cRegistry::getClientConfig(cRegistry::getClientId())['path']['frontend'] . 'securimage' . DIRECTORY_SEPARATOR;
+require_once $sFrontEndPath . 'securimage.php';
+require_once $sFrontEndPath . 'CaptchaObject.php';
+require_once $sFrontEndPath . 'StorageAdapter/AdapterInterface.php';
 
 class w3form {
 
-    private $email = array(
-        'adresses' => '',
-        'from' => array(
-            'name' => '',
-            'email' => ''
-        ),
-        'message' => '',
-        'subject' => ''
-    );
-    private $unraveled = array();
-    private $form = array(
-        'form' => '',
-        'answer' => '',
-        'colorError' => ''
-    );
-    private $formField = array();
+    private array $email = ['adresses' => '', 'from' => ['name' => '', 'email' => ''], 'message' => '', 'subject' => ''];
+    private array $unraveled = [];
+    private array $form = ['form' => '', 'answer' => '', 'colorError' => ''];
+    private array $formField = [];
 
     public function __construct()
     {
     }
 
-    private function sendEmail() {
+    private function sendEmail(): bool
+    {
         $this->unravel($this->suppress('sent'));
         $this->generateEmailMessage();
 
@@ -58,7 +47,8 @@ class w3form {
         return false;
     }
 
-    private function unravel($toUnravel, $prefix = '') {
+    private function unravel($toUnravel, $prefix = ''): void
+    {
         foreach ($toUnravel as $key => $value) {
             if (is_array($value)) {
                 $this->unravel($value, $key . ' ');
@@ -86,6 +76,7 @@ class w3form {
     }
 
     private function suppress() {
+        $fields = [];
         $suppress = func_get_args();
         foreach ($_POST as $key => $value) {
             if (array_search($key, $suppress) === false)
@@ -125,7 +116,7 @@ class w3form {
 
     public function formInterpretation(&$form) {
         $fields = explode('###', $form);
-        $field = array();
+        $field = [];
 
         for ($i = 1; $i < count($fields); $i = $i + 2) {
             $attributte = explode(';', trim($fields[$i]));
@@ -202,7 +193,7 @@ class w3form {
                     }
                 }
                 // show captcha HTML using Securimage::getCaptchaHtml()
-                $options = array();
+                $options = [];
                 $options['input_name'] = 'ct_captcha'; // change name of input element for form post input_text
                 $options['input_text'] = mi18n("Zeichen eingeben");
                 $options['input_required'] = false;
@@ -231,7 +222,7 @@ class w3form {
                 break;
             case 'select':
                 echo "<select $parameter $style>";
-                for ($i = 0; $i < count($attribute['option']); $i++) {
+                for ($i = 0; $i < (is_countable($attribute['option']) ? count($attribute['option']) : 0); $i++) {
                     if (!empty($attribute['optionvalue'][$i])) {
                         if (!empty($_POST["{$attribute['name']}"]) && $_POST["{$attribute['name']}"] == $attribute['optionvalue'][$i]) {
                             echo "<option value=\"{$attribute['optionvalue'][$i]}\" selected=\"selected\">{$attribute['option'][$i]}</option>\n";
@@ -339,42 +330,42 @@ class w3form {
         if (!empty($field['valid'])) {
             switch ($field['valid']) {
                 case 'textmitumbruch':
-                    if (!filter_var($sPostFieldValue, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => "/^[\n\r,;:\. ÄÖÜäöüß\-\+\*§$%&\/()=?!\"'\w\d]*$/")))) {
+                    if (!filter_var($sPostFieldValue, FILTER_VALIDATE_REGEXP, ["options" => ["regexp" => "/^[\n\r,;:\. ÄÖÜäöüß\-\+\*§$%&\/()=?!\"'\w\d]*$/"]])) {
                         return false;
                     }
                     break;
                 case 'simpletext':
-                    if (!filter_var($sPostFieldValue, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => "/^[\w]*$/i")))) {
+                    if (!filter_var($sPostFieldValue, FILTER_VALIDATE_REGEXP, ["options" => ["regexp" => "/^[\w]*$/i"]])) {
                         return false;
                     }
                     break;
                 case 'text':
-                    if (!filter_var($sPostFieldValue, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => "/^[,;:\. ÄÖÜäöüß\-\+\*§$%&\/()=?!\"'\w\d]*$/")))) {
+                    if (!filter_var($sPostFieldValue, FILTER_VALIDATE_REGEXP, ["options" => ["regexp" => "/^[,;:\. ÄÖÜäöüß\-\+\*§$%&\/()=?!\"'\w\d]*$/"]])) {
                         return false;
                     }
                     break;
                 case 'phone':
-                    if (!filter_var($sPostFieldValue, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => "/^(\(?([\d \-\)\–\+\/\(]+){6,}\)?([ .\-–\/]?)([\d]+))$/")))) {
+                    if (!filter_var($sPostFieldValue, FILTER_VALIDATE_REGEXP, ["options" => ["regexp" => "/^(\(?([\d \-\)\–\+\/\(]+){6,}\)?([ .\-–\/]?)([\d]+))$/"]])) {
                         return false;
                     }
                     break;
                 case 'integer':
-                    if (!filter_var($sPostFieldValue, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => "/^\d*$/")))) {
+                    if (!filter_var($sPostFieldValue, FILTER_VALIDATE_REGEXP, ["options" => ["regexp" => "/^\d*$/"]])) {
                         return false;
                     }
                     break;
                 case 'float':
-                    if (!filter_var($sPostFieldValue, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => "/^[+-]?([0-9]*[.])?[0-9]+$/")))) {
+                    if (!filter_var($sPostFieldValue, FILTER_VALIDATE_REGEXP, ["options" => ["regexp" => "/^[+-]?([0-9]*[.])?[0-9]+$/"]])) {
                         return false;
                     }
                     break;
                 case 'date':
-                    if (!filter_var($sPostFieldValue, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => "/^[0-9]{1,2}.[0-9]{1,2}.[0-9]{2,4}$/")))) {
+                    if (!filter_var($sPostFieldValue, FILTER_VALIDATE_REGEXP, ["options" => ["regexp" => "/^[0-9]{1,2}.[0-9]{1,2}.[0-9]{2,4}$/"]])) {
                         return false;
                     }
                     break;
                 case 'email':
-                    if (!filter_var($sPostFieldValue, FILTER_VALIDATE_REGEXP, array("options" => array("regexp" => "/^[öäüéàèâêîç_a-z0-9-]+(\.[öäüéàèâêîç_a-z0-9-]+)*@[öäüéàèâêîça-z0-9-]+(\.[öäüéàèâêîça-z0-9-]+)*$/")))) {
+                    if (!filter_var($sPostFieldValue, FILTER_VALIDATE_REGEXP, ["options" => ["regexp" => "/^[öäüéàèâêîç_a-z0-9-]+(\.[öäüéàèâêîç_a-z0-9-]+)*@[öäüéàèâêîça-z0-9-]+(\.[öäüéàèâêîça-z0-9-]+)*$/"]])) {
                         return false;
                     }
                     break;