HaaseIT / HCSF

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') {
-                        header('Location: ' . $this->P->cb_pageconfig, true, 302);
+                        header('Location: '.$this->P->cb_pageconfig, true, 302);
                         exit();
                     }
 
@@ -149,14 +149,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 (
                     !(
@@ -166,10 +166,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;
@@ -191,7 +191,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);
@@ -201,7 +201,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/HCSF.php

Spacing +8 added lines, -8 removed lines

@@ -37,7 +37,7 @@ 
 
         $this->setupHardcodedTextcats();
 
-        $this->serviceManager->setFactory('db', function () {
+        $this->serviceManager->setFactory('db', function() {
             return null;
         });
 
@@ -50,7 +50,7 @@ 
         $this->setupTwig();
 
         if (HelperConfig::$core['enable_module_shop']) {
-            $this->serviceManager->setFactory('oItem', function (ServiceManager $serviceManager) {
+            $this->serviceManager->setFactory('oItem', function(ServiceManager $serviceManager) {
                 return new \HaaseIT\HCSF\Shop\Items($serviceManager);
             });
         }
@@ -63,7 +63,7 @@ 
     {
         // PSR-7 Stuff
         // Init request object
-        $this->serviceManager->setFactory('request', function () {
+        $this->serviceManager->setFactory('request', function() {
             $request = \Zend\Diactoros\ServerRequestFactory::fromGlobals();
 
             // cleanup request
@@ -83,7 +83,7 @@ 
 // session.use_trans_sid wenn nötig aktivieren
             ini_set('session.use_only_cookies', 0);
             session_name('sid');
-            if(ini_get('session.use_trans_sid') == 1) {
+            if (ini_get('session.use_trans_sid') == 1) {
                 ini_set('session.use_trans_sid', 0);
             }
 // Session wenn nötig starten
@@ -127,7 +127,7 @@ 
 
     protected function setupDB()
     {
-        $this->serviceManager->setFactory('dbal', function () {
+        $this->serviceManager->setFactory('dbal', function() {
             $config = new \Doctrine\DBAL\Configuration();
 
             $connectionParams = [
@@ -148,14 +148,14 @@ 
             return \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config);
         });
 
-        $this->serviceManager->setFactory('db', function (ServiceManager $serviceManager) {
+        $this->serviceManager->setFactory('db', function(ServiceManager $serviceManager) {
             return $serviceManager->get('dbal')->getWrappedConnection();
         });
     }
 
     protected function setupTextcats()
     {
-        $this->serviceManager->setFactory('textcats', function (ServiceManager $serviceManager) {
+        $this->serviceManager->setFactory('textcats', function(ServiceManager $serviceManager) {
             $langavailable = HelperConfig::$core['lang_available'];
             $textcats = new \HaaseIT\Toolbox\Textcat(
                 HelperConfig::$lang,
@@ -172,7 +172,7 @@ 
 
     protected function setupTwig()
     {
-        $this->serviceManager->setFactory('twig', function (ServiceManager $serviceManager) {
+        $this->serviceManager->setFactory('twig', function(ServiceManager $serviceManager) {
             $loader = new \Twig_Loader_Filesystem([PATH_BASEDIR.'customviews', HCSF_BASEDIR.'src/views/']);
 
             $twig_options = [

src/Controller/Shop/Updatecart.php

Spacing +2 added lines, -2 removed lines

@@ -94,7 +94,7 @@ 
                                 unset($sTMP);
 
                                 if (isset($_REQUEST[$sValue]) && in_array($_REQUEST[$sValue], $aOptions)) {
-                                    $sCartKey .= '|' . $sValue . ':' . $_REQUEST[$sValue];
+                                    $sCartKey .= '|'.$sValue.':'.$_REQUEST[$sValue];
                                 } else {
                                     $this->replyToCartUpdate('requiredfieldmissing');
                                 }
@@ -163,7 +163,7 @@ 
             }
             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);
             }

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

Spacing +19 added lines, -19 removed lines

@@ -75,7 +75,7 @@ 
             $postdata = '';
 
             foreach ($_POST as $i => $v) {
-                $postdata .= $i . '=' . urlencode($v) . '&';
+                $postdata .= $i.'='.urlencode($v).'&';
             }
             $postdata .= 'cmd=_notify-validate';
             $web = parse_url(HelperConfig::$shop['paypal']['url']);
@@ -87,15 +87,15 @@ 
                 $web['port'] = 80;
                 $ssl = '';
             }
-            $fp = @fsockopen($ssl . $web['host'], $web['port'], $errnum, $errstr, 30);
+            $fp = @fsockopen($ssl.$web['host'], $web['port'], $errnum, $errstr, 30);
 
             if ($fp) {
-                fwrite($fp, 'POST ' . $web['path'] . " HTTP/1.1\r\n");
-                fwrite($fp, 'Host: ' . $web['host'] . "\r\n");
+                fwrite($fp, 'POST '.$web['path']." HTTP/1.1\r\n");
+                fwrite($fp, 'Host: '.$web['host']."\r\n");
                 fwrite($fp, "Content-type: application/x-www-form-urlencoded\r\n");
-                fwrite($fp, 'Content-length: ' . strlen($postdata) . "\r\n");
+                fwrite($fp, 'Content-length: '.strlen($postdata)."\r\n");
                 fwrite($fp, "Connection: close\r\n\r\n");
-                fwrite($fp, $postdata . "\r\n\r\n");
+                fwrite($fp, $postdata."\r\n\r\n");
 
                 $info = [];
                 while (!feof($fp)) {
@@ -105,9 +105,9 @@ 
                 $info = implode(',', $info);
                 if (!(strpos($info, 'VERIFIED') === false)) {
 
-                    $sLogData .= '-- new entry - ' . date(HelperConfig::$core['locale_format_date_time']) . " --\n\n";
+                    $sLogData .= '-- new entry - '.date(HelperConfig::$core['locale_format_date_time'])." --\n\n";
                     $sLogData .= "W00T!\n\n";
-                    $sLogData .= \HaaseIT\Toolbox\Tools::debug($_REQUEST, '', true, true) . "\n\n";
+                    $sLogData .= \HaaseIT\Toolbox\Tools::debug($_REQUEST, '', true, true)."\n\n";
 
                     // Check if the transaction id has been used before
                     $queryBuilder = $this->dbal->createQueryBuilder();
@@ -138,27 +138,27 @@ 
                             ;
                             $queryBuilder->execute();
 
-                            $sLogData .= '-- Alles ok. Zahlung erfolgreich. TXNID: ' . $_REQUEST['txn_id'] . " --\n\n";
+                            $sLogData .= '-- Alles ok. Zahlung erfolgreich. TXNID: '.$_REQUEST['txn_id']." --\n\n";
                         } else {
                             $sLogData .= "-- In my country we have problem; Problem is evaluation. Throw the data down the log!\n";
-                            $sLogData .= 'mc_gross: ' . $_REQUEST['mc_gross'] . ' - number_format($fGesamtbrutto, 2, \'.\', \'\'): ' . number_format($fGesamtbrutto,
-                                    2, '.', '') . "\n";
-                            $sLogData .= 'custom: ' . $_REQUEST['custom'] . ' - $aOrder[\'o_id\']: ' . $aOrder['o_id'] . "\n";
-                            $sLogData .= 'payment_status: ' . $_REQUEST['payment_status'] . "\n";
-                            $sLogData .= 'mc_currency: ' . $_REQUEST['mc_currency'] . ' - HelperConfig::$shop["paypal"]["currency_id"]: ' . HelperConfig::$shop['paypal']['currency_id'] . "\n";
-                            $sLogData .= 'business: ' . $_REQUEST['receiver_email'] . ' - HelperConfig::$shop["paypal"]["business"]: ' . HelperConfig::$shop['paypal']['business'] . "\n\n";
+                            $sLogData .= 'mc_gross: '.$_REQUEST['mc_gross'].' - number_format($fGesamtbrutto, 2, \'.\', \'\'): '.number_format($fGesamtbrutto,
+                                    2, '.', '')."\n";
+                            $sLogData .= 'custom: '.$_REQUEST['custom'].' - $aOrder[\'o_id\']: '.$aOrder['o_id']."\n";
+                            $sLogData .= 'payment_status: '.$_REQUEST['payment_status']."\n";
+                            $sLogData .= 'mc_currency: '.$_REQUEST['mc_currency'].' - HelperConfig::$shop["paypal"]["currency_id"]: '.HelperConfig::$shop['paypal']['currency_id']."\n";
+                            $sLogData .= 'business: '.$_REQUEST['receiver_email'].' - HelperConfig::$shop["paypal"]["business"]: '.HelperConfig::$shop['paypal']['business']."\n\n";
                         }
                     } else {
                         // INVALID LOGGING ERROR
-                        $sLogData .= '-- new entry - ' . date(HelperConfig::$core['locale_format_date_time']) . " --\n\nPHAIL\n\n";
-                        $sLogData .= '!!! JEMAND HAT EINE ALTE TXN_ID BENUTZT: ' . $_REQUEST['txn_id'] . " !!!\n\n";
+                        $sLogData .= '-- new entry - '.date(HelperConfig::$core['locale_format_date_time'])." --\n\nPHAIL\n\n";
+                        $sLogData .= '!!! JEMAND HAT EINE ALTE TXN_ID BENUTZT: '.$_REQUEST['txn_id']." !!!\n\n";
                         $sLogData .= "!!! INVALID !!!\n\n";
                     }
                 } else {
-                    $sLogData .= '-- new entry - ' . date(HelperConfig::$core['locale_format_date_time']) . " --\n\nPHAIL - Transaktion fehlgeschlagen. TXNID: " . $_REQUEST['txn_id'] . "\n" . $info . "\n\n";
+                    $sLogData .= '-- new entry - '.date(HelperConfig::$core['locale_format_date_time'])." --\n\nPHAIL - Transaktion fehlgeschlagen. TXNID: ".$_REQUEST['txn_id']."\n".$info."\n\n";
                 }
 
-                file_put_contents(PATH_LOGS . FILE_PAYPALLOG, $sLogData, FILE_APPEND);
+                file_put_contents(PATH_LOGS.FILE_PAYPALLOG, $sLogData, FILE_APPEND);
             }
         }
 

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/Shop/Shoppingcart.php

Spacing +23 added lines, -23 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
             && 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();
     }
@@ -337,7 +337,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_'
@@ -346,21 +346,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(
             $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
         );
@@ -371,9 +371,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);
     }
 
@@ -415,9 +415,9 @@ 
             'country' => isset($this->post['country']) && trim($this->post['country']) != '' ?
             (
                 isset(
-                    HelperConfig::$countries['countries_' .HelperConfig::$lang][$this->post['country']]
+                    HelperConfig::$countries['countries_'.HelperConfig::$lang][$this->post['country']]
                 )
-                    ? HelperConfig::$countries['countries_' .HelperConfig::$lang][$this->post['country']]
+                    ? HelperConfig::$countries['countries_'.HelperConfig::$lang][$this->post['country']]
                     : $this->post['country'])
             : '',
             'remarks' => $this->getPostValue('remarks'),
@@ -425,8 +425,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,
@@ -454,15 +454,15 @@ 
                 ($this->get['msg'] === 'updated' && isset($this->get['cartkey'], $this->get['amount']))
                 || ($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);
                         }
                     }
@@ -470,9 +470,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/Myorders.php

Spacing +10 added lines, -10 removed lines

@@ -56,14 +56,14 @@ 
         if (!CHelper::getUserData()) {
             $this->P->oPayload->cl_html = $this->textcats->T('denied_notloggedin');
         } else {
-            require_once PATH_BASEDIR . 'src/shop/functions.shoppingcart.php';
+            require_once PATH_BASEDIR.'src/shop/functions.shoppingcart.php';
 
             $this->P->cb_customcontenttemplate = 'shop/myorders';
 
             if (isset($_GET['action'], $_GET['id']) && $_GET['action'] === 'show') {
                 $iId = \filter_input(INPUT_GET, 'id', FILTER_SANITIZE_NUMBER_INT);
 
-                $sql = 'SELECT * FROM ' . 'orders WHERE o_id = :id AND o_custno = \'' . $_SESSION['user']['cust_no'] . '\' AND o_ordercompleted != \'d\'';
+                $sql = 'SELECT * FROM '.'orders WHERE o_id = :id AND o_custno = \''.$_SESSION['user']['cust_no'].'\' AND o_ordercompleted != \'d\'';
                 $hResult = $this->db->prepare($sql);
                 $hResult->bindValue(':id', $iId);
                 $hResult->execute();
@@ -76,7 +76,7 @@ 
                         $aOrder['o_ordertimestamp']
                     );
                     $this->P->cb_customdata['orderdata']['orderremarks'] = $aOrder['o_remarks'];
-                    $this->P->cb_customdata['orderdata']['paymentmethod'] = $this->textcats->T('order_paymentmethod_' . $aOrder['o_paymentmethod']);
+                    $this->P->cb_customdata['orderdata']['paymentmethod'] = $this->textcats->T('order_paymentmethod_'.$aOrder['o_paymentmethod']);
                     $this->P->cb_customdata['orderdata']['paymentcompleted'] = (($aOrder['o_paymentcompleted'] == 'y') ? $this->textcats->T('myorders_paymentstatus_completed') : $this->textcats->T('myorders_paymentstatus_open'));
                     $this->P->cb_customdata['orderdata']['orderstatus'] = SHelper::showOrderStatusText($this->textcats, $aOrder['o_ordercompleted']);
                     $this->P->cb_customdata['orderdata']['shippingservice'] = $aOrder['o_shipping_service'];
@@ -118,12 +118,12 @@ 
                 }
             } else {
                 $COList = [
-                    ['title' => $this->textcats->T('order_head_orderdate'), 'key' => 'o_ordertime', 'width' => 110, 'linked' => false,],
-                    ['title' => $this->textcats->T('order_head_paymenthethod'), 'key' => 'o_paymentmethod', 'width' => 125, 'linked' => false,],
-                    ['title' => $this->textcats->T('order_head_paid'), 'key' => 'o_paymentcompleted', 'width' => 60, 'linked' => false,],
-                    ['title' => $this->textcats->T('order_head_status'), 'key' => 'o_order_status', 'width' => 80, 'linked' => false,],
-                    ['title' => $this->textcats->T('order_head_shipping_service'), 'key' => 'o_shipping_service', 'width' => 90, 'linked' => false,],
-                    ['title' => $this->textcats->T('order_head_shipping_trackingno'), 'key' => 'o_shipping_trackingno', 'width' => 130, 'linked' => false,],
+                    ['title' => $this->textcats->T('order_head_orderdate'), 'key' => 'o_ordertime', 'width' => 110, 'linked' => false, ],
+                    ['title' => $this->textcats->T('order_head_paymenthethod'), 'key' => 'o_paymentmethod', 'width' => 125, 'linked' => false, ],
+                    ['title' => $this->textcats->T('order_head_paid'), 'key' => 'o_paymentcompleted', 'width' => 60, 'linked' => false, ],
+                    ['title' => $this->textcats->T('order_head_status'), 'key' => 'o_order_status', 'width' => 80, 'linked' => false, ],
+                    ['title' => $this->textcats->T('order_head_shipping_service'), 'key' => 'o_shipping_service', 'width' => 90, 'linked' => false, ],
+                    ['title' => $this->textcats->T('order_head_shipping_trackingno'), 'key' => 'o_shipping_trackingno', 'width' => 130, 'linked' => false, ],
                     [
                         'title' => $this->textcats->T('order_show'),
                         'key' => 'o_id',
@@ -131,7 +131,7 @@ 
                         'linked' => true,
                         'ltarget' => '/_misc/myorders.html',
                         'lkeyname' => 'id',
-                        'lgetvars' => ['action' => 'show',],
+                        'lgetvars' => ['action' => 'show', ],
                     ],
                 ];
 

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