HaaseIT / HCSF

src/Controller/Admin/DBStatus.php

Spacing +43 added lines, -43 removed lines

@@ -88,10 +88,10 @@ 
         $this->P->cb_customdata['rows_textcat_lang'] = $hResult->rowCount();
         if ($this->P->cb_customdata['rows_textcat_lang'] > 0) {
             $aListSetting = [
-                ['title' => 'tcl_id', 'key' => 'tcl_id', 'width' => '6%', 'linked' => false,],
-                ['title' => 'tcl_tcid', 'key' => 'tcl_tcid', 'width' => '6%', 'linked' => false,],
-                ['title' => 'tcl_lang', 'key' => 'tcl_lang', 'width' => '6%', 'linked' => false,],
-                ['title' => 'tcl_text', 'key' => 'tcl_text', 'width' => '82%', 'linked' => false, 'escapehtmlspecialchars' => true,],
+                ['title' => 'tcl_id', 'key' => 'tcl_id', 'width' => '6%', 'linked' => false, ],
+                ['title' => 'tcl_tcid', 'key' => 'tcl_tcid', 'width' => '6%', 'linked' => false, ],
+                ['title' => 'tcl_lang', 'key' => 'tcl_lang', 'width' => '6%', 'linked' => false, ],
+                ['title' => 'tcl_text', 'key' => 'tcl_text', 'width' => '82%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
             ];
             $aData = $hResult->fetchAll();
             $this->P->cb_customdata['rows_textcat_lang_list'] = Tools::makeListtable(
@@ -115,12 +115,12 @@ 
         $this->P->cb_customdata['rows_textcat_lang_archive'] = $hResult->rowCount();
         if ($this->P->cb_customdata['rows_textcat_lang_archive'] > 0) {
             $aListSetting = [
-                ['title' => 'tcla_timestamp', 'key' => 'tcla_timestamp', 'width' => '15%', 'linked' => false,],
-                ['title' => 'tcla_id', 'key' => 'tcla_id', 'width' => '6%', 'linked' => false,],
-                ['title' => 'tcl_id', 'key' => 'tcl_id', 'width' => '6%', 'linked' => false,],
-                ['title' => 'tcl_tcid', 'key' => 'tcl_tcid', 'width' => '6%', 'linked' => false,],
-                ['title' => 'tcl_lang', 'key' => 'tcl_lang', 'width' => '6%', 'linked' => false,],
-                ['title' => 'tcl_text', 'key' => 'tcl_text', 'width' => '61%', 'linked' => false, 'escapehtmlspecialchars' => true,],
+                ['title' => 'tcla_timestamp', 'key' => 'tcla_timestamp', 'width' => '15%', 'linked' => false, ],
+                ['title' => 'tcla_id', 'key' => 'tcla_id', 'width' => '6%', 'linked' => false, ],
+                ['title' => 'tcl_id', 'key' => 'tcl_id', 'width' => '6%', 'linked' => false, ],
+                ['title' => 'tcl_tcid', 'key' => 'tcl_tcid', 'width' => '6%', 'linked' => false, ],
+                ['title' => 'tcl_lang', 'key' => 'tcl_lang', 'width' => '6%', 'linked' => false, ],
+                ['title' => 'tcl_text', 'key' => 'tcl_text', 'width' => '61%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
             ];
             $aData = $hResult->fetchAll();
             $this->P->cb_customdata['rows_textcat_lang_archive_list'] = Tools::makeListtable($aListSetting,
@@ -141,13 +141,13 @@ 
         $this->P->cb_customdata['rows_content_lang'] = $hResult->rowCount();
         if ($this->P->cb_customdata['rows_content_lang'] > 0) {
             $aListSetting = [
-                ['title' => 'cl_id', 'key' => 'cl_id', 'width' => '6%', 'linked' => false,],
-                ['title' => 'cl_cb', 'key' => 'cl_cb', 'width' => '6%', 'linked' => false,],
-                ['title' => 'cl_lang', 'key' => 'cl_lang', 'width' => '6%', 'linked' => false,],
-                ['title' => 'cl_html', 'key' => 'cl_html', 'width' => '43%', 'linked' => false, 'escapehtmlspecialchars' => true,],
-                ['title' => 'cl_keywords', 'key' => 'cl_keywords', 'width' => '13%', 'linked' => false, 'escapehtmlspecialchars' => true,],
-                ['title' => 'cl_description', 'key' => 'cl_description', 'width' => '13%', 'linked' => false, 'escapehtmlspecialchars' => true,],
-                ['title' => 'cl_title', 'key' => 'cl_title', 'width' => '13%', 'linked' => false, 'escapehtmlspecialchars' => true,],
+                ['title' => 'cl_id', 'key' => 'cl_id', 'width' => '6%', 'linked' => false, ],
+                ['title' => 'cl_cb', 'key' => 'cl_cb', 'width' => '6%', 'linked' => false, ],
+                ['title' => 'cl_lang', 'key' => 'cl_lang', 'width' => '6%', 'linked' => false, ],
+                ['title' => 'cl_html', 'key' => 'cl_html', 'width' => '43%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
+                ['title' => 'cl_keywords', 'key' => 'cl_keywords', 'width' => '13%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
+                ['title' => 'cl_description', 'key' => 'cl_description', 'width' => '13%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
+                ['title' => 'cl_title', 'key' => 'cl_title', 'width' => '13%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
             ];
             $aData = $hResult->fetchAll();
             $this->P->cb_customdata['rows_content_lang_list'] = Tools::makeListtable($aListSetting,
@@ -168,15 +168,15 @@ 
         $this->P->cb_customdata['rows_content_lang_archive'] = $hResult->rowCount();
         if ($this->P->cb_customdata['rows_content_lang_archive'] > 0) {
             $aListSetting = [
-                ['title' => 'cla_timestamp', 'key' => 'cla_timestamp', 'width' => '15%', 'linked' => false,],
-                ['title' => 'cla_id', 'key' => 'cla_id', 'width' => '6%', 'linked' => false,],
-                ['title' => 'cl_id', 'key' => 'cl_id', 'width' => '6%', 'linked' => false,],
-                ['title' => 'cl_cb', 'key' => 'cl_cb', 'width' => '6%', 'linked' => false,],
-                ['title' => 'cl_lang', 'key' => 'cl_lang', 'width' => '6%', 'linked' => false,],
-                ['title' => 'cl_html', 'key' => 'cl_html', 'width' => '33%', 'linked' => false, 'escapehtmlspecialchars' => true,],
-                ['title' => 'cl_keywords', 'key' => 'cl_keywords', 'width' => '10%', 'linked' => false, 'escapehtmlspecialchars' => true,],
-                ['title' => 'cl_description', 'key' => 'cl_description', 'width' => '10%', 'linked' => false, 'escapehtmlspecialchars' => true,],
-                ['title' => 'cl_title', 'key' => 'cl_title', 'width' => '10%', 'linked' => false, 'escapehtmlspecialchars' => true,],
+                ['title' => 'cla_timestamp', 'key' => 'cla_timestamp', 'width' => '15%', 'linked' => false, ],
+                ['title' => 'cla_id', 'key' => 'cla_id', 'width' => '6%', 'linked' => false, ],
+                ['title' => 'cl_id', 'key' => 'cl_id', 'width' => '6%', 'linked' => false, ],
+                ['title' => 'cl_cb', 'key' => 'cl_cb', 'width' => '6%', 'linked' => false, ],
+                ['title' => 'cl_lang', 'key' => 'cl_lang', 'width' => '6%', 'linked' => false, ],
+                ['title' => 'cl_html', 'key' => 'cl_html', 'width' => '33%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
+                ['title' => 'cl_keywords', 'key' => 'cl_keywords', 'width' => '10%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
+                ['title' => 'cl_description', 'key' => 'cl_description', 'width' => '10%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
+                ['title' => 'cl_title', 'key' => 'cl_title', 'width' => '10%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
             ];
             $aData = $hResult->fetchAll();
             $this->P->cb_customdata['rows_content_lang_archive_list'] = Tools::makeListtable($aListSetting,
@@ -197,9 +197,9 @@ 
         $this->P->cb_customdata['rows_item_lang'] = $hResult->rowCount();
         if ($this->P->cb_customdata['rows_item_lang'] > 0) {
             $aListSetting = [
-                ['title' => 'itml_id', 'key' => 'itml_id', 'width' => '6%', 'linked' => false,],
-                ['title' => 'itml_pid', 'key' => 'itml_pid', 'width' => '6%', 'linked' => false,],
-                ['title' => 'itml_lang', 'key' => 'itml_lang', 'width' => '6%', 'linked' => false,],
+                ['title' => 'itml_id', 'key' => 'itml_id', 'width' => '6%', 'linked' => false, ],
+                ['title' => 'itml_pid', 'key' => 'itml_pid', 'width' => '6%', 'linked' => false, ],
+                ['title' => 'itml_lang', 'key' => 'itml_lang', 'width' => '6%', 'linked' => false, ],
                 [
                     'title' => 'itml_name_override',
                     'key' => 'itml_name_override',
@@ -241,9 +241,9 @@ 
         $this->P->cb_customdata['rows_itemgroups_text'] = $hResult->rowCount();
         if ($this->P->cb_customdata['rows_itemgroups_text'] > 0) {
             $aListSetting = [
-                ['title' => 'itmgt_id', 'key' => 'itmgt_id', 'width' => '6%', 'linked' => false,],
-                ['title' => 'itmgt_pid', 'key' => 'itmgt_pid', 'width' => '6%', 'linked' => false,],
-                ['title' => 'itmgt_lang', 'key' => 'itmgt_lang', 'width' => '6%', 'linked' => false,],
+                ['title' => 'itmgt_id', 'key' => 'itmgt_id', 'width' => '6%', 'linked' => false, ],
+                ['title' => 'itmgt_pid', 'key' => 'itmgt_pid', 'width' => '6%', 'linked' => false, ],
+                ['title' => 'itmgt_lang', 'key' => 'itmgt_lang', 'width' => '6%', 'linked' => false, ],
                 [
                     'title' => 'itmgt_shorttext',
                     'key' => 'itmgt_shorttext',
@@ -278,17 +278,17 @@ 
         $this->P->cb_customdata['rows_orders_items'] = $hResult->rowCount();
         if ($this->P->cb_customdata['rows_orders_items'] > 0) {
             $aListSetting = [
-                ['title' => 'oi_id', 'key' => 'oi_id', 'width' => '8%', 'linked' => false,],
-                ['title' => 'oi_o_id', 'key' => 'oi_o_id', 'width' => '9%', 'linked' => false,],
-                ['title' => 'oi_cartkey', 'key' => 'oi_cartkey', 'width' => '13%', 'linked' => false,],
-                ['title' => 'oi_amount', 'key' => 'oi_amount', 'width' => '9%', 'linked' => false,],
-                ['title' => 'oi_vat', 'key' => 'oi_vat', 'width' => '8%', 'linked' => false,],
-                ['title' => 'oi_rg', 'key' => 'oi_rg', 'width' => '8%', 'linked' => false,],
-                ['title' => 'oi_rg_rebate', 'key' => 'oi_rg_rebate', 'width' => '9%', 'linked' => false,],
-                ['title' => 'oi_price_netto_list',  'key' => 'oi_price_netto_list', 'width' => '9%', 'linked' => false,],
-                ['title' => 'oi_price_netto_sale', 'key' => 'oi_price_netto_sale', 'width' => '9%', 'linked' => false,],
-                ['title' => 'oi_price_netto_rebated', 'key' => 'oi_price_netto_rebated', 'width' => '9%', 'linked' => false,],
-                ['title' => 'oi_price_brutto_use', 'key' => 'oi_price_brutto_use', 'width' => '9%', 'linked' => false,],
+                ['title' => 'oi_id', 'key' => 'oi_id', 'width' => '8%', 'linked' => false, ],
+                ['title' => 'oi_o_id', 'key' => 'oi_o_id', 'width' => '9%', 'linked' => false, ],
+                ['title' => 'oi_cartkey', 'key' => 'oi_cartkey', 'width' => '13%', 'linked' => false, ],
+                ['title' => 'oi_amount', 'key' => 'oi_amount', 'width' => '9%', 'linked' => false, ],
+                ['title' => 'oi_vat', 'key' => 'oi_vat', 'width' => '8%', 'linked' => false, ],
+                ['title' => 'oi_rg', 'key' => 'oi_rg', 'width' => '8%', 'linked' => false, ],
+                ['title' => 'oi_rg_rebate', 'key' => 'oi_rg_rebate', 'width' => '9%', 'linked' => false, ],
+                ['title' => 'oi_price_netto_list', 'key' => 'oi_price_netto_list', 'width' => '9%', 'linked' => false, ],
+                ['title' => 'oi_price_netto_sale', 'key' => 'oi_price_netto_sale', 'width' => '9%', 'linked' => false, ],
+                ['title' => 'oi_price_netto_rebated', 'key' => 'oi_price_netto_rebated', 'width' => '9%', 'linked' => false, ],
+                ['title' => 'oi_price_brutto_use', 'key' => 'oi_price_brutto_use', 'width' => '9%', 'linked' => false, ],
                 //['title' => 'oi_img', 'key' => 'oi_img', 'width' => '41%', 'linked' => false, 'escapehtmlspecialchars' => true,],
 
             ];

src/Controller/Admin/Shop/Shopadmin.php

Spacing +13 added lines, -13 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, ],
             ],
         ];
 
@@ -221,7 +221,7 @@ 
                         $sZahlungsmethode = '<span style="color: red;">';
                     }
                     $mZahlungsmethode = $this->serviceManager->get('textcats')->T("order_paymentmethod_".$aRow["o_paymentmethod"], true);
-                    if ($mZahlungsmethode ) {
+                    if ($mZahlungsmethode) {
                         $sZahlungsmethode .= $mZahlungsmethode;
                     } else {
                         $sZahlungsmethode .= ucwords($aRow["o_paymentmethod"]);
@@ -265,7 +265,7 @@ 
                     ];
                     if (!($aRow["o_ordercompleted"] == 's' && $bIgnoreStorno)) {
                         $fGesamtnetto += $aRow["o_sumnettoall"];
-                        $j ++;
+                        $j++;
                     } else {
                         $k++;
                     }

src/Controller/Admin/Shop/Itemadmin.php

Spacing +9 added lines, -9 removed lines

@@ -128,7 +128,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();
@@ -229,10 +229,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) {
@@ -288,7 +288,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'],
@@ -319,7 +319,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);
 
@@ -361,7 +361,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"])) {
@@ -374,7 +374,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/Itemgroupadmin.php

Spacing +3 added lines, -3 removed lines

@@ -150,7 +150,7 @@ 
      * @param $purifier
      * @return string
      */
-    private function admin_updateGroup( $purifier)
+    private function admin_updateGroup($purifier)
     {
         $sql = 'SELECT * FROM itemgroups_base WHERE itmg_id != :id AND itmg_no = :gno';
         $hResult = $this->db->prepare($sql);
@@ -173,7 +173,7 @@ 
         $sql = DBTools::buildPSUpdateQuery($aData, 'itemgroups_base', 'itmg_id');
         $hResult = $this->db->prepare($sql);
         foreach ($aData as $sKey => $sValue) {
-            $hResult->bindValue(':' . $sKey, $sValue);
+            $hResult->bindValue(':'.$sKey, $sValue);
         }
         $hResult->execute();
 
@@ -194,7 +194,7 @@ 
             ];
             $sql = DBTools::buildPSUpdateQuery($aData, 'itemgroups_text', 'itmgt_id');
             $hResult = $this->db->prepare($sql);
-            foreach ($aData as $sKey => $sValue) $hResult->bindValue(':' . $sKey, $sValue);
+            foreach ($aData as $sKey => $sValue) $hResult->bindValue(':'.$sKey, $sValue);
             $hResult->execute();
         }
 

Braces +27 added lines, -9 removed lines

@@ -81,7 +81,9 @@ 
                 ];
                 $sql = DBTools::buildPSInsertQuery($aData, 'itemgroups_text');
                 $hResult = $this->db->prepare($sql);
-                foreach ($aData as $sKey => $sValue) $hResult->bindValue(':'.$sKey, $sValue);
+                foreach ($aData as $sKey => $sValue) {
+                    $hResult->bindValue(':'.$sKey, $sValue);
+                }
                 $hResult->execute();
                 header('Location: /_admin/itemgroupadmin.html?gid='.$iGID.'&action=editgroup');
                 die();
@@ -107,14 +109,20 @@ 
                 $sGNo = filter_var($_REQUEST["no"], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
                 $sImg = filter_var($_REQUEST["img"], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
 
-                if (strlen($sName) < 3) $aErr["nametooshort"] = true;
-                if (strlen($sGNo) < 3) $aErr["grouptooshort"] = true;
+                if (strlen($sName) < 3) {
+                    $aErr["nametooshort"] = true;
+                }
+                if (strlen($sGNo) < 3) {
+                    $aErr["grouptooshort"] = true;
+                }
                 if (count($aErr) == 0) {
                     $sql = 'SELECT itmg_no FROM itemgroups_base WHERE itmg_no = :no';
                     $hResult = $this->db->prepare($sql);
                     $hResult->bindValue(':no', $sGNo);
                     $hResult->execute();
-                    if ($hResult->rowCount() > 0) $aErr["duplicateno"] = true;
+                    if ($hResult->rowCount() > 0) {
+                        $aErr["duplicateno"] = true;
+                    }
                 }
                 if (count($aErr) == 0) {
                     $aData = [
@@ -124,7 +132,9 @@ 
                     ];
                     $sql = DBTools::buildPSInsertQuery($aData, 'itemgroups_base');
                     $hResult = $this->db->prepare($sql);
-                    foreach ($aData as $sKey => $sValue) $hResult->bindValue(':'.$sKey, $sValue);
+                    foreach ($aData as $sKey => $sValue) {
+                        $hResult->bindValue(':'.$sKey, $sValue);
+                    }
                     $hResult->execute();
                     $iLastInsertID = $this->db->lastInsertId();
                     header('Location: /_admin/itemgroupadmin.html?action=editgroup&added&gid='.$iLastInsertID);
@@ -161,7 +171,9 @@ 
         $hResult->execute();
         $iNumRows = $hResult->rowCount();
 
-        if ($iNumRows > 0) return 'duplicateno';
+        if ($iNumRows > 0) {
+            return 'duplicateno';
+        }
 
         $aData = [
             'itmg_name' => filter_var($_REQUEST["name"], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW),
@@ -194,7 +206,9 @@ 
             ];
             $sql = DBTools::buildPSUpdateQuery($aData, 'itemgroups_text', 'itmgt_id');
             $hResult = $this->db->prepare($sql);
-            foreach ($aData as $sKey => $sValue) $hResult->bindValue(':' . $sKey, $sValue);
+            foreach ($aData as $sKey => $sValue) {
+                $hResult->bindValue(':' . $sKey, $sValue);
+            }
             $hResult->execute();
         }
 
@@ -237,11 +251,15 @@ 
         $sql = 'SELECT * FROM itemgroups_base '
             . 'LEFT OUTER JOIN itemgroups_text ON itemgroups_base.itmg_id = itemgroups_text.itmgt_pid'
             . ' AND itemgroups_text.itmgt_lang = :lang';
-        if ($iGID != '') $sql .= ' WHERE itmg_id = :gid';
+        if ($iGID != '') {
+            $sql .= ' WHERE itmg_id = :gid';
+        }
         $sql .= ' ORDER BY itmg_no';
         $hResult = $this->db->prepare($sql);
         $hResult->bindValue(':lang', HelperConfig::$lang);
-        if ($iGID != '') $hResult->bindValue(':gid', $iGID);
+        if ($iGID != '') {
+            $hResult->bindValue(':gid', $iGID);
+        }
         $hResult->execute();
 
         $aGroups = $hResult->fetchAll();

src/Shop/Items.php

Spacing +3 added lines, -3 removed lines

@@ -207,7 +207,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 (
@@ -230,7 +230,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'
                         )
@@ -262,7 +262,7 @@ 
                 bcdiv(
                     bcmul(
                         $price,
-                        (string)$vat
+                        (string) $vat
                     ),
                     '100'
                 ),

Braces +7 added lines, -5 removed lines

@@ -86,8 +86,7 @@ 
             if (!is_array($mItemno)) {
                 $hResult->bindValue(':itemno', $mItemno, \PDO::PARAM_STR);
             }
-        }
-        elseif (isset($_REQUEST["searchtext"]) && strlen($_REQUEST["searchtext"]) > 2) {
+        } elseif (isset($_REQUEST["searchtext"]) && strlen($_REQUEST["searchtext"]) > 2) {
             $sSearchtext = filter_var(trim($_REQUEST["searchtext"]), FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
             if (isset($_REQUEST["artnoexact"])) {
                 $hResult->bindValue(':searchtext', $sSearchtext, \PDO::PARAM_STR);
@@ -114,8 +113,9 @@ 
                 $sql .= 'item_base.itm_no = :itemno';
             }
         } elseif (isset($_REQUEST["searchtext"]) && \strlen($_REQUEST["searchtext"]) > 2) {
-            if (isset($_REQUEST["artnoexact"])) $sql .= 'item_base.itm_no = :searchtext';
-            else {
+            if (isset($_REQUEST["artnoexact"])) {
+                $sql .= 'item_base.itm_no = :searchtext';
+            } else {
                 $sql .= '(item_base.itm_no LIKE :searchtextwild1 OR itm_name LIKE :searchtextwild2';
                 $sql .= ' OR itml_name_override LIKE :searchtextwild3 OR itml_text1 LIKE :searchtextwild4';
                 $sql .= ' OR itml_text2 LIKE :searchtextwild5)';
@@ -123,7 +123,9 @@ 
         } else {
             if (is_array($mItemIndex)) {
                 $sql .= "(";
-                foreach ($mItemIndex as $sAIndex) $sql .= "itm_index LIKE '%".filter_var($sAIndex, FILTER_SANITIZE_SPECIAL_CHARS)."%' OR ";
+                foreach ($mItemIndex as $sAIndex) {
+                    $sql .= "itm_index LIKE '%".filter_var($sAIndex, FILTER_SANITIZE_SPECIAL_CHARS)."%' OR ";
+                }
                 $sql = \HaaseIT\Toolbox\Tools::cutStringend($sql, 4);
                 $sql .= ")";
             } else {

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;
@@ -408,12 +408,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/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 = '\\HaaseIT\\HCSF\\Controller\\Glide';
@@ -128,7 +128,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();
                     }
 
@@ -145,14 +145,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 (
                     !(
@@ -162,10 +162,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;
@@ -187,7 +187,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);
@@ -197,7 +197,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].'/';
                 }
             }
         }

Braces +6 added lines, -2 removed lines

@@ -116,9 +116,13 @@
                     If the last part of the path doesn't include a dot (.) and is not empty, apend a slash.
                     If there is already a slash at the end, the last part of the path array will be empty.
                      */
-                    if (mb_strpos($aPath[count($aPath) - 1], '.') === false && $aPath[count($aPath) - 1] != '') $this->sPath .= '/';
+                    if (mb_strpos($aPath[count($aPath) - 1], '.') === false && $aPath[count($aPath) - 1] != '') {
+                        $this->sPath .= '/';
+                    }
 
-                    if ($this->sPath[strlen($this->sPath) - 1] == '/') $this->sPath .= 'index.html';
+                    if ($this->sPath[strlen($this->sPath) - 1] == '/') {
+                        $this->sPath .= 'index.html';
+                    }
 
                     $this->P = new UserPage($this->serviceManager, $this->sPath);
                 }

src/HCSF.php

Spacing +8 added lines, -8 removed lines

@@ -30,7 +30,7 @@ 
 
         $this->setupHardcodedTextcats();
 
-        $this->serviceManager->setFactory('db', function () {
+        $this->serviceManager->setFactory('db', function() {
             return null;
         });
 
@@ -43,7 +43,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);
             });
         }
@@ -56,7 +56,7 @@ 
     {
         // PSR-7 Stuff
         // Init request object
-        $this->serviceManager->setFactory('request', function () {
+        $this->serviceManager->setFactory('request', function() {
             $request = \Zend\Diactoros\ServerRequestFactory::fromGlobals();
 
             // cleanup request
@@ -76,7 +76,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
@@ -120,7 +120,7 @@ 
 
     protected function setupDB()
     {
-        $this->serviceManager->setFactory('dbal', function () {
+        $this->serviceManager->setFactory('dbal', function() {
             $config = new \Doctrine\DBAL\Configuration();
 
             $connectionParams = [
@@ -141,14 +141,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,
@@ -165,7 +165,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/Admin/Pageadmin.php

Spacing +5 added lines, -5 removed lines

@@ -158,11 +158,11 @@
 
                         if ($iArchivedRows > 0) {
                             $aListSetting = [
-                                ['title' => 'cla_timestamp', 'key' => 'cla_timestamp', 'width' => '15%', 'linked' => false,],
-                                ['title' => 'cl_html', 'key' => 'cl_html', 'width' => '40%', 'linked' => false, 'escapehtmlspecialchars' => true,],
-                                ['title' => 'cl_keywords', 'key' => 'cl_keywords', 'width' => '15%', 'linked' => false, 'escapehtmlspecialchars' => true,],
-                                ['title' => 'cl_description', 'key' => 'cl_description', 'width' => '15%', 'linked' => false, 'escapehtmlspecialchars' => true,],
-                                ['title' => 'cl_title', 'key' => 'cl_title', 'width' => '15%', 'linked' => false, 'escapehtmlspecialchars' => true,],
+                                ['title' => 'cla_timestamp', 'key' => 'cla_timestamp', 'width' => '15%', 'linked' => false, ],
+                                ['title' => 'cl_html', 'key' => 'cl_html', 'width' => '40%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
+                                ['title' => 'cl_keywords', 'key' => 'cl_keywords', 'width' => '15%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
+                                ['title' => 'cl_description', 'key' => 'cl_description', 'width' => '15%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
+                                ['title' => 'cl_title', 'key' => 'cl_title', 'width' => '15%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
                             ];
                             $aData = $statement->fetchAll();
                             $this->P->cb_customdata['archived_list'] = \HaaseIT\Toolbox\Tools::makeListtable(