HaaseIT / HCSF

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

src/Controller/Admin/Shop/Itemadmin.php

Spacing +9 added lines, -9 removed lines

@@ -134,7 +134,7 @@ 
                         if ($iRows > 0) {
                             $aErr['itemnoalreadytaken'] = true;
                         } else {
-                            $aData = ['itm_no' => trim(\filter_input(INPUT_POST, 'itemno', FILTER_SANITIZE_SPECIAL_CHARS)),];
+                            $aData = ['itm_no' => trim(\filter_input(INPUT_POST, 'itemno', FILTER_SANITIZE_SPECIAL_CHARS)), ];
                             $sql = DBTools::buildInsertQuery($aData, 'item_base');
                             $this->db->exec($sql);
                             $iInsertID = $this->db->lastInsertId();
@@ -242,10 +242,10 @@ 
     private function admin_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) {
@@ -301,7 +301,7 @@ 
     private function admin_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'],
@@ -332,7 +332,7 @@ 
         $aGroups = $this->admin_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);
 
@@ -374,7 +374,7 @@ 
         $sql = DBTools::buildPSUpdateQuery($aData, 'item_base', 'itm_id');
         $hResult = $this->db->prepare($sql);
         foreach ($aData as $sKey => $sValue) {
-            $hResult->bindValue(':' . $sKey, $sValue);
+            $hResult->bindValue(':'.$sKey, $sValue);
         }
         $hResult->execute();
         if (isset($this->post['textid'])) {
@@ -387,7 +387,7 @@ 
             $sql = DBTools::buildPSUpdateQuery($aData, 'item_lang', 'itml_id');
             $hResult = $this->db->prepare($sql);
             foreach ($aData as $sKey => $sValue) {
-                $hResult->bindValue(':' . $sKey, $sValue);
+                $hResult->bindValue(':'.$sKey, $sValue);
             }
             $hResult->execute();
         }

src/Controller/Admin/Shop/Shopadmin.php

Spacing +14 added lines, -14 removed lines

@@ -94,12 +94,12 @@ 
         $CSA = [
             'list_orders' => [
                 ['title' => '', 'key' => 'o_id', 'width' => 30, 'linked' => false, 'callback' => 'shopadminMakeCheckbox'],
-                ['title' => HardcodedText::get('shopadmin_list_orderid'), 'key' => 'o_id', 'width' => 30, 'linked' => false,],
-                ['title' => HardcodedText::get('shopadmin_list_customer'), 'key' => 'o_cust', 'width' => 280, 'linked' => false,],
-                ['title' => HardcodedText::get('shopadmin_list_sumnettoall'), 'key' => 'o_sumnettoall', 'width' => 75, 'linked' => false,],
-                ['title' => HardcodedText::get('shopadmin_list_orderstatus'), 'key' => 'o_order_status', 'width' => 80, 'linked' => false,],
-                ['title' => HardcodedText::get('shopadmin_list_ordertimenumber'), 'key' => 'o_ordertime_number', 'width' => 100, 'linked' => false,],
-                ['title' => HardcodedText::get('shopadmin_list_hostpayment'), 'key' => 'o_order_host_payment', 'width' => 140, 'linked' => false,],
+                ['title' => HardcodedText::get('shopadmin_list_orderid'), 'key' => 'o_id', 'width' => 30, 'linked' => false, ],
+                ['title' => HardcodedText::get('shopadmin_list_customer'), 'key' => 'o_cust', 'width' => 280, 'linked' => false, ],
+                ['title' => HardcodedText::get('shopadmin_list_sumnettoall'), 'key' => 'o_sumnettoall', 'width' => 75, 'linked' => false, ],
+                ['title' => HardcodedText::get('shopadmin_list_orderstatus'), 'key' => 'o_order_status', 'width' => 80, 'linked' => false, ],
+                ['title' => HardcodedText::get('shopadmin_list_ordertimenumber'), 'key' => 'o_ordertime_number', 'width' => 100, 'linked' => false, ],
+                ['title' => HardcodedText::get('shopadmin_list_hostpayment'), 'key' => 'o_order_host_payment', 'width' => 140, 'linked' => false, ],
                 [
                     'title' => HardcodedText::get('shopadmin_list_edit'),
                     'key' => 'o_id',
@@ -113,11 +113,11 @@ 
                 ],
             ],
             'list_orderitems' => [
-                ['title' => HardcodedText::get('shopadmin_list_itemno'), 'key' => 'oi_itemno', 'width' => 95, 'linked' => false,],
-                ['title' => HardcodedText::get('shopadmin_list_itemname'), 'key' => 'oi_itemname', 'width' => 350, 'linked' => false,],
-                ['title' => HardcodedText::get('shopadmin_list_itemamount'), 'key' => 'oi_amount', 'width' => 50, 'linked' => false, 'style-data' => 'text-align: center;',],
-                ['title' => HardcodedText::get('shopadmin_list_itemnetto'), 'key' => 'oi_price_netto', 'width' => 70, 'linked' => false,],
-                ['title' => HardcodedText::get('shopadmin_list_itemsumnetto'), 'key' => 'ges_netto', 'width' => 75, 'linked' => false,],
+                ['title' => HardcodedText::get('shopadmin_list_itemno'), 'key' => 'oi_itemno', 'width' => 95, 'linked' => false, ],
+                ['title' => HardcodedText::get('shopadmin_list_itemname'), 'key' => 'oi_itemname', 'width' => 350, 'linked' => false, ],
+                ['title' => HardcodedText::get('shopadmin_list_itemamount'), 'key' => 'oi_amount', 'width' => 50, 'linked' => false, 'style-data' => 'text-align: center;', ],
+                ['title' => HardcodedText::get('shopadmin_list_itemnetto'), 'key' => 'oi_price_netto', 'width' => 70, 'linked' => false, ],
+                ['title' => HardcodedText::get('shopadmin_list_itemsumnetto'), 'key' => 'ges_netto', 'width' => 75, 'linked' => false, ],
             ],
         ];
 
@@ -220,8 +220,8 @@ 
                     } else {
                         $sZahlungsmethode = '<span style="color: red;">';
                     }
-                    $mZahlungsmethode = $this->serviceManager->get('textcats')->T('order_paymentmethod_' .$aRow['o_paymentmethod'], true);
-                    if ($mZahlungsmethode ) {
+                    $mZahlungsmethode = $this->serviceManager->get('textcats')->T('order_paymentmethod_'.$aRow['o_paymentmethod'], true);
+                    if ($mZahlungsmethode) {
                         $sZahlungsmethode .= $mZahlungsmethode;
                     } else {
                         $sZahlungsmethode .= ucwords($aRow['o_paymentmethod']);
@@ -265,7 +265,7 @@ 
                     ];
                     if (!($bIgnoreStorno && $aRow['o_ordercompleted'] === 's')) {
                         $fGesamtnetto += $aRow['o_sumnettoall'];
-                        $j ++;
+                        $j++;
                     } else {
                         $k++;
                     }

src/Controller/Admin/Phpinfo.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
         $html .= implode("\n",
             array_map(
                 function($i) {
-                    return '.phpinfodisplay ' . preg_replace( '/,/', ',.phpinfodisplay ', $i );
+                    return '.phpinfodisplay '.preg_replace('/,/', ',.phpinfodisplay ', $i);
                 },
                 preg_split('/\n/', $matches[1])
             )

src/Controller/Admin/Customer/Customeradmin.php

Spacing +7 added lines, -7 removed lines

@@ -57,11 +57,11 @@ 
         $this->P->cb_subnav = 'admin';
 
         $CUA = [
-            ['title' => HardcodedText::get('customeradmin_list_no'), 'key' => 'cust_no', 'width' => '16%', 'linked' => false,'stylehead' => 'text-align: left;',],
-            ['title' => HardcodedText::get('customeradmin_list_company'), 'key' => 'cust_corp', 'width' => '16%', 'linked' => false,'stylehead' => 'text-align: left;',],
-            ['title' => HardcodedText::get('customeradmin_list_name'), 'key' => 'cust_name', 'width' => '16%', 'linked' => false,'stylehead' => 'text-align: left;',],
-            ['title' => HardcodedText::get('customeradmin_list_town'), 'key' => 'cust_town', 'width' => '16%', 'linked' => false,'stylehead' => 'text-align: left;',],
-            ['title' => HardcodedText::get('customeradmin_list_active'), 'key' => 'cust_active', 'width' => '16%', 'linked' => false,'stylehead' => 'text-align: left;',],
+            ['title' => HardcodedText::get('customeradmin_list_no'), 'key' => 'cust_no', 'width' => '16%', 'linked' => false, 'stylehead' => 'text-align: left;', ],
+            ['title' => HardcodedText::get('customeradmin_list_company'), 'key' => 'cust_corp', 'width' => '16%', 'linked' => false, 'stylehead' => 'text-align: left;', ],
+            ['title' => HardcodedText::get('customeradmin_list_name'), 'key' => 'cust_name', 'width' => '16%', 'linked' => false, 'stylehead' => 'text-align: left;', ],
+            ['title' => HardcodedText::get('customeradmin_list_town'), 'key' => 'cust_town', 'width' => '16%', 'linked' => false, 'stylehead' => 'text-align: left;', ],
+            ['title' => HardcodedText::get('customeradmin_list_active'), 'key' => 'cust_active', 'width' => '16%', 'linked' => false, 'stylehead' => 'text-align: left;', ],
             [
                 'title' => HardcodedText::get('customeradmin_list_edit'),
                 'key' => 'cust_id',
@@ -69,7 +69,7 @@ 
                 'linked' => true,
                 'ltarget' => '/_admin/customeradmin.html',
                 'lkeyname' => 'id',
-                'lgetvars' => ['action' => 'edit',],
+                'lgetvars' => ['action' => 'edit', ],
             ],
         ];
         $aPData = $this->handleCustomerAdmin($CUA, $this->serviceManager->get('twig'));
@@ -161,7 +161,7 @@ 
                         $sql = \HaaseIT\Toolbox\DBTools::buildPSUpdateQuery($aData, 'customer', 'cust_id');
                         $hResult = $this->db->prepare($sql);
                         foreach ($aData as $sKey => $sValue) {
-                            $hResult->bindValue(':' . $sKey, $sValue);
+                            $hResult->bindValue(':'.$sKey, $sValue);
                         }
                         $hResult->execute();
                         $aInfo['changeswritten'] = true;

src/Shop/Items.php

Spacing +8 added lines, -8 removed lines

@@ -163,12 +163,12 @@ 
             if (!$bEnableItemGroups || \trim($aRow['itm_group']) == 0) {
                 $aAssembly['item'][$aRow['itm_no']] = $aRow;
             } else {
-                if (isset($aAssembly['groups']['ITEMGROUP-' .$aRow['itm_group']])) {
-                    $aAssembly['groups']['ITEMGROUP-' .$aRow['itm_group']][$aRow['itm_no']] = $aRow;
+                if (isset($aAssembly['groups']['ITEMGROUP-'.$aRow['itm_group']])) {
+                    $aAssembly['groups']['ITEMGROUP-'.$aRow['itm_group']][$aRow['itm_no']] = $aRow;
                 } else {
-                    $aAssembly['item']['ITEMGROUP-' .$aRow['itm_group']]['group'] = 'ITEMGROUP-' .$aRow['itm_group'];
-                    $aAssembly['groups']['ITEMGROUP-' .$aRow['itm_group']]['ITEMGROUP-DATA'] = $this->getGroupdata($aRow['itm_group']);
-                    $aAssembly['groups']['ITEMGROUP-' .$aRow['itm_group']][$aRow['itm_no']] = $aRow;
+                    $aAssembly['item']['ITEMGROUP-'.$aRow['itm_group']]['group'] = 'ITEMGROUP-'.$aRow['itm_group'];
+                    $aAssembly['groups']['ITEMGROUP-'.$aRow['itm_group']]['ITEMGROUP-DATA'] = $this->getGroupdata($aRow['itm_group']);
+                    $aAssembly['groups']['ITEMGROUP-'.$aRow['itm_group']][$aRow['itm_no']] = $aRow;
                 }
             }
         }
@@ -209,7 +209,7 @@ 
             $aData['itm_vatid'] = 'full';
         }
 
-        if(is_numeric($aData['itm_price']) && (float) $aData['itm_price'] > 0) {
+        if (is_numeric($aData['itm_price']) && (float) $aData['itm_price'] > 0) {
             $aPrice['netto_list'] = $aData['itm_price'];
             $aPrice['brutto_list'] = $this->addVat($aPrice['netto_list'], HelperConfig::$shop['vat'][$aData['itm_vatid']]);
             if (
@@ -231,7 +231,7 @@ 
                         bcdiv(
                             bcsub(
                                 '100',
-                                (string)HelperConfig::$shop['rebate_groups'][$aData['itm_rg']][CHelper::getUserData('cust_group')]
+                                (string) HelperConfig::$shop['rebate_groups'][$aData['itm_rg']][CHelper::getUserData('cust_group')]
                             ),
                             '100'
                         )
@@ -263,7 +263,7 @@ 
                 bcdiv(
                     bcmul(
                         $price,
-                        (string)$vat
+                        (string) $vat
                     ),
                     '100'
                 ),

src/Shop/Helper.php

Spacing +5 added lines, -5 removed lines

@@ -102,11 +102,11 @@ 
         }
 
         if ($aOrder['iMindergebuehr_id'] > 0) {
-            $aOrder['fVoll'] += HelperConfig::$shop['reducedorderamountfee' . $aOrder['iMindergebuehr_id']];
-            $aOrder['fGesamtnetto'] += HelperConfig::$shop['reducedorderamountfee' . $aOrder['iMindergebuehr_id']];
+            $aOrder['fVoll'] += HelperConfig::$shop['reducedorderamountfee'.$aOrder['iMindergebuehr_id']];
+            $aOrder['fGesamtnetto'] += HelperConfig::$shop['reducedorderamountfee'.$aOrder['iMindergebuehr_id']];
             $aOrder['fSteuervoll'] = $aOrder['fVoll'] * $iVATfull / 100;
             $aOrder['fGesamtbrutto'] = $aOrder['fGesamtnetto'] + $aOrder['fSteuervoll'] + $aOrder['fSteuererm'];
-            $aOrder['fMindergebuehr'] = HelperConfig::$shop['reducedorderamountfee' . $aOrder['iMindergebuehr_id']];
+            $aOrder['fMindergebuehr'] = HelperConfig::$shop['reducedorderamountfee'.$aOrder['iMindergebuehr_id']];
         }
 
         $aOrder['fVersandkosten'] = 0;
@@ -423,12 +423,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/HCSF.php

Doc Comments +1 added lines, -1 removed lines

@@ -213,7 +213,7 @@
     }
 
     /**
-     * @return mixed
+     * @return ServiceManager
      */
     public function getServiceManager()
     {

Spacing +9 added lines, -9 removed lines

@@ -41,7 +41,7 @@ 
 
         $this->setupHardcodedTextcats();
 
-        $this->serviceManager->setFactory('db', function () {
+        $this->serviceManager->setFactory('db', function() {
             return null;
         });
 
@@ -54,7 +54,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);
             });
         }
@@ -67,7 +67,7 @@ 
     {
         // PSR-7 Stuff
         // Init request object
-        $this->serviceManager->setFactory('request', function () {
+        $this->serviceManager->setFactory('request', function() {
             $request = \Zend\Diactoros\ServerRequestFactory::fromGlobals();
 
             // cleanup request
@@ -87,7 +87,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
@@ -131,7 +131,7 @@ 
 
     protected function setupDB()
     {
-        $this->serviceManager->setFactory('dbal', function () {
+        $this->serviceManager->setFactory('dbal', function() {
             $config = new \Doctrine\DBAL\Configuration();
 
             $connectionParams = [
@@ -152,14 +152,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,
@@ -176,7 +176,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 = [
@@ -301,7 +301,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;
         }