HaaseIT / HCSF

src/Controller/Shop/Shoppingcart.php

Doc Comments +3 added lines, -3 removed lines

@@ -224,7 +224,7 @@ 
     }
 
     /**
-     * @return bool
+     * @return false|null
      */
     private function doCheckout()
     {
@@ -329,7 +329,7 @@ 
     }
 
     /**
-     * @param $iInsertID
+     * @param string $iInsertID
      * @param $sMailbody_us
      * @param $sMailbody_they
      * @param $aImagesToSend
@@ -376,7 +376,7 @@ 
     }
 
     /**
-     * @param $field
+     * @param string $field
      * @return string
      */
     private function getPostValue($field)

Spacing +19 added lines, -19 removed lines

@@ -142,7 +142,7 @@ 
 
         if (HelperConfig::$shop['email_orderconfirmation_embed_itemimages_method'] === 'glide') {
             $sPathToImage = '/'.HelperConfig::$core['directory_images'].'/'.HelperConfig::$shop['directory_images_items'].'/';
-            $sImageroot = PATH_BASEDIR . HelperConfig::$core['directory_glide_master'];
+            $sImageroot = PATH_BASEDIR.HelperConfig::$core['directory_glide_master'];
 
             if (
                 is_file($sImageroot.substr($sPathToImage.$aV["img"], strlen(HelperConfig::$core['directory_images']) + 1))
@@ -153,7 +153,7 @@ 
                     'cache' => PATH_GLIDECACHE,
                     'max_image_size' => HelperConfig::$core['glide_max_imagesize'],
                 ]);
-                $glideserver->setBaseUrl('/' . HelperConfig::$core['directory_images'] . '/');
+                $glideserver->setBaseUrl('/'.HelperConfig::$core['directory_images'].'/');
                 $base64Img = $glideserver->getImageAsBase64($sPathToImage.$aV["img"], HelperConfig::$shop['email_orderconfirmation_embed_itemimages_glideparams']);
                 $TMP = explode(',', $base64Img);
                 $binImg = base64_decode($TMP[1]);
@@ -166,7 +166,7 @@ 
                 .HelperConfig::$shop['directory_images_items_email'].'/';
             if ($aImgInfo = getimagesize($sPathToImage.$aV["img"])) {
                 $binImg = file_get_contents($sPathToImage.$aV["img"]);
-                $base64Img = 'data:' . $aImgInfo["mime"] . ';base64,';
+                $base64Img = 'data:'.$aImgInfo["mime"].';base64,';
                 $base64Img .= base64_encode($binImg);
             }
         }
@@ -242,7 +242,7 @@ 
             $sql = DBTools::buildPSInsertQuery($aDataOrder, 'orders');
             $hResult = $db->prepare($sql);
             foreach ($aDataOrder as $sKey => $sValue) {
-                $hResult->bindValue(':' . $sKey, $sValue);
+                $hResult->bindValue(':'.$sKey, $sValue);
             }
             $hResult->execute();
             $iInsertID = $db->lastInsertId();
@@ -277,7 +277,7 @@ 
                 $sql = DBTools::buildPSInsertQuery($aV, 'orders_items');
                 $hResult = $db->prepare($sql);
                 foreach ($aV as $sKey => $sValue) {
-                    $hResult->bindValue(':' . $sKey, $sValue);
+                    $hResult->bindValue(':'.$sKey, $sValue);
                 }
                 $hResult->execute();
             }
@@ -315,15 +315,15 @@ 
             && array_search('paypal', HelperConfig::$shop["paymentmethods"]) !== false
             && isset(HelperConfig::$shop["paypal_interactive"]) && HelperConfig::$shop["paypal_interactive"]
         ) {
-            header('Location: /_misc/paypal.html?id=' . $iInsertID);
+            header('Location: /_misc/paypal.html?id='.$iInsertID);
         } elseif (
             isset($this->post["paymentmethod"])
             && $this->post["paymentmethod"] == 'sofortueberweisung'
             && array_search('sofortueberweisung', HelperConfig::$shop["paymentmethods"]) !== false
         ) {
-            header('Location: /_misc/sofortueberweisung.html?id=' . $iInsertID);
+            header('Location: /_misc/sofortueberweisung.html?id='.$iInsertID);
         } else {
-            header('Location: /_misc/checkedout.html?id=' . $iInsertID);
+            header('Location: /_misc/checkedout.html?id='.$iInsertID);
         }
         die();
     }
