From 3530b43ea2829a6cccf703063eaace471f48f758 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Sat, 6 Apr 2024 22:59:27 +0200
Subject: [PATCH] Fix Error in scheduled jobs due to PHP 8 incompatibility,
 #6682

---
 server/lib/classes/backup.inc.php                         | 8 ++++----
 server/lib/classes/cron.d/100-monitor_clamav_log.inc.php  | 1 +
 server/lib/classes/cron.d/100-monitor_mail_queue.inc.php  | 1 +
 .../lib/classes/cron.d/100-monitor_system_update.inc.php  | 2 +-
 server/lib/classes/db_mysql.inc.php                       | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/server/lib/classes/backup.inc.php b/server/lib/classes/backup.inc.php
index 07ecdf11d0..77011e61cb 100644
--- a/server/lib/classes/backup.inc.php
+++ b/server/lib/classes/backup.inc.php
@@ -1497,9 +1497,9 @@ class backup
         foreach ($backup_excludes as $ex) {
             # pass through escapeshellarg if not already done
             if ( preg_match( "/^'.+'$/", $ex ) ) {
-                $excludes .= "${arg}${pre}${ex}${post} ";
+                $excludes .= "{$arg}{$pre}{$ex}{$post} ";
             } else {
-                $excludes .= "${arg}" . escapeshellarg("${pre}${ex}${post}") . " ";
+                $excludes .= "{$arg}" . escapeshellarg("{$pre}{$ex}{$post}") . " ";
             }
         }
 
@@ -1870,8 +1870,8 @@ class backup
             //* Remove old backups
             self::backups_garbage_collection($server_id, 'mysql', $domain_id);
             $prefix_list = array(
-                        "db_${db_name}_",
-                        "manual-db_${db_name}_",
+                        "db_{$db_name}_",
+                        "manual-db_{$db_name}_",
                     );
             self::clearBackups($server_id, $domain_id, intval($rec['backup_copies']), $db_backup_dir, $prefix_list);
         }
diff --git a/server/lib/classes/cron.d/100-monitor_clamav_log.inc.php b/server/lib/classes/cron.d/100-monitor_clamav_log.inc.php
index f2120539b4..87e5937656 100644
--- a/server/lib/classes/cron.d/100-monitor_clamav_log.inc.php
+++ b/server/lib/classes/cron.d/100-monitor_clamav_log.inc.php
@@ -94,6 +94,7 @@ class cronjob_monitor_clamav_log extends cronjob {
 
 		/* Get the data of the log */
 		$data = $this->_tools->_getLogData($type);
+		if ($data == null) $data = "\n";
 
 		/* Get the data from the LAST log-Entry.
 		 * if there can be found:
diff --git a/server/lib/classes/cron.d/100-monitor_mail_queue.inc.php b/server/lib/classes/cron.d/100-monitor_mail_queue.inc.php
index f39dd00a6e..1463d7f1e2 100644
--- a/server/lib/classes/cron.d/100-monitor_mail_queue.inc.php
+++ b/server/lib/classes/cron.d/100-monitor_mail_queue.inc.php
@@ -82,6 +82,7 @@ class cronjob_monitor_mail_queue extends cronjob {
 
 		/* Get the data from the mailq */
 		$data['output'] = shell_exec('mailq');
+		if ($data['output'] == null) $data['output'] = "";
 
 		/*
 		 *  The last line has more informations
diff --git a/server/lib/classes/cron.d/100-monitor_system_update.inc.php b/server/lib/classes/cron.d/100-monitor_system_update.inc.php
index cab5f68edb..2bec71d8d2 100644
--- a/server/lib/classes/cron.d/100-monitor_system_update.inc.php
+++ b/server/lib/classes/cron.d/100-monitor_system_update.inc.php
@@ -216,7 +216,7 @@ class cronjob_monitor_system_update extends cronjob {
 
 		//* Ensure that output is encoded so that it does not break the serialize
 		//$res['data']['output'] = htmlentities($res['data']['output']);
-		$res['data']['output'] = htmlentities($res['data']['output'], ENT_QUOTES, 'UTF-8');
+		$res['data']['output'] = $res['data']['output'] ? htmlentities($res['data']['output'], ENT_QUOTES, 'UTF-8') : null;
 
 		/*
 		 * Insert the data into the database
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
index f2299de343..44355ebfbb 100644
--- a/server/lib/classes/db_mysql.inc.php
+++ b/server/lib/classes/db_mysql.inc.php
@@ -668,7 +668,7 @@ class db
 			$clientdb_user     = ($conf['db_user']) ? $conf['db_user'] : NULL;
 			$clientdb_password = ($conf['db_password']) ? $conf['db_password'] : NULL;
 			$clientdb_port     = ((int)$conf['db_port']) ? (int)$conf['db_port'] : NULL;
-			$clientdb_flags    = ($conf['db_flags'] !== NULL) ? $conf['db_flags'] : NULL;
+			$clientdb_flags    = (isset($conf['db_flags']) && $conf['db_flags'] !== NULL) ? $conf['db_flags'] : NULL;
 
 			require_once 'lib/mysql_clientdb.conf';
 
-- 
GitLab