From 33aa95dadac2747fdda7b00f1651cbf2ecd09ab7 Mon Sep 17 00:00:00 2001
From: Minteck <contact@minteck.org>
Date: Wed, 8 Jun 2022 15:40:53 +0200
Subject: Fix 2

---
 .idea/workspace.xml        | 69 ++++++++++++++++++++++++++++++++++++++++++++--
 private/session-noconf.php | 11 ++++++++
 private/session.php        |  2 +-
 version.txt                |  2 +-
 4 files changed, 80 insertions(+), 4 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 41e9a9b..b6b250d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,71 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="e4941d36-f387-4fd6-8e3d-4cad435f2034" name="Changes" comment="" />
+    <list default="true" id="e4941d36-f387-4fd6-8e3d-4cad435f2034" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/cdn/statusbar.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/statusbar.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/.gitignore" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/.gitlab-ci.yml" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/.gitlab-ci.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/LICENSE" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/LICENSE" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/SatteliteGiteaData.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/SatteliteGiteaData.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/dllib/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/dllib/.gitignore" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/dllib/LICENSE" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/dllib/LICENSE" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/dllib/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/dllib/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/dllib/bower.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/dllib/bower.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/dllib/jquery.flexdatalist.css" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/dllib/jquery.flexdatalist.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/dllib/jquery.flexdatalist.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/dllib/jquery.flexdatalist.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/dllib/jquery.flexdatalist.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/dllib/jquery.flexdatalist.min.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/dllib/jquery.flexdatalist.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/dllib/jquery.flexdatalist.min.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/dllib/jquery.flexdatalist.min.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/dllib/jquery.flexdatalist.min.js.map" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/dllib/jquery.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/dllib/jquery.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/dllib/org.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/dllib/org.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/dllib/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/dllib/package.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/fonts/Nunito-Italic-VariableFont_wght.ttf" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/fonts/Nunito-Italic-VariableFont_wght.ttf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/fonts/Nunito-VariableFont_wght.ttf" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/fonts/Nunito-VariableFont_wght.ttf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/lib/LICENSE" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/lib/LICENSE" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/lib/tree_maker-min.css" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/lib/tree_maker-min.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/lib/tree_maker-min.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/lib/tree_maker-min.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/me/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/me/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/person/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/person/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/private/footer.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/private/footer.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/private/header.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/private/header.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/search/birth/data.json/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/birth/data.json/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/search/birth/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/birth/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/search/birth/results/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/birth/results/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/search/city/data.json/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/city/data.json/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/search/city/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/city/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/search/city/results/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/city/results/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/search/death/data.json/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/death/data.json/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/search/death/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/death/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/search/death/results/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/death/results/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/search/dept/data.json/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/dept/data.json/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/search/dept/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/dept/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/search/dept/results/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/dept/results/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/search/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/search/lastname/data.json/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/lastname/data.json/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/search/lastname/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/lastname/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/search/lastname/results/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/lastname/results/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/search/marriage/data.json/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/marriage/data.json/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/search/marriage/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/marriage/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/search/marriage/results/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/marriage/results/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/search/name/data.json/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/name/data.json/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/search/name/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/name/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/search/name/results/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/name/results/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/search/state/data.json/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/state/data.json/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/search/state/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/state/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/search/state/results/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/state/results/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/style/LICENSE" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/style/LICENSE" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/style/tree_maker.css" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/style/tree_maker.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/styles/common.css" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/styles/common.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/styles/dark.css" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/styles/dark.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/tree/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/tree/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/genealogy/tree/mktree.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/tree/mktree.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/private/session-noconf.php" beforeDir="false" afterPath="$PROJECT_DIR$/private/session-noconf.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/private/session.php" beforeDir="false" afterPath="$PROJECT_DIR$/private/session.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/version.txt" beforeDir="false" afterPath="$PROJECT_DIR$/version.txt" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -109,7 +173,8 @@
       <workItem from="1654352190298" duration="166000" />
       <workItem from="1654352378304" duration="53000" />
       <workItem from="1654352763363" duration="147000" />
-      <workItem from="1654692815481" duration="37000" />
+      <workItem from="1654692815481" duration="319000" />
+      <workItem from="1654695589166" duration="60000" />
     </task>
     <servers />
   </component>
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]"));
diff --git a/version.txt b/version.txt
index dd134ed..9fe1978 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-4.10.3 (%ea%)
\ No newline at end of file
+4.10.4b (%ea%)
\ No newline at end of file
-- 
cgit