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

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

Spacing +12 added lines, -12 removed lines

@@ -42,24 +42,24 @@
 
         header("Content-Type: text/html; charset=UTF-8");
         $return = '<div>';
-        $return .= '<div id="shippingcostbrutto_new">' . number_format($_SESSION["cartpricesums"]["fVersandkostenbrutto"],
+        $return .= '<div id="shippingcostbrutto_new">'.number_format($_SESSION["cartpricesums"]["fVersandkostenbrutto"],
                 HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'],
-                HelperConfig::$core['numberformat_thousands_seperator']) . '</div>';
-        $return .= '<div id="vatfull_new">' . number_format(round($_SESSION["cartpricesums"]["fSteuervoll"], 2),
+                HelperConfig::$core['numberformat_thousands_seperator']).'</div>';
+        $return .= '<div id="vatfull_new">'.number_format(round($_SESSION["cartpricesums"]["fSteuervoll"], 2),
                 HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'],
-                HelperConfig::$core['numberformat_thousands_seperator']) . '</div>';
-        $return .= '<div id="totalbrutto_new">' . number_format(round($_SESSION["cartpricesums"]["fGesamtbrutto"], 2),
+                HelperConfig::$core['numberformat_thousands_seperator']).'</div>';
+        $return .= '<div id="totalbrutto_new">'.number_format(round($_SESSION["cartpricesums"]["fGesamtbrutto"], 2),
                 HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'],
-                HelperConfig::$core['numberformat_thousands_seperator']) . '</div>';
-        $return .= '<div id="shippingcostnetto_new">' . number_format($_SESSION["cartpricesums"]["fVersandkostennetto"],
+                HelperConfig::$core['numberformat_thousands_seperator']).'</div>';
+        $return .= '<div id="shippingcostnetto_new">'.number_format($_SESSION["cartpricesums"]["fVersandkostennetto"],
                 HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'],
-                HelperConfig::$core['numberformat_thousands_seperator']) . '</div>';
-        $return .= '<div id="vatreduced_new">' . number_format(round($_SESSION["cartpricesums"]["fSteuererm"], 2),
+                HelperConfig::$core['numberformat_thousands_seperator']).'</div>';
+        $return .= '<div id="vatreduced_new">'.number_format(round($_SESSION["cartpricesums"]["fSteuererm"], 2),
                 HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'],
-                HelperConfig::$core['numberformat_thousands_seperator']) . '</div>';
-        $return .= '<div id="totalnetto_new">' . number_format(round($_SESSION["cartpricesums"]["fGesamtnetto"], 2),
+                HelperConfig::$core['numberformat_thousands_seperator']).'</div>';
+        $return .= '<div id="totalnetto_new">'.number_format(round($_SESSION["cartpricesums"]["fGesamtnetto"], 2),
                 HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'],
-                HelperConfig::$core['numberformat_thousands_seperator']) . '</div>';
+                HelperConfig::$core['numberformat_thousands_seperator']).'</div>';
         $return .= '</div>';
         die($return);
     }

src/Controller/Shop/Sofortueberweisung.php

Spacing +4 added lines, -4 removed lines

@@ -72,14 +72,14 @@
                 .'&project_id='.HelperConfig::$shop["sofortueberweisung"]["project_id"].'&amount='
                 .number_format($fGesamtbrutto, 2, '.', '')
                 .'&currency_id='.HelperConfig::$shop["sofortueberweisung"]["currency_id"].'&reason_1='
-                .urlencode($this->textcats->T("misc_paysofortueberweisung_ueberweisungsbetreff") . ' ').$iId;
+                .urlencode($this->textcats->T("misc_paysofortueberweisung_ueberweisungsbetreff").' ').$iId;
             if (HelperConfig::$shop["interactive_paymentmethods_redirect_immediately"]) {
-                header('Location: ' . $sPURL);
+                header('Location: '.$sPURL);
                 die();
             }
 
-            $this->P->oPayload->cl_html = $this->textcats->T("misc_paysofortueberweisung_greeting") . '<br><br>';
-            $this->P->oPayload->cl_html .= '<a href="' . $sPURL . '">' . $this->textcats->T("misc_paysofortueberweisung") . '</a>';
+            $this->P->oPayload->cl_html = $this->textcats->T("misc_paysofortueberweisung_greeting").'<br><br>';
+            $this->P->oPayload->cl_html .= '<a href="'.$sPURL.'">'.$this->textcats->T("misc_paysofortueberweisung").'</a>';
         } else {
             $this->P->oPayload->cl_html = $this->textcats->T("misc_paysofortueberweisung_paymentnotavailable");
         }

src/Controller/Glide.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
                 'cache' => PATH_GLIDECACHE,
                 'max_image_size' => HelperConfig::$core['glide_max_imagesize'],
             ]);
-            $glideserver->setBaseUrl('/' . HelperConfig::$core['directory_images'] . '/');
+            $glideserver->setBaseUrl('/'.HelperConfig::$core['directory_images'].'/');
             // Generate a URL
 
             try {

src/Controller/Base.php

Spacing +3 added lines, -3 removed lines

@@ -80,7 +80,7 @@ 
         } elseif (count(HelperConfig::$secrets['admin_users'])) {
 
             if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION'])) { // fix for php cgi mode
-                list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = explode(':' , base64_decode(substr($_SERVER['REDIRECT_HTTP_AUTHORIZATION'], 6)));
+                list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = explode(':', base64_decode(substr($_SERVER['REDIRECT_HTTP_AUTHORIZATION'], 6)));
             }
 
             if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
@@ -96,12 +96,12 @@ 
             }
 
             if (!$validated) {
-                header('WWW-Authenticate: Basic realm="' . HelperConfig::$secrets['admin_authrealm'] . '"');
+                header('WWW-Authenticate: Basic realm="'.HelperConfig::$secrets['admin_authrealm'].'"');
                 header('HTTP/1.0 401 Unauthorized');
                 die("Not authorized");
             }
         } else {
-            header('WWW-Authenticate: Basic realm="' . HelperConfig::$secrets['admin_authrealm'] . '"');
+            header('WWW-Authenticate: Basic realm="'.HelperConfig::$secrets['admin_authrealm'].'"');
             header('HTTP/1.0 401 Unauthorized');
             die('Not authorized');
         }