interface/lib/lang/hr.lng

@@ -180,4 +180,8 @@ $wb['datalog_status_d_client'] = 'Delete client';
 $wb['datalog_status_i_domain'] = 'Create new domain';
 $wb['datalog_status_u_domain'] = 'Update domain';
 $wb['datalog_status_d_domain'] = 'Delete domain';
+$wb['datalog_status_d_web_backup'] = 'Delete website backup';
+$wb['datalog_status_i_dns_template'] = 'Create DNS template';
+$wb['datalog_status_u_dns_template'] = 'Update DNS template';
+$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
 ?>

interface/lib/lang/hu.lng

@@ -180,4 +180,8 @@ $wb['datalog_status_d_client'] = 'Delete client';
 $wb['datalog_status_i_domain'] = 'Create new domain';
 $wb['datalog_status_u_domain'] = 'Update domain';
 $wb['datalog_status_d_domain'] = 'Delete domain';
+$wb['datalog_status_d_web_backup'] = 'Delete website backup';
+$wb['datalog_status_i_dns_template'] = 'Create DNS template';
+$wb['datalog_status_u_dns_template'] = 'Update DNS template';
+$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
 ?>

interface/lib/lang/id.lng

@@ -180,4 +180,8 @@ $wb['datalog_status_d_client'] = 'Delete client';
 $wb['datalog_status_i_domain'] = 'Create new domain';
 $wb['datalog_status_u_domain'] = 'Update domain';
 $wb['datalog_status_d_domain'] = 'Delete domain';
+$wb['datalog_status_d_web_backup'] = 'Delete website backup';
+$wb['datalog_status_i_dns_template'] = 'Create DNS template';
+$wb['datalog_status_u_dns_template'] = 'Update DNS template';
+$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
 ?>

interface/lib/lang/it.lng

@@ -180,4 +180,8 @@ $wb['datalog_status_d_client'] = 'Delete client';
 $wb['datalog_status_i_domain'] = 'Create new domain';
 $wb['datalog_status_u_domain'] = 'Update domain';
 $wb['datalog_status_d_domain'] = 'Delete domain';
+$wb['datalog_status_d_web_backup'] = 'Delete website backup';
+$wb['datalog_status_i_dns_template'] = 'Create DNS template';
+$wb['datalog_status_u_dns_template'] = 'Update DNS template';
+$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
 ?>

interface/lib/lang/ja.lng

@@ -180,4 +180,8 @@ $wb['datalog_status_d_client'] = 'Delete client';
 $wb['datalog_status_i_domain'] = 'Create new domain';
 $wb['datalog_status_u_domain'] = 'Update domain';
 $wb['datalog_status_d_domain'] = 'Delete domain';
+$wb['datalog_status_d_web_backup'] = 'Delete website backup';
+$wb['datalog_status_i_dns_template'] = 'Create DNS template';
+$wb['datalog_status_u_dns_template'] = 'Update DNS template';
+$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
 ?>

interface/lib/lang/nl.lng

@@ -180,4 +180,8 @@ $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be
 $wb['datalog_changes_close_txt'] = 'Sluiten';
 $wb['non_admin_error'] = 'Requires administrator level permissions';
 $wb['copy_to_clipboard_txt'] = 'Kopieer naar klembord';
+$wb['datalog_status_d_web_backup'] = 'Delete website backup';
+$wb['datalog_status_i_dns_template'] = 'Create DNS template';
+$wb['datalog_status_u_dns_template'] = 'Update DNS template';
+$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
 ?>

interface/lib/lang/pl.lng

@@ -180,4 +180,8 @@ $wb['datalog_status_d_client'] = 'Delete client';
 $wb['datalog_status_i_domain'] = 'Create new domain';
 $wb['datalog_status_u_domain'] = 'Update domain';
 $wb['datalog_status_d_domain'] = 'Delete domain';
+$wb['datalog_status_d_web_backup'] = 'Delete website backup';
+$wb['datalog_status_i_dns_template'] = 'Create DNS template';
+$wb['datalog_status_u_dns_template'] = 'Update DNS template';
+$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
 ?>

interface/lib/lang/pt.lng

@@ -180,4 +180,8 @@ $wb['datalog_status_d_client'] = 'Delete client';
 $wb['datalog_status_i_domain'] = 'Create new domain';
 $wb['datalog_status_u_domain'] = 'Update domain';
 $wb['datalog_status_d_domain'] = 'Delete domain';
+$wb['datalog_status_d_web_backup'] = 'Delete website backup';
+$wb['datalog_status_i_dns_template'] = 'Create DNS template';
+$wb['datalog_status_u_dns_template'] = 'Update DNS template';
+$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
 ?>

interface/lib/lang/ro.lng

@@ -180,4 +180,8 @@ $wb['datalog_status_d_client'] = 'Delete client';
 $wb['datalog_status_i_domain'] = 'Create new domain';
 $wb['datalog_status_u_domain'] = 'Update domain';
 $wb['datalog_status_d_domain'] = 'Delete domain';
+$wb['datalog_status_d_web_backup'] = 'Delete website backup';
+$wb['datalog_status_i_dns_template'] = 'Create DNS template';
+$wb['datalog_status_u_dns_template'] = 'Update DNS template';
+$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
 ?>

interface/lib/lang/ru.lng

@@ -180,4 +180,8 @@ $wb['datalog_status_d_client'] = 'Delete client';
 $wb['datalog_status_i_domain'] = 'Create new domain';
 $wb['datalog_status_u_domain'] = 'Update domain';
 $wb['datalog_status_d_domain'] = 'Delete domain';
+$wb['datalog_status_d_web_backup'] = 'Delete website backup';
+$wb['datalog_status_i_dns_template'] = 'Create DNS template';
+$wb['datalog_status_u_dns_template'] = 'Update DNS template';
+$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
 ?>

interface/lib/lang/se.lng

@@ -180,4 +180,8 @@ $wb['datalog_status_d_client'] = 'Delete client';
 $wb['datalog_status_i_domain'] = 'Create new domain';
 $wb['datalog_status_u_domain'] = 'Update domain';
 $wb['datalog_status_d_domain'] = 'Delete domain';
+$wb['datalog_status_d_web_backup'] = 'Delete website backup';
+$wb['datalog_status_i_dns_template'] = 'Create DNS template';
+$wb['datalog_status_u_dns_template'] = 'Update DNS template';
+$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
 ?>

interface/lib/lang/sk.lng

@@ -180,4 +180,8 @@ $wb['datalog_status_d_client'] = 'Delete client';
 $wb['datalog_status_i_domain'] = 'Create new domain';
 $wb['datalog_status_u_domain'] = 'Update domain';
 $wb['datalog_status_d_domain'] = 'Delete domain';
+$wb['datalog_status_d_web_backup'] = 'Delete website backup';
+$wb['datalog_status_i_dns_template'] = 'Create DNS template';
+$wb['datalog_status_u_dns_template'] = 'Update DNS template';
+$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
 ?>

interface/lib/lang/tr.lng

@@ -181,4 +181,8 @@ $wb['datalog_status_d_client'] = 'Delete client';
 $wb['datalog_status_i_domain'] = 'Create new domain';
 $wb['datalog_status_u_domain'] = 'Update domain';
 $wb['datalog_status_d_domain'] = 'Delete domain';
+$wb['datalog_status_d_web_backup'] = 'Delete website backup';
+$wb['datalog_status_i_dns_template'] = 'Create DNS template';
+$wb['datalog_status_u_dns_template'] = 'Update DNS template';
+$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
 ?>

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

@@ -487,6 +487,18 @@ $form["tabs"]['dns'] = array (
 			'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 @@
 	</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/client/domain_edit.php

@@ -130,6 +130,13 @@ class page_action extends tform_actions {
 
 		$app->tpl->setVar($wb);
 
+		$csrf_token = $app->auth->csrf_token_get('_domain_del');
+		$app->tpl->setVar('_csrf_id', $csrf_token['csrf_id']);
+		$app->tpl->setVar('_csrf_key', $csrf_token['csrf_key']);
+
+		$global_config = $app->getconf->get_global_config();
+		$app->tpl->setVar('show_delete_on_forms', $global_config['misc']['show_delete_on_forms']);
+
 		parent::onShowEnd();
 	}
 

interface/web/client/form/domain.tform.php

@@ -107,7 +107,8 @@ $form["tabs"]['domain'] = array (
 			'default' => '',
 			'value'  => '',
 			'width'  => '30',
-			'maxlength' => '255'
+			'maxlength' => '255',
+			'searchable' => 1,
 		),
 		//#################################
 		// END Datatable fields

interface/web/client/lib/lang/ar_domain.lng

@@ -3,4 +3,5 @@ $wb['domain_error_empty'] = 'The domain-name is empty';
 $wb['domain_error_unique'] = 'The domain already exists';
 $wb['domain_error_regex'] = 'This domain-name is not allowed';
 $wb['Domain'] = 'Domain';
+$wb['domain_txt'] = 'Domain';
 ?>

interface/web/client/lib/lang/bg_domain.lng

@@ -3,4 +3,5 @@ $wb['domain_error_empty'] = 'Името на домейна е празно';
 $wb['domain_error_unique'] = 'Домейна съществува';
 $wb['domain_error_regex'] = 'Това име на домейн не е разрешен.';
 $wb['Domain'] = 'Домейн';
+$wb['domain_txt'] = 'Domain';
 ?>