Skip to content
Snippets Groups Projects
Commit 6a68fa55 authored by Boris's avatar Boris
Browse files

Fix by @poka

parent 8cf493f8
No related branches found
No related tags found
No related merge requests found
......@@ -14,21 +14,33 @@ $legalNotice =
// Trouver une façon de définir $rootURL sans faire ça :
if ($_SERVER['SERVER_NAME'] == 'localhost') {
$rootURL = '/www/cesium-website';
} else {
$rootURL = '';
}
/* ====== i18n ====== */
function checkAvailableLanguages ($langList) {
foreach ($langList as $k => $v) {
foreach ($langList as $isoCode => $l) {
$loc = setlocale(LC_ALL, $langList[$k]['folder'], ($langList[$k]['folder'] . '.utf8'));
$loc = setlocale(LC_ALL, $l['folder'], ($l['folder'] . '.utf8'));
if ($loc === false) {
$langList[$k] = NULL;
unset($langList[$isoCode]);
} else {
$langList[$k]['localeCode'] = $loc;
$langList[$isoCode]['localeCode'] = $loc;
}
}
......@@ -85,18 +97,6 @@ bindTextDomains($textDomains);
// Trouver une façon de définir $rootURL sans faire ça :
if ($_SERVER['SERVER_NAME'] == 'localhost') {
$rootURL = '/www/cesium-website';
} else {
$rootURL = '/';
}
include('inc/functions.php');
include('inc/display.php');
......
......@@ -30,7 +30,8 @@ function getUserIpAddress ()
} else if (array_key_exists('HTTP_X_FORWARDED_FOR', $_SERVER)) {
return array_pop(explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']));
$a = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
return array_pop($a);
} else {
......
......@@ -24,11 +24,18 @@ function getLangFolder ($isoCode)
function defineLang ()
{
global $availableLanguages;
global $rootURL;
if (isset($_GET['lang'])) { /* From URL */
$lang = $_GET['lang'];
if (!in_array($lang, array_keys($availableLanguages))) {
header('Location: '. $rootURL . '/'. DEFAULT_LANG . '/');
}
} else { /* From browser (if visiting root page /) */
$lang = preg_replace('/^([^,-]+).*$/', '$1', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment