From bf2558253637537c2d57765e557bdc0e164c58ee Mon Sep 17 00:00:00 2001 From: Minteck Date: Wed, 22 Feb 2023 10:29:48 +0100 Subject: Updated 23 files, added assets/uploads/pt-princesscelestia.png and renamed assets/uploads/pt-luna.png (automated) --- includes/planner.inc | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'includes/planner.inc') diff --git a/includes/planner.inc b/includes/planner.inc index 1bc5143..ce6e0cb 100644 --- a/includes/planner.inc +++ b/includes/planner.inc @@ -4,7 +4,7 @@ require_once $_SERVER["DOCUMENT_ROOT"] . "/includes/travelling.inc"; global $tra require_once $_SERVER["DOCUMENT_ROOT"] . "/includes/score.inc"; require_once $_SERVER["DOCUMENT_ROOT"] . "/includes/pronouns.inc"; require_once $_SERVER["DOCUMENT_ROOT"] . "/includes/bitset.inc"; -require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/session.inc"; global $isLoggedIn; global $isUserLoggedIn; +require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/session.inc"; global $isLoggedIn; global $isUserLoggedIn; global $isLowerLoggedIn; require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/banner.inc"; require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/rainbow.inc"; require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/functions.inc"; @@ -14,9 +14,11 @@ $cloudburst = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includ $raindrops = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/planner/gdapd.json"), true); function pacifier($id) { + global $isLowerLoggedIn; + $metadata = parseMetadata(json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/metadata/" . $id . ".json"), true)); - if ($metadata["pacifier"]) { + if ($metadata["pacifier"] && !$isLowerLoggedIn) { return ""; } @@ -113,6 +115,7 @@ function formatTime($time) { function school($time, $first = false) { global $school; global $_PROFILE; + global $isLowerLoggedIn; $day = date('Y-m-d', $time); $parts = []; @@ -127,6 +130,8 @@ function school($time, $first = false) { } } + if ($isLowerLoggedIn) $parts = []; + if (count($parts) > 0) { if ($first) { return ucfirst(implode(", ", $parts)); @@ -142,7 +147,7 @@ function school($time, $first = false) { } } -function day($display, $diff): void { if ($diff < 0) $disabled = true; else $disabled = false; global $cloudburst; global $raindrops; ?> +function day($display, $diff): void { if ($diff < 0) $disabled = true; else $disabled = false; global $cloudburst; global $raindrops; global $isLowerLoggedIn; ?> - + - + @@ -211,7 +216,7 @@ function day($display, $diff): void { if ($diff < 0) $disabled = true; else $dis - + - + @@ -238,13 +243,13 @@ function day($display, $diff): void { if ($diff < 0) $disabled = true; else $dis - + - + - + Multiple merged members @@ -255,7 +260,7 @@ function day($display, $diff): void { if ($diff < 0) $disabled = true; else $dis - + - + @@ -473,7 +478,6 @@ function day($display, $diff): void { if ($diff < 0) $disabled = true; else $dis .member-link:hover .member-link-inner, .planner-add-link:hover .planner-add-link-inner, .planner-add-link-cofronter:hover .planner-add-link-cofronter-inner { background-color: rgba(255, 255, 255, .125); - /*background-color: rgba(255, 255, 255, .25);*/ } @@ -862,15 +866,15 @@ function day($display, $diff): void { if ($diff < 0) $disabled = true; else $dis

Editing for the n/a

- + " onclick="deleteFronter();"> Delete - + " onclick="moveFronterUp();"> Move up - + " onclick="moveFronterDown();"> Move down @@ -898,14 +902,10 @@ function day($display, $diff): void { if ($diff < 0) $disabled = true; else $dis

Editing for the n/a