HaaseIT / HCSF

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

src/Controller/Admin/Customer/Customeradmin.php

Spacing +6 added lines, -6 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'));

src/Controller/Shop/Shoppingcart.php

Doc Comments +2 added lines, -2 removed lines

@@ -326,7 +326,7 @@ 
     }
 
     /**
-     * @param $iInsertID
+     * @param string $iInsertID
      * @param $sMailbody_us
      * @param $sMailbody_they
      * @param $aImagesToSend
@@ -375,7 +375,7 @@ 
     }
 
     /**
-     * @param $field
+     * @param string $field
      * @return string
      */
     private function getPostValue($field)

Spacing +23 added lines, -23 removed lines

@@ -142,7 +142,7 @@ 
 
         if (HelperConfig::$shop['email_orderconfirmation_embed_itemimages_method'] === 'glide') {
             $sPathToImage = '/'.HelperConfig::$core['directory_images'].'/'.HelperConfig::$shop['directory_images_items'].'/';
-            $sImageroot = PATH_BASEDIR . HelperConfig::$core['directory_glide_master'];
+            $sImageroot = PATH_BASEDIR.HelperConfig::$core['directory_glide_master'];
 
             if (
                 is_file($sImageroot.substr($sPathToImage.$aV['img'], strlen(HelperConfig::$core['directory_images']) + 1))
@@ -153,7 +153,7 @@ 
                     'cache' => PATH_GLIDECACHE,
                     'max_image_size' => HelperConfig::$core['glide_max_imagesize'],
                 ]);
-                $glideserver->setBaseUrl('/' . HelperConfig::$core['directory_images'] . '/');
+                $glideserver->setBaseUrl('/'.HelperConfig::$core['directory_images'].'/');
                 $base64Img = $glideserver->getImageAsBase64($sPathToImage.$aV['img'], HelperConfig::$shop['email_orderconfirmation_embed_itemimages_glideparams']);
                 $TMP = explode(',', $base64Img);
                 $binImg = base64_decode($TMP[1]);
@@ -166,7 +166,7 @@ 
                 .HelperConfig::$shop['directory_images_items_email'].'/';
             if ($aImgInfo = getimagesize($sPathToImage.$aV['img'])) {
                 $binImg = file_get_contents($sPathToImage.$aV['img']);
-                $base64Img = 'data:' . $aImgInfo['mime'] . ';base64,';
+                $base64Img = 'data:'.$aImgInfo['mime'].';base64,';
                 $base64Img .= base64_encode($binImg);
             }
         }
@@ -239,7 +239,7 @@ 
             $sql = DBTools::buildPSInsertQuery($aDataOrder, 'orders');
             $hResult = $db->prepare($sql);
             foreach ($aDataOrder as $sKey => $sValue) {
-                $hResult->bindValue(':' . $sKey, $sValue);
+                $hResult->bindValue(':'.$sKey, $sValue);
             }
             $hResult->execute();
             $iInsertID = $db->lastInsertId();
@@ -274,7 +274,7 @@ 
                 $sql = DBTools::buildPSInsertQuery($aV, 'orders_items');
                 $hResult = $db->prepare($sql);
                 foreach ($aV as $sKey => $sValue) {
-                    $hResult->bindValue(':' . $sKey, $sValue);
+                    $hResult->bindValue(':'.$sKey, $sValue);
                 }
                 $hResult->execute();
             }
@@ -312,15 +312,15 @@ 
             && array_search('paypal', HelperConfig::$shop['paymentmethods']) !== false
             && HelperConfig::$shop['paypal_interactive']
         ) {
-            $redirectto = '/_misc/paypal.html?id=' . $iInsertID;
+            $redirectto = '/_misc/paypal.html?id='.$iInsertID;
         } elseif (
             isset($this->post['paymentmethod'])
             && $this->post['paymentmethod'] === 'sofortueberweisung'
             && array_search('sofortueberweisung', HelperConfig::$shop['paymentmethods']) !== false
         ) {
-            $redirectto = '/_misc/sofortueberweisung.html?id=' . $iInsertID;
+            $redirectto = '/_misc/sofortueberweisung.html?id='.$iInsertID;
         } else {
-            $redirectto = '/_misc/checkedout.html?id=' . $iInsertID;
+            $redirectto = '/_misc/checkedout.html?id='.$iInsertID;
         }
         \HaaseIT\HCSF\Helper::redirectToPage($redirectto);
     }
