Skip to content

Commit 1955d82

Browse files
author
Demian
committed
fix checkDomainModuleDomain call on dns zone imports #6345
before we handed over domain_name instead of domain_id to the checkDomainModuleDomain function, which resulted in nothing. This fixes the call by querying the database for the domain_id for the given domain_name.
1 parent 39bf4b2 commit 1955d82

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

interface/web/dns/dns_import.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,11 @@ function fqdn_name( $owner, $origin ) {
622622
$error[] = $wb['zone_file_soa_parser'];
623623
$error[] = print_r( $soa, true );
624624
}
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']) ) {
626630
$valid_zone_file = false;
627631
$error[] = $wb['zone_not_allowed'];
628632
}

0 commit comments

Comments
 (0)