Updated 5 files (automated)

5 files changed, 64 insertions, 25 deletions

diff --git a/includes/util/functions.inc b/includes/util/functions.inc
index 9b6f356..8b22709 100644
--- a/includes/util/functions.inc
+++ b/includes/util/functions.inc
@@ -5,6 +5,18 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/util/bitset.inc";
 require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/util/homepage.inc";
 require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/util/random.inc";
 
+if (!function_exists("pf_utf8_decode")) {
+    function pf_utf8_decode(string $string): string {
+        return iconv("UTF-8", "ISO-8859-1", $string);
+    }
+}
+
+if (!function_exists("pf_utf8_encode")) {
+    function pf_utf8_encode(string $string): string {
+        return iconv("ISO-8859-1", "UTF-8", $string);
+    }
+}
+
 if (!function_exists("getLastFronted")) {
     function getLastFronted($members, $id) {
         foreach ($members as $member) {
@@ -37,7 +49,7 @@ if (!function_exists("formatPonypush")) {
 
 if (!function_exists("generateToken")) {
     function generateToken(): string {
-        return str_replace("/", ".", base64_encode(random_bytes(96)));
+        return "peh" . str_replace("/", ".", base64_encode(random_bytes(96)));
     }
 }
 
diff --git a/includes/util/session.inc b/includes/util/session.inc
index 6cee8be..e3af58b 100644
--- a/includes/util/session.inc
+++ b/includes/util/session.inc
@@ -36,7 +36,7 @@ $token = $authorization ?? $post ?? $_POST["_session"] ?? $_GET["_session"] ?? $
 if (isset($token)) {
     if (!(str_contains($token, "/") || trim($token) === "" || trim($token) === "." || trim($token) === "..")) {
         if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/includes/tokens/" . str_replace("/", "", $token))) {
-            $data = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/tokens/" . str_replace("/", "", $token)), true);
+            $data = json_decode(pf_utf8_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/tokens/" . str_replace("/", "", $token))), true);
 
             if (isset($data["profile"])) {
                 $_PROFILE = $data["profile"];
@@ -51,7 +51,17 @@ if (isset($token)) {
                 $data["last"] = time();
                 if (!isset($data["addresses"])) $data["addresses"] = [];
                 $data["addresses"][$_SERVER["HTTP_X_FORWARDED_FOR"] ?? $_SERVER["REMOTE_ADDR"]] = time();
-                file_put_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/tokens/" . str_replace("/", "", $token), json_encode($data));
+
+                copy($_SERVER['DOCUMENT_ROOT'] . "/includes/tokens/" . str_replace("/", "", $token), $_SERVER['DOCUMENT_ROOT'] . "/includes/tokens/" . str_replace("/", "", $token) . ".old");
+
+                file_put_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/tokens/" . str_replace("/", "", $token), pf_utf8_encode(json_encode($data)));
+
+                if (trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/tokens/" . str_replace("/", "", $token)) === "")) {
+                    unlink($_SERVER['DOCUMENT_ROOT'] . "/includes/tokens/" . str_replace("/", "", $token));
+                    copy($_SERVER['DOCUMENT_ROOT'] . "/includes/tokens/" . str_replace("/", "", $token) . ".old", $_SERVER['DOCUMENT_ROOT'] . "/includes/tokens/" . str_replace("/", "", $token));
+                }
+
+                unlink($_SERVER['DOCUMENT_ROOT'] . "/includes/tokens/" . str_replace("/", "", $token) . ".old");
             } else {
                 $_PROFILE = $data;
             }
@@ -63,7 +73,7 @@ if (isset($token)) {
 
             $isLoggedIn = true;
         } elseif (file_exists($_SERVER['DOCUMENT_ROOT'] . "/includes/lowertokens/" . str_replace("/", "", $token))) {
-            $data = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/lowertokens/" . str_replace("/", "", $token)), true);
+            $data = json_decode(pf_utf8_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/lowertokens/" . str_replace("/", "", $token))), true);
 
             if (isset($data["profile"])) {
                 $_PROFILE = $data["profile"];
@@ -76,8 +86,19 @@ if (isset($token)) {
                 }
 
                 $data["last"] = time();
+                if (!isset($data["addresses"])) $data["addresses"] = [];
                 $data["addresses"][$_SERVER["HTTP_X_FORWARDED_FOR"] ?? $_SERVER["REMOTE_ADDR"]] = time();
-                file_put_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/tokens/" . str_replace("/", "", $token), json_encode($data));
+
+                copy($_SERVER['DOCUMENT_ROOT'] . "/includes/lowertokens/" . str_replace("/", "", $token), $_SERVER['DOCUMENT_ROOT'] . "/includes/lowertokens/" . str_replace("/", "", $token) . ".old");
+
+                file_put_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/lowertokens/" . str_replace("/", "", $token), pf_utf8_encode(json_encode($data)));
+
+                if (trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/lowertokens/" . str_replace("/", "", $token)) === "")) {
+                    unlink($_SERVER['DOCUMENT_ROOT'] . "/includes/lowertokens/" . str_replace("/", "", $token));
+                    copy($_SERVER['DOCUMENT_ROOT'] . "/includes/lowertokens/" . str_replace("/", "", $token) . ".old", $_SERVER['DOCUMENT_ROOT'] . "/includes/lowertokens/" . str_replace("/", "", $token));
+                }
+
+                unlink($_SERVER['DOCUMENT_ROOT'] . "/includes/lowertokens/" . str_replace("/", "", $token) . ".old");
             } else {
                 $_PROFILE = $data;
             }
diff --git a/pages/api/rename.php b/pages/api/rename.php
index abec81e..3aab034 100644
--- a/pages/api/rename.php
+++ b/pages/api/rename.php
@@ -15,7 +15,7 @@ $obj = [
 ];
 
 global $token;
-$data = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/tokens/" . str_replace("/", "", $token)), true);
+$data = json_decode(pf_utf8_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/tokens/" . str_replace("/", "", $token))), true);
 
 $data["name"] = $_POST["name"] ?? $_GET["name"] ?? $data["name"];
 $obj["pre_name"] = $data["name"];
@@ -33,5 +33,5 @@ if (json_last_error() === JSON_ERROR_NONE) {
 
 $obj["new_name"] = $data["name"];
 
-file_put_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/tokens/" . str_replace("/", "", $token), json_encode($data));
+file_put_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/tokens/" . str_replace("/", "", $token), pf_utf8_encode(json_encode($data)));
 die(json_encode($obj));
\ No newline at end of file
diff --git a/pages/api/session.php b/pages/api/session.php
index 53e1845..d410c10 100644
--- a/pages/api/session.php
+++ b/pages/api/session.php
@@ -4,22 +4,26 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/util/functions.inc";
 require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/util/session.inc"; global $isLoggedIn; global $isLowerLoggedIn;
 
 header("Content-Type: application/json");
+global $token;
 
-if (!$isLoggedIn || $isLowerLoggedIn) {
-    die(json_encode([
-        "name" => null,
-        "created" => null,
-        "last_seen" => null,
-        "seen_at" => null
-    ], JSON_PRETTY_PRINT));
-}
+if (isset($_GET["raw"])) {
+    die(json_encode(json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/tokens/" . str_replace("/", "", $token)), true), JSON_PRETTY_PRINT));
+} else {
+    if (!$isLoggedIn || $isLowerLoggedIn) {
+        die(json_encode([
+            "name" => null,
+            "created" => null,
+            "last_seen" => null,
+            "seen_at" => null
+        ], JSON_PRETTY_PRINT));
+    }
 
-global $token;
-$data = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/tokens/" . str_replace("/", "", $token)), true);
+    $data = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/tokens/" . str_replace("/", "", $token)), true);
 
-die(json_encode([
-    "name" => $data["name"],
-    "created" => date('c', $data["created"]),
-    "last_seen" => date('c', $data["last"]),
-    "seen_at" => array_keys($data["addresses"] ?? [])
-], JSON_PRETTY_PRINT));
\ No newline at end of file
+    die(json_encode([
+        "name" => $data["name"],
+        "created" => date('c', $data["created"]),
+        "last_seen" => date('c', $data["last"]),
+        "seen_at" => array_keys($data["addresses"] ?? [])
+    ], JSON_PRETTY_PRINT));
+}
\ No newline at end of file
diff --git a/pages/sessions.inc b/pages/sessions.inc
index a8734ac..e24a78f 100644
--- a/pages/sessions.inc
+++ b/pages/sessions.inc
@@ -1,7 +1,7 @@
 <?php
 
 require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/init.inc"; global $title; global $isLoggedIn; global $isLowerLoggedIn; global $lang; global $pages;
-require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/components/header.inc'; global $_PROFILE;
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/components/header.inc'; global $_PROFILE; global $app;
 
 $verified = [
     dns_get_record("zephyrheights.equestria.dev", DNS_A)[0]["ip"],
@@ -9,6 +9,7 @@ $verified = [
     dns_get_record("bridlewood.equestria.dev", DNS_A)[0]["ip"],
     dns_get_record("cloudsdale.equestria.dev", DNS_A)[0]["ip"],
     dns_get_record("manehattan.equestria.dev", DNS_A)[0]["ip"],
+    dns_get_record("everfree.equestria.dev", DNS_A)[0]["ip"],
 ];
 
 $verifiedNames = [
@@ -16,7 +17,8 @@ $verifiedNames = [
     "Raindrops System",
     "Equestria.dev bridlewood",
     "Cloudburst System",
-    "Equestria.dev manehattan"
+    "Equestria.dev manehattan",
+    $app["other"]["name"]
 ];
 
 ?>