@@ -334,7 +334,7 @@ 
     private function sendCheckoutMails($iInsertID, $sMailbody_us, $sMailbody_they, $aImagesToSend)
     {
         if (
-            isset(HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_' .HelperConfig::$lang])
+            isset(HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_'.HelperConfig::$lang])
             && file_exists(
                 PATH_DOCROOT.HelperConfig::$core['directory_emailattachments']
                 .'/'.HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_'
@@ -343,21 +343,21 @@ 
         ) {
             $aFilesToSend[] =
                 PATH_DOCROOT.HelperConfig::$core['directory_emailattachments'].'/'
-                .HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_' .HelperConfig::$lang];
+                .HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_'.HelperConfig::$lang];
         } else {
             $aFilesToSend = [];
         }
 
         Helper::mailWrapper(
             $this->post['email'],
-            $this->textcats->T('shoppingcart_mail_subject') . ' ' . $iInsertID,
+            $this->textcats->T('shoppingcart_mail_subject').' '.$iInsertID,
             $sMailbody_they,
             $aImagesToSend,
             $aFilesToSend
         );
         Helper::mailWrapper(
             HelperConfig::$core['email_sender'],
-            'Bestellung im Webshop Nr: ' . $iInsertID,
+            'Bestellung im Webshop Nr: '.$iInsertID,
             $sMailbody_us,
             $aImagesToSend
         );
@@ -368,9 +368,9 @@ 
      */
     private function writeCheckoutToFile($sMailbody_us)
     {
-        $fp = fopen(PATH_LOGS . 'shoplog_' . date('Y-m-d') . '.html', 'a');
+        $fp = fopen(PATH_LOGS.'shoplog_'.date('Y-m-d').'.html', 'a');
         // Write $somecontent to our opened file.
-        fwrite($fp, $sMailbody_us . "\n\n-------------------------------------------------------------------------\n\n");
+        fwrite($fp, $sMailbody_us."\n\n-------------------------------------------------------------------------\n\n");
         fclose($fp);
     }
 
@@ -412,9 +412,9 @@ 
             'country' => isset($this->post['country']) && trim($this->post['country']) != '' ?
             (
                 isset(
-                    HelperConfig::$countries['countries_' .HelperConfig::$lang][$this->post['country']]
+                    HelperConfig::$countries['countries_'.HelperConfig::$lang][$this->post['country']]
                 )
-                    ? HelperConfig::$countries['countries_' .HelperConfig::$lang][$this->post['country']]
+                    ? HelperConfig::$countries['countries_'.HelperConfig::$lang][$this->post['country']]
                     : $this->post['country'])
             : '',
             'remarks' => $this->getPostValue('remarks'),
@@ -422,8 +422,8 @@ 
             'cancellationdisclaimer' => $this->getPostValue('cancellationdisclaimer'),
             'paymentmethod' => $this->getPostValue('paymentmethod'),
             'shippingcost' => !isset($_SESSION['shippingcost']) || $_SESSION['shippingcost'] == 0 ? false : $_SESSION['shippingcost'],
-            'paypallink' => isset($this->post['paymentmethod']) && $this->post['paymentmethod'] == 'paypal' ?  $_SERVER['SERVER_NAME'].'/_misc/paypal.html?id='.$iId : '',
-            'sofortueberweisunglink' => isset($this->post['paymentmethod']) && $this->post['paymentmethod'] == 'sofortueberweisung' ?  $_SERVER['SERVER_NAME'].'/_misc/sofortueberweisung.html?id='.$iId : '',
+            'paypallink' => isset($this->post['paymentmethod']) && $this->post['paymentmethod'] == 'paypal' ? $_SERVER['SERVER_NAME'].'/_misc/paypal.html?id='.$iId : '',
+            'sofortueberweisunglink' => isset($this->post['paymentmethod']) && $this->post['paymentmethod'] == 'sofortueberweisung' ? $_SERVER['SERVER_NAME'].'/_misc/sofortueberweisung.html?id='.$iId : '',
             'SESSION' => !$bCust ? Tools::debug($_SESSION, '$_SESSION', true, true) : '',
             'POST' => !$bCust ? Tools::debug($this->post, '$this->post', true, true) : '',
             'orderid' => $iId,
@@ -451,15 +451,15 @@ 
                 ($this->get['msg'] === 'updated' && isset($this->get['cartkey'], $this->get['amount']))
                 || ($this->get['msg'] === 'removed' && isset($this->get['cartkey']))
             ) {
-                $return .= $this->textcats->T('shoppingcart_msg_' . $this->get['msg'] . '_1') . ' ';
+                $return .= $this->textcats->T('shoppingcart_msg_'.$this->get['msg'].'_1').' ';
                 if (isset(HelperConfig::$shop['custom_order_fields']) && mb_strpos($this->get['cartkey'], '|') !== false) {
                     $mCartkeys = explode('|', $this->get['cartkey']);
                     foreach ($mCartkeys as $sKey => $sValue) {
                         if ($sKey == 0) {
-                            $return .= $sValue . ', ';
+                            $return .= $sValue.', ';
                         } else {
                             $TMP = explode(':', $sValue);
-                            $return .= $this->textcats->T('shoppingcart_item_' . $TMP[0]) . ' ' . $TMP[1] . ', ';
+                            $return .= $this->textcats->T('shoppingcart_item_'.$TMP[0]).' '.$TMP[1].', ';
                             unset($TMP);
                         }
                     }
@@ -467,9 +467,9 @@ 
                 } else {
                     $return .= $this->get['cartkey'];
                 }
-                $return.= ' ' . $this->textcats->T('shoppingcart_msg_' . $this->get['msg'] . '_2');
+                $return .= ' '.$this->textcats->T('shoppingcart_msg_'.$this->get['msg'].'_2');
                 if ($this->get['msg'] == 'updated') {
-                    $return .= ' ' . $this->get['amount'];
+                    $return .= ' '.$this->get['amount'];
                 }
                 $return .= '<br><br>';
             }

src/Controller/Shop/Sofortueberweisung.php

Spacing +3 added lines, -3 removed lines

@@ -72,13 +72,13 @@
                 .'&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']) {
                 \HaaseIT\HCSF\Helper::redirectToPage($sPURL);
             }
 
-            $this->P->oPayload->cl_html = $this->textcats->T('misc_paysofortueberweisung_greeting') . '<br><br>';
-            $this->P->oPayload->cl_html .= '<a href="' . $sPURL . '">' . $this->textcats->T('misc_paysofortueberweisung') . '</a>';
+            $this->P->oPayload->cl_html = $this->textcats->T('misc_paysofortueberweisung_greeting').'<br><br>';
+            $this->P->oPayload->cl_html .= '<a href="'.$sPURL.'">'.$this->textcats->T('misc_paysofortueberweisung').'</a>';
         } else {
             $this->P->oPayload->cl_html = $this->textcats->T('misc_paysofortueberweisung_paymentnotavailable');
         }

