Completed
Push — master ( 596a2c...dd17f1 )
by Marcus
27:04 queued 24:20
created
src/Controller/Shop/Paypal.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -69,16 +69,16 @@
 block discarded – undo
69 69
 
70 70
             $sPaypalURL = HelperConfig::$shop['paypal']['url']
71 71
                 .'?cmd=_xclick&rm=2&custom='
72
-                .$iId . '&business='.HelperConfig::$shop['paypal']['business'];
73
-            $sPaypalURL .= '&notify_url=http://' . $_SERVER['SERVER_NAME'] . '/_misc/paypal_notify.html&item_name=' . $this->textcats->T('misc_paypaypal_paypaltitle') . ' ' . $iId;
74
-            $sPaypalURL .= '&currency_code=' . HelperConfig::$shop['paypal']['currency_id']
75
-                .'&amount=' . str_replace(',', '.', number_format($fGesamtbrutto, 2, '.', ''));
72
+                .$iId.'&business='.HelperConfig::$shop['paypal']['business'];
73
+            $sPaypalURL .= '&notify_url=http://'.$_SERVER['SERVER_NAME'].'/_misc/paypal_notify.html&item_name='.$this->textcats->T('misc_paypaypal_paypaltitle').' '.$iId;
74
+            $sPaypalURL .= '&currency_code='.HelperConfig::$shop['paypal']['currency_id']
75
+                .'&amount='.str_replace(',', '.', number_format($fGesamtbrutto, 2, '.', ''));
76 76
             if (HelperConfig::$shop['interactive_paymentmethods_redirect_immediately']) {
77 77
                 \HaaseIT\HCSF\Helper::redirectToPage($sPaypalURL);
78 78
             }
79 79
 
80
-            $this->P->oPayload->cl_html = $this->textcats->T('misc_paypaypal_greeting') . '<br><br>';
81
-            $this->P->oPayload->cl_html .= '<a href="' . $sPaypalURL . '">' . $this->textcats->T('misc_paypaypal') . '</a>';
80
+            $this->P->oPayload->cl_html = $this->textcats->T('misc_paypaypal_greeting').'<br><br>';
81
+            $this->P->oPayload->cl_html .= '<a href="'.$sPaypalURL.'">'.$this->textcats->T('misc_paypaypal').'</a>';
82 82
         } else {
83 83
             $this->P->oPayload->cl_html = $this->textcats->T('misc_paypaypal_paymentnotavailable');
84 84
         }
Please login to merge, or discard this patch.
src/Controller/Customer/Login.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -45,18 +45,18 @@  discard block
 block discarded – undo
