Merge branch '6430-php8-unable-to-add-database-on-multiserver-setup-withs-eparate-db-server' into 'develop'

Till Brehm · Till Brehm · commit d53109aa289f · 2022-12-16T17:50:53.000Z
Resolve "PHP8: Unable to add database on multiserver setup withs eparate DB server"

Closes #6430

See merge request ispconfig/ispconfig3!1673
diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php
@@ -369,7 +369,7 @@ function onBeforeUpdate() {
 			} else {
 				$remote_ips = explode(",", $global_config['default_remote_dbserver']);
 			}
-			if (!in_array($server_config['ip_address'], $default_remote_db)) { $remote_ips[] = $server_config['ip_address']; }
+			if (!in_array($server_config['ip_address'], $remote_ips)) { $remote_ips[] = $server_config['ip_address']; }
 
 			if($server_config['ip_address']!='') {
 				if($this->dataRecord['remote_access'] != 'y'){
@@ -459,7 +459,7 @@ function onBeforeInsert() {
 				$remote_ips = explode(",", $global_config['default_remote_dbserver']);
 			}
 			
-			if (!in_array($server_config['ip_address'], $default_remote_db)) { $remote_ips[] = $server_config['ip_address']; }
+			if (!in_array($server_config['ip_address'], $remote_ips)) { $remote_ips[] = $server_config['ip_address']; }
 
 			if($server_config['ip_address']!='') {
 				if($this->dataRecord['remote_access'] != 'y'){

Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ function onBeforeUpdate() {`
`369`	`369`	`} else {`
`370`	`370`	`$remote_ips = explode(",", $global_config['default_remote_dbserver']);`
`371`	`371`	`}`
`372`		`- if (!in_array($server_config['ip_address'], $default_remote_db)) { $remote_ips[] = $server_config['ip_address']; }`
	`372`	`+ if (!in_array($server_config['ip_address'], $remote_ips)) { $remote_ips[] = $server_config['ip_address']; }`
`373`	`373`
`374`	`374`	`if($server_config['ip_address']!='') {`
`375`	`375`	`if($this->dataRecord['remote_access'] != 'y'){`
`@@ -459,7 +459,7 @@ function onBeforeInsert() {`
`459`	`459`	`$remote_ips = explode(",", $global_config['default_remote_dbserver']);`
`460`	`460`	`}`
`461`	`461`
`462`		`- if (!in_array($server_config['ip_address'], $default_remote_db)) { $remote_ips[] = $server_config['ip_address']; }`
	`462`	`+ if (!in_array($server_config['ip_address'], $remote_ips)) { $remote_ips[] = $server_config['ip_address']; }`
`463`	`463`
`464`	`464`	`if($server_config['ip_address']!='') {`
`465`	`465`	`if($this->dataRecord['remote_access'] != 'y'){`