@@ -351,14 +351,14 @@ 
 
         Helper::mailWrapper(
             $this->post["email"],
-            $this->textcats->T("shoppingcart_mail_subject") . ' ' . $iInsertID,
+            $this->textcats->T("shoppingcart_mail_subject").' '.$iInsertID,
             $sMailbody_they,
             $aImagesToSend,
             $aFilesToSend
         );
         Helper::mailWrapper(
             HelperConfig::$core["email_sender"],
-            'Bestellung im Webshop Nr: ' . $iInsertID,
+            'Bestellung im Webshop Nr: '.$iInsertID,
             $sMailbody_us,
             $aImagesToSend
         );
@@ -369,9 +369,9 @@ 
      */
     private function writeCheckoutToFile($sMailbody_us)
     {
-        $fp = fopen(PATH_LOGS . 'shoplog_' . date("Y-m-d") . '.html', 'a');
+        $fp = fopen(PATH_LOGS.'shoplog_'.date("Y-m-d").'.html', 'a');
         // Write $somecontent to our opened file.
-        fwrite($fp, $sMailbody_us . "\n\n-------------------------------------------------------------------------\n\n");
+        fwrite($fp, $sMailbody_us."\n\n-------------------------------------------------------------------------\n\n");
         fclose($fp);
     }
 
@@ -427,8 +427,8 @@ 
             'cancellationdisclaimer' => $this->getPostValue('cancellationdisclaimer'),
             'paymentmethod' => $this->getPostValue('paymentmethod'),
             'shippingcost' => (!isset($_SESSION["shippingcost"]) || $_SESSION["shippingcost"] == 0 ? false : $_SESSION["shippingcost"]),
-            'paypallink' => (isset($this->post["paymentmethod"]) && $this->post["paymentmethod"] == 'paypal' ?  $_SERVER["SERVER_NAME"].'/_misc/paypal.html?id='.$iId : ''),
-            'sofortueberweisunglink' => (isset($this->post["paymentmethod"]) && $this->post["paymentmethod"] == 'sofortueberweisung' ?  $_SERVER["SERVER_NAME"].'/_misc/sofortueberweisung.html?id='.$iId : ''),
+            'paypallink' => (isset($this->post["paymentmethod"]) && $this->post["paymentmethod"] == 'paypal' ? $_SERVER["SERVER_NAME"].'/_misc/paypal.html?id='.$iId : ''),
+            'sofortueberweisunglink' => (isset($this->post["paymentmethod"]) && $this->post["paymentmethod"] == 'sofortueberweisung' ? $_SERVER["SERVER_NAME"].'/_misc/sofortueberweisung.html?id='.$iId : ''),
             'SESSION' => (!$bCust ? Tools::debug($_SESSION, '$_SESSION', true, true) : ''),
             'POST' => (!$bCust ? Tools::debug($this->post, '$this->post', true, true) : ''),
             'orderid' => $iId,
@@ -457,15 +457,15 @@ 
                 || ($this->get["msg"] == 'removed')
                 && isset($this->get["cartkey"])
             ) {
-                $return .= $this->textcats->T("shoppingcart_msg_" . $this->get["msg"] . "_1") . ' ';
+                $return .= $this->textcats->T("shoppingcart_msg_".$this->get["msg"]."_1").' ';
                 if (isset(HelperConfig::$shop["custom_order_fields"]) && mb_strpos($this->get["cartkey"], '|') !== false) {
                     $mCartkeys = explode('|', $this->get["cartkey"]);
                     foreach ($mCartkeys as $sKey => $sValue) {
                         if ($sKey == 0) {
-                            $return .= $sValue . ', ';
+                            $return .= $sValue.', ';
                         } else {
                             $TMP = explode(':', $sValue);
-                            $return .= $this->textcats->T("shoppingcart_item_" . $TMP[0]) . ' ' . $TMP[1] . ', ';
+                            $return .= $this->textcats->T("shoppingcart_item_".$TMP[0]).' '.$TMP[1].', ';
                             unset($TMP);
                         }
                     }
@@ -473,9 +473,9 @@ 
                 } else {
                     $return .= $this->get["cartkey"];
                 }
-                $return.= ' ' . $this->textcats->T("shoppingcart_msg_" . $this->get["msg"] . "_2");
+                $return .= ' '.$this->textcats->T("shoppingcart_msg_".$this->get["msg"]."_2");
                 if ($this->get["msg"] == 'updated') {
-                    $return .= ' ' . $this->get["amount"];
+                    $return .= ' '.$this->get["amount"];
                 }
                 $return .= '<br><br>';
             }

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

Doc Comments +1 added lines, -1 removed lines

@@ -118,7 +118,7 @@
     }
 
     /**
-     * @param $sReply
+     * @param string $sReply
      * @param array $aMore
      */
     private function replyToCartUpdate($sReply, $aMore = []) {

Spacing +2 added lines, -2 removed lines

@@ -77,7 +77,7 @@ 
                                 unset($sTMP);
 
                                 if (isset($_REQUEST[$sValue]) && in_array($_REQUEST[$sValue], $aOptions)) {
-                                    $sCartKey .= '|' . $sValue . ':' . $_REQUEST[$sValue];
+                                    $sCartKey .= '|'.$sValue.':'.$_REQUEST[$sValue];
                                 } else {
                                     $this->replyToCartUpdate('requiredfieldmissing');
                                 }
@@ -135,7 +135,7 @@ 
             if (count($aMore)) $aAR = array_merge($aAR, $aMore);
             echo $this->serviceManager->get('twig')->render('shop/update-cart.twig', $aAR);
         } else {
-            $aMSG["msg"] =  $sReply;
+            $aMSG["msg"] = $sReply;
             if (count($aMore)) $aMSG = array_merge($aMSG, $aMore);
             header('Location: '.\HaaseIT\Toolbox\Tools::makeLinkHRefWithAddedGetVars($_SERVER["HTTP_REFERER"], $aMSG, true, false));
         }

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/Customer/Helper.php

Doc Comments +11 added lines

@@ -27,6 +27,9 @@ 
 
 class Helper
 {
+    /**
+     * @param string $sLang
+     */
     public static function validateCustomerForm($sLang, $aErr = [], $bEdit = false)
     {
         if (!isset($_POST["email"]) || !\filter_var($_POST["email"], FILTER_VALIDATE_EMAIL)) $aErr["email"] = true;
@@ -68,6 +71,11 @@ 
         return '';
     }
 
+    /**
+     * @param string $sKeyConfig
+     * @param string $sKeyForm
+     * @param boolean $aUserData
+     */
     public static function getCustomerFormDefaultValue($sKeyConfig, $sKeyForm, $aUserData) {
         $sDefaultValue = self::getUserData($sKeyConfig, $aUserData);
         if (!$sDefaultValue && isset($_SESSION["formsave_addrform"][$sKeyForm])) $sDefaultValue = $_SESSION["formsave_addrform"][$sKeyForm];
@@ -75,6 +83,9 @@ 
         return $sDefaultValue;
     }
 
+    /**
+     * @param string $sLang
+     */
     public static function buildCustomerForm($sLang, $sPurpose = 'none', $sErr = '', $aUserData = false)
     {
         $sDefaultCountry = self::getCustomerFormDefaultValue('cust_country', "country", $aUserData);

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

Doc Comments +6 added lines

@@ -214,6 +214,9 @@ 
         return $aP;
     }
 
+    /**
+     * @param Page $P
+     */
     private static function getDebug($aP, $P)
     {
         if (!empty($_POST)) {
@@ -260,6 +263,9 @@ 
         return $sLang;
     }
 
+    /**
+     * @param string $purpose
+     */
     public static function getPurifier($purpose)
     {
         $purifier_config = \HTMLPurifier_Config::createDefault();

src/UserPage.php

Doc Comments +3 added lines

@@ -85,6 +85,9 @@
         return $hResult->execute();
     }
 
+    /**
+     * @param string $sPagekeytoadd
+     */
     public function insert($sPagekeytoadd) {
         $aData = [
             'cb_key' => $sPagekeytoadd,

Braces +3 added lines, -1 removed lines

@@ -56,7 +56,9 @@
                 $hResult->fetch();
 
                 if ($this->cb_pagetype !== 'shorturl') {
-                    if (!$bReturnRaw) $this->cb_pageconfig = json_decode($this->cb_pageconfig);
+                    if (!$bReturnRaw) {
+                        $this->cb_pageconfig = json_decode($this->cb_pageconfig);
+                    }
                     $this->oPayload = $this->getPayload();
                 }
             }

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 */