From 4c24f4e48dc4c85a15d2fce18b3d54217fde70c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Poulain?= Date: Sat, 18 Apr 2020 18:06:54 +0200 Subject: [PATCH] =?UTF-8?q?fix(i18n):=20switch=20le=20domaine=20si=20le=20?= =?UTF-8?q?server=5Fname=20n'est=20pas=20trouv=C3=A9e=20dans=20l'url=20d?= =?UTF-8?q?=C3=A9clar=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/i18n.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/i18n.php b/lib/i18n.php index c13260d..cfac2f5 100644 --- a/lib/i18n.php +++ b/lib/i18n.php @@ -55,13 +55,19 @@ $server_names= array('expolibre.org', 'www.expolibre.org', 'libreexpo.org', 'www if (!isset ($_SERVER['HTTP_REFERER']) or ( strrpos ($_SERVER['HTTP_REFERER'], 'expolibre.org') === false and strrpos ($_SERVER['HTTP_REFERER'], 'libreexpo.org') === false)) { + + # if we are deep in the tree we don't upgrade language: it may be choosen if ($current_dir == "expolibre.org") { $current_dir= $registered_languages['fr']['loc']; $prefered_dir= $registered_languages[prefered_language ()]['loc']; if (basename($current_dir) != basename ($prefered_dir)) { header ("Location: " . url_translate ($_SERVER['REQUEST_URI'], prefered_language ())); } + # if we are not on the good domain + if ($prefered_dir and false === strpos($prefered_dir, $_SERVER['SERVER_NAME'])) { + header ("Location: " . url_translate ($_SERVER['REQUEST_URI'], prefered_language ())); + } } } -?> +?> \ No newline at end of file