diff options
| -rw-r--r-- | includes/components/planner.inc | 2 | ||||
| -rw-r--r-- | pages/rules.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/includes/components/planner.inc b/includes/components/planner.inc index aed4e56..af2f350 100644 --- a/includes/components/planner.inc +++ b/includes/components/planner.inc @@ -278,7 +278,7 @@ function day($display, $diff): void { if ($diff < 0) $disabled = true; else $dis <td colspan="10" style="padding: 0;border:none;"> <div style="padding: 5px 10px;border: 1px solid #404040;margin:-1px;border-bottom-left-radius: 10px;border-bottom-right-radius: 10px;"> <?php if (count($dayCloudburst) > 0 && count($dayRaindrops) > 0): ?> - <?= getMemberWithoutSystem($dayCloudburst[count($dayCloudburst) - 1][0])["display_name"] ?? getMemberWithoutSystem($dayCloudburst[count($dayCloudburst) - 1][0])["name"] ?> will sleep with <?= getMemberWithoutSystem($dayRaindrops[count($dayRaindrops) - 1][0])["display_name"] ?? getMemberWithoutSystem($dayRaindrops[count($dayRaindrops) - 1][0])["name"] ?><?= school(time() + 86400 * $diff, false) ?> + <?= getMemberWithoutSystem($dayCloudburst[count($dayCloudburst) - 1][0])["display_name"] ?? getMemberWithoutSystem($dayCloudburst[count($dayCloudburst) - 1][0])["name"] ?><?php if (isset($dayCloudburst[count($dayCloudburst) - 1][1])): echo(" and " . getMemberWithoutSystem($dayCloudburst[count($dayCloudburst) - 1][1])["display_name"] ?? getMemberWithoutSystem($dayCloudburst[count($dayCloudburst) - 1][1])["name"]); endif; ?> will sleep with <?= getMemberWithoutSystem($dayRaindrops[count($dayRaindrops) - 1][0])["display_name"] ?? getMemberWithoutSystem($dayRaindrops[count($dayRaindrops) - 1][0])["name"] ?><?php if (isset($dayRaindrops[count($dayRaindrops) - 1][1])): echo(" and " . getMemberWithoutSystem($dayRaindrops[count($dayRaindrops) - 1][1])["display_name"] ?? getMemberWithoutSystem($dayRaindrops[count($dayRaindrops) - 1][1])["name"]); endif; ?> <?php else: ?> <?= school(time() + 86400 * $diff, true) ?> <?php endif; ?> diff --git a/pages/rules.inc b/pages/rules.inc index 1238b7d..967a4b4 100644 --- a/pages/rules.inc +++ b/pages/rules.inc @@ -58,7 +58,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/components/header.inc'; ?> - <?php $index = 1; foreach ($rules as $rule): ?> + <?php foreach (array_values($rules) as $index => $rule): $index++; ?> <h4 style="margin-top: 20px;"> <b>Rule <?= $index ?>: <?= str_replace("<", "<", str_replace(">", ">", $rule["name"])) ?></b> <?php if (in_array(false, $rule["approved"])): ?> |