diff options
author | RaindropsSys <contact@minteck.org> | 2023-06-10 11:06:53 +0200 |
---|---|---|
committer | RaindropsSys <contact@minteck.org> | 2023-06-10 11:06:53 +0200 |
commit | 2e7294c83c6388e3855ce787f0a18c20ed652131 (patch) | |
tree | 7e3a4ee156fa93954a501b0f112fa2d1055064f0 | |
parent | 85145d4a0f7ddd7717af495cbd3f42891042d047 (diff) | |
download | pluralconnect-2e7294c83c6388e3855ce787f0a18c20ed652131.tar.gz pluralconnect-2e7294c83c6388e3855ce787f0a18c20ed652131.tar.bz2 pluralconnect-2e7294c83c6388e3855ce787f0a18c20ed652131.zip |
Updated 12 files and added includes/system/compare.inc (automated)
-rw-r--r-- | .idea/deployment.xml | 9 | ||||
-rw-r--r-- | assets/logo/newlogo-template.png | bin | 40099 -> 40366 bytes | |||
-rw-r--r-- | assets/logo/newlogo.png | bin | 5622 -> 5686 bytes | |||
-rw-r--r-- | assets/logo/newlogo3-template.png | bin | 42331 -> 47379 bytes | |||
-rw-r--r-- | assets/logo/newlogo3.png | bin | 5745 -> 6334 bytes | |||
-rw-r--r-- | includes/components/navigation.inc | 2 | ||||
-rw-r--r-- | includes/components/planner.inc | 34 | ||||
-rw-r--r-- | includes/flags.json | 4 | ||||
-rw-r--r-- | includes/system/compare.inc | 187 | ||||
-rw-r--r-- | includes/util/banner.inc | 10 | ||||
-rw-r--r-- | pages/api/money/create.php | 2 | ||||
-rw-r--r-- | pages/fronting.inc | 4 | ||||
-rw-r--r-- | pages/travelling.inc | 14 |
13 files changed, 232 insertions, 34 deletions
diff --git a/.idea/deployment.xml b/.idea/deployment.xml index e07dbe7..a20124a 100644 --- a/.idea/deployment.xml +++ b/.idea/deployment.xml @@ -2,17 +2,10 @@ <project version="4"> <component name="PublishConfigData" autoUpload="Always" serverName="bridlewood" remoteFilesAllowedToDisappearOnAutoupload="false"> <serverData> - <paths name="Minteck.org"> - <serverdata> - <mappings> - <mapping deploy="/nas/web/ponies.equestria.horse" local="$PROJECT_DIR$" web="/" /> - </mappings> - </serverdata> - </paths> <paths name="bridlewood"> <serverdata> <mappings> - <mapping deploy="/_ch" local="$PROJECT_DIR$" web="/" /> + <mapping deploy="/opt/peh" local="$PROJECT_DIR$" web="/" /> </mappings> <excludedPaths> <excludedPath local="true" path="$PROJECT_DIR$/_archive" /> diff --git a/assets/logo/newlogo-template.png b/assets/logo/newlogo-template.png Binary files differindex 148d9f5..3159280 100644 --- a/assets/logo/newlogo-template.png +++ b/assets/logo/newlogo-template.png diff --git a/assets/logo/newlogo.png b/assets/logo/newlogo.png Binary files differindex 47af7ef..7745933 100644 --- a/assets/logo/newlogo.png +++ b/assets/logo/newlogo.png diff --git a/assets/logo/newlogo3-template.png b/assets/logo/newlogo3-template.png Binary files differindex e862260..41500c8 100644 --- a/assets/logo/newlogo3-template.png +++ b/assets/logo/newlogo3-template.png diff --git a/assets/logo/newlogo3.png b/assets/logo/newlogo3.png Binary files differindex 0ba967d..375b56e 100644 --- a/assets/logo/newlogo3.png +++ b/assets/logo/newlogo3.png diff --git a/includes/components/navigation.inc b/includes/components/navigation.inc index b82e247..478420d 100644 --- a/includes/components/navigation.inc +++ b/includes/components/navigation.inc @@ -117,7 +117,7 @@ $navigation_admin = [ "name" => $lang["navigation"]["apps"], "minimal" => false, "items" => [ - [ + time() >= 1686787200 ? null : [ "name" => $pages["fronting"]["name"][$lang["_name"]], "icon" => "/assets/icons/fronting.svg", "invert" => true, diff --git a/includes/components/planner.inc b/includes/components/planner.inc index f005f52..b5fc7a5 100644 --- a/includes/components/planner.inc +++ b/includes/components/planner.inc @@ -482,23 +482,29 @@ </style> <h2>Front planner</h2> + + <div class="alert alert-warning"> + <b>The fronting schedule will be removed on June 15<sup>th</sup>.</b> Due to internal discussion, we have decided to remove the fronting schedule as it is causing a lot of trouble inside the respective systems. Archives will be kept in the database. + </div> + <table id="planner"> <tbody> <?php - day("Yesterday", -1); - day("Today", 0); - day("Tomorrow", 1); - day(date('l j', time() + 86400 * 2), 2); - day(date('l j', time() + 86400 * 3), 3); - day(date('l j', time() + 86400 * 4), 4); - day(date('l j', time() + 86400 * 5), 5); - day(date('l j', time() + 86400 * 6), 6); - day(date('l j', time() + 86400 * 7), 7); - day(date('l j', time() + 86400 * 8), 8); - day(date('l j', time() + 86400 * 9), 9); - day(date('l j', time() + 86400 * 10), 10); - day(date('l j', time() + 86400 * 11), 11); - day(date('l j', time() + 86400 * 12), 12); + + if (time() - 86400 < 1686787200) day("Yesterday", -1); + if (time() < 1686787200) day("Today", 0); + if (time() + 86400 < 1686787200) day("Tomorrow", 1); + if (time() + 86400 * 2 < 1686787200) day(date('l j', time() + 86400 * 2), 2); + if (time() + 86400 * 3 < 1686787200) day(date('l j', time() + 86400 * 3), 3); + if (time() + 86400 * 4 < 1686787200) day(date('l j', time() + 86400 * 4), 4); + if (time() + 86400 * 5 < 1686787200) day(date('l j', time() + 86400 * 5), 5); + if (time() + 86400 * 6 < 1686787200) day(date('l j', time() + 86400 * 6), 6); + if (time() + 86400 * 7 < 1686787200) day(date('l j', time() + 86400 * 7), 7); + if (time() + 86400 * 8 < 1686787200) day(date('l j', time() + 86400 * 8), 8); + if (time() + 86400 * 9 < 1686787200) day(date('l j', time() + 86400 * 9), 9); + if (time() + 86400 * 10 < 1686787200) day(date('l j', time() + 86400 * 10), 10); + if (time() + 86400 * 12 < 1686787200) day(date('l j', time() + 86400 * 11), 11); + if (time() + 86400 * 12 < 1686787200) day(date('l j', time() + 86400 * 12), 12); ?> </tbody> diff --git a/includes/flags.json b/includes/flags.json index d11fd54..0aed68e 100644 --- a/includes/flags.json +++ b/includes/flags.json @@ -1,7 +1,7 @@ { "age_regressor": null, "age_spells": null, - "host": null, + "host": "Host", "not_talking": null, "median": null, @@ -30,4 +30,4 @@ "other2": "Potentially having sex with %other%", "other3": "#Having sex with Raindrops", "other4": "#Potentially having sex with Raindrops" -}
\ No newline at end of file +} diff --git a/includes/system/compare.inc b/includes/system/compare.inc new file mode 100644 index 0000000..6eec002 --- /dev/null +++ b/includes/system/compare.inc @@ -0,0 +1,187 @@ +<?php return; global $system; global $lang; global $pages; global $systemCommonName; global $systemID; $pages = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/pages.json"), true); $title = $pages["s:compare"]["name"][$lang["_name"]] . " · " . $systemCommonName; require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/components/header.inc'; global $travelling; global $app; + +$members = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/$systemID/members.json"), true); + +?> + + <br> + <div class="container"> + <h2><?= $lang["compare"]["title"] ?> <?= $systemCommonName ?></h2> + <div class="comparison" style="<?php if ($systemID === $app["other"]["id"]): ?>grid-template-columns: 3fr 1.5fr 2fr repeat(4, 1fr);<?php endif; ?>"> + <span class="comparison-header comparison-item"> + <span class="comparison-header-l0"><abbr title="<?= $lang["compare"]["member"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["member"][0] ?></abbr></span> + <span class="comparison-header-l1"><abbr title="<?= $lang["compare"]["member"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["member"][1] ?></abbr></span> + <span class="comparison-header-l2"><abbr title="<?= $lang["compare"]["member"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["member"][2] ?></abbr></span> + <span class="comparison-header-l3"><abbr title="<?= $lang["compare"]["member"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["member"][3] ?></abbr></span> + <span class="comparison-header-l4"><abbr title="<?= $lang["compare"]["member"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["member"][4] ?></abbr></span> + <span class="comparison-header-l5"><abbr title="<?= $lang["compare"]["member"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["member"][5] ?></abbr></span> + </span> + <span class="comparison-header comparison-item"> + <span class="comparison-header-l0"><abbr title="<?= $lang["compare"]["species"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["species"][0] ?></abbr></span> + <span class="comparison-header-l1"><abbr title="<?= $lang["compare"]["species"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["species"][1] ?></abbr></span> + <span class="comparison-header-l2"><abbr title="<?= $lang["compare"]["species"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["species"][2] ?></abbr></span> + <span class="comparison-header-l3"><abbr title="<?= $lang["compare"]["species"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["species"][3] ?></abbr></span> + <span class="comparison-header-l4"><abbr title="<?= $lang["compare"]["species"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["species"][4] ?></abbr></span> + <span class="comparison-header-l5"><abbr title="<?= $lang["compare"]["species"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["species"][5] ?></abbr></span> + </span> + <?php if ($systemID !== $app["other"]["id"]): ?> + <span class="comparison-header comparison-item"> + <span class="comparison-header-l0"><abbr title="Code" data-bs-toggle="tooltip">Code</abbr></span> + <span class="comparison-header-l1"><abbr title="Code" data-bs-toggle="tooltip">Code</abbr></span> + <span class="comparison-header-l2"><abbr title="Code" data-bs-toggle="tooltip">Code</abbr></span> + <span class="comparison-header-l3"><abbr title="Code" data-bs-toggle="tooltip">Code</abbr></span> + <span class="comparison-header-l4"><abbr title="Code" data-bs-toggle="tooltip">Code</abbr></span> + <span class="comparison-header-l5"><abbr title="Code" data-bs-toggle="tooltip">Code</abbr></span> + </span> + <?php endif; ?> + <span class="comparison-header comparison-item"> + <span class="comparison-header-l0"><abbr title="<?= $lang["compare"]["relations"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["relations"][0] ?></abbr></span> + <span class="comparison-header-l1"><abbr title="<?= $lang["compare"]["relations"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["relations"][1] ?></abbr></span> + <span class="comparison-header-l2"><abbr title="<?= $lang["compare"]["relations"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["relations"][2] ?></abbr></span> + <span class="comparison-header-l3"><abbr title="<?= $lang["compare"]["relations"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["relations"][3] ?></abbr></span> + <span class="comparison-header-l4"><abbr title="<?= $lang["compare"]["relations"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["relations"][4] ?></abbr></span> + <span class="comparison-header-l5"><abbr title="<?= $lang["compare"]["relations"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["relations"][5] ?></abbr></span> + </span> + <span class="comparison-header comparison-item"> + <span class="comparison-header-l0"><abbr title="<?= $lang["compare"]["memory"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["memory"][0] ?></abbr></span> + <span class="comparison-header-l1"><abbr title="<?= $lang["compare"]["memory"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["memory"][1] ?></abbr></span> + <span class="comparison-header-l2"><abbr title="<?= $lang["compare"]["memory"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["memory"][2] ?></abbr></span> + <span class="comparison-header-l3"><abbr title="<?= $lang["compare"]["memory"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["memory"][3] ?></abbr></span> + <span class="comparison-header-l4"><abbr title="<?= $lang["compare"]["memory"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["memory"][4] ?></abbr></span> + <span class="comparison-header-l5"><abbr title="<?= $lang["compare"]["memory"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["memory"][5] ?></abbr></span> + </span> + <span class="comparison-header comparison-item"> + <span class="comparison-header-l0"><abbr title="<?= $lang["compare"]["fictive"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["fictive"][0] ?></abbr></span> + <span class="comparison-header-l1"><abbr title="<?= $lang["compare"]["fictive"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["fictive"][1] ?></abbr></span> + <span class="comparison-header-l2"><abbr title="<?= $lang["compare"]["fictive"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["fictive"][2] ?></abbr></span> + <span class="comparison-header-l3"><abbr title="<?= $lang["compare"]["fictive"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["fictive"][3] ?></abbr></span> + <span class="comparison-header-l4"><abbr title="<?= $lang["compare"]["fictive"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["fictive"][4] ?></abbr></span> + <span class="comparison-header-l5"><abbr title="<?= $lang["compare"]["fictive"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["fictive"][5] ?></abbr></span> + </span> + <span class="comparison-header comparison-item"> + <span class="comparison-header-l0"><abbr title="<?= $lang["compare"]["little"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["little"][0] ?></abbr></span> + <span class="comparison-header-l1"><abbr title="<?= $lang["compare"]["little"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["little"][1] ?></abbr></span> + <span class="comparison-header-l2"><abbr title="<?= $lang["compare"]["little"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["little"][2] ?></abbr></span> + <span class="comparison-header-l3"><abbr title="<?= $lang["compare"]["little"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["little"][3] ?></abbr></span> + <span class="comparison-header-l4"><abbr title="<?= $lang["compare"]["little"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["little"][4] ?></abbr></span> + <span class="comparison-header-l5"><abbr title="<?= $lang["compare"]["little"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["little"][5] ?></abbr></span> + </span> + <span class="comparison-header comparison-item"> + <span class="comparison-header-l0"><abbr title="<?= $lang["compare"]["protector"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["protector"][0] ?></abbr></span> + <span class="comparison-header-l1"><abbr title="<?= $lang["compare"]["protector"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["protector"][1] ?></abbr></span> + <span class="comparison-header-l2"><abbr title="<?= $lang["compare"]["protector"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["protector"][2] ?></abbr></span> + <span class="comparison-header-l3"><abbr title="<?= $lang["compare"]["protector"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["protector"][3] ?></abbr></span> + <span class="comparison-header-l4"><abbr title="<?= $lang["compare"]["protector"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["protector"][4] ?></abbr></span> + <span class="comparison-header-l5"><abbr title="<?= $lang["compare"]["protector"][0] ?>" data-bs-toggle="tooltip"><?= $lang["compare"]["protector"][5] ?></abbr></span> + </span> + + <?php foreach (scoreOrder($members, $systemID) as $member): + + $metadata = $member["_metadata"]; + + ?> + <a title="<?= $member["display_name"] ?? $member["name"] ?>" data-bs-toggle="tooltip" class="member-link comparison-item comparison-item-clickable" href="/<?= $member["name"] ?>"> + <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <span style="vertical-align: middle;"><span class="comparison-name-full"><?= $member["display_name"] ?? $member["name"] ?></span><span class="comparison-name-small"><?= getMiniName($member["display_name"] ?? $member["name"]) ?></span></span> + <span class="comparison-colors" style="background-color: #<?= $member["color"] ?? "ffffff" ?>; height: 16px; width: 16px;display: inline-block;vertical-align: middle;border-radius:2px;"></span> + </a> + <span class="comparison-item"> + <?php foreach ($metadata["species"] ?? [] as $species): ?> + <img data-bs-toggle="tooltip" title="<?php switch ($species) { + case "earth": + if ($metadata["robot"]) echo $lang["species"]["earth"][0]; else if ($metadata["plush"]) echo $lang["species"]["earth"][1]; else echo $lang["species"]["earth"][2]; + break; + + case "alicorn": + if ($metadata["robot"]) echo $lang["species"]["alicorn"][0]; else if ($metadata["plush"]) echo $lang["species"]["alicorn"][1]; else echo $lang["species"]["alicorn"][2]; + break; + + case "crystal": + if ($metadata["robot"]) echo $lang["species"]["crystal"][0]; else if ($metadata["plush"]) echo $lang["species"]["crystal"][1]; else echo $lang["species"]["crystal"][2]; + break; + + case "pegasus": + if ($metadata["robot"]) echo $lang["species"]["pegasus"][0]; else if ($metadata["plush"]) echo $lang["species"]["pegasus"][1]; else echo $lang["species"]["pegasus"][2]; + break; + + case "batpony": + if ($metadata["robot"]) echo $lang["species"]["batpony"][0]; else if ($metadata["plush"]) echo $lang["species"]["batpony"][1]; else echo $lang["species"]["batpony"][2]; + break; + + case "unicorn": + if ($metadata["robot"]) echo $lang["species"]["unicorn"][0]; else if ($metadata["plush"]) echo $lang["species"]["unicorn"][1]; else echo $lang["species"]["unicorn"][2]; + break; + + default: + echo $species . "_" . $metadata["robot"]; + break; + } ?>" style="width:24px;vertical-align: middle;position:relative;top:-5px;" src="/assets/species/<?= $species ?><?= $metadata["robot"] ? "-robot" : ($metadata["plush"] ? "-plush" : "") ?>.png" alt="<?= $species ?>"> + <?php endforeach; ?> + </span> + <?php if ($systemID !== $app["other"]["id"]): ?> + <span class="comparison-item"> + <?php if (isset($metadata["code"]) && trim($metadata["code"]) !== ""): ?> + <code style="color: white;"><?= strtoupper(substr($metadata["code"], 0, 3)) ?></code> + <?php else: ?>-<?php endif; ?> + </span> + <?php endif; ?> + <span class="comparison-item"> + <?= count($metadata["marefriends"]) + count($metadata["sisters"]) + count($metadata["caretakers"]) === 0 ? "-" : "" ?> + <span class="comparison-relations-count"> + <?= count($metadata["marefriends"]) + count($metadata["sisters"]) > 0 ? count($metadata["marefriends"]) + count($metadata["sisters"]) : "" ?> + </span> + <span class="comparison-relations-full"> + <?php global $isLowerLoggedIn; global $isLoggedIn; $index = 0; foreach ($metadata["marefriends"] as $marefriend): $mfSystem = explode("/", $marefriend)[0]; if (!($mfSystem === $app["other"]["id"] && !$isLoggedIn && !$isLowerLoggedIn)): $mfMemberID = explode("/", $marefriend)[1]; $mfMember = array_filter(json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/$mfSystem/members.json"), true), function ($item) use ($mfSystem) { + global $mfMemberID; global $app; global $isLoggedIn; global $isLowerLoggedIn; + return $item["id"] === $mfMemberID && !($mfSystem === $app["other"]["id"] && !$isLoggedIn && !$isLowerLoggedIn); + }); sort($mfMember); $mfMember = $mfMember[0]; ?><a title="<b><?= $mfMember["display_name"] ?? $mfMember["name"] ?></b><br><?= $lang["compare"]["status"][0] ?>" data-bs-toggle="tooltip" data-bs-html="true" class="member-link tooltip-nohelp" href="/<?= $mfMember["name"] ?>"><img src="<?= getAsset($mfSystem, $mfMember["id"], "heads") ?>" style="width:24px;"></a><?php endif; $index++; endforeach; ?><?php $index = 0; foreach ($metadata["sisters"] as $marefriend): $mfSystem = explode("/", $marefriend)[0]; if (!($mfSystem === $app["other"]["id"] && !$isLoggedIn && !$isLowerLoggedIn)): $mfMemberID = explode("/", $marefriend)[1]; $mfMember = array_filter(json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/$mfSystem/members.json"), true), function ($item) use ($mfSystem) { + global $mfMemberID; global $app; global $isLoggedIn; global $isLowerLoggedIn; + return $item["id"] === $mfMemberID && !($mfSystem === $app["other"]["id"] && !$isLoggedIn && !$isLowerLoggedIn); + }); sort($mfMember); $mfMember = $mfMember[0]; ?><a title="<b><?= $mfMember["display_name"] ?? $mfMember["name"] ?></b><br><?= $lang["compare"]["status"][1] ?>" data-bs-toggle="tooltip" data-bs-html="true" class="member-link tooltip-nohelp" href="/<?= $mfMember["name"] ?>"><img src="<?= getAsset($mfSystem, $mfMember["id"], "heads") ?>" style="width:24px;"></a><?php endif; $index++; endforeach; ?><?php $index = 0; foreach ($metadata["caretakers"] as $marefriend): $mfSystem = explode("/", $marefriend)[0]; if (!($mfSystem === $app["other"]["id"] && !$isLoggedIn && !$isLowerLoggedIn)): $mfMemberID = explode("/", $marefriend)[1]; $mfMember = array_filter(json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/$mfSystem/members.json"), true), function ($item) use ($mfSystem) { + global $mfMemberID; global $app; global $isLoggedIn; global $isLowerLoggedIn; + return $item["id"] === $mfMemberID && !($mfSystem === $app["other"]["id"] && !$isLoggedIn && !$isLowerLoggedIn); + }); sort($mfMember); $mfMember = $mfMember[0]; ?><a title="<b><?= $mfMember["display_name"] ?? $mfMember["name"] ?></b><br><?= $lang["compare"]["status"][2] ?>" data-bs-toggle="tooltip" data-bs-html="true" class="member-link tooltip-nohelp" href="/<?= $mfMember["name"] ?>"><img src="<?= getAsset($mfSystem, $mfMember["id"], "heads") ?>" style="width:24px;"></a><?php endif; $index++; endforeach; ?> + </span> + </span> + <span class="comparison-item"> + <?php if ($metadata["shared_memory"] > 0): ?> + <?php if ($metadata["shared_memory"] === 1): ?> + <img data-bs-toggle="tooltip" title="<?= $lang["compare"]["state"][5] ?>" src="/assets/icons/partial.svg" alt="<?= $lang["compare"]["state"][5] ?>" style="width:24px;"> + <?php else: ?> + <img data-bs-toggle="tooltip" title="<?= $lang["compare"]["state"][6] ?>" src="/assets/icons/complete.svg" alt="<?= $lang["compare"]["state"][6] ?>" style="width:24px;"> + <?php endif; ?> + <?php else: ?> + <img data-bs-toggle="tooltip" title="<?= $lang["compare"]["state"][2] ?>" src="/assets/icons/none.svg" alt="<?= $lang["compare"]["state"][2] ?>" style="width:24px;"> + <?php endif; ?> + </span> + <span class="comparison-item"> + <?php if ($metadata["fictive"]): ?> + <img data-bs-toggle="tooltip" title="<?= $lang["compare"]["state"][0] ?>" src="/assets/icons/complete.svg" alt="<?= $lang["compare"]["state"][0] ?>" style="width:24px;"> + <?php else: ?> + <img data-bs-toggle="tooltip" title="<?= $lang["compare"]["state"][2] ?>" src="/assets/icons/none.svg" alt="<?= $lang["compare"]["state"][2] ?>" style="width:24px;"> + <?php endif; ?> + </span> + <span class="comparison-item"> + <?php if ($metadata["little"] === 2): ?> + <img data-bs-toggle="tooltip" title="<?= $lang["compare"]["state"][0] ?>" src="/assets/icons/complete.svg" alt="<?= $lang["compare"]["state"][0] ?>" style="width:24px;"> + <?php elseif ($metadata["little"] === 3): ?> + <img data-bs-toggle="tooltip" title="<?= $lang["compare"]["state"][3] ?>" src="/assets/icons/partial.svg" alt="<?= $lang["compare"]["state"][1] ?>" style="width:24px;"> + <?php else: ?> + <img data-bs-toggle="tooltip" title="<?= $lang["compare"]["state"][2] ?>" src="/assets/icons/none.svg" alt="<?= $lang["compare"]["state"][2] ?>" style="width:24px;"> + <?php endif; ?> + </span> + <span class="comparison-item"> + <?php if ($metadata["protector"]): ?> + <?php if ($travelling[$member["id"]]["travelling"]): ?> + <img data-bs-toggle="tooltip" title="<?= $lang["compare"]["state"][4] ?>" src="/assets/icons/partial.svg" alt="<?= $lang["compare"]["state"][4] ?>" style="width:24px;"> + <?php else: ?> + <img data-bs-toggle="tooltip" title="<?= $lang["compare"]["state"][0] ?>" src="/assets/icons/complete.svg" alt="<?= $lang["compare"]["state"][0] ?>" style="width:24px;"> + <?php endif; ?> + <?php else: ?> + <img data-bs-toggle="tooltip" title="<?= $lang["compare"]["state"][2] ?>" src="/assets/icons/none.svg" alt="<?= $lang["compare"]["state"][2] ?>" style="width:24px;"> + <?php endif; ?> + </span> + <?php endforeach; ?> + </div> + </div> + +<?php require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/components/footer.inc'; ?>
\ No newline at end of file diff --git a/includes/util/banner.inc b/includes/util/banner.inc index 01362a0..1f4d7fd 100644 --- a/includes/util/banner.inc +++ b/includes/util/banner.inc @@ -337,6 +337,14 @@ function getMemberBannerData(string $id, string $system, bool $french = false) { ]; } + if (($metadata["host"] ?? false)) { + $badges[] = [ + "id" => "host", + "color" => "fc6735", + "html" => '<span data-bs-toggle="tooltip" data-bs-html="true" title="<b>Host</b><br>' . ucfirst(getMemberPronouns($member['pronouns'])["subjective"]) . ' ' . (getMemberPronouns($member['pronouns'])["third"] ? "is" : "are") . ' the host in ' . getMemberPronouns($member['pronouns'])["possessive_det"] . ' system." class="badge rounded-pill" style="background-color:#fc6735;height:24px;display:inline-flex;align-items:center;position:relative;top:1px;"><span>Host</span></span>' + ]; + } + if (($metadata["leader"] ?? false)) { $badges[] = [ "id" => "leader", @@ -403,4 +411,4 @@ function getMemberBannerData(string $id, string $system, bool $french = false) { 'friends' => $friends ?? [] ] ]; -}
\ No newline at end of file +} diff --git a/pages/api/money/create.php b/pages/api/money/create.php index 0b78f57..12cc7c9 100644 --- a/pages/api/money/create.php +++ b/pages/api/money/create.php @@ -79,7 +79,7 @@ file_get_contents('https://' . $ntfy["server"] . '/' . $ntfy["topic"], false, st "Title: " . formatPonypush((getMember($myId)["display_name"] ?? getMember($myId)["name"]) . " created a transaction to " . $account["name"] . " (" . ucfirst($account["owner"]) . ")") . "\r\n" . "Tags: bits\r\n" . "Authorization: Basic " . base64_encode($ntfy["user"] . ":" . $ntfy["password"]), - 'content' => formatPonypush(($account["currency"] === "gbp" ? "£" : "€") . abs((float)$data["amount"]) . " were " . ((float)$data["amount"] >= 0 ? "added" : "removed") . " just now" . (trim($data["description"]) !== "" ? ": " . $_GET["description"] : "")) + 'content' => formatPonypush(($account["currency"] === "gbp" ? "£" : "€") . abs((float)$data["amount"]) . " were " . ((float)$data["amount"] >= 0 ? "added" : "removed") . " just now" . (trim($data["description"]) !== "" ? ": " . $data["description"] : "")) ] ])); diff --git a/pages/fronting.inc b/pages/fronting.inc index 6cd464b..9873b81 100644 --- a/pages/fronting.inc +++ b/pages/fronting.inc @@ -1,5 +1,9 @@ <?php +if (time() >= 1686787200) { + peh_error("Page not found: fronting", 404); +} + require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/init.inc"; global $title; global $isLoggedIn; global $lang; global $pages; require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/components/header.inc'; diff --git a/pages/travelling.inc b/pages/travelling.inc index ee2e2c3..7eb3dfa 100644 --- a/pages/travelling.inc +++ b/pages/travelling.inc @@ -39,8 +39,8 @@ if (isset($_GET['toggleTravel']) && $isLoggedIn) { $reqContext = stream_context_create($reqOptions); // No actual data is received on DELETE, so we don't even bother trying to collect req response; if it fails it will put a warning in the logs anyway. - sleep(1); - file_get_contents("https://api.pluralkit.me/v2/members/$travellingMember", false, $reqContext); + //sleep(1); + //file_get_contents("https://api.pluralkit.me/v2/members/$travellingMember", false, $reqContext); } } else { $travelling[$_GET['member']]["travelling"] = true; @@ -86,13 +86,13 @@ if (isset($_GET['toggleTravel']) && $isLoggedIn) { $reqContext = stream_context_create($reqOptions); - sleep(1); - $member = json_decode(file_get_contents("https://api.pluralkit.me/v2/members", false, $reqContext), true); + //sleep(1); + //$member = json_decode(file_get_contents("https://api.pluralkit.me/v2/members", false, $reqContext), true); // Member exists? - if (isset($member)) { - $travelling[$id]['pluralkit'] = $member["id"]; - } + //if (isset($member)) { + //$travelling[$id]['pluralkit'] = $member["id"]; + //} } } } |