diff options
author | RaindropsSys <raindrops@equestria.dev> | 2024-05-16 22:41:09 +0200 |
---|---|---|
committer | RaindropsSys <raindrops@equestria.dev> | 2024-05-16 22:41:09 +0200 |
commit | 8640438fe62ee2e19c7022024ba88c29f1b2b755 (patch) | |
tree | dba171c37472fb35a0b06cf9860d7bd66168ff04 | |
parent | b6c6e355a362b012ded7b349da93ccb40e5c90f4 (diff) | |
download | delta-8640438fe62ee2e19c7022024ba88c29f1b2b755.tar.gz delta-8640438fe62ee2e19c7022024ba88c29f1b2b755.tar.bz2 delta-8640438fe62ee2e19c7022024ba88c29f1b2b755.zip |
Updated 3 files and deleted 3 files (automated)
-rw-r--r-- | includes/navigation.php | 3 | ||||
-rw-r--r-- | index.php | 4 | ||||
-rw-r--r-- | pass/index.php | 57 | ||||
-rw-r--r-- | pass/scan/index.php | 163 | ||||
-rw-r--r-- | pass/scan/resolve/index.php | 41 | ||||
-rw-r--r-- | version | 2 |
6 files changed, 3 insertions, 267 deletions
diff --git a/includes/navigation.php b/includes/navigation.php index 9a49205..b291d35 100644 --- a/includes/navigation.php +++ b/includes/navigation.php @@ -158,9 +158,6 @@ <a style="margin-right: 15px;" href="/requests" data-bs-placement="bottom" class="newnav-link" title="<?= l("lang_navigation_user_requests") ?>" data-bs-toggle="tooltip"> <img class="icon" src="/icons/requests.svg"> </a> - <a style="margin-right: 15px;" href="/pass" data-bs-placement="bottom" class="newnav-link" title="<?= l("lang_pass_title") ?>" data-bs-toggle="tooltip"> - <img class="icon" src="/icons/pass.svg"> - </a> </div> </div> <div style="width: 359px;"> @@ -27,8 +27,8 @@ $version = file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/version"); <li style="opacity: .25;">21 avril : Désactivation de Delta Beta. Étant donné qu'il n'y a, à l'heure actuelle, aucune fonctionnalité expérimentale, la page correspondante est simplement retirée. Le prix de l'abonnement Delta Plus sera abaissé à 3 pièces par mois (soit 0,75€ par mois).</li> <li style="opacity: .25;">28 avril : Activation de l'option d'impression des pages pour tous les utilisateurs de Delta. Le prix de l'abonnement Delta Plus sera abaissé à 2 pièces par mois (soit 0,50€ par mois).</li> <li style="opacity: .25;">5 mai : Retrait de Delta Plus (et par conséquent du badge de profil et des relectures privilégiées). Les abonnements Delta Plus en cours de validité expireront.</li> - <li style="font-weight: bold;">12 mai : Désactivation de l'option d'aide intégrée. À partir de ce jour, aucun support technique ne sera fourni aux utilisateurs de Delta.</li> - <li>19 mai : Retrait du Pass Événements. Les intégrations dans des applications tierces utilisant le Pass Événements cesseront de fonctionner.</li> + <li style="opacity: .25;">12 mai : Désactivation de l'option d'aide intégrée. À partir de ce jour, aucun support technique ne sera fourni aux utilisateurs de Delta.</li> + <li style="font-weight: bold;">19 mai : Retrait du Pass Événements. Les intégrations dans des applications tierces utilisant le Pass Événements cesseront de fonctionner.</li> <li>26 mai : Retrait du système de recherche.</li> <li>2 juin : Désactivation des albums de galerie. Étant donné qu'aucun album n'existe actuellement, la page est simplement retirée.</li> <li>9 juin : Désactivation de toutes les fonctionnalités de modification de Delta. Pour modifier du contenu après cette date, contactez les administrateurs.</li> diff --git a/pass/index.php b/pass/index.php deleted file mode 100644 index 884647f..0000000 --- a/pass/index.php +++ /dev/null @@ -1,57 +0,0 @@ -<?php - -$title = "lang_pass_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; - -$tag = base64_encode(hex2bin(str_replace("-", "", $_USER))); -global $palette; - -?> - -<script src="/bootstrap/qrcode.min.js"></script> -<style> - #qrcode img { - width: 216px; - } - - #qrcode { - pointer-events: none; - width: max-content; - } -</style> - -<div class="container"> - <br><br> - <h1><?= l("lang_pass_title") ?></h1> - - <?php if (isset($_COOKIE["DeltaKiosk"])): ?> - <div class="alert alert-secondary"> - <?= l("lang_pass_kiosk") ?> - </div> - <?php else: ?> - <p><?= l("lang_pass_description") ?></p> - - <div> - <div style="background: white; padding: 20px; border-radius: 20px;"> - <div id="qrcode" style="margin-left: auto; margin-right: auto;"></div> - </div> - </div> - - <script type="text/javascript"> - new QRCode(document.getElementById("qrcode"), "<?= $tag ?>"); - </script> - - <?php if (isset($_PROFILE["organizer"])): ?> - <div style="margin-top: 10px;"> - <a href="/pass/scan"><?= l("lang_pass_scan") ?></a> - </div> - <?php endif; ?> - <?php endif; ?> - - <br><br><br> -</div> - -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/footer.php"; ?> diff --git a/pass/scan/index.php b/pass/scan/index.php deleted file mode 100644 index 04125a4..0000000 --- a/pass/scan/index.php +++ /dev/null @@ -1,163 +0,0 @@ -<?php - -$title = "lang_pass_title2"; -require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/session.php"; global $_PROFILE; global $_USER; - -if (!$_PROFILE["organizer"]) { - header("Location: /pass"); - die(); -} - -require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/header.php"; -require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/navigation.php"; - -$tag = base64_encode(hex2bin(str_replace("-", "", $_USER))); -global $palette; - -?> - -<style> - video { - max-width: 100%; - max-height: 100%; - display: block; - margin-left: auto; - margin-right: auto; - } -</style> - -<div class="modal fade" id="modal-result"> - <div class="modal-dialog"> - <div class="modal-content"> - <div class="modal-header"> - <h4 class="modal-title"><?= l("lang_pass_result") ?></h4> - <button type="button" class="btn-close" data-bs-dismiss="modal"></button> - </div> - - <div class="modal-body"> - <div id="modal-result-load"> - <?= l("lang_pass_loading") ?> - </div> - <table id="modal-result-data" style="display: none;"> - <tbody> - <tr> - <td style="padding-right: 10px; text-align: right;"><b><?= l("lang_pass_items_0") ?></b></td> - <td class="pass-items-item" id="pass-items-0">-</td> - </tr> - <tr> - <td style="padding-right: 10px; text-align: right;"><b><?= l("lang_pass_items_1") ?></b></td> - <td class="pass-items-item" id="pass-items-1">-</td> - </tr> - <tr> - <td style="padding-right: 10px; text-align: right;"><b><?= l("lang_pass_items_2") ?></b></td> - <td class="pass-items-item" id="pass-items-2">-</td> - </tr> - <tr> - <td style="padding-right: 10px; text-align: right;"><b><?= l("lang_pass_items_3") ?></b></td> - <td class="pass-items-item" id="pass-items-3">-</td> - </tr> - <tr> - <td style="padding-right: 10px; text-align: right;"><b><?= l("lang_pass_items_4") ?></b></td> - <td class="pass-items-item" id="pass-items-4">-</td> - </tr> - <tr> - <td style="padding-right: 10px; text-align: right;"><b><?= l("lang_pass_items_5") ?></b></td> - <td class="pass-items-item" id="pass-items-5">-</td> - </tr> - <tr> - <td style="padding-right: 10px; text-align: right;"><b><?= l("lang_pass_items_6") ?></b></td> - <td class="pass-items-item" id="pass-items-6">-</td> - </tr> - <tr> - <td style="padding-right: 10px; text-align: right;"><b><?= l("lang_pass_items_7") ?></b></td> - <td class="pass-items-item" id="pass-items-7">-</td> - </tr> - <tr> - <td style="padding-right: 10px; text-align: right;"><b><?= l("lang_pass_items_8") ?></b></td> - <td class="pass-items-item" id="pass-items-8">-</td> - </tr> - <tr> - <td style="padding-right: 10px; text-align: right;"><b><?= l("lang_pass_items_9") ?></b></td> - <td class="pass-items-item" id="pass-items-9">-</td> - </tr> - </tbody> - </table> - </div> - </div> - </div> -</div> - -<div class="container"> - <br><br> - <h1><?= l("lang_pass_title2") ?></h1> - - <video id="preview" style="filter: blur(100px);"></video> - - <script type="module"> - import QrScanner from '/bootstrap/qr-scanner.min.js'; - window.modal = new bootstrap.Modal(document.getElementById("modal-result")); - window.ready = false; - - const qrScanner = new QrScanner( - document.getElementById("preview"), - result => { - if (!modal._isShown && window.ready) { - navigator.vibrate(100); - document.getElementById("modal-result-load").style.display = "block"; - document.getElementById("modal-result-data").style.display = "none"; - modal.show(); - - let characters = base64ToHex(result.data).toLowerCase().split(""); - let id = [...characters].splice(0, 8).join("") + "-" + [...characters].splice(8, 4).join("") + "-" + [...characters].splice(12, 4).join("") + "-" + [...characters].splice(16, 4).join("") + "-" + [...characters].splice(20, 12).join(""); - - console.log(id); - resolveUser(id); - } - }, - {}, - ); - - qrScanner.start(); - - document.getElementById("preview").onclick = () => { - window.ready = true; - document.getElementById("preview").style.filter = ""; - } - </script> - - <script> - function base64ToHex(str) { - const raw = atob(str); - let result = ''; - for (let i = 0; i < raw.length; i++) { - const hex = raw.charCodeAt(i).toString(16); - result += (hex.length === 2 ? hex : '0' + hex); - } - return result.toUpperCase(); - } - - async function resolveUser(id) { - Array.from(document.getElementsByClassName("pass-items-item")).map(i => { - i.innerText = "-"; - }); - - let data = await (await fetch("/pass/scan/resolve/?_=" + id)).json(); - - for (let index in data) { - document.getElementById("pass-items-" + index).innerText = data[parseInt(index)]; - } - - document.getElementById("modal-result-load").style.display = "none"; - document.getElementById("modal-result-data").style.display = "block"; - return data; - } - </script> - - <div style="margin-top: 10px;"> - <a href="/pass"><?= l("lang_pass_show") ?></a> - </div> - - <br><br><br> -</div> - -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/footer.php"; ?>
\ No newline at end of file diff --git a/pass/scan/resolve/index.php b/pass/scan/resolve/index.php deleted file mode 100644 index 37c182f..0000000 --- a/pass/scan/resolve/index.php +++ /dev/null @@ -1,41 +0,0 @@ -<?php - -require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/session.php"; global $_PROFILE; global $_USER; - -if (!$_PROFILE["organizer"]) { - header("Location: /pass"); - die(); -} - -if (isset($_GET["_"]) && !str_contains("/", $_GET["_"]) && !str_contains(".", $_GET["_"]) && file_exists($_SERVER['DOCUMENT_ROOT'] . "/includes/data/profiles/" . $_GET["_"] . ".json")) { - $selected = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/profiles/" . $_GET["_"] . ".json"), true); -} else { - die(); -} - -$bdate = strtotime($selected["birth"]); -$age = timeAgo($bdate, false, true) . " " . l("lang_profile_old"); -$birth = "(" . formatDate($selected["birth"], false) . ")"; - -$privileges = []; - -if ($selected["organizer"]) $privileges[] = l("lang_pass_organizer"); -if ($selected["hunter"]) $privileges[] = l("lang_badges_hunter"); -if ($selected["eap"]) $privileges[] = l("lang_badges_eap"); -if ($selected["admin"]) $privileges[] = l("lang_badges_admin"); - -$return = [ - $_GET["_"], - $selected["first_name"] . " " . $selected["last_name"], - $age . " " . $birth, - $selected["ultra"] ? "Delta Ultra" : ($selected["plus"] ? "Delta Plus" : "Delta Free"), - count($privileges) > 0 ? implode(", ", $privileges) : "-", - timeAgo($selected["date"]), - $selected["balance"] . " " . l("lang_plus_coins"), - $selected["email"], - $selected["phone"], - $selected["kiosk"] ? l("lang_pass_yes") : l("lang_pass_no") -]; - -header("Content-Type: application/json"); -die(json_encode($return));
\ No newline at end of file @@ -1 +1 @@ -5.3.9 +5.3.10 |