@@ -48,7 +48,7 @@ |
||
48 | 48 | 'cache' => PATH_GLIDECACHE, |
49 | 49 | 'max_image_size' => HelperConfig::$core['glide_max_imagesize'], |
50 | 50 | ]); |
51 | - $glideserver->setBaseUrl('/' . HelperConfig::$core['directory_images'] . '/'); |
|
51 | + $glideserver->setBaseUrl('/'.HelperConfig::$core['directory_images'].'/'); |
|
52 | 52 | // Generate a URL |
53 | 53 | |
54 | 54 | try { |
@@ -88,10 +88,10 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 | ]; |
@@ -49,8 +49,8 @@ discard block |
||
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 |
||
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, |
@@ -223,11 +223,11 @@ |
||
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( |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | /** |
106 | 106 | * @param string $sKeyConfig |
107 | 107 | * @param string $sKeyForm |
108 | - * @param array|bool $aUserData |
|
108 | + * @param boolean $aUserData |
|
109 | 109 | * @return bool |
110 | 110 | */ |
111 | 111 | public static function getCustomerFormDefaultValue($sKeyConfig, $sKeyForm, $aUserData) { |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | } |
119 | 119 | |
120 | 120 | /** |
121 | - * @param $sLang |
|
121 | + * @param string $sLang |
|
122 | 122 | * @param string $sPurpose |
123 | 123 | * @param string $sErr |
124 | 124 | * @param bool $aUserData |
@@ -66,13 +66,13 @@ |
||
66 | 66 | if (HelperConfig::$customer['validate_fax'] && (!isset($_POST['fax']) || strlen(trim($_POST['fax']))) < 6) { |
67 | 67 | $aErr['fax'] = true; |
68 | 68 | } |
69 | - if (HelperConfig::$customer['validate_country'] && (!isset($_POST['country']) || !isset(HelperConfig::$countries['countries_' .$sLang][$_POST['country']]))) { |
|
69 | + if (HelperConfig::$customer['validate_country'] && (!isset($_POST['country']) || !isset(HelperConfig::$countries['countries_'.$sLang][$_POST['country']]))) { |
|
70 | 70 | $aErr['country'] = true; |
71 | 71 | } |
72 | 72 | if (!$bEdit && (!isset($_POST['tos']) || $_POST['tos'] !== 'y')) { |
73 | 73 | $aErr['tos'] = true; |
74 | 74 | } |
75 | - if (!$bEdit && (!isset( $_POST['cancellationdisclaimer'] ) || $_POST['cancellationdisclaimer'] !== 'y')) { |
|
75 | + if (!$bEdit && (!isset($_POST['cancellationdisclaimer']) || $_POST['cancellationdisclaimer'] !== 'y')) { |
|
76 | 76 | $aErr['cancellationdisclaimer'] = true; |
77 | 77 | } |
78 | 78 |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | * @param $purifier |
161 | 161 | * @return string |
162 | 162 | */ |
163 | - private function admin_updateGroup( $purifier) |
|
163 | + private function admin_updateGroup($purifier) |
|
164 | 164 | { |
165 | 165 | $sql = 'SELECT * FROM itemgroups_base WHERE itmg_id != :id AND itmg_no = :gno'; |
166 | 166 | $hResult = $this->db->prepare($sql); |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | $sql = DBTools::buildPSUpdateQuery($aData, 'itemgroups_base', 'itmg_id'); |
186 | 186 | $hResult = $this->db->prepare($sql); |
187 | 187 | foreach ($aData as $sKey => $sValue) { |
188 | - $hResult->bindValue(':' . $sKey, $sValue); |
|
188 | + $hResult->bindValue(':'.$sKey, $sValue); |
|
189 | 189 | } |
190 | 190 | $hResult->execute(); |
191 | 191 | |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | $sql = DBTools::buildPSUpdateQuery($aData, 'itemgroups_text', 'itmgt_id'); |
208 | 208 | $hResult = $this->db->prepare($sql); |
209 | 209 | foreach ($aData as $sKey => $sValue) { |
210 | - $hResult->bindValue(':' . $sKey, $sValue); |
|
210 | + $hResult->bindValue(':'.$sKey, $sValue); |
|
211 | 211 | } |
212 | 212 | $hResult->execute(); |
213 | 213 | } |
@@ -86,7 +86,7 @@ discard block |
||
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 |
||
132 | 132 | } else { // if it is found, go on |
133 | 133 | // Support for shorturls |
134 | 134 | if ($this->P->cb_pagetype === 'shorturl') { |
135 | - header('Location: ' . $this->P->cb_pageconfig, true, 302); |
|
135 | + header('Location: '.$this->P->cb_pageconfig, true, 302); |
|
136 | 136 | exit(); |
137 | 137 | } |
138 | 138 | |
@@ -149,14 +149,14 @@ discard block |
||
149 | 149 | $this->P->iStatus = 404; |
150 | 150 | |
151 | 151 | $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T('misc_page_not_found'); |
152 | - header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found'); |
|
152 | + header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found'); |
|
153 | 153 | } elseif (!is_object($this->P) && $this->P == 500) { |
154 | 154 | $this->P = new CorePage($this->serviceManager); |
155 | 155 | $this->P->cb_pagetype = 'error'; |
156 | 156 | $this->P->iStatus = 500; |
157 | 157 | |
158 | 158 | $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T('misc_server_error'); |
159 | - header($_SERVER['SERVER_PROTOCOL'] . ' 500 Internal Server Error'); |
|
159 | + header($_SERVER['SERVER_PROTOCOL'].' 500 Internal Server Error'); |
|
160 | 160 | } elseif (is_object($this->P) && $this->P->oPayload == NULL) {// elseif the page has been found but contains no payload... |
161 | 161 | if ( |
162 | 162 | !( |
@@ -166,10 +166,10 @@ discard block |
||
166 | 166 | ) |
167 | 167 | ) { // no payload is fine if page is one of these |
168 | 168 | $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T('misc_content_not_found'); |
169 | - header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found'); |
|
169 | + header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found'); |
|
170 | 170 | } |
171 | 171 | } 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 |
172 | - $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T('misc_page_not_available_lang') . '<br><br>' . $this->P->oPayload->cl_html; |
|
172 | + $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T('misc_page_not_available_lang').'<br><br>'.$this->P->oPayload->cl_html; |
|
173 | 173 | } |
174 | 174 | } |
175 | 175 | return $this->P; |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | // to allow dots in the filename, we have to iterate through all parts of the filename |
192 | 192 | $aRoutingoverride['itemno'] = ''; |
193 | 193 | for ($i = 0; $i < count($aTMP['exploded_request_file']) - 1; $i++) { |
194 | - $aRoutingoverride['itemno'] .= $aTMP['exploded_request_file'][$i] . '.'; |
|
194 | + $aRoutingoverride['itemno'] .= $aTMP['exploded_request_file'][$i].'.'; |
|
195 | 195 | } |
196 | 196 | // remove the trailing dot |
197 | 197 | $aRoutingoverride['itemno'] = \HaaseIT\Toolbox\Tools::cutStringend($aRoutingoverride['itemno'], 1); |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | // rebuild the path string without the trailing '/item/itemno.html' |
202 | 202 | $this->sPath = ''; |
203 | 203 | for ($i = 0; $i < $aTMP['parts_in_path'] - 2; $i++) { |
204 | - $this->sPath .= $aPath[$i] . '/'; |
|
204 | + $this->sPath .= $aPath[$i].'/'; |
|
205 | 205 | } |
206 | 206 | } |
207 | 207 | } |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | unset($sTMP); |
95 | 95 | |
96 | 96 | if (isset($_REQUEST[$sValue]) && in_array($_REQUEST[$sValue], $aOptions)) { |
97 | - $sCartKey .= '|' . $sValue . ':' . $_REQUEST[$sValue]; |
|
97 | + $sCartKey .= '|'.$sValue.':'.$_REQUEST[$sValue]; |
|
98 | 98 | } else { |
99 | 99 | $this->replyToCartUpdate('requiredfieldmissing'); |
100 | 100 | } |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | } |
164 | 164 | echo $this->serviceManager->get('twig')->render('shop/update-cart.twig', $aAR); |
165 | 165 | } else { |
166 | - $aMSG['msg'] = $sReply; |
|
166 | + $aMSG['msg'] = $sReply; |
|
167 | 167 | if (count($aMore)) { |
168 | 168 | $aMSG = array_merge($aMSG, $aMore); |
169 | 169 | } |
@@ -75,7 +75,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |