From 3d1cd02f27518f1a04374c7c8320cd5d82ede6e9 Mon Sep 17 00:00:00 2001 From: Minteck Date: Thu, 23 Feb 2023 19:34:56 +0100 Subject: Updated 40 files, added 37 files, deleted 1103 files and renamed 3905 files (automated) --- includes/header.inc | 40 ++++++++++------------------------------ 1 file changed, 10 insertions(+), 30 deletions(-) (limited to 'includes/header.inc') diff --git a/includes/header.inc b/includes/header.inc index 4261f1c..02cb190 100644 --- a/includes/header.inc +++ b/includes/header.inc @@ -12,7 +12,7 @@ if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/includes/data/.test")) { $isNormallyLoggedIn = false; -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; if ($readOnly && $isLoggedIn || $readOnly && $isUserLoggedIn) { $isLoggedIn = false; $isUserLoggedIn = false; @@ -21,12 +21,14 @@ if ($readOnly && $isLoggedIn || $readOnly && $isUserLoggedIn) { $pages = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/pages.json"), true); -function error($errno, $errstr, $file, $line) { - echo(' +if (!function_exists("error")) { + function error($errno, $errstr, $file, $line) { + echo(' "> -
- Error ' . $errno . ': ' . $errstr . ' [' . $file . ':' . $line . '] -
'); +
+ Error ' . $errno . ': ' . $errstr . ' [' . $file . ':' . $line . '] +
'); + } } if (isset($_GET['errors'])) { @@ -54,7 +56,6 @@ require_once $_SERVER["DOCUMENT_ROOT"] . "/includes/bitset.inc"; require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/banner.inc"; require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/rainbow.inc"; require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/functions.inc"; -require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/ical/main.php"; ?> @@ -65,32 +66,11 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/ical/main.php"; - <?= $title ? $title . " · " : "" ?>Cold Haze - - - - - - - - - - - - - - - - - - - - - + <?= $title && $title !== "-" ? $title . " · " : "" ?>Cold Haze + .png" type="image/png"> id="admin-page"> -
-- cgit