Completed
Push — master ( a1c094...c4d7a3 )
by Marcus
04:19
created
src/Controller/Sandbox.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -88,8 +88,7 @@
 block discarded – undo
88 88
 
89 89
 
90 90
             }
91
-        }
92
-        catch (\Exception $e)
91
+        } catch (\Exception $e)
93 92
         {
94 93
             $html .= \HaaseIT\Toolbox\Tools::debug($e, 'exception', true);
95 94
         }
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
@@ -146,11 +146,11 @@
 block discarded – undo
146 146
                         $iArchivedRows = $hResult->rowCount();
147 147
                         if ($iArchivedRows > 0) {
148 148
                             $aListSetting = [
149
-                                ['title' => 'cla_timestamp', 'key' => 'cla_timestamp', 'width' => '15%', 'linked' => false,],
150
-                                ['title' => 'cl_html', 'key' => 'cl_html', 'width' => '40%', 'linked' => false, 'escapehtmlspecialchars' => true,],
151
-                                ['title' => 'cl_keywords', 'key' => 'cl_keywords', 'width' => '15%', 'linked' => false, 'escapehtmlspecialchars' => true,],
152
-                                ['title' => 'cl_description', 'key' => 'cl_description', 'width' => '15%', 'linked' => false, 'escapehtmlspecialchars' => true,],
153
-                                ['title' => 'cl_title', 'key' => 'cl_title', 'width' => '15%', 'linked' => false, 'escapehtmlspecialchars' => true,],
149
+                                ['title' => 'cla_timestamp', 'key' => 'cla_timestamp', 'width' => '15%', 'linked' => false, ],
150
+                                ['title' => 'cl_html', 'key' => 'cl_html', 'width' => '40%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
151
+                                ['title' => 'cl_keywords', 'key' => 'cl_keywords', 'width' => '15%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
152
+                                ['title' => 'cl_description', 'key' => 'cl_description', 'width' => '15%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
153
+                                ['title' => 'cl_title', 'key' => 'cl_title', 'width' => '15%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
154 154
                             ];
155 155
                             $aData = $hResult->fetchAll();
156 156
                             $this->P->cb_customdata['archived_list'] = \HaaseIT\Toolbox\Tools::makeListtable(
Please login to merge, or discard this patch.
src/Controller/Admin/Customer/Customeradmin.php 2 patches
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
                         }
162 162
                         $sql = \HaaseIT\Toolbox\DBTools::buildPSUpdateQuery($aData, 'customer', 'cust_id');
163 163
                         $hResult = $this->db->prepare($sql);
164
-                        foreach ($aData as $sKey => $sValue) $hResult->bindValue(':' . $sKey, $sValue);
164
+                        foreach ($aData as $sKey => $sValue) $hResult->bindValue(':'.$sKey, $sValue);
165 165
                         $hResult->execute();
166 166
                         $aInfo["changeswritten"] = true;
167 167
                     }
Please login to merge, or discard this patch.
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -161,7 +161,9 @@  discard block
 block discarded – undo
161 161
                         }
162 162
                         $sql = \HaaseIT\Toolbox\DBTools::buildPSUpdateQuery($aData, 'customer', 'cust_id');
163 163
                         $hResult = $this->db->prepare($sql);
164
-                        foreach ($aData as $sKey => $sValue) $hResult->bindValue(':' . $sKey, $sValue);
164
+                        foreach ($aData as $sKey => $sValue) {
165
+                            $hResult->bindValue(':' . $sKey, $sValue);
166
+                        }
165 167
                         $hResult->execute();
166 168
                         $aInfo["changeswritten"] = true;
167 169
                     }
@@ -180,7 +182,9 @@  discard block
 block discarded – undo
180 182
         }
181 183
         $aPData["customeradmin"]["text"] = $return;
182 184
         $aPData["customeradmin"]["type"] = $sType;
183
-        if (isset($aInfo)) $aPData["customeradmin"]["info"] = $aInfo;
185
+        if (isset($aInfo)) {
186
+            $aPData["customeradmin"]["info"] = $aInfo;
187
+        }
184 188
         return $aPData;
185 189
     }
186 190
 
Please login to merge, or discard this patch.
src/Controller/Admin/Phpinfo.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -37,16 +37,16 @@
 block discarded – undo
37 37
 
38 38
         ob_start();
39 39
         phpinfo();
40
-        preg_match ('%<style type="text/css">(.*?)</style>.*?(<body>.*</body>)%s', ob_get_clean(), $matches);
40
+        preg_match('%<style type="text/css">(.*?)</style>.*?(<body>.*</body>)%s', ob_get_clean(), $matches);
41 41
         $html = '<div class=\'phpinfodisplay\'><style type=\'text/css\'>';
