HaaseIT / HCSF

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>';
         \HaaseIT\HCSF\Helper::terminateScript($return);
     }

src/Router.php

Spacing +8 added lines, -8 removed lines

@@ -86,7 +86,7 @@ 
 
             $aPath = explode('/', $this->sPath);
             if (!empty($map[$this->sPath])) {
-                $class = '\\HaaseIT\\HCSF\\Controller\\' . $map[$this->sPath];
+                $class = '\\HaaseIT\\HCSF\\Controller\\'.$map[$this->sPath];
             } else {
                 if ($aPath[1] == HelperConfig::$core['directory_images']) {
                     $class = Controller\Glide::class;
@@ -132,7 +132,7 @@ 
                 } else { // if it is found, go on
                     // Support for shorturls
                     if ($this->P->cb_pagetype === 'shorturl') {
-                        \HaaseIT\HCSF\Helper::redirectToPage('Location: ' . $this->P->cb_pageconfig, true);
+                        \HaaseIT\HCSF\Helper::redirectToPage('Location: '.$this->P->cb_pageconfig, true);
                     }
 
                     if (isset($this->P, $aRoutingoverride) && count($aRoutingoverride)) {
@@ -148,14 +148,14 @@ 
                 $this->P->iStatus = 404;
 
                 $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T('misc_page_not_found');
-                header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found');
+                header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found');
             } elseif (!is_object($this->P) && $this->P == 500) {
                 $this->P = new CorePage($this->serviceManager);
                 $this->P->cb_pagetype = 'error';
                 $this->P->iStatus = 500;
 
                 $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T('misc_server_error');
-                header($_SERVER['SERVER_PROTOCOL'] . ' 500 Internal Server Error');
+                header($_SERVER['SERVER_PROTOCOL'].' 500 Internal Server Error');
             } elseif (is_object($this->P) && $this->P->oPayload == NULL) {// elseif the page has been found but contains no payload...
                 if (
                     !(
@@ -165,10 +165,10 @@ 
                     )
                 ) { // no payload is fine if page is one of these
                     $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T('misc_content_not_found');
-                    header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found');
+                    header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found');
                 }
             } elseif ($this->P->oPayload->cl_lang != NULL && $this->P->oPayload->cl_lang != HelperConfig::$lang) { // if the page is available but not in the current language, display info
-                $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T('misc_page_not_available_lang') . '<br><br>' . $this->P->oPayload->cl_html;
+                $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T('misc_page_not_available_lang').'<br><br>'.$this->P->oPayload->cl_html;
             }
         }
         return $this->P;
@@ -190,7 +190,7 @@ 
                 // to allow dots in the filename, we have to iterate through all parts of the filename
                 $aRoutingoverride['itemno'] = '';
                 for ($i = 0; $i < count($aTMP['exploded_request_file']) - 1; $i++) {
-                    $aRoutingoverride['itemno'] .= $aTMP['exploded_request_file'][$i] . '.';
+                    $aRoutingoverride['itemno'] .= $aTMP['exploded_request_file'][$i].'.';
                 }
                 // remove the trailing dot
                 $aRoutingoverride['itemno'] = \HaaseIT\Toolbox\Tools::cutStringend($aRoutingoverride['itemno'], 1);
@@ -200,7 +200,7 @@ 
                 // rebuild the path string without the trailing '/item/itemno.html'
                 $this->sPath = '';
                 for ($i = 0; $i < $aTMP['parts_in_path'] - 2; $i++) {
-                    $this->sPath .= $aPath[$i] . '/';
+                    $this->sPath .= $aPath[$i].'/';
                 }
             }
         }

src/Controller/Admin/Shop/Itemadmin.php

Spacing +6 added lines, -6 removed lines

@@ -252,10 +252,10 @@ 
     private function prepareItemlist($aItemlist)
     {
         $aList = [
-            ['title' => HardcodedText::get('itemadmin_list_active'), 'key' => 'itemindex', 'width' => 30, 'linked' => false, 'callback' => 'renderItemStatusIcon',],
-            ['title' => HardcodedText::get('itemadmin_list_itemno'), 'key' => 'itemno', 'width' => 100, 'linked' => false,],
-            ['title' => HardcodedText::get('itemadmin_list_name'), 'key' => 'name', 'width' => 350, 'linked' => false,],
-            ['title' => HardcodedText::get('itemadmin_list_edit'), 'key' => 'itemno', 'width' => 30, 'linked' => true, 'ltarget' => '/_admin/itemadmin.html', 'lkeyname' => 'itemno', 'lgetvars' => ['action' => 'showitem'],],
+            ['title' => HardcodedText::get('itemadmin_list_active'), 'key' => 'itemindex', 'width' => 30, 'linked' => false, 'callback' => 'renderItemStatusIcon', ],
+            ['title' => HardcodedText::get('itemadmin_list_itemno'), 'key' => 'itemno', 'width' => 100, 'linked' => false, ],
+            ['title' => HardcodedText::get('itemadmin_list_name'), 'key' => 'name', 'width' => 350, 'linked' => false, ],
+            ['title' => HardcodedText::get('itemadmin_list_edit'), 'key' => 'itemno', 'width' => 30, 'linked' => true, 'ltarget' => '/_admin/itemadmin.html', 'lkeyname' => 'itemno', 'lgetvars' => ['action' => 'showitem'], ],
         ];
         $aData = [];
         foreach ($aItemlist['data'] as $aValue) {
@@ -320,7 +320,7 @@ 
     private function prepareItem($aItemdata)
     {
         $aData = [
-            'form' => ['action' => Tools::makeLinkHRefWithAddedGetVars('/_admin/itemadmin.html', ['action' => 'showitem', 'itemno' => $aItemdata['base']['itm_no']]),],
+            'form' => ['action' => Tools::makeLinkHRefWithAddedGetVars('/_admin/itemadmin.html', ['action' => 'showitem', 'itemno' => $aItemdata['base']['itm_no']]), ],
             'id' => $aItemdata['base']['itm_id'],
             'itemno' => $aItemdata['base']['itm_no'],
             'name' => $aItemdata['base']['itm_name'],
@@ -351,7 +351,7 @@ 
         $aGroups = $this->getItemgroups('');
         $aData['groupoptions'][] = '';
         foreach ($aGroups as $aValue) {
-            $aData['groupoptions'][] = $aValue['itmg_id'] . '|' . $aValue['itmg_no'] . ' - ' . $aValue['itmg_name'];
+            $aData['groupoptions'][] = $aValue['itmg_id'].'|'.$aValue['itmg_no'].' - '.$aValue['itmg_name'];
         }
         unset($aGroups);
 

src/Controller/Base.php

Spacing +3 added lines, -3 removed lines

@@ -117,7 +117,7 @@ 
             $user = filter_input(INPUT_SERVER, 'PHP_AUTH_USER');
             $pass = filter_input(INPUT_SERVER, 'PHP_AUTH_PW');
             if (filter_input(INPUT_SERVER, 'REDIRECT_HTTP_AUTHORIZATION') !== null) { // fix for php cgi mode
-                list($user, $pass) = explode(':' , base64_decode(substr(filter_input(INPUT_SERVER, 'REDIRECT_HTTP_AUTHORIZATION'), 6)));
+                list($user, $pass) = explode(':', base64_decode(substr(filter_input(INPUT_SERVER, 'REDIRECT_HTTP_AUTHORIZATION'), 6)));
             }
 
             if (!empty($user) && !empty($pass)) {
@@ -130,12 +130,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');
                 \HaaseIT\HCSF\Helper::terminateScript('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');
             \HaaseIT\HCSF\Helper::terminateScript('Not authorized');
         }

src/Controller/Customer/Forgotpassword.php

Spacing +1 added lines, -1 removed lines

@@ -118,7 +118,7 @@
                     $sTargetAddress = $aResult['cust_email'];
                     $sSubject = $this->textcats->T('forgotpw_mail_subject');
                     $sMessage = $this->textcats->T('forgotpw_mail_text1');
-                    $sMessage .= '<br><br>' .'<a href="http'.($serverhttps === 'on' ? 's' : '').'://';
+                    $sMessage .= '<br><br>'.'<a href="http'.($serverhttps === 'on' ? 's' : '').'://';
                     $sMessage .= $serverservername.'/_misc/rp.html?key='.$sResetCode.'&amp;email='.$sTargetAddress.'">';
                     $sMessage .= 'http'.($serverhttps === 'on' ? 's' : '').'://';
                     $sMessage .= $serverservername.'/_misc/rp.html?key='.$sResetCode.'&amp;email='.$sTargetAddress.'</a>';

src/Controller/Customer/Login.php

Spacing +8 added lines, -8 removed lines

@@ -45,18 +45,18 @@ 
         } 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>';
                 \HaaseIT\HCSF\Helper::redirectToPage('/_misc/userhome.html?login=true');
             } 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');
@@ -110,7 +110,7 @@ 
         $hResult->execute();
 
         $iRows = $hResult->rowCount();
-        if($iRows == 1) {
+        if ($iRows == 1) {
             $aRow = $hResult->fetch();
 
             if (password_verify(filter_input(INPUT_POST, 'password'), $aRow['cust_password'])) {
@@ -120,9 +120,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/Shop/Shoppingcart.php

Unused Use Statements -1 removed lines

@@ -25,7 +25,6 @@
 use HaaseIT\HCSF\Helper;
 use HaaseIT\HCSF\Customer\Helper as CHelper;
 use HaaseIT\HCSF\Shop\Helper as SHelper;
-use HaaseIT\Toolbox\DBTools;
 
 class Shoppingcart extends Base
 {

Spacing +19 added lines, -19 removed lines

@@ -119,7 +119,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))
@@ -130,7 +130,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]);
@@ -143,7 +143,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);
             }
         }
