From 5374602896bf2390a4b34b8dab0844ca878c92f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20M=C3=BCller?= Date: Sun, 12 Mar 2023 11:39:38 +0100 Subject: [PATCH 01/12] fix 'Array and string offset access using curly braces' deprecated error --- libs/php_idn/idna.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/php_idn/idna.php b/libs/php_idn/idna.php index bac2b63..af8f98e 100644 --- a/libs/php_idn/idna.php +++ b/libs/php_idn/idna.php @@ -12,7 +12,7 @@ function ordUTF8($c, $index = 0, &$bytes = null) $bytes = 0; if ($index >= $len) return false; - $h = ord($c{$index}); + $h = ord($c[$index]); if ($h <= 0x7F) { $bytes = 1; return $h; @@ -21,18 +21,18 @@ function ordUTF8($c, $index = 0, &$bytes = null) return false; else if ($h <= 0xDF && $index < $len - 1) { $bytes = 2; - return ($h & 0x1F) << 6 | (ord($c{$index + 1}) & 0x3F); + return ($h & 0x1F) << 6 | (ord($c[$index + 1]) & 0x3F); } else if ($h <= 0xEF && $index < $len - 2) { $bytes = 3; - return ($h & 0x0F) << 12 | (ord($c{$index + 1}) & 0x3F) << 6 - | (ord($c{$index + 2}) & 0x3F); + return ($h & 0x0F) << 12 | (ord($c[$index + 1]) & 0x3F) << 6 + | (ord($c[$index + 2]) & 0x3F); } else if ($h <= 0xF4 && $index < $len - 3) { $bytes = 4; - return ($h & 0x0F) << 18 | (ord($c{$index + 1}) & 0x3F) << 12 - | (ord($c{$index + 2}) & 0x3F) << 6 - | (ord($c{$index + 3}) & 0x3F); + return ($h & 0x0F) << 18 | (ord($c[$index + 1]) & 0x3F) << 12 + | (ord($c[$index + 2]) & 0x3F) << 6 + | (ord($c[$index + 3]) & 0x3F); } else return false; From 9ef3938e100f2ce5ee97f73fc030df69496d99df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20M=C3=BCller?= Date: Sun, 12 Mar 2023 11:40:27 +0100 Subject: [PATCH 02/12] fix error if server configs are renamed already --- create-server-config.php | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/create-server-config.php b/create-server-config.php index c3130da..f87c2aa 100644 --- a/create-server-config.php +++ b/create-server-config.php @@ -7,17 +7,26 @@ // This is needed because some hosts do not either unzip hidden files // or neither GitHub puts that file inside the zips. /********************************************************************/ +$apacheExampleName = "ApacheHtaccess"; +$apacheProductionName = ".htaccess"; +$iisExampleName = "IISWebConfig"; +$iisProductionName = "web.config"; if(stripos($_SERVER['SERVER_SOFTWARE'],'apache')!== false){ -$f = fopen(".htaccess", "a+"); -$f2 = fopen("ApacheHtaccess","r"); -fwrite($f, fread($f2, filesize("ApacheHtaccess"))); -fclose($f); -fclose($f2); + if(!file_exists($apacheProductionName)) { + $f = fopen($apacheProductionName, "a+"); + $f2 = fopen($apacheExampleName,"r"); + fwrite($f, fread($f2, filesize($apacheExampleName))); + fclose($f); + fclose($f2); + } +// skipping renaming file if it already exists } else { -$f = fopen("web.config", "a+"); -$f2 = fopen("IISWebConfig","r"); -fwrite($f, fread($f2, filesize("IISWebConfig"))); -fclose($f); -fclose($f2); + if(!file_exists($iisProductionName)) { + $f = fopen($iisProductionName, "a+"); + $f2 = fopen($iisExampleName,"r"); + fwrite($f, fread($f2, filesize($iisExampleName))); + fclose($f); + fclose($f2); + } } ?> 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 03/12] 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 = '
    '; // If subscriber is not logged on, display subscriber menus @@ -56,7 +57,7 @@ class Template{ - + Date: Sun, 12 Mar 2023 13:50:28 +0100 Subject: [PATCH 04/12] fix PHP8 fatals --- classes/notification.php | 5 +++++ classes/queue.php | 2 +- classes/service-group.php | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/classes/notification.php b/classes/notification.php index 762bbd7..d39dd88 100644 --- a/classes/notification.php +++ b/classes/notification.php @@ -60,6 +60,11 @@ class Notification $sql = "SELECT DISTINCT subscriberIDFK FROM services_subscriber WHERE serviceIDFK IN (" . $this->serviceids . ")"; $query = $mysqli->query($sql); + if (0 === $query->num_rows) { + // skip processing if no one needs to be notified + return; + } + // Create the queue tasks for email/telegram notifications $queue = new Queue(); $queue->status = $queue->all_status['populating']; diff --git a/classes/queue.php b/classes/queue.php index dd8187c..a1836b3 100644 --- a/classes/queue.php +++ b/classes/queue.php @@ -114,7 +114,7 @@ class Queue } // TODO: Fix max attempts for notifications - public function process_queue(){ + public static function process_queue(){ global $mysqli; $stmt = $mysqli->query("SELECT qn.id, qn.task_id, qn.status, qn.subscriber_id, qn.retries, sub.firstname, sub.userID, sub.token FROM queue_notify AS qn INNER JOIN subscribers AS sub ON qn.subscriber_id = sub.subscriberID WHERE qn.status NOT LIKE 2 AND sub.active=1"); while ( $result = $stmt->fetch_assoc() ) { diff --git a/classes/service-group.php b/classes/service-group.php index 933571a..f94fc72 100644 --- a/classes/service-group.php +++ b/classes/service-group.php @@ -153,7 +153,7 @@ class ServiceGroup * Get list of services groups. * @return array $groups */ - public function get_groups() { + public static function get_groups() { global $mysqli; $stmt = $mysqli->query("SELECT id, name FROM services_groups ORDER by name ASC"); From 8731add0728904386a5e21ca2611e20b258a94f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20M=C3=BCller?= Date: Sun, 12 Mar 2023 13:51:11 +0100 Subject: [PATCH 05/12] fix double check issue with login function --- classes/user.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/user.php b/classes/user.php index f613373..71c8576 100644 --- a/classes/user.php +++ b/classes/user.php @@ -210,12 +210,12 @@ class User public static function login() { global $message, $mysqli; - if (!isset($_POST['email']) && !isset($_POST['email'])) + if (!isset($_POST['email']) && !isset($_POST['pass'])) { return; } - if ((!isset($_POST['email']) || !isset($_POST['email']))) + if ((!isset($_POST['email']) || !isset($_POST['pass']))) { $message = _("Please fill in your email and password!"); return; From 9d5ab1f0d24dfc5013ea23e79c1da30dca17d81b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20M=C3=BCller?= Date: Tue, 20 Jun 2023 17:32:10 +0200 Subject: [PATCH 06/12] more fixes --- classes/constellation.php | 2 +- classes/incident.php | 2 +- classes/locale-negotiator.php | 1 - classes/notification.php | 4 ++-- classes/queue.php | 6 +++--- classes/service-group.php | 3 ++- classes/service.php | 4 ++-- index.php | 2 +- template.php | 15 ++++++++++++++- 9 files changed, 26 insertions(+), 13 deletions(-) diff --git a/classes/constellation.php b/classes/constellation.php index 3dba616..a31f6e9 100644 --- a/classes/constellation.php +++ b/classes/constellation.php @@ -69,7 +69,7 @@ class Constellation * @param boolean $admin * @return array of services */ - public function render_status($admin = false, $heading = true){ + public function render_status($admin = false, $heading = true): array{ global $mysqli; //$query = $mysqli->query("SELECT id, name, description FROM services"); diff --git a/classes/incident.php b/classes/incident.php index 3a3cd0a..af7a695 100644 --- a/classes/incident.php +++ b/classes/incident.php @@ -223,7 +223,7 @@ class Incident implements JsonSerializable $this->id, "date" => $this->timestamp, diff --git a/classes/locale-negotiator.php b/classes/locale-negotiator.php index b13ee23..94060c4 100644 --- a/classes/locale-negotiator.php +++ b/classes/locale-negotiator.php @@ -150,7 +150,6 @@ class LocaleNegotiator 'nl_BE' => 'Nederlands', 'nl_NL' => 'Nederlands', 'nn_NO' => 'Nynorsk', - 'nb_NO' => 'Norsk Bokmål', 'nso_ZA' => 'Northern sotho', 'oc_FR' => 'Occitan', 'or_IN' => 'ଓଡ଼ିଆ', diff --git a/classes/notification.php b/classes/notification.php index d39dd88..cf11ce7 100644 --- a/classes/notification.php +++ b/classes/notification.php @@ -130,7 +130,7 @@ class Notification * @param string $msg Body of message * @return boolean true = Sent / False = failed */ - public function submit_queue_telegram($userID, $firstname, $msg) + public static function submit_queue_telegram($userID, $firstname, $msg) { // TODO Handle limitations (Max 30 different subscribers per second) // TODO Error handling @@ -155,7 +155,7 @@ class Notification * @param String $uthkey Users token for managing subscription * @return void */ - public function submit_queue_email($subscriber, $subject, $msg) + public static function submit_queue_email($subscriber, $subject, $msg): bool { // TODO Error handling $mailer = new Mailer(); diff --git a/classes/queue.php b/classes/queue.php index a1836b3..adb6653 100644 --- a/classes/queue.php +++ b/classes/queue.php @@ -49,7 +49,7 @@ class Queue * Remove task from the queue * @return void */ - public function delete_task($task_id){ + public static function delete_task($task_id){ global $mysqli; $stmt = $mysqli->prepare("DELETE FROM queue_task WHERE id = ?"); $stmt->bind_param("i", $task_id); @@ -98,14 +98,14 @@ class Queue $this->set_task_status($this->all_status['ready']); // Make task available for release } - public function update_notification_retries($task_id, $subscriber_id) { + public static function update_notification_retries($task_id, $subscriber_id) { global $mysqli; $stmt = $mysqli->prepare("UPDATE queue_notify SET retries = retries+1 WHERE task_id = ? AND subscriber_id = ?"); $stmt->bind_param("ii", $task_id, $subscriber_id); $stmt->execute(); } - public function delete_notification($task_id, $subscriber_id) { + public static function delete_notification($task_id, $subscriber_id) { global $mysqli; $stmt = $mysqli->prepare("DELETE FROM queue_notify WHERE task_id = ? AND subscriber_id = ?"); $stmt->bind_param("ii", $task_id, $subscriber_id); diff --git a/classes/service-group.php b/classes/service-group.php index f94fc72..fef8934 100644 --- a/classes/service-group.php +++ b/classes/service-group.php @@ -8,6 +8,7 @@ class ServiceGroup private $name; private $description; private $visibility_id; + private $status; /** * Constructs servicegroup from its data. @@ -16,7 +17,7 @@ class ServiceGroup * @param String $description tooltip text * @param int $visibility_id how to display group items */ - function __construct($id, $name, $description, $visibility_id) + function __construct($id, $name, $description, $visibility_id, $status) { //TODO: Maybe get data from ID? diff --git a/classes/service.php b/classes/service.php index 268715c..5ed577e 100644 --- a/classes/service.php +++ b/classes/service.php @@ -180,7 +180,7 @@ class Service implements JsonSerializable * @param Service[] $array array of services * @return void */ - public static function current_status($array){ + public static function current_status($array): void{ global $all, $some, $classes; $statuses = array(0,0,0,0); $worst = 5; @@ -258,7 +258,7 @@ class Service implements JsonSerializable } } - public function jsonSerialize() { + public function jsonSerialize(): mixed { global $statuses; return [ "id" => $this->id, diff --git a/index.php b/index.php index a815246..96bb3dd 100644 --- a/index.php +++ b/index.php @@ -100,7 +100,7 @@ Template::render_header("Status"); render_status();?> -query("SELECT count(*) FROM status")->num_rows) +query("SELECT count(*) FROM status")) { ?>
    diff --git a/template.php b/template.php index 8729989..0709651 100644 --- a/template.php +++ b/template.php @@ -59,7 +59,7 @@ class Template{ /css/bootstrap.min.css"> + @@ -90,6 +91,17 @@ class Template{ +
'; - //echo ''; + return $array; } else{ return $array; diff --git a/index.php b/index.php index 96bb3dd..239ad7b 100644 --- a/index.php +++ b/index.php @@ -118,3 +118,10 @@ Template::render_header("Status"); Template::render_footer(); } +?> + + Date: Tue, 2 Apr 2024 18:12:51 +0200 Subject: [PATCH 09/12] fix header and footer not showing --- template.php | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/template.php b/template.php index 0709651..e8545c1 100644 --- a/template.php +++ b/template.php @@ -72,7 +72,6 @@ class Template{ - @@ -91,17 +90,6 @@ class Template{ -