Commit 81ad2131 authored by Till Brehm's avatar Till Brehm
Browse files

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

fix checkDomainModuleDomain call on dns zone imports #6345

Closes #6345

See merge request !1695
parents 969a78d0 1955d826
Pipeline #13060 passed with stage
in 12 seconds
......@@ -622,7 +622,11 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name'
$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'];
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment