HaaseIT / HCSF

src/Controller/Customer/Login.php

Spacing +3 added lines, -3 removed lines

@@ -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/Updatecart.php

Spacing +1 added lines, -1 removed lines

@@ -174,7 +174,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/Base.php

Spacing +1 added lines, -1 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)) {

src/Shop/Helper.php

Spacing +2 added lines, -2 removed lines

@@ -449,12 +449,12 @@
                 }
                 // because array_rand will change numerical (string) values to integer, we have to do this awkward dance
                 foreach ($keysAddSuggsTMP as $key => $item) {
-                    $keysAddSuggs[] = (string)$item;
+                    $keysAddSuggs[] = (string) $item;
                 }
 
                 // iterate suggestions and remove those that which will not be kept
                 foreach ($suggestions['additional'] as $addSuggsKey => $addSuggsVal) {
-                    if (!in_array((string)$addSuggsKey, $keysAddSuggs, true)) {
+                    if (!in_array((string) $addSuggsKey, $keysAddSuggs, true)) {
                         unset($suggestions['additional'][$addSuggsKey]);
                     }
                 }

src/Controller/Shop/Shoppingcart.php

Spacing +6 added lines, -6 removed lines

@@ -307,7 +307,7 @@ 
     {
         $aFilesToSend = [];
         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_'
@@ -316,7 +316,7 @@ 
         ) {
             $aFilesToSend[] =
                 PATH_DOCROOT.HelperConfig::$core['directory_emailattachments'].'/'
-                .HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_' .HelperConfig::$lang];
+                .HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_'.HelperConfig::$lang];
         }
 
         Helper::mailWrapper(
@@ -390,9 +390,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'),
@@ -401,7 +401,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,
@@ -442,7 +442,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;
                 }

src/HCSF.php

Spacing +8 added lines, -8 removed lines

@@ -62,7 +62,7 @@ 
 
         $this->setupHardcodedTextcats();
 
-        $this->serviceManager->setFactory('db', function () {
+        $this->serviceManager->setFactory('db', function() {
             return null;
         });
 
@@ -77,7 +77,7 @@ 
         }
 
         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);
             });
         }
@@ -94,7 +94,7 @@ 
     {
         // PSR-7 Stuff
         // Init request object
-        $this->serviceManager->setFactory('request', function () {
+        $this->serviceManager->setFactory('request', function() {
             $request = \Zend\Diactoros\ServerRequestFactory::fromGlobals();
 
             // cleanup request
@@ -154,7 +154,7 @@ 
 
     protected function setupDB()
     {
-        $this->serviceManager->setFactory('dbal', function () {
+        $this->serviceManager->setFactory('dbal', function() {
             $config = new \Doctrine\DBAL\Configuration();
 
             $connectionParams = [
@@ -175,14 +175,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,
@@ -199,7 +199,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 = [
@@ -321,7 +321,7 @@ 
         }
 
         $aP['countrylist'][] = ' | ';
-        foreach (HelperConfig::$countries['countries_' .HelperConfig::$lang] as $sKey => $sValue) {
+        foreach (HelperConfig::$countries['countries_'.HelperConfig::$lang] as $sKey => $sValue) {
             $aP['countrylist'][] = $sKey.'|'.$sValue;
         }
 

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();
@@ -136,27 +136,27 @@ 
                                 ->setParameter(1, $iId);
                             $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/Myorders.php

Spacing +9 added lines, -9 removed lines

@@ -63,7 +63,7 @@ 
             if (filter_input(INPUT_GET, 'id') !== null && filter_input(INPUT_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/Customer/Helper.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
             $aErr['fax'] = true;
         }
         $postcountry = filter_input(INPUT_POST, 'country', FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
-        if (HelperConfig::$customer['validate_country'] && (empty($postcountry) || !isset(HelperConfig::$countries['countries_' .$sLang][$postcountry]))) {
+        if (HelperConfig::$customer['validate_country'] && (empty($postcountry) || !isset(HelperConfig::$countries['countries_'.$sLang][$postcountry]))) {
             $aErr['country'] = true;
         }
         $posttos = filter_input(INPUT_POST, 'tos');