Completed
Push — master ( 8102d3...4de2a2 )
by Marcus
02:31
created
src/Controller/Customer/Resendverificationmail.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
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 */
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/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/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.