Merge branch '6345-fix-dns-zone-import' into 'develop'

Till Brehm · Till Brehm · commit 81ad2131e7fe · 2023-03-06T17:57:08.000Z
fix checkDomainModuleDomain call on dns zone imports #6345

Closes #6345

See merge request ispconfig/ispconfig3!1695
diff --git a/interface/web/dns/dns_import.php b/interface/web/dns/dns_import.php
@@ -622,7 +622,11 @@ function fqdn_name( $owner, $origin ) {
 		$error[] = $wb['zone_file_soa_parser'];
 $error[] = print_r( $soa, true );
 	}
-	if ($settings['use_domain_module'] == 'y' && ! $app->tools_sites->checkDomainModuleDomain($soa['name']) ) {
+
+  $tmp_soa_name = trim($soa['name'], ".");
+  $tmp_domain_id = $app->db->queryOneRecord('SELECT domain_id FROM domain where domain = ?', $tmp_soa_name);
+
+	if ($settings['use_domain_module'] == 'y' && ! $app->tools_sites->checkDomainModuleDomain($tmp_domain_id['domain_id']) ) {
 		$valid_zone_file = false;
 		$error[] = $wb['zone_not_allowed'];
 	}

Original file line number	Diff line number	Diff line change
`@@ -622,7 +622,11 @@ function fqdn_name( $owner, $origin ) {`
`622`	`622`	`$error[] = $wb['zone_file_soa_parser'];`
`623`	`623`	`$error[] = print_r( $soa, true );`
`624`	`624`	`}`
`625`		`- if ($settings['use_domain_module'] == 'y' && ! $app->tools_sites->checkDomainModuleDomain($soa['name']) ) {`
	`625`	`+`
	`626`	`+ $tmp_soa_name = trim($soa['name'], ".");`
	`627`	`+ $tmp_domain_id = $app->db->queryOneRecord('SELECT domain_id FROM domain where domain = ?', $tmp_soa_name);`
	`628`	`+`
	`629`	`+ if ($settings['use_domain_module'] == 'y' && ! $app->tools_sites->checkDomainModuleDomain($tmp_domain_id['domain_id']) ) {`
`626`	`630`	`$valid_zone_file = false;`
`627`	`631`	`$error[] = $wb['zone_not_allowed'];`
`628`	`632`	`}`