From 5677300754891f24097d30343b5f8c2542d89177 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Tue, 18 May 2021 11:17:07 +0200 Subject: [PATCH] add additional domains for navigation --- core/Controller/Site/PageController.php | 1 + core/Router/SiteRouteLoader.php | 6 +++--- core/Site/SiteRequest.php | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/core/Controller/Site/PageController.php b/core/Controller/Site/PageController.php index 81a88e4..4a16fa8 100644 --- a/core/Controller/Site/PageController.php +++ b/core/Controller/Site/PageController.php @@ -41,6 +41,7 @@ class PageController extends AbstractController '_page' => $this->siteRequest->getPage(), '_menu' => $this->siteRequest->getMenu(), '_navigation' => $this->siteRequest->getNavigation(), + '_domain' => $this->siteRequest->getDomain(), '_locale' => $this->siteRequest->getNavigation()->getLocale(), '_store' => $this->siteStore, ]; diff --git a/core/Router/SiteRouteLoader.php b/core/Router/SiteRouteLoader.php index f76a3d1..88c7857 100644 --- a/core/Router/SiteRouteLoader.php +++ b/core/Router/SiteRouteLoader.php @@ -70,7 +70,7 @@ class SiteRouteLoader extends Loader '_menu' => $menu->getId(), '_page' => $node->getPage() ? $node->getPage()->getId() : null, '_navigation' => $navigation->getId(), - 'domain' => $navigation->getDomain(), + '_domain' => $navigation->getDomain(), ]; foreach ($node->getParameters() as $parameter) { @@ -90,7 +90,7 @@ class SiteRouteLoader extends Loader $additionalDomains = $navigation->getAdditionalDomains(); if (count($additionalDomains)) { - $host = '{domain}'; + $host = '{_domain}'; $domains = [ preg_quote($navigation->getDomain()), ]; @@ -103,7 +103,7 @@ class SiteRouteLoader extends Loader } } - $requirements['domain'] = sprintf('(%s)', implode('|', $domains)); + $requirements['_domain'] = sprintf('(%s)', implode('|', $domains)); } else { $host = $navigation->getDomain(); } diff --git a/core/Site/SiteRequest.php b/core/Site/SiteRequest.php index 55c9f20..4bc0690 100644 --- a/core/Site/SiteRequest.php +++ b/core/Site/SiteRequest.php @@ -66,4 +66,9 @@ class SiteRequest return null !== $menu ? $menu->getNavigation() : null; } + + public function getDomain(): string + { + return $this->requestStack->getCurrentRequest()->headers->get('host'); + } }