aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.idea/workspace.xml7
-rw-r--r--private/session.php2
-rw-r--r--version.txt2
-rw-r--r--welcome/index.php6
4 files changed, 11 insertions, 6 deletions
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e1ba42d..82a9e19 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -62,9 +62,9 @@
<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$/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/index.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/known/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/known/index.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" />
+ <change beforePath="$PROJECT_DIR$/welcome/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/welcome/index.php" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -175,7 +175,8 @@
<workItem from="1654352763363" duration="147000" />
<workItem from="1654692815481" duration="319000" />
<workItem from="1654695589166" duration="74000" />
- <workItem from="1654708779061" duration="2495000" />
+ <workItem from="1654708779061" duration="2539000" />
+ <workItem from="1654712510961" duration="189000" />
</task>
<servers />
</component>
diff --git a/private/session.php b/private/session.php
index bea80ed..3f0fd01 100644
--- a/private/session.php
+++ b/private/session.php
@@ -28,7 +28,7 @@ if (isset($_COOKIE['FL_SESSION_TOKEN'])) {
$_FULLNAME = $_PROFILE['name'];
$_FRENCH = $_PROFILE['profile']['locale']['name'] === "fr";
- if (!in_array($_USER, $_WELCOMED)) {
+ if (!in_array($_USER, $_WELCOMED) && $_FRENCH) {
header("Location: /welcome/?r=" . urlencode("https://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"));
die();
}
diff --git a/version.txt b/version.txt
index 0518ae5..4d938d5 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-4.10.7 (%ea%) \ No newline at end of file
+4.10.8 (%ea%) \ No newline at end of file
diff --git a/welcome/index.php b/welcome/index.php
index faf1df9..2c9f096 100644
--- a/welcome/index.php
+++ b/welcome/index.php
@@ -1,6 +1,6 @@
<?php
-require_once $_SERVER['DOCUMENT_ROOT'] . "/private/session-noconf.php";
+require_once $_SERVER['DOCUMENT_ROOT'] . "/private/session-noconf.php"; global $_FRENCH;
/** @var string $_FULLNAME
* @var string $_USER
@@ -9,6 +9,10 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/private/session-noconf.php";
* @var array $_CONFIG
*/
+if (!$_FRENCH) {
+ header("Location: /welcome/confirm/" . isset($_GET['r']) ? "?r=" . urlencode($_GET['r']) : "?r=/") and die();
+}
+
?>
<!DOCTYPE html>