From 7a025720d6a07323c4a0b32cf6c5fdb7d0269807 Mon Sep 17 00:00:00 2001
From: Minteck <contact@minteck.org>
Date: Sat, 5 Feb 2022 15:54:00 +0100
Subject: Update

---
 private/session.php | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

(limited to 'private/session.php')

diff --git a/private/session.php b/private/session.php
index 7a37d8a..37ff9e7 100644
--- a/private/session.php
+++ b/private/session.php
@@ -1,31 +1,35 @@
 <?php
 
-$_CONFIG = json_decode(file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/private/FamilineConfig.json"), true);
+global $_CONFIG;
+$_CONFIG = json_decode(file_get_contents("/mnt/familine/private/FamilineConfig.json"), true);
 
-if (isset($_COOKIE['FL_SESSION_TOKEN'])) {
-    if (strpos($_COOKIE['FL_SESSION_TOKEN'], ".") !== false || strpos($_COOKIE['FL_SESSION_TOKEN'], "/") !== false) {
-        header("Location: /welcome");
-        die();
-    }
+if ($_SERVER['REMOTE_ADDR'] !== "127.0.0.1" && $_SERVER['REMOTE_ADDR'] !== "::0") {
+    if (isset($_COOKIE['FL_SESSION_TOKEN'])) {
+        if (strpos($_COOKIE['FL_SESSION_TOKEN'], ".") !== false || strpos($_COOKIE['FL_SESSION_TOKEN'], "/") !== false) {
+            header("Location: https://" . $_CONFIG["Global"]["domain"] . "/login/?r=" . urlencode("https://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"));
+            die();
+        }
 
-    if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/private/tokens/" . str_replace(".", "", str_replace("/", "", $_COOKIE['FL_SESSION_TOKEN'])))) {
-        $_PROFILE = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/private/tokens/" . str_replace(".", "", str_replace("/", "", $_COOKIE['FL_SESSION_TOKEN']))), true);
+        if (file_exists("/mnt/familine/private/tokens/" . str_replace(".", "", str_replace("/", "", $_COOKIE['FL_SESSION_TOKEN'])))) {
+            $_PROFILE = json_decode(file_get_contents("/mnt/familine/private/tokens/" . str_replace(".", "", str_replace("/", "", $_COOKIE['FL_SESSION_TOKEN']))), true);
 
-        if (isset($_PROFILE['familine'])) {
-            header("Location: /welcome");
+            if (isset($_PROFILE['familine'])) {
+                header("Location: https://" . $_CONFIG["Global"]["domain"] . "/login/?r=" . urlencode("https://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"));
+                die();
+            }
+
+            $_USER = $_PROFILE['login'];
+            $_SUID = $_PROFILE['login'];
+            $_FULLNAME = $_PROFILE['name'];
+        } else {
+            header("Location: https://" . $_CONFIG["Global"]["domain"] . "/login/?r=" . urlencode("https://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"));
             die();
         }
-
-        $_USER = $_PROFILE['login'];
-        $_SUID = $_PROFILE['login'];
-        $_FULLNAME = $_PROFILE['name'];
     } else {
-        header("Location: /welcome");
+        header("Location: https://" . $_CONFIG["Global"]["domain"] . "/login/?r=" . urlencode("https://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"));
         die();
     }
-} else {
-    header("Location: /welcome");
-    die();
+
 }
 
 if (isset($_PROFILE["projectRoles"]) && is_array($_PROFILE["projectRoles"]) && isset($_PROFILE["projectRoles"][0]) && is_array($_PROFILE["projectRoles"][0]) && isset($_PROFILE["projectRoles"][0]["role"]) && is_array($_PROFILE["projectRoles"][0]["role"]) && isset($_PROFILE["projectRoles"][0]["role"]["key"]) && is_string($_PROFILE["projectRoles"][0]["role"]["key"]) && $_PROFILE["projectRoles"][0]["role"]["key"] === "system-admin") {
-- 
cgit