From a0b85ee44c07ac7ffd3f69227069e8835f0f2730 Mon Sep 17 00:00:00 2001 From: Minteck Date: Mon, 6 Feb 2023 22:53:06 +0100 Subject: Updated 9 files and added assets/uploads/pt-pinkiepie.png (automated) --- api/computer.php | 8 +++ assets/logo/custom.css | 4 ++ assets/uploads/pt-pinkiepie.png | Bin 0 -> 4595 bytes comproxy/index.js | 4 +- includes/fullbanner.inc | 1 - includes/member.inc | 154 +++++++++++++++++++++------------------- includes/navigation.inc | 8 +-- includes/search.inc | 2 +- pages/bitset.inc | 26 +++---- pages/computers.inc | 133 ++++++++++++++++++++++------------ 10 files changed, 200 insertions(+), 140 deletions(-) create mode 100644 assets/uploads/pt-pinkiepie.png diff --git a/api/computer.php b/api/computer.php index a4ead80..cd065e7 100644 --- a/api/computer.php +++ b/api/computer.php @@ -9,6 +9,14 @@ $json_object = json_decode($request_raw, true); $host = md5($json_object['host']); switch ($_GET['type']) { + case "heartbeat": + if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/includes/data/computers/metadata/" . $_PROFILE['login'] . "-" . $host . ".json")) { + $data = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/computers/metadata/" . $_PROFILE['login'] . "-" . $host . ".json"), true); + $data["date"] = date('c'); + file_put_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/computers/metadata/" . $_PROFILE['login'] . "-" . $host . ".json", json_encode($data)); + } + break; + case "screenshot": $id = $json_object['id']; $data = base64_decode($json_object['data']); diff --git a/assets/logo/custom.css b/assets/logo/custom.css index a67eb02..ad308e2 100644 --- a/assets/logo/custom.css +++ b/assets/logo/custom.css @@ -707,4 +707,8 @@ peh-muted { html, body { overflow-x: hidden; +} + +.form-check-input { + filter: invert(1) hue-rotate(180deg); } \ No newline at end of file diff --git a/assets/uploads/pt-pinkiepie.png b/assets/uploads/pt-pinkiepie.png new file mode 100644 index 0000000..75e9071 Binary files /dev/null and b/assets/uploads/pt-pinkiepie.png differ diff --git a/comproxy/index.js b/comproxy/index.js index 60b4baa..4a5115e 100644 --- a/comproxy/index.js +++ b/comproxy/index.js @@ -34,7 +34,9 @@ wss.on('connection', function connection(ws, req) { servers[data.id].send(JSON.stringify({ type: "client", - id: ws.id + id: ws.id, + address: req.headers['x-forwarded-for'].split(',')[0].trim(), + name: data.name })); clients[ws.id] = ws; diff --git a/includes/fullbanner.inc b/includes/fullbanner.inc index 30bdf3e..b5a05b1 100644 --- a/includes/fullbanner.inc +++ b/includes/fullbanner.inc @@ -12,7 +12,6 @@ -
diff --git a/includes/member.inc b/includes/member.inc index e984861..488ff7f 100644 --- a/includes/member.inc +++ b/includes/member.inc @@ -39,23 +39,24 @@ if ($memberData["name"] === "fusion") { ?> -
');background-size: cover;background-position: center; top: 0;"> -
+
;position: fixed;background-image: url('');background-size: cover;background-position: center; top: 0;"> +
">

-
+
; padding-bottom: 0 !important;">
+

@@ -63,6 +64,7 @@ if ($memberData["name"] === "fusion") {
+

@@ -77,80 +79,14 @@ if ($memberData["name"] === "fusion") {
- -
- - (edit: metadata, public, private) - -
-
    -
  • 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: -
      $usage) { - if (is_string($usage)) { - echo("
    • " . $type . ": " . $usage . "
      • "); - } else if (is_array($usage)) { - if (count($usage) === 0) { - echo("
    • " . $type . ": []
      • "); - } else { - echo("
    • " . $type . ":
        "); - - foreach ($usage as $key => $item) { - if (is_string($item)) { - echo("
      • " . $key . ": " . $item . "
        • "); - } else { - echo("
      • " . $key . ": " . json_encode($item, JSON_UNESCAPED_SLASHES) . "
        • "); - } - } - - echo("
      • "); - } - } else { - echo("
    • " . $type . ": " . json_encode($usage, JSON_UNESCAPED_SLASHES) . "
      • "); - } - } - - ?>
    • -
-
-
- - +
-
+
+ "); ?> @@ -158,4 +94,76 @@ if ($memberData["name"] === "fusion") {
+
+ +
+ +
+ + (edit: metadata, public, private) + +
+
    +
  • 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: +
      $usage) { + if (is_string($usage)) { + echo("
    • " . $type . ": " . $usage . "
      • "); + } else if (is_array($usage)) { + if (count($usage) === 0) { + echo("
    • " . $type . ": []
      • "); + } else { + echo("
    • " . $type . ":
        "); + + foreach ($usage as $key => $item) { + if (is_string($item)) { + echo("
      • " . $key . ": " . $item . "
        • "); + } else { + echo("
      • " . $key . ": " . json_encode($item, JSON_UNESCAPED_SLASHES) . "
        • "); + } + } + + echo("
      • "); + } + } else { + echo("
    • " . $type . ": " . json_encode($usage, JSON_UNESCAPED_SLASHES) . "
      • "); + } + } + + ?>
    • +
+
+
+ +
+ \ No newline at end of file diff --git a/includes/navigation.inc b/includes/navigation.inc index 3db5d21..b61c069 100644 --- a/includes/navigation.inc +++ b/includes/navigation.inc @@ -270,7 +270,7 @@ $navigation_cloudburst = [ ] ] ], - "subsystems" => [ + /*"subsystems" => [ "name" => $lang["navigation"]["subsystems"], "minimal" => false, "items" => array_map(function ($subsystem) { @@ -284,7 +284,7 @@ $navigation_cloudburst = [ "stepped" => null ]; }, $cloudburst_subsystemsNotMember) - ], + ],*/ "members" => [ "name" => $lang["navigation"]["members"], "minimal" => false, @@ -342,7 +342,7 @@ $navigation_raindrops = [ ] ] ], - "subsystems" => [ + /*"subsystems" => [ "name" => $lang["navigation"]["subsystems"], "minimal" => false, "items" => array_map(function ($subsystem) { @@ -356,7 +356,7 @@ $navigation_raindrops = [ "stepped" => null ]; }, $raindrops_subsystemsNotMember) - ], + ],*/ "members" => [ "name" => $lang["navigation"]["members"], "minimal" => false, diff --git a/includes/search.inc b/includes/search.inc index c125556..0f0a868 100644 --- a/includes/search.inc +++ b/includes/search.inc @@ -8,7 +8,7 @@
- +

diff --git a/pages/bitset.inc b/pages/bitset.inc index b16a23e..bd8412b 100644 --- a/pages/bitset.inc +++ b/pages/bitset.inc @@ -322,7 +322,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/header.inc'; - + Little/younger: @@ -395,51 +395,51 @@ require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/header.inc';













diff --git a/pages/computers.inc b/pages/computers.inc index 1541fa6..0d41a23 100644 --- a/pages/computers.inc +++ b/pages/computers.inc @@ -1,6 +1,6 @@ + +
@@ -47,6 +62,13 @@ if (count($parts) === 2 || count($parts) === 3) { Back + +
+

We are unable to give you access to this computer.

+

This computer is running Luna version 1.0.0. This version of Luna is considered malware because of inconspicuous behavior and is therefore not usable anymore and has been disabled. This means you cannot access this computer at the moment.

+ Update this computer to run Luna 1.1.0 or newer and try again. +
+

Overview