@@ -224,7 +224,7 @@ discard block |
||
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | /** |
| 227 | - * @return bool |
|
| 227 | + * @return false|null |
|
| 228 | 228 | */ |
| 229 | 229 | private function doCheckout() |
| 230 | 230 | { |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | } |
| 330 | 330 | |
| 331 | 331 | /** |
| 332 | - * @param $iInsertID |
|
| 332 | + * @param string $iInsertID |
|
| 333 | 333 | * @param $sMailbody_us |
| 334 | 334 | * @param $sMailbody_they |
| 335 | 335 | * @param $aImagesToSend |
@@ -376,7 +376,7 @@ discard block |
||
| 376 | 376 | } |
| 377 | 377 | |
| 378 | 378 | /** |
| 379 | - * @param $field |
|
| 379 | + * @param string $field |
|
| 380 | 380 | * @return string |
| 381 | 381 | */ |
| 382 | 382 | private function getPostValue($field) |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | |
| 143 | 143 | if (HelperConfig::$shop['email_orderconfirmation_embed_itemimages_method'] === 'glide') { |
| 144 | 144 | $sPathToImage = '/'.HelperConfig::$core['directory_images'].'/'.HelperConfig::$shop['directory_images_items'].'/'; |
| 145 | - $sImageroot = PATH_BASEDIR . HelperConfig::$core['directory_glide_master']; |
|
| 145 | + $sImageroot = PATH_BASEDIR.HelperConfig::$core['directory_glide_master']; |
|
| 146 | 146 | |
| 147 | 147 | if ( |
| 148 | 148 | is_file($sImageroot.substr($sPathToImage.$aV['img'], strlen(HelperConfig::$core['directory_images']) + 1)) |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | 'cache' => PATH_GLIDECACHE, |
| 154 | 154 | 'max_image_size' => HelperConfig::$core['glide_max_imagesize'], |
| 155 | 155 | ]); |
| 156 | - $glideserver->setBaseUrl('/' . HelperConfig::$core['directory_images'] . '/'); |
|
| 156 | + $glideserver->setBaseUrl('/'.HelperConfig::$core['directory_images'].'/'); |
|
| 157 | 157 | $base64Img = $glideserver->getImageAsBase64($sPathToImage.$aV['img'], HelperConfig::$shop['email_orderconfirmation_embed_itemimages_glideparams']); |
| 158 | 158 | $TMP = explode(',', $base64Img); |
| 159 | 159 | $binImg = base64_decode($TMP[1]); |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | .HelperConfig::$shop['directory_images_items_email'].'/'; |
| 167 | 167 | if ($aImgInfo = getimagesize($sPathToImage.$aV['img'])) { |
| 168 | 168 | $binImg = file_get_contents($sPathToImage.$aV['img']); |
| 169 | - $base64Img = 'data:' . $aImgInfo['mime'] . ';base64,'; |
|
| 169 | + $base64Img = 'data:'.$aImgInfo['mime'].';base64,'; |
|
| 170 | 170 | $base64Img .= base64_encode($binImg); |
| 171 | 171 | } |
| 172 | 172 | } |
@@ -242,7 +242,7 @@ discard block |
||
| 242 | 242 | $sql = DBTools::buildPSInsertQuery($aDataOrder, 'orders'); |
| 243 | 243 | $hResult = $db->prepare($sql); |
| 244 | 244 | foreach ($aDataOrder as $sKey => $sValue) { |
| 245 | - $hResult->bindValue(':' . $sKey, $sValue); |
|
| 245 | + $hResult->bindValue(':'.$sKey, $sValue); |
|
| 246 | 246 | } |
| 247 | 247 | $hResult->execute(); |
| 248 | 248 | $iInsertID = $db->lastInsertId(); |
@@ -277,7 +277,7 @@ discard block |
||
| 277 | 277 | $sql = DBTools::buildPSInsertQuery($aV, 'orders_items'); |
| 278 | 278 | $hResult = $db->prepare($sql); |
| 279 | 279 | foreach ($aV as $sKey => $sValue) { |
| 280 | - $hResult->bindValue(':' . $sKey, $sValue); |
|
| 280 | + $hResult->bindValue(':'.$sKey, $sValue); |
|
| 281 | 281 | } |
| 282 | 282 | $hResult->execute(); |
| 283 | 283 | } |
@@ -315,15 +315,15 @@ discard block |
||
| 315 | 315 | && array_search('paypal', HelperConfig::$shop['paymentmethods']) !== false |
| 316 | 316 | && HelperConfig::$shop['paypal_interactive'] |
| 317 | 317 | ) { |
| 318 | - header('Location: /_misc/paypal.html?id=' . $iInsertID); |
|
| 318 | + header('Location: /_misc/paypal.html?id='.$iInsertID); |
|
| 319 | 319 | } elseif ( |
| 320 | 320 | isset($this->post['paymentmethod']) |
| 321 | 321 | && $this->post['paymentmethod'] === 'sofortueberweisung' |
| 322 | 322 | && array_search('sofortueberweisung', HelperConfig::$shop['paymentmethods']) !== false |
| 323 | 323 | ) { |
| 324 | - header('Location: /_misc/sofortueberweisung.html?id=' . $iInsertID); |
|
| 324 | + header('Location: /_misc/sofortueberweisung.html?id='.$iInsertID); |
|
| 325 | 325 | } else { |
| 326 | - header('Location: /_misc/checkedout.html?id=' . $iInsertID); |
|
| 326 | + header('Location: /_misc/checkedout.html?id='.$iInsertID); |
|
| 327 | 327 | } |
| 328 | 328 | die(); |
| 329 | 329 | } |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | private function sendCheckoutMails($iInsertID, $sMailbody_us, $sMailbody_they, $aImagesToSend) |
| 338 | 338 | { |
| 339 | 339 | if ( |
| 340 | - isset(HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_' .HelperConfig::$lang]) |
|
| 340 | + isset(HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_'.HelperConfig::$lang]) |
|
| 341 | 341 | && file_exists( |
| 342 | 342 | PATH_DOCROOT.HelperConfig::$core['directory_emailattachments'] |
| 343 | 343 | .'/'.HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_' |
@@ -346,21 +346,21 @@ discard block |
||
| 346 | 346 | ) { |
| 347 | 347 | $aFilesToSend[] = |
| 348 | 348 | PATH_DOCROOT.HelperConfig::$core['directory_emailattachments'].'/' |
| 349 | - .HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_' .HelperConfig::$lang]; |
|
| 349 | + .HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_'.HelperConfig::$lang]; |
|
| 350 | 350 | } else { |
| 351 | 351 | $aFilesToSend = []; |
| 352 | 352 | } |
| 353 | 353 | |
| 354 | 354 | Helper::mailWrapper( |
| 355 | 355 | $this->post['email'], |
| 356 | - $this->textcats->T('shoppingcart_mail_subject') . ' ' . $iInsertID, |
|
| 356 | + $this->textcats->T('shoppingcart_mail_subject').' '.$iInsertID, |
|
| 357 | 357 | $sMailbody_they, |
| 358 | 358 | $aImagesToSend, |
| 359 | 359 | $aFilesToSend |
| 360 | 360 | ); |
| 361 | 361 | Helper::mailWrapper( |
| 362 | 362 | HelperConfig::$core['email_sender'], |
| 363 | - 'Bestellung im Webshop Nr: ' . $iInsertID, |
|
| 363 | + 'Bestellung im Webshop Nr: '.$iInsertID, |
|
| 364 | 364 | $sMailbody_us, |
| 365 | 365 | $aImagesToSend |
| 366 | 366 | ); |
@@ -371,9 +371,9 @@ discard block |
||
| 371 | 371 | */ |
| 372 | 372 | private function writeCheckoutToFile($sMailbody_us) |
| 373 | 373 | { |
| 374 | - $fp = fopen(PATH_LOGS . 'shoplog_' . date('Y-m-d') . '.html', 'a'); |
|
| 374 | + $fp = fopen(PATH_LOGS.'shoplog_'.date('Y-m-d').'.html', 'a'); |
|
| 375 | 375 | // Write $somecontent to our opened file. |
| 376 | - fwrite($fp, $sMailbody_us . "\n\n-------------------------------------------------------------------------\n\n"); |
|
| 376 | + fwrite($fp, $sMailbody_us."\n\n-------------------------------------------------------------------------\n\n"); |
|
| 377 | 377 | fclose($fp); |
| 378 | 378 | } |
| 379 | 379 | |
@@ -415,9 +415,9 @@ discard block |
||
| 415 | 415 | 'country' => isset($this->post['country']) && trim($this->post['country']) != '' ? |
| 416 | 416 | ( |
| 417 | 417 | isset( |
| 418 | - HelperConfig::$countries['countries_' .HelperConfig::$lang][$this->post['country']] |
|
| 418 | + HelperConfig::$countries['countries_'.HelperConfig::$lang][$this->post['country']] |
|
| 419 | 419 | ) |
| 420 | - ? HelperConfig::$countries['countries_' .HelperConfig::$lang][$this->post['country']] |
|
| 420 | + ? HelperConfig::$countries['countries_'.HelperConfig::$lang][$this->post['country']] |
|
| 421 | 421 | : $this->post['country']) |
| 422 | 422 | : '', |
| 423 | 423 | 'remarks' => $this->getPostValue('remarks'), |
@@ -425,8 +425,8 @@ discard block |
||
| 425 | 425 | 'cancellationdisclaimer' => $this->getPostValue('cancellationdisclaimer'), |
| 426 | 426 | 'paymentmethod' => $this->getPostValue('paymentmethod'), |
| 427 | 427 | 'shippingcost' => !isset($_SESSION['shippingcost']) || $_SESSION['shippingcost'] == 0 ? false : $_SESSION['shippingcost'], |
| 428 | - 'paypallink' => isset($this->post['paymentmethod']) && $this->post['paymentmethod'] == 'paypal' ? $_SERVER['SERVER_NAME'].'/_misc/paypal.html?id='.$iId : '', |
|
| 429 | - 'sofortueberweisunglink' => isset($this->post['paymentmethod']) && $this->post['paymentmethod'] == 'sofortueberweisung' ? $_SERVER['SERVER_NAME'].'/_misc/sofortueberweisung.html?id='.$iId : '', |
|
| 428 | + 'paypallink' => isset($this->post['paymentmethod']) && $this->post['paymentmethod'] == 'paypal' ? $_SERVER['SERVER_NAME'].'/_misc/paypal.html?id='.$iId : '', |
|
| 429 | + 'sofortueberweisunglink' => isset($this->post['paymentmethod']) && $this->post['paymentmethod'] == 'sofortueberweisung' ? $_SERVER['SERVER_NAME'].'/_misc/sofortueberweisung.html?id='.$iId : '', |
|
| 430 | 430 | 'SESSION' => !$bCust ? Tools::debug($_SESSION, '$_SESSION', true, true) : '', |
| 431 | 431 | 'POST' => !$bCust ? Tools::debug($this->post, '$this->post', true, true) : '', |
| 432 | 432 | 'orderid' => $iId, |
@@ -454,15 +454,15 @@ discard block |
||
| 454 | 454 | ($this->get['msg'] === 'updated' && isset($this->get['cartkey'], $this->get['amount'])) |
| 455 | 455 | || ($this->get['msg'] === 'removed' && isset($this->get['cartkey'])) |
| 456 | 456 | ) { |
| 457 | - $return .= $this->textcats->T('shoppingcart_msg_' . $this->get['msg'] . '_1') . ' '; |
|
| 457 | + $return .= $this->textcats->T('shoppingcart_msg_'.$this->get['msg'].'_1').' '; |
|
| 458 | 458 | if (isset(HelperConfig::$shop['custom_order_fields']) && mb_strpos($this->get['cartkey'], '|') !== false) { |
| 459 | 459 | $mCartkeys = explode('|', $this->get['cartkey']); |
| 460 | 460 | foreach ($mCartkeys as $sKey => $sValue) { |
| 461 | 461 | if ($sKey == 0) { |
| 462 | - $return .= $sValue . ', '; |
|
| 462 | + $return .= $sValue.', '; |
|
| 463 | 463 | } else { |
| 464 | 464 | $TMP = explode(':', $sValue); |
| 465 | - $return .= $this->textcats->T('shoppingcart_item_' . $TMP[0]) . ' ' . $TMP[1] . ', '; |
|
| 465 | + $return .= $this->textcats->T('shoppingcart_item_'.$TMP[0]).' '.$TMP[1].', '; |
|
| 466 | 466 | unset($TMP); |
| 467 | 467 | } |
| 468 | 468 | } |
@@ -470,9 +470,9 @@ discard block |
||
| 470 | 470 | } else { |
| 471 | 471 | $return .= $this->get['cartkey']; |
| 472 | 472 | } |
| 473 | - $return.= ' ' . $this->textcats->T('shoppingcart_msg_' . $this->get['msg'] . '_2'); |
|
| 473 | + $return .= ' '.$this->textcats->T('shoppingcart_msg_'.$this->get['msg'].'_2'); |
|
| 474 | 474 | if ($this->get['msg'] == 'updated') { |
| 475 | - $return .= ' ' . $this->get['amount']; |
|
| 475 | + $return .= ' '.$this->get['amount']; |
|
| 476 | 476 | } |
| 477 | 477 | $return .= '<br><br>'; |
| 478 | 478 | } |
@@ -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 | } |