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 (

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', ];
                 }
             }
         }

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

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");
         }

src/Controller/Shop/Shoppingcart.php

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>';
             }

src/Controller/Shop/Updatecart.php

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));
         }