From 209356b8ade1920b50d1d3a1a5e121c6623d167b Mon Sep 17 00:00:00 2001 From: Minteck Date: Fri, 11 Nov 2022 23:47:49 +0100 Subject: Update --- includes/assets.inc | 34 +++- includes/cleanup.inc | 45 +++++ includes/details.inc | 82 ++++++++ includes/edit-private.inc | 7 +- includes/edit.inc | 7 +- includes/fullbanner.inc | 102 ++++++++++ includes/header.inc | 24 ++- includes/logo.inc | 16 +- includes/member.inc | 260 +++++------------------- includes/navigation.inc | 17 +- includes/pages.json | 14 +- includes/planner.inc | 17 +- includes/refresh.php | 10 +- includes/score.inc | 6 +- includes/subsysedit.inc | 4 +- includes/sysedit.inc | 264 ++++++++++++------------ includes/system.inc | 4 +- includes/system/compare.inc | 20 +- includes/system/species.inc | 12 +- includes/titlebar.inc | 476 +++++++++++++++++++++++++++++++++++++++++++- 20 files changed, 1008 insertions(+), 413 deletions(-) create mode 100644 includes/cleanup.inc create mode 100644 includes/details.inc create mode 100644 includes/fullbanner.inc (limited to 'includes') diff --git a/includes/assets.inc b/includes/assets.inc index 9a0a9ac..3f9971a 100644 --- a/includes/assets.inc +++ b/includes/assets.inc @@ -11,14 +11,18 @@ function downloadAssets($system) { if (isset($general["avatar_url"])) { $id = preg_replace("/^([\da-f]{8})-([\da-f]{4})-([\da-f]{4})-([\da-f]{4})-([\da-f]{12})$/", "$1$2$3$4$5", $general["uuid"]); echo(" /avatars/$id.webp\n"); - exec("convert -resize 512x512 \"" . $general["avatar_url"] . "\" ../assets/avatars/" . $id . ".webp"); - exec("convert -resize 512x512 \"" . $general["avatar_url"] . "\" ../assets/uploads/" . ($id === "gdapd" ? "raindrops" : "cloudburst") . ".png"); + file_put_contents("/tmp/img." . pathinfo($general['avatar_url'], PATHINFO_EXTENSION), file_get_contents($general['avatar_url'])); + exec("convert -resize 512x512 \"" . "/tmp/img." . pathinfo($general['avatar_url'], PATHINFO_EXTENSION) . "\" ../assets/avatars/" . $id . ".webp"); + exec("convert -resize 512x512 \"" . "/tmp/img." . pathinfo($general['avatar_url'], PATHINFO_EXTENSION) . "\" ../assets/uploads/" . ($id === "gdapd" ? "raindrops" : "cloudburst") . ".png"); + unlink("/tmp/img." . pathinfo($general['avatar_url'], PATHINFO_EXTENSION)); } if (isset($general["banner"])) { $id = preg_replace("/^([\da-f]{8})-([\da-f]{4})-([\da-f]{4})-([\da-f]{4})-([\da-f]{12})$/", "$1$2$3$4$5", $general["uuid"]); echo(" /banners/$id.webp\n"); - exec("convert -resize 2048x2048 \"" . $general["banner"] . "\" ../assets/banners/" . $id . ".webp"); + file_put_contents("/tmp/img." . pathinfo($general['banner'], PATHINFO_EXTENSION), file_get_contents($general['banner'])); + exec("convert -resize 2048x2048 \"" . "/tmp/img." . pathinfo($general['banner'], PATHINFO_EXTENSION) ."\" ../assets/banners/" . $id . ".webp"); + unlink("/tmp/img." . pathinfo($general['banner'], PATHINFO_EXTENSION)); } $members = json_decode(file_get_contents("./data/$system/members.json"), true); @@ -28,12 +32,30 @@ function downloadAssets($system) { if (isset($member["avatar_url"])) { echo(" /avatars/$id.webp\n"); - exec("convert -resize 512x512 \"" . $member["avatar_url"] . "\" ../assets/avatars/" . $id . ".webp"); + file_put_contents("/tmp/img." . pathinfo($member['avatar_url'], PATHINFO_EXTENSION), file_get_contents($member['avatar_url'])); + exec("convert -resize 512x512 \"" . "/tmp/img." . pathinfo($member['avatar_url'], PATHINFO_EXTENSION) . "\" ../assets/avatars/" . $id . ".webp"); + unlink("/tmp/img." . pathinfo($member['avatar_url'], PATHINFO_EXTENSION)); } + echo(" /banners/$id.webp\n"); + if (isset($member["banner"])) { - echo(" /banners/$id.webp\n"); - exec("convert -resize 2048x2048 \"" . $member["banner"] . "\" ../assets/banners/" . $id . ".webp"); + file_put_contents("/tmp/img." . pathinfo($member['banner'], PATHINFO_EXTENSION), file_get_contents($member['banner'])); + exec("convert -resize 2048x2048 \"" . "/tmp/img." . pathinfo($member['banner'], PATHINFO_EXTENSION) . "\" ../assets/banners/" . $id . ".webp"); + unlink("/tmp/img." . pathinfo($member['banner'], PATHINFO_EXTENSION)); + } else { + $img = imagecreate(2048, 1024); + + if (isset($member["color"])) { + imagecolorallocate($img, hexdec(substr($member["color"], 0, 2)) / 2, hexdec(substr($member["color"], 2, 2)) / 2, hexdec(substr($member["color"], 4, 2)) / 2); + } else { + imagecolorallocate($img, 0, 0, 0); + } + + imagejpeg($img, "/tmp/img.jpeg", 100); + imagedestroy($img); + exec("convert -resize 2048x2048 \"/tmp/img.jpeg\" ../assets/banners/" . $id . ".webp"); + unlink("/tmp/img.jpeg"); } if (file_exists("../assets/uploads/pt-" . $member["name"] . ".png")) { diff --git a/includes/cleanup.inc b/includes/cleanup.inc new file mode 100644 index 0000000..1d02081 --- /dev/null +++ b/includes/cleanup.inc @@ -0,0 +1,45 @@ + +
; margin-left: -20px; margin-right: -20px;"> +
+ Food:
 + "Not needed", + 1 => "Not animals", + 2 => "Not meat", + 3 => "All", + } ?> +
+
+ Shared memory:
 + "None", + 1 => "Partial", + 2 => "Full", + } ?> +
+
+ Magic:
 + "None", + 1 => "In some cases", + 2 => "Horn", + 3 => "Wings", + 4 => "Horn and wings", + 5 => "Yes", + } ?> +
