HaaseIT / HCSF

src/Controller/Customer/Userhome.php

Spacing +2 added lines, -2 removed lines

@@ -82,7 +82,7 @@ 
                     $hResult->bindValue(':email', $sEmail, \PDO::PARAM_STR);
                     $hResult->execute();
                     $iRows = $hResult->rowCount();
-                    if ($iRows == 1) $sErr .= $this->textcats->T("userprofile_emailalreadyinuse") . '<br>';
+                    if ($iRows == 1) $sErr .= $this->textcats->T("userprofile_emailalreadyinuse").'<br>';
                     $sErr = CHelper::validateCustomerForm(HelperConfig::$lang, $sErr, true);
 
                     if ($sErr == '') {
@@ -110,7 +110,7 @@ 
                             $sql = \HaaseIT\Toolbox\DBTools::buildPSUpdateQuery($aData, 'customer', 'cust_id');
                             $hResult = $this->db->prepare($sql);
                             foreach ($aData as $sKey => $sValue) {
-                                $hResult->bindValue(':' . $sKey, $sValue);
+                                $hResult->bindValue(':'.$sKey, $sValue);
                             }
                             $hResult->execute();
                             $aPData["infochangessaved"] = true;

Braces +3 added lines, -1 removed lines

@@ -82,7 +82,9 @@
                     $hResult->bindValue(':email', $sEmail, \PDO::PARAM_STR);
                     $hResult->execute();
                     $iRows = $hResult->rowCount();
-                    if ($iRows == 1) $sErr .= $this->textcats->T("userprofile_emailalreadyinuse") . '<br>';
+                    if ($iRows == 1) {
+                        $sErr .= $this->textcats->T("userprofile_emailalreadyinuse") . '<br>';
+                    }
                     $sErr = CHelper::validateCustomerForm(HelperConfig::$lang, $sErr, true);
 
                     if ($sErr == '') {

src/Controller/Customer/Resetpassword.php

Braces +9 added lines, -3 removed lines

@@ -108,8 +108,12 @@ 
             if (
                 strlen($_POST["pwd"]) < HelperConfig::$customer["minimum_length_password"]
                 || strlen($_POST["pwd"]) > HelperConfig::$customer["maximum_length_password"]
-            ) $aErr[] = 'pwlength';
-            if ($_POST["pwd"] != $_POST["pwdc"]) $aErr[] = 'pwmatch';
+            ) {
+                $aErr[] = 'pwlength';
+            }
+            if ($_POST["pwd"] != $_POST["pwdc"]) {
+                $aErr[] = 'pwmatch';
+            }
             if (count($aErr) == 0) {
                 $sEnc = password_hash($_POST["pwd"], PASSWORD_DEFAULT);
                 $aData = [
@@ -119,7 +123,9 @@ 
                 ];
                 $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();
             }
         } else {

src/Controller/Shop/Paypal.php

Spacing +7 added lines, -7 removed lines

@@ -69,17 +69,17 @@
 
             $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"]) {
-                header('Location: ' . $sPaypalURL);
+                header('Location: '.$sPaypalURL);
                 die();
             }
 
-            $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/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>';
         die($return);
     }

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', ],
                     ],
                 ];
 

Braces +19 added lines, -8 removed lines

@@ -158,14 +158,23 @@ 
             while ($aRow = $hResult->fetch()) {
                 $sStatus = SHelper::showOrderStatusText($this->textcats, $aRow["o_ordercompleted"]);
 
-                if ($aRow["o_paymentmethod"] == 'prepay') $sPaymentmethod = $this->textcats->T("order_paymentmethod_prepay");
-                elseif ($aRow["o_paymentmethod"] == 'paypal') $sPaymentmethod = $this->textcats->T("order_paymentmethod_paypal");
-                elseif ($aRow["o_paymentmethod"] == 'debit') $sPaymentmethod = $this->textcats->T("order_paymentmethod_debit");
-                elseif ($aRow["o_paymentmethod"] == 'invoice') $sPaymentmethod = $this->textcats->T("order_paymentmethod_invoice");
-                else $sPaymentmethod = ucwords($aRow["o_paymentmethod"]);
+                if ($aRow["o_paymentmethod"] == 'prepay') {
+                    $sPaymentmethod = $this->textcats->T("order_paymentmethod_prepay");
+                } elseif ($aRow["o_paymentmethod"] == 'paypal') {
+                    $sPaymentmethod = $this->textcats->T("order_paymentmethod_paypal");
+                } elseif ($aRow["o_paymentmethod"] == 'debit') {
+                    $sPaymentmethod = $this->textcats->T("order_paymentmethod_debit");
+                } elseif ($aRow["o_paymentmethod"] == 'invoice') {
+                    $sPaymentmethod = $this->textcats->T("order_paymentmethod_invoice");
+                } else {
+                    $sPaymentmethod = ucwords($aRow["o_paymentmethod"]);
+                }
 
-                if ($aRow["o_paymentcompleted"] == 'y') $sPaymentstatus = ucwords($this->textcats->T("misc_yes"));
-                else $sPaymentstatus = ucwords($this->textcats->T("misc_no"));
+                if ($aRow["o_paymentcompleted"] == 'y') {
+                    $sPaymentstatus = ucwords($this->textcats->T("misc_yes"));
+                } else {
+                    $sPaymentstatus = ucwords($this->textcats->T("misc_no"));
+                }
 
                 $aData[] = [
                     'o_id' => $aRow["o_id"],
@@ -181,7 +190,9 @@ 
                 ];
             }
             $return .= \HaaseIT\Toolbox\Tools::makeListtable($COList, $aData, $this->serviceManager->get('twig'));
-        } else $return .= $this->textcats->T("myorders_no_orders_to_display");
+        } else {
+            $return .= $this->textcats->T("myorders_no_orders_to_display");
+        }
 
         return $return;
     }

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

Braces +6 added lines, -2 removed lines

@@ -161,7 +161,9 @@ 
                         }
                         $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;
                     }
@@ -180,7 +182,9 @@ 
         }
         $aPData["customeradmin"]["text"] = $return;
         $aPData["customeradmin"]["type"] = $sType;
-        if (isset($aInfo)) $aPData["customeradmin"]["info"] = $aInfo;
+        if (isset($aInfo)) {
+            $aPData["customeradmin"]["info"] = $aInfo;
+        }
         return $aPData;
     }