src/Controller/Shop/Paypal.php

Spacing +6 added lines, -6 removed lines

@@ -69,16 +69,16 @@
 
             $sPaypalURL = HelperConfig::$shop['paypal']['url']
                 .'?cmd=_xclick&rm=2&custom='
-                .$iId . '&business='.HelperConfig::$shop['paypal']['business'];
-            $sPaypalURL .= '&notify_url=http://' . $_SERVER['SERVER_NAME'] . '/_misc/paypal_notify.html&item_name=' . $this->textcats->T('misc_paypaypal_paypaltitle') . ' ' . $iId;
-            $sPaypalURL .= '&currency_code=' . HelperConfig::$shop['paypal']['currency_id']
-                .'&amount=' . str_replace(',', '.', number_format($fGesamtbrutto, 2, '.', ''));
+                .$iId.'&business='.HelperConfig::$shop['paypal']['business'];
+            $sPaypalURL .= '&notify_url=http://'.$_SERVER['SERVER_NAME'].'/_misc/paypal_notify.html&item_name='.$this->textcats->T('misc_paypaypal_paypaltitle').' '.$iId;
+            $sPaypalURL .= '&currency_code='.HelperConfig::$shop['paypal']['currency_id']
+                .'&amount='.str_replace(',', '.', number_format($fGesamtbrutto, 2, '.', ''));
             if (HelperConfig::$shop['interactive_paymentmethods_redirect_immediately']) {
                 \HaaseIT\HCSF\Helper::redirectToPage($sPaypalURL);
             }
 
