Completed
Push — master ( 0359c5...34a292 )
by Marcus
05:05
created
src/Controller/Admin/DBStatus.php 1 patch
Spacing   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -88,10 +88,10 @@  discard block
 block discarded – undo
88 88
         $this->P->cb_customdata['rows_textcat_lang'] = $hResult->rowCount();
89 89
         if ($this->P->cb_customdata['rows_textcat_lang'] > 0) {
90 90
             $aListSetting = [
91
-                ['title' => 'tcl_id', 'key' => 'tcl_id', 'width' => '6%', 'linked' => false,],
92
-                ['title' => 'tcl_tcid', 'key' => 'tcl_tcid', 'width' => '6%', 'linked' => false,],
93
-                ['title' => 'tcl_lang', 'key' => 'tcl_lang', 'width' => '6%', 'linked' => false,],
94
-                ['title' => 'tcl_text', 'key' => 'tcl_text', 'width' => '82%', 'linked' => false, 'escapehtmlspecialchars' => true,],
91
+                ['title' => 'tcl_id', 'key' => 'tcl_id', 'width' => '6%', 'linked' => false, ],
92
+                ['title' => 'tcl_tcid', 'key' => 'tcl_tcid', 'width' => '6%', 'linked' => false, ],
93
+                ['title' => 'tcl_lang', 'key' => 'tcl_lang', 'width' => '6%', 'linked' => false, ],
94
+                ['title' => 'tcl_text', 'key' => 'tcl_text', 'width' => '82%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
95 95
             ];
96 96
             $aData = $hResult->fetchAll();
97 97
             $this->P->cb_customdata['rows_textcat_lang_list'] = Tools::makeListtable(
@@ -115,12 +115,12 @@  discard block
 block discarded – undo
115 115
         $this->P->cb_customdata['rows_textcat_lang_archive'] = $hResult->rowCount();
116 116
         if ($this->P->cb_customdata['rows_textcat_lang_archive'] > 0) {
117 117
             $aListSetting = [
118
-                ['title' => 'tcla_timestamp', 'key' => 'tcla_timestamp', 'width' => '15%', 'linked' => false,],
119
-                ['title' => 'tcla_id', 'key' => 'tcla_id', 'width' => '6%', 'linked' => false,],
120
-                ['title' => 'tcl_id', 'key' => 'tcl_id', 'width' => '6%', 'linked' => false,],
121
-                ['title' => 'tcl_tcid', 'key' => 'tcl_tcid', 'width' => '6%', 'linked' => false,],
122
-                ['title' => 'tcl_lang', 'key' => 'tcl_lang', 'width' => '6%', 'linked' => false,],
123
-                ['title' => 'tcl_text', 'key' => 'tcl_text', 'width' => '61%', 'linked' => false, 'escapehtmlspecialchars' => true,],
118
+                ['title' => 'tcla_timestamp', 'key' => 'tcla_timestamp', 'width' => '15%', 'linked' => false, ],
119
+                ['title' => 'tcla_id', 'key' => 'tcla_id', 'width' => '6%', 'linked' => false, ],
120
+                ['title' => 'tcl_id', 'key' => 'tcl_id', 'width' => '6%', 'linked' => false, ],
121
+                ['title' => 'tcl_tcid', 'key' => 'tcl_tcid', 'width' => '6%', 'linked' => false, ],
122
+                ['title' => 'tcl_lang', 'key' => 'tcl_lang', 'width' => '6%', 'linked' => false, ],
123
+                ['title' => 'tcl_text', 'key' => 'tcl_text', 'width' => '61%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
124 124
             ];
125 125
             $aData = $hResult->fetchAll();
126 126
             $this->P->cb_customdata['rows_textcat_lang_archive_list'] = Tools::makeListtable($aListSetting,
@@ -141,13 +141,13 @@  discard block
 block discarded – undo
141 141
         $this->P->cb_customdata['rows_content_lang'] = $hResult->rowCount();
142 142
         if ($this->P->cb_customdata['rows_content_lang'] > 0) {
143 143
             $aListSetting = [
144
-                ['title' => 'cl_id', 'key' => 'cl_id', 'width' => '6%', 'linked' => false,],
145
-                ['title' => 'cl_cb', 'key' => 'cl_cb', 'width' => '6%', 'linked' => false,],
146
-                ['title' => 'cl_lang', 'key' => 'cl_lang', 'width' => '6%', 'linked' => false,],
147
-                ['title' => 'cl_html', 'key' => 'cl_html', 'width' => '43%', 'linked' => false, 'escapehtmlspecialchars' => true,],
148
-                ['title' => 'cl_keywords', 'key' => 'cl_keywords', 'width' => '13%', 'linked' => false, 'escapehtmlspecialchars' => true,],
149
-                ['title' => 'cl_description', 'key' => 'cl_description', 'width' => '13%', 'linked' => false, 'escapehtmlspecialchars' => true,],
150
-                ['title' => 'cl_title', 'key' => 'cl_title', 'width' => '13%', 'linked' => false, 'escapehtmlspecialchars' => true,],
144
+                ['title' => 'cl_id', 'key' => 'cl_id', 'width' => '6%', 'linked' => false, ],
145
+                ['title' => 'cl_cb', 'key' => 'cl_cb', 'width' => '6%', 'linked' => false, ],
146
+                ['title' => 'cl_lang', 'key' => 'cl_lang', 'width' => '6%', 'linked' => false, ],
147
+                ['title' => 'cl_html', 'key' => 'cl_html', 'width' => '43%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
148
+                ['title' => 'cl_keywords', 'key' => 'cl_keywords', 'width' => '13%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
149
+                ['title' => 'cl_description', 'key' => 'cl_description', 'width' => '13%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
150
+                ['title' => 'cl_title', 'key' => 'cl_title', 'width' => '13%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
151 151
             ];
152 152
             $aData = $hResult->fetchAll();
153 153
             $this->P->cb_customdata['rows_content_lang_list'] = Tools::makeListtable($aListSetting,
@@ -168,15 +168,15 @@  discard block
 block discarded – undo
168 168
         $this->P->cb_customdata['rows_content_lang_archive'] = $hResult->rowCount();
169 169
         if ($this->P->cb_customdata['rows_content_lang_archive'] > 0) {
170 170
             $aListSetting = [
171
-                ['title' => 'cla_timestamp', 'key' => 'cla_timestamp', 'width' => '15%', 'linked' => false,],
172
-                ['title' => 'cla_id', 'key' => 'cla_id', 'width' => '6%', 'linked' => false,],
173
-                ['title' => 'cl_id', 'key' => 'cl_id', 'width' => '6%', 'linked' => false,],
174
-                ['title' => 'cl_cb', 'key' => 'cl_cb', 'width' => '6%', 'linked' => false,],
175
-                ['title' => 'cl_lang', 'key' => 'cl_lang', 'width' => '6%', 'linked' => false,],
176
-                ['title' => 'cl_html', 'key' => 'cl_html', 'width' => '33%', 'linked' => false, 'escapehtmlspecialchars' => true,],
177
-                ['title' => 'cl_keywords', 'key' => 'cl_keywords', 'width' => '10%', 'linked' => false, 'escapehtmlspecialchars' => true,],
178
-                ['title' => 'cl_description', 'key' => 'cl_description', 'width' => '10%', 'linked' => false, 'escapehtmlspecialchars' => true,],
179
-                ['title' => 'cl_title', 'key' => 'cl_title', 'width' => '10%', 'linked' => false, 'escapehtmlspecialchars' => true,],
171
+                ['title' => 'cla_timestamp', 'key' => 'cla_timestamp', 'width' => '15%', 'linked' => false, ],
172
+                ['title' => 'cla_id', 'key' => 'cla_id', 'width' => '6%', 'linked' => false, ],
173
+                ['title' => 'cl_id', 'key' => 'cl_id', 'width' => '6%', 'linked' => false, ],
174
+                ['title' => 'cl_cb', 'key' => 'cl_cb', 'width' => '6%', 'linked' => false, ],
175
+                ['title' => 'cl_lang', 'key' => 'cl_lang', 'width' => '6%', 'linked' => false, ],
176
+                ['title' => 'cl_html', 'key' => 'cl_html', 'width' => '33%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
177
+                ['title' => 'cl_keywords', 'key' => 'cl_keywords', 'width' => '10%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
178
+                ['title' => 'cl_description', 'key' => 'cl_description', 'width' => '10%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
179
+                ['title' => 'cl_title', 'key' => 'cl_title', 'width' => '10%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
180 180
             ];
181 181
             $aData = $hResult->fetchAll();
182 182
             $this->P->cb_customdata['rows_content_lang_archive_list'] = Tools::makeListtable($aListSetting,
@@ -197,9 +197,9 @@  discard block
 block discarded – undo
197 197
         $this->P->cb_customdata['rows_item_lang'] = $hResult->rowCount();
198 198
         if ($this->P->cb_customdata['rows_item_lang'] > 0) {
199 199
             $aListSetting = [
200
-                ['title' => 'itml_id', 'key' => 'itml_id', 'width' => '6%', 'linked' => false,],
201
-                ['title' => 'itml_pid', 'key' => 'itml_pid', 'width' => '6%', 'linked' => false,],
202
-                ['title' => 'itml_lang', 'key' => 'itml_lang', 'width' => '6%', 'linked' => false,],
200
+                ['title' => 'itml_id', 'key' => 'itml_id', 'width' => '6%', 'linked' => false, ],
201
+                ['title' => 'itml_pid', 'key' => 'itml_pid', 'width' => '6%', 'linked' => false, ],
202
+                ['title' => 'itml_lang', 'key' => 'itml_lang', 'width' => '6%', 'linked' => false, ],
203 203
                 [
204 204
                     'title' => 'itml_name_override',
205 205
                     'key' => 'itml_name_override',
@@ -241,9 +241,9 @@  discard block
 block discarded – undo
241 241
         $this->P->cb_customdata['rows_itemgroups_text'] = $hResult->rowCount();
242 242
         if ($this->P->cb_customdata['rows_itemgroups_text'] > 0) {
243 243
             $aListSetting = [
244
-                ['title' => 'itmgt_id', 'key' => 'itmgt_id', 'width' => '6%', 'linked' => false,],
245
-                ['title' => 'itmgt_pid', 'key' => 'itmgt_pid', 'width' => '6%', 'linked' => false,],
246
-                ['title' => 'itmgt_lang', 'key' => 'itmgt_lang', 'width' => '6%', 'linked' => false,],
244
+                ['title' => 'itmgt_id', 'key' => 'itmgt_id', 'width' => '6%', 'linked' => false, ],
245
+                ['title' => 'itmgt_pid', 'key' => 'itmgt_pid', 'width' => '6%', 'linked' => false, ],
246
+                ['title' => 'itmgt_lang', 'key' => 'itmgt_lang', 'width' => '6%', 'linked' => false, ],
247 247
                 [
248 248
                     'title' => 'itmgt_shorttext',
249 249
                     'key' => 'itmgt_shorttext',
@@ -278,17 +278,17 @@  discard block
 block discarded – undo
278 278
         $this->P->cb_customdata['rows_orders_items'] = $hResult->rowCount();
279 279
         if ($this->P->cb_customdata['rows_orders_items'] > 0) {
280 280
             $aListSetting = [
281
-                ['title' => 'oi_id', 'key' => 'oi_id', 'width' => '8%', 'linked' => false,],
282
-                ['title' => 'oi_o_id', 'key' => 'oi_o_id', 'width' => '9%', 'linked' => false,],
283
-                ['title' => 'oi_cartkey', 'key' => 'oi_cartkey', 'width' => '13%', 'linked' => false,],
284
-                ['title' => 'oi_amount', 'key' => 'oi_amount', 'width' => '9%', 'linked' => false,],
285
-                ['title' => 'oi_vat', 'key' => 'oi_vat', 'width' => '8%', 'linked' => false,],
286
-                ['title' => 'oi_rg', 'key' => 'oi_rg', 'width' => '8%', 'linked' => false,],
287
-                ['title' => 'oi_rg_rebate', 'key' => 'oi_rg_rebate', 'width' => '9%', 'linked' => false,],
288
-                ['title' => 'oi_price_netto_list',  'key' => 'oi_price_netto_list', 'width' => '9%', 'linked' => false,],
289
-                ['title' => 'oi_price_netto_sale', 'key' => 'oi_price_netto_sale', 'width' => '9%', 'linked' => false,],
290
-                ['title' => 'oi_price_netto_rebated', 'key' => 'oi_price_netto_rebated', 'width' => '9%', 'linked' => false,],
291
-                ['title' => 'oi_price_brutto_use', 'key' => 'oi_price_brutto_use', 'width' => '9%', 'linked' => false,],
281
+                ['title' => 'oi_id', 'key' => 'oi_id', 'width' => '8%', 'linked' => false, ],
282
+                ['title' => 'oi_o_id', 'key' => 'oi_o_id', 'width' => '9%', 'linked' => false, ],
283
+                ['title' => 'oi_cartkey', 'key' => 'oi_cartkey', 'width' => '13%', 'linked' => false, ],
284
+                ['title' => 'oi_amount', 'key' => 'oi_amount', 'width' => '9%', 'linked' => false, ],
285
+                ['title' => 'oi_vat', 'key' => 'oi_vat', 'width' => '8%', 'linked' => false, ],
286
+                ['title' => 'oi_rg', 'key' => 'oi_rg', 'width' => '8%', 'linked' => false, ],
287
+                ['title' => 'oi_rg_rebate', 'key' => 'oi_rg_rebate', 'width' => '9%', 'linked' => false, ],
288
+                ['title' => 'oi_price_netto_list', 'key' => 'oi_price_netto_list', 'width' => '9%', 'linked' => false, ],
289
+                ['title' => 'oi_price_netto_sale', 'key' => 'oi_price_netto_sale', 'width' => '9%', 'linked' => false, ],
290
+                ['title' => 'oi_price_netto_rebated', 'key' => 'oi_price_netto_rebated', 'width' => '9%', 'linked' => false, ],
291
+                ['title' => 'oi_price_brutto_use', 'key' => 'oi_price_brutto_use', 'width' => '9%', 'linked' => false, ],
292 292
                 //['title' => 'oi_img', 'key' => 'oi_img', 'width' => '41%', 'linked' => false, 'escapehtmlspecialchars' => true,],
293 293
 
294 294
             ];
Please login to merge, or discard this patch.
src/Controller/Admin/Pageadmin.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -223,11 +223,11 @@
 block discarded – undo
223 223
 
224 224
                 if ($iArchivedRows > 0) {
225 225
                     $aListSetting = [
226
-                        ['title' => 'cla_timestamp', 'key' => 'cla_timestamp', 'width' => '15%', 'linked' => false,],
227
-                        ['title' => 'cl_html', 'key' => 'cl_html', 'width' => '40%', 'linked' => false, 'escapehtmlspecialchars' => true,],
228
-                        ['title' => 'cl_keywords', 'key' => 'cl_keywords', 'width' => '15%', 'linked' => false, 'escapehtmlspecialchars' => true,],
229
-                        ['title' => 'cl_description', 'key' => 'cl_description', 'width' => '15%', 'linked' => false, 'escapehtmlspecialchars' => true,],
230
-                        ['title' => 'cl_title', 'key' => 'cl_title', 'width' => '15%', 'linked' => false, 'escapehtmlspecialchars' => true,],
226
+                        ['title' => 'cla_timestamp', 'key' => 'cla_timestamp', 'width' => '15%', 'linked' => false, ],
227
+                        ['title' => 'cl_html', 'key' => 'cl_html', 'width' => '40%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
228
+                        ['title' => 'cl_keywords', 'key' => 'cl_keywords', 'width' => '15%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
229
+                        ['title' => 'cl_description', 'key' => 'cl_description', 'width' => '15%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
230
+                        ['title' => 'cl_title', 'key' => 'cl_title', 'width' => '15%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
231 231
                     ];
232 232
                     $aData = $statement->fetchAll();
233 233
                     $this->P->cb_customdata['archived_list'] = \HaaseIT\Toolbox\Tools::makeListtable(
Please login to merge, or discard this patch.
src/Controller/Customer/Register.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@
 block discarded – undo
100 100
                             ->setParameter(':cust_email', $sEmail)
101 101
                             ->setParameter(':cust_corp', filter_var(trim(Tools::getFormfield('corpname')), FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW))
102 102
                             ->setParameter(':cust_name', filter_var(trim(Tools::getFormfield('name')), FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW))
103
-                            ->setParameter(':cust_street', filter_var(trim(Tools::getFormfield('street')),FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW))
103
+                            ->setParameter(':cust_street', filter_var(trim(Tools::getFormfield('street')), FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW))
104 104
                             ->setParameter(':cust_zip', filter_var(trim(Tools::getFormfield('zip')), FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW))
105 105
                             ->setParameter(':cust_town', filter_var(trim(Tools::getFormfield('town')), FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW))
106 106
                             ->setParameter(':cust_phone', filter_var(trim(Tools::getFormfield('phone')), FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW))
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
@@ -118,7 +118,7 @@
 block discarded – undo
118 118
                     $sTargetAddress = $aResult['cust_email'];
119 119
                     $sSubject = $this->textcats->T('forgotpw_mail_subject');
120 120
                     $sMessage = $this->textcats->T('forgotpw_mail_text1');
121
-                    $sMessage .= '<br><br>' .'<a href="http'.($serverhttps === 'on' ? 's' : '').'://';
121
+                    $sMessage .= '<br><br>'.'<a href="http'.($serverhttps === 'on' ? 's' : '').'://';
122 122
                     $sMessage .= $serverservername.'/_misc/rp.html?key='.$sResetCode.'&amp;email='.$sTargetAddress.'">';
123 123
                     $sMessage .= 'http'.($serverhttps === 'on' ? 's' : '').'://';
124 124
                     $sMessage .= $serverservername.'/_misc/rp.html?key='.$sResetCode.'&amp;email='.$sTargetAddress.'</a>';
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/Customer/Login.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
         $hResult->execute();
111 111
 
112 112
         $iRows = $hResult->rowCount();
113
-        if($iRows == 1) {
113
+        if ($iRows == 1) {
114 114
             $aRow = $hResult->fetch();
115 115
 
116 116
             if (password_verify(filter_input(INPUT_POST, 'password'), $aRow['cust_password'])) {
@@ -120,9 +120,9 @@  discard block
 block discarded – undo
120 120
                 } elseif ($aRow['cust_tosaccepted'] === 'n') {
121 121
                     return ['status' => 'tosnotaccepted'];
122 122
                 } elseif ($aRow['cust_emailverified'] === 'n') {
123
-                    return ['status' => 'emailnotverified', 'data' => $aRow,];
123
+                    return ['status' => 'emailnotverified', 'data' => $aRow, ];
124 124
                 } elseif ($aRow['cust_active'] === 'n') {
125
-                    return ['status' => 'accountinactive',];
125
+                    return ['status' => 'accountinactive', ];
126 126
                 }
127 127
             }
128 128
         }
Please login to merge, or discard this patch.
src/Controller/Shop/Updatecart.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -174,7 +174,7 @@
 block discarded – undo
174 174
             }
175 175
             echo $this->serviceManager->get('twig')->render('shop/update-cart.twig', $aAR);
176 176
         } else {
177
-            $aMSG['msg'] =  $sReply;
177
+            $aMSG['msg'] = $sReply;
178 178
             if (count($aMore)) {
179 179
                 $aMSG = array_merge($aMSG, $aMore);
180 180
             }
Please login to merge, or discard this patch.
src/Controller/Base.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -117,7 +117,7 @@
 block discarded – undo
117 117
             $user = filter_input(INPUT_SERVER, 'PHP_AUTH_USER');
118 118
             $pass = filter_input(INPUT_SERVER, 'PHP_AUTH_PW');
119 119
             if (filter_input(INPUT_SERVER, 'REDIRECT_HTTP_AUTHORIZATION') !== null) { // fix for php cgi mode
120
-                list($user, $pass) = explode(':' , base64_decode(substr(filter_input(INPUT_SERVER, 'REDIRECT_HTTP_AUTHORIZATION'), 6)));
120
+                list($user, $pass) = explode(':', base64_decode(substr(filter_input(INPUT_SERVER, 'REDIRECT_HTTP_AUTHORIZATION'), 6)));
121 121
             }
122 122
 
123 123
             if (!empty($user) && !empty($pass)) {
Please login to merge, or discard this patch.
src/Shop/Helper.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -449,12 +449,12 @@
 block discarded – undo
449 449
                 }
450 450
                 // because array_rand will change numerical (string) values to integer, we have to do this awkward dance
451 451
                 foreach ($keysAddSuggsTMP as $key => $item) {
452
-                    $keysAddSuggs[] = (string)$item;
452
+                    $keysAddSuggs[] = (string) $item;
453 453
                 }
454 454
 
455 455
                 // iterate suggestions and remove those that which will not be kept
456 456
                 foreach ($suggestions['additional'] as $addSuggsKey => $addSuggsVal) {
457
-                    if (!in_array((string)$addSuggsKey, $keysAddSuggs, true)) {
457
+                    if (!in_array((string) $addSuggsKey, $keysAddSuggs, true)) {
458 458
                         unset($suggestions['additional'][$addSuggsKey]);
459 459
                     }
460 460
                 }
Please login to merge, or discard this patch.