Completed
Push — master ( 385681...627cfe )
by Marcus
02:38
created
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.
src/Controller/Admin/Customer/Customeradmin.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -57,11 +57,11 @@  discard block
 block discarded – undo
57 57
         $this->P->cb_subnav = 'admin';
58 58
 
59 59
         $CUA = [
60
-            ['title' => HardcodedText::get('customeradmin_list_no'), 'key' => 'cust_no', 'width' => '16%', 'linked' => false,'stylehead' => 'text-align: left;',],
61
-            ['title' => HardcodedText::get('customeradmin_list_company'), 'key' => 'cust_corp', 'width' => '16%', 'linked' => false,'stylehead' => 'text-align: left;',],
62
-            ['title' => HardcodedText::get('customeradmin_list_name'), 'key' => 'cust_name', 'width' => '16%', 'linked' => false,'stylehead' => 'text-align: left;',],
63
-            ['title' => HardcodedText::get('customeradmin_list_town'), 'key' => 'cust_town', 'width' => '16%', 'linked' => false,'stylehead' => 'text-align: left;',],
64
-            ['title' => HardcodedText::get('customeradmin_list_active'), 'key' => 'cust_active', 'width' => '16%', 'linked' => false,'stylehead' => 'text-align: left;',],
60
+            ['title' => HardcodedText::get('customeradmin_list_no'), 'key' => 'cust_no', 'width' => '16%', 'linked' => false, 'stylehead' => 'text-align: left;', ],
61
+            ['title' => HardcodedText::get('customeradmin_list_company'), 'key' => 'cust_corp', 'width' => '16%', 'linked' => false, 'stylehead' => 'text-align: left;', ],
62
+            ['title' => HardcodedText::get('customeradmin_list_name'), 'key' => 'cust_name', 'width' => '16%', 'linked' => false, 'stylehead' => 'text-align: left;', ],
63
+            ['title' => HardcodedText::get('customeradmin_list_town'), 'key' => 'cust_town', 'width' => '16%', 'linked' => false, 'stylehead' => 'text-align: left;', ],
64
+            ['title' => HardcodedText::get('customeradmin_list_active'), 'key' => 'cust_active', 'width' => '16%', 'linked' => false, 'stylehead' => 'text-align: left;', ],
65 65
             [
66 66
                 'title' => HardcodedText::get('customeradmin_list_edit'),
67 67
                 'key' => 'cust_id',
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
                 'linked' => true,
70 70
                 'ltarget' => '/_admin/customeradmin.html',
71 71
                 'lkeyname' => 'id',
72
-                'lgetvars' => ['action' => 'edit',],
72
+                'lgetvars' => ['action' => 'edit', ],
73 73
             ],
74 74
         ];
75 75
         $aPData = $this->handleCustomerAdmin($CUA, $this->serviceManager->get('twig'));
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
                         $sql = \HaaseIT\Toolbox\DBTools::buildPSUpdateQuery($aData, 'customer', 'cust_id');
162 162
                         $hResult = $this->db->prepare($sql);
163 163
                         foreach ($aData as $sKey => $sValue) {
164
-                            $hResult->bindValue(':' . $sKey, $sValue);
164
+                            $hResult->bindValue(':'.$sKey, $sValue);
165 165
                         }
166 166
                         $hResult->execute();
167 167
                         $aInfo['changeswritten'] = true;
Please login to merge, or discard this patch.
src/Shop/Items.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -163,12 +163,12 @@  discard block
 block discarded – undo
163 163
             if (!$bEnableItemGroups || \trim($aRow['itm_group']) == 0) {
164 164
                 $aAssembly['item'][$aRow['itm_no']] = $aRow;
165 165
             } else {
166
-                if (isset($aAssembly['groups']['ITEMGROUP-' .$aRow['itm_group']])) {
167
-                    $aAssembly['groups']['ITEMGROUP-' .$aRow['itm_group']][$aRow['itm_no']] = $aRow;
166
+                if (isset($aAssembly['groups']['ITEMGROUP-'.$aRow['itm_group']])) {
167
+                    $aAssembly['groups']['ITEMGROUP-'.$aRow['itm_group']][$aRow['itm_no']] = $aRow;
168 168
                 } else {
169
-                    $aAssembly['item']['ITEMGROUP-' .$aRow['itm_group']]['group'] = 'ITEMGROUP-' .$aRow['itm_group'];
170
-                    $aAssembly['groups']['ITEMGROUP-' .$aRow['itm_group']]['ITEMGROUP-DATA'] = $this->getGroupdata($aRow['itm_group']);
171
-                    $aAssembly['groups']['ITEMGROUP-' .$aRow['itm_group']][$aRow['itm_no']] = $aRow;
169
+                    $aAssembly['item']['ITEMGROUP-'.$aRow['itm_group']]['group'] = 'ITEMGROUP-'.$aRow['itm_group'];
170
+                    $aAssembly['groups']['ITEMGROUP-'.$aRow['itm_group']]['ITEMGROUP-DATA'] = $this->getGroupdata($aRow['itm_group']);
171
+                    $aAssembly['groups']['ITEMGROUP-'.$aRow['itm_group']][$aRow['itm_no']] = $aRow;
172 172
                 }
173 173
             }
174 174
         }
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
             $aData['itm_vatid'] = 'full';
