From 3d1cd02f27518f1a04374c7c8320cd5d82ede6e9 Mon Sep 17 00:00:00 2001
From: Minteck <contact@minteck.org>
Date: Thu, 23 Feb 2023 19:34:56 +0100
Subject: Updated 40 files, added 37 files, deleted 1103 files and renamed 3905
 files (automated)

---
 includes/system/compare.inc     |  13 -
 includes/system/history.inc     |  13 -
 includes/system/history.old.inc | 528 ----------------------------------------
 includes/system/species.inc     |  72 ------
 includes/system/subsystem.inc   | 100 --------
 includes/system/tree.inc        | 114 ---------
 6 files changed, 840 deletions(-)
 delete mode 100644 includes/system/history.old.inc
 delete mode 100644 includes/system/species.inc
 delete mode 100644 includes/system/subsystem.inc
 delete mode 100644 includes/system/tree.inc

(limited to 'includes/system')

diff --git a/includes/system/compare.inc b/includes/system/compare.inc
index 2accb8a..768522f 100644
--- a/includes/system/compare.inc
+++ b/includes/system/compare.inc
@@ -2,19 +2,6 @@
 
 $members = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/$systemID/members.json"), true);
 
-function getMember(string $id) {
-    global $systemID;
-    global $members;
-
-    $member = null;
-
-    foreach ($members as $m) {
-        if ($m["id"] === $id) $member = $m;
-    }
-
-    return $member;
-}
-
 ?>
 
     <br>
diff --git a/includes/system/history.inc b/includes/system/history.inc
index 5905276..199f0ba 100644
--- a/includes/system/history.inc
+++ b/includes/system/history.inc
@@ -1,18 +1,5 @@
 <?php global $system; global $lang; global $pages; global $systemCommonName; $pages = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/pages.json"), true); $title = $pages["s:history"]["name"][$lang["_name"]] . " · " . $systemCommonName; global $systemID; global $app; require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/header.inc';
 
-function getMember(string $id) {
-    global $systemID;
-
-    $members = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/$systemID/members.json"), true);
-    $member = null;
-
-    foreach ($members as $m) {
-        if ($m["id"] === $id) $member = $m;
-    }
-
-    return $member;
-}
-
 ?>
 
     <br>
