HaaseIT / HCSF

src/Customer/Helper.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
         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["cancellationdisclaimer"]) || $_POST["cancellationdisclaimer"] != 'y')) $aErr["cancellationdisclaimer"] = true;
 
         if (!$bEdit || (isset($_POST["pwd"]) && trim($_POST["pwd"]) != '')) {
             if (

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/Register.php

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
                     $iRows = $hResult->rowCount();
 
                     if ($iRows == 0) {
-                        $sEmailVerificationcode = md5($_POST["email"] . time());
+                        $sEmailVerificationcode = md5($_POST["email"].time());
                         $aData = [
                             'cust_email' => $sEmail,
                             'cust_corp' => filter_var(trim(Tools::getFormfield("corpname")),
@@ -84,7 +84,7 @@ 
 
                         $hResult = $this->serviceManager->get('db')->prepare($sql);
                         foreach ($aData as $sKey => $sValue) {
-                            $hResult->bindValue(':' . $sKey, $sValue, \PDO::PARAM_STR);
+                            $hResult->bindValue(':'.$sKey, $sValue, \PDO::PARAM_STR);
                         }
                         $hResult->execute();
 

src/Controller/Customer/Login.php

Spacing +8 added lines, -8 removed lines

@@ -45,19 +45,19 @@ 
         } else {
             $mLogin = $this->getLogin();
             if (isset($mLogin["status"]) && $mLogin["status"] == 'success') {
-                $this->P->oPayload->cl_html = $textcats->T("login_success") . '<br>';
+                $this->P->oPayload->cl_html = $textcats->T("login_success").'<br>';
                 header('Location: /_misc/userhome.html?login=true');
                 die();
             } elseif (isset($mLogin["status"]) && $mLogin["status"] == 'tosnotaccepted') {
-                $this->P->oPayload->cl_html = $textcats->T("login_fail_tosnotaccepted") . '<br>';
+                $this->P->oPayload->cl_html = $textcats->T("login_fail_tosnotaccepted").'<br>';
                 $this->P->cb_customcontenttemplate = 'customer/login';
             } elseif (isset($mLogin["status"]) && $mLogin["status"] == 'emailnotverified') {
-                $this->P->oPayload->cl_html = $textcats->T("login_fail_emailnotverified") . '<br><br>';
+                $this->P->oPayload->cl_html = $textcats->T("login_fail_emailnotverified").'<br><br>';
                 $this->P->oPayload->cl_html .= '<a href="/_misc/resendverificationmail.html?email='
-                    . $mLogin["data"]['cust_email'] . '">' . $textcats->T("login_fail_emailnotverifiedresend") . '</a>';
+                    . $mLogin["data"]['cust_email'].'">'.$textcats->T("login_fail_emailnotverifiedresend").'</a>';
                 $this->P->cb_customcontenttemplate = 'customer/login';
             } elseif (isset($mLogin["status"]) && $mLogin["status"] == 'accountinactive') {
-                $this->P->oPayload->cl_html = $textcats->T("login_fail_accountinactive") . '<br>';
+                $this->P->oPayload->cl_html = $textcats->T("login_fail_accountinactive").'<br>';
                 $this->P->cb_customcontenttemplate = 'customer/login';
             } else {
                 $this->P->oPayload->cl_html = $textcats->T("login_fail");
@@ -101,7 +101,7 @@ 
         $hResult->execute();
 
         $iRows = $hResult->rowCount();
-        if($iRows == 1) {
+        if ($iRows == 1) {
             $aRow = $hResult->fetch();
 
             if (password_verify($_POST["password"], $aRow['cust_password'])) {
@@ -111,9 +111,9 @@ 
                 } elseif ($aRow['cust_tosaccepted'] == 'n') {
                     return ['status' => 'tosnotaccepted'];
                 } elseif ($aRow['cust_emailverified'] == 'n') {
-                    return ['status' => 'emailnotverified', 'data' => $aRow,];
+                    return ['status' => 'emailnotverified', 'data' => $aRow, ];
                 } elseif ($aRow['cust_active'] == 'n') {
-                    return ['status' => 'accountinactive',];
+                    return ['status' => 'accountinactive', ];
                 }
             }
         }

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/Verifyemail.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
                 /** @var \PDOStatement $hResult */
                 $hResult = $this->db->prepare($sql);
                 foreach ($aData as $sKey => $sValue) {
-                    $hResult->bindValue(':' . $sKey, $sValue);
+                    $hResult->bindValue(':'.$sKey, $sValue);
                 }
                 $hResult->execute();
                 $this->P->oPayload->cl_html = $this->textcats->T("register_emailverificationsuccess");

src/Controller/Customer/Resendverificationmail.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
         if (CHelper::getUserData()) {
             $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T("denied_default");
         } else {
-            $sql = 'SELECT ' . DB_ADDRESSFIELDS . ', cust_emailverificationcode FROM customer';
+            $sql = 'SELECT '.DB_ADDRESSFIELDS.', cust_emailverificationcode FROM customer';
             $sql .= ' WHERE cust_email = :email AND cust_emailverified = \'n\'';
 
             /** @var \PDOStatement $hResult */

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

Spacing +2 added lines, -2 removed lines

@@ -82,7 +82,7 @@ 
                     $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 == '') {
@@ -110,7 +110,7 @@ 
                             $sql = \HaaseIT\Toolbox\DBTools::buildPSUpdateQuery($aData, 'customer', 'cust_id');
                             $hResult = $this->db->prepare($sql);
                             foreach ($aData as $sKey => $sValue) {
-                                $hResult->bindValue(':' . $sKey, $sValue);
+                                $hResult->bindValue(':'.$sKey, $sValue);
                             }
                             $hResult->execute();
                             $aPData["infochangessaved"] = true;

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/Paypal.php

Spacing +7 added lines, -7 removed lines

@@ -69,17 +69,17 @@
 
             $sPaypalURL = HelperConfig::$shop["paypal"]["url"]
                 .'?cmd=_xclick&rm=2&custom='
-                .$iId . '&business='.HelperConfig::$shop["paypal"]["business"];
-            $sPaypalURL .= '&notify_url=http://' . $_SERVER["SERVER_NAME"] . '/_misc/paypal_notify.html&item_name=' . $this->textcats->T("misc_paypaypal_paypaltitle") . ' ' . $iId;
-            $sPaypalURL .= '&currency_code=' . HelperConfig::$shop["paypal"]["currency_id"]
-                .'&amount=' . str_replace(',', '.', number_format($fGesamtbrutto, 2, '.', ''));
+                .$iId.'&business='.HelperConfig::$shop["paypal"]["business"];
+            $sPaypalURL .= '&notify_url=http://'.$_SERVER["SERVER_NAME"].'/_misc/paypal_notify.html&item_name='.$this->textcats->T("misc_paypaypal_paypaltitle").' '.$iId;
+            $sPaypalURL .= '&currency_code='.HelperConfig::$shop["paypal"]["currency_id"]
+                .'&amount='.str_replace(',', '.', number_format($fGesamtbrutto, 2, '.', ''));
             if (HelperConfig::$shop["interactive_paymentmethods_redirect_immediately"]) {
-                header('Location: ' . $sPaypalURL);
+                header('Location: '.$sPaypalURL);
                 die();
             }
 
-            $this->P->oPayload->cl_html = $this->textcats->T("misc_paypaypal_greeting") . '<br><br>';
-            $this->P->oPayload->cl_html .= '<a href="' . $sPaypalURL . '">' . $this->textcats->T("misc_paypaypal") . '</a>';
+            $this->P->oPayload->cl_html = $this->textcats->T("misc_paypaypal_greeting").'<br><br>';
+            $this->P->oPayload->cl_html .= '<a href="'.$sPaypalURL.'">'.$this->textcats->T("misc_paypaypal").'</a>';
         } else {
             $this->P->oPayload->cl_html = $this->textcats->T("misc_paypaypal_paymentnotavailable");
         }