Merge branch '6637-zone-import-external-ns' into 'develop'

DNS import, add external NS as default, #6637

Closes #6637

See merge request ispconfig/ispconfig3!1845

Author: Till Brehm

interface/web/admin/form/system_config.tform.php

@@ -487,6 +487,18 @@
 			'value'  => '',
 			'name'  => 'default_slave_dnsserver'
 		),
+		'dns_external_slave_fqdn' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'TEXT',
+			'filters'   => array(
+					0 => array( 'event' => 'SAVE',
+					'type' => 'STRIPTAGS'),
+					1 => array( 'event' => 'SAVE',
+					'type' => 'STRIPNL')
+			),
+			'default' => '',
+			'value'  => ''
+		),
 		'dns_show_zoneexport' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',

interface/web/admin/lib/lang/en_system_config.lng

@@ -109,4 +109,5 @@ $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
 $wb['dns_show_zoneexport_txt'] = 'Show zone export.';
 $wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
 $wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
+$wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
 ?>

interface/web/admin/templates/system_config_dns_edit.htm

@@ -12,6 +12,13 @@ <h1><tmpl_var name="list_head_txt"></h1>
 	</select></div>
 </div>
 
+<div class="form-group">
+  <label class="col-sm-3 control-label">{tmpl_var name=dns_external_slave_server_txt'}</label>
+  <div class="col-sm-9">
+	<input type="text" name="dns_external_slave_fqdn" id="dns_external_slave_fqdn" value="{tmpl_var name='dns_external_slave_fqdn'}" size="" maxlength="" class="form-control" />
+  </div>
+</div>
+
 <div class="form-group">
   <label class="col-sm-3 control-label">{tmpl_var name=dns_show_zoneexport_txt'}</label>
   <div class="col-sm-9">

interface/web/dns/dns_import.php

@@ -64,6 +64,8 @@
 	$sys_groupid = $_SESSION["s"]["user"]["default_group"];
 }
 $domain = (isset($_POST['domain'])&&!empty($_POST['domain']))?$_POST['domain']:NULL;
+$settings = $app->getconf->get_global_config('dns');
+$external_slave_servers = $settings['dns_external_slave_fqdn'];
 
 // get the correct server_id
 if (isset($_POST['server_id'])) {
@@ -73,7 +75,6 @@
 	$server_id = $app->functions->intval($_POST['server_id_value']);
 	$post_server_id = true;
 } else {
-	$settings = $app->getconf->get_global_config('dns');
 	$server_id = $app->functions->intval($settings['default_dnsserver']);
 	$post_server_id = false;
 }
@@ -263,6 +264,13 @@ function fqdn_name( $owner, $origin ) {
 			$servers[$i]['server_name'] .= ".";
 		}
 	}
+	if (!empty($external_slave_servers)) {
+		$external_servers = preg_split('/[\s,]+/', $external_slave_servers);
+		foreach($external_servers as $e) {
+			$servers[]['server_name'] = rtrim($e, '.') . '.';
+		}
+	}
+
 	$lines = file($_FILES['file']['tmp_name']);
 
 	// Remove empty lines, comments, whitespace, tabs, etc.