From 5bb6e37a974506cfa343544807cd3c7be52ad7d1 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Mon, 26 Dec 2022 12:41:04 +0100
Subject: [PATCH 1/4] Avoid php8.1 warning about shell_exec returning NULL

---
 install/lib/installer_base.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 3d49c23871..f3f5985e87 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -52,7 +52,7 @@ class installer_base {
 	}
 
 	public function update_acme() {
-		$acme = explode("\n", shell_exec('which acme.sh /usr/local/ispconfig/server/scripts/acme.sh /root/.acme.sh/acme.sh 2> /dev/null'));
+		$acme = explode("\n", (string)shell_exec('which acme.sh /usr/local/ispconfig/server/scripts/acme.sh /root/.acme.sh/acme.sh 2> /dev/null'));
 		$acme = reset($acme);
 		$val = 0;
 
-- 
GitLab


From a41468bf1c2ff19d9f9a9d87913e87103a1cbe9c Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Mon, 26 Dec 2022 14:21:36 +0100
Subject: [PATCH 2/4] Avoid Automatic conversion of false to array is
 deprecated in cron.d/200-logfiles.inc.php

---
 server/lib/classes/cron.d/200-ftplogfiles.inc.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/lib/classes/cron.d/200-ftplogfiles.inc.php b/server/lib/classes/cron.d/200-ftplogfiles.inc.php
index a88a360ae2..430d8ce412 100644
--- a/server/lib/classes/cron.d/200-ftplogfiles.inc.php
+++ b/server/lib/classes/cron.d/200-ftplogfiles.inc.php
@@ -70,7 +70,7 @@ class cronjob_ftplogfiles extends cronjob {
 		
 		function add_ftp_traffic(&$traffic_array, $parsed_line)
 		{		
-			if(is_array($traffic_array[$parsed_line['date']]) && array_key_exists($parsed_line['domain'], $traffic_array[$parsed_line['date']]))
+			if(isset($traffic_array[$parsed_line['date']]) && is_array($traffic_array[$parsed_line['date']]) && array_key_exists($parsed_line['domain'], $traffic_array[$parsed_line['date']]))
 			{
 				$traffic_array[$parsed_line['date']][$parsed_line['domain']][$parsed_line['direction']] += $parsed_line['size'];
 			}
@@ -89,13 +89,13 @@ class cronjob_ftplogfiles extends cronjob {
 			while($line = fgets($fp))
 			{
 				$parsed_line = parse_ftp_log($line);
+				if (!empty($parsed_line)) {
+					$sql = "SELECT wd.domain FROM ftp_user AS fu INNER JOIN web_domain AS wd ON fu.parent_domain_id = wd.domain_id WHERE fu.username = ? ";
+					$temp = $app->db->queryOneRecord($sql, $parsed_line['username'] );
+					$parsed_line['domain'] = $temp['domain'];
+					add_ftp_traffic($ftp_traffic, $parsed_line);
+				}
 
-				$sql = "SELECT wd.domain FROM ftp_user AS fu INNER JOIN web_domain AS wd ON fu.parent_domain_id = wd.domain_id WHERE fu.username = ? ";		
-				$temp = $app->db->queryOneRecord($sql, $parsed_line['username'] );
-
-				$parsed_line['domain'] = $temp['domain'];
-
-				add_ftp_traffic($ftp_traffic, $parsed_line);
 			}
 
 			fclose($fp);
-- 
GitLab


From 4a099343840dbab9ad929becf674fea2d047127a Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Mon, 26 Dec 2022 14:30:58 +0100
Subject: [PATCH 3/4] Fix loginc error, backup_download_dir was not initialized
 in time

Fround by: PHP Deprecated:  is_dir(): Passing null to parameter #1 ($filename) of type string is deprecated in /usr/local/ispconfig/server/lib/classes/backup.inc.php on line 1311
---
 server/lib/classes/backup.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/lib/classes/backup.inc.php b/server/lib/classes/backup.inc.php
index 46618e2278..57f264ec44 100644
--- a/server/lib/classes/backup.inc.php
+++ b/server/lib/classes/backup.inc.php
@@ -1305,13 +1305,13 @@ class backup
         foreach ($domains as $rec) {
             $domain_id = $rec['domain_id'];
             $domain_backup_dir = $backup_dir . '/web' . $domain_id;
+            $web_path = $rec['document_root'];
+            $backup_download_dir = $web_path . '/backup';
 
             // Remove backupdir symlink and create as directory instead
             if (is_link($backup_download_dir) || !is_dir($backup_download_dir)) {
-                $web_path = $rec['document_root'];
                 $app->system->web_folder_protection($web_path, false);
 
-                $backup_download_dir = $web_path . '/backup';
                 if (is_link($backup_download_dir)) {
                     unlink($backup_download_dir);
                 }
-- 
GitLab


From 27fea5f289300e361a755f7526ce9540ede57fbc Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Fri, 27 Jan 2023 22:32:51 +0100
Subject: [PATCH 4/4] Avoid Deprecation warning

PHP Deprecated:  substr(): Passing null to parameter #1 ($string) of type string is deprecated in /usr/local/ispconfig/server/plugins-available/bind_plugin.inc.php on line 397
---
 server/plugins-available/bind_plugin.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/plugins-available/bind_plugin.inc.php b/server/plugins-available/bind_plugin.inc.php
index 643f34e618..15fe062648 100644
--- a/server/plugins-available/bind_plugin.inc.php
+++ b/server/plugins-available/bind_plugin.inc.php
@@ -393,7 +393,7 @@ class bind_plugin {
 		//}
 
 		//* Delete old domain file, if domain name has been changed
-		if($data['old']['origin'] != $data['new']['origin']) {
+		if(!empty($data['old']['origin']) && $data['old']['origin'] != $data['new']['origin']) {
 			$filename = $dns_config['bind_zonefiles_dir'].'/' . $this->zone_file_prefix() . str_replace("/", "_", substr($data['old']['origin'], 0, -1));
 
 			if(is_file($filename)) unlink($filename);
-- 
GitLab