Completed
Push — master ( 9218b4...e95aee )
by Marcus
02:47
created
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 1 patch
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.
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.
src/Shop/Items.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
             $aData['itm_vatid'] = 'full';
208 208
         }
209 209
 
210
-        if(is_numeric($aData['itm_price']) && (float) $aData['itm_price'] > 0) {
210
+        if (is_numeric($aData['itm_price']) && (float) $aData['itm_price'] > 0) {
211 211
             $aPrice["netto_list"] = $aData['itm_price'];
212 212
             $aPrice['brutto_list'] = $this->addVat($aPrice['netto_list'], HelperConfig::$shop['vat'][$aData['itm_vatid']]);
213 213
             if (
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
                         bcdiv(
231 231
                             bcsub(
232 232
                                 '100',
233
-                                (string)HelperConfig::$shop["rebate_groups"][$aData['itm_rg']][CHelper::getUserData('cust_group')]
233
+                                (string) HelperConfig::$shop["rebate_groups"][$aData['itm_rg']][CHelper::getUserData('cust_group')]
234 234
                             ),
235 235
                             '100'
236 236
                         )
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
                 bcdiv(
263 263
                     bcmul(
264 264
                         $price,
265
-                        (string)$vat
265
+                        (string) $vat
266 266
                     ),
267 267
                     '100'
268 268
                 ),
Please login to merge, or discard this patch.
src/Shop/Helper.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -102,11 +102,11 @@  discard block
 block discarded – undo
102 102
         }
103 103
 
104 104
         if ($aOrder["iMindergebuehr_id"] > 0) {
105
-            $aOrder["fVoll"] += HelperConfig::$shop["reducedorderamountfee" . $aOrder["iMindergebuehr_id"]];
106
-            $aOrder["fGesamtnetto"] += HelperConfig::$shop["reducedorderamountfee" . $aOrder["iMindergebuehr_id"]];
105
+            $aOrder["fVoll"] += HelperConfig::$shop["reducedorderamountfee".$aOrder["iMindergebuehr_id"]];
106
+            $aOrder["fGesamtnetto"] += HelperConfig::$shop["reducedorderamountfee".$aOrder["iMindergebuehr_id"]];
107 107
             $aOrder["fSteuervoll"] = $aOrder["fVoll"] * $iVATfull / 100;
108 108
             $aOrder["fGesamtbrutto"] = $aOrder["fGesamtnetto"] + $aOrder["fSteuervoll"] + $aOrder["fSteuererm"];
109
-            $aOrder["fMindergebuehr"] = HelperConfig::$shop["reducedorderamountfee" . $aOrder["iMindergebuehr_id"]];
109
+            $aOrder["fMindergebuehr"] = HelperConfig::$shop["reducedorderamountfee".$aOrder["iMindergebuehr_id"]];
110 110
         }
111 111
 
112 112
         $aOrder["fVersandkosten"] = 0;
@@ -408,12 +408,12 @@  discard block
 block discarded – undo
408 408
                 }
409 409
                 // because array_rand will change numerical (string) values to integer, we have to do this awkward dance
410 410
                 foreach ($keysAddSuggsTMP as $key => $item) {
411
-                    $keysAddSuggs[] = (string)$item;
411
+                    $keysAddSuggs[] = (string) $item;
412 412
                 }
413 413
 
414 414
                 // iterate suggestions and remove those that which will not be kept
415 415
                 foreach ($suggestions['additional'] as $addSuggsKey => $addSuggsVal) {
416
-                    if (!in_array((string)$addSuggsKey, $keysAddSuggs, true)) {
416
+                    if (!in_array((string) $addSuggsKey, $keysAddSuggs, true)) {
417 417
                         unset($suggestions['additional'][$addSuggsKey]);
418 418
                     }
419 419
                 }
Please login to merge, or discard this patch.
src/Router.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 
87 87
             $aPath = explode('/', $this->sPath);
88 88
             if (!empty($map[$this->sPath])) {
89
-                $class = '\\HaaseIT\\HCSF\\Controller\\' . $map[$this->sPath];
89
+                $class = '\\HaaseIT\\HCSF\\Controller\\'.$map[$this->sPath];
90 90
             } else {
91 91
                 if ($aPath[1] == HelperConfig::$core['directory_images']) {
92 92
                     $class = '\\HaaseIT\\HCSF\\Controller\\Glide';
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
                 } else { // if it is found, go on
129 129
                     // Support for shorturls
130 130
                     if ($this->P->cb_pagetype == 'shorturl') {
131
-                        header('Location: ' . $this->P->cb_pageconfig, true, 302);
131
+                        header('Location: '.$this->P->cb_pageconfig, true, 302);
132 132
                         exit();
133 133
                     }
134 134
 
@@ -145,14 +145,14 @@  discard block
 block discarded – undo
145 145
                 $this->P->iStatus = 404;
146 146
 
147 147
                 $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T("misc_page_not_found");
148
-                header($_SERVER["SERVER_PROTOCOL"] . " 404 Not Found");
148
+                header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
149 149
             } elseif (!is_object($this->P) && $this->P == 500) {
150 150
                 $this->P = new CorePage($this->serviceManager);
151 151
                 $this->P->cb_pagetype = 'error';
152 152
                 $this->P->iStatus = 500;
153 153
 
154 154
                 $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T("misc_server_error");
155
-                header($_SERVER["SERVER_PROTOCOL"] . " 500 Internal Server Error");
155
+                header($_SERVER["SERVER_PROTOCOL"]." 500 Internal Server Error");
156 156
             } elseif (is_object($this->P) && $this->P->oPayload == NULL) {// elseif the page has been found but contains no payload...
157 157
                 if (
158 158
                     !(
@@ -162,10 +162,10 @@  discard block
 block discarded – undo
162 162
                     )
163 163
                 ) { // no payload is fine if page is one of these
164 164
                     $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T("misc_content_not_found");
165
-                    header($_SERVER["SERVER_PROTOCOL"] . " 404 Not Found");
165
+                    header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
166 166
                 }
167 167
             } elseif ($this->P->oPayload->cl_lang != NULL && $this->P->oPayload->cl_lang != HelperConfig::$lang) { // if the page is available but not in the current language, display info
168
-                $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T("misc_page_not_available_lang") . '<br><br>' . $this->P->oPayload->cl_html;
168
+                $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T("misc_page_not_available_lang").'<br><br>'.$this->P->oPayload->cl_html;
169 169
             }
170 170
         }
171 171
         return $this->P;
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
                 // to allow dots in the filename, we have to iterate through all parts of the filename
188 188
                 $aRoutingoverride["itemno"] = '';
189 189
                 for ($i = 0; $i < count($aTMP["exploded_request_file"]) - 1; $i++) {
190
-                    $aRoutingoverride["itemno"] .= $aTMP["exploded_request_file"][$i] . '.';
190
+                    $aRoutingoverride["itemno"] .= $aTMP["exploded_request_file"][$i].'.';
191 191
                 }
192 192
                 // remove the trailing dot
193 193
                 $aRoutingoverride["itemno"] = \HaaseIT\Toolbox\Tools::cutStringend($aRoutingoverride["itemno"], 1);
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
                 // rebuild the path string without the trailing '/item/itemno.html'
198 198
                 $this->sPath = '';
199 199
                 for ($i = 0; $i < $aTMP["parts_in_path"] - 2; $i++) {
200
-                    $this->sPath .= $aPath[$i] . '/';
200
+                    $this->sPath .= $aPath[$i].'/';
201 201
                 }
202 202
             }
203 203
         }
Please login to merge, or discard this patch.
src/HCSF.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 
31 31
         $this->setupHardcodedTextcats();
32 32
 
33
-        $this->serviceManager->setFactory('db', function () {
33
+        $this->serviceManager->setFactory('db', function() {
34 34
             return null;
35 35
         });
36 36
 
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
         $this->setupTwig();
44 44
 
45 45
         if (HelperConfig::$core["enable_module_shop"]) {
46
-            $this->serviceManager->setFactory('oItem', function (ServiceManager $serviceManager) {
46
+            $this->serviceManager->setFactory('oItem', function(ServiceManager $serviceManager) {
47 47
                 return new \HaaseIT\HCSF\Shop\Items($serviceManager);
48 48
             });
49 49
         }
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
     {
57 57
         // PSR-7 Stuff
58 58
         // Init request object
59
-        $this->serviceManager->setFactory('request', function () {
59
+        $this->serviceManager->setFactory('request', function() {
60 60
             $request = \Zend\Diactoros\ServerRequestFactory::fromGlobals();
61 61
 
62 62
             // cleanup request
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 // session.use_trans_sid wenn nötig aktivieren
77 77
             ini_set('session.use_only_cookies', 0);
78 78
             session_name('sid');
79
-            if(ini_get('session.use_trans_sid') == 1) {
79
+            if (ini_get('session.use_trans_sid') == 1) {
80 80
                 ini_set('session.use_trans_sid', 0);
81 81
             }
82 82
 // Session wenn nötig starten
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 
121 121
     protected function setupDB()
122 122
     {
123
-        $this->serviceManager->setFactory('dbal', function () {
123
+        $this->serviceManager->setFactory('dbal', function() {
124 124
             $config = new \Doctrine\DBAL\Configuration();
125 125
 
126 126
             $connectionParams = [
@@ -141,14 +141,14 @@  discard block
 block discarded – undo
141 141
             return \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config);
142 142
         });
143 143
 
144
-        $this->serviceManager->setFactory('db', function (ServiceManager $serviceManager) {
144
+        $this->serviceManager->setFactory('db', function(ServiceManager $serviceManager) {
145 145
             return $serviceManager->get('dbal')->getWrappedConnection();
146 146
         });
147 147
     }
148 148
 
149 149
     protected function setupTextcats()
150 150
     {
151
-        $this->serviceManager->setFactory('textcats', function (ServiceManager $serviceManager) {
151
+        $this->serviceManager->setFactory('textcats', function(ServiceManager $serviceManager) {
152 152
             $langavailable = HelperConfig::$core["lang_available"];
153 153
             $textcats = new \HaaseIT\Toolbox\Textcat(
154 154
                 HelperConfig::$lang,
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 
166 166
     protected function setupTwig()
167 167
     {
168
-        $this->serviceManager->setFactory('twig', function (ServiceManager $serviceManager) {
168
+        $this->serviceManager->setFactory('twig', function(ServiceManager $serviceManager) {
169 169
             $loader = new \Twig_Loader_Filesystem([PATH_BASEDIR.'customviews', HCSF_BASEDIR.'src/views/']);
170 170
 
171 171
             $twig_options = [
Please login to merge, or discard this patch.