210 210
         }
211 211
 
212
-        if(is_numeric($aData['itm_price']) && (float) $aData['itm_price'] > 0) {
212
+        if (is_numeric($aData['itm_price']) && (float) $aData['itm_price'] > 0) {
213 213
             $aPrice['netto_list'] = $aData['itm_price'];
214 214
             $aPrice['brutto_list'] = $this->addVat($aPrice['netto_list'], HelperConfig::$shop['vat'][$aData['itm_vatid']]);
215 215
             if (
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
                         bcdiv(
232 232
                             bcsub(
233 233
                                 '100',
234
-                                (string)HelperConfig::$shop['rebate_groups'][$aData['itm_rg']][CHelper::getUserData('cust_group')]
234
+                                (string) HelperConfig::$shop['rebate_groups'][$aData['itm_rg']][CHelper::getUserData('cust_group')]
235 235
                             ),
236 236
                             '100'
237 237
                         )
@@ -263,7 +263,7 @@  discard block
 block discarded – undo
263 263
                 bcdiv(
264 264
                     bcmul(
265 265
                         $price,
266
-                        (string)$vat
266
+                        (string) $vat
267 267
                     ),
268 268
                     '100'
269 269
                 ),
Please login to merge, or discard this patch.
src/Shop/Helper.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -102,11 +102,11 @@  discard block
 block discarded – undo
102 102
         }
103 103
 
104 104
         if ($aOrder['iMindergebuehr_id'] > 0) {
105
-            $aOrder['fVoll'] += HelperConfig::$shop['reducedorderamountfee' . $aOrder['iMindergebuehr_id']];
106
-            $aOrder['fGesamtnetto'] += HelperConfig::$shop['reducedorderamountfee' . $aOrder['iMindergebuehr_id']];
105
+            $aOrder['fVoll'] += HelperConfig::$shop['reducedorderamountfee'.$aOrder['iMindergebuehr_id']];
106
+            $aOrder['fGesamtnetto'] += HelperConfig::$shop['reducedorderamountfee'.$aOrder['iMindergebuehr_id']];
107 107
             $aOrder['fSteuervoll'] = $aOrder['fVoll'] * $iVATfull / 100;
108 108
             $aOrder['fGesamtbrutto'] = $aOrder['fGesamtnetto'] + $aOrder['fSteuervoll'] + $aOrder['fSteuererm'];
109
-            $aOrder['fMindergebuehr'] = HelperConfig::$shop['reducedorderamountfee' . $aOrder['iMindergebuehr_id']];
109
+            $aOrder['fMindergebuehr'] = HelperConfig::$shop['reducedorderamountfee'.$aOrder['iMindergebuehr_id']];
110 110
         }
111 111
 
112 112
         $aOrder['fVersandkosten'] = 0;
@@ -423,12 +423,12 @@  discard block
 block discarded – undo
423 423
                 }
424 424
                 // because array_rand will change numerical (string) values to integer, we have to do this awkward dance
425 425
                 foreach ($keysAddSuggsTMP as $key => $item) {
426
-                    $keysAddSuggs[] = (string)$item;
426
+                    $keysAddSuggs[] = (string) $item;
427 427
                 }
428 428
 
429 429
                 // iterate suggestions and remove those that which will not be kept
430 430
                 foreach ($suggestions['additional'] as $addSuggsKey => $addSuggsVal) {
431
-                    if (!in_array((string)$addSuggsKey, $keysAddSuggs, true)) {
431
+                    if (!in_array((string) $addSuggsKey, $keysAddSuggs, true)) {
432 432
                         unset($suggestions['additional'][$addSuggsKey]);
433 433
                     }
434 434
                 }
Please login to merge, or discard this patch.
src/Helper.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -213,7 +213,7 @@
 block discarded – undo
213 213
         }
214 214
 
215 215
         $aP['countrylist'][] = ' | ';
216
-        foreach (HelperConfig::$countries['countries_' .HelperConfig::$lang] as $sKey => $sValue) {
216
+        foreach (HelperConfig::$countries['countries_'.HelperConfig::$lang] as $sKey => $sValue) {
217 217
             $aP['countrylist'][] = $sKey.'|'.$sValue;
218 218
         }
219 219
 
Please login to merge, or discard this patch.