HaaseIT / HCSF

src/Customer/Helper.php

Braces +53 added lines, -20 removed lines

@@ -29,18 +29,42 @@ 
 {
     public static function validateCustomerForm($sLang, $aErr = [], $bEdit = false)
     {
-        if (!isset($_POST["email"]) || !\filter_var($_POST["email"], FILTER_VALIDATE_EMAIL)) $aErr["email"] = true;
-        if (HelperConfig::$customer["validate_corpname"] && (!isset($_POST["corpname"]) || strlen(trim($_POST["corpname"])) < 3)) $aErr["corpname"] = true;
-        if (HelperConfig::$customer["validate_name"] && (!isset($_POST["name"]) || strlen(trim($_POST["name"])) < 3)) $aErr["name"] = true;
-        if (HelperConfig::$customer["validate_street"] && (!isset($_POST["street"]) || strlen(trim($_POST["street"])) < 3)) $aErr["street"] = true;
-        if (HelperConfig::$customer["validate_zip"] && (!isset($_POST["zip"]) || strlen(trim($_POST["zip"])) < 4)) $aErr["zip"] = true;
-        if (HelperConfig::$customer["validate_town"] && (!isset($_POST["town"]) || strlen(trim($_POST["town"])) < 3)) $aErr["town"] = true;
-        if (HelperConfig::$customer["validate_phone"] && (!isset($_POST["phone"]) || strlen(trim($_POST["phone"])) < 6)) $aErr["phone"] = true;
-        if (HelperConfig::$customer["validate_cellphone"] && (!isset($_POST["cellphone"]) || strlen(trim($_POST["cellphone"])) < 11)) $aErr["cellphone"] = true;
-        if (HelperConfig::$customer["validate_fax"] && (!isset($_POST["fax"]) || strlen(trim($_POST["fax"]))) < 6) $aErr["fax"] = true;
-        if (HelperConfig::$customer["validate_country"] && (!isset($_POST["country"]) || !isset(HelperConfig::$countries["countries_".$sLang][$_POST["country"]]))) $aErr["country"] = true;
-        if (!$bEdit && (!isset($_POST["tos"]) || $_POST["tos"] != 'y')) $aErr["tos"] = true;
-        if (!$bEdit && (!isset( $_POST["cancellationdisclaimer"] ) || $_POST["cancellationdisclaimer"] != 'y')) $aErr["cancellationdisclaimer"] = true;
+        if (!isset($_POST["email"]) || !\filter_var($_POST["email"], FILTER_VALIDATE_EMAIL)) {
+            $aErr["email"] = true;
+        }
+        if (HelperConfig::$customer["validate_corpname"] && (!isset($_POST["corpname"]) || strlen(trim($_POST["corpname"])) < 3)) {
+            $aErr["corpname"] = true;
+        }
+        if (HelperConfig::$customer["validate_name"] && (!isset($_POST["name"]) || strlen(trim($_POST["name"])) < 3)) {
+            $aErr["name"] = true;
+        }
+        if (HelperConfig::$customer["validate_street"] && (!isset($_POST["street"]) || strlen(trim($_POST["street"])) < 3)) {
+            $aErr["street"] = true;
+        }
+        if (HelperConfig::$customer["validate_zip"] && (!isset($_POST["zip"]) || strlen(trim($_POST["zip"])) < 4)) {
+            $aErr["zip"] = true;
+        }
+        if (HelperConfig::$customer["validate_town"] && (!isset($_POST["town"]) || strlen(trim($_POST["town"])) < 3)) {
+            $aErr["town"] = true;
+        }
+        if (HelperConfig::$customer["validate_phone"] && (!isset($_POST["phone"]) || strlen(trim($_POST["phone"])) < 6)) {
+            $aErr["phone"] = true;
+        }
+        if (HelperConfig::$customer["validate_cellphone"] && (!isset($_POST["cellphone"]) || strlen(trim($_POST["cellphone"])) < 11)) {
+            $aErr["cellphone"] = true;
+        }
+        if (HelperConfig::$customer["validate_fax"] && (!isset($_POST["fax"]) || strlen(trim($_POST["fax"]))) < 6) {
+            $aErr["fax"] = true;
+        }
+        if (HelperConfig::$customer["validate_country"] && (!isset($_POST["country"]) || !isset(HelperConfig::$countries["countries_".$sLang][$_POST["country"]]))) {
+            $aErr["country"] = true;
+        }
+        if (!$bEdit && (!isset($_POST["tos"]) || $_POST["tos"] != 'y')) {
+            $aErr["tos"] = true;
+        }
+        if (!$bEdit && (!isset( $_POST["cancellationdisclaimer"] ) || $_POST["cancellationdisclaimer"] != 'y')) {
+            $aErr["cancellationdisclaimer"] = true;
+        }
 
         if (!$bEdit || (isset($_POST["pwd"]) && trim($_POST["pwd"]) != '')) {
             if (
@@ -70,7 +94,9 @@ 
 
     public static function getCustomerFormDefaultValue($sKeyConfig, $sKeyForm, $aUserData) {
         $sDefaultValue = self::getUserData($sKeyConfig, $aUserData);
-        if (!$sDefaultValue && isset($_SESSION["formsave_addrform"][$sKeyForm])) $sDefaultValue = $_SESSION["formsave_addrform"][$sKeyForm];
+        if (!$sDefaultValue && isset($_SESSION["formsave_addrform"][$sKeyForm])) {
+            $sDefaultValue = $_SESSION["formsave_addrform"][$sKeyForm];
+        }
 
         return $sDefaultValue;
     }
@@ -210,8 +236,7 @@ 
             $aP['link'] .= $_SERVER["SERVER_NAME"].'/_misc/verifyemail.html?key='.$sEmailVerificationcode;
 
             $sMessage = $serviceManager->get('twig')->render('customer/sendverificationmail.twig', $aP);
-        }
-        else {
+        } else {
             $sSubject = HardcodedText::get('newcustomerregistration_mail_subject');
             $sMessage = HardcodedText::get('newcustomerregistration_mail_text1').' ';
             $sMessage .= $sTargetAddress.HardcodedText::get(
@@ -226,13 +251,21 @@ 
     public static function getUserData($sField = '', $aUserdata = false)
     {
         if (!$aUserdata) {
-            if (!isset($_SESSION["user"]) || !is_array($_SESSION["user"])) return false;
-            elseif ($sField == '') return true;
+            if (!isset($_SESSION["user"]) || !is_array($_SESSION["user"])) {
+                return false;
+            } elseif ($sField == '') {
+                return true;
+            }
 
-            if ($sField != '' && isset($_SESSION["user"][$sField]) && $_SESSION["user"][$sField] != '') return $_SESSION["user"][$sField];
+            if ($sField != '' && isset($_SESSION["user"][$sField]) && $_SESSION["user"][$sField] != '') {
+                return $_SESSION["user"][$sField];
+            }
         } else {
-            if (isset($aUserdata[$sField])) return $aUserdata[$sField];
-            elseif ($sField = '') return false;
+            if (isset($aUserdata[$sField])) {
+                return $aUserdata[$sField];
+            } elseif ($sField = '') {
+                return false;
+            }
         }
     }
 }

src/Controller/Customer/Login.php

Braces +15 added lines, -5 removed lines

@@ -76,21 +76,31 @@
     private function getLogin()
     {
         $bTryEmail = false;
-        if ('cust_no' != 'cust_email') $bTryEmail = true;
+        if ('cust_no' != 'cust_email') {
+            $bTryEmail = true;
+        }
 
         $sEmail = filter_var(trim(Tools::getFormfield("user")), FILTER_SANITIZE_EMAIL);
         $sUser = filter_var(trim(Tools::getFormfield("user")), FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
 
         $sql = 'SELECT cust_no, cust_email, cust_password, cust_active, cust_emailverified, cust_tosaccepted'
             . ' FROM customer WHERE ';
-        if ($bTryEmail) $sql .= "(";
+        if ($bTryEmail) {
+            $sql .= "(";
+        }
         $sql .= 'cust_no = :user';
-        if ($bTryEmail) $sql .= ' OR cust_email = :email) ';
+        if ($bTryEmail) {
+            $sql .= ' OR cust_email = :email) ';
+        }
         $sql .= " AND ";
-        if ($bTryEmail) $sql .= "(";
+        if ($bTryEmail) {
+            $sql .= "(";
+        }
         $sql .= 'cust_no != \'\'';
 
-        if ($bTryEmail) $sql .= ' OR cust_email != \'\')';
+        if ($bTryEmail) {
+            $sql .= ' OR cust_email != \'\')';
+        }
 
         /** @var \PDOStatement $hResult */
         $hResult = $this->serviceManager->get('db')->prepare($sql);

src/Controller/Customer/Forgotpassword.php

Braces +3 added lines, -1 removed lines

@@ -105,7 +105,9 @@
                     ];
                     $sql = \HaaseIT\Toolbox\DBTools::buildPSUpdateQuery($aData, 'customer', 'cust_id');
                     $hResult = $this->db->prepare($sql);
-                    foreach ($aData as $sKey => $sValue) $hResult->bindValue(':'.$sKey, $sValue);
+                    foreach ($aData as $sKey => $sValue) {
+                        $hResult->bindValue(':'.$sKey, $sValue);
+                    }
                     $hResult->execute();
 
                     $sTargetAddress = $aResult['cust_email'];

src/Controller/Customer/Userhome.php

Braces +3 added lines, -1 removed lines

@@ -82,7 +82,9 @@
                     $hResult->bindValue(':email', $sEmail, \PDO::PARAM_STR);
                     $hResult->execute();
                     $iRows = $hResult->rowCount();
-                    if ($iRows == 1) $sErr .= $this->textcats->T("userprofile_emailalreadyinuse") . '<br>';
+                    if ($iRows == 1) {
+                        $sErr .= $this->textcats->T("userprofile_emailalreadyinuse") . '<br>';
+                    }
                     $sErr = CHelper::validateCustomerForm(HelperConfig::$lang, $sErr, true);
 
                     if ($sErr == '') {

src/Controller/Customer/Resetpassword.php

Braces +9 added lines, -3 removed lines

@@ -108,8 +108,12 @@ 
             if (
                 strlen($_POST["pwd"]) < HelperConfig::$customer["minimum_length_password"]
                 || strlen($_POST["pwd"]) > HelperConfig::$customer["maximum_length_password"]
-            ) $aErr[] = 'pwlength';
-            if ($_POST["pwd"] != $_POST["pwdc"]) $aErr[] = 'pwmatch';
+            ) {
+                $aErr[] = 'pwlength';
+            }
+            if ($_POST["pwd"] != $_POST["pwdc"]) {
+                $aErr[] = 'pwmatch';
+            }
             if (count($aErr) == 0) {
                 $sEnc = password_hash($_POST["pwd"], PASSWORD_DEFAULT);
                 $aData = [
@@ -119,7 +123,9 @@ 
                 ];
                 $sql = \HaaseIT\Toolbox\DBTools::buildPSUpdateQuery($aData, 'customer', 'cust_id');
                 $hResult = $this->db->prepare($sql);
-                foreach ($aData as $sKey => $sValue) $hResult->bindValue(':'.$sKey, $sValue);
+                foreach ($aData as $sKey => $sValue) {
+                    $hResult->bindValue(':'.$sKey, $sValue);
+                }
                 $hResult->execute();
             }
         } else {

src/Controller/Shop/Shoppingcart.php

Braces +3 added lines, -1 removed lines

@@ -347,7 +347,9 @@
             $aFilesToSend[] =
                 PATH_DOCROOT.HelperConfig::$core['directory_emailattachments'].'/'
                 .HelperConfig::$shop["email_orderconfirmation_attachment_cancellationform_".HelperConfig::$lang];
-        } else $aFilesToSend = [];
+        } else {
+            $aFilesToSend = [];
+        }
 
         Helper::mailWrapper(
             $this->post["email"],

src/Controller/Shop/Updatecart.php

Braces +6 added lines, -2 removed lines

@@ -132,11 +132,15 @@
                 'numberformat_decimal_point' => HelperConfig::$core['numberformat_decimal_point'],
                 'numberformat_thousands_seperator' => HelperConfig::$core['numberformat_thousands_seperator'],
             ];
-            if (count($aMore)) $aAR = array_merge($aAR, $aMore);
+            if (count($aMore)) {
+                $aAR = array_merge($aAR, $aMore);
+            }
             echo $this->serviceManager->get('twig')->render('shop/update-cart.twig', $aAR);
         } else {
             $aMSG["msg"] =  $sReply;
-            if (count($aMore)) $aMSG = array_merge($aMSG, $aMore);
+            if (count($aMore)) {
+                $aMSG = array_merge($aMSG, $aMore);
+            }
             header('Location: '.\HaaseIT\Toolbox\Tools::makeLinkHRefWithAddedGetVars($_SERVER["HTTP_REFERER"], $aMSG, true, false));
         }
         die();

src/Controller/Shop/Myorders.php

Braces +19 added lines, -8 removed lines

@@ -158,14 +158,23 @@ 
             while ($aRow = $hResult->fetch()) {
                 $sStatus = SHelper::showOrderStatusText($this->textcats, $aRow["o_ordercompleted"]);
 
-                if ($aRow["o_paymentmethod"] == 'prepay') $sPaymentmethod = $this->textcats->T("order_paymentmethod_prepay");
-                elseif ($aRow["o_paymentmethod"] == 'paypal') $sPaymentmethod = $this->textcats->T("order_paymentmethod_paypal");
-                elseif ($aRow["o_paymentmethod"] == 'debit') $sPaymentmethod = $this->textcats->T("order_paymentmethod_debit");
-                elseif ($aRow["o_paymentmethod"] == 'invoice') $sPaymentmethod = $this->textcats->T("order_paymentmethod_invoice");
-                else $sPaymentmethod = ucwords($aRow["o_paymentmethod"]);
+                if ($aRow["o_paymentmethod"] == 'prepay') {
+                    $sPaymentmethod = $this->textcats->T("order_paymentmethod_prepay");
+                } elseif ($aRow["o_paymentmethod"] == 'paypal') {
+                    $sPaymentmethod = $this->textcats->T("order_paymentmethod_paypal");
+                } elseif ($aRow["o_paymentmethod"] == 'debit') {
+                    $sPaymentmethod = $this->textcats->T("order_paymentmethod_debit");
+                } elseif ($aRow["o_paymentmethod"] == 'invoice') {
+                    $sPaymentmethod = $this->textcats->T("order_paymentmethod_invoice");
+                } else {
+                    $sPaymentmethod = ucwords($aRow["o_paymentmethod"]);
+                }
 
-                if ($aRow["o_paymentcompleted"] == 'y') $sPaymentstatus = ucwords($this->textcats->T("misc_yes"));
-                else $sPaymentstatus = ucwords($this->textcats->T("misc_no"));
+                if ($aRow["o_paymentcompleted"] == 'y') {
+                    $sPaymentstatus = ucwords($this->textcats->T("misc_yes"));
+                } else {
+                    $sPaymentstatus = ucwords($this->textcats->T("misc_no"));
+                }
 
                 $aData[] = [
                     'o_id' => $aRow["o_id"],
@@ -181,7 +190,9 @@ 
                 ];
             }
             $return .= \HaaseIT\Toolbox\Tools::makeListtable($COList, $aData, $this->serviceManager->get('twig'));
-        } else $return .= $this->textcats->T("myorders_no_orders_to_display");
+        } else {
+            $return .= $this->textcats->T("myorders_no_orders_to_display");
+        }
 
         return $return;
     }

src/Controller/Admin/Customer/Customeradmin.php

Braces +6 added lines, -2 removed lines

@@ -161,7 +161,9 @@ 
                         }
                         $sql = \HaaseIT\Toolbox\DBTools::buildPSUpdateQuery($aData, 'customer', 'cust_id');
                         $hResult = $this->db->prepare($sql);
-                        foreach ($aData as $sKey => $sValue) $hResult->bindValue(':' . $sKey, $sValue);
+                        foreach ($aData as $sKey => $sValue) {
+                            $hResult->bindValue(':' . $sKey, $sValue);
+                        }
                         $hResult->execute();
                         $aInfo["changeswritten"] = true;
                     }
@@ -180,7 +182,9 @@ 
         }
         $aPData["customeradmin"]["text"] = $return;
         $aPData["customeradmin"]["type"] = $sType;
-        if (isset($aInfo)) $aPData["customeradmin"]["info"] = $aInfo;
+        if (isset($aInfo)) {
+            $aPData["customeradmin"]["info"] = $aInfo;
+        }
         return $aPData;
     }