HaaseIT / HCSF

src/Customer/Helper.php

Doc Comments +11 added lines

@@ -27,6 +27,9 @@ 
 
 class Helper
 {
+    /**
+     * @param string $sLang
+     */
     public static function validateCustomerForm($sLang, $aErr = [], $bEdit = false)
     {
         if (!isset($_POST["email"]) || !\filter_var($_POST["email"], FILTER_VALIDATE_EMAIL)) {
@@ -92,6 +95,11 @@ 
         return '';
     }
 
+    /**
+     * @param string $sKeyConfig
+     * @param string $sKeyForm
+     * @param boolean $aUserData
+     */
     public static function getCustomerFormDefaultValue($sKeyConfig, $sKeyForm, $aUserData) {
         $sDefaultValue = self::getUserData($sKeyConfig, $aUserData);
         if (!$sDefaultValue && isset($_SESSION["formsave_addrform"][$sKeyForm])) {
@@ -101,6 +109,9 @@ 
         return $sDefaultValue;
     }
 
+    /**
+     * @param string $sLang
+     */
     public static function buildCustomerForm($sLang, $sPurpose = 'none', $sErr = '', $aUserData = false)
     {
         $sDefaultCountry = self::getCustomerFormDefaultValue('cust_country', "country", $aUserData);

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
         if (!$bEdit && (!isset($_POST["tos"]) || $_POST["tos"] != 'y')) {
             $aErr["tos"] = true;
         }
-        if (!$bEdit && (!isset( $_POST["cancellationdisclaimer"] ) || $_POST["cancellationdisclaimer"] != 'y')) {
+        if (!$bEdit && (!isset($_POST["cancellationdisclaimer"]) || $_POST["cancellationdisclaimer"] != 'y')) {
             $aErr["cancellationdisclaimer"] = true;
         }
 

src/Controller/Shop/Updatecart.php

Spacing +2 added lines, -2 removed lines

@@ -77,7 +77,7 @@ 
                                 unset($sTMP);
 
                                 if (isset($_REQUEST[$sValue]) && in_array($_REQUEST[$sValue], $aOptions)) {
-                                    $sCartKey .= '|' . $sValue . ':' . $_REQUEST[$sValue];
+                                    $sCartKey .= '|'.$sValue.':'.$_REQUEST[$sValue];
                                 } else {
                                     $this->replyToCartUpdate('requiredfieldmissing');
                                 }
@@ -137,7 +137,7 @@ 
             }
             echo $this->serviceManager->get('twig')->render('shop/update-cart.twig', $aAR);
         } else {
-            $aMSG["msg"] =  $sReply;
+            $aMSG["msg"] = $sReply;
             if (count($aMore)) {
                 $aMSG = array_merge($aMSG, $aMore);
             }

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["id"]) && $_GET["action"] === 'show') {
                 $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 +3 added lines, -6 removed lines

@@ -160,14 +160,11 @@
 
                 if ($aRow["o_paymentmethod"] === 'prepay') {
                     $sPaymentmethod = $this->textcats->T("order_paymentmethod_prepay");
-                }
-                elseif ($aRow["o_paymentmethod"] === 'paypal') {
+                } elseif ($aRow["o_paymentmethod"] === 'paypal') {
                     $sPaymentmethod = $this->textcats->T("order_paymentmethod_paypal");
-                }
-                elseif ($aRow["o_paymentmethod"] === 'debit') {
+                } elseif ($aRow["o_paymentmethod"] === 'debit') {
                     $sPaymentmethod = $this->textcats->T("order_paymentmethod_debit");
-                }
-                elseif ($aRow["o_paymentmethod"] === 'invoice') {
+                } elseif ($aRow["o_paymentmethod"] === 'invoice') {
                     $sPaymentmethod = $this->textcats->T("order_paymentmethod_invoice");
                 } else {
                     $sPaymentmethod = ucwords($aRow["o_paymentmethod"]);

src/Controller/Customer/Userhome.php

Spacing +2 added lines, -2 removed lines

@@ -83,7 +83,7 @@ 
                     $hResult->execute();
                     $iRows = $hResult->rowCount();
                     if ($iRows == 1) {
-                        $sErr .= $this->textcats->T("userprofile_emailalreadyinuse") . '<br>';
+                        $sErr .= $this->textcats->T("userprofile_emailalreadyinuse").'<br>';
                     }
                     $sErr = CHelper::validateCustomerForm(HelperConfig::$lang, $sErr, true);
 
@@ -112,7 +112,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;

src/Controller/Customer/Login.php

Spacing +8 added lines, -8 removed lines

@@ -45,19 +45,19 @@ 
         } 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>';
                 header('Location: /_misc/userhome.html?login=true');
                 die();
             } 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");
@@ -111,7 +111,7 @@ 
         $hResult->execute();
 
         $iRows = $hResult->rowCount();
-        if($iRows == 1) {
+        if ($iRows == 1) {
             $aRow = $hResult->fetch();
 
             if (password_verify($_POST["password"], $aRow['cust_password'])) {
@@ -121,9 +121,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/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);
+                            $hResult->bindValue(':'.$sKey, $sValue);
                         }
                         $hResult->execute();
                         $aInfo["changeswritten"] = true;

src/Controller/Admin/Phpinfo.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
         $html .= implode("\n",
             array_map(
                 function($i) {
-                    return ".phpinfodisplay " . preg_replace( "/,/", ",.phpinfodisplay ", $i );
+                    return ".phpinfodisplay ".preg_replace("/,/", ",.phpinfodisplay ", $i);
                 },
                 preg_split('/\n/', $matches[1])
             )