From 7601038f6bec91dad1d959e4b10701a6619d694f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20M=C3=BCller?= Date: Sun, 12 Mar 2023 11:41:04 +0100 Subject: [PATCH] fix php8 error on undefined const --- 404.php | 3 +++ index.php | 15 +++++++-------- template.php | 7 ++++--- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/404.php b/404.php index 1f01ea7..d3c6ced 100644 --- a/404.php +++ b/404.php @@ -1,4 +1,7 @@ getSetting($mysqli,"title")); define("WEB_URL", $db->getSetting($mysqli,"url")); define("MAILER_NAME", $db->getSetting($mysqli,"mailer")); define("MAILER_ADDRESS", $db->getSetting($mysqli,"mailer_email")); - -define("SUBSCRIBE_EMAIL", $db->getBooleanSetting($mysqli,"subscribe_email")); -define("SUBSCRIBE_TELEGRAM", $db->getBooleanSetting($mysqli,"subscribe_telegram")); -define("TG_BOT_USERNAME", $db->getSetting($mysqli,"tg_bot_username")); -define("TG_BOT_API_TOKEN", $db->getSetting($mysqli,"tg_bot_api_token")); -define("GOOGLE_RECAPTCHA", $db->getBooleanSetting($mysqli,"google_recaptcha")); -define("GOOGLE_RECAPTCHA_SITEKEY", $db->getSetting($mysqli,"google_recaptcha_sitekey")); -define("GOOGLE_RECAPTCHA_SECRET", $db->getSetting($mysqli,"google_recaptcha_secret")); +define("SUBSCRIBE_EMAIL", $db->getBooleanSetting($mysqli,"subscribe_email") ?: ""); +define("SUBSCRIBE_TELEGRAM", $db->getBooleanSetting($mysqli,"subscribe_telegram") ?: ""); +define("TG_BOT_USERNAME", $db->getSetting($mysqli,"tg_bot_username") ?: ""); +define("TG_BOT_API_TOKEN", $db->getSetting($mysqli,"tg_bot_api_token") ?: ""); +define("GOOGLE_RECAPTCHA", $db->getBooleanSetting($mysqli,"google_recaptcha") ?: ""); +define("GOOGLE_RECAPTCHA_SITEKEY", $db->getSetting($mysqli,"google_recaptcha_sitekey") ?: ""); +define("GOOGLE_RECAPTCHA_SECRET", $db->getSetting($mysqli,"google_recaptcha_secret") ?: ""); $offset = 0; if (isset($_GET['ajax'])) diff --git a/template.php b/template.php index ba89407..8729989 100644 --- a/template.php +++ b/template.php @@ -26,7 +26,8 @@ class Template{ if ( 'admin' == $str_url ) { $strSubsMenu = ''; } else { - if (SUBSCRIBE_EMAIL || SUBSCRIBE_TELEGRAM ) { + $strSubsMenu = ''; + if (defined('SUBSCRIBE_EMAIL') || defined('SUBSCRIBE_TELEGRAM') ) { // Subscriber menu is to be shown... $strSubsMenu = '