Updated 46 files and deleted 19 files (automated)

1 files changed, 8 insertions, 21 deletions

diff --git a/pages/page.inc b/pages/page.inc
index fb63383..fa82a10 100644
--- a/pages/page.inc
+++ b/pages/page.inc
@@ -9,10 +9,7 @@ if (!isset($_GET['_']) || trim($_GET['_']) === "") peh_error("Invalid request",
 
 $parts = explode("/", $_GET['_']);
 
-if (($parts[0] !== "cloudburst" && $parts[0] !== "raindrops" && $parts[0] !== "moonglow" && $parts[0] !== $app["other"]["slug"]) && (!(count($parts) > 2) || $parts[1] === "-")) {
-    $namesCloudburst = [...array_map(function ($i) {
-        return $i['name'];
-    }, json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/ynmuc/members.json"), true)), "unknown-cb"];
+if (($parts[0] !== "raindrops" && $parts[0] !== "moonglow" && $parts[0] !== $app["other"]["slug"]) && (!(count($parts) > 2) || $parts[1] === "-")) {
     $namesRaindrops = [...array_map(function ($i) {
         return $i['name'];
     }, json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/gdapd/members.json"), true)), "unknown-rd"];
@@ -33,9 +30,7 @@ if (($parts[0] !== "cloudburst" && $parts[0] !== "raindrops" && $parts[0] !== "m
     array_unshift($parts, "");
     $parts = array_values($parts);
 
-    if (in_array($parts[1], $namesCloudburst)) {
-        $parts[0] = "cloudburst";
-    } else if (in_array($parts[1], $namesRaindrops)) {
+    if (in_array($parts[1], $namesRaindrops)) {
         $parts[0] = "raindrops";
     } else if (in_array($parts[1], $namesMoonglow)) {
         $parts[0] = "moonglow";
@@ -49,9 +44,9 @@ if (($parts[0] !== "cloudburst" && $parts[0] !== "raindrops" && $parts[0] !== "m
 $system = $parts[0];
 $member = ($parts[1] ?? null) === "" ? null : ($parts[1] ?? null);
 
-if ($system !== "cloudburst" && $system !== "raindrops" && $system !== "moonglow" && ($system !== $app["other"]["slug"] && !$isLowerLoggedIn && !$isLoggedIn)) peh_error("System not found", 404);
-$systemCommonName = $system === "cloudburst" ? "Cloudburst System" : ($system === $app["other"]["slug"] && ($isLoggedIn || $isLowerLoggedIn) ? $app["other"]["name"] : ($system === "moonglow" ? "Moonglow" : "Raindrops System"));
-$systemID = $system === "cloudburst" ? "ynmuc" : ($system === $app["other"]["slug"] && ($isLoggedIn || $isLowerLoggedIn) ? $app["other"]["id"] : ($system === "moonglow" ? "hrbom" : "gdapd"));
+if ($system !== "raindrops" && $system !== "moonglow" && ($system !== $app["other"]["slug"] && !$isLowerLoggedIn && !$isLoggedIn)) peh_error("System not found", 404);
+$systemCommonName = $system === $app["other"]["slug"] && ($isLoggedIn || $isLowerLoggedIn) ? $app["other"]["name"] : ($system === "moonglow" ? "Moonglow" : "Raindrops System");
+$systemID = $system === $app["other"]["slug"] && ($isLoggedIn || $isLowerLoggedIn) ? $app["other"]["id"] : ($system === "moonglow" ? "hrbom" : "gdapd");
 
 if ($member === null) {
     global $_SystemName;
@@ -72,13 +67,12 @@ if ($member === null) {
     $traveller = false;
 
     $members = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/" . ($systemID === $app["other"]["id"] ? "other" : $systemID) . "/members.json"), true);
-    $members2 = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/" . ($systemID === "gdapd" ? "ynmuc" : "gdapd") . "/members.json"), true);
+    $members2 = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/" . ($systemID === "gdapd" ? "hrbom" : "gdapd") . "/members.json"), true);
     $memberData = null;
     $memberCommonName = null;
     $memberID = null;
 
-    foreach ($members as $m) {
-        if ($m['name'] === $member) {
+    foreach ($members as $m) {if ($m['name'] === $member) {
             $memberData = $m;
             $memberCommonName = $m['display_name'] ?? $m['name'];
             $memberID = $m['id'];
@@ -86,14 +80,7 @@ if ($member === null) {
     }
 
     foreach ($members2 as $m) {
-        if ($m['name'] === $member && $travelling[$m['id']]['travelling']) {
-            $traveller = true;
-            $memberData = $m;
-            $memberCommonName = $m['display_name'] ?? $m['name'];
-            $memberID = $m['id'];
-            $system = $systemID === "gdapd" ? "cloudburst" : "raindrops";
-            $systemID = $system === "cloudburst" ? "ynmuc" : "gdapd";
-        } else if ($m['name'] === $member) {
+        if ($m['name'] === $member) {
             $memberFoundInAnotherSystem = true;
         }
     }