-            $this->P->oPayload->cl_html = $this->textcats->T('misc_paypaypal_greeting') . '<br><br>';
-            $this->P->oPayload->cl_html .= '<a href="' . $sPaypalURL . '">' . $this->textcats->T('misc_paypaypal') . '</a>';
+            $this->P->oPayload->cl_html = $this->textcats->T('misc_paypaypal_greeting').'<br><br>';
+            $this->P->oPayload->cl_html .= '<a href="'.$sPaypalURL.'">'.$this->textcats->T('misc_paypaypal').'</a>';
         } else {
             $this->P->oPayload->cl_html = $this->textcats->T('misc_paypaypal_paymentnotavailable');
         }

src/Controller/Customer/Login.php

Spacing +8 added lines, -8 removed lines

@@ -45,18 +45,18 @@ 
         } else {
             $mLogin = $this->getLogin();
             if (isset($mLogin['status']) && $mLogin['status'] === 'success') {
-                $this->P->oPayload->cl_html = $textcats->T('login_success') . '<br>';
+                $this->P->oPayload->cl_html = $textcats->T('login_success').'<br>';
                 \HaaseIT\HCSF\Helper::redirectToPage('/_misc/userhome.html?login=true');
             } elseif (isset($mLogin['status']) && $mLogin['status'] === 'tosnotaccepted') {
-                $this->P->oPayload->cl_html = $textcats->T('login_fail_tosnotaccepted') . '<br>';
+                $this->P->oPayload->cl_html = $textcats->T('login_fail_tosnotaccepted').'<br>';
                 $this->P->cb_customcontenttemplate = 'customer/login';
             } elseif (isset($mLogin['status']) && $mLogin['status'] === 'emailnotverified') {
-                $this->P->oPayload->cl_html = $textcats->T('login_fail_emailnotverified') . '<br><br>';
+                $this->P->oPayload->cl_html = $textcats->T('login_fail_emailnotverified').'<br><br>';
                 $this->P->oPayload->cl_html .= '<a href="/_misc/resendverificationmail.html?email='
-                    . $mLogin['data']['cust_email'] . '">' . $textcats->T('login_fail_emailnotverifiedresend') . '</a>';
+                    . $mLogin['data']['cust_email'].'">'.$textcats->T('login_fail_emailnotverifiedresend').'</a>';
                 $this->P->cb_customcontenttemplate = 'customer/login';
             } elseif (isset($mLogin['status']) && $mLogin['status'] === 'accountinactive') {
-                $this->P->oPayload->cl_html = $textcats->T('login_fail_accountinactive') . '<br>';
+                $this->P->oPayload->cl_html = $textcats->T('login_fail_accountinactive').'<br>';
                 $this->P->cb_customcontenttemplate = 'customer/login';
             } else {
                 $this->P->oPayload->cl_html = $textcats->T('login_fail');
@@ -110,7 +110,7 @@ 
         $hResult->execute();
 
         $iRows = $hResult->rowCount();
-        if($iRows == 1) {
+        if ($iRows == 1) {
             $aRow = $hResult->fetch();
 
             if (password_verify($_POST['password'], $aRow['cust_password'])) {
@@ -120,9 +120,9 @@ 
                 } elseif ($aRow['cust_tosaccepted'] === 'n') {
                     return ['status' => 'tosnotaccepted'];
                 } elseif ($aRow['cust_emailverified'] === 'n') {
-                    return ['status' => 'emailnotverified', 'data' => $aRow,];
+                    return ['status' => 'emailnotverified', 'data' => $aRow, ];
                 } elseif ($aRow['cust_active'] === 'n') {
-                    return ['status' => 'accountinactive',];
+                    return ['status' => 'accountinactive', ];
                 }
             }
         }

src/Controller/Admin/Shop/Itemadmin.php

Spacing +6 added lines, -6 removed lines

@@ -258,10 +258,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) {
@@ -326,7 +326,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'],
@@ -357,7 +357,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);