diff options
| author | Minteck <contact@minteck.org> | 2022-06-08 15:40:53 +0200 |
|---|---|---|
| committer | Minteck <contact@minteck.org> | 2022-06-08 15:40:53 +0200 |
| commit | 33aa95dadac2747fdda7b00f1651cbf2ecd09ab7 (patch) | |
| tree | be8055afb2230678336fe770a903115703fb54d4 /private | |
| parent | 544bf38fd99d9b7e4d0dfcf14e23b459ed8557f2 (diff) | |
| download | core-33aa95dadac2747fdda7b00f1651cbf2ecd09ab7.tar.gz core-33aa95dadac2747fdda7b00f1651cbf2ecd09ab7.tar.bz2 core-33aa95dadac2747fdda7b00f1651cbf2ecd09ab7.zip | |
Fix 2
Diffstat (limited to 'private')
| -rw-r--r-- | private/session-noconf.php | 11 | ||||
| -rw-r--r-- | private/session.php | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/private/session-noconf.php b/private/session-noconf.php index 37ff9e7..844a640 100644 --- a/private/session-noconf.php +++ b/private/session-noconf.php @@ -21,6 +21,7 @@ if ($_SERVER['REMOTE_ADDR'] !== "127.0.0.1" && $_SERVER['REMOTE_ADDR'] !== "::0" $_USER = $_PROFILE['login'];
$_SUID = $_PROFILE['login'];
$_FULLNAME = $_PROFILE['name'];
+ $_FRENCH = $_PROFILE['profile']['locale']['name'] === "fr";
} else {
header("Location: https://" . $_CONFIG["Global"]["domain"] . "/login/?r=" . urlencode("https://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"));
die();
@@ -37,3 +38,13 @@ if (isset($_PROFILE["projectRoles"]) && is_array($_PROFILE["projectRoles"]) && i } else {
$_ADMIN = false;
}
+
+function l($fr, $en) {
+ global $_FRENCH;
+
+ if ($_FRENCH) {
+ return $fr;
+ } else {
+ return $en;
+ }
+}
\ No newline at end of file diff --git a/private/session.php b/private/session.php index e9a2370..bea80ed 100644 --- a/private/session.php +++ b/private/session.php @@ -26,7 +26,7 @@ if (isset($_COOKIE['FL_SESSION_TOKEN'])) { $_USER = $_PROFILE['login'];
$_SUID = $_PROFILE['login'];
$_FULLNAME = $_PROFILE['name'];
- $_FRENCH = $_PROFILE['locale']['name'] === "fr";
+ $_FRENCH = $_PROFILE['profile']['locale']['name'] === "fr";
if (!in_array($_USER, $_WELCOMED)) {
header("Location: /welcome/?r=" . urlencode("https://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"));
|