diff options
author | RaindropsSys <raindrops@equestria.dev> | 2024-04-04 18:01:01 +0200 |
---|---|---|
committer | RaindropsSys <raindrops@equestria.dev> | 2024-04-04 18:01:01 +0200 |
commit | e40246759a367cb23cbdb5467b527f4af7a1438b (patch) | |
tree | 1cfddf03b874a08ef63316b57cfd32ab3000c0d0 | |
parent | f16062c94d5da929be9f0c1e2eb3489ba42a7cd8 (diff) | |
download | delta-e40246759a367cb23cbdb5467b527f4af7a1438b.tar.gz delta-e40246759a367cb23cbdb5467b527f4af7a1438b.tar.bz2 delta-e40246759a367cb23cbdb5467b527f4af7a1438b.zip |
Updated 16 files and deleted 12 files (automated)
-rw-r--r-- | _icons/index.php | 43 | ||||
-rw-r--r-- | _profile/index.php | 6 | ||||
-rw-r--r-- | admin/handoff/index.php | 43 | ||||
-rw-r--r-- | admin/index.php | 3 | ||||
-rw-r--r-- | handoff/avatar/index.php | 121 | ||||
-rw-r--r-- | handoff/fcm/index.php | 69 | ||||
-rw-r--r-- | handoff/index.php | 13 | ||||
-rw-r--r-- | handoff/version/index.php | 36 | ||||
-rw-r--r-- | includes/functions.php | 16 | ||||
-rw-r--r-- | includes/header.php | 129 | ||||
-rw-r--r-- | includes/navigation.php | 16 | ||||
-rw-r--r-- | includes/oobe.php | 47 | ||||
-rw-r--r-- | index.php | 18 | ||||
-rw-r--r-- | lang/en.json | 59 | ||||
-rw-r--r-- | lang/fr.json | 59 | ||||
-rw-r--r-- | login/android/index.php | 21 | ||||
-rw-r--r-- | login/index.php | 4 | ||||
-rw-r--r-- | mobile_profile/index.php | 63 | ||||
-rw-r--r-- | pass/index.php | 4 | ||||
-rw-r--r-- | plus/index.php | 14 | ||||
-rw-r--r-- | plus/subscribe/index.php | 20 | ||||
-rw-r--r-- | studio/index.php | 99 | ||||
-rw-r--r-- | studio/light/index.php | 22 | ||||
-rw-r--r-- | studio/profile-theme/index.php | 17 | ||||
-rw-r--r-- | studio/profile/index.php | 17 | ||||
-rw-r--r-- | studio/theme/index.php | 17 | ||||
-rw-r--r-- | support/index.php | 5 | ||||
-rw-r--r-- | version | 2 |
28 files changed, 71 insertions, 912 deletions
diff --git a/_icons/index.php b/_icons/index.php index b8e6235..733aa72 100644 --- a/_icons/index.php +++ b/_icons/index.php @@ -8,24 +8,8 @@ $palettes = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes $userPalette = $palettes["list"][$palettes["default"]]["light"]; -if (isset($_PROFILE) && !isset($_COOKIE["DeltaKiosk"])) { - if (isset($_PROFILE["studio_settings"]) && isset($_PROFILE["studio_settings"]["theme"]) && isset($_PROFILE["ultra"]) && $_PROFILE["ultra"] && isset($palettes["list"][$_PROFILE["studio_settings"]["theme"]])) { - $userPalette = $palettes["list"][$_PROFILE["studio_settings"]["theme"]][$_PROFILE["studio_settings"]["dark"] === true ? "dark" : "light"]; - } -} - if (isset($_SERVER["HTTP_REFERER"]) && isset($_PROFILE)) { $id = preg_replace("/^http(s|):\/\/.*\/(edit|profiles)\/([\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})$/i", "$3", $_SERVER['HTTP_REFERER']); - - if (isset($id) && trim($id) !== "") { - if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/includes/data/profiles/" . $id . ".json")) { - $_ = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/profiles/" . $id . ".json"), true); - - if (isset($_["ultra"]) && $_["ultra"] && isset($_["studio_settings"]) && isset($_["studio_settings"]["profile"]["theme"]) && $_["studio_settings"]["profile"]["theme"] !== -1 && isset($palettes["list"][$_["studio_settings"]["profile"]["theme"]])) { - $userPalette = $palettes["list"][$_["studio_settings"]["profile"]["theme"]][!isset($_COOKIE["DeltaKiosk"]) && $_PROFILE["studio_settings"]["dark"] === true ? "dark" : "light"]; - } - } - } } if (isset($_GET["__"]) && trim($_GET["__"]) !== "") { @@ -34,28 +18,17 @@ if (isset($_GET["__"]) && trim($_GET["__"]) !== "") { if (str_contains("/", $name)) die(); if (!file_exists($_SERVER['DOCUMENT_ROOT'] . "/_icons/" . $name)) die(); - if (isset($_COOKIE["DeltaHandoffPalette"]) || isset($userPalette)) { - $palette = explode(",", $_COOKIE["DeltaHandoffPalette"] ?? $userPalette); + if (isset($userPalette)) { + $palette = explode(",", $userPalette); if (count($palette) > 0) { - if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/_icons/_mdi/" . $name) && isset($_COOKIE["DeltaHandoffPalette"])) { - header("Content-Type: " . mime_content_type($_SERVER['DOCUMENT_ROOT'] . "/_icons/_mdi/" . $name)); - header("Content-Length: " . filesize($_SERVER['DOCUMENT_ROOT'] . "/_icons/_mdi/" . $name)); + header("Content-Type: " . mime_content_type($_SERVER['DOCUMENT_ROOT'] . "/_icons/" . $name)); + header("Content-Length: " . filesize($_SERVER['DOCUMENT_ROOT'] . "/_icons/" . $name)); - if (isset($_GET['p'])) { - echo(str_replace('fill="#084298"', 'fill="#' . $palette[0] . '"', str_replace('fill="#000000"', 'fill="#' . $palette[9] . '"', file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/_icons/_mdi/" . $name)))); - } else { - echo(str_replace('fill="#084298"', 'fill="#' . $palette[0] . '"', str_replace('fill="#000000"', 'fill="#' . $palette[6] . '"', file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/_icons/_mdi/" . $name)))); - } + if (isset($_GET['p'])) { + echo(str_replace('fill="#084298"', 'fill="#' . $palette[0] . '"', str_replace('fill="#000000"', 'fill="#' . $palette[9] . '"', file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/_icons/" . $name)))); } else { - header("Content-Type: " . mime_content_type($_SERVER['DOCUMENT_ROOT'] . "/_icons/" . $name)); - header("Content-Length: " . filesize($_SERVER['DOCUMENT_ROOT'] . "/_icons/" . $name)); - - if (isset($_GET['p'])) { - echo(str_replace('fill="#084298"', 'fill="#' . $palette[0] . '"', str_replace('fill="#000000"', 'fill="#' . $palette[9] . '"', file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/_icons/" . $name)))); - } else { - echo(str_replace('fill="#084298"', 'fill="#' . $palette[0] . '"', str_replace('fill="#000000"', 'fill="#' . $palette[6] . '"', file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/_icons/" . $name)))); - } + echo(str_replace('fill="#084298"', 'fill="#' . $palette[0] . '"', str_replace('fill="#000000"', 'fill="#' . $palette[6] . '"', file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/_icons/" . $name)))); } } else { header("Content-Type: " . mime_content_type($_SERVER['DOCUMENT_ROOT'] . "/_icons/" . $name)); @@ -69,4 +42,4 @@ if (isset($_GET["__"]) && trim($_GET["__"]) !== "") { readfile($_SERVER['DOCUMENT_ROOT'] . "/_icons/" . $name); } -}
\ No newline at end of file +} diff --git a/_profile/index.php b/_profile/index.php index 47c8334..4a3cae6 100644 --- a/_profile/index.php +++ b/_profile/index.php @@ -11,7 +11,7 @@ $gender = "other"; if (isset($id)) { $id = substr($id, 1); if (!preg_match("/[a-zA-Z0-6]/m", $id)) { - if (!isset($_COOKIE["DeltaHandoffPalette"])) header("Location: /profile/$_USER"); else header("Location: /mobile_profile"); + header("Location: /profile/$_USER"); die(); } @@ -25,7 +25,7 @@ if (isset($id)) { $title_pre = $data["nick_name"] ?? $data["first_name"] . " " . $data["last_name"]; $title = "lang_profile_title"; } else { - if (!isset($_COOKIE["DeltaHandoffPalette"])) header("Location: /profile/$_USER"); else header("Location: /mobile_profile"); + header("Location: /profile/$_USER"); die(); } @@ -217,4 +217,4 @@ foreach (array_filter(scandir($_SERVER["DOCUMENT_ROOT"] . "/includes/data/people <br><br> </div> -<?php if ($id !== $_USER) addToUserHistory($id); require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/footer.php"; ?>
\ No newline at end of file +<?php if ($id !== $_USER) addToUserHistory($id); require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/footer.php"; ?> diff --git a/admin/handoff/index.php b/admin/handoff/index.php deleted file mode 100644 index 40ceeb9..0000000 --- a/admin/handoff/index.php +++ /dev/null @@ -1,43 +0,0 @@ -<?php - -require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/session.php"; -$title = "lang_admin_title"; -$title_pre = l("lang_admin_titles_handoff"); -require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/header.php"; -require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/navigation.php"; - -$indexes = [ - "Primary", - "On Primary", - "On Background", - "On Primary Container", - "Secondary 35/Secondary 80", - "Secondary 30/Secondary 90", - "Secondary 25/Secondary 95", - "Surface Variant", - "Neutral 10/Neutral 95", - "Background" -]; - -global $palette; - -?> - -<div class="container"> - <br><br> - <a href="/admin">← <?= l("lang_admin_title") ?></a> - <h1><?= l("lang_admin_titles_handoff") ?></h1> - - <code><?= implode(",", $palette) ?></code><br> - <code><?= $_COOKIE["DeltaHandoffPalette"] ?? "-" ?></code> - - <ul> - <?php foreach ($palette as $index => $color): ?> - <li>[<?= $index ?>, <?= $indexes[9 - $index] ?? "(unknown)" ?>] <code>#<?= $color ?></code> <div style="background-color: #<?= $color ?>; width: 16px; height: 16px; display: inline-block;"></div></li> - <?php endforeach; ?> - </ul> - - <br><br> -</div> - -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/footer.php"; ?>
\ No newline at end of file diff --git a/admin/index.php b/admin/index.php index 44b2f90..bab5d96 100644 --- a/admin/index.php +++ b/admin/index.php @@ -15,7 +15,6 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/navigation.php"; <a href="/admin/requests" class="list-group-item list-group-item-action"><?= l("lang_admin_titles_requests") ?></a> <a href="/admin/registrations" class="list-group-item list-group-item-action"><?= l("lang_admin_titles_registrations") ?></a> <a href="/admin/objects" class="list-group-item list-group-item-action"><?= l("lang_admin_titles_objects") ?></a> - <a href="/admin/handoff" class="list-group-item list-group-item-action"><?= l("lang_admin_titles_handoff") ?></a> <a href="/admin/support" class="list-group-item list-group-item-action"><?= l("lang_admin_titles_support") ?></a> <a href="/admin/codes" class="list-group-item list-group-item-action"><?= l("lang_admin_titles_codes") ?></a> <a href="/admin/avatars" class="list-group-item list-group-item-action"><?= l("lang_admin_titles_avatars") ?></a> @@ -24,4 +23,4 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/navigation.php"; <br><br> </div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/footer.php"; ?>
\ No newline at end of file +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/footer.php"; ?> diff --git a/handoff/avatar/index.php b/handoff/avatar/index.php deleted file mode 100644 index baf6519..0000000 --- a/handoff/avatar/index.php +++ /dev/null @@ -1,121 +0,0 @@ -<?php - -function imageCreateCorners($sourceImageFile, $radius) { - # test source image - if (file_exists($sourceImageFile)) { - $res = is_array($info = getimagesize($sourceImageFile)); - } - else $res = false; - - # open image - if ($res) { - $w = $info[0]; - $h = $info[1]; - switch ($info['mime']) { - case 'image/jpeg': $src = imagecreatefromjpeg($sourceImageFile); - break; - case 'image/gif': $src = imagecreatefromgif($sourceImageFile); - break; - case 'image/png': $src = imagecreatefrompng($sourceImageFile); - break; - default: - $res = false; - } - } - - # create corners - if ($res) { - - $q = 10; # change this if you want - $radius *= $q; - - # find unique color - do { - $r = rand(0, 255); - $g = rand(0, 255); - $b = rand(0, 255); - } - while (imagecolorexact($src, $r, $g, $b) < 0); - - $nw = $w*$q; - $nh = $h*$q; - - $img = imagecreatetruecolor($nw, $nh); - $alphacolor = imagecolorallocatealpha($img, $r, $g, $b, 127); - imagealphablending($img, false); - imagesavealpha($img, true); - imagefilledrectangle($img, 0, 0, $nw, $nh, $alphacolor); - - imagefill($img, 0, 0, $alphacolor); - imagecopyresampled($img, $src, 0, 0, 0, 0, $nw, $nh, $w, $h); - - imagearc($img, $radius-1, $radius-1, $radius*2, $radius*2, 180, 270, $alphacolor); - imagefilltoborder($img, 0, 0, $alphacolor, $alphacolor); - imagearc($img, $nw-$radius, $radius-1, $radius*2, $radius*2, 270, 0, $alphacolor); - imagefilltoborder($img, $nw-1, 0, $alphacolor, $alphacolor); - imagearc($img, $radius-1, $nh-$radius, $radius*2, $radius*2, 90, 180, $alphacolor); - imagefilltoborder($img, 0, $nh-1, $alphacolor, $alphacolor); - imagearc($img, $nw-$radius, $nh-$radius, $radius*2, $radius*2, 0, 90, $alphacolor); - imagefilltoborder($img, $nw-1, $nh-1, $alphacolor, $alphacolor); - imagealphablending($img, true); - imagecolortransparent($img, $alphacolor); - - # resize image down - $dest = imagecreatetruecolor($w, $h); - imagealphablending($dest, false); - imagesavealpha($dest, true); - imagefilledrectangle($dest, 0, 0, $w, $h, $alphacolor); - imagecopyresampled($dest, $img, 0, 0, 0, 0, $w, $h, $nw, $nh); - - # output image - $res = $dest; - imagedestroy($src); - imagedestroy($img); - } - - return $res; -} - -$api = true; -$data = [ - "loggedIn" => false -]; - -if (isset($_GET["token"])) { - $_COOKIE["DeltaSession"] = $_GET["token"]; -} - -require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/session.php"; global $_USER; global $_PROFILE; - -if ($data["loggedIn"] && file_exists($_SERVER['DOCUMENT_ROOT'] . "/uploads/" . $_USER . ".webp")) { - header("Content-Type: image/png"); - $id = bin2hex(random_bytes(32)); - $out = []; - $out2 = []; - - $size = getimagesize($_SERVER['DOCUMENT_ROOT'] . "/uploads/" . $_USER . ".webp"); - - exec('convert -size 128x128 xc:none -draw "roundrectangle 0,0,128,128,128,128" /tmp/' . $id . '-mask.png', $out); - - exec('convert -resize 128x128 "' . $_SERVER['DOCUMENT_ROOT'] . "/uploads/" . $_USER . ".webp" . '" /tmp/' . $id . '-source.png'); - exec('convert /tmp/' . $id . '-source.png -matte /tmp/' . $id . '-mask.png -compose DstIn -composite /tmp/' . $id . '.png', $out2); - - if ($_PROFILE["plus"]) { - exec('convert -background none -bordercolor none -resize 94x94 -border 17x17 /tmp/' . $id . '.png /tmp/' . $id . '-source.png'); - - if ($_PROFILE["ultra"]) { - exec('convert -background none /tmp/' . $id . '-source.png "' . $_SERVER['DOCUMENT_ROOT'] . '/circle-ultra.png" -gravity Center -composite /tmp/' . $id . '.png'); - } else { - exec('convert -background none /tmp/' . $id . '-source.png "' . $_SERVER['DOCUMENT_ROOT'] . '/circle-plus.png" -gravity Center -composite /tmp/' . $id . '.png'); - } - } - - echo(file_get_contents('/tmp/' . $id . '.png')); - unlink('/tmp/' . $id . '.png'); - unlink('/tmp/' . $id . '-mask.png'); - unlink('/tmp/' . $id . '-source.png'); -} else { - header("Content-Type: image/png"); - - die(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/defaultuser.png")); -}
\ No newline at end of file diff --git a/handoff/fcm/index.php b/handoff/fcm/index.php deleted file mode 100644 index f9e5ac6..0000000 --- a/handoff/fcm/index.php +++ /dev/null @@ -1,69 +0,0 @@ -<?php - -$GLOBALS["dump"] = []; - -set_error_handler(function($errno, $errstr, $errfile, $errline) { - die(json_encode([ - "error" => $errstr, - "line" => $errline, - "dump" => $GLOBALS["dump"] - ])); -}); - -$json = file_get_contents('php://input'); -$obj = json_decode($json, true); - -header("Content-Type: application/json"); -$data = [ - "session" => isset($obj["session"]) && trim(explode("||||", $obj["session"])[1]) !== "" ? explode("||||", $obj["session"])[1] : null, - "token" => isset($obj["session"]) && trim(explode("||||", $obj["session"])[0]) !== "" ? explode("||||", $obj["session"])[0] : null, -]; -$api = true; - -$users = array_values(array_filter(scandir($_SERVER['DOCUMENT_ROOT'] . "/includes/data/profiles"), function ($i) { - return !str_starts_with($i, "."); -})); - -if (isset($data["token"])) { - $_COOKIE["DeltaSession"] = $data["token"]; -} - -require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/session.php"; global $_PROFILE; - -if (isset($_PROFILE) && isset($data["session"])) { - if (!isset($_PROFILE["devices"])) $_PROFILE["devices"] = []; - - if (!in_array($data["session"], array_map(function ($i) { - return $i["token"]; - }, $_PROFILE["devices"]))) { - foreach ($users as $user) { - $GLOBALS["dump"][] = $users; - $userData = json_decode(pf_utf8_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/profiles/" . $user)), true); - $userData["devices"] = array_values(array_filter($userData["devices"], function ($i) use ($data) { - return $i["token"] !== $data["session"]; - })); - while (trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/profiles/" . $user)) === "") {} - file_put_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/profiles/" . $user, pf_utf8_encode(json_encode($userData, JSON_PRETTY_PRINT))); - } - - $_PROFILE["devices"][] = [ - "token" => $data["session"], - "date" => date('c') - ]; - } else { - foreach ($_PROFILE["devices"] as $index => $device) { - if ($device["token"] === $data["session"]) { - $_PROFILE["devices"][$index]["date"] = date('c'); - } - } - } - - saveProfile(); - die(json_encode([ - "error" => null - ])); -} else { - die(json_encode([ - "error" => "Not logged in or no token received" - ])); -}
\ No newline at end of file diff --git a/handoff/index.php b/handoff/index.php deleted file mode 100644 index 14d9538..0000000 --- a/handoff/index.php +++ /dev/null @@ -1,13 +0,0 @@ -<?php - -$palette = []; - -header("Content-Type: text/plain"); - -foreach (explode(",", $_GET["colors"] ?? "") as $color) { - $palette[] = substr(dechex((int)$color), strlen(dechex((int)$color)) - 6); -} - -setcookie("DeltaHandoffPalette", implode(",", $palette), 0, "/"); -header("Location: " . ($_GET["return"] ?? "/")); -die();
\ No newline at end of file diff --git a/handoff/version/index.php b/handoff/version/index.php deleted file mode 100644 index 859bb3e..0000000 --- a/handoff/version/index.php +++ /dev/null @@ -1,36 +0,0 @@ -<?php - -$json = file_get_contents('php://input'); -$obj = json_decode($json, true); - -header("Content-Type: application/json"); -$data = [ - "loggedIn" => false, - "admin" => false, - "subscription" => "base", - "blocked" => false, - "session" => $_COOKIE["DeltaSession"] ?? (isset($obj["session"]) && trim($obj["session"]) !== "" ? $obj["session"] : null), - "name" => null -]; -$api = true; - -if (isset($data["session"])) { - $_COOKIE["DeltaSession"] = $data["session"]; -} - -$data["version"] = trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/version")); -require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/session.php"; global $_PROFILE; - -if (isset($_PROFILE)) { - if ($_PROFILE["plus"] && $_PROFILE["ultra"]) { - $data["subscription"] = "ultra"; - } else if ($_PROFILE["plus"]) { - $data["subscription"] = "plus"; - } - - $data["admin"] = $_PROFILE["admin"] ?? false; - - $data["name"] = $_PROFILE["nick_name"] ?? $_PROFILE["first_name"] . " " . $_PROFILE["last_name"]; -} - -die(json_encode($data, JSON_PRETTY_PRINT));
\ No newline at end of file diff --git a/includes/functions.php b/includes/functions.php index d8f5c7b..80f6f72 100644 --- a/includes/functions.php +++ b/includes/functions.php @@ -46,16 +46,8 @@ function pf_utf8_encode(string $string): string { return iconv("ISO-8859-1", "UTF-8", $string); } -function hasProfileSetting($setting, $default, $target = null) { - global $_PROFILE; - - if ($target === null) $target = $_PROFILE; - - if (isset($target["ultra"]) && $target["ultra"] && isset($target["studio_settings"]) && isset($target["studio_settings"]["profile"]) && isset($target["studio_settings"]["profile"][$setting])) { - return $target["studio_settings"]["profile"][$setting]; - } else { - return $default; - } +function hasProfileSetting($_1, $default, $_2 = null) { + return $default; } function badges($data) { ?> @@ -79,7 +71,7 @@ function badges($data) { ?> function initLang(): void { global $_PROFILE; - if (isset($_PROFILE) && isset($_PROFILE["language"]) && !isset($_COOKIE["DeltaHandoffPalette"])) { + if (isset($_PROFILE) && isset($_PROFILE["language"])) { genLang("en"); genLang($_GET["hl"] ?? $_PROFILE["language"]); } else { @@ -598,4 +590,4 @@ function findRelated($id) { } } -require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/linking.php";
\ No newline at end of file +require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/linking.php"; diff --git a/includes/header.php b/includes/header.php index efb49ae..c59262e 100644 --- a/includes/header.php +++ b/includes/header.php @@ -15,35 +15,28 @@ if (isset($_PROFILE)) { require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/functions.php"; initLang(); -if (isset($_COOKIE["DeltaHandoffPalette"]) && !str_starts_with($_SERVER['REQUEST_URI'], "/login")) { - header("Location: /login/android/"); - die(); -} - $palettes = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/themes.json"), true); if (isset($_PROFILE)) { - if (!isset($_PROFILE["studio_settings"])) { - $_PROFILE["studio_settings"] = [ - "theme" => $palettes["default"], - "dark" => false, - "navigation" => [ - "top" => [], - "bottom" => [], - "home" => [] - ], - "profile" => [ - "badge" => true, - "theme" => -1, - "detailed" => false, - "photo" => true, - "hide" => false, - "phone" => true, - "email" => true, - "birth" => true - ] - ]; - } + $_PROFILE["studio_settings"] = [ + "theme" => $palettes["default"], + "dark" => false, + "navigation" => [ + "top" => [], + "bottom" => [], + "home" => [] + ], + "profile" => [ + "badge" => true, + "theme" => -1, + "detailed" => false, + "photo" => true, + "hide" => false, + "phone" => true, + "email" => true, + "birth" => true + ] + ]; saveProfile(); } @@ -57,22 +50,8 @@ if (isset($_PROFILE)) { $userPalette = $palettes["list"][$palettes["default"]]["light"]; -if (isset($_PROFILE) && !isset($_COOKIE["DeltaKiosk"])) { - if (isset($_PROFILE["studio_settings"]) && isset($_PROFILE["studio_settings"]["theme"]) && isset($_PROFILE["ultra"]) && $_PROFILE["ultra"] && isset($palettes["list"][$_PROFILE["studio_settings"]["theme"]])) { - $userPalette = $palettes["list"][$_PROFILE["studio_settings"]["theme"]][$_PROFILE["studio_settings"]["dark"] === true ? "dark" : "light"]; - } -} - if (isset($_GET["__"])) { $_id = str_replace("/", "-", substr($_GET["__"], 1)); - - if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/includes/data/profiles/" . $_id . ".json")) { - $_ = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/profiles/" . $_id . ".json"), true); - - if (isset($_["ultra"]) && $_["ultra"] && isset($_["studio_settings"]) && isset($_["studio_settings"]["profile"]["theme"]) && $_["studio_settings"]["profile"]["theme"] !== -1 && isset($palettes["list"][$_["studio_settings"]["profile"]["theme"]])) { - $userPalette = $palettes["list"][$_["studio_settings"]["profile"]["theme"]][!isset($_COOKIE["DeltaKiosk"]) && $_PROFILE["studio_settings"]["dark"] === true ? "dark" : "light"]; - } - } } ?> @@ -535,75 +514,9 @@ if (isset($_GET["__"])) { font-family: "Nunito",system-ui,-apple-system,"Segoe UI",Roboto,"Helvetica Neue","Noto Sans","Liberation Sans",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; } - <?php if (isset($_COOKIE["DeltaHandoffPalette"])): ?> - * { - font-family: system-ui,-apple-system,"Segoe UI",Roboto,"Helvetica Neue","Noto Sans","Liberation Sans",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; - } - - #desktop-navigation { - display: none; - } - - .navbar { - display: none; - } - #footer { - display: none; - } - - h1 { - font-size: 0; - } - - h1 .btn, h1 .dropdown { - margin-left: 10px; - } - - h1 .btn:nth-child(1) { - margin-left: 0 !important; - } - - body > div > #page > .container, body > div > #page > form > .container { - margin-top: -35px; - } - - h1 > span { - float: none !important; - text-align: center; - display: block; - } - - #plus-container { - margin-top: 0 !important; - } - - - #plus-types { - display: block !important; - margin-top: 10px; - } - - #plus-types span { - font-size: 16px !important; - } - - .coins-inline { - float: initial; - margin-bottom: 10px; - display: block; - width: max-content; - margin-left: auto; - margin-right: auto; - } - - .badge-subscription-mobile { - display: none; - } - <?php endif; ?> - - <?php if (isset($_COOKIE["DeltaHandoffPalette"]) || isset($userPalette)): + <?php if (isset($userPalette)): - $palette = explode(",", $_COOKIE["DeltaHandoffPalette"] ?? $userPalette); + $palette = explode(",", $userPalette); function rgb($color) { return hexdec(substr($color, 0, 2)) . "," . hexdec(substr($color, 2, 2)) . "," . hexdec(substr($color, 4, 2)); diff --git a/includes/navigation.php b/includes/navigation.php index 186f779..7e99fec 100644 --- a/includes/navigation.php +++ b/includes/navigation.php @@ -1,6 +1,6 @@ <?php global $unreadAlerts; global $_USER; global $_PROFILE; global $betaEligible; ?> <style> - <?php if (!isset($_COOKIE["DeltaHandoffPalette"]) && !isset($_GET["frameless"])): ?> + <?php if (!isset($_GET["frameless"])): ?> #desktop-navigation-mobile { display: none; } @@ -152,11 +152,6 @@ </ul> </div> <div style="display: inline-flex;float: right;height: 57px;margin-top: -10px;align-items: center;margin-right:-10px;"> - <?php if (isset($_PROFILE["ultra"]) && $_PROFILE['ultra']): ?> - <a style="margin-right: 15px; background-color: var(--bs-body-color); border-radius: 999px; width: 24px; height: 24px; display:flex; align-items: center; justify-content: center;" href="/studio" data-bs-placement="bottom" class="newnav-link" title="<?= l("lang_navigation_user_studio") ?>" data-bs-toggle="tooltip"> - <img src="/icons/studio.svg" style="width: 16px; height: 16px;"> - </a> - <?php endif; ?> <?php if (!isset($_PROFILE["plus"]) || !$_PROFILE['plus']): ?> <a style="margin-right: 15px; background-color: var(--bs-body-color); border-radius: 999px; width: 24px; height: 24px; display:flex; align-items: center; justify-content: center;" href="/plus" data-bs-placement="bottom" class="newnav-link" title="<?= l("lang_navigation_upgrade") ?>" data-bs-toggle="tooltip"> <img src="/icons/upgrade.svg" style="width: 16px; height: 16px;"> @@ -214,13 +209,6 @@ <h4>Delta Plus/Ultra</h4> </div> </div> - <?php elseif (str_starts_with($_SERVER['REQUEST_URI'], "/studio/") || $_SERVER['REQUEST_URI'] === "/studio"): ?> - <div style="display: flex; align-items: center; justify-content: center; text-align: center; height: 100%;opacity:.5;"> - <div> - <img src="/icons/studio-mono.svg" style="width: 48px;"> - <h4><?= l("lang_studio_title") ?></h4> - </div> - </div> <?php elseif (str_starts_with($_SERVER['REQUEST_URI'], "/request/") || $_SERVER['REQUEST_URI'] === "/request" || str_starts_with($_SERVER['REQUEST_URI'], "/edit/") || $_SERVER['REQUEST_URI'] === "/edit"): ?> <div style="display: flex; align-items: center; justify-content: center; text-align: center; height: 100%;opacity:.5;"> <div> @@ -346,4 +334,4 @@ } </script> -<div id="page">
\ No newline at end of file +<div id="page"> diff --git a/includes/oobe.php b/includes/oobe.php index 0405c60..95ed574 100644 --- a/includes/oobe.php +++ b/includes/oobe.php @@ -21,7 +21,7 @@ <div style="width: 12px; height: 12px; background-color: var(--palette-3); border-radius: 999px; margin-right: 5px;"></div> <div style="width: 12px; height: 12px; background-color: var(--palette-3); border-radius: 999px; margin-right: 5px;"></div> <div style="width: 12px; height: 12px; background-color: var(--palette-3); border-radius: 999px; margin-right: 5px;"></div> - <?php if (!isset($_COOKIE["DeltaHandoffPalette"])): ?><div style="width: 12px; height: 12px; background-color: var(--palette-3); border-radius: 999px; margin-right: 5px;"></div><?php endif; ?> + <div style="width: 12px; height: 12px; background-color: var(--palette-3); border-radius: 999px; margin-right: 5px;"></div> <div style="width: 12px; height: 12px; background-color: var(--palette-3); border-radius: 999px;"></div> </div> <div style="display: flex; justify-content: end; width: 100%;"> @@ -52,7 +52,7 @@ <div style="width: 12px; height: 12px; background-color: var(--palette-9); border-radius: 999px; margin-right: 5px;"></div> <div style="width: 12px; height: 12px; background-color: var(--palette-3); border-radius: 999px; margin-right: 5px;"></div> <div style="width: 12px; height: 12px; background-color: var(--palette-3); border-radius: 999px; margin-right: 5px;"></div> - <?php if (!isset($_COOKIE["DeltaHandoffPalette"])): ?><div style="width: 12px; height: 12px; background-color: var(--palette-3); border-radius: 999px; margin-right: 5px;"></div><?php endif; ?> + <div style="width: 12px; height: 12px; background-color: var(--palette-3); border-radius: 999px; margin-right: 5px;"></div> <div style="width: 12px; height: 12px; background-color: var(--palette-3); border-radius: 999px;"></div> </div> <div style="display: flex; justify-content: end; width: 100%;"> @@ -85,7 +85,7 @@ <div style="width: 12px; height: 12px; background-color: var(--palette-9); border-radius: 999px; margin-right: 5px;"></div> <div style="width: 12px; height: 12px; background-color: var(--palette-9); border-radius: 999px; margin-right: 5px;"></div> <div style="width: 12px; height: 12px; background-color: var(--palette-3); border-radius: 999px; margin-right: 5px;"></div> - <?php if (!isset($_COOKIE["DeltaHandoffPalette"])): ?><div style="width: 12px; height: 12px; background-color: var(--palette-3); border-radius: 999px; margin-right: 5px;"></div><?php endif; ?> + <div style="width: 12px; height: 12px; background-color: var(--palette-3); border-radius: 999px; margin-right: 5px;"></div> <div style="width: 12px; height: 12px; background-color: var(--palette-3); border-radius: 999px;"></div> </div> <div style="display: flex; justify-content: end; width: 100%;"> @@ -118,40 +118,7 @@ <div style="width: 12px; height: 12px; background-color: var(--palette-9); border-radius: 999px; margin-right: 5px;"></div> <div style="width: 12px; height: 12px; background-color: var(--palette-9); border-radius: 999px; margin-right: 5px;"></div> <div style="width: 12px; height: 12px; background-color: var(--palette-9); border-radius: 999px; margin-right: 5px;"></div> - <?php if (!isset($_COOKIE["DeltaHandoffPalette"])): ?><div style="width: 12px; height: 12px; background-color: var(--palette-3); border-radius: 999px; margin-right: 5px;"></div><?php endif; ?> - <div style="width: 12px; height: 12px; background-color: var(--palette-3); border-radius: 999px;"></div> - </div> - <div style="display: flex; justify-content: end; width: 100%;"> - <a onclick="if (document.cookie.includes('DeltaHandoffPalette=')) { page(6); } else { page(5); }" class="btn btn-primary"><?= l("lang_oobe_next") ?></a> - </div> - </div> - </div> - </div> - <div id="oobe-page-5" class="oobe-page" style="display: none;"> - <div style="text-align: center;"> - <img style="width: 64px;" src="/icons/smartphone.svg"> - <h3 style="margin-top: 5px;"><?= l("lang_oobe_pages_4_title") ?></h3> - - <div class="oobe-container" style="height: 228px;"> - <p style="margin-top: 10px;"> - <?= l("lang_oobe_pages_4_description") ?> - </p> - - <div class="card" style="margin-bottom: 20px; text-align: left; background-color: var(--palette-3);"> - <div class="card-body"><?= l("lang_oobe_pages_4_tip") ?></div> - </div> - </div> - - <div style="display: grid; grid-template-columns: 1fr 1fr 1fr;"> - <div style="display: flex; justify-content: start; width: 100%;"> - <a onclick="page(4, true);" class="btn btn-outline-primary"><?= l("lang_oobe_back") ?></a> - </div> - <div style="display: flex; justify-content: center; align-items: center; width: 100%;"> - <div style="width: 12px; height: 12px; background-color: var(--palette-9); border-radius: 999px; margin-right: 5px;"></div> - <div style="width: 12px; height: 12px; background-color: var(--palette-9); border-radius: 999px; margin-right: 5px;"></div> - <div style="width: 12px; height: 12px; background-color: var(--palette-9); border-radius: 999px; margin-right: 5px;"></div> - <div style="width: 12px; height: 12px; background-color: var(--palette-9); border-radius: 999px; margin-right: 5px;"></div> - <?php if (!isset($_COOKIE["DeltaHandoffPalette"])): ?><div style="width: 12px; height: 12px; background-color: var(--palette-9); border-radius: 999px; margin-right: 5px;"></div><?php endif; ?> + <div style="width: 12px; height: 12px; background-color: var(--palette-3); border-radius: 999px; margin-right: 5px;"></div> <div style="width: 12px; height: 12px; background-color: var(--palette-3); border-radius: 999px;"></div> </div> <div style="display: flex; justify-content: end; width: 100%;"> @@ -191,14 +158,14 @@ <div style="display: grid; grid-template-columns: 1fr 1fr 1fr;"> <div style="display: flex; justify-content: start; width: 100%;"> - <a onclick="if (document.cookie.includes('DeltaHandoffPalette=')) { page(4, true); } else { page(5, true); }" class="btn btn-outline-primary"><?= l("lang_oobe_back") ?></a> + <a onclick="page(4, true);" class="btn btn-outline-primary"><?= l("lang_oobe_back") ?></a> </div> <div style="display: flex; justify-content: center; align-items: center; width: 100%;"> <div style="width: 12px; height: 12px; background-color: var(--palette-9); border-radius: 999px; margin-right: 5px;"></div> <div style="width: 12px; height: 12px; background-color: var(--palette-9); border-radius: 999px; margin-right: 5px;"></div> <div style="width: 12px; height: 12px; background-color: var(--palette-9); border-radius: 999px; margin-right: 5px;"></div> <div style="width: 12px; height: 12px; background-color: var(--palette-9); border-radius: 999px; margin-right: 5px;"></div> - <?php if (!isset($_COOKIE["DeltaHandoffPalette"])): ?><div style="width: 12px; height: 12px; background-color: var(--palette-9); border-radius: 999px; margin-right: 5px;"></div><?php endif; ?> + <div style="width: 12px; height: 12px; background-color: var(--palette-9); border-radius: 999px; margin-right: 5px;"></div> <div style="width: 12px; height: 12px; background-color: var(--palette-9); border-radius: 999px;"></div> </div> <div style="display: flex; justify-content: end; width: 100%;"> @@ -363,4 +330,4 @@ oobe.show(); document.getElementById("oobe").classList.add("fade"); } -</script>
\ No newline at end of file +</script> @@ -14,29 +14,11 @@ $version = file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/version"); <br><br> <h1><?= l("lang_home_greeting") ?> <?= $_PROFILE["nick_name"] ?? $_PROFILE["first_name"] . " " . $_PROFILE["last_name"] ?></h1> - <?php if (isset($_COOKIE["DeltaHandoffPalette"]) && isset($_GET["debug"])): ?> - <div class="alert alert-primary"> - <details> - <summary>This device is using a custom handoff palette.</summary> - <ul> - <?php foreach (explode(",", $_COOKIE['DeltaHandoffPalette']) as $color): ?> - <li><?= $color ?> <span style="background-color:#<?= $color ?>;width:36px;height:36px;display:inline-block;"></span></li> - <?php endforeach; ?> - </ul> - </details> - </div> - <?php endif; ?> - <?php if ($_SERVER["SERVER_PORT"] === "81"): ?> <div class="alert alert-danger"> <b>This is a development environment.</b> All data is reset with data from production every 60 minutes. Run <code style="color: inherit;"><?= $_SERVER['DOCUMENT_ROOT'] ?>/includes/prod.sh</code> to push this release to production. </div> <?php endif; ?> - <?php if (isset($_COOKIE["DeltaHandoffPalette"])): ?> - <div class="alert alert-danger"> - <b><?= l("lang_mobile_end_0") ?></b> <?= l("lang_mobile_end_1") ?> - </div> - <?php endif; ?> <?php if (str_contains($version, "rc") || str_contains($version, "eap") || diff --git a/lang/en.json b/lang/en.json index 3d3ef1b..d56e320 100644 --- a/lang/en.json +++ b/lang/en.json @@ -87,7 +87,6 @@ "upgrade": "Upgrade", "beta": "Latest changes", "user": { - "studio": "Delta Studio", "dashboard": "Dashboard", "profile": "Your profile", "edit": "Edit page", @@ -288,7 +287,7 @@ "change": "Change subscription", "notice": "Current subscription is %1. May require a Delta coins balance.", "perks": "What do we get with Delta Plus (for 4 coins a month)?", - "perks2": "Delta Ultra adds all of this for 6 coins a month:", + "perks2": "Delta Ultra adds all of this for 5 coins a month:", "list": [ { "title": "Free technical support", @@ -320,11 +319,7 @@ "description": "With a profile nickname, you get another name Delta users can use to refer to you%1. This nickname will replace your real name everywhere in Delta%2.", "pretty": "Custom nickname for your profile and Delta" }, - { - "title": "Delta Studio", - "description": "With Delta Ultra, you get to customise everything with Delta Studio. Your own profile, the color theme%1, and even more!", - "pretty": "Additional interface customisation options" - }, + null, { "title": "Mobile notifications", "description": "Tired of getting emails? Delta Ultra allows you to get notifications from Delta directly on your phone, without using email%1.", @@ -348,7 +343,7 @@ }, "trial": { "title": "Get 5 coins free", - "description": "First time using Delta Plus? You can get 5 coins for free (1 month of Delta Plus subscription%1)." + "description": "First time using Delta Plus? You can get 5 coins for free (1 month of Delta Ultra subscription%1)." }, "notes": [ "Delta Plus is only available for users who are 16 years old or more and without an active account block.", @@ -599,7 +594,6 @@ "subscriptions": "Subscriptions and coins", "pending": "Pending change requests", "support": "Delta help and support", - "studio": "Open Delta Studio", "beta": "Latest Delta Beta changes", "admin": "Administrative options", "end": [ @@ -775,52 +769,6 @@ "network": "Network routing", "new": "New" }, - "studio": { - "title": "Delta Studio", - "theme": "Theme", - "dark": "Dark theme", - "light": "Light theme", - "profile": "Profile", - "on": "On", - "off": "Off", - "redacted": "[redacted]", - "settings": { - "badge": { - "title": "Show subscription badge", - "description": "Display the Delta Ultra badge next to your name" - }, - "detailed": { - "title": "Detailed statistics information", - "description": "Show more statistics about you, such as your most viewed pages" - }, - "photo": { - "title": "Show profile picture", - "description": "Show your profile picture next to other personal information" - }, - "hide": { - "title": "Hide statistics information", - "description": "Hide all statistics from your profile (dates and pending requests)" - }, - "birth": { - "title": "Show complete birth date", - "description": "Show your complete birth date next to your age" - }, - "phone": { - "title": "Show phone number", - "description": "Show your phone number on your profile" - }, - "email": { - "title": "Show email address", - "description": "Show your email address on your profile" - } - }, - "details": { - "most": "Most viewed pages:", - "requests": "Latest change requests:", - "none": "No pending requests." - }, - "kiosk": "Delta Studio theming options are not available when using a Delta kiosk. Open this page on your own device to change these settings." - }, "badges": { "admin": "Delta staff", "eap": "Early supporter", @@ -1048,7 +996,6 @@ "titles": { "codes": "Gift card codes", "create": "Create a new object", - "handoff": "Handoff cookie export", "objects": "Database objects", "requests": "Pending requests", "registrations": "Account registrations", diff --git a/lang/fr.json b/lang/fr.json index d9c21f8..1aba543 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -87,7 +87,6 @@ "upgrade": "Mettre à niveau", "beta": "Derniers changements", "user": { - "studio": "Delta Studio", "dashboard": "Tableau de bord", "profile": "Votre profil", "edit": "Modifier votre page", @@ -288,7 +287,7 @@ "change": "Changer d'offre", "notice": "L'offre actuelle est %1. Peut nécessiter un solde de pièces.", "perks": "Qu'est-ce que nous obtenons avec Delta Plus (pour 4 pièces par mois) ?", - "perks2": "Delta Ultra ajoute tout ça pour 6 pièces par mois :", + "perks2": "Delta Ultra ajoute tout ça pour 5 pièces par mois :", "list": [ { "title": "Support technique gratuit", @@ -320,11 +319,7 @@ "description": "Avec un surnom de profil, vous pouvez avoir un autre nom que les utilisateurs utilisent pour vous%1. Ce surnom remplacera votre nom réel partout sur Delta%2.", "pretty": "Surnom personnalisé pour votre profil et Delta" }, - { - "title": "Delta Studio", - "description": "Avec Delta Ultra, vous pouvez tout personnaliser grace à Delta Studio. Votre profil, le thème de couleur%1, et plus encore !", - "pretty": "Plus d'options de personnalisation" - }, + null, { "title": "Notifications mobile", "description": "Assez de recevoir des courriels ? Delta Ultra vous permet d'obtenir des notifications de Delta sur votre téléphone, sans utiliser des courriels%1.", @@ -348,7 +343,7 @@ }, "trial": { "title": "Obtenez 5 pièces gratuitement", - "description": "Première fois avec Delta Plus ? Vous pouvez obtenir 5 pièces Delta gratuites (1 mois d'abonnement Delta Plus%1)." + "description": "Première fois avec Delta Plus ? Vous pouvez obtenir 5 pièces Delta gratuites (1 mois d'abonnement Delta Ultra%1)." }, "notes": [ "Delta Plus est disponible uniquement aux utilisateurs de 16 ans ou plus et sans blocage de compte.", @@ -599,7 +594,6 @@ "subscriptions": "Abonnements et pièces", "pending": "Demandes de changement en attente", "support": "Aide et support Delta", - "studio": "Ouvrir Delta Studio", "beta": "Derniers changements Delta Beta", "admin": "Options administratives", "end": [ @@ -775,52 +769,6 @@ "network": "Routage réseau", "new": "Nouveau" }, - "studio": { - "title": "Delta Studio", - "theme": "Thème", - "dark": "Thème sombre", - "light": "Thème clair", - "profile": "Profil", - "on": "Oui", - "off": "Non", - "redacted": "[caviardé]", - "settings": { - "badge": { - "title": "Montrer le badge d'abonnement", - "description": "Afficher le badge Delta Ultra à côté de votre nom" - }, - "detailed": { - "title": "Informations statistiques détaillées", - "description": "Afficher plus d'informations sur vous, telles que vos pages les plus visitées" - }, - "photo": { - "title": "Montrer la photo de profil", - "description": "Afficher votre photo de profil à côté des autres informations personnelles" - }, - "hide": { - "title": "Cacher les informations statistiques", - "description": "Masquer toutes les statistiques (dates et demandes en attente)" - }, - "birth": { - "title": "Montrer la date de naissance complète", - "description": "Afficher votre date de naissance à côté de votre age" - }, - "phone": { - "title": "Montrer le numéro de téléphone", - "description": "Afficher votre numéro de téléphone sur votre profil" - }, - "email": { - "title": "Montrer l'adresse courriel", - "description": "Afficher votre adresse courriel sur votre profil" - } - }, - "details": { - "most": "Les plus visitées :", - "requests": "Dernières demandes :", - "none": "Pas de demandes en attente." - }, - "kiosk": "Les options de thème Delta Studio ne sont pas disponibles sur les kiosques Delta. Ouvrez cette page sur votre propre appareil pour modifier ces paramètres." - }, "badges": { "admin": "Personnel Delta", "eap": "Accès anticipé", @@ -1048,7 +996,6 @@ "titles": { "codes": "Codes des cartes cadeau", "create": "Créer un nouvel objet", - "handoff": "Exportation du témoin de remise", "objects": "Objets de la base de données", "requests": "Demandes en attente", "registrations": "Enregistrements de compte", diff --git a/login/android/index.php b/login/android/index.php deleted file mode 100644 index 4151f1a..0000000 --- a/login/android/index.php +++ /dev/null @@ -1,21 +0,0 @@ -<?php - -$title = "lang_mobile_bye_title"; -require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/session.php"; -require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/header.php"; -require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/navigation.php"; -global $_PROFILE; global $_USER; global $unreadAlerts; - -?> - - <div class="container"> - <br><br><br> - <div class="alert alert-danger"> - <p><?= l("lang_mobile_bye_text_0") ?></p> - <p><?= l("lang_mobile_bye_text_1") ?></p> - <p><?= l("lang_mobile_bye_text_2") ?></p> - <?= l("lang_mobile_bye_text_3") ?> - </div> - </div> - -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/footer.php"; ?>
\ No newline at end of file diff --git a/login/index.php b/login/index.php index b557a50..2476354 100644 --- a/login/index.php +++ b/login/index.php @@ -130,7 +130,6 @@ $title = "lang_login_title"; require_once $_SERVER['DOCUMENT_ROOT'] . "/includes <button class="btn btn-primary g-recaptcha" data-sitekey="<?= trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/recaptcha-site")) ?>" data-callback='onSubmit' data-action='submit'><?= l("lang_login_continue") ?></button> </form> - <?php if (!isset($_COOKIE["DeltaHandoffPalette"])): ?> <hr> <div style="margin-top: 20px;"> <form method="post" action="/login/?method=hub&return=<?= rawurlencode($_GET["return"]) ?>" id="oauth-form"> @@ -138,7 +137,6 @@ $title = "lang_login_title"; require_once $_SERVER['DOCUMENT_ROOT'] . "/includes </form> <a style="display: block; margin-top: 5px;" href="/login/?method=apply&return=<?= rawurlencode($_GET["return"]) ?>"><?= l("lang_login_auth_apply") ?></a> </div> - <?php endif; ?> <?php elseif ($step === 1): ?> <img src="/icons/code.svg?o" style="width: 48px; margin-bottom: 10px;"> <p><b><?= l("lang_login_code3") ?></b></p> @@ -183,4 +181,4 @@ $title = "lang_login_title"; require_once $_SERVER['DOCUMENT_ROOT'] . "/includes <br><br> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/footer.php"; ?>
\ No newline at end of file +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/footer.php"; ?> diff --git a/mobile_profile/index.php b/mobile_profile/index.php deleted file mode 100644 index 263c646..0000000 --- a/mobile_profile/index.php +++ /dev/null @@ -1,63 +0,0 @@ -<?php - -$title = "lang_mobile_title"; -require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/session.php"; -require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/header.php"; -require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/navigation.php"; -global $_PROFILE; global $_USER; global $unreadAlerts; - -?> - - <div class="container"> - <br><br><br> - - <div style="margin: 0 20px;"> - <img src="https://delta.equestria.dev/handoff/avatar/" style="width: 80px;"> - <h3 style="margin-top: 10px;"> - <span style="position: relative;top: 4px;"><?= $_PROFILE["nick_name"] ?? $_PROFILE["first_name"] . " " . $_PROFILE["last_name"] ?></span> - <span style="float: right;"><?php badges($_PROFILE); ?></span> - </h3> - </div> - - <hr> - - <div class="list-group"> - <a href="/profile/<?= $_USER ?>" class="list-group-item list-group-item-action"> - <img class="icon" src="/icons/profiles.svg" style="margin-right:5px;"><span style="vertical-align: middle;"><?= l("lang_mobile_profile") ?></span> - </a> - <a href="/alerts" class="list-group-item list-group-item-action"> - <img class="icon" src="/icons/messages.svg" style="margin-right:5px;"><span style="vertical-align: middle;"><?= l("lang_mobile_alerts") ?><?php if ($unreadAlerts > 0): ?><span class="badge rounded-pill bg-secondary" style="float: right; margin-top: 2px;"><?= str_replace("%1", $unreadAlerts, l($unreadAlerts > 1 ? "lang_alerts_unread2" : "lang_alerts_unread1")) ?></span><?php endif; ?></span> - </a> - <?php if (isset($_PROFILE["ultra"]) && $_PROFILE["ultra"]): ?> - <a href="/studio" class="list-group-item list-group-item-action"> - <img class="icon" src="/icons/studio-mono.svg" style="margin-right:5px;"><span style="vertical-align: middle;"><?= l("lang_mobile_studio") ?></span> - </a> - <?php endif; ?> - <a href="/plus" class="list-group-item list-group-item-action"> - <img class="icon" src="/icons/subscription.svg" style="margin-right:5px;"><span style="vertical-align: middle;"><?= l("lang_mobile_subscriptions") ?></span> - </a> - <a href="/pass" class="list-group-item list-group-item-action"> - <img class="icon" src="/icons/pass.svg" style="margin-right:5px;"><span style="vertical-align: middle;"><?= l("lang_pass_mobile") ?></span> - </a> - <a href="/requests" class="list-group-item list-group-item-action"> - <img class="icon" src="/icons/requests.svg" style="margin-right:5px;"><span style="vertical-align: middle;"><?= l("lang_mobile_pending") ?></span> - </a> - <a href="/support" class="list-group-item list-group-item-action"> - <img class="icon" src="/icons/help.svg" style="margin-right:5px;"><span style="vertical-align: middle;"><?= l("lang_mobile_support") ?></span> - </a> - <?php if (isset($_PROFILE["plus"]) && $_PROFILE["plus"]): ?> - <a href="/beta" class="list-group-item list-group-item-action"> - <img class="icon" src="/icons/beta.svg" style="margin-right:5px;"><span style="vertical-align: middle;"><?= l("lang_mobile_beta") ?></span> - </a> - <?php endif; ?> - <?php if (isset($_PROFILE["admin"]) && $_PROFILE["admin"]): ?> - <a href="/admin" class="list-group-item list-group-item-action"> - <img class="icon" src="/icons/admin.svg" style="margin-right:5px;"><span style="vertical-align: middle;"><?= l("lang_mobile_admin") ?></span> - </a> - <?php endif; ?> - </div> - - <br><br><br> - </div> - -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/footer.php"; ?>
\ No newline at end of file diff --git a/pass/index.php b/pass/index.php index 627fa93..884647f 100644 --- a/pass/index.php +++ b/pass/index.php @@ -44,7 +44,7 @@ global $palette; new QRCode(document.getElementById("qrcode"), "<?= $tag ?>"); </script> - <?php if (isset($_PROFILE["organizer"]) && !isset($_COOKIE["DeltaHandoffPalette"])): ?> + <?php if (isset($_PROFILE["organizer"])): ?> <div style="margin-top: 10px;"> <a href="/pass/scan"><?= l("lang_pass_scan") ?></a> </div> @@ -54,4 +54,4 @@ global $palette; <br><br><br> </div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/footer.php"; ?>
\ No newline at end of file +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/footer.php"; ?> diff --git a/plus/index.php b/plus/index.php index fd54e9f..5e7f517 100644 --- a/plus/index.php +++ b/plus/index.php @@ -23,12 +23,6 @@ $age = (int)(explode(" ", timeAgo($_PROFILE["birth"] ?? "1990-01-01", false, tru background-position: 0 50%; } } - - <?php if (isset($_COOKIE["DeltaHandoffPalette"])): ?> - #mobile-navigation, #desktop-navigation { - display: none !important; - } - <?php endif; ?> </style> <div class="text-white" id="plus-box" style="background: linear-gradient(45deg, #E44857, #C711E1, #7F52FF, #5269ff); background-size: 400% 400%; animation: gradient 10s ease infinite;"> @@ -114,7 +108,7 @@ $age = (int)(explode(" ", timeAgo($_PROFILE["birth"] ?? "1990-01-01", false, tru <h2 style="margin-bottom: 20px;margin-top: 30px;"><?= l("lang_plus_perks2") ?></h2> <div id="plus-grid" style="display: grid; grid-template-columns: repeat(2, 1fr); grid-gap: 20px;"> - <div class="promo-wrapper promo-ultra"> + <!--<div class="promo-wrapper promo-ultra"> <div class="card promo-item"> <div class="card-body"> <img src="/icons/brush.svg" style="width: 48px;"><br> @@ -124,7 +118,7 @@ $age = (int)(explode(" ", timeAgo($_PROFILE["birth"] ?? "1990-01-01", false, tru </div> </div> - <!--<div class="promo-wrapper promo-ultra"> + <div class="promo-wrapper promo-ultra"> <div class="card promo-item"> <div class="card-body"> <img src="/icons/smartphone.svg" style="width: 48px;"><br> @@ -191,8 +185,8 @@ $age = (int)(explode(" ", timeAgo($_PROFILE["birth"] ?? "1990-01-01", false, tru <sup>3</sup><?= l("lang_plus_notes_2") ?><br> <sup>4</sup><?= l("lang_plus_notes_3") ?><br> <sup>5</sup><?= l("lang_plus_notes_4") ?><br> - <sup>6</sup><?= l("lang_plus_notes_5") ?><br> - <!--<sup>7</sup><?= l("lang_plus_notes_6") ?><br> + <!--<sup>6</sup><?= l("lang_plus_notes_5") ?><br> + <sup>7</sup><?= l("lang_plus_notes_6") ?><br> <sup>8</sup><?= l("lang_plus_notes_7") ?><br> <sup>9</sup><?= l("lang_plus_notes_8") ?><br>--> <sup>10</sup><?= l("lang_plus_notes_9") ?><br> diff --git a/plus/subscribe/index.php b/plus/subscribe/index.php index b72bc77..56eb200 100644 --- a/plus/subscribe/index.php +++ b/plus/subscribe/index.php @@ -44,11 +44,11 @@ if (isset($_GET["plan"])) { if ($_GET["plan"] === "delta") $planTarget = 0 and $planTargetName = "Delta Free" and $planTargetCost = 0; if ($_GET["plan"] === "plus") $planTarget = 1 and $planTargetName = "Delta Plus" and $planTargetCost = $price; - if ($_GET["plan"] === "ultra") $planTarget = 2 and $planTargetName = "Delta Ultra" and $planTargetCost = $price * 1.5; + if ($_GET["plan"] === "ultra") $planTarget = 2 and $planTargetName = "Delta Ultra" and $planTargetCost = $price * 1.25; if ($currentPlan === 0 && $planTarget === 1) $updateCost = 4; - if ($currentPlan === 0 && $planTarget === 2) $updateCost = 6; - if ($currentPlan === 1 && $planTarget === 2) $updateCost = 4; + if ($currentPlan === 0 && $planTarget === 2) $updateCost = 5; + if ($currentPlan === 1 && $planTarget === 2) $updateCost = 1; $updatePossible = $_PROFILE["balance"] === -1 || $_PROFILE["balance"] - $updateCost >= 0; } @@ -166,9 +166,9 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/navigation.php"; <li class="plus-compare-placeholder" style="opacity:0;"><?= l("lang_plus_list_2_pretty") ?></li> <li class="plus-compare-placeholder" style="opacity:0;"><?= l("lang_plus_list_3_pretty") ?></li> <li class="plus-compare-placeholder" style="opacity:0;"><?= l("lang_plus_list_4_pretty") ?></li> - <li class="plus-compare-placeholder" style="opacity:0;"><?= l("lang_plus_list_5_pretty") ?></li> + <!--<li class="plus-compare-placeholder" style="opacity:0;"><?= l("lang_plus_list_5_pretty") ?></li> <li class="plus-compare-placeholder" style="opacity:0;"><?= l("lang_plus_list_6_pretty") ?></li> - <!--<li class="plus-compare-placeholder" style="opacity:0;"><?= l("lang_plus_list_7_pretty") ?></li>--> + <li class="plus-compare-placeholder" style="opacity:0;"><?= l("lang_plus_list_7_pretty") ?></li>--> </ul> <?php if (!$_PROFILE["plus"]): ?> @@ -199,9 +199,9 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/navigation.php"; <li style="color: var(--bs-link-color);"><?= l("lang_plus_list_3_pretty") ?></li> <li style="color: var(--bs-link-color);"><?= l("lang_plus_list_4_pretty") ?></li> <li class="plus-compare-placeholder" style="opacity:0;"><?= l("lang_plus_list_5_pretty") ?></li> - <li class="plus-compare-placeholder" style="opacity:0;"><?= l("lang_plus_list_0_pretty") ?></li> + <!--<li class="plus-compare-placeholder" style="opacity:0;"><?= l("lang_plus_list_0_pretty") ?></li> <li class="plus-compare-placeholder" style="opacity:0;"><?= l("lang_plus_list_6_pretty") ?></li> - <!--<li class="plus-compare-placeholder" style="opacity:0;"><?= l("lang_plus_list_7_pretty") ?></li>--> + <li class="plus-compare-placeholder" style="opacity:0;"><?= l("lang_plus_list_7_pretty") ?></li>--> </ul> <?php if ($_PROFILE["plus"] && !$_PROFILE["ultra"]): ?> @@ -234,9 +234,9 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/navigation.php"; <li><?= l("lang_plus_list_3_pretty") ?></li> <li><?= l("lang_plus_list_4_pretty") ?></li> <li style="color: var(--bs-link-color);"><?= l("lang_plus_list_5_pretty") ?></li> - <li style="color: var(--bs-link-color);"><?= l("lang_plus_list_0_pretty") ?></li> + <!--<li style="color: var(--bs-link-color);"><?= l("lang_plus_list_0_pretty") ?></li> <li style="color: var(--bs-link-color);"><?= l("lang_plus_list_6_pretty") ?></li> - <!--<li style="color: var(--bs-link-color);"><?= l("lang_plus_list_7_pretty") ?></li>--> + <li style="color: var(--bs-link-color);"><?= l("lang_plus_list_7_pretty") ?></li>--> </ul> <?php if ($_PROFILE["plus"] && $_PROFILE["ultra"]): ?> @@ -245,7 +245,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/navigation.php"; <a href="/plus/subscribe/?plan=ultra" class="btn btn-primary"><?= l("lang_plus_subscribe_up") ?></a><br> <?php endif; ?> - <div style="margin-top: 10px;" class="small text-muted"><?= $price * 1.5 ?> <?= l("lang_plus_subscribe_coin") ?> · <?= str_replace("%1", coinsToEur($price * 1.5), l("lang_plus_subscribe_monthly")) ?></div> + <div style="margin-top: 10px;" class="small text-muted"><?= $price * 1.25 ?> <?= l("lang_plus_subscribe_coin") ?> · <?= str_replace("%1", coinsToEur($price * 1.25), l("lang_plus_subscribe_monthly")) ?></div> </div> </div> </div> diff --git a/studio/index.php b/studio/index.php deleted file mode 100644 index 046bd21..0000000 --- a/studio/index.php +++ /dev/null @@ -1,99 +0,0 @@ -<?php - -$title = "lang_studio_title"; - -require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/session.php"; -require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/header.php"; -require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/navigation.php"; - -global $unreadAlerts; global $betaEligible; - -if (!isset($_PROFILE["ultra"]) || !$_PROFILE["ultra"]) { - header("Location: /"); - die(); -} - -$palettes = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/themes.json"), true); - -function check($name, $description, $checked, $actionOn, $actionOff, $disable = false) { ?> -<div style="margin-top: 10px;display: grid; grid-template-columns: 1fr max-content;"> - <div> - <p style="margin-bottom: 5px;"><?= $name ?></p> - <span class="text-muted"><?= $description ?></span> - </div> - <div style="display: flex; align-items: center; justify-content: end;"> - <div class="btn-group"> - <a href="<?= $actionOn ?>" type="button" class="<?= $disable ? "disabled " : "" ?>btn <?= $checked ? "btn-primary" : "btn-outline-primary" ?>"><?= l("lang_studio_on") ?></a> - <a href="<?= $actionOff ?>" type="button" class="<?= $disable ? "disabled " : "" ?>btn <?= !$checked ? "btn-primary" : "btn-outline-primary" ?>"><?= l("lang_studio_off") ?></a> - </div> - </div> -</div> -<?php } ?> - -<style> - .studio-theme { - transition: opacity 200ms; - } - - .studio-theme:hover { - opacity: .75; - } -</style> - -<div class="container"> - <br><br> - <h1><?= l("lang_studio_title") ?></h1> - - <h3><?= l("lang_studio_theme") ?></h3> - - <?php if (isset($_COOKIE["DeltaKiosk"])): ?> - <div class="alert alert-secondary"> - <?= l("lang_studio_kiosk") ?> - </div> - <?php else: ?> - <div style="margin-top: 20px; display: grid; grid-gap: 15px; grid-template-columns: repeat(<?= count($palettes["list"]) ?>, 1fr);"> - <?php foreach ($palettes["list"] as $index => $palette): ?> - <a class="studio-theme" href="/studio/theme/?id=<?= $index ?>"> - <span style="width: 100%; border-radius: 999px; aspect-ratio: 1/1; background: <?= "#" . explode(",", $palette[$_PROFILE["studio_settings"]["dark"] ? "dark" : "light"])[9] ?>; display: inline-flex; align-items: center; justify-content: center;"><?= $index === $_PROFILE["studio_settings"]["theme"] ? "<div style='width: 75%; height: 75%; background: rgba(0, 0, 0, .25); display: inline-flex; align-items: center; justify-content: center; border-radius: 999px;'><img src='/studio-done.svg'></div>" : "" ?></span> - </a> - <?php endforeach; ?> - </div> - - <div class="btn-group" style="margin-top: 20px; width: 100%;"> - <a href="/studio/light/?dark" type="button" class="btn <?= $_PROFILE["studio_settings"]["dark"] ? "btn-primary" : "btn-outline-primary" ?>"><?= l("lang_studio_dark") ?></a> - <a href="/studio/light/?light" type="button" class="btn <?= !$_PROFILE["studio_settings"]["dark"] ? "btn-primary" : "btn-outline-primary" ?>"><?= l("lang_studio_light") ?></a> - </div> - <?php endif; ?> - - <h3 style="margin-top: 20px;"><?= l("lang_studio_profile") ?></h3> - <div style="margin-top: 20px; display: grid; grid-gap: 15px; grid-template-columns: repeat(<?= count($palettes["list"]) + 1 ?>, 1fr);"> - <a class="studio-theme" href="/studio/profile-theme/?id=-1"> - <span style="width: 100%; border-radius: 999px; aspect-ratio: 1/1; background: transparent; border: 2px solid var(--bs-link-color); display: inline-flex; align-items: center; justify-content: center;"><?= -1 === $_PROFILE["studio_settings"]["profile"]["theme"] ? "<div style='width: 75%; height: 75%; background: rgba(0, 0, 0, .25); display: inline-flex; align-items: center; justify-content: center; border-radius: 999px;'><img src='/studio-done.svg'></div>" : "" ?></span> - </a> - <?php foreach ($palettes["list"] as $index => $palette): ?> - <a class="studio-theme" href="/studio/profile-theme/?id=<?= $index ?>"> - <span style="width: 100%; border-radius: 999px; aspect-ratio: 1/1; background: <?= "#" . explode(",", $palette[$_PROFILE["studio_settings"]["dark"] ? "dark" : "light"])[9] ?>; display: inline-flex; align-items: center; justify-content: center;"><?= $index === $_PROFILE["studio_settings"]["profile"]["theme"] ? "<div style='width: 75%; height: 75%; background: rgba(0, 0, 0, .25); display: inline-flex; align-items: center; justify-content: center; border-radius: 999px;'><img src='/studio-done.svg'></div>" : "" ?></span> - </a> - <?php endforeach; ?> - </div> - - <div style="margin-top: 20px;"> - <?php check(l("lang_studio_settings_badge_title"), l("lang_studio_settings_badge_description"), $_PROFILE["studio_settings"]["profile"]["badge"], "/studio/profile/?id=badge&value=1", "/studio/profile/?id=badge&value=0") ?> - - <?php check(l("lang_studio_settings_photo_title"), l("lang_studio_settings_photo_description"), $_PROFILE["studio_settings"]["profile"]["photo"], "/studio/profile/?id=photo&value=1", "/studio/profile/?id=photo&value=0") ?> - - <?php check(l("lang_studio_settings_birth_title"), l("lang_studio_settings_birth_description"), $_PROFILE["studio_settings"]["profile"]["birth"], "/studio/profile/?id=birth&value=1", "/studio/profile/?id=birth&value=0") ?> - - <?php check(l("lang_studio_settings_phone_title"), l("lang_studio_settings_phone_description"), $_PROFILE["studio_settings"]["profile"]["phone"], "/studio/profile/?id=phone&value=1", "/studio/profile/?id=phone&value=0") ?> - - <?php check(l("lang_studio_settings_email_title"), l("lang_studio_settings_email_description"), $_PROFILE["studio_settings"]["profile"]["email"], "/studio/profile/?id=email&value=1", "/studio/profile/?id=email&value=0") ?> - - <?php check(l("lang_studio_settings_detailed_title"), l("lang_studio_settings_detailed_description"), $_PROFILE["studio_settings"]["profile"]["detailed"], "/studio/profile/?id=detailed&value=1", "/studio/profile/?id=detailed&value=0") ?> - - <?php check(l("lang_studio_settings_hide_title"), l("lang_studio_settings_hide_description"), $_PROFILE["studio_settings"]["profile"]["hide"], "/studio/profile/?id=hide&value=1", "/studio/profile/?id=hide&value=0") ?> - </div> - - <br><br> -</div> - -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/footer.php"; ?>
\ No newline at end of file diff --git a/studio/light/index.php b/studio/light/index.php deleted file mode 100644 index 8f8ed8f..0000000 --- a/studio/light/index.php +++ /dev/null @@ -1,22 +0,0 @@ -<?php - -require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/session.php"; -if (!isset($_PROFILE["ultra"]) || !$_PROFILE["ultra"]) { - header("Location: /"); - die(); -} - -$palettes = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/themes.json"), true); - -if (isset($_GET['dark'])) { - $_PROFILE["studio_settings"]["dark"] = true; - saveProfile(); -} - -if (isset($_GET['light'])) { - $_PROFILE["studio_settings"]["dark"] = false; - saveProfile(); -} - -header("Location: /studio"); -die();
\ No newline at end of file diff --git a/studio/profile-theme/index.php b/studio/profile-theme/index.php deleted file mode 100644 index c5f2bbc..0000000 --- a/studio/profile-theme/index.php +++ /dev/null @@ -1,17 +0,0 @@ -<?php - -require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/session.php"; -if (!isset($_PROFILE["ultra"]) || !$_PROFILE["ultra"]) { - header("Location: /"); - die(); -} - -$palettes = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/themes.json"), true); - -if (isset($_GET['id']) && is_numeric($_GET['id']) && (isset($palettes["list"][(int)$_GET["id"]]) || (int)$_GET["id"] === -1)) { - $_PROFILE["studio_settings"]["profile"]["theme"] = (int)$_GET["id"]; - saveProfile(); -} - -header("Location: /studio"); -die();
\ No newline at end of file diff --git a/studio/profile/index.php b/studio/profile/index.php deleted file mode 100644 index f2f72bc..0000000 --- a/studio/profile/index.php +++ /dev/null @@ -1,17 +0,0 @@ -<?php - -require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/session.php"; -if (!isset($_PROFILE["ultra"]) || !$_PROFILE["ultra"]) { - header("Location: /"); - die(); -} - -$palettes = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/themes.json"), true); - -if (isset($_GET['value']) && isset($_GET['id']) && isset($_PROFILE["studio_settings"]["profile"][$_GET["id"]]) && is_bool($_PROFILE["studio_settings"]["profile"][$_GET["id"]])) { - $_PROFILE["studio_settings"]["profile"][$_GET["id"]] = (bool)$_GET["value"]; - saveProfile(); -} - -header("Location: /studio"); -die();
\ No newline at end of file diff --git a/studio/theme/index.php b/studio/theme/index.php deleted file mode 100644 index 506f263..0000000 --- a/studio/theme/index.php +++ /dev/null @@ -1,17 +0,0 @@ -<?php - -require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/session.php"; -if (!isset($_PROFILE["ultra"]) || !$_PROFILE["ultra"]) { - header("Location: /"); - die(); -} - -$palettes = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/themes.json"), true); - -if (isset($_GET['id']) && is_numeric($_GET['id']) && isset($palettes["list"][(int)$_GET["id"]])) { - $_PROFILE["studio_settings"]["theme"] = (int)$_GET["id"]; - saveProfile(); -} - -header("Location: /studio"); -die();
\ No newline at end of file diff --git a/support/index.php b/support/index.php index e5da28a..c8d6023 100644 --- a/support/index.php +++ b/support/index.php @@ -115,9 +115,6 @@ $emailSupport = file_exists($_SERVER['DOCUMENT_ROOT'] . "/includes/email") && tr <a href="?t=8" class="list-group-item list-group-item-action"> <img class="icon" src="/icons/requests.svg"><span style="vertical-align: middle; margin-left: 5px;"><?= l("lang_support_issues_8") ?></span> </a> - <a href="?t=9" class="list-group-item list-group-item-action"> - <img class="icon" src="/icons/smartphone.svg"><span style="vertical-align: middle; margin-left: 5px;"><?= l("lang_support_issues_9") ?></span> - </a> <a href="?t=10" class="list-group-item list-group-item-action"> <img class="icon" src="/icons/help.svg"><span style="vertical-align: middle; margin-left: 5px;"><?= l("lang_support_issues_10") ?></span> </a> @@ -136,4 +133,4 @@ $emailSupport = file_exists($_SERVER['DOCUMENT_ROOT'] . "/includes/email") && tr <br><br><br> </div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/footer.php"; ?>
\ No newline at end of file +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/footer.php"; ?> @@ -1 +1 @@ -5.3.2 +5.3.4 |