Merge branch '6636-import-ignore-ns' into 'develop'

Add option to ignore NS records in zone import, #6636

Closes #6636

See merge request ispconfig/ispconfig3!1846

Author: Till Brehm

interface/web/dns/dns_import.php

@@ -79,6 +79,7 @@
 	$post_server_id = false;
 }
 
+$ignore_ns_records = (isset($_POST['ignore_ns_records']))?$app->functions->intval($_POST['ignore_ns_records']):0;
 
 // Load the templates
 $records = $app->db->queryAllRecords("SELECT * FROM dns_template WHERE visible = 'Y'");
@@ -332,7 +333,7 @@ function fqdn_name( $owner, $origin ) {
 	$owner = $name;
 	$r = 0;
 	$dns_rr = array();
-	$add_default_ns = TRUE;
+	$ns_record_included = FALSE;
 	$found_soa = FALSE;
 	foreach($lines as $line){
 
@@ -580,7 +581,12 @@ function fqdn_name( $owner, $origin ) {
 			$dns_rr[$r]['type'] = strtoupper($resource_type);
 
 			if($dns_rr[$r]['type'] == 'NS' && fqdn_name( $dns_rr[$r]['name'], $soa['name'] ) == $soa['name']){
-				$add_default_ns = FALSE;
+				if ($ignore_ns_records) {
+					unset($dns_rr[$r]);
+					continue;
+				} else {
+					$ns_record_included = TRUE;
+				}
 			}
 
 			$dns_rr[$r]['ttl'] = $app->functions->intval($dns_rr[$r]['ttl']);
@@ -611,7 +617,7 @@ function fqdn_name( $owner, $origin ) {
 		$i++;
 	}
 
-	if ( $add_default_ns ) {
+	if ( $ignore_ns_records || !$ns_record_included ) {
 		foreach ($servers as $server){
 			$dns_rr[$r]['name'] = $soa['name'];
 			$dns_rr[$r]['type'] = 'NS';

interface/web/dns/lib/lang/en_dns_import.lng

@@ -22,4 +22,5 @@ $wb['ignore_record_not_class_in'] = 'Ignoring DNS record, not class IN.';
 $wb['ignore_record_unknown_type'] = 'Ignoring DNS record, unknown type.';
 $wb['ignore_record_invalid_owner'] = 'Ignoring DNS record, not able to validate owner name.';
 $wb['zone_file_import_fail'] = 'The zone file did not import.';
+$wb['ignore_ns_records_txt'] = 'Ignore NS records';
 ?>

interface/web/dns/templates/dns_import.htm

@@ -46,6 +46,13 @@ <h1>
 			<div class="col-sm-9 col-text">
 				<tmpl_var name='domain_field_desc_txt' }</div>
 			</div>
+			<div class="form-group">
+			  <label class="col-sm-3 control-label">{tmpl_var name=ignore_ns_records_txt'}</label>
+			  <div class="col-sm-9">
+				<input type="checkbox" id="ignore_ns_records" value="1" checked name="ignore_ns_records" />
+			  </div>
+			</div>
+
 			<div class="form-group">
 				<label for="file" class="col-sm-3 control-label">{tmpl_var name='zonefile_to_import_txt'}</label>
 				<div class="col-sm-9 col-text"><input name="file" id="file" size="30" type="file" class="fileUpload" /></div>