From 15bb1453008237edbc2cb4e82a9eb44db6f99794 Mon Sep 17 00:00:00 2001
From: Minteck <contact@minteck.org>
Date: Fri, 24 Feb 2023 11:45:36 +0100
Subject: Updated 10 files (automated)

---
 includes/details.inc    |  6 ++++++
 includes/fullbanner.inc | 10 +++++++---
 includes/functions.inc  | 21 +++++----------------
 includes/member.inc     | 14 ++++++++------
 includes/metadata.inc   |  2 ++
 5 files changed, 28 insertions(+), 25 deletions(-)

(limited to 'includes')

diff --git a/includes/details.inc b/includes/details.inc
index ce1add6..415e313 100644
--- a/includes/details.inc
+++ b/includes/details.inc
@@ -112,6 +112,9 @@
             case "pan":
                 echo "Pansexual";
                 break;
+            case "poly":
+                echo "Polysexual";
+                break;
         } ?><?php if ($metadata["polyamorous"]["sexual"]): ?> (poly)<?php endif; ?>
     </div>
     <?php else: ?>
@@ -142,6 +145,9 @@
             case "pan":
                 echo "Panromantic";
                 break;
+            case "poly":
+                echo "Polyromantic";
+                break;
         } ?><?php if ($metadata["polyamorous"]["romantic"]): ?> (poly)<?php endif; ?>
     </div>
     <?php if ($systemID !== $app["other"]["id"]): ?>
diff --git a/includes/fullbanner.inc b/includes/fullbanner.inc
index f6741c9..4f78101 100644
--- a/includes/fullbanner.inc
+++ b/includes/fullbanner.inc
@@ -1,6 +1,6 @@
 <?php global $memberData; global $memberID; global $systemID; global $metadata; global $travelling; global $systemCommonName; global $member; global $lang; global $pages; ?>
 <script>
-    window.currentMemberData = JSON.parse(atob(`<?= base64_encode(json_encode(getMemberBannerData($memberID, $systemID, false))) ?>`));
+    window.currentMemberData = JSON.parse(atob(`<?= base64_encode(json_encode(getMemberBannerData($memberID, $systemID))) ?>`));
 </script>
 <?php if ($memberData["name"] !== "unknown" && $memberData["name"] !== "fusion"): ?>
     <div id="member-banner-container">
@@ -14,11 +14,15 @@
 <script src="/assets/logo/banner.js"></script><script>refreshBanner(false, <?= $lang["_french"] ? "true" : "false" ?>)</script>
 
 <?php if ($travelling[$memberID]['travelling'] && !$travelling[$memberID]['equestria']): ?>
-    <div class="alert alert-primary">
+    <br>
+    <div class="alert alert-primary" style="margin-bottom: 0 !important;">
         <?= getMiniName($memberData["display_name"] ?? $memberData["name"]) ?> <?= $lang["fullbanner"]["visit"][0] ?> <?= $systemID === "ynmuc" ? "Raindrops System" : "Cloudburst System" ?><?= str_replace("%1", getMemberPronouns($memberData["pronouns"])["subjective"], str_replace("%2", getMemberPronouns($memberData["pronouns"])["third"] ? "is" : "are", $lang["fullbanner"]["visit"][1])) ?><?= $systemCommonName ?>.
     </div>
+    <br>
 <?php elseif ($travelling[$memberID]['travelling'] && $travelling[$memberID]['equestria']): ?>
-    <div class="alert alert-primary">
+    <br>
+    <div class="alert alert-primary" style="margin-bottom: 0 !important;">
         <?= getMiniName($memberData["display_name"] ?? $memberData["name"]) ?> is on a trip to Equestria. <?= str_replace("%1", getMemberPronouns($memberData["pronouns"])["subjective"], str_replace("%2", getMemberPronouns($memberData["pronouns"])["third"] ? "is" : "are", "Therefore %1 %2 currently not in the ")) ?><?= $systemCommonName ?>.
     </div>
+    <br>
 <?php endif; ?>
\ No newline at end of file
diff --git a/includes/functions.inc b/includes/functions.inc
index 5effe5b..7a6ad5d 100644
--- a/includes/functions.inc
+++ b/includes/functions.inc
@@ -388,25 +388,19 @@ if (!function_exists("timeAgo")) {
             $time = strtotime($time);
         }
 
-        $periods = ["sec.", "mn.", "hr.", "d.", "wk.", "mo.", "y.", "ages"];
-        $periods_fr = ["sec.", "mn.", "hr.", "j.", "sem.", "m.", "a.", "des années"];
+        $periods = ["sec", "min", "hr", "d", "wk", "mo", "y", "ages"];
+        $periods_fr = $periods;
         $lengths = array("60", "60", "24", "7", "4.35", "12", "100");
 
         $now = time();
 
         $difference = $now - $time;
         if ($difference <= 10 && $difference >= 0) {
-            if ($french) {
-                return $tense_fr = "à l'instant";
-            } else {
-                return $tense = "now";
-            }
+            return $tense = "now";
         } elseif ($difference > 0) {
             $tense = "ago";
-            $tense_fr = "il y a";
         } else {
             $tense = "later";
-            $tense_fr = "dans";
         }
 
         for ($j = 0; $difference >= $lengths[$j] && $j < count($lengths)-1; $j++) {
@@ -415,13 +409,8 @@ if (!function_exists("timeAgo")) {
 
         $difference = round($difference);
 
-        if ($french) {
-            $period = $periods_fr[$j];
-            return "{$tense_fr} {$difference} {$period}";
-        } else {
-            $period = $periods[$j];
-            return "{$difference} {$period} {$tense}";
-        }
+        $period = $periods[$j];
+        return "{$difference} {$period} {$tense}";
     }
 }
 