45 45
         } else {
46 46
             $mLogin = $this->getLogin();
47 47
             if (isset($mLogin['status']) && $mLogin['status'] === 'success') {
48
-                $this->P->oPayload->cl_html = $textcats->T('login_success') . '<br>';
48
+                $this->P->oPayload->cl_html = $textcats->T('login_success').'<br>';
49 49
                 \HaaseIT\HCSF\Helper::redirectToPage('/_misc/userhome.html?login=true');
50 50
             } elseif (isset($mLogin['status']) && $mLogin['status'] === 'tosnotaccepted') {
51
-                $this->P->oPayload->cl_html = $textcats->T('login_fail_tosnotaccepted') . '<br>';
51
+                $this->P->oPayload->cl_html = $textcats->T('login_fail_tosnotaccepted').'<br>';
52 52
                 $this->P->cb_customcontenttemplate = 'customer/login';
53 53
             } elseif (isset($mLogin['status']) && $mLogin['status'] === 'emailnotverified') {
54
-                $this->P->oPayload->cl_html = $textcats->T('login_fail_emailnotverified') . '<br><br>';
54
+                $this->P->oPayload->cl_html = $textcats->T('login_fail_emailnotverified').'<br><br>';
55 55
                 $this->P->oPayload->cl_html .= '<a href="/_misc/resendverificationmail.html?email='
56
-                    . $mLogin['data']['cust_email'] . '">' . $textcats->T('login_fail_emailnotverifiedresend') . '</a>';
56
+                    . $mLogin['data']['cust_email'].'">'.$textcats->T('login_fail_emailnotverifiedresend').'</a>';
57 57
                 $this->P->cb_customcontenttemplate = 'customer/login';
58 58
             } elseif (isset($mLogin['status']) && $mLogin['status'] === 'accountinactive') {
59
-                $this->P->oPayload->cl_html = $textcats->T('login_fail_accountinactive') . '<br>';
59
+                $this->P->oPayload->cl_html = $textcats->T('login_fail_accountinactive').'<br>';
60 60
                 $this->P->cb_customcontenttemplate = 'customer/login';
61 61
             } else {
62 62
                 $this->P->oPayload->cl_html = $textcats->T('login_fail');
@@ -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($_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/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/Shop/Updateshippingcost.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -42,24 +42,24 @@
 block discarded – undo
42 42
 
43 43
         header('Content-Type: text/html; charset=UTF-8');
44 44
         $return = '<div>';
45
-        $return .= '<div id="shippingcostbrutto_new">' . number_format($_SESSION['cartpricesums']['fVersandkostenbrutto'],
45
+        $return .= '<div id="shippingcostbrutto_new">'.number_format($_SESSION['cartpricesums']['fVersandkostenbrutto'],
46 46
                 HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'],
47
-                HelperConfig::$core['numberformat_thousands_seperator']) . '</div>';
48
-        $return .= '<div id="vatfull_new">' . number_format(round($_SESSION['cartpricesums']['fSteuervoll'], 2),
47
+                HelperConfig::$core['numberformat_thousands_seperator']).'</div>';
48
+        $return .= '<div id="vatfull_new">'.number_format(round($_SESSION['cartpricesums']['fSteuervoll'], 2),
49 49
                 HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'],
50
-                HelperConfig::$core['numberformat_thousands_seperator']) . '</div>';
51
-        $return .= '<div id="totalbrutto_new">' . number_format(round($_SESSION['cartpricesums']['fGesamtbrutto'], 2),
50
+                HelperConfig::$core['numberformat_thousands_seperator']).'</div>';
51
+        $return .= '<div id="totalbrutto_new">'.number_format(round($_SESSION['cartpricesums']['fGesamtbrutto'], 2),
52 52
                 HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'],
53
-                HelperConfig::$core['numberformat_thousands_seperator']) . '</div>';
54
-        $return .= '<div id="shippingcostnetto_new">' . number_format($_SESSION['cartpricesums']['fVersandkostennetto'],
53
+                HelperConfig::$core['numberformat_thousands_seperator']).'</div>';
54
+        $return .= '<div id="shippingcostnetto_new">'.number_format($_SESSION['cartpricesums']['fVersandkostennetto'],
55 55
                 HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'],
56
-                HelperConfig::$core['numberformat_thousands_seperator']) . '</div>';
57
-        $return .= '<div id="vatreduced_new">' . number_format(round($_SESSION['cartpricesums']['fSteuererm'], 2),
56
+                HelperConfig::$core['numberformat_thousands_seperator']).'</div>';
57
+        $return .= '<div id="vatreduced_new">'.number_format(round($_SESSION['cartpricesums']['fSteuererm'], 2),
58 58
                 HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'],
59
-                HelperConfig::$core['numberformat_thousands_seperator']) . '</div>';
60
-        $return .= '<div id="totalnetto_new">' . number_format(round($_SESSION['cartpricesums']['fGesamtnetto'], 2),
59
+                HelperConfig::$core['numberformat_thousands_seperator']).'</div>';
60
+        $return .= '<div id="totalnetto_new">'.number_format(round($_SESSION['cartpricesums']['fGesamtnetto'], 2),
61 61
                 HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'],
62
-                HelperConfig::$core['numberformat_thousands_seperator']) . '</div>';
62
+                HelperConfig::$core['numberformat_thousands_seperator']).'</div>';
63 63
         $return .= '</div>';
64 64
         \HaaseIT\HCSF\Helper::terminateScript($return);
65 65
     }
Please login to merge, or discard this patch.
src/Controller/Base.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
         } elseif (count(HelperConfig::$secrets['admin_users'])) {
116 116
 
117 117
             if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION'])) { // fix for php cgi mode
118
-                list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = explode(':' , base64_decode(substr($_SERVER['REDIRECT_HTTP_AUTHORIZATION'], 6)));
118
+                list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = explode(':', base64_decode(substr($_SERVER['REDIRECT_HTTP_AUTHORIZATION'], 6)));
119 119
             }
120 120
 
121 121
             if (isset($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'])) {
@@ -131,12 +131,12 @@  discard block
 block discarded – undo
131 131
             }
132 132
 
133 133
             if (!$validated) {
134
-                header('WWW-Authenticate: Basic realm="' . HelperConfig::$secrets['admin_authrealm'] . '"');
134
+                header('WWW-Authenticate: Basic realm="'.HelperConfig::$secrets['admin_authrealm'].'"');
135 135
                 header('HTTP/1.0 401 Unauthorized');
136 136
                 \HaaseIT\HCSF\Helper::terminateScript('Not authorized');
137 137
             }
138 138
         } else {
139
-            header('WWW-Authenticate: Basic realm="' . HelperConfig::$secrets['admin_authrealm'] . '"');
139
+            header('WWW-Authenticate: Basic realm="'.HelperConfig::$secrets['admin_authrealm'].'"');
140 140
             header('HTTP/1.0 401 Unauthorized');
141 141
             \HaaseIT\HCSF\Helper::terminateScript('Not authorized');
142 142
         }
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 = Controller\Glide::class;
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
                 } else { // if it is found, go on
133 133
                     // Support for shorturls
134 134
                     if ($this->P->cb_pagetype === 'shorturl') {
135
-                        \HaaseIT\HCSF\Helper::redirectToPage('Location: ' . $this->P->cb_pageconfig, true);
135
+                        \HaaseIT\HCSF\Helper::redirectToPage('Location: '.$this->P->cb_pageconfig, true);
136 136
                     }
137 137
 
138 138
                     if (isset($this->P, $aRoutingoverride) && count($aRoutingoverride)) {
@@ -148,14 +148,14 @@  discard block
 block discarded – undo
148 148
                 $this->P->iStatus = 404;
149 149
 
150 150
                 $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T('misc_page_not_found');
151
-                header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found');
151
+                header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found');
152 152
             } elseif (!is_object($this->P) && $this->P == 500) {
153 153
                 $this->P = new CorePage($this->serviceManager);
154 154
                 $this->P->cb_pagetype = 'error';
155 155
                 $this->P->iStatus = 500;
156 156
 
157 157
                 $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T('misc_server_error');
158
-                header($_SERVER['SERVER_PROTOCOL'] . ' 500 Internal Server Error');
158
+                header($_SERVER['SERVER_PROTOCOL'].' 500 Internal Server Error');
159 159
             } elseif (is_object($this->P) && $this->P->oPayload == NULL) {// elseif the page has been found but contains no payload...
160 160
                 if (
161 161
                     !(
@@ -165,10 +165,10 @@  discard block
 block discarded – undo
165 165
                     )
166 166
                 ) { // no payload is fine if page is one of these
167 167
                     $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T('misc_content_not_found');
168
-                    header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found');
168
+                    header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found');
169 169
                 }
170 170
             } 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
171
-                $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T('misc_page_not_available_lang') . '<br><br>' . $this->P->oPayload->cl_html;
171
+                $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T('misc_page_not_available_lang').'<br><br>'.$this->P->oPayload->cl_html;
172 172
             }
173 173
         }
174 174
         return $this->P;
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
                 // to allow dots in the filename, we have to iterate through all parts of the filename
191 191
                 $aRoutingoverride['itemno'] = '';
192 192
                 for ($i = 0; $i < count($aTMP['exploded_request_file']) - 1; $i++) {
193
-                    $aRoutingoverride['itemno'] .= $aTMP['exploded_request_file'][$i] . '.';
193
+                    $aRoutingoverride['itemno'] .= $aTMP['exploded_request_file'][$i].'.';
194 194
                 }
195 195
                 // remove the trailing dot
196 196
                 $aRoutingoverride['itemno'] = \HaaseIT\Toolbox\Tools::cutStringend($aRoutingoverride['itemno'], 1);
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
                 // rebuild the path string without the trailing '/item/itemno.html'
201 201
                 $this->sPath = '';
202 202
                 for ($i = 0; $i < $aTMP['parts_in_path'] - 2; $i++) {
203
-                    $this->sPath .= $aPath[$i] . '/';
203
+                    $this->sPath .= $aPath[$i].'/';
204 204
                 }
205 205
             }
206 206
         }
Please login to merge, or discard this patch.
src/Controller/Admin/Shop/Itemadmin.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -252,10 +252,10 @@  discard block
 block discarded – undo
