Completed
Push — master ( 42e6bf...4e0ac1 )
by Marcus
02:50
created
src/Controller/Customer/Login.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -45,19 +45,19 @@  discard block
 block discarded – undo
45 45
         } else {
46 46
             $mLogin = $this->getLogin();
47 47
             if (isset($mLogin['status']) && $mLogin['status'] === 'success') {
48
-                $this->P->oPayload->cl_html = $textcats->T('login_success') . '<br>';
48
+                $this->P->oPayload->cl_html = $textcats->T('login_success').'<br>';
49 49
                 header('Location: /_misc/userhome.html?login=true');
50 50
                 die();
51 51
             } elseif (isset($mLogin['status']) && $mLogin['status'] === 'tosnotaccepted') {
52
-                $this->P->oPayload->cl_html = $textcats->T('login_fail_tosnotaccepted') . '<br>';
52
+                $this->P->oPayload->cl_html = $textcats->T('login_fail_tosnotaccepted').'<br>';
53 53
                 $this->P->cb_customcontenttemplate = 'customer/login';
54 54
             } elseif (isset($mLogin['status']) && $mLogin['status'] === 'emailnotverified') {
55
-                $this->P->oPayload->cl_html = $textcats->T('login_fail_emailnotverified') . '<br><br>';
55
+                $this->P->oPayload->cl_html = $textcats->T('login_fail_emailnotverified').'<br><br>';
56 56
                 $this->P->oPayload->cl_html .= '<a href="/_misc/resendverificationmail.html?email='
57
-                    . $mLogin['data']['cust_email'] . '">' . $textcats->T('login_fail_emailnotverifiedresend') . '</a>';
57
+                    . $mLogin['data']['cust_email'].'">'.$textcats->T('login_fail_emailnotverifiedresend').'</a>';
58 58
                 $this->P->cb_customcontenttemplate = 'customer/login';
59 59
             } elseif (isset($mLogin['status']) && $mLogin['status'] === 'accountinactive') {
60
-                $this->P->oPayload->cl_html = $textcats->T('login_fail_accountinactive') . '<br>';
60
+                $this->P->oPayload->cl_html = $textcats->T('login_fail_accountinactive').'<br>';
61 61
                 $this->P->cb_customcontenttemplate = 'customer/login';
62 62
             } else {
63 63
                 $this->P->oPayload->cl_html = $textcats->T('login_fail');
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
         $hResult->execute();
112 112
 
113 113
         $iRows = $hResult->rowCount();
114
-        if($iRows == 1) {
114
+        if ($iRows == 1) {
115 115
             $aRow = $hResult->fetch();
116 116
 
117 117
             if (password_verify($_POST['password'], $aRow['cust_password'])) {
@@ -121,9 +121,9 @@  discard block
 block discarded – undo
121 121
                 } elseif ($aRow['cust_tosaccepted'] === 'n') {
122 122
                     return ['status' => 'tosnotaccepted'];
123 123
                 } elseif ($aRow['cust_emailverified'] === 'n') {
124
-                    return ['status' => 'emailnotverified', 'data' => $aRow,];
124
+                    return ['status' => 'emailnotverified', 'data' => $aRow, ];
125 125
                 } elseif ($aRow['cust_active'] === 'n') {
126
-                    return ['status' => 'accountinactive',];
126
+                    return ['status' => 'accountinactive', ];
127 127
                 }
128 128
             }
129 129
         }
Please login to merge, or discard this patch.
src/Controller/Customer/Forgotpassword.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@
 block discarded – undo
113 113
                     $sTargetAddress = $aResult['cust_email'];
114 114
                     $sSubject = $this->textcats->T('forgotpw_mail_subject');
115 115
                     $sMessage = $this->textcats->T('forgotpw_mail_text1');
116
-                    $sMessage .= '<br><br>' .'<a href="http'.(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? 's' : '').'://';
116
+                    $sMessage .= '<br><br>'.'<a href="http'.(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? 's' : '').'://';
117 117
                     $sMessage .= $_SERVER['SERVER_NAME'].'/_misc/rp.html?key='.$sResetCode.'&amp;email='.$sTargetAddress.'">';
118 118
                     $sMessage .= 'http'.(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? 's' : '').'://';
119 119
                     $sMessage .= $_SERVER['SERVER_NAME'].'/_misc/rp.html?key='.$sResetCode.'&amp;email='.$sTargetAddress.'</a>';
Please login to merge, or discard this patch.
src/Controller/Customer/Verifyemail.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@
 block discarded – undo
75 75
                 /** @var \PDOStatement $hResult */
76 76
                 $hResult = $this->db->prepare($sql);
77 77
                 foreach ($aData as $sKey => $sValue) {
78
-                    $hResult->bindValue(':' . $sKey, $sValue);
78
+                    $hResult->bindValue(':'.$sKey, $sValue);
79 79
                 }
80 80
                 $hResult->execute();
81 81
                 $this->P->oPayload->cl_html = $this->textcats->T('register_emailverificationsuccess');
Please login to merge, or discard this patch.
src/Controller/Customer/Userhome.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
                     $hResult->execute();
84 84
                     $iRows = $hResult->rowCount();
85 85
                     if ($iRows == 1) {
86
-                        $sErr .= $this->textcats->T('userprofile_emailalreadyinuse') . '<br>';
86
+                        $sErr .= $this->textcats->T('userprofile_emailalreadyinuse').'<br>';
87 87
                     }
88 88
                     $sErr = CHelper::validateCustomerForm(HelperConfig::$lang, $sErr, true);
89 89
 
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
                             $sql = \HaaseIT\Toolbox\DBTools::buildPSUpdateQuery($aData, 'customer', 'cust_id');
113 113
                             $hResult = $this->db->prepare($sql);
114 114
                             foreach ($aData as $sKey => $sValue) {
115
-                                $hResult->bindValue(':' . $sKey, $sValue);
115
+                                $hResult->bindValue(':'.$sKey, $sValue);
116 116
                             }
117 117
                             $hResult->execute();
118 118
                             $aPData['infochangessaved'] = true;
Please login to merge, or discard this patch.
src/Controller/Customer/Register.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
                     $iRows = $hResult->rowCount();
52 52
 
53 53
                     if ($iRows == 0) {
54
-                        $sEmailVerificationcode = md5($_POST['email'] . time());
54
+                        $sEmailVerificationcode = md5($_POST['email'].time());
55 55
                         $aData = [
56 56
                             'cust_email' => $sEmail,
57 57
                             'cust_corp' => filter_var(trim(Tools::getFormfield('corpname')),
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 
85 85
                         $hResult = $this->serviceManager->get('db')->prepare($sql);
86 86
                         foreach ($aData as $sKey => $sValue) {
87
-                            $hResult->bindValue(':' . $sKey, $sValue, \PDO::PARAM_STR);
87
+                            $hResult->bindValue(':'.$sKey, $sValue, \PDO::PARAM_STR);
88 88
                         }
89 89
                         $hResult->execute();
90 90
 
Please login to merge, or discard this patch.
src/Controller/Base.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
         } elseif (count(HelperConfig::$secrets['admin_users'])) {
81 81
 
82 82
             if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION'])) { // fix for php cgi mode
83
-                list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = explode(':' , base64_decode(substr($_SERVER['REDIRECT_HTTP_AUTHORIZATION'], 6)));
83
+                list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = explode(':', base64_decode(substr($_SERVER['REDIRECT_HTTP_AUTHORIZATION'], 6)));
84 84
             }
85 85
 
86 86
             if (isset($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'])) {
@@ -96,12 +96,12 @@  discard block
 block discarded – undo
96 96
             }
97 97
 
98 98
             if (!$validated) {
99
-                header('WWW-Authenticate: Basic realm="' . HelperConfig::$secrets['admin_authrealm'] . '"');
99
+                header('WWW-Authenticate: Basic realm="'.HelperConfig::$secrets['admin_authrealm'].'"');
100 100
                 header('HTTP/1.0 401 Unauthorized');
101 101
                 die('Not authorized');
102 102
             }
103 103
         } else {
104
-            header('WWW-Authenticate: Basic realm="' . HelperConfig::$secrets['admin_authrealm'] . '"');
104
+            header('WWW-Authenticate: Basic realm="'.HelperConfig::$secrets['admin_authrealm'].'"');
105 105
             header('HTTP/1.0 401 Unauthorized');
106 106
             die('Not authorized');
107 107
         }
Please login to merge, or discard this patch.
src/Controller/Admin/Shop/Itemadmin.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
                         if ($iRows > 0) {
135 135
                             $aErr['itemnoalreadytaken'] = true;
136 136
                         } else {
137
-                            $aData = ['itm_no' => trim(\filter_input(INPUT_POST, 'itemno', FILTER_SANITIZE_SPECIAL_CHARS)),];
137
+                            $aData = ['itm_no' => trim(\filter_input(INPUT_POST, 'itemno', FILTER_SANITIZE_SPECIAL_CHARS)), ];
138 138
                             $sql = DBTools::buildInsertQuery($aData, 'item_base');
139 139
                             $this->db->exec($sql);
140 140
                             $iInsertID = $this->db->lastInsertId();
@@ -242,10 +242,10 @@  discard block
 block discarded – undo
242 242
     private function admin_prepareItemlist($aItemlist)
243 243
     {
244 244
         $aList = [
245
-            ['title' => HardcodedText::get('itemadmin_list_active'), 'key' => 'itemindex', 'width' => 30, 'linked' => false, 'callback' => 'renderItemStatusIcon',],
246
-            ['title' => HardcodedText::get('itemadmin_list_itemno'), 'key' => 'itemno', 'width' => 100, 'linked' => false,],
247
-            ['title' => HardcodedText::get('itemadmin_list_name'), 'key' => 'name', 'width' => 350, 'linked' => false,],
248
-            ['title' => HardcodedText::get('itemadmin_list_edit'), 'key' => 'itemno', 'width' => 30, 'linked' => true, 'ltarget' => '/_admin/itemadmin.html', 'lkeyname' => 'itemno', 'lgetvars' => ['action' => 'showitem'],],
245
+            ['title' => HardcodedText::get('itemadmin_list_active'), 'key' => 'itemindex', 'width' => 30, 'linked' => false, 'callback' => 'renderItemStatusIcon', ],
246
+            ['title' => HardcodedText::get('itemadmin_list_itemno'), 'key' => 'itemno', 'width' => 100, 'linked' => false, ],
247
+            ['title' => HardcodedText::get('itemadmin_list_name'), 'key' => 'name', 'width' => 350, 'linked' => false, ],
248
+            ['title' => HardcodedText::get('itemadmin_list_edit'), 'key' => 'itemno', 'width' => 30, 'linked' => true, 'ltarget' => '/_admin/itemadmin.html', 'lkeyname' => 'itemno', 'lgetvars' => ['action' => 'showitem'], ],
249 249
         ];
250 250
         $aData = [];
251 251
         foreach ($aItemlist['data'] as $aValue) {
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
     private function admin_prepareItem($aItemdata)
302 302
     {
303 303
         $aData = [
304
-            'form' => ['action' => Tools::makeLinkHRefWithAddedGetVars('/_admin/itemadmin.html', ['action' => 'showitem', 'itemno' => $aItemdata['base']['itm_no']]),],
304
+            'form' => ['action' => Tools::makeLinkHRefWithAddedGetVars('/_admin/itemadmin.html', ['action' => 'showitem', 'itemno' => $aItemdata['base']['itm_no']]), ],
305 305
             'id' => $aItemdata['base']['itm_id'],
306 306
             'itemno' => $aItemdata['base']['itm_no'],
307 307
             'name' => $aItemdata['base']['itm_name'],
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
         $aGroups = $this->admin_getItemgroups('');
333 333
         $aData['groupoptions'][] = '';
334 334
         foreach ($aGroups as $aValue) {
335
-            $aData['groupoptions'][] = $aValue['itmg_id'] . '|' . $aValue['itmg_no'] . ' - ' . $aValue['itmg_name'];
335
+            $aData['groupoptions'][] = $aValue['itmg_id'].'|'.$aValue['itmg_no'].' - '.$aValue['itmg_name'];
336 336
         }
337 337
         unset($aGroups);
338 338
 
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
374 374
         $sql = DBTools::buildPSUpdateQuery($aData, 'item_base', 'itm_id');
375 375
         $hResult = $this->db->prepare($sql);
376 376
         foreach ($aData as $sKey => $sValue) {
377
-            $hResult->bindValue(':' . $sKey, $sValue);
377
+            $hResult->bindValue(':'.$sKey, $sValue);
378 378
         }
379 379
         $hResult->execute();
380 380
         if (isset($this->post['textid'])) {
@@ -387,7 +387,7 @@  discard block
 block discarded – undo
387 387
             $sql = DBTools::buildPSUpdateQuery($aData, 'item_lang', 'itml_id');
388 388
             $hResult = $this->db->prepare($sql);
389 389
             foreach ($aData as $sKey => $sValue) {
390
-                $hResult->bindValue(':' . $sKey, $sValue);
390
+                $hResult->bindValue(':'.$sKey, $sValue);
391 391
             }
392 392
             $hResult->execute();
393 393
         }
Please login to merge, or discard this patch.
src/Controller/Admin/Shop/Shopadmin.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -94,12 +94,12 @@  discard block
 block discarded – undo
94 94
         $CSA = [
95 95
             'list_orders' => [
96 96
                 ['title' => '', 'key' => 'o_id', 'width' => 30, 'linked' => false, 'callback' => 'shopadminMakeCheckbox'],
97
-                ['title' => HardcodedText::get('shopadmin_list_orderid'), 'key' => 'o_id', 'width' => 30, 'linked' => false,],
98
-                ['title' => HardcodedText::get('shopadmin_list_customer'), 'key' => 'o_cust', 'width' => 280, 'linked' => false,],
99
-                ['title' => HardcodedText::get('shopadmin_list_sumnettoall'), 'key' => 'o_sumnettoall', 'width' => 75, 'linked' => false,],
100
-                ['title' => HardcodedText::get('shopadmin_list_orderstatus'), 'key' => 'o_order_status', 'width' => 80, 'linked' => false,],
101
-                ['title' => HardcodedText::get('shopadmin_list_ordertimenumber'), 'key' => 'o_ordertime_number', 'width' => 100, 'linked' => false,],
102
-                ['title' => HardcodedText::get('shopadmin_list_hostpayment'), 'key' => 'o_order_host_payment', 'width' => 140, 'linked' => false,],
97
+                ['title' => HardcodedText::get('shopadmin_list_orderid'), 'key' => 'o_id', 'width' => 30, 'linked' => false, ],
98
+                ['title' => HardcodedText::get('shopadmin_list_customer'), 'key' => 'o_cust', 'width' => 280, 'linked' => false, ],
99
+                ['title' => HardcodedText::get('shopadmin_list_sumnettoall'), 'key' => 'o_sumnettoall', 'width' => 75, 'linked' => false, ],
100
+                ['title' => HardcodedText::get('shopadmin_list_orderstatus'), 'key' => 'o_order_status', 'width' => 80, 'linked' => false, ],
101
+                ['title' => HardcodedText::get('shopadmin_list_ordertimenumber'), 'key' => 'o_ordertime_number', 'width' => 100, 'linked' => false, ],
102
+                ['title' => HardcodedText::get('shopadmin_list_hostpayment'), 'key' => 'o_order_host_payment', 'width' => 140, 'linked' => false, ],
103 103
                 [
104 104
                     'title' => HardcodedText::get('shopadmin_list_edit'),
105 105
                     'key' => 'o_id',
@@ -113,11 +113,11 @@  discard block
 block discarded – undo
113 113
                 ],
114 114
             ],
115 115
             'list_orderitems' => [
116
-                ['title' => HardcodedText::get('shopadmin_list_itemno'), 'key' => 'oi_itemno', 'width' => 95, 'linked' => false,],
117
-                ['title' => HardcodedText::get('shopadmin_list_itemname'), 'key' => 'oi_itemname', 'width' => 350, 'linked' => false,],
118
-                ['title' => HardcodedText::get('shopadmin_list_itemamount'), 'key' => 'oi_amount', 'width' => 50, 'linked' => false, 'style-data' => 'text-align: center;',],
119
-                ['title' => HardcodedText::get('shopadmin_list_itemnetto'), 'key' => 'oi_price_netto', 'width' => 70, 'linked' => false,],
120
-                ['title' => HardcodedText::get('shopadmin_list_itemsumnetto'), 'key' => 'ges_netto', 'width' => 75, 'linked' => false,],
116
+                ['title' => HardcodedText::get('shopadmin_list_itemno'), 'key' => 'oi_itemno', 'width' => 95, 'linked' => false, ],
117
+                ['title' => HardcodedText::get('shopadmin_list_itemname'), 'key' => 'oi_itemname', 'width' => 350, 'linked' => false, ],
118
+                ['title' => HardcodedText::get('shopadmin_list_itemamount'), 'key' => 'oi_amount', 'width' => 50, 'linked' => false, 'style-data' => 'text-align: center;', ],
119
+                ['title' => HardcodedText::get('shopadmin_list_itemnetto'), 'key' => 'oi_price_netto', 'width' => 70, 'linked' => false, ],
120
+                ['title' => HardcodedText::get('shopadmin_list_itemsumnetto'), 'key' => 'ges_netto', 'width' => 75, 'linked' => false, ],
121 121
             ],
122 122
         ];
123 123
 
@@ -220,8 +220,8 @@  discard block
 block discarded – undo
220 220
                     } else {
221 221
                         $sZahlungsmethode = '<span style="color: red;">';
222 222
                     }
223
-                    $mZahlungsmethode = $this->serviceManager->get('textcats')->T('order_paymentmethod_' .$aRow['o_paymentmethod'], true);
224
-                    if ($mZahlungsmethode ) {
223
+                    $mZahlungsmethode = $this->serviceManager->get('textcats')->T('order_paymentmethod_'.$aRow['o_paymentmethod'], true);
224
+                    if ($mZahlungsmethode) {
225 225
                         $sZahlungsmethode .= $mZahlungsmethode;
226 226
                     } else {
227 227
                         $sZahlungsmethode .= ucwords($aRow['o_paymentmethod']);
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
265 265
                     ];
266 266
                     if (!($bIgnoreStorno && $aRow['o_ordercompleted'] === 's')) {
267 267
                         $fGesamtnetto += $aRow['o_sumnettoall'];
268
-                        $j ++;
268
+                        $j++;
269 269
                     } else {
270 270
                         $k++;
271 271
                     }
Please login to merge, or discard this patch.
src/Controller/Admin/Phpinfo.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
         $html .= implode("\n",
44 44
             array_map(
45 45
                 function($i) {
46
-                    return '.phpinfodisplay ' . preg_replace( '/,/', ',.phpinfodisplay ', $i );
46
+                    return '.phpinfodisplay '.preg_replace('/,/', ',.phpinfodisplay ', $i);
47 47
                 },
48 48
                 preg_split('/\n/', $matches[1])
49 49
             )
Please login to merge, or discard this patch.