diff --git a/htdocs/languages.php b/htdocs/languages.php index ce74dcf..28c2287 100644 --- a/htdocs/languages.php +++ b/htdocs/languages.php @@ -3,7 +3,7 @@ register_lang ('fr', array ( 'name' => 'Français', - 'loc' => '/', + 'loc' => '//expolibre.org/', 'pages' => [ /* Conserver l'ordre !! */ 'a-propos-april-et-expolibre.php', @@ -28,7 +28,7 @@ register_lang ('fr', register_lang ('en', array ( 'name' => 'English', - 'loc' => '/en/', + 'loc' => '//libreexpo.org/en/', /* Conserver l'ordre !! */ 'pages' => [ 'about-april-and-libreexpo.php', diff --git a/htdocs/lib/i18n.php b/htdocs/lib/i18n.php index b8d6b96..770871d 100644 --- a/htdocs/lib/i18n.php +++ b/htdocs/lib/i18n.php @@ -51,7 +51,10 @@ function url_translate ($url, $to) { /* * Redirect to prefered language, if needed, when referer is none or ourself */ -if (!isset ($_SERVER['HTTP_REFERER']) or strrpos ($_SERVER['HTTP_REFERER'], $_SERVER['SERVER_NAME']) === false) { +$server_names= array('expolibre.org', 'www.expolibre.org', 'libreexpo.org', 'www.libreexpo.org'); +if (!isset ($_SERVER['HTTP_REFERER']) or ( + strrpos ($_SERVER['HTTP_REFERER'], 'expolibre.org') === false and + strrpos ($_SERVER['HTTP_REFERER'], 'libreexpo.org') === false)) { if ($current_dir == "htdocs") $current_dir= $registered_languages['fr']['loc']; $prefered_dir= $registered_languages[prefered_language ()]['loc'];