diff --git a/includes/member.inc b/includes/member.inc
index 66d0798..5292dc1 100644
--- a/includes/member.inc
+++ b/includes/member.inc
@@ -58,15 +58,16 @@ if ($memberData["name"] === "fusion") {
         <div id="page-content">
             <?php if ($memberData["name"] === "unknown"): ?>
                 <br>
-                <div class="alert alert-secondary">
-                    <p><?= $lang["member"]["unknown"][0] ?></p>
-                    <p><?= $lang["member"]["unknown"][1] ?></p>
-                    <p><?= $lang["member"]["unknown"][2] ?></p>
-                    <span><?= $lang["member"]["unknown"][3] ?></span>
+                <div class="alert alert-secondary" style="margin-bottom: 0 !important;">
+                    <p>Hello there!</p>
+                    <p>I'm currently not totally sure who I am (it's a thing that can happen with plurality), but I am using this pony as a temporary identity to stay calm and not panic while I figure out what is going on and who I am.</p>
+                    <p>I can either be an existing headmate who cannot work out they are fronting (this can sometimes happen when one of us gets pushed out of front), multiple headmates blurring who cannot work out who we are, a new pony trying to figure out their identity (this can sometimes take a while), or some other plurality shenanigans.</p>
+                    <span>In all cases, feel free to ask!</span>
                 </div>
+                <br>
             <?php elseif ($memberData["name"] === "fusion"): ?>
                 <br>
-                <div class="alert alert-secondary">
+                <div class="alert alert-secondary" style="margin-bottom: 0 !important;">
                     <p><?= $lang["member"]["fusion"][0] ?></p>
                     <p><?= $lang["member"]["fusion"][1] ?></p>
                     <p><?= $lang["member"]["fusion"][2] ?></p>
@@ -79,6 +80,7 @@ if ($memberData["name"] === "fusion") {
                     <i><?= $lang["member"]["no_fusion"] ?></i>
                     <?php endif; ?>
                 </div>
+                <br>
             <?php else: ?>
                 <?php if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/includes/data/content/$memberID-private.html") && $isLoggedIn): ?>
                     <br>
diff --git a/includes/metadata.inc b/includes/metadata.inc
index 10a87ab..d903010 100644
--- a/includes/metadata.inc
+++ b/includes/metadata.inc
@@ -71,6 +71,7 @@ if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/includes/data/metadata/" . $member
                     <option <?= $metadata["alignment"]["sexual"] === "homo" ? "selected" : "" ?> value="homo">Homosexual</option>
                     <option <?= $metadata["alignment"]["sexual"] === "bi" ? "selected" : "" ?> value="bi">Bisexual</option>
                     <option <?= $metadata["alignment"]["sexual"] === "pan" ? "selected" : "" ?> value="pan">Pansexual</option>
+                    <option <?= $metadata["alignment"]["sexual"] === "poly" ? "selected" : "" ?> value="poly">Polysexual</option>
                 </select>
                 <select class="tooltip-nohelp form-select" style='display:inline-block;filter:invert(1) hue-rotate(180deg);background-image:url("data:image/svg+xml,%3csvg xmlns=&apos;http://www.w3.org/2000/svg&apos; viewBox=&apos;0 0 16 16&apos;%3e%3cpath fill=&apos;none&apos; stroke=&apos;%23000000&apos; stroke-linecap=&apos;round&apos; stroke-linejoin=&apos;round&apos; stroke-width=&apos;2&apos; d=&apos;M2 5l6 6 6-6&apos;/%3e%3c/svg%3e");' name="alignment[romantic]">
                     <option <?= $metadata["alignment"]["romantic"] === "aroace" ? "selected" : "" ?> value="aroace">Aromantic</option>
@@ -78,6 +79,7 @@ if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/includes/data/metadata/" . $member
                     <option <?= $metadata["alignment"]["romantic"] === "homo" ? "selected" : "" ?> value="homo">Homoromantic</option>
                     <option <?= $metadata["alignment"]["romantic"] === "bi" ? "selected" : "" ?> value="bi">Biromantic</option>
                     <option <?= $metadata["alignment"]["romantic"] === "pan" ? "selected" : "" ?> value="pan">Panromantic</option>
+                    <option <?= $metadata["alignment"]["romantic"] === "poly" ? "selected" : "" ?> value="poly">Polyromantic</option>
                 </select>
             </div>
         </div>
-- 
cgit