+ +
+ Sensitivity:
 + "None", + 1 => "Maybe", + 2 => "Affectionate", + 3 => "Sexual", + 4 => "Affectionate and sexual", + } ?> +
+
+ Age:
 + + + - + + " . $metadata["birth"]["age"] . "* years old" ?> + + + + - + + + " . $age . " years old" ?> + + +
+
+ Birthday:
 + + + + - + +
+ +
\ No newline at end of file diff --git a/includes/edit-private.inc b/includes/edit-private.inc index e760b94..69f50d8 100644 --- a/includes/edit-private.inc +++ b/includes/edit-private.inc @@ -8,12 +8,7 @@ if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/includes/data/metadata/" . $member
- -
- -
+

Saved · bytes · ">View page diff --git a/includes/edit.inc b/includes/edit.inc index d8cf673..61e9f29 100644 --- a/includes/edit.inc +++ b/includes/edit.inc @@ -8,12 +8,7 @@ if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/includes/data/metadata/" . $member

- -
- -
+

Saved · bytes · ">View page diff --git a/includes/fullbanner.inc b/includes/fullbanner.inc new file mode 100644 index 0000000..1c449d3 --- /dev/null +++ b/includes/fullbanner.inc @@ -0,0 +1,102 @@ + + + +

+
+ +
+ +
+ + + +
+ + + +
+ This member's metadata needs an update. It still uses the old JSON metadata system instead of the new 24bit integer-based system. Contact a developer to request an update. (only administrators can see this; file: /includes/data/metadata/.json) +
+ +
+
+ Private administrator information +
    +
  • ID: (, )
    • +
  • Files: +
      +
    • ()
      • +
    • ()
      • +
    • ()
      • +
    +
    • +
  • Date added: (, )
    • +
  • Pronouns:
    • +
  • Pronouns usage:
      $usage) { + if (is_string($usage) && $type !== "color") { + echo("
    • " . $type . ": " . $usage . "
      • "); + } + } + + ?>
    • +
  • Color: ;display:inline-block;width:16px;height:16px;border-radius:5px;vertical-align: middle;filter: invert(1) hue-rotate(180deg);"> # +
  • Bitset: (0x, )
    • Not using bitset; please update. +
  • Reduced name:
    • +
  • Shared memory access: ()
    • +
  • Protector: ()
    • +
  • Little: ()
    • +
  • Relations count:
    • + +
  • + Score breakdown: +
      +
    • Most common fronter score:
      • +
    • Relationships score:
      • +
    • Fictive score:
      • +
    • Median score:
      • +
    • Species score:
      • +
    • Little score:
      • +
    • Not talking score:
      • +
    • Protector score:
      • +
    • Name score:
      • +
    • Shared memory score:
      • +
    +
    • +
  • Full metadata:
      $usage) { + if (is_string($usage)) { + echo("
    • " . $type . ": " . $usage . "
      • "); + } else { + echo("
    • " . $type . ": " . json_encode($usage, JSON_UNESCAPED_SLASHES) . "
      • "); + } + } + + ?>
    • +
+ +
+
+ AI-generated page: + +
+
+
+ + +
+ is visiting the , therefore currently not in the . +
+ + +
+

Hello there!

+

I'm currently a new headmate slowly figuring myself out.

+

Give me some time to figure myself out and see this page change as I find new stuff about my identity. Don't be too worried if I accidentally get pushed to front, it's something that can happen sometimes.

+ Thanks! +
+ \ No newline at end of file diff --git a/includes/header.inc b/includes/header.inc index c893cea..2d95799 100644 --- a/includes/header.inc +++ b/includes/header.inc @@ -1,6 +1,6 @@ id="admin-page"> @@ -851,6 +855,10 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/ical/main.php"; body { margin-left: 250px !important; } + + #system-banner-container, #member-banner-container { + width: 100% !important; + } } @media (max-width: 1300px) { @@ -894,6 +902,20 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/ical/main.php"; display: block !important; } } + + @media (max-width: 700px) { + #title-bar-parts-mobile { + display: inline !important; + } + + #title-bar-parts-desktop { + display: none; + } + + #title-bar { + text-align: left; + } + } diff --git a/includes/logo.inc b/includes/logo.inc index 442ff2b..9b4a03f 100644 --- a/includes/logo.inc +++ b/includes/logo.inc @@ -4,7 +4,9 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/functions.inc"; require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/bitset.inc"; require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/score.inc"; -$columns = round(sqrt(count(scoreOrderGlobal()))); +$columns = ceil(sqrt(count(scoreOrderGlobal()))); +echo(" Using " . $columns . " columns\n"); + $members = scoreOrderGlobal(); usort($members, function ($a, $b) { @@ -27,6 +29,8 @@ usort($members, function ($a, $b) { return $ra - $rb; }); +echo(" " . count($members) . " members\n"); + $packs = []; $currentPack = []; @@ -71,7 +75,11 @@ $factor = 64; for ($y = 0; $y < $columns; ++$y) { for ($x = 0; $x < $columns; ++$x) { - imagesetpixel($img, $x, $y, imagecolorallocate($img, hexdec(substr($newPacks[$y][$x], 0, 2)), hexdec(substr($newPacks[$y][$x], 2, 2)), hexdec(substr($newPacks[$y][$x], 4, 2)))); + if (isset($newPacks[$y][$x])) { + imagesetpixel($img, $x, $y, imagecolorallocate($img, hexdec(substr($newPacks[$y][$x], 0, 2)), hexdec(substr($newPacks[$y][$x], 2, 2)), hexdec(substr($newPacks[$y][$x], 4, 2)))); + } else { + imagesetpixel($img, $x, $y, imagecolorallocate($img, 255, 255, 255)); + } } } @@ -83,6 +91,7 @@ $img3 = imageCreateCorners("/tmp/image.png", $columns * 10); unlink("/tmp/image.png"); imagepng($img3, $_SERVER['DOCUMENT_ROOT'] . "/assets/logo/newlogo.png"); +imagepng($img3, "/tmp/ponieslogo1.png"); for ($x = 1; $x <= 120; $x++) { imagefilter($img2, IMG_FILTER_GAUSSIAN_BLUR); @@ -94,4 +103,5 @@ imagepng($img2, "/tmp/image.png"); $img3 = imageCreateCorners("/tmp/image.png", $columns * 10); unlink("/tmp/image.png"); -imagepng($img3, $_SERVER['DOCUMENT_ROOT'] . "/assets/logo/newlogo-template.png"); \ No newline at end of file +imagepng($img3, $_SERVER['DOCUMENT_ROOT'] . "/assets/logo/newlogo-template.png"); +imagepng($img3, "/tmp/ponieslogo2.png"); \ No newline at end of file diff --git a/includes/member.inc b/includes/member.inc index 6f36f75..02f7769 100644 --- a/includes/member.inc +++ b/includes/member.inc @@ -39,230 +39,62 @@ if ($memberData["name"] === "fusion") { ?> +
');background-size: cover;background-position: center; top: 0;"> +
+
+ + +
- - -
-
-
"> -
- Food:
 - "Not needed", - 1 => "Not animals", - 2 => "Not meat", - 3 => "All", - } ?> -
-
- Shared memory:
 - "None", - 1 => "Partial", - 2 => "Full", - } ?> -
-
- Magic:
 - "None", - 1 => "In some cases", - 2 => "Horn", - 3 => "Wings", - 4 => "Horn and wings", - 5 => "Yes", - } ?> -
- -
- Sensitivity:
 - "None", - 1 => "Maybe", - 2 => "Affectionate", - 3 => "Sexual", - 4 => "Affectionate and sexual", - } ?> -
