fix: be more easy on ep_trk cookie and resellers

This commit is contained in:
Björn Fromme
2024-08-22 16:58:37 +02:00
parent 4367dc6dc4
commit 98c4aa7c4f
5 changed files with 19 additions and 38 deletions
@@ -29,7 +29,6 @@ namespace EP\EpTheme\DataProcessing;
use EP\EpProducts\Service\ResellerDataService;
use EP\EpProducts\Traits\DbConnectionTrait;
use EP\EpProducts\Utility\CookieUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Object\ObjectManager;
use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
@@ -65,15 +64,11 @@ class ContextProcessor implements DataProcessorInterface
}
if ($data['tx_eptheme_context_pacode']) {
$processedData['context']['paCode'] = $data['tx_eptheme_context_pacode'];
} else {
$resellerData = $this->getResellerData();
if ($resellerData) {
$processedData['context']['paCode'] = $resellerData['paCode'];
} elseif ($paCode = $this->getPaCodeFromRequest()) {
$processedData['context']['paCode'] = $paCode;
} elseif ($cookieData = CookieUtility::getPaCookie()) {
$processedData['context']['paCode'] = $cookieData;
}
// Disabled, not working anyways, reseller subdomains are not registered since TYPO3 10.*
// } elseif ($resellerData = $this->getResellerData()) {
// $processedData['context']['paCode'] = $resellerData['paCode'];
} elseif ($paCode = $this->getPaCodeFromRequest()) {
$processedData['context']['paCode'] = $paCode;
}
return $processedData;
@@ -107,10 +102,7 @@ class ContextProcessor implements DataProcessorInterface
parse_str($query, $items);
if (array_key_exists('pa', $items)) {
$paCode = $items['pa'];
CookieUtility::setPaCookie($paCode);
return $paCode;
return $items['pa'];
}
return '';