@@ -42,24 +42,24 @@ |
||
42 | 42 | |
43 | 43 | header('Content-Type: text/html; charset=UTF-8'); |
44 | 44 | $return = '<div>'; |
45 | - $return .= '<div id="shippingcostbrutto_new">' . number_format($_SESSION['cartpricesums']['fVersandkostenbrutto'], |
|
45 | + $return .= '<div id="shippingcostbrutto_new">'.number_format($_SESSION['cartpricesums']['fVersandkostenbrutto'], |
|
46 | 46 | HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'], |
47 | - HelperConfig::$core['numberformat_thousands_seperator']) . '</div>'; |
|
48 | - $return .= '<div id="vatfull_new">' . number_format(round($_SESSION['cartpricesums']['fSteuervoll'], 2), |
|
47 | + HelperConfig::$core['numberformat_thousands_seperator']).'</div>'; |
|
48 | + $return .= '<div id="vatfull_new">'.number_format(round($_SESSION['cartpricesums']['fSteuervoll'], 2), |
|
49 | 49 | HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'], |
50 | - HelperConfig::$core['numberformat_thousands_seperator']) . '</div>'; |
|
51 | - $return .= '<div id="totalbrutto_new">' . number_format(round($_SESSION['cartpricesums']['fGesamtbrutto'], 2), |
|
50 | + HelperConfig::$core['numberformat_thousands_seperator']).'</div>'; |
|
51 | + $return .= '<div id="totalbrutto_new">'.number_format(round($_SESSION['cartpricesums']['fGesamtbrutto'], 2), |
|
52 | 52 | HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'], |
53 | - HelperConfig::$core['numberformat_thousands_seperator']) . '</div>'; |
|
54 | - $return .= '<div id="shippingcostnetto_new">' . number_format($_SESSION['cartpricesums']['fVersandkostennetto'], |
|
53 | + HelperConfig::$core['numberformat_thousands_seperator']).'</div>'; |
|
54 | + $return .= '<div id="shippingcostnetto_new">'.number_format($_SESSION['cartpricesums']['fVersandkostennetto'], |
|
55 | 55 | HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'], |
56 | - HelperConfig::$core['numberformat_thousands_seperator']) . '</div>'; |
|
57 | - $return .= '<div id="vatreduced_new">' . number_format(round($_SESSION['cartpricesums']['fSteuererm'], 2), |
|
56 | + HelperConfig::$core['numberformat_thousands_seperator']).'</div>'; |
|
57 | + $return .= '<div id="vatreduced_new">'.number_format(round($_SESSION['cartpricesums']['fSteuererm'], 2), |
|
58 | 58 | HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'], |
59 | - HelperConfig::$core['numberformat_thousands_seperator']) . '</div>'; |
|
60 | - $return .= '<div id="totalnetto_new">' . number_format(round($_SESSION['cartpricesums']['fGesamtnetto'], 2), |
|
59 | + HelperConfig::$core['numberformat_thousands_seperator']).'</div>'; |
|
60 | + $return .= '<div id="totalnetto_new">'.number_format(round($_SESSION['cartpricesums']['fGesamtnetto'], 2), |
|
61 | 61 | HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'], |
62 | - HelperConfig::$core['numberformat_thousands_seperator']) . '</div>'; |
|
62 | + HelperConfig::$core['numberformat_thousands_seperator']).'</div>'; |
|
63 | 63 | $return .= '</div>'; |
64 | 64 | die($return); |
65 | 65 | } |
@@ -32,7 +32,7 @@ |
||
32 | 32 | if (CHelper::getUserData()) { |
33 | 33 | $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T('denied_default'); |
34 | 34 | } else { |
35 | - $sql = 'SELECT ' . DB_ADDRESSFIELDS . ', cust_emailverificationcode FROM customer'; |
|
35 | + $sql = 'SELECT '.DB_ADDRESSFIELDS.', cust_emailverificationcode FROM customer'; |
|
36 | 36 | $sql .= ' WHERE cust_email = :email AND cust_emailverified = \'n\''; |
37 | 37 | |
38 | 38 | /** @var \PDOStatement $hResult */ |
@@ -113,7 +113,7 @@ |
||
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.'&email='.$sTargetAddress.'">'; |
118 | 118 | $sMessage .= 'http'.(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? 's' : '').'://'; |
119 | 119 | $sMessage .= $_SERVER['SERVER_NAME'].'/_misc/rp.html?key='.$sResetCode.'&email='.$sTargetAddress.'</a>'; |
@@ -75,7 +75,7 @@ |
||
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'); |
@@ -83,7 +83,7 @@ discard block |
||
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 |
||
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; |
@@ -51,7 +51,7 @@ discard block |
||
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 |
||
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 |
@@ -80,7 +80,7 @@ discard block |
||
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 |
||
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 | } |
@@ -134,7 +134,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 | } |
@@ -94,12 +94,12 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 | } |