252 252
     private function prepareItemlist($aItemlist)
253 253
     {
254 254
         $aList = [
255
-            ['title' => HardcodedText::get('itemadmin_list_active'), 'key' => 'itemindex', 'width' => 30, 'linked' => false, 'callback' => 'renderItemStatusIcon',],
256
-            ['title' => HardcodedText::get('itemadmin_list_itemno'), 'key' => 'itemno', 'width' => 100, 'linked' => false,],
257
-            ['title' => HardcodedText::get('itemadmin_list_name'), 'key' => 'name', 'width' => 350, 'linked' => false,],
258
-            ['title' => HardcodedText::get('itemadmin_list_edit'), 'key' => 'itemno', 'width' => 30, 'linked' => true, 'ltarget' => '/_admin/itemadmin.html', 'lkeyname' => 'itemno', 'lgetvars' => ['action' => 'showitem'],],
255
+            ['title' => HardcodedText::get('itemadmin_list_active'), 'key' => 'itemindex', 'width' => 30, 'linked' => false, 'callback' => 'renderItemStatusIcon', ],
256
+            ['title' => HardcodedText::get('itemadmin_list_itemno'), 'key' => 'itemno', 'width' => 100, 'linked' => false, ],
257
+            ['title' => HardcodedText::get('itemadmin_list_name'), 'key' => 'name', 'width' => 350, 'linked' => false, ],
258
+            ['title' => HardcodedText::get('itemadmin_list_edit'), 'key' => 'itemno', 'width' => 30, 'linked' => true, 'ltarget' => '/_admin/itemadmin.html', 'lkeyname' => 'itemno', 'lgetvars' => ['action' => 'showitem'], ],
259 259
         ];
260 260
         $aData = [];
261 261
         foreach ($aItemlist['data'] as $aValue) {
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
     private function prepareItem($aItemdata)
321 321
     {
322 322
         $aData = [
323
-            'form' => ['action' => Tools::makeLinkHRefWithAddedGetVars('/_admin/itemadmin.html', ['action' => 'showitem', 'itemno' => $aItemdata['base']['itm_no']]),],
323
+            'form' => ['action' => Tools::makeLinkHRefWithAddedGetVars('/_admin/itemadmin.html', ['action' => 'showitem', 'itemno' => $aItemdata['base']['itm_no']]), ],
324 324
             'id' => $aItemdata['base']['itm_id'],
325 325
             'itemno' => $aItemdata['base']['itm_no'],
326 326
             'name' => $aItemdata['base']['itm_name'],
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
351 351
         $aGroups = $this->getItemgroups('');
352 352
         $aData['groupoptions'][] = '';
353 353
         foreach ($aGroups as $aValue) {
354
-            $aData['groupoptions'][] = $aValue['itmg_id'] . '|' . $aValue['itmg_no'] . ' - ' . $aValue['itmg_name'];
354
+            $aData['groupoptions'][] = $aValue['itmg_id'].'|'.$aValue['itmg_no'].' - '.$aValue['itmg_name'];
355 355
         }
356 356
         unset($aGroups);
357 357
 
Please login to merge, or discard this patch.