HaaseIT / HCSF

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/Customer/Register.php

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
                             ->setParameter(':cust_email', $sEmail)
                             ->setParameter(':cust_corp', filter_var(trim(Tools::getFormfield('corpname')), FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW))
                             ->setParameter(':cust_name', filter_var(trim(Tools::getFormfield('name')), FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW))
-                            ->setParameter(':cust_street', filter_var(trim(Tools::getFormfield('street')),FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW))
+                            ->setParameter(':cust_street', filter_var(trim(Tools::getFormfield('street')), FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW))
                             ->setParameter(':cust_zip', filter_var(trim(Tools::getFormfield('zip')), FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW))
                             ->setParameter(':cust_town', filter_var(trim(Tools::getFormfield('town')), FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW))
                             ->setParameter(':cust_phone', filter_var(trim(Tools::getFormfield('phone')), FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW))

src/HCSF.php

Spacing +8 added lines, -8 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
@@ -127,7 +127,7 @@ 
 
     protected function setupDB()
     {
-        $this->serviceManager->setFactory('dbal', function () {
+        $this->serviceManager->setFactory('dbal', function() {
             $config = new \Doctrine\DBAL\Configuration();
 
             $connectionParams = [
@@ -148,14 +148,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,
@@ -172,7 +172,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 = [
@@ -297,7 +297,7 @@ 
         }
 
         $aP['countrylist'][] = ' | ';
-        foreach (HelperConfig::$countries['countries_' .HelperConfig::$lang] as $sKey => $sValue) {
+        foreach (HelperConfig::$countries['countries_'.HelperConfig::$lang] as $sKey => $sValue) {
             $aP['countrylist'][] = $sKey.'|'.$sValue;
         }
 

src/Controller/Shop/Updateshippingcost.php

Spacing +12 added lines, -12 removed lines

@@ -42,24 +42,24 @@
 
         header('Content-Type: text/html; charset=UTF-8');
         $return = '<div>';
-        $return .= '<div id="shippingcostbrutto_new">' . number_format($_SESSION['cartpricesums']['fVersandkostenbrutto'],
+        $return .= '<div id="shippingcostbrutto_new">'.number_format($_SESSION['cartpricesums']['fVersandkostenbrutto'],
                 HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'],
-                HelperConfig::$core['numberformat_thousands_seperator']) . '</div>';
-        $return .= '<div id="vatfull_new">' . number_format(round($_SESSION['cartpricesums']['fSteuervoll'], 2),
+                HelperConfig::$core['numberformat_thousands_seperator']).'</div>';
+        $return .= '<div id="vatfull_new">'.number_format(round($_SESSION['cartpricesums']['fSteuervoll'], 2),
                 HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'],
-                HelperConfig::$core['numberformat_thousands_seperator']) . '</div>';
-        $return .= '<div id="totalbrutto_new">' . number_format(round($_SESSION['cartpricesums']['fGesamtbrutto'], 2),
+                HelperConfig::$core['numberformat_thousands_seperator']).'</div>';
+        $return .= '<div id="totalbrutto_new">'.number_format(round($_SESSION['cartpricesums']['fGesamtbrutto'], 2),
                 HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'],
-                HelperConfig::$core['numberformat_thousands_seperator']) . '</div>';
-        $return .= '<div id="shippingcostnetto_new">' . number_format($_SESSION['cartpricesums']['fVersandkostennetto'],
+                HelperConfig::$core['numberformat_thousands_seperator']).'</div>';
+        $return .= '<div id="shippingcostnetto_new">'.number_format($_SESSION['cartpricesums']['fVersandkostennetto'],
                 HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'],
-                HelperConfig::$core['numberformat_thousands_seperator']) . '</div>';
-        $return .= '<div id="vatreduced_new">' . number_format(round($_SESSION['cartpricesums']['fSteuererm'], 2),
+                HelperConfig::$core['numberformat_thousands_seperator']).'</div>';
+        $return .= '<div id="vatreduced_new">'.number_format(round($_SESSION['cartpricesums']['fSteuererm'], 2),
                 HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'],
-                HelperConfig::$core['numberformat_thousands_seperator']) . '</div>';
-        $return .= '<div id="totalnetto_new">' . number_format(round($_SESSION['cartpricesums']['fGesamtnetto'], 2),
+                HelperConfig::$core['numberformat_thousands_seperator']).'</div>';
+        $return .= '<div id="totalnetto_new">'.number_format(round($_SESSION['cartpricesums']['fGesamtnetto'], 2),
                 HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'],
-                HelperConfig::$core['numberformat_thousands_seperator']) . '</div>';
+                HelperConfig::$core['numberformat_thousands_seperator']).'</div>';
         $return .= '</div>';
         \HaaseIT\HCSF\Helper::terminateScript($return);
     }

src/Controller/Base.php

Spacing +3 added lines, -3 removed lines

@@ -115,7 +115,7 @@ 
         } elseif (count(HelperConfig::$secrets['admin_users'])) {
 
             if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION'])) { // fix for php cgi mode
-                list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = explode(':' , base64_decode(substr($_SERVER['REDIRECT_HTTP_AUTHORIZATION'], 6)));
+                list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = explode(':', base64_decode(substr($_SERVER['REDIRECT_HTTP_AUTHORIZATION'], 6)));
             }
 
             if (isset($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'])) {
@@ -131,12 +131,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');
                 \HaaseIT\HCSF\Helper::terminateScript('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');
             \HaaseIT\HCSF\Helper::terminateScript('Not authorized');
         }

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 = Controller\Glide::class;
@@ -132,7 +132,7 @@ 
                 } else { // if it is found, go on
                     // Support for shorturls
                     if ($this->P->cb_pagetype === 'shorturl') {
-                        \HaaseIT\HCSF\Helper::redirectToPage('Location: ' . $this->P->cb_pageconfig, true);
+                        \HaaseIT\HCSF\Helper::redirectToPage('Location: '.$this->P->cb_pageconfig, true);
                     }
 
                     if (isset($this->P, $aRoutingoverride) && count($aRoutingoverride)) {
@@ -148,14 +148,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 (
                     !(
@@ -165,10 +165,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;
@@ -190,7 +190,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);
@@ -200,7 +200,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].'/';
                 }
             }
         }

src/Controller/Admin/Shop/Itemadmin.php

Spacing +6 added lines, -6 removed lines

@@ -252,10 +252,10 @@ 
     private function 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) {
@@ -320,7 +320,7 @@ 
     private function 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'],
@@ -351,7 +351,7 @@ 
         $aGroups = $this->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);