Completed
Push — master ( b3c1c7...c901c8 )
by Marcus
02:39
created
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.
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',
@@ -112,8 +112,8 @@  discard block
 block discarded – undo
112 112
 
113 113
                 if ($iArchivedRows > 0) {
114 114
                     $aListSetting = [
115
-                        ['title' => 'tcla_timestamp', 'key' => 'tcla_timestamp', 'width' => '15%', 'linked' => false,],
116
-                        ['title' => 'tcl_text', 'key' => 'tcl_text', 'width' => '85%', 'linked' => false, 'escapehtmlspecialchars' => true,],
115
+                        ['title' => 'tcla_timestamp', 'key' => 'tcla_timestamp', 'width' => '15%', 'linked' => false, ],
116
+                        ['title' => 'tcl_text', 'key' => 'tcl_text', 'width' => '85%', 'linked' => false, 'escapehtmlspecialchars' => true, ],
117 117
                     ];
118 118
                     $aData = $statement->fetchAll();
119 119
                     $this->P->cb_customdata['archived_list'] = Tools::makeListtable($aListSetting,
Please login to merge, or discard this patch.
src/Controller/Shop/Paypalnotify.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
             $postdata = '';
76 76
 
77 77
             foreach ($_POST as $i => $v) {
78
-                $postdata .= $i . '=' . urlencode($v) . '&';
78
+                $postdata .= $i.'='.urlencode($v).'&';
79 79
             }
80 80
             $postdata .= 'cmd=_notify-validate';
81 81
             $web = parse_url(HelperConfig::$shop["paypal"]["url"]);
@@ -87,15 +87,15 @@  discard block
 block discarded – undo
87 87
                 $web['port'] = 80;
88 88
                 $ssl = '';
89 89
             }
90
-            $fp = @fsockopen($ssl . $web['host'], $web['port'], $errnum, $errstr, 30);
90
+            $fp = @fsockopen($ssl.$web['host'], $web['port'], $errnum, $errstr, 30);
91 91
 
92 92
             if ($fp) {
93
-                fwrite($fp, "POST " . $web['path'] . " HTTP/1.1\r\n");
94
-                fwrite($fp, "Host: " . $web['host'] . "\r\n");
93
+                fwrite($fp, "POST ".$web['path']." HTTP/1.1\r\n");
94
+                fwrite($fp, "Host: ".$web['host']."\r\n");
95 95
                 fwrite($fp, "Content-type: application/x-www-form-urlencoded\r\n");
96
-                fwrite($fp, "Content-length: " . strlen($postdata) . "\r\n");
96
+                fwrite($fp, "Content-length: ".strlen($postdata)."\r\n");
97 97
                 fwrite($fp, "Connection: close\r\n\r\n");
98
-                fwrite($fp, $postdata . "\r\n\r\n");
98
+                fwrite($fp, $postdata."\r\n\r\n");
99 99
 
100 100
                 $info = [];
101 101
                 while (!feof($fp)) {
@@ -105,9 +105,9 @@  discard block
 block discarded – undo
105 105
                 $info = implode(',', $info);
106 106
                 if (!(strpos($info, 'VERIFIED') === false)) {
107 107
 
108
-                    $sLogData .= "-- new entry - " . date(HelperConfig::$core['locale_format_date_time']) . " --\n\n";
108
+                    $sLogData .= "-- new entry - ".date(HelperConfig::$core['locale_format_date_time'])." --\n\n";
109 109
                     $sLogData .= "W00T!\n\n";
110
-                    $sLogData .= \HaaseIT\Toolbox\Tools::debug($_REQUEST, '', true, true) . "\n\n";
110
+                    $sLogData .= \HaaseIT\Toolbox\Tools::debug($_REQUEST, '', true, true)."\n\n";
111 111
 
112 112
                     // Check if the transaction id has been used before
113 113
                     $queryBuilder = $this->dbal->createQueryBuilder();
@@ -138,27 +138,27 @@  discard block
 block discarded – undo
138 138
                             ;
139 139
                             $queryBuilder->execute();
140 140
 
141
-                            $sLogData .= "-- Alles ok. Zahlung erfolgreich. TXNID: " . $_REQUEST["txn_id"] . " --\n\n";
141
+                            $sLogData .= "-- Alles ok. Zahlung erfolgreich. TXNID: ".$_REQUEST["txn_id"]." --\n\n";
142 142
                         } else {
143 143
                             $sLogData .= "-- In my country we have problem; Problem is evaluation. Throw the data down the log!\n";
144
-                            $sLogData .= "mc_gross: " . $_REQUEST["mc_gross"] . ' - number_format($fGesamtbrutto, 2, \'.\', \'\'): ' . number_format($fGesamtbrutto,
145
-                                    2, '.', '') . "\n";
146
-                            $sLogData .= "custom: " . $_REQUEST["custom"] . ' - $aOrder[\'o_id\']: ' . $aOrder['o_id'] . "\n";
147
-                            $sLogData .= "payment_status: " . $_REQUEST["payment_status"] . "\n";
148
-                            $sLogData .= "mc_currency: " . $_REQUEST["mc_currency"] . ' - HelperConfig::$shop["paypal"]["currency_id"]: ' . HelperConfig::$shop["paypal"]["currency_id"] . "\n";
149
-                            $sLogData .= "business: " . $_REQUEST["receiver_email"] . ' - HelperConfig::$shop["paypal"]["business"]: ' . HelperConfig::$shop["paypal"]["business"] . "\n\n";
144
+                            $sLogData .= "mc_gross: ".$_REQUEST["mc_gross"].' - number_format($fGesamtbrutto, 2, \'.\', \'\'): '.number_format($fGesamtbrutto,
145
+                                    2, '.', '')."\n";
146
+                            $sLogData .= "custom: ".$_REQUEST["custom"].' - $aOrder[\'o_id\']: '.$aOrder['o_id']."\n";
147
+                            $sLogData .= "payment_status: ".$_REQUEST["payment_status"]."\n";
148
+                            $sLogData .= "mc_currency: ".$_REQUEST["mc_currency"].' - HelperConfig::$shop["paypal"]["currency_id"]: '.HelperConfig::$shop["paypal"]["currency_id"]."\n";
149
+                            $sLogData .= "business: ".$_REQUEST["receiver_email"].' - HelperConfig::$shop["paypal"]["business"]: '.HelperConfig::$shop["paypal"]["business"]."\n\n";
150 150
                         }
151 151
                     } else {
152 152
                         // INVALID LOGGING ERROR
153
-                        $sLogData .= "-- new entry - " . date(HelperConfig::$core['locale_format_date_time']) . " --\n\nPHAIL\n\n";
154
-                        $sLogData .= "!!! JEMAND HAT EINE ALTE TXN_ID BENUTZT: " . $_REQUEST["txn_id"] . " !!!\n\n";
153
+                        $sLogData .= "-- new entry - ".date(HelperConfig::$core['locale_format_date_time'])." --\n\nPHAIL\n\n";
154
+                        $sLogData .= "!!! JEMAND HAT EINE ALTE TXN_ID BENUTZT: ".$_REQUEST["txn_id"]." !!!\n\n";
155 155
                         $sLogData .= "!!! INVALID !!!\n\n";
156 156
                     }
157 157
                 } else {
158
-                    $sLogData .= "-- new entry - " . date(HelperConfig::$core['locale_format_date_time']) . " --\n\nPHAIL - Transaktion fehlgeschlagen. TXNID: " . $_REQUEST["txn_id"] . "\n" . $info . "\n\n";
158
+                    $sLogData .= "-- new entry - ".date(HelperConfig::$core['locale_format_date_time'])." --\n\nPHAIL - Transaktion fehlgeschlagen. TXNID: ".$_REQUEST["txn_id"]."\n".$info."\n\n";
159 159
                 }
160 160
 
161
-                file_put_contents(PATH_LOGS . FILE_PAYPALLOG, $sLogData, FILE_APPEND);
161
+                file_put_contents(PATH_LOGS.FILE_PAYPALLOG, $sLogData, FILE_APPEND);
162 162
             }
163 163
         }
164 164
 
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.