Fixed various PHP 8.x warnings

Author: tbrehm

install/lib/installer_base.lib.php

@@ -3333,7 +3333,7 @@ public function make_ispconfig_ssl_cert() {
 		}
 
 		// If the LE SSL certs for this hostname exists
-		if(!is_dir($acme_cert_dir) || !file_exists($check_acme_file) || !$issued_successfully) {
+		if(!is_dir($acme_cert_dir) || !file_exists($check_acme_file) || !isset($issued_successfully) || !$issued_successfully) {
 			if(!$issued_successfully) {
 				swriteln('Could not issue letsencrypt certificate, falling back to self-signed.');
 			} else {

interface/lib/classes/db_mysql.inc.php

@@ -668,7 +668,7 @@ public function getDatabaseSize($database_name) {
 			$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';
 

interface/web/mail/mail_domain_edit.php

@@ -730,7 +730,7 @@ private function find_soa_domain($domain) {
 		$soaDomain = $domain . '.';
 		$soa = null;
 		while ((!isset($soa) && (substr_count($soaDomain,'.') > 1))) {
-			$soa = $app->db->queryOneRecord("SELECT id AS zone, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, server_id, ttl, serial FROM dns_soa WHERE active = 'Y' AND origin = ?", $soaDomain);
+			$soa = $app->db->queryOneRecord("SELECT `id` AS `zone`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `ttl`, `serial` FROM `dns_soa` WHERE `active` = 'Y' AND `origin` = ?", $soaDomain);
 			$soaDomain = preg_replace("/^[^\.]+\./","",$soaDomain);
 		}
 		return $soa;

server/lib/app.inc.php

@@ -1,5 +1,5 @@
 <?php
-/**
+/*
 Copyright (c) 2007-2022, Till Brehm, projektfarm Gmbh
 All rights reserved.
 
@@ -324,7 +324,7 @@ function log($msg, $priority = 0, $dblog = true) {
 
 		// Send an email to the administrator if the current priority demands it.
 		if(isset($conf['admin_notify_priority']) && $priority >= $conf['admin_notify_priority'] && $conf['admin_mail'] != '') {
-			if($conf['hostname'] != 'localhost' && $conf['hostname'] != '') {
+			if(isset($conf['hostname']) && $conf['hostname'] != 'localhost' && $conf['hostname'] != '') {
 				$hostname = $conf['hostname'];
 			} else {
 				$hostname = exec('hostname -f');

server/lib/classes/cron.d/100-monitor_clamav_log.inc.php

@@ -105,17 +105,17 @@ public function onRunJob() {
 
 		$tmp = explode("\n", $data);
 		$lastLog = array();
-		if (count($tmp) >= 2) {
+		if (is_array($tmp) && count($tmp) >= 2) {
 			if ($tmp[sizeof($tmp) - 1] == '') {
 				/* the log ends with an empty line remove this */
 				array_pop($tmp);
 			}
-			if (strpos($tmp[sizeof($tmp) - 1], '-------------') !== false) {
+			if (isset($tmp[sizeof($tmp) - 1]) && strpos($tmp[sizeof($tmp) - 1], '-------------') !== false) {
 				/* the log ends with "-----..." remove this */
 				array_pop($tmp);
 			}
 			for ($i = sizeof($tmp) - 1; $i > 0; $i--) {
-				if (strpos($tmp[$i], '---------') === false) {
+				if (isset($tmp[$i]) && strpos($tmp[$i], '---------') === false) {
 					/* no delimiter found, so add this to the last-log */
 					$lastLog[] = $tmp[$i];
 				} else {

server/lib/classes/cron.d/100-monitor_mem_usage.inc.php

@@ -75,14 +75,16 @@ public function onRunJob() {
 		$memInfo = explode("\n", $miData);
 
 		foreach ($memInfo as $line) {
-			if (strlen($line) >= 1){
+			if (!empty($line) && strlen($line) >= 1){
 				$part = preg_split('/:/', $line);
-				$key = trim($part[0]);
-				$tmp = explode(' ', trim($part[1]));
-				$value = 0;
-				if (isset($tmp[1]) && $tmp[1] == 'kB')
-					$value = $tmp[0] * 1024;
-				$data[$key] = $value;
+                if(is_array($part) && isset($part[0]) && isset($part[1])) {
+				    $key = trim($part[0]);
+				    $tmp = explode(' ', trim($part[1]));
+				    $value = 0;
+				    if (isset($tmp[1]) && $tmp[1] == 'kB')
+					    $value = $tmp[0] * 1024;
+				    $data[$key] = $value;
+                }
 			}
 		}
 

server/lib/classes/cron.d/100-monitor_system_update.inc.php

@@ -216,7 +216,7 @@ public function onRunJob() {
 
 		//* Ensure that output is encoded so that it does not break the serialize
 		//$res['data']['output'] = htmlentities($res['data']['output']);
-		$res['data']['output'] = $res['data']['output'] ? htmlentities($res['data']['output'], ENT_QUOTES, 'UTF-8') : null;
+		$res['data']['output'] = (isset($res['data']['output']) && !empty($res['data']['output'])) ? htmlentities($res['data']['output'], ENT_QUOTES, 'UTF-8') : null;
 
 		/*
 		 * Insert the data into the database

server/lib/classes/cronjob.inc.php

@@ -42,6 +42,7 @@ class cronjob {
 	protected $_last_run = null;
 	protected $_next_run = null;
 	private $_running = false;
+    protected $_tools = null;
 
 	// services for delayed restart/reload
 	private $_delayed_restart_services = array();

server/lib/classes/system.inc.php

@@ -925,13 +925,18 @@ function mkdir($dirname, $allow_symlink = false, $mode = 0777, $recursive = fals
 	}
 
 	function unlink($filename) {
-		if(file_exists($filename) || is_link($filename)) {
+		if(!empty($filename) && file_exists($filename) || is_link($filename)) {
 			return unlink($filename);
 		}
 	}
 
 	function copy($file1, $file2) {
-		return copy($file1, $file2);
+        if(!empty($file1) && !empty($file2)) {
+            return copy($file1, $file2);
+        } else {
+            return false;
+        }
+		
 	}
 
 	function move($file1, $file2) {
@@ -942,6 +947,7 @@ function move($file1, $file2) {
         }
 
 	function rmdir($path, $recursive=false) {
+        global $app;
 		// Disallow operating on root directory
 		if(realpath($path) == '/') {
 			$app->log("rmdir: afraid I might delete root: $path", LOGLEVEL_WARN);
@@ -1117,15 +1123,15 @@ function checkpath($path) {
 	function check_free_space($path, $limit = 0, &$free_space = 0) {
 		$path = rtrim($path, '/');
 
-		/**
+		/*
 		* Make sure that we have only existing directories in the path.
 
 		* Given a file name instead of a directory, the behaviour of the disk_free_space
 		function is unspecified and may differ between operating systems and PHP versions.
         */
 		while(!is_dir($path) && $path != '/') $path = realpath(dirname($path));
 
-		$free_space = disk_free_space($out);
+		$free_space = disk_free_space($path);
 
 		if (!$free_space) {
 			$free_space = 0;

server/plugins-available/apache2_plugin.inc.php

@@ -848,7 +848,7 @@ function update($event_name, $data) {
 
 		// Get the client ID
 		$client = $app->dbmaster->queryOneRecord('SELECT client_id FROM sys_group WHERE sys_group.groupid = ?', $data['new']['sys_groupid']);
-		$client_id = intval($client['client_id']);
+		$client_id = (!empty($client))?intval($client['client_id']):0;
 		unset($client);
 
 		// Remove old symlinks, if site is renamed