Merge branch '6585-php-warning-undefined-array-key-ip-in-tmp-update_runner-sh-mqxkxglcyo-install-lib' into 'develop'

Till Brehm · Till Brehm · commit 769bf053ba66 · 2023-10-03T12:07:42.000Z
Resolve "PHP Warning:  Undefined array key "ip" in /tmp/update_runner.sh.MQXkxglcyo/install/lib/installer_base.lib.php on line 2995"

Closes #1813 and #6585

See merge request ispconfig/ispconfig3!1813
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -2988,15 +2988,15 @@ public function make_ispconfig_ssl_cert() {
 			$dnsa=dns_get_record($hostname, DNS_A);
 			if($dnsa) {
 				foreach ($dnsa as $rec) {
-					$dns_ips[] = $rec['ip'];
+					if(is_array($rec) && isset($rec['ip'])) $dns_ips[] = $rec['ip'];
 				}
 			}
 		}
 		if (checkdnsrr($hostname, 'AAAA')) {
 			$dnsaaaa=dns_get_record($hostname, DNS_AAAA);
 			if($dnsaaaa) {
 				foreach ($dnsaaaa as $rec) {
-					$dns_ips[] = $rec['ip'];
+					if(is_array($rec) && isset($rec['ip'])) $dns_ips[] = $rec['ip'];
 				}
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -2988,15 +2988,15 @@ public function make_ispconfig_ssl_cert() {`
`2988`	`2988`	`$dnsa=dns_get_record($hostname, DNS_A);`
`2989`	`2989`	`if($dnsa) {`
`2990`	`2990`	`foreach ($dnsa as $rec) {`
`2991`		`- $dns_ips[] = $rec['ip'];`
	`2991`	`+ if(is_array($rec) && isset($rec['ip'])) $dns_ips[] = $rec['ip'];`
`2992`	`2992`	`}`
`2993`	`2993`	`}`
`2994`	`2994`	`}`
`2995`	`2995`	`if (checkdnsrr($hostname, 'AAAA')) {`
`2996`	`2996`	`$dnsaaaa=dns_get_record($hostname, DNS_AAAA);`
`2997`	`2997`	`if($dnsaaaa) {`
`2998`	`2998`	`foreach ($dnsaaaa as $rec) {`
`2999`		`- $dns_ips[] = $rec['ip'];`
	`2999`	`+ if(is_array($rec) && isset($rec['ip'])) $dns_ips[] = $rec['ip'];`
`3000`	`3000`	`}`
`3001`	`3001`	`}`
`3002`	`3002`	`}`