Merge branch '6438-php81-deprecation' into 'develop'

Fix php 8.1 deprecation warnings

Closes #6438

See merge request ispconfig/ispconfig3!1682

Author: Till Brehm

install/lib/installer_base.lib.php

@@ -52,7 +52,7 @@ private function install_acme() {
 	}
 
 	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;
 

server/lib/classes/backup.inc.php

@@ -1305,13 +1305,13 @@ protected static function backups_garbage_collection($server_id, $backup_type =
         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);
                 }

server/lib/classes/cron.d/200-ftplogfiles.inc.php

@@ -70,7 +70,7 @@ function parse_ftp_log($line){
 
 		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 @@ function add_ftp_traffic(&$traffic_array, $parsed_line)
 			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);

server/plugins-available/bind_plugin.inc.php

@@ -393,7 +393,7 @@ function soa_update($event_name, $data) {
 		//}
 
 		//* 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);