55 files changed, 120 insertions, 15 deletions

diff --git a/LICENSE b/LICENSE
index 0d58d33..0d58d33 100644..100755
--- a/LICENSE
+++ b/LICENSE
diff --git a/README.md b/README.md
index 540d6ea..540d6ea 100644..100755
--- a/README.md
+++ b/README.md
diff --git a/admin/callback/index.php b/admin/callback/index.php
index 7aaed70..7aaed70 100644..100755
--- a/admin/callback/index.php
+++ b/admin/callback/index.php
diff --git a/admin/contact/index.php b/admin/contact/index.php
index 3310762..3310762 100644..100755
--- a/admin/contact/index.php
+++ b/admin/contact/index.php
diff --git a/admin/general/index.php b/admin/general/index.php
new file mode 100755
index 0000000..95de883
--- /dev/null
+++ b/admin/general/index.php
@@ -0,0 +1,69 @@
+<?php require_once $_SERVER["DOCUMENT_ROOT"] . "/includes/admin/session.php"; global $_USER; ?>
+<?php
+
+if (isset($_GET['submit'])) {
+    if (isset($_GET["description"])) {
+        $config = json_decode(file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/data/general.json"), true);
+        if (trim($_GET['description']) === "") {
+            file_put_contents($_SERVER["DOCUMENT_ROOT"] . "/data/general.json", json_encode([
+                "description" => "Lorem ipsum dolor sit amet",
+                "name" => $config["name"]
+            ], JSON_PRETTY_PRINT));
+        } else {
+            file_put_contents($_SERVER["DOCUMENT_ROOT"] . "/data/general.json", json_encode([
+                "description" => $_GET['description'],
+                "name" => $config["name"]
+            ], JSON_PRETTY_PRINT));
+        }
+        header("Location: /admin/general");
+        die();
+    }
+    if (isset($_GET["name"])) {
+        $config = json_decode(file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/data/general.json"), true);
+        if (trim($_GET['name']) === "") {
+            file_put_contents($_SERVER["DOCUMENT_ROOT"] . "/data/general.json", json_encode([
+                "description" => $config["description"],
+                "name" => "Cloudburst System"
+            ], JSON_PRETTY_PRINT));
+        } else {
+            file_put_contents($_SERVER["DOCUMENT_ROOT"] . "/data/general.json", json_encode([
+                "description" => $config['description'],
+                "name" => $_GET["name"]
+            ], JSON_PRETTY_PRINT));
+        }
+        header("Location: /admin/general");
+        die();
+    }
+}
+
+?>
+<?php require_once $_SERVER["DOCUMENT_ROOT"] . "/includes/admin/header.php"; $config = json_decode(file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/data/general.json"), true); ?>
+
+<br>
+<div class="container">
+    <h1>General Preferences</h1>
+
+    <form class="input-group mb-3" style="max-width: 500px;">
+        <input name="description" value="<?= $config['description'] === 'Lorem ipsum dolor sit amet' ? '' : $config['description'] ?>" type="text" class="form-control" placeholder="Website Description">
+        <input type="hidden" name="submit">
+        <button class="btn btn-primary" type="submit">Save and apply</button>
+    </form>
+
+    <form class="input-group mb-3" style="max-width: 500px;">
+        <input name="name" value="<?= $config['name'] ?>" type="text" class="form-control" placeholder="Website Name">
+        <input type="hidden" name="submit">
+        <button class="btn btn-primary" type="submit">Save and apply</button>
+    </form>
+</div>
+
+<style>
+    #system-icon {
+        border-radius: 999px;
+        width: 24px;
+        vertical-align: middle;
+        background: lightgray;
+        margin-right: 5px;
+    }
+</style>
+
+<?php require_once $_SERVER["DOCUMENT_ROOT"] . "/includes/admin/footer.php"; ?>
\ No newline at end of file
diff --git a/admin/index.php b/admin/index.php
index f45cd62..7722af8 100644..100755
--- a/admin/index.php
+++ b/admin/index.php
@@ -11,7 +11,7 @@
                 <div class="card-body">
                     <h4 class="card-title">General</h4>
                     <p class="card-text">General website configuration data.</p>
-                    <a href="/admin/general" class="btn btn-primary disabled">Manage</a>
+                    <a href="/admin/general" class="btn btn-primary">Manage</a>
                 </div>
             </div>
         </div>
diff --git a/admin/login/index.php b/admin/login/index.php
index 9a12ac5..9a12ac5 100644..100755
--- a/admin/login/index.php
+++ b/admin/login/index.php
diff --git a/admin/pluralkit/index.php b/admin/pluralkit/index.php
index c976882..c976882 100644..100755
--- a/admin/pluralkit/index.php
+++ b/admin/pluralkit/index.php
diff --git a/admin/projects/index.php b/admin/projects/index.php
index 78e2b04..78e2b04 100644..100755
--- a/admin/projects/index.php
+++ b/admin/projects/index.php
diff --git a/admin/users/index.php b/admin/users/index.php
index 1bc81d2..1bc81d2 100644..100755
--- a/admin/users/index.php
+++ b/admin/users/index.php
diff --git a/api/contact/count/index.php b/api/contact/count/index.php
index 809902b..809902b 100644..100755
--- a/api/contact/count/index.php
+++ b/api/contact/count/index.php
diff --git a/api/contact/index.php b/api/contact/index.php
index 71cf001..71cf001 100644..100755
--- a/api/contact/index.php
+++ b/api/contact/index.php
diff --git a/api/contact/list/index.php b/api/contact/list/index.php
index 884821c..884821c 100644..100755
--- a/api/contact/list/index.php
+++ b/api/contact/list/index.php
diff --git a/api/index.php b/api/index.php
index 71cf001..71cf001 100644..100755
--- a/api/index.php
+++ b/api/index.php
diff --git a/api/pluralkit/fronters/index.php b/api/pluralkit/fronters/index.php
index 4dcb08f..4dcb08f 100644..100755
--- a/api/pluralkit/fronters/index.php
+++ b/api/pluralkit/fronters/index.php
diff --git a/api/pluralkit/index.php b/api/pluralkit/index.php
index 71cf001..71cf001 100644..100755
--- a/api/pluralkit/index.php
+++ b/api/pluralkit/index.php
diff --git a/api/pluralkit/members/index.php b/api/pluralkit/members/index.php
index fb5fa6c..510d5d4 100644..100755
--- a/api/pluralkit/members/index.php
+++ b/api/pluralkit/members/index.php
@@ -2,4 +2,4 @@
 
 $config = json_decode(file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/data/pluralkit.json"), true);
 header("Content-Type: application/json");
-die(file_get_contents("https://api.pluralkit.me/v2/systems/$config[system]/count"));
\ No newline at end of file
+die(file_get_contents("https://api.pluralkit.me/v2/systems/$config[system]/members"));
\ No newline at end of file
diff --git a/api/pluralkit/system/index.php b/api/pluralkit/system/index.php
index a8fda5c..a8fda5c 100644..100755
--- a/api/pluralkit/system/index.php
+++ b/api/pluralkit/system/index.php
diff --git a/api/projects/all/index.php b/api/projects/all/index.php
index 608789d..608789d 100644..100755
--- a/api/projects/all/index.php
+++ b/api/projects/all/index.php
diff --git a/api/projects/count/index.php b/api/projects/count/index.php
index 809902b..809902b 100644..100755
--- a/api/projects/count/index.php
+++ b/api/projects/count/index.php
diff --git a/api/projects/index.php b/api/projects/index.php
index 71cf001..71cf001 100644..100755
--- a/api/projects/index.php
+++ b/api/projects/index.php
diff --git a/api/projects/list/index.php b/api/projects/list/index.php
index 884821c..884821c 100644..100755
--- a/api/projects/list/index.php
+++ b/api/projects/list/index.php
diff --git a/api/projects/showcase/index.php b/api/projects/showcase/index.php
index 60dc597..60dc597 100644..100755
--- a/api/projects/showcase/index.php
+++ b/api/projects/showcase/index.php
diff --git a/assets/css/bootstrap.css b/assets/css/bootstrap.css
index 2fbee7e..2fbee7e 100644..100755
--- a/assets/css/bootstrap.css
+++ b/assets/css/bootstrap.css
diff --git a/assets/css/main.css b/assets/css/main.css
index ae07de4..ae07de4 100644..100755
--- a/assets/css/main.css
+++ b/assets/css/main.css
diff --git a/assets/favicon/android-chrome-192x192.png b/assets/favicon/android-chrome-192x192.png
index 81889d9..81889d9 100644..100755
--- a/assets/favicon/android-chrome-192x192.png
+++ b/assets/favicon/android-chrome-192x192.png
diff --git a/assets/favicon/android-chrome-512x512.png b/assets/favicon/android-chrome-512x512.png
index b1b12ee..b1b12ee 100644..100755
--- a/assets/favicon/android-chrome-512x512.png
+++ b/assets/favicon/android-chrome-512x512.png
diff --git a/assets/favicon/apple-touch-icon.png b/assets/favicon/apple-touch-icon.png
index 321981f..321981f 100644..100755
--- a/assets/favicon/apple-touch-icon.png
+++ b/assets/favicon/apple-touch-icon.png
diff --git a/assets/favicon/browserconfig.xml b/assets/favicon/browserconfig.xml
index 0adbe51..0adbe51 100644..100755
--- a/assets/favicon/browserconfig.xml
+++ b/assets/favicon/browserconfig.xml
diff --git a/assets/favicon/favicon-16x16.png b/assets/favicon/favicon-16x16.png
index a9ccc2f..a9ccc2f 100644..100755
--- a/assets/favicon/favicon-16x16.png
+++ b/assets/favicon/favicon-16x16.png
diff --git a/assets/favicon/favicon-32x32.png b/assets/favicon/favicon-32x32.png
index d0c0e34..d0c0e34 100644..100755
--- a/assets/favicon/favicon-32x32.png
+++ b/assets/favicon/favicon-32x32.png
diff --git a/assets/favicon/favicon.ico b/assets/favicon/favicon.ico
index 194573a..194573a 100644..100755
--- a/assets/favicon/favicon.ico
+++ b/assets/favicon/favicon.ico
diff --git a/assets/favicon/mstile-150x150.png b/assets/favicon/mstile-150x150.png
index b2c981a..b2c981a 100644..100755
--- a/assets/favicon/mstile-150x150.png
+++ b/assets/favicon/mstile-150x150.png
diff --git a/assets/favicon/safari-pinned-tab.svg b/assets/favicon/safari-pinned-tab.svg
index e18580e..e18580e 100644..100755
--- a/assets/favicon/safari-pinned-tab.svg
+++ b/assets/favicon/safari-pinned-tab.svg
diff --git a/assets/favicon/site.webmanifest b/assets/favicon/site.webmanifest
index a7ed95e..a7ed95e 100644..100755
--- a/assets/favicon/site.webmanifest
+++ b/assets/favicon/site.webmanifest
diff --git a/assets/img/icon.png b/assets/img/icon.png
index 30c59ec..30c59ec 100644..100755
--- a/assets/img/icon.png
+++ b/assets/img/icon.png
diff --git a/assets/js/bootstrap.js b/assets/js/bootstrap.js
index cc0a255..cc0a255 100644..100755
--- a/assets/js/bootstrap.js
+++ b/assets/js/bootstrap.js
diff --git a/data/admins.json b/data/admins.json
index a3932e5..a3932e5 100644..100755
--- a/data/admins.json
+++ b/data/admins.json
diff --git a/data/contact.json b/data/contact.json
index 878f22d..878f22d 100644..100755
--- a/data/contact.json
+++ b/data/contact.json
diff --git a/data/general.json b/data/general.json
new file mode 100644
index 0000000..5c53246
--- /dev/null
+++ b/data/general.json
@@ -0,0 +1,4 @@
+{
+    "description": "Lorem ipsum dolor sit amet",
+    "name": "Cloudburst System"
+}
\ No newline at end of file
diff --git a/data/pluralkit.json b/data/pluralkit.json
index 8577b3b..8577b3b 100644..100755
--- a/data/pluralkit.json
+++ b/data/pluralkit.json
diff --git a/data/projects.json b/data/projects.json
index bf9b365..bf9b365 100644..100755
--- a/data/projects.json
+++ b/data/projects.json
diff --git a/includes/Parsedown.php b/includes/Parsedown.php
index 88c0b72..88c0b72 100644..100755
--- a/includes/Parsedown.php
+++ b/includes/Parsedown.php
diff --git a/includes/admin/footer.php b/includes/admin/footer.php
index 691287b..691287b 100644..100755
--- a/includes/admin/footer.php
+++ b/includes/admin/footer.php
diff --git a/includes/admin/header.php b/includes/admin/header.php
index 58a1b74..58a1b74 100644..100755
--- a/includes/admin/header.php
+++ b/includes/admin/header.php
diff --git a/includes/admin/navigation.php b/includes/admin/navigation.php
index 23cc361..23cc361 100644..100755
--- a/includes/admin/navigation.php
+++ b/includes/admin/navigation.php
diff --git a/includes/admin/session.php b/includes/admin/session.php
index 4090156..4090156 100644..100755
--- a/includes/admin/session.php
+++ b/includes/admin/session.php
diff --git a/includes/gui/footer.php b/includes/gui/footer.php
index 691287b..691287b 100644..100755
--- a/includes/gui/footer.php
+++ b/includes/gui/footer.php
diff --git a/includes/gui/header.php b/includes/gui/header.php
index 5f5bc25..0ca8765 100644..100755
--- a/includes/gui/header.php
+++ b/includes/gui/header.php
@@ -1,10 +1,20 @@
 <?php
 
+if (!file_exists($_SERVER["DOCUMENT_ROOT"] . "/data/general.json")) {
+    file_put_contents($_SERVER["DOCUMENT_ROOT"] . "/data/general.json", json_encode([
+            "name" => "Cloudburst System",
+            "description" => "Lorem ipsum dolor sit amet"
+    ]));
+}
+
 if ($_SERVER['HTTP_HOST'] !== "conep.one" && $_SERVER['HTTP_HOST'] !== "www.conep.one" && $_SERVER['HTTP_HOST'] !== "localhost" && $_SERVER['HTTP_HOST'] !== "0.0.0.0") {
     header("Location: https://" . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
     die();
 }
 
+global $general;
+$general = json_decode(file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/data/general.json"), true);
+
 ?>
 
 <!DOCTYPE html>
@@ -15,7 +25,7 @@ if ($_SERVER['HTTP_HOST'] !== "conep.one" && $_SERVER['HTTP_HOST'] !== "www.cone
         <?php if (isset($title)): ?>
         <?= $title ?> |
         <?php endif; ?>
-        Cloudburst System
+        <?= $general["name"] ?>
     </title>
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
diff --git a/includes/gui/navigation.php b/includes/gui/navigation.php
index 68d27c5..3cf35c3 100644..100755
--- a/includes/gui/navigation.php
+++ b/includes/gui/navigation.php
@@ -1,6 +1,7 @@
+<?php global $general; ?>
 <nav class="navbar navbar-expand-sm bg-dark navbar-dark">
     <div class="container-fluid">
-        <a class="navbar-brand" href="/">Cloudburst System</a>
+        <a class="navbar-brand" href="/"><?= $general["name"] ?></a>
         <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#collapsibleNavbar">
             <span class="navbar-toggler-icon"></span>
         </button>
diff --git a/index.php b/index.php
index 2c28e8a..17202a2 100644..100755
--- a/index.php
+++ b/index.php
@@ -1,21 +1,29 @@
-<?php $title = null; require_once $_SERVER["DOCUMENT_ROOT"] . "/includes/gui/header.php"; ?>
+<?php $title = null; require_once $_SERVER["DOCUMENT_ROOT"] . "/includes/gui/header.php"; global $general; ?>
 
 <div id="hero">
     <img src="/assets/img/icon.png" id="hero-img" alt="">
-    <h1>Cloudburst System</h1>
-    <h4>Lorem ipsum dolor sit amet</h4>
+    <h1><?= $general["name"] ?></h1>
+    <h4><?= $general["description"] ?></h4>
     <b>Current Fronter·s:</b> <?php
 
         $config = json_decode(file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/data/pluralkit.json"), true);
         $data = json_decode(file_get_contents("https://api.pluralkit.me/v2/systems/$config[system]/fronters"), true);
 
         foreach ($data["members"] as $index => $fronter) {
+            if (is_string($fronter["display_name"]) && trim($fronter["display_name"]) !== "") {
+                $dn = $fronter["display_name"];
+            } else if (is_string($fronter["name"]) && trim($fronter["name"]) !== "") {
+                $dn = $fronter["name"];
+            } else {
+                $dn = "(Unnamed)";
+            }
+
             if ($index + 1 === count($data["members"])) {
-                echo("<a href='/members/read/?m=$fronter[uuid]' class='text-white'>" . $fronter["display_name"] . "</a>");
+                echo("<a href='/members/read/?m=$fronter[uuid]' class='text-white'>" . $dn . "</a>");
             } else if ($index + 2 === count($data["members"])) {
-                echo("<a href='/members/read/?m=$fronter[uuid]' class='text-white'>" . $fronter["display_name"] . "</a> and ");
+                echo("<a href='/members/read/?m=$fronter[uuid]' class='text-white'>" . $dn . "</a> and ");
             } else {
-                echo("<a href='/members/read/?m=$fronter[uuid]' class='text-white'>" . $fronter["display_name"] . "</a>, ");
+                echo("<a href='/members/read/?m=$fronter[uuid]' class='text-white'>" . $dn . "</a>, ");
             }
         }
 
diff --git a/members/index.php b/members/index.php
index f1f6c11..d5ed459 100644..100755
--- a/members/index.php
+++ b/members/index.php
@@ -25,7 +25,18 @@ $data2 = json_decode(file_get_contents("https://api.pluralkit.me/v2/systems/$con
             <div class="card stylized-card">
                 <div class="card-body">
                     <img class="stylized-card-icon" src="<?= $member["avatar_url"] ?>" alt="">
-                    <h4 class="card-title"><?= $member["display_name"] ?></h4>
+                    <h4 class="card-title"><?php
+
+                        if (is_string($member["display_name"]) && trim($member["display_name"]) !== "") {
+                            $dn = $member["display_name"];
+                        } else if (is_string($member["name"]) && trim($member["name"]) !== "") {
+                            $dn = $member["name"];
+                        } else {
+                            $dn = "(Unnamed)";
+                        }
+                        echo $dn;
+
+                        ?></h4>
                     <p class="card-text"><?= is_string($member["description"]) ? (strlen($member["description"]) > 100 ? substr($member["description"], 0, 100) . "…" : $member["description"]) : "<span class='text-muted'>This system member does not have a description</span>" ?></p>
                     <a href="/members/read/?m=<?= $member["uuid"] ?>" class="btn btn-outline-light">Read More</a>
                 </div>
diff --git a/members/read/index.php b/members/read/index.php
index d9b3d9c..0bc1029 100644..100755
--- a/members/read/index.php
+++ b/members/read/index.php
@@ -30,18 +30,20 @@ $title = $sel['display_name'] . " | System Members"; require_once $_SERVER["DOCU
 
     <h3>General Info</h3>
     <p>
-        <b>Date Added:</b> <?= date("l F jS, Y \a\\t G:i:s (e)", strtotime("2021-10-06T19:29:17.195373Z")) ?><br>
-        <b>Pronouns:</b> <?= $sel["pronouns"] ?><br>
-        <b>Birthday:</b> <?= $sel["birthday"] ?><br>
-        <b>Color:</b> <span style="background-color:#<?= $sel["color"] ?>;">&nbsp;&nbsp;&nbsp;&nbsp;</span> #<?= $sel["color"] ?>
+        <b>Date Added:</b> <?= date("l F jS, Y \a\\t G:i:s (e)", strtotime($sel["created"])) ?><br>
+        <?php if (isset($sel["pronouns"])): ?><b>Pronouns:</b> <?= $sel["pronouns"] ?><br><?php endif; ?>
+        <?php if (isset($sel["birthday"])): ?><b>Birthday:</b> <?= $sel["birthday"] ?><br><?php endif; ?>
+        <?php if (isset($sel["color"])): ?><b>Color:</b> <span style="background-color:#<?= $sel["color"] ?>;">&nbsp;&nbsp;&nbsp;&nbsp;</span> #<?= $sel["color"] ?><?php endif; ?>
     </p>
 
+    <?php if (count($sel["proxy_tags"]) > 0): ?>
     <h3>PluralKit Proxy Tags</h3>
     <ul>
         <?php foreach ($sel["proxy_tags"] as $tag): ?>
             <li><?= $tag["prefix"] ?><i>text</i><?= $tag["suffix"] ?></li>
         <?php endforeach; ?>
     </ul>
+    <?php endif; ?>
 </div>
 
 <?php require_once $_SERVER["DOCUMENT_ROOT"] . "/includes/gui/footer.php"; ?>
\ No newline at end of file
diff --git a/projects/index.php b/projects/index.php
index 42aa8b3..42aa8b3 100644..100755
--- a/projects/index.php
+++ b/projects/index.php
diff --git a/social/index.php b/social/index.php
index a66765f..a66765f 100644..100755
--- a/social/index.php
+++ b/social/index.php