From b5793048dfd6a7bcc2e940fd3bc716f767c7a43a Mon Sep 17 00:00:00 2001 From: Kristian Date: Tue, 2 Jan 2018 12:30:45 +0100 Subject: [PATCH] Remember selected lang in cookie # Conflicts: # data/web/inc/prerequisites.inc.php --- data/web/inc/prerequisites.inc.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/web/inc/prerequisites.inc.php b/data/web/inc/prerequisites.inc.php index c78b5aad..8aa20770 100644 --- a/data/web/inc/prerequisites.inc.php +++ b/data/web/inc/prerequisites.inc.php @@ -55,7 +55,7 @@ exit; require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/sessions.inc.php'; // Set language -if (!isset($_SESSION['mailcow_locale'])) { +if (!isset($_SESSION['mailcow_locale']) && !isset($_COOKIE['mailcow_locale'])) { if ($DETECT_LANGUAGE && isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { $header_lang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2); foreach ($AVAILABLE_LANGUAGES as $available_lang) { @@ -68,8 +68,12 @@ if (!isset($_SESSION['mailcow_locale'])) { $_SESSION['mailcow_locale'] = strtolower(trim($DEFAULT_LANG)); } } +if (isset($_COOKIE['mailcow_locale'])) { + $_SESSION['mailcow_locale'] = $_COOKIE['mailcow_locale']; +} if (isset($_GET['lang']) && in_array($_GET['lang'], $AVAILABLE_LANGUAGES)) { $_SESSION['mailcow_locale'] = $_GET['lang']; + setcookie("mailcow_locale", $_GET['lang'], time()+30758400); // one year } require_once $_SERVER['DOCUMENT_ROOT'] . '/lang/lang.en.php';