42 42
 
43
-        $html .= join( "\n",
43
+        $html .= join("\n",
44 44
             array_map(
45 45
                 create_function(
46 46
                     '$i',
47 47
                     'return ".phpinfodisplay " . preg_replace( "/,/", ",.phpinfodisplay ", $i );'
48 48
                 ),
49
-                preg_split( '/\n/', $matches[1] )
49
+                preg_split('/\n/', $matches[1])
50 50
             )
51 51
         );
52 52
         $html .= '</style>'.$matches[2];
Please login to merge, or discard this patch.
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/Shop/Shopadmin.php 1 patch
Spacing   +13 added lines, -13 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
 
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
                         $sZahlungsmethode = '<span style="color: red;">';
222 222
                     }
223 223
                     $mZahlungsmethode = $this->serviceManager->get('textcats')->T("order_paymentmethod_".$aRow["o_paymentmethod"], true);
224
-                    if ($mZahlungsmethode ) {
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 (!($aRow["o_ordercompleted"] == 's' && $bIgnoreStorno)) {
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/Shop/Itemadmin.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
                         if ($iRows > 0) {
129 129
                             $aErr["itemnoalreadytaken"] = true;
130 130
                         } else {
131
-                            $aData = ['itm_no' => trim(\filter_input(INPUT_POST, 'itemno', FILTER_SANITIZE_SPECIAL_CHARS)),];
131
+                            $aData = ['itm_no' => trim(\filter_input(INPUT_POST, 'itemno', FILTER_SANITIZE_SPECIAL_CHARS)), ];
132 132
                             $sql = DBTools::buildInsertQuery($aData, 'item_base');
133 133
                             $this->db->exec($sql);
134 134
                             $iInsertID = $this->db->lastInsertId();
@@ -229,10 +229,10 @@  discard block
 block discarded – undo
229 229
     private function admin_prepareItemlist($aItemlist)
230 230
     {
231 231
         $aList = [
232
-            ['title' => HardcodedText::get('itemadmin_list_active'), 'key' => 'itemindex', 'width' => 30, 'linked' => false, 'callback' => 'renderItemStatusIcon',],
233
-            ['title' => HardcodedText::get('itemadmin_list_itemno'), 'key' => 'itemno', 'width' => 100, 'linked' => false,],
234
-            ['title' => HardcodedText::get('itemadmin_list_name'), 'key' => 'name', 'width' => 350, 'linked' => false,],
235
-            ['title' => HardcodedText::get('itemadmin_list_edit'), 'key' => 'itemno', 'width' => 30, 'linked' => true, 'ltarget' => '/_admin/itemadmin.html', 'lkeyname' => 'itemno', 'lgetvars' => ['action' => 'showitem'],],
232
+            ['title' => HardcodedText::get('itemadmin_list_active'), 'key' => 'itemindex', 'width' => 30, 'linked' => false, 'callback' => 'renderItemStatusIcon', ],
233
+            ['title' => HardcodedText::get('itemadmin_list_itemno'), 'key' => 'itemno', 'width' => 100, 'linked' => false, ],
234
+            ['title' => HardcodedText::get('itemadmin_list_name'), 'key' => 'name', 'width' => 350, 'linked' => false, ],
235
+            ['title' => HardcodedText::get('itemadmin_list_edit'), 'key' => 'itemno', 'width' => 30, 'linked' => true, 'ltarget' => '/_admin/itemadmin.html', 'lkeyname' => 'itemno', 'lgetvars' => ['action' => 'showitem'], ],
236 236
         ];
237 237
         $aData = [];
238 238
         foreach ($aItemlist["data"] as $aValue) {
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
     private function admin_prepareItem($aItemdata)
289 289
     {
290 290
         $aData = [
291
-            'form' => ['action' => Tools::makeLinkHRefWithAddedGetVars('/_admin/itemadmin.html', ['action' => 'showitem', 'itemno' => $aItemdata["base"]['itm_no']]),],
291
+            'form' => ['action' => Tools::makeLinkHRefWithAddedGetVars('/_admin/itemadmin.html', ['action' => 'showitem', 'itemno' => $aItemdata["base"]['itm_no']]), ],
292 292
             'id' => $aItemdata["base"]['itm_id'],
293 293
             'itemno' => $aItemdata["base"]['itm_no'],
294 294
             'name' => $aItemdata["base"]['itm_name'],
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
         $aGroups = $this->admin_getItemgroups('');
320 320
         $aData["groupoptions"][] = '';
321 321
         foreach ($aGroups as $aValue) {
322
-            $aData["groupoptions"][] = $aValue['itmg_id'] . '|' . $aValue['itmg_no'] . ' - ' . $aValue['itmg_name'];
322
+            $aData["groupoptions"][] = $aValue['itmg_id'].'|'.$aValue['itmg_no'].' - '.$aValue['itmg_name'];
323 323
         }
324 324
         unset($aGroups);
325 325
 
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
361 361
         $sql = DBTools::buildPSUpdateQuery($aData, 'item_base', 'itm_id');
362 362
         $hResult = $this->db->prepare($sql);
363 363
         foreach ($aData as $sKey => $sValue) {
364
-            $hResult->bindValue(':' . $sKey, $sValue);
364
+            $hResult->bindValue(':'.$sKey, $sValue);
365 365
         }
366 366
         $hResult->execute();
367 367
         if (isset($this->post["textid"])) {
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
374 374
             $sql = DBTools::buildPSUpdateQuery($aData, 'item_lang', 'itml_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
         }
Please login to merge, or discard this patch.
src/Controller/Admin/Shop/Itemgroupadmin.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
      * @param $purifier
151 151
      * @return string
152 152
      */
153
-    private function admin_updateGroup( $purifier)
153
+    private function admin_updateGroup($purifier)
154 154
     {
155 155
         $sql = 'SELECT * FROM itemgroups_base WHERE itmg_id != :id AND itmg_no = :gno';
156 156
         $hResult = $this->db->prepare($sql);
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
         $sql = DBTools::buildPSUpdateQuery($aData, 'itemgroups_base', 'itmg_id');
174 174
         $hResult = $this->db->prepare($sql);
175 175
         foreach ($aData as $sKey => $sValue) {
176
-            $hResult->bindValue(':' . $sKey, $sValue);
176
+            $hResult->bindValue(':'.$sKey, $sValue);
177 177
         }
178 178
         $hResult->execute();
179 179
 
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
             ];
195 195
             $sql = DBTools::buildPSUpdateQuery($aData, 'itemgroups_text', 'itmgt_id');
196 196
             $hResult = $this->db->prepare($sql);
197
-            foreach ($aData as $sKey => $sValue) $hResult->bindValue(':' . $sKey, $sValue);
197
+            foreach ($aData as $sKey => $sValue) $hResult->bindValue(':'.$sKey, $sValue);
198 198
             $hResult->execute();
199 199
         }
200 200
 
Please login to merge, or discard this patch.
Braces   +27 added lines, -9 removed lines patch added patch discarded remove patch
@@ -81,7 +81,9 @@  discard block
 block discarded – undo
81 81
                 ];
82 82
                 $sql = DBTools::buildPSInsertQuery($aData, 'itemgroups_text');
83 83
                 $hResult = $this->db->prepare($sql);
84
-                foreach ($aData as $sKey => $sValue) $hResult->bindValue(':'.$sKey, $sValue);
84
+                foreach ($aData as $sKey => $sValue) {
85
+                    $hResult->bindValue(':'.$sKey, $sValue);
86
+                }
85 87
                 $hResult->execute();
86 88
                 header('Location: /_admin/itemgroupadmin.html?gid='.$iGID.'&action=editgroup');
87 89
                 die();
@@ -107,14 +109,20 @@  discard block
 block discarded – undo
107 109
                 $sGNo = filter_var($_REQUEST["no"], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
108 110
                 $sImg = filter_var($_REQUEST["img"], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
109 111
 
110
-                if (strlen($sName) < 3) $aErr["nametooshort"] = true;
111
-                if (strlen($sGNo) < 3) $aErr["grouptooshort"] = true;
112
+                if (strlen($sName) < 3) {
113
+                    $aErr["nametooshort"] = true;
114
+                }
115
+                if (strlen($sGNo) < 3) {
116
+                    $aErr["grouptooshort"] = true;
117
+                }
112 118
                 if (count($aErr) == 0) {
113 119
                     $sql = 'SELECT itmg_no FROM itemgroups_base WHERE itmg_no = :no';
114 120
                     $hResult = $this->db->prepare($sql);
115 121
                     $hResult->bindValue(':no', $sGNo);
116 122
                     $hResult->execute();
117
-                    if ($hResult->rowCount() > 0) $aErr["duplicateno"] = true;
123
+                    if ($hResult->rowCount() > 0) {
124
+                        $aErr["duplicateno"] = true;
125
+                    }
118 126
                 }
119 127
                 if (count($aErr) == 0) {
120 128
                     $aData = [
@@ -124,7 +132,9 @@  discard block
 block discarded – undo
124 132
                     ];
125 133
                     $sql = DBTools::buildPSInsertQuery($aData, 'itemgroups_base');
126 134
                     $hResult = $this->db->prepare($sql);
127
-                    foreach ($aData as $sKey => $sValue) $hResult->bindValue(':'.$sKey, $sValue);
135
+                    foreach ($aData as $sKey => $sValue) {
136
+                        $hResult->bindValue(':'.$sKey, $sValue);
137
+                    }
128 138
                     $hResult->execute();
129 139
                     $iLastInsertID = $this->db->lastInsertId();
130 140
                     header('Location: /_admin/itemgroupadmin.html?action=editgroup&added&gid='.$iLastInsertID);
@@ -161,7 +171,9 @@  discard block
 block discarded – undo
161 171
         $hResult->execute();
162 172
         $iNumRows = $hResult->rowCount();
163 173
 
164
-        if ($iNumRows > 0) return 'duplicateno';
174
+        if ($iNumRows > 0) {
175
+            return 'duplicateno';
176
+        }
165 177
 
166 178
         $aData = [
167 179
             'itmg_name' => filter_var($_REQUEST["name"], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW),
@@ -194,7 +206,9 @@  discard block
 block discarded – undo
194 206
             ];
195 207
             $sql = DBTools::buildPSUpdateQuery($aData, 'itemgroups_text', 'itmgt_id');
196 208
             $hResult = $this->db->prepare($sql);
197
-            foreach ($aData as $sKey => $sValue) $hResult->bindValue(':' . $sKey, $sValue);
209
+            foreach ($aData as $sKey => $sValue) {
210
+                $hResult->bindValue(':' . $sKey, $sValue);
211
+            }
198 212
             $hResult->execute();
199 213
         }
200 214
 
@@ -237,11 +251,15 @@  discard block
 block discarded – undo
237 251
         $sql = 'SELECT * FROM itemgroups_base '
238 252
             . 'LEFT OUTER JOIN itemgroups_text ON itemgroups_base.itmg_id = itemgroups_text.itmgt_pid'
239 253
             . ' AND itemgroups_text.itmgt_lang = :lang';
240
-        if ($iGID != '') $sql .= ' WHERE itmg_id = :gid';
254
+        if ($iGID != '') {
255
+            $sql .= ' WHERE itmg_id = :gid';
256
+        }
241 257
         $sql .= ' ORDER BY itmg_no';
242 258
         $hResult = $this->db->prepare($sql);
243 259
         $hResult->bindValue(':lang', HelperConfig::$lang);
244
-        if ($iGID != '') $hResult->bindValue(':gid', $iGID);
260
+        if ($iGID != '') {
261
+            $hResult->bindValue(':gid', $iGID);
262
+        }
245 263
         $hResult->execute();
246 264
 
247 265
         $aGroups = $hResult->fetchAll();
Please login to merge, or discard this patch.
src/Controller/Admin/Textcatadmin.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -49,8 +49,8 @@  discard block
 block discarded – undo
49 49
             $aData = $this->textcats->getCompleteTextcatForCurrentLang();
50 50
 
51 51
             $aListSetting = [
52
-                ['title' => HardcodedText::get('textcatadmin_list_title_key'), 'key' => 'tc_key', 'width' => '20%', 'linked' => false,],
53
-                ['title' => HardcodedText::get('textcatadmin_list_title_text'), 'key' => 'tcl_text', 'width' => '80%', 'linked' => false, 'escapehtmlspecialchars' => true,],
52
+                ['title' => HardcodedText::get('textcatadmin_list_title_key'), 'key' => 'tc_key', 'width' => '20%', 'linked' => false, ],
53
+                ['title' => HardcodedText::get('textcatadmin_list_title_text'), 'key' => 'tcl_text', 'width' => '80%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
54 54
                 [
55 55
                     'title' => HardcodedText::get('textcatadmin_list_title_edit'),
56 56
                     'key' => 'tc_id',
@@ -101,8 +101,8 @@  discard block
 block discarded – undo
101 101
                 $iArchivedRows = $hResult->rowCount();
102 102
                 if ($iArchivedRows > 0) {
103 103
                     $aListSetting = [
104
-                        ['title' => 'tcla_timestamp', 'key' => 'tcla_timestamp', 'width' => '15%', 'linked' => false,],
105
-                        ['title' => 'tcl_text', 'key' => 'tcl_text', 'width' => '85%', 'linked' => false, 'escapehtmlspecialchars' => true,],
104
+                        ['title' => 'tcla_timestamp', 'key' => 'tcla_timestamp', 'width' => '15%', 'linked' => false, ],
105
+                        ['title' => 'tcl_text', 'key' => 'tcl_text', 'width' => '85%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
106 106
                     ];
107 107
                     $aData = $hResult->fetchAll();
108 108
                     $this->P->cb_customdata['archived_list'] = Tools::makeListtable($aListSetting,
Please login to merge, or discard this patch.