-
- Age:
 - - - - - - " . $metadata["birth"]["age"] . "* years old" ?> +
+ + +
+ +
+

Hello there!

+

I'm currently not totally sure who I am (it's a thing that can happen with plurality), but I am using as a temporary identity to stay calm and not panic while I figure out what is going on and who I am.

+

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, or a new pony trying to figure out their identity (this can sometimes take a while).

+ In all cases, feel free to ask! +
+ +
+

Hello there!

+

I'm the result of more than one pony temporarily merging together to the point they are unable to be told apart (this can be done for various reasons). We have not registered this switch for the "Unknown" member since this merge is made on purpose.

+

Below is the list of who is merged, we can be either from a single system or from different systems.

+
+ + " style="filter:invert(1) hue-rotate(180deg);width:24px;"> + +
+ + No members are currently merged. - - - - - - + + + (edit: public, private) + - ?> - " . $age . " years old" ?> - + + +
-
-
- Birthday:
 - - + + + - - +

This page is automatically generated and may not be 100% accurate.

+ -
- -
- - - -
- - - -
- This member's metadata needs an update. It still uses the old JSON metadata system instead of the new 24bit integer-based system. Contact a developer to request an update. (only administrators can see this; file: /includes/data/metadata/.json) -
- -
-
- Private administrator information -
    -
  • ID: (, )
    • -
  • Files: -
      -
    • ()
      • -
    • ()
      • -
    • ()
      • -
    -
    • -
  • Date added: (, )
    • -
  • Pronouns:
    • -
  • Pronouns usage:
      $usage) { - if (is_string($usage) && $type !== "color") { - echo("
    • " . $type . ": " . $usage . "
      • "); - } - } - - ?>
    • -
  • Color: ;display:inline-block;width:16px;height:16px;border-radius:5px;vertical-align: middle;filter: invert(1) hue-rotate(180deg);"> # -
  • Bitset: (0x, )
    • Not using bitset; please update. -
  • Reduced name:
    • -
  • Shared memory access: ()
    • -
  • Protector: ()
    • -
  • Little: ()
    • -
  • Relations count:
    • - -
  • - Score breakdown: -
      -
    • Most common fronter score:
      • -
    • Relationships score:
      • -
    • Fictive score:
      • -
    • Median score:
      • -
    • Species score:
      • -
    • Little score:
      • -
    • Not talking score:
      • -
    • Protector score:
      • -
    • Name score:
      • -
    • Shared memory score:
      • -
    -
    • -
  • Full metadata:
      $usage) { - if (is_string($usage)) { - echo("
    • " . $type . ": " . $usage . "
      • "); - } else { - echo("
    • " . $type . ": " . json_encode($usage, JSON_UNESCAPED_SLASHES) . "
      • "); - } - } - - ?>
    • -
- -
-
- AI-generated page: - -
-
-
- - -
- is visiting the , therefore currently not in the . -
- - -
-

Hello there!

-

I'm currently a new headmate slowly figuring myself out.

-

Give me some time to figure myself out and see this page change as I find new stuff about my identity. Don't be too worried if I accidentally get pushed to front, it's something that can happen sometimes.

- Thanks! -
- - -
- -
-

Hello there!

-

I'm currently not totally sure who I am (it's a thing that can happen with plurality), but I am using as a temporary identity to stay calm and not panic while I figure out what is going on and who I am.

-

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, or a new pony trying to figure out their identity (this can sometimes take a while).

- In all cases, feel free to ask! -
- -
-

Hello there!

-

I'm the result of more than one pony temporarily merging together to the point they are unable to be told apart (this can be done for various reasons). We have not registered this switch for the "Unknown" member since this merge is made on purpose.

-

Below is the list of who is merged, we can be either from a single system or from different systems.

-
- - " style="filter:invert(1) hue-rotate(180deg);width:24px;"> - -
- - No members are currently merged. - -
- - - (edit: public, private) - - - - -
- - - - - -

This page is automatically generated and may not be 100% accurate.

- - - -
\ No newline at end of file diff --git a/includes/navigation.inc b/includes/navigation.inc index 8ad019c..8e6e8cd 100644 --- a/includes/navigation.inc +++ b/includes/navigation.inc @@ -81,10 +81,10 @@ $navigation_admin = [ "stepped" => null ], [ - "name" => $pages["rules"]["name"], - "icon" => "/assets/icons/rules.svg", + "name" => $pages["rules-old"]["name"], + "icon" => "/assets/icons/rules-old.svg", "invert" => true, - "link" => "/-/rules", + "link" => "/-/rules-old", "stepped" => null ], [ @@ -94,6 +94,13 @@ $navigation_admin = [ "link" => "/-/docs", "stepped" => null ], + [ + "name" => $pages["computers"]["name"], + "icon" => "/assets/icons/computers.svg", + "invert" => true, + "link" => "/-/computers", + "stepped" => null + ], [ "name" => $pages["nicknames"]["name"], "icon" => "/assets/icons/nicknames.svg", @@ -228,7 +235,7 @@ $navigation_global = [ ] ] ], - "tools" => [ + /*"tools" => [ "name" => "Tools", "minimal" => false, "items" => [ @@ -247,7 +254,7 @@ $navigation_global = [ "stepped" => null ] ] - ] + ]*/ ] ]; $navigation_cloudburst = [ diff --git a/includes/pages.json b/includes/pages.json index cb05739..659de57 100644 --- a/includes/pages.json +++ b/includes/pages.json @@ -41,6 +41,12 @@ "admin": true, "rail": true }, + "computers": { + "name": "Computers", + "short": "PCs", + "admin": true, + "rail": true + }, "dashboard": { "name": "Dashboard", "short": null, @@ -156,11 +162,17 @@ "rail": false }, "rules": { - "name": "Systems rules", + "name": "General rules", "short": "Rules", "admin": true, "rail": true }, + "rules-old": { + "name": "Systems rules (legacy)", + "short": "Rules (old)", + "admin": true, + "rail": true + }, "s:compare": { "name": "Compare members", "short": null, diff --git a/includes/planner.inc b/includes/planner.inc index 69e0331..72c82a5 100644 --- a/includes/planner.inc +++ b/includes/planner.inc @@ -110,7 +110,7 @@ function day($display, $diff): void { if ($diff < 0) $disabled = true; else $dis - + @@ -126,7 +126,7 @@ function day($display, $diff): void { if ($diff < 0) $disabled = true; else $dis - + Add new fronter @@ -148,7 +148,7 @@ function day($display, $diff): void { if ($diff < 0) $disabled = true; else $dis - + @@ -164,7 +164,7 @@ function day($display, $diff): void { if ($diff < 0) $disabled = true; else $dis - + Add new fronter @@ -220,7 +220,7 @@ function day($display, $diff): void { if ($diff < 0) $disabled = true; else $dis } td { - border: 1px solid rgba(255, 255, 255, .25); + border: 1px solid #404040; padding: 5px 10px; } @@ -259,6 +259,7 @@ function day($display, $diff): void { if ($diff < 0) $disabled = true; else $dis .planner-add-link { color: rgba(255, 255, 255, .75); text-decoration: none; + cursor: pointer; } .planner-add-link:hover { @@ -773,9 +774,9 @@ function day($display, $diff): void { if ($diff < 0) $disabled = true; else $dis @@ -804,7 +805,7 @@ function day($display, $diff): void { if ($diff < 0) $disabled = true; else $dis diff --git a/includes/refresh.php b/includes/refresh.php index ff8d1eb..fefebb2 100644 --- a/includes/refresh.php +++ b/includes/refresh.php @@ -41,6 +41,8 @@ foreach ($deletable as $item) { } $times["docs_cleanup"] = microtime(true) - $currentOpStart; +require_once "./cleanup.inc"; + $currentOpStart = microtime(true); $version = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/version.json"), true); @@ -193,7 +195,9 @@ foreach (json_decode(file_get_contents("./data/gdapd/members.json"), true) as $m if (isset($member['avatar_url'])) { echo(" Profile picture\n"); - exec("convert -resize 128x128 -quality 50 \"" . $member['avatar_url'] . "\" \"./data/images/pf-gdapd-" . $member['id'] . ".webp\""); + file_put_contents("/tmp/img." . pathinfo($member['avatar_url'], PATHINFO_EXTENSION), file_get_contents($member['avatar_url'])); + exec("convert -resize 128x128 -quality 50 \"" . "/tmp/img." . pathinfo($member['avatar_url'], PATHINFO_EXTENSION) . "\" \"./data/images/pf-gdapd-" . $member['id'] . ".webp\""); + unlink("/tmp/img." . pathinfo($member['avatar_url'], PATHINFO_EXTENSION)); } echo(" Pony Town character\n"); @@ -211,7 +215,9 @@ foreach (json_decode(file_get_contents("./data/ynmuc/members.json"), true) as $m if (isset($member['avatar_url'])) { echo(" Profile picture\n"); - exec("convert -resize 128x128 -quality 50 \"" . $member['avatar_url'] . "\" \"./data/images/pf-ynmuc-" . $member['id'] . ".webp\""); + file_put_contents("/tmp/img." . pathinfo($member['avatar_url'], PATHINFO_EXTENSION), file_get_contents($member['avatar_url'])); + exec("convert -resize 128x128 -quality 50 \"" . "/tmp/img." . pathinfo($member['avatar_url'], PATHINFO_EXTENSION) . "\" \"./data/images/pf-ynmuc-" . $member['id'] . ".webp\""); + unlink("/tmp/img." . pathinfo($member['avatar_url'], PATHINFO_EXTENSION)); } echo(" Pony Town character\n"); diff --git a/includes/score.inc b/includes/score.inc index 80a90d1..21baf67 100644 --- a/includes/score.inc +++ b/includes/score.inc @@ -40,7 +40,7 @@ function calculateScore($metadata, $name) { function scoreOrder($members, $system) { $ordered = []; foreach ($members as $member) { - if ($member["name"] !== "unknown" && $member["name"] !== "fusion" && $member["name"] !== "new" && !str_ends_with($member["name"], "-travelling") && file_exists($_SERVER['DOCUMENT_ROOT'] . "/includes/data/metadata/$member[id].json")) { + if ($member["name"] !== "unknown" && $member["name"] !== "fusion" && $member["name"] !== "new" && !str_starts_with($member["name"], "smol") && !str_ends_with($member["name"], "-travelling") && file_exists($_SERVER['DOCUMENT_ROOT'] . "/includes/data/metadata/$member[id].json")) { $systemID = $member["system"] ?? $system; $member["_system"] = $member["system"] = $systemID; @@ -60,7 +60,7 @@ function scoreOrder($members, $system) { function scoreOrderGlobal() { $ordered = []; foreach (json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/gdapd/members.json"), true) as $member) { - if ($member["name"] !== "unknown" && $member["name"] !== "fusion" && $member["name"] !== "new" && !str_ends_with($member["name"], "-travelling") && file_exists($_SERVER['DOCUMENT_ROOT'] . "/includes/data/metadata/$member[id].json")) { + if ($member["name"] !== "unknown" && $member["name"] !== "fusion" && $member["name"] !== "new" && !str_starts_with($member["name"], "smol") && !str_ends_with($member["name"], "-travelling") && file_exists($_SERVER['DOCUMENT_ROOT'] . "/includes/data/metadata/$member[id].json")) { $member["_system"] = "gdapd"; $member["system"] = "gdapd"; $member["_metadata"] = parseMetadata(json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/metadata/$member[id].json"), true)); @@ -70,7 +70,7 @@ function scoreOrderGlobal() { } foreach (json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/ynmuc/members.json"), true) as $member) { - if ($member["name"] !== "unknown" && $member["name"] !== "fusion" && $member["name"] !== "new" && !str_ends_with($member["name"], "-travelling") && file_exists($_SERVER['DOCUMENT_ROOT'] . "/includes/data/metadata/$member[id].json")) { + if ($member["name"] !== "unknown" && $member["name"] !== "fusion" && $member["name"] !== "new" && !str_starts_with($member["name"], "smol") && !str_ends_with($member["name"], "-travelling") && file_exists($_SERVER['DOCUMENT_ROOT'] . "/includes/data/metadata/$member[id].json")) { $member["_system"] = "ynmuc"; $member["system"] = "ynmuc"; $member["_metadata"] = parseMetadata(json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/metadata/$member[id].json"), true)); diff --git a/includes/subsysedit.inc b/includes/subsysedit.inc index e9c4b4c..ab71e37 100644 --- a/includes/subsysedit.inc +++ b/includes/subsysedit.inc @@ -8,12 +8,12 @@

- Saved · bytes + Saved · bytes

diff --git a/includes/sysedit.inc b/includes/sysedit.inc index 95a0b5b..bfff61b 100644 --- a/includes/sysedit.inc +++ b/includes/sysedit.inc @@ -2,142 +2,152 @@ ?> +
+
+
+
- -
+
-

- Saved · bytes -

+
+ +
- - - - - - + + + +
+
+
\ No newline at end of file diff --git a/includes/system.inc b/includes/system.inc index ae6477c..85b8a9c 100644 --- a/includes/system.inc +++ b/includes/system.inc @@ -2,8 +2,8 @@ ?> -
-
+
+