@@ -297,15 +297,15 @@ 
             && in_array('paypal', HelperConfig::$shop['paymentmethods'], true) !== false
             && HelperConfig::$shop['paypal_interactive']
         ) {
-            $redirectto = '/_misc/paypal.html?id=' . $iInsertID;
+            $redirectto = '/_misc/paypal.html?id='.$iInsertID;
         } elseif (
             $postpaymentmethod !== null
             && $postpaymentmethod === 'sofortueberweisung'
             && in_array('sofortueberweisung', HelperConfig::$shop['paymentmethods'], true) !== false
         ) {
-            $redirectto = '/_misc/sofortueberweisung.html?id=' . $iInsertID;
+            $redirectto = '/_misc/sofortueberweisung.html?id='.$iInsertID;
         } else {
-            $redirectto = '/_misc/checkedout.html?id=' . $iInsertID;
+            $redirectto = '/_misc/checkedout.html?id='.$iInsertID;
         }
         \HaaseIT\HCSF\Helper::redirectToPage($redirectto);
     }
@@ -319,7 +319,7 @@ 
     private function sendCheckoutMails($iInsertID, $sMailbody_us, $sMailbody_they, $aImagesToSend)
     {
         if (
-            isset(HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_' .HelperConfig::$lang])
+            isset(HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_'.HelperConfig::$lang])
             && file_exists(
                 PATH_DOCROOT.HelperConfig::$core['directory_emailattachments']
                 .'/'.HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_'
@@ -328,21 +328,21 @@ 
         ) {
             $aFilesToSend[] =
                 PATH_DOCROOT.HelperConfig::$core['directory_emailattachments'].'/'
-                .HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_' .HelperConfig::$lang];
+                .HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_'.HelperConfig::$lang];
         } else {
             $aFilesToSend = [];
         }
 
         Helper::mailWrapper(
             filter_input(INPUT_POST, 'email', FILTER_SANITIZE_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
         );
@@ -353,9 +353,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);
     }
 
@@ -405,9 +405,9 @@ 
             'country' => !empty($postcountry) ?
             (
                 isset(
-                    HelperConfig::$countries['countries_' .HelperConfig::$lang][$postcountry]
+                    HelperConfig::$countries['countries_'.HelperConfig::$lang][$postcountry]
                 )
-                    ? HelperConfig::$countries['countries_' .HelperConfig::$lang][$postcountry]
+                    ? HelperConfig::$countries['countries_'.HelperConfig::$lang][$postcountry]
                     : $postcountry)
             : '',
             'remarks' => $this->getPostValue('remarks'),
@@ -416,7 +416,7 @@ 
             'paymentmethod' => $this->getPostValue('paymentmethod'),
             'shippingcost' => empty($_SESSION['shippingcost']) ? false : $_SESSION['shippingcost'],
             'paypallink' => $postpaymentmethod === 'paypal' ? $serverservername.'/_misc/paypal.html?id='.$iId : '',
-            'sofortueberweisunglink' => $postpaymentmethod === 'sofortueberweisung' ?  $serverservername.'/_misc/sofortueberweisung.html?id='.$iId : '',
+            'sofortueberweisunglink' => $postpaymentmethod === 'sofortueberweisung' ? $serverservername.'/_misc/sofortueberweisung.html?id='.$iId : '',
             'SESSION' => !$bCust ? Tools::debug($_SESSION, '$_SESSION', true, true) : '',
             'POST' => !$bCust ? Tools::debug($_POST, '$_POST', true, true) : '',
             'orderid' => $iId,
@@ -441,15 +441,15 @@ 
                 ($getmsg === 'updated' && !empty($getcartkey) && !empty($getamount))
                 || ($getmsg === 'removed' && !empty($getcartkey))
             ) {
-                $return .= $this->textcats->T('shoppingcart_msg_' . $getmsg . '_1') . ' ';
+                $return .= $this->textcats->T('shoppingcart_msg_'.$getmsg.'_1').' ';
                 if (isset(HelperConfig::$shop['custom_order_fields']) && mb_strpos($getcartkey, '|') !== false) {
                     $mCartkeys = explode('|', $getcartkey);
                     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);
                         }
                     }
@@ -457,7 +457,7 @@ 
                 } else {
                     $return .= $getcartkey;
                 }
-                $return.= ' ' . $this->textcats->T('shoppingcart_msg_'.$getmsg.'_2');
+                $return .= ' '.$this->textcats->T('shoppingcart_msg_'.$getmsg.'_2');
                 if ($getmsg === 'updated') {
                     $return .= ' '.$getamount;
                 }