Skip to content

[BUG] niche redirect error #592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
janhenckens merged 1 commit into from
Feb 27, 2026
Merged

[BUG] niche redirect error #592

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions modules/statik/src/services/LanguageService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

class LanguageService extends Component
{
public function getLanguageCookie(): string|null
public function getLanguageCookie(): ?string
{
$cookieValue = Craft::$app->getRequest()->getCookies()->getValue(Statik::LANGUAGE_COOKIE);
return $cookieValue;
Expand Down Expand Up @@ -61,17 +61,23 @@ public function redirect(): void
if ($site) {
if ($site->id === $currentSite->id) {
return;
} else {
$this->redirectToSite($site);
}

// INFO: Only redirect within the same site group (language variants of the same website)
// This prevents cross-site redirects between e.g. chiweb and oncweb
if ($site->groupId !== $currentSite->groupId) {
return;
}

$this->redirectToSite($site);
}
}

$this->detectLanguage();
}

/**
* This funcion only runs when the user enters the site on the root and doesn't have a cookie yet
* This function only runs when the user enters the site on the root and doesn't have a cookie yet
* It will look at the language available in the current install, and the languages accepted by the browser.
* - If a match can be made, we'll set the Statik::LANGUAGE_COOKIE cookie to that site handle and redirect the user
* - If no match can be made, we'll redirect to the primary site and set a cookie for that site.
Expand All @@ -80,12 +86,13 @@ public function redirect(): void
*/
private function detectLanguage(): void
{
$sites = Craft::$app->getSites()->getAllSites();
$currentSite = Craft::$app->getSites()->getCurrentSite();
$sites = Craft::$app->getSites()->getSitesByGroupId($currentSite->groupId);
$availableLanguages = [];
foreach ($sites as $site) {
$availableLanguages[$site->language] = (int)$site->id;
$availableLanguages[$site->language] = (int) $site->id;
$language = explode('-', $site->language);
$availableLanguages[$language[0]] = (int)$site->id;
$availableLanguages[$language[0]] = (int) $site->id;
}

$acceptedLanguages = [];
Expand Down Expand Up @@ -143,8 +150,8 @@ private function setLanguageCookie(Site $site): void
private function isExternalReferrer(string $referrer): bool
{
$refHost = parse_url($referrer, PHP_URL_HOST);
$siteHost = parse_url(getenv('BASE_URL'));
$currentSiteHost = parse_url(Craft::$app->getSites()->getCurrentSite()->baseUrl, PHP_URL_HOST);

return $refHost && $refHost !== $siteHost;
return $refHost && $refHost !== $currentSiteHost;
}
}
Loading