Fix redirect loop

This commit is contained in:
Björn Fromme
2019-06-18 15:27:31 +02:00
parent de2731e9a4
commit 3517fb849b
@@ -138,22 +138,23 @@ class TrackingMiddleware implements MiddlewareInterface
$params = $request->getAttribute('normalizedParams');
$query = $params->getQueryString();
$path = $params->getRequestUri();
if (preg_match('/(' . static::CODE_PATTERN . ')\/?$/i', $path)) {
$urlItems = GeneralUtility::trimExplode('/', $path, true);
$code = array_pop($urlItems);
$this->setCookie($code);
$uri = '/';
if (count($urlItems) > 0) {
$uri = '/' . implode('/', $urlItems) . '/';
}
if (!empty($query)) {
$uri .= '?' . $query;
}
return $uri;
if (!preg_match('/^(' . static::CODE_PATTERN . ')\/?$/i', $path)) {
return null;
}
return null;
$urlItems = GeneralUtility::trimExplode('/', $path, true);
$code = array_pop($urlItems);
$this->setCookie($code);
$uri = '/';
if (count($urlItems) > 0) {
$uri = '/' . implode('/', $urlItems) . '/';
}
if (!empty($query)) {
$uri .= '?' . $query;
}
return $uri;
}
/**