diff --git a/includes/system/history.old.inc b/includes/system/history.old.inc
deleted file mode 100644
index 060ba97..0000000
--- a/includes/system/history.old.inc
+++ /dev/null
@@ -1,528 +0,0 @@
-<?php global $system; global $systemCommonName; global $systemID; $title = "Front history · " . $systemCommonName; require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/header.inc';
-
-function getMember(string $id) {
-    global $systemID;
-
-    $members = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/$systemID/members.json"), true);
-    $member = null;
-
-    foreach ($members as $m) {
-        if ($m["id"] === $id) $member = $m;
-    }
-
-    return $member;
-}
-
-?>
-
-    <br>
-    <div class="container" id="page-content">
-        <?php
-
-        $switches = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/$systemID/switches.json"), true);
-        uksort($switches, function ($a, $b) {
-            if (isset($b["timestamp"]) && isset($a["timestamp"])) {
-                return strtotime($b["timestamp"]) - strtotime($a["timestamp"]);
-            } else {
-                return null;
-            }
-        });
-
-        function getSwitchesForDay(int $day) {
-            global $switches;
-
-            $filtered = array_values(array_filter($switches, function ($i) use ($day) {
-                $diff = strtotime(date("Y-m-d")) - strtotime(explode("T", $i["timestamp"])[0]);
-                return $diff <= (86400 * $day) && $diff > (86400 * ($day - 1));
-            }));
-
-            uksort($filtered, function ($a, $b) {
-                if (isset($b["timestamp"]) && isset($a["timestamp"])) {
-                    return strtotime($b["timestamp"]) - strtotime($a["timestamp"]);
-                } else {
-                    return null;
-                }
-            });
-
-            return $filtered;
-        }
-
-        function getSwitchBefore(string $id) {
-            global $switches;
-
-            $currentPassed = false;
-            $before = null;
-
-            foreach ($switches as $switch) {
-                if ($currentPassed) {
-                    $before = $switch;
-                    break;
-                } else {
-                    if ($switch["id"] === $id) {
-                        $currentPassed = true;
-                    }
-                }
-            }
-
-            return $before;
-        }
-
-        function isNotToday(int $timestamp, int $offset) {
-            if (date('Y-m-d', $timestamp) !== date('Y-m-d', time() - (86400 * $offset))) {
-                return true;
-            } else {
-                return false;
-            }
-        }
-
-        $switches1  = getSwitchesForDay(0);
-        $switches2  = getSwitchesForDay(1);
-        $switches3  = getSwitchesForDay(2);
-        $switches4  = getSwitchesForDay(3);
-        $switches5  = getSwitchesForDay(4);
-        $switches6  = getSwitchesForDay(5);
-        $switches7  = getSwitchesForDay(6);
-        $switches8  = getSwitchesForDay(7);
-        $switches9  = getSwitchesForDay(8);
-        $switches10 = getSwitchesForDay(9);
-
-        ?>
-        <h2>Front history in the <?= $systemCommonName ?></h2>
-        <div class="alert alert-warning" id="timezone" style="display: none;">
-            Times on this page are now shown using your local timezone (<span id="timezone-name">-</span>). Days start at <span id="day-start">-</span> (00:00 on UTC).
-            <script>
-                document.getElementById("day-start").innerText = new Date(<?= strtotime(date('Y-m-d')) ?> * 1000).toTimeString().substring(0, 5);
-                document.getElementById("timezone-name").innerText = new Date().toTimeString().split("(")[1].split(")")[0];
-            </script>
-        </div>
-        <h4>Today</h4>
-        <?php
-
-        $fronters = array_map(function ($i) {
-            return [
-                "member" => $i["members"][0] ?? null,
-                "member2" => $i["members"][1] ?? null,
-                "date" => strtotime($i["timestamp"])
-            ];
-        }, $switches1);
-
-        $fronters[] = [
-            "member" => isset($switches2[0]) ? (isset($switches2[0]["members"]) && isset($switches2[0]["members"][0]) ? $switches2[0]["members"][0] : null) : (isset($switches3[0]) ? (isset($switches3[0]["members"]) && isset($switches3[0]["members"][0]) ? $switches3[0]["members"][0] : null) : (isset($switches4[0]) ? (isset($switches4[0]["members"]) && isset($switches4[0]["members"][0]) ? $switches4[0]["members"][0] : null) : (isset($switches5[0]) ? (isset($switches5[0]["members"]) && isset($switches5[0]["members"][0]) ? $switches5[0]["members"][0] : null) : (isset($switches6[0]) ? (isset($switches6[0]["members"]) && isset($switches6[0]["members"][0]) ? $switches6[0]["members"][0] : null) : (isset($switches7[0]) ? (isset($switches7[0]["members"]) && isset($switches7[0]["members"][0]) ? $switches7[0]["members"][0] : null) : (isset($switches8[0]) ? (isset($switches8[0]["members"]) && isset($switches8[0]["members"][0]) ? $switches8[0]["members"][0] : null) : (isset($switches9[0]) ? (isset($switches9[0]["members"]) && isset($switches9[0]["members"][0]) ? $switches9[0]["members"][0] : null) : $switches10[0]["members"][0]))))))),
-            "member2" => isset($switches2[0]) ? (isset($switches2[0]["members"]) && isset($switches2[0]["members"][1]) ? $switches2[0]["members"][1] : null) : (isset($switches3[0]) ? (isset($switches3[0]["members"]) && isset($switches3[0]["members"][1]) ? $switches3[0]["members"][1] : null) : (isset($switches4[0]) ? (isset($switches4[0]["members"]) && isset($switches4[0]["members"][1]) ? $switches4[0]["members"][1] : null) : (isset($switches5[0]) ? (isset($switches5[0]["members"]) && isset($switches5[0]["members"][1]) ? $switches5[0]["members"][1] : null) : (isset($switches6[0]) ? (isset($switches6[0]["members"]) && isset($switches6[0]["members"][1]) ? $switches6[0]["members"][1] : null) : (isset($switches7[0]) ? (isset($switches7[0]["members"]) && isset($switches7[0]["members"][1]) ? $switches7[0]["members"][1] : null) : (isset($switches8[0]) ? (isset($switches8[0]["members"]) && isset($switches8[0]["members"][1]) ? $switches8[0]["members"][1] : null) : (isset($switches9[0]) ? (isset($switches9[0]["members"]) && isset($switches9[0]["members"][1]) ? $switches9[0]["members"][1] : null) : $switches10[0]["members"][1]))))))),
-            "date" => strtotime(isset($switches2[0]) ? $switches2[0]["timestamp"] : (isset($switches3[0]) ? $switches3[0]["timestamp"] : (isset($switches4[0]) ? $switches4[0]["timestamp"] : (isset($switches5[0]) ? $switches5[0]["timestamp"] : (isset($switches6[0]) ? $switches6[0]["timestamp"] : (isset($switches7[0]) ? $switches7[0]["timestamp"] : (isset($switches8[0]) ? $switches8[0]["timestamp"] : (isset($switches9[0]) ? $switches9[0]["timestamp"] : $switches10[0]["timestamp"]))))))))
-        ];
-
-        foreach ($fronters as $fronter): if (isset($fronter["member"])): $member = getMember($fronter["member"]);
-            ?>
-        <div class="fronter">
-            <span class="fronter-date" data-date-time="<?= isNotToday($fronter["date"], 0) ? strtotime(date('Y-m-d', $fronter["date"])) : $fronter["date"] ?>" style="opacity:.5;font-family: monospace;font-size:14px;vertical-align: middle;">
-                <?= isNotToday($fronter["date"], 0) ? "00:00" : date('H:i', $fronter["date"]) ?>
-            </span>
-            <span class="fronter-profile" style="vertical-align: middle;">
-                <a class="member-link" href="/<?= $member["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member["display_name"] ?? $member["name"] ?>
-                </a>
-                <?php if (isset($fronter["member2"])): $member2 = getMember($fronter["member2"]); ?>
-                and <a class="member-link" href="/<?= $member2["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member2["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>
-                <?php endif; ?>
-            </span>
-        </div>
-        <?php else: ?>
-            <div class="fronter">
-            <span class="fronter-date" data-date-time="<?= isNotToday($fronter["date"], 0) ? strtotime(date('Y-m-d', $fronter["date"])) : $fronter["date"] ?>" style="opacity:.5;font-family: monospace;font-size:14px;vertical-align: middle;">
-                <?= isNotToday($fronter["date"], 0) ? "00:00" : date('H:i', $fronter["date"]) ?>
-            </span>
-                <span class="fronter-profile" style="vertical-align: middle;">
-                <span class="text-muted">Fallback pony</span>
-            </span>
-            </div>
-        <?php endif; endforeach; ?>
-        <h4 style="margin-top:15px;">Yesterday</h4>
-        <?php
-
-        $fronters = array_map(function ($i) {
-            return [
-                "member" => $i["members"][0] ?? null,
-                "member2" => $i["members"][1] ?? null,
-                "date" => strtotime($i["timestamp"])
-            ];
-        }, $switches2);
-
-        $fronters[] = [
-            "member" => isset($switches3[0]) ? (isset($switches3[0]["members"]) && isset($switches3[0]["members"][0]) ? $switches3[0]["members"][0] : null) : (isset($switches4[0]) ? (isset($switches4[0]["members"]) && isset($switches4[0]["members"][0]) ? $switches4[0]["members"][0] : null) : (isset($switches5[0]) ? (isset($switches5[0]["members"]) && isset($switches5[0]["members"][0]) ? $switches5[0]["members"][0] : null) : (isset($switches6[0]) ? (isset($switches6[0]["members"]) && isset($switches6[0]["members"][0]) ? $switches6[0]["members"][0] : null) : (isset($switches7[0]) ? (isset($switches7[0]["members"]) && isset($switches7[0]["members"][0]) ? $switches7[0]["members"][0] : null) : (isset($switches8[0]) ? (isset($switches8[0]["members"]) && isset($switches8[0]["members"][0]) ? $switches8[0]["members"][0] : null) : (isset($switches9[0]) ? (isset($switches9[0]["members"]) && isset($switches9[0]["members"][0]) ? $switches9[0]["members"][0] : null) : $switches10[0]["members"][0])))))),
-            "member2" => isset($switches3[0]) ? (isset($switches3[0]["members"]) && isset($switches3[0]["members"][1]) ? $switches3[0]["members"][1] : null) : (isset($switches4[0]) ? (isset($switches4[0]["members"]) && isset($switches4[0]["members"][1]) ? $switches4[0]["members"][1] : null) : (isset($switches5[0]) ? (isset($switches5[0]["members"]) && isset($switches5[0]["members"][1]) ? $switches5[0]["members"][1] : null) : (isset($switches6[0]) ? (isset($switches6[0]["members"]) && isset($switches6[0]["members"][1]) ? $switches6[0]["members"][1] : null) : (isset($switches7[0]) ? (isset($switches7[0]["members"]) && isset($switches7[0]["members"][1]) ? $switches7[0]["members"][1] : null) : (isset($switches8[0]) ? (isset($switches8[0]["members"]) && isset($switches8[0]["members"][1]) ? $switches8[0]["members"][1] : null) : (isset($switches9[0]) ? (isset($switches9[0]["members"]) && isset($switches9[0]["members"][1]) ? $switches9[0]["members"][1] : null) : $switches10[0]["members"][1])))))),
-            "date" => strtotime(isset($switches3[0]) ? $switches3[0]["timestamp"] : (isset($switches4[0]) ? $switches4[0]["timestamp"] : (isset($switches5[0]) ? $switches5[0]["timestamp"] : (isset($switches6[0]) ? $switches6[0]["timestamp"] : (isset($switches7[0]) ? $switches7[0]["timestamp"] : (isset($switches8[0]) ? $switches8[0]["timestamp"] : (isset($switches9[0]) ? $switches9[0]["timestamp"] : $switches10[0]["timestamp"])))))))
-        ];
-
-        foreach ($fronters as $fronter): if (isset($fronter["member"])): $member = getMember($fronter["member"]);
-            ?>
-            <div class="fronter">
-            <span class="fronter-date" data-date-time="<?= isNotToday($fronter["date"], 1) ? strtotime(date('Y-m-d', $fronter["date"])) : $fronter["date"] ?>" style="opacity:.5;font-family: monospace;font-size:14px;vertical-align: middle;">
-                <?= isNotToday($fronter["date"], 1) ? "00:00" : date('H:i', $fronter["date"]) ?>
-            </span>
-                <span class="fronter-profile" style="vertical-align: middle;">
-                <a class="member-link" href="/<?= $member["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member["display_name"] ?? $member["name"] ?>
-                </a>
-                <?php if (isset($fronter["member2"])): $member2 = getMember($fronter["member2"]); ?>
-                    and <a class="member-link" href="/<?= $member2["name"] ?>">
-                <img src="<?= getAsset($systemID, $member2["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>
-                <?php endif; ?>
-            </span>
-            </div>
-        <?php else: ?>
-            <div class="fronter">
-            <span class="fronter-date" data-date-time="<?= isNotToday($fronter["date"], 1) ? strtotime(date('Y-m-d', $fronter["date"])) : $fronter["date"] ?>" style="opacity:.5;font-family: monospace;font-size:14px;vertical-align: middle;">
-                <?= isNotToday($fronter["date"], 1) ? "00:00" : date('H:i', $fronter["date"]) ?>
-            </span>
-                <span class="fronter-profile" style="vertical-align: middle;">
-                <span class="text-muted">Fallback pony</span>
-            </span>
-            </div>
-        <?php endif; endforeach; ?>
-        <h4 style="margin-top:15px;"><?= date('D j M', time() - (86400 * 2)) ?></h4>
-        <?php
-
-        $fronters = array_map(function ($i) {
-            return [
-                "member" => $i["members"][0] ?? null,
-                "member2" => $i["members"][1] ?? null,
-                "date" => strtotime($i["timestamp"])
-            ];
-        }, $switches3);
-
-        $fronters[] = [
-            "member" => isset($switches4[0]) ? (isset($switches4[0]["members"]) && isset($switches4[0]["members"][0]) ? $switches4[0]["members"][0] : null) : (isset($switches5[0]) ? (isset($switches5[0]["members"]) && isset($switches5[0]["members"][0]) ? $switches5[0]["members"][0] : null) : (isset($switches6[0]) ? (isset($switches6[0]["members"]) && isset($switches6[0]["members"][0]) ? $switches6[0]["members"][0] : null) : (isset($switches7[0]) ? (isset($switches7[0]["members"]) && isset($switches7[0]["members"][0]) ? $switches7[0]["members"][0] : null) : (isset($switches8[0]) ? (isset($switches8[0]["members"]) && isset($switches8[0]["members"][0]) ? $switches8[0]["members"][0] : null) : (isset($switches9[0]) ? (isset($switches9[0]["members"]) && isset($switches9[0]["members"][0]) ? $switches9[0]["members"][0] : null) : $switches10[0]["members"][0]))))),
-            "member2" => isset($switches4[0]) ? (isset($switches4[0]["members"]) && isset($switches4[0]["members"][1]) ? $switches4[0]["members"][1] : null) : (isset($switches5[0]) ? (isset($switches5[0]["members"]) && isset($switches5[0]["members"][1]) ? $switches5[0]["members"][1] : null) : (isset($switches6[0]) ? (isset($switches6[0]["members"]) && isset($switches6[0]["members"][1]) ? $switches6[0]["members"][1] : null) : (isset($switches7[0]) ? (isset($switches7[0]["members"]) && isset($switches7[0]["members"][1]) ? $switches7[0]["members"][1] : null) : (isset($switches8[0]) ? (isset($switches8[0]["members"]) && isset($switches8[0]["members"][1]) ? $switches8[0]["members"][1] : null) : (isset($switches9[0]) ? (isset($switches9[0]["members"]) && isset($switches9[0]["members"][1]) ? $switches9[0]["members"][1] : null) : $switches10[0]["members"][1]))))),
-            "date" => strtotime(isset($switches4[0]) ? $switches4[0]["timestamp"] : (isset($switches5[0]) ? $switches5[0]["timestamp"] : (isset($switches6[0]) ? $switches6[0]["timestamp"] : (isset($switches7[0]) ? $switches7[0]["timestamp"] : (isset($switches8[0]) ? $switches8[0]["timestamp"] : (isset($switches9[0]) ? $switches9[0]["timestamp"] : $switches10[0]["timestamp"]))))))
-        ];
-
-        foreach ($fronters as $fronter): if (isset($fronter["member"])): $member = getMember($fronter["member"]);
-            ?>
-            <div class="fronter">
-            <span class="fronter-date" data-date-time="<?= isNotToday($fronter["date"], 2) ? strtotime(date('Y-m-d', $fronter["date"])) : $fronter["date"] ?>" style="opacity:.5;font-family: monospace;font-size:14px;vertical-align: middle;">
-                <?= isNotToday($fronter["date"], 2) ? "00:00" : date('H:i', $fronter["date"]) ?>
-            </span>
-                <span class="fronter-profile" style="vertical-align: middle;">
-                <a class="member-link" href="/<?= $member["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member["display_name"] ?? $member["name"] ?>
-                </a>
-                    <?php if (isset($fronter["member2"])): $member2 = getMember($fronter["member2"]); ?>
-                        and <a class="member-link" href="/<?= $member2["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member2["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>
-                    <?php endif; ?>
-            </span>
-            </div>
-        <?php else: ?>
-            <div class="fronter">
-            <span class="fronter-date" data-date-time="<?= isNotToday($fronter["date"], 2) ? strtotime(date('Y-m-d', $fronter["date"])) : $fronter["date"] ?>" style="opacity:.5;font-family: monospace;font-size:14px;vertical-align: middle;">
-                <?= isNotToday($fronter["date"], 2) ? "00:00" : date('H:i', $fronter["date"]) ?>
-            </span>
-                <span class="fronter-profile" style="vertical-align: middle;">
-                <span class="text-muted">Fallback pony</span>
-            </span>
-            </div>
-        <?php endif; endforeach; ?>
-        <h4 style="margin-top:15px;"><?= date('D j M', time() - (86400 * 3)) ?></h4>
-        <?php
-
-        $fronters = array_map(function ($i) {
-            return [
-                "member" => $i["members"][0] ?? null,
-                "member2" => $i["members"][1] ?? null,
-                "date" => strtotime($i["timestamp"])
-            ];
-        }, $switches4);
-
-        $fronters[] = [
-            "member" => isset($switches5[0]) ? (isset($switches5[0]["members"]) && isset($switches5[0]["members"][0]) ? $switches5[0]["members"][0] : null) : (isset($switches6[0]) ? (isset($switches6[0]["members"]) && isset($switches6[0]["members"][0]) ? $switches6[0]["members"][0] : null) : (isset($switches7[0]) ? (isset($switches7[0]["members"]) && isset($switches7[0]["members"][0]) ? $switches7[0]["members"][0] : null) : (isset($switches8[0]) ? (isset($switches8[0]["members"]) && isset($switches8[0]["members"][0]) ? $switches8[0]["members"][0] : null) : (isset($switches9[0]) ? (isset($switches9[0]["members"]) && isset($switches9[0]["members"][0]) ? $switches9[0]["members"][0] : null) : $switches10[0]["members"][0])))),
-            "member2" => isset($switches5[0]) ? (isset($switches5[0]["members"]) && isset($switches5[0]["members"][1]) ? $switches5[0]["members"][1] : null) : (isset($switches6[0]) ? (isset($switches6[0]["members"]) && isset($switches6[0]["members"][1]) ? $switches6[0]["members"][1] : null) : (isset($switches7[0]) ? (isset($switches7[0]["members"]) && isset($switches7[0]["members"][1]) ? $switches7[0]["members"][1] : null) : (isset($switches8[0]) ? (isset($switches8[0]["members"]) && isset($switches8[0]["members"][1]) ? $switches8[0]["members"][1] : null) : (isset($switches9[0]) ? (isset($switches9[0]["members"]) && isset($switches9[0]["members"][1]) ? $switches9[0]["members"][1] : null) : $switches10[0]["members"][1])))),
-            "date" => strtotime(isset($switches5[0]) ? $switches5[0]["timestamp"] : (isset($switches6[0]) ? $switches6[0]["timestamp"] : (isset($switches7[0]) ? $switches7[0]["timestamp"] : (isset($switches8[0]) ? $switches8[0]["timestamp"] : (isset($switches9[0]) ? $switches9[0]["timestamp"] : $switches10[0]["timestamp"])))))
-        ];
-
-        foreach ($fronters as $fronter): if (isset($fronter["member"])): $member = getMember($fronter["member"]);
-            ?>
-            <div class="fronter">
-            <span class="fronter-date" data-date-time="<?= isNotToday($fronter["date"], 3) ? strtotime(date('Y-m-d', $fronter["date"])) : $fronter["date"] ?>" style="opacity:.5;font-family: monospace;font-size:14px;vertical-align: middle;">
-                <?= isNotToday($fronter["date"], 3) ? "00:00" : date('H:i', $fronter["date"]) ?>
-            </span>
-                <span class="fronter-profile" style="vertical-align: middle;">
-                <a class="member-link" href="/<?= $member["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member["display_name"] ?? $member["name"] ?>
-                </a>
-                    <?php if (isset($fronter["member2"])): $member2 = getMember($fronter["member2"]); ?>
-                        and <a class="member-link" href="/<?= $member2["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member2["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>
-                    <?php endif; ?>
-            </span>
-            </div>
-        <?php else: ?>
-            <div class="fronter">
-            <span class="fronter-date" data-date-time="<?= isNotToday($fronter["date"], 3) ? strtotime(date('Y-m-d', $fronter["date"])) : $fronter["date"] ?>" style="opacity:.5;font-family: monospace;font-size:14px;vertical-align: middle;">
-                <?= isNotToday($fronter["date"], 3) ? "00:00" : date('H:i', $fronter["date"]) ?>
-            </span>
-                <span class="fronter-profile" style="vertical-align: middle;">
-                <span class="text-muted">Fallback pony</span>
-            </span>
-            </div>
-        <?php endif; endforeach; ?>
-        <h4 style="margin-top:15px;"><?= date('D j M', time() - (86400 * 4)) ?></h4>
-        <?php
-
-        $fronters = array_map(function ($i) {
-            return [
-                "member" => $i["members"][0] ?? null,
-                "member2" => $i["members"][1] ?? null,
-                "date" => strtotime($i["timestamp"])
-            ];
-        }, $switches5);
-
-        $fronters[] = [
-            "member" => isset($switches6[0]) ? (isset($switches6[0]["members"]) && isset($switches6[0]["members"][0]) ? $switches6[0]["members"][0] : null) : (isset($switches7[0]) ? (isset($switches7[0]["members"]) && isset($switches7[0]["members"][0]) ? $switches7[0]["members"][0] : null) : (isset($switches8[0]) ? (isset($switches8[0]["members"]) && isset($switches8[0]["members"][0]) ? $switches8[0]["members"][0] : null) : (isset($switches9[0]) ? (isset($switches9[0]["members"]) && isset($switches9[0]["members"][0]) ? $switches9[0]["members"][0] : null) : $switches10[0]["members"][0]))),
-            "member2" => isset($switches6[0]) ? (isset($switches6[0]["members"]) && isset($switches6[0]["members"][1]) ? $switches6[0]["members"][1] : null) : (isset($switches7[0]) ? (isset($switches7[0]["members"]) && isset($switches7[0]["members"][1]) ? $switches7[0]["members"][1] : null) : (isset($switches8[0]) ? (isset($switches8[0]["members"]) && isset($switches8[0]["members"][1]) ? $switches8[0]["members"][1] : null) : (isset($switches9[0]) ? (isset($switches9[0]["members"]) && isset($switches9[0]["members"][1]) ? $switches9[0]["members"][1] : null) : $switches10[0]["members"][1]))),
-            "date" => strtotime(isset($switches6[0]) ? $switches6[0]["timestamp"] : (isset($switches7[0]) ? $switches7[0]["timestamp"] : (isset($switches8[0]) ? $switches8[0]["timestamp"] : (isset($switches9[0]) ? $switches9[0]["timestamp"] : $switches10[0]["timestamp"]))))
-        ];
-
-        foreach ($fronters as $fronter): if (isset($fronter["member"])): $member = getMember($fronter["member"]);
-            ?>
-            <div class="fronter">
-            <span class="fronter-date" data-date-time="<?= isNotToday($fronter["date"], 4) ? strtotime(date('Y-m-d', $fronter["date"])) : $fronter["date"] ?>" style="opacity:.5;font-family: monospace;font-size:14px;vertical-align: middle;">
-                <?= isNotToday($fronter["date"], 4) ? "00:00" : date('H:i', $fronter["date"]) ?>
-            </span>
-                <span class="fronter-profile" style="vertical-align: middle;">
-                <a class="member-link" href="/<?= $member["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member["display_name"] ?? $member["name"] ?>
-                </a>
-                    <?php if (isset($fronter["member2"])): $member2 = getMember($fronter["member2"]); ?>
-                        and <a class="member-link" href="/<?= $member2["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member2["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>
-                    <?php endif; ?>
-            </span>
-            </div>
-        <?php else: ?>
-            <div class="fronter">
-            <span class="fronter-date" data-date-time="<?= isNotToday($fronter["date"], 4) ? strtotime(date('Y-m-d', $fronter["date"])) : $fronter["date"] ?>" style="opacity:.5;font-family: monospace;font-size:14px;vertical-align: middle;">
-                <?= isNotToday($fronter["date"], 4) ? "00:00" : date('H:i', $fronter["date"]) ?>
-            </span>
-                <span class="fronter-profile" style="vertical-align: middle;">
-                <span class="text-muted">Fallback pony</span>
-            </span>
-            </div>
-        <?php endif; endforeach; ?>
-        <h4 style="margin-top:15px;"><?= date('D j M', time() - (86400 * 5)) ?></h4>
-        <?php
-
-        $fronters = array_map(function ($i) {
-            return [
-                "member" => $i["members"][0] ?? null,
-                "member2" => $i["members"][1] ?? null,
-                "date" => strtotime($i["timestamp"])
-            ];
-        }, $switches6);
-
-        $fronters[] = [
-            "member" => isset($switches7[0]) ? (isset($switches7[0]["members"]) && isset($switches7[0]["members"][0]) ? $switches7[0]["members"][0] : null) : (isset($switches8[0]) ? (isset($switches8[0]["members"]) && isset($switches8[0]["members"][0]) ? $switches8[0]["members"][0] : null) : (isset($switches9[0]) ? (isset($switches9[0]["members"]) && isset($switches9[0]["members"][0]) ? $switches9[0]["members"][0] : null) : $switches10[0]["members"][0])),
-            "member2" => isset($switches7[0]) ? (isset($switches7[0]["members"]) && isset($switches7[0]["members"][1]) ? $switches7[0]["members"][1] : null) : (isset($switches8[0]) ? (isset($switches8[0]["members"]) && isset($switches8[0]["members"][1]) ? $switches8[0]["members"][1] : null) : (isset($switches9[0]) ? (isset($switches9[0]["members"]) && isset($switches9[0]["members"][1]) ? $switches9[0]["members"][1] : null) : $switches10[0]["members"][1])),
-            "date" => strtotime(isset($switches7[0]) ? $switches7[0]["timestamp"] : (isset($switches8[0]) ? $switches8[0]["timestamp"] : (isset($switches9[0]) ? $switches9[0]["timestamp"] : $switches10[0]["timestamp"])))
-        ];
-
-        foreach ($fronters as $fronter): if (isset($fronter["member"])): $member = getMember($fronter["member"]);
-            ?>
-            <div class="fronter">
-            <span class="fronter-date" data-date-time="<?= isNotToday($fronter["date"], 5) ? strtotime(date('Y-m-d', $fronter["date"])) : $fronter["date"] ?>" style="opacity:.5;font-family: monospace;font-size:14px;vertical-align: middle;">
-                <?= isNotToday($fronter["date"], 5) ? "00:00" : date('H:i', $fronter["date"]) ?>
-            </span>
-                <span class="fronter-profile" style="vertical-align: middle;">
-                <a class="member-link" href="/<?= $member["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member["display_name"] ?? $member["name"] ?>
-                </a>
-                    <?php if (isset($fronter["member2"])): $member2 = getMember($fronter["member2"]); ?>
-                        and <a class="member-link" href="/<?= $member2["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member2["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>
-                    <?php endif; ?>
-            </span>
-            </div>
-        <?php else: ?>
-            <div class="fronter">
-            <span class="fronter-date" data-date-time="<?= isNotToday($fronter["date"], 5) ? strtotime(date('Y-m-d', $fronter["date"])) : $fronter["date"] ?>" style="opacity:.5;font-family: monospace;font-size:14px;vertical-align: middle;">
-                <?= isNotToday($fronter["date"], 5) ? "00:00" : date('H:i', $fronter["date"]) ?>
-            </span>
-                <span class="fronter-profile" style="vertical-align: middle;">
-                <span class="text-muted">Fallback pony</span>
-            </span>
-            </div>
-        <?php endif; endforeach; ?>
-        <h4 style="margin-top:15px;"><?= date('D j M', time() - (86400 * 6)) ?></h4>
-        <?php
-
-        $fronters = array_map(function ($i) {
-            return [
-                "member" => $i["members"][0] ?? null,
-                "member2" => $i["members"][1] ?? null,
-                "date" => strtotime($i["timestamp"])
-            ];
-        }, $switches7);
-
-        $fronters[] = [
-            "member" => isset($switches8[0]) ? (isset($switches8[0]["members"]) && isset($switches8[0]["members"][0]) ? $switches8[0]["members"][0] : null) : (isset($switches9[0]) ? (isset($switches9[0]["members"]) && isset($switches9[0]["members"][0]) ? $switches9[0]["members"][0] : null) : $switches10[0]["members"][0]),
-            "member2" => isset($switches8[0]) ? (isset($switches8[0]["members"]) && isset($switches8[0]["members"][1]) ? $switches8[0]["members"][1] : null) : (isset($switches9[0]) ? (isset($switches9[0]["members"]) && isset($switches9[0]["members"][1]) ? $switches9[0]["members"][1] : null) : $switches10[0]["members"][1]),
-            "date" => strtotime(isset($switches8[0]) ? $switches8[0]["timestamp"] : (isset($switches9[0]) ? $switches9[0]["timestamp"] : $switches10[0]["timestamp"]))
-        ];
-
-        foreach ($fronters as $fronter): if (isset($fronter["member"])): $member = getMember($fronter["member"]);
-            ?>
-            <div class="fronter">
-            <span class="fronter-date" data-date-time="<?= isNotToday($fronter["date"], 6) ? strtotime(date('Y-m-d', $fronter["date"])) : $fronter["date"] ?>" style="opacity:.5;font-family: monospace;font-size:14px;vertical-align: middle;">
-                <?= isNotToday($fronter["date"], 6) ? "00:00" : date('H:i', $fronter["date"]) ?>
-            </span>
-                <span class="fronter-profile" style="vertical-align: middle;">
-                <a class="member-link" href="/<?= $member["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member["display_name"] ?? $member["name"] ?>
-                </a>
-                    <?php if (isset($fronter["member2"])): $member2 = getMember($fronter["member2"]); ?>
-                        and <a class="member-link" href="/<?= $member2["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member2["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>
-                    <?php endif; ?>
-            </span>
-            </div>
-        <?php else: ?>
-            <div class="fronter">
-            <span class="fronter-date" data-date-time="<?= isNotToday($fronter["date"], 6) ? strtotime(date('Y-m-d', $fronter["date"])) : $fronter["date"] ?>" style="opacity:.5;font-family: monospace;font-size:14px;vertical-align: middle;">
-                <?= isNotToday($fronter["date"], 6) ? "00:00" : date('H:i', $fronter["date"]) ?>
-            </span>
-                <span class="fronter-profile" style="vertical-align: middle;">
-                <span class="text-muted">Fallback pony</span>
-            </span>
-            </div>
-        <?php endif; endforeach; ?>
-        <h4 style="margin-top:15px;"><?= date('D j M', time() - (86400 * 7)) ?></h4>
-        <?php
-
-        $fronters = array_map(function ($i) {
-            return [
-                "member" => $i["members"][0] ?? null,
-                "member2" => $i["members"][1] ?? null,
-                "date" => strtotime($i["timestamp"])
-            ];
-        }, $switches8);
-
-        $fronters[] = [
-            "member" => isset($switches9[0]) ? (isset($switches9[0]["members"]) && isset($switches9[0]["members"][0]) ? $switches9[0]["members"][0] : null) : $switches10[0]["members"][0],
-            "member2" => isset($switches9[0]) ? (isset($switches9[0]["members"]) && isset($switches9[0]["members"][1]) ? $switches9[0]["members"][1] : null) : $switches10[0]["members"][1],
-            "date" => strtotime(isset($switches9[0]) ? $switches9[0]["timestamp"] : $switches10[0]["timestamp"])
-        ];
-
-        foreach ($fronters as $fronter): if (isset($fronter["member"])): $member = getMember($fronter["member"]);
-            ?>
-            <div class="fronter">
-            <span class="fronter-date" data-date-time="<?= isNotToday($fronter["date"], 7) ? strtotime(date('Y-m-d', $fronter["date"])) : $fronter["date"] ?>" style="opacity:.5;font-family: monospace;font-size:14px;vertical-align: middle;">
-                <?= isNotToday($fronter["date"], 7) ? "00:00" : date('H:i', $fronter["date"]) ?>
-            </span>
-                <span class="fronter-profile" style="vertical-align: middle;">
-                <a class="member-link" href="/<?= $member["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member["display_name"] ?? $member["name"] ?>
-                </a>
-                    <?php if (isset($fronter["member2"])): $member2 = getMember($fronter["member2"]); ?>
-                        and <a class="member-link" href="/<?= $member2["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>
-                    <?php endif; ?>
-            </span>
-            </div>
-        <?php else: ?>
-            <div class="fronter">
-            <span class="fronter-date" data-date-time="<?= isNotToday($fronter["date"], 7) ? strtotime(date('Y-m-d', $fronter["date"])) : $fronter["date"] ?>" style="opacity:.5;font-family: monospace;font-size:14px;vertical-align: middle;">
-                <?= isNotToday($fronter["date"], 7) ? "00:00" : date('H:i', $fronter["date"]) ?>
-            </span>
-            <span class="fronter-profile" style="vertical-align: middle;">
-                <span class="text-muted">Fallback pony</span>
-            </span>
-            </div>
-        <?php endif; endforeach; ?>
-        <h4 style="margin-top:15px;"><?= date('D j M', time() - (86400 * 8)) ?></h4>
-        <?php
-
-        $fronters = array_map(function ($i) {
-            return [
-                "member" => $i["members"][0] ?? null,
-                "member2" => $i["members"][1] ?? null,
-                "date" => strtotime($i["timestamp"])
-            ];
-        }, $switches9);
-
-        $fronters[] = [
-            "member" => isset($switches10[0]) ? $switches10[0]["members"][0] : getSwitchBefore($switches9[count($switches9) - 1]["id"])["members"][0],
-            "member2" => isset($switches10[0]) && isset($switches10[0]["members"]) && isset($switches10[0]["members"][1]) ? $switches10[0]["members"][1] : (isset(getSwitchBefore($switches9[count($switches9) - 1]["id"])["members"][1]) ? getSwitchBefore($switches9[count($switches9) - 1]["id"])["members"][1] : null),
-            "date" => strtotime(isset($switches10[0]) ? $switches10[0]["timestamp"] : getSwitchBefore($switches9[count($switches9) - 1]["id"])["timestamp"])
-        ];
-
-        foreach ($fronters as $fronter): if (isset($fronter["member"])): $member = getMember($fronter["member"]);
-            ?>
-            <div class="fronter">
-            <span class="fronter-date" data-date-time="<?= isNotToday($fronter["date"], 8) ? strtotime(date('Y-m-d', $fronter["date"])) : $fronter["date"] ?>" style="opacity:.5;font-family: monospace;font-size:14px;vertical-align: middle;">
-                <?= isNotToday($fronter["date"], 8) ? "00:00" : date('H:i', $fronter["date"]) ?>
-            </span>
-                <span class="fronter-profile" style="vertical-align: middle;">
-                <a class="member-link" href="/<?= $member["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member["display_name"] ?? $member["name"] ?>
-                </a>
-                    <?php if (isset($fronter["member2"])): $member2 = getMember($fronter["member2"]); ?>
-                        and <a class="member-link" href="/<?= $member2["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>
-                    <?php endif; ?>
-            </span>
-            </div>
-        <?php else: ?>
-            <div class="fronter">
-            <span class="fronter-date" data-date-time="<?= isNotToday($fronter["date"], 7) ? strtotime(date('Y-m-d', $fronter["date"])) : $fronter["date"] ?>" style="opacity:.5;font-family: monospace;font-size:14px;vertical-align: middle;">
-                <?= isNotToday($fronter["date"], 7) ? "00:00" : date('H:i', $fronter["date"]) ?>
-            </span>
-                <span class="fronter-profile" style="vertical-align: middle;">
-                <span class="text-muted">Fallback pony</span>
-            </span>
-            </div>
-        <?php endif; endforeach; ?>
-        <h4 style="margin-top:15px;"><?= date('D j M', time() - (86400 * 9)) ?></h4>
-        <?php
-
-        $fronters = array_map(function ($i) {
-            return [
-                "member" => $i["members"][0] ?? null,
-                "member2" => $i["members"][1] ?? null,
-                "date" => strtotime($i["timestamp"])
-            ];
-        }, $switches10);
-
-        foreach ($fronters as $fronter): if (isset($fronter["member"])): $member = getMember($fronter["member"]);
-            ?>
-            <div class="fronter">
-            <span class="fronter-date" data-date-time="<?= isNotToday($fronter["date"], 9) ? strtotime(date('Y-m-d', $fronter["date"])) : $fronter["date"] ?>" style="opacity:.5;font-family: monospace;font-size:14px;vertical-align: middle;">
-                <?= isNotToday($fronter["date"], 9) ? "00:00" : date('H:i', $fronter["date"]) ?>
-            </span>
-                <span class="fronter-profile" style="vertical-align: middle;">
-                <a class="member-link" href="/<?= $member["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member["display_name"] ?? $member["name"] ?>
-                </a>
-                    <?php if (isset($fronter["member2"])): $member2 = getMember($fronter["member2"]); ?>
-                         <a class="member-link" href="/<?= $member2["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>
-                    <?php endif; ?>
-            </span>
-            </div>
-        <?php else: ?>
-            <div class="fronter">
-            <span class="fronter-date" data-date-time="<?= isNotToday($fronter["date"], 7) ? strtotime(date('Y-m-d', $fronter["date"])) : $fronter["date"] ?>" style="opacity:.5;font-family: monospace;font-size:14px;vertical-align: middle;">
-                <?= isNotToday($fronter["date"], 7) ? "00:00" : date('H:i', $fronter["date"]) ?>
-            </span>
-                <span class="fronter-profile" style="vertical-align: middle;">
-                <span class="text-muted">Fallback pony</span>
-            </span>
-            </div>
-        <?php endif; endforeach; ?>
-    </div>
-    <script>
-        Array.from(document.getElementsByClassName("fronter-date")).forEach((i) => { i.innerText = new Date(parseInt(i.getAttribute("data-date-time").trim()) * 1000).toTimeString().split(" ")[0].substring(0, 5) + " " });
-        document.getElementById("timezone").style.display = "";
-    </script>
-
-<?php require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/footer.inc'; ?>
\ No newline at end of file
diff --git a/includes/system/species.inc b/includes/system/species.inc
deleted file mode 100644
index b5fdee6..0000000
--- a/includes/system/species.inc
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php global $system; global $systemCommonName; global $lang; global $pages; global $systemID; $pages = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/pages.json"), true); $title = $pages["s:species"]["name"][$lang["_name"]] . " · " . $systemCommonName; require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/header.inc'; global $travelling;
-
-$members = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/$systemID/members.json"), true);
-$members = scoreOrder($members, $systemID);
-
-function species(array $members, string $id, string $name) { global $systemID; global $travelling; ?>
-    <?php
-
-    $members = [
-        ...array_map(function ($i) use ($systemID) { $i["_system"] = $systemID; return $i; },array_filter($members, function ($i) use ($systemID) {
-            global $travelling;
-            return !($travelling[$i['id']]['travelling'] || (isset($travelling[$i['id']]['equestria']) && $travelling[$i['id']]['equestria']));
-        })),
-        ...array_map(function ($i) use ($systemID) { $i["_system"] = $systemID === "gdapd" ? "ynmuc" : "gdapd"; return $i; }, array_filter(json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/" . ($systemID === "gdapd" ? "ynmuc" : "gdapd") . "/members.json"), true), function ($i) use ($id, $systemID) {
-            global $travelling;
-            return $travelling[$i['id']]['travelling'] && !$travelling[$i['id']]['equestria'] && in_array($id, parseMetadata(json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/metadata/" . $i['id'] . ".json"), true))["species"]);
-        }))
-    ];
-    
-    ?>
-    <div class="relation" style="background-color:rgba(255, 255, 255, .1);margin-bottom:10px;padding:10px;border-radius:10px;display:grid;grid-template-columns: 1fr 4fr;">
-        <div class="relation-intro" style="background-color:rgba(255, 255, 255, .05);border-right:1px solid rgba(255, 255, 255, .1);margin:-10px;padding:10px;border-top-left-radius:10px;border-bottom-left-radius:10px;color: white;text-decoration: none;">
-            <img src="/assets/species/<?= $id ?>.png" style="width:24px;"><span class="species-name"> <?= $name ?></span> (<?= count($members) ?>)
-        </div>
-
-        <div class="relation-item" style="margin-left:10px;padding:0 20px;">
-            <?php if (count($members) > 0): ?>
-                <?php $index = 0; foreach ($members as $member): ?><a class="member-link" href="/<?= $member["name"] ?>"><img src="<?= getAsset($member["_system"], $member["id"], "heads") ?>" style="width:24px;"> <?= getMiniName($member["display_name"] ?? $member["name"]) ?></a><?php if ($index + 2 <= count($members)) echo('<span class="list-separator-desktop">, </span><span class="list-separator-mobile"><br></span>'); $index++; endforeach; ?>
-            <?php else: ?>-<?php endif; ?>
-        </div>
-    </div>
-<?php }
-
-?>
-
-    <br>
-    <div class="container" id="page-content">
-        <h2><?= str_replace("%1", $systemCommonName, $lang["species_compare"]["title"]) ?></h2>
-        <?php
-
-        $earth = [];
-        $pegasus = [];
-        $unicorn = [];
-        $alicorn = [];
-        $batpony = [];
-        $crystal = [];
-        $changeling = [];
-
-        foreach ($members as $member) {
-            foreach ($member["_metadata"]["species"] as $species) {
-                if ($species === "earth")      $earth[] = $member;
-                if ($species === "pegasus")    $pegasus[] = $member;
-                if ($species === "unicorn")    $unicorn[] = $member;
-                if ($species === "alicorn")    $alicorn[] = $member;
-                if ($species === "batpony")    $batpony[] = $member;
-                if ($species === "crystal")    $crystal[] = $member;
-                if ($species === "changeling") $changeling[] = $member;
-            }
-        }
-
-        ?>
-
-        <?php species($earth,   "earth",   $lang["species"]["earth"][3]); ?>
-        <?php species($pegasus, "pegasus", $lang["species"]["pegasus"][3]); ?>
-        <?php species($unicorn, "unicorn", $lang["species"]["unicorn"][3]); ?>
-        <?php species($alicorn, "alicorn", $lang["species"]["alicorn"][3]); ?>
-        <?php species($batpony, "batpony", $lang["species"]["batpony"][3]); ?>
-        <?php species($crystal, "crystal", $lang["species"]["crystal"][3]); ?>
-        <?php species($changeling, "changeling", "Changelings"); ?>
-    </div>
-
-<?php require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/footer.inc'; ?>
\ No newline at end of file
diff --git a/includes/system/subsystem.inc b/includes/system/subsystem.inc
deleted file mode 100644
index 3269df7..0000000
--- a/includes/system/subsystem.inc
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php global $system; global $systemCommonName; global $lang; global $pages; global $parts; global $systemID;
-
-if (str_ends_with($_GET['_'], "/subsystem")) header("Location: /?error=Invalid subsystem ID") and die();
-
-$members = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/$systemID/members.json"), true);
-
-$subsystemID = $parts[3];
-
-$subsystems = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/subsystems/$systemID.json"), true) ?? [];
-
-function getMember(string $id) {
-    global $systemID;
-    global $members;
-
-    $member = null;
-
-    foreach ($members as $m) {
-        if ($m["id"] === $id) $member = $m;
-    }
-
-    return $member;
-}
-
-function memberHasSubsystem(array $member) {
-    global $subsystems;
-    $has = false;
-
-    foreach ($subsystems as $subsystem) {
-        if ($subsystem["source_type"] === "member" && $subsystem["source"] === $member["id"]) {
-            $has = true;
-        }
-    }
-
-    return $has;
-}
-
-function memberPartOfSubsystem(array $member) {
-    global $subsystems;
-    $is = false;
-
-    foreach ($subsystems as $subsystem) {
-        if (in_array($member["id"], $subsystem["members"])) {
-            $is = true;
-        }
-    }
-
-    return $is;
-}
-
-function getMemberSubsystem(array $member) {
-    global $subsystems;
-    $subsystem = null;
-
-    foreach ($subsystems as $ss) {
-        if ($ss["source_type"] === "member" && $ss["source"] === $member["id"]) {
-            $subsystem = $ss;
-        }
-    }
-
-    return $subsystem;
-}
-
-function getSubsystemByID(string $id) {
-    global $subsystems;
-    $subsystem = null;
-
-    foreach ($subsystems as $ss) {
-        if ($ss["source"] === $id) {
-            $subsystem = $ss;
-        }
-    }
-
-    return $subsystem;
-}
-
-if (getSubsystemByID($subsystemID) === null) header("Location: /?error=Invalid subsystem ID") and die();
-$subsystemData = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/subsystems/$systemID-$subsystemID.json"), true);
-
-global $subsystem;
-$subsystem = getSubsystemByID($subsystemID);
-
-$title = $subsystemData["name"] . " · " . $systemCommonName; require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/header.inc';
-
-?>
-
-    <br>
-    <div class="container">
-        <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/subsysbanner.inc"; ?>
-        <br>
-
-        <div id="page-content">
-            <?php global $isLoggedIn; if ($isLoggedIn): ?>
-                <small style="opacity:.5;display:block;">(<a href="/-/edit/<?= $system ?>/<?= $subsystemID ?>">edit</a>)</small>
-            <?php endif; ?>
-            <?= file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/subsystems/$systemID-$subsystemID.html") ?>
-        </div>
-        <?php showSubsystem(getSubsystemByID($subsystemID), $systemID); ?>
-    </div>
-
-<?php require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/footer.inc'; ?>
\ No newline at end of file
diff --git a/includes/system/tree.inc b/includes/system/tree.inc
deleted file mode 100644
index 6a2d1cc..0000000
--- a/includes/system/tree.inc
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php global $system; global $systemCommonName; global $lang; global $pages; global $systemID; $pages = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/pages.json"), true); $title = $pages["s:tree"]["name"][$lang["_name"]] . " · " . $systemCommonName; require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/header.inc';
-
-$members = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/$systemID/members.json"), true);
-$members = scoreOrder($members, $systemID);
-
-$subsystems = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/subsystems/$systemID.json"), true) ?? [];
-
-function getMember(string $id) {
-    global $systemID;
-    global $members;
-
-    $member = null;
-
-    foreach ($members as $m) {
-        if ($m["id"] === $id) $member = $m;
-    }
-
-    return $member;
-}
-
-function memberHasSubsystem(array $member) {
-    global $subsystems;
-    $has = false;
-
-    foreach ($subsystems as $subsystem) {
-        if ($subsystem["source_type"] === "member" && $subsystem["source"] === $member["id"]) {
-            $has = true;
-        }
-    }
-
-    return $has;
-}
-
-function memberPartOfSubsystem(array $member) {
-    global $subsystems;
-    $is = false;
-
-    foreach ($subsystems as $subsystem) {
-        if (in_array($member["id"], $subsystem["members"])) {
-            $is = true;
-        }
-    }
-
-    return $is;
-}
-
-function getMemberSubsystem(array $member) {
-    global $subsystems;
-    $subsystem = null;
-
-    foreach ($subsystems as $ss) {
-        if ($ss["source_type"] === "member" && $ss["source"] === $member["id"]) {
-            $subsystem = $ss;
-        }
-    }
-
-    return $subsystem;
-}
-
-?>
-
-    <br>
-    <div class="container" id="page-content">
-        <h2><?= $lang["tree"]["title"] ?> <?= $systemCommonName ?></h2>
-        <a class="tree-root member-link" href="/<?= $system ?>">
-            <img src="/assets/uploads/<?= file_exists($_SERVER['DOCUMENT_ROOT'] . "/assets/uploads/" . $system . ".png") ? $system : "" ?>.png" style="height:24px;"> <span style="vertical-align: middle;"><?= $systemCommonName ?></span></a>
-        <?php $first = true; ?>
-        <?php foreach ($subsystems as $subsystem): if ($subsystem["source_type"] === "trait"): ?>
-        <div class="tree-l0">
-            <div class="tree-l0-separator<?= $first ? " tree-first-separator" : "" ?>">&nbsp;</div>
-            <div class="tree-inner">
-                <a class="member-link" href="/<?= $systemID === "gdapd" ? "raindrops" : "cloudburst" ?>/-/subsystem/<?= $subsystem["source"] ?>">
-                    <img src="/assets/uploads/ss-<?= $subsystem["source"] ?>.png" style="height:24px;border-radius:5px;"> <span style="vertical-align: middle;"><?= file_exists($_SERVER['DOCUMENT_ROOT'] . "/includes/data/subsystems/$systemID-$subsystem[source].json") ? json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/subsystems/$systemID-$subsystem[source].json"), true)["name"] : $subsystem["source"] ?></span>
-                </a>
-            </div>
-            <?php $ssfirst = true; foreach ($subsystem["members"] as $ssm): $ssmember = getMember($ssm); ?>
-                <div class="tree-l1">
-                    <div class="tree-l0-separator">&nbsp;</div>
-                    <div class="tree-l1-separator<?= $ssfirst ? " tree-first-separator" : "" ?>">&nbsp;</div>
-                    <div class="tree-inner">
-                        <a class="member-link" href="/<?= $ssmember["name"] ?>">
-                            <img src="<?= getAsset($systemID, $ssmember["id"], "heads") ?>" style="height:24px;"> <span style="vertical-align: middle;"><?= $ssmember["display_name"] ?? $ssmember["name"] ?></span>
-                        </a>
-                    </div>
-                </div>
-            <?php $ssfirst = false; endforeach; ?>
-        </div>
-        <?php $first = false; endif; endforeach; ?>
-        <?php foreach ($members as $member): if (!memberPartOfSubsystem($member)): ?>
-        <div class="tree-l0">
-            <div class="tree-l0-separator<?= $first ? " tree-first-separator" : "" ?>">&nbsp;</div>
-            <div class="tree-inner">
-                <a class="member-link" href="/<?= $member["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="height:24px;"> <span style="vertical-align: middle;"><?= $member["display_name"] ?? $member["name"] ?></span>
-                </a>
-            </div>
-            <?php if (memberHasSubsystem($member)): ?>
-                <?php $ssfirst = true; foreach (getMemberSubsystem($member)["members"] as $ssm): $ssmember = getMember($ssm); ?>
-                    <div class="tree-l1">
-                        <div class="tree-l0-separator">&nbsp;</div>
-                        <div class="tree-l1-separator<?= $ssfirst ? " tree-first-separator" : "" ?>">&nbsp;</div>
-                        <div class="tree-inner">
-                            <a class="member-link" href="/<?= $ssmember["name"] ?>">
-                                <img src="<?= getAsset($systemID, $ssmember["id"], "heads") ?>" style="height:24px;"> <span style="vertical-align: middle;"><?= $ssmember["display_name"] ?? $ssmember["name"] ?></span>
-                            </a>
-                        </div>
-                    </div>
-                <?php $ssfirst = false;endforeach; ?>
-            <?php endif; ?>
-        </div>
-        <?php $first = false; endif; endforeach; ?>
-    </div>
-
-<?php require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/footer.inc'; ?>
\ No newline at end of file
-- 
cgit