HaaseIT / HCSF

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["action"] == 'show' && isset($_GET["id"])) {
                 $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/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/Glide.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
                 'cache' => PATH_GLIDECACHE,
                 'max_image_size' => HelperConfig::$core['glide_max_imagesize'],
             ]);
-            $glideserver->setBaseUrl('/' . HelperConfig::$core['directory_images'] . '/');
+            $glideserver->setBaseUrl('/'.HelperConfig::$core['directory_images'].'/');
             // Generate a URL
 
             try {

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']) && isset($_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/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);
+                        foreach ($aData as $sKey => $sValue) $hResult->bindValue(':'.$sKey, $sValue);
                         $hResult->execute();
                         $aInfo["changeswritten"] = true;
                     }

src/Controller/Admin/Phpinfo.php

Spacing +3 added lines, -3 removed lines

@@ -37,16 +37,16 @@
 
         ob_start();
         phpinfo();
-        preg_match ('%<style type="text/css">(.*?)</style>.*?(<body>.*</body>)%s', ob_get_clean(), $matches);
+        preg_match('%<style type="text/css">(.*?)</style>.*?(<body>.*</body>)%s', ob_get_clean(), $matches);
         $html = '<div class=\'phpinfodisplay\'><style type=\'text/css\'>';
 
-        $html .= join( "\n",
+        $html .= join("\n",
             array_map(
                 create_function(
                     '$i',
                     'return ".phpinfodisplay " . preg_replace( "/,/", ",.phpinfodisplay ", $i );'
                 ),
-                preg_split( '/\n/', $matches[1] )
+                preg_split('/\n/', $matches[1])
             )
         );
         $html .= '</style>'.$matches[2];

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