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

@@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $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';
 ?>

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

@@ -342,3 +342,5 @@ $wb['tooltip_jailkit_hardlinks_txt'] = 'Using hardlinks is insecure, but saves d
 $wb['jailkit_hardlinks_allow_txt'] = 'Allow hardlinks within the jail';
 $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files';
 $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible';
+$wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete';
+$wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.';

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

@@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $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';
 ?>

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

@@ -342,3 +342,5 @@ $wb['tooltip_jailkit_hardlinks_txt'] = 'Using hardlinks is insecure, but saves d
 $wb['jailkit_hardlinks_allow_txt'] = 'Allow hardlinks within the jail';
 $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files';
 $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible';
+$wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete';
+$wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.';

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

@@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $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';
 ?>

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

@@ -342,3 +342,5 @@ $wb['tooltip_jailkit_hardlinks_txt'] = 'Using hardlinks is insecure, but saves d
 $wb['jailkit_hardlinks_allow_txt'] = 'Allow hardlinks within the jail';
 $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files';
 $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible';
+$wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete';
+$wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.';

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

@@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $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';
 ?>

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

@@ -342,3 +342,5 @@ $wb['tooltip_jailkit_hardlinks_txt'] = 'Using hardlinks is insecure, but saves d
 $wb['jailkit_hardlinks_allow_txt'] = 'Allow hardlinks within the jail';
 $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files';
 $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible';
+$wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete';
+$wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.';

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

@@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $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';
 ?>

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

@@ -339,3 +339,5 @@ $wb['tooltip_jailkit_hardlinks_txt'] = 'Using hardlinks is insecure, but saves d
 $wb['jailkit_hardlinks_allow_txt'] = 'Allow hardlinks within the jail';
 $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files';
 $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible';
+$wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete';
+$wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.';

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

@@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $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';
 ?>

interface/web/admin/templates/server_config_dns_edit.htm

@@ -11,6 +11,9 @@
             <div class="form-group">
                 <label for="bind_zonefiles_dir" class="col-sm-3 control-label">{tmpl_var name='bind_zonefiles_dir_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="bind_zonefiles_dir" id="bind_zonefiles_dir" value="{tmpl_var name='bind_zonefiles_dir'}" class="form-control" /></div></div>
+            <div class="form-group">
+                <label for="bind_keyfiles_dir" class="col-sm-3 control-label">{tmpl_var name='bind_keyfiles_dir_txt'}</label>
+                <div class="col-sm-9"><input type="text" name="bind_keyfiles_dir" id="bind_keyfiles_dir" value="{tmpl_var name='bind_keyfiles_dir'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="named_conf_path" class="col-sm-3 control-label">{tmpl_var name='named_conf_path_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="named_conf_path" id="named_conf_path" value="{tmpl_var name='named_conf_path'}" class="form-control" /></div></div>

interface/web/admin/templates/server_config_mail_edit.htm

@@ -140,6 +140,12 @@
                     <a data-toggle="tooltip" title="{tmpl_var name='tooltip_stress_adaptive_txt'}">{tmpl_var name="stress_adaptive"}</a>
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">{tmpl_var name='mailbox_soft_delete_txt'}</label>
+                <div class="col-sm-9">
+                    {tmpl_var name='mailbox_soft_delete'}&nbsp;{tmpl_var name='mailbox_soft_delete_info_txt'}
+                </div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='mailbox_quota_stats_txt'}</label>
                 <div class="col-sm-9">

interface/web/admin/templates/system_config_sites_edit.htm

@@ -96,14 +96,19 @@
                 <label for="default_remote_dbserver" class="col-sm-3 control-label">{tmpl_var name='default_remote_dbserver_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="default_remote_dbserver" id="default_remote_dbserver" value="{tmpl_var name='default_remote_dbserver'}" class="form-control" /></div>
 	    </div>
-      <div class="form-group">
-        <label for="ssh_authentication" class="col-sm-3 control-label">{tmpl_var name='ssh_authentication_txt'}</label>
-        <div class="col-sm-9"><select name="ssh_authentication" id="ssh_authentication" class="form-control">
-          {tmpl_var name='ssh_authentication'}
-          </select>
+        <div class="form-group">
+            <label for="ssh_authentication" class="col-sm-3 control-label">{tmpl_var name='ssh_authentication_txt'}</label>
+            <div class="col-sm-9"><select name="ssh_authentication" id="ssh_authentication" class="form-control">
+                {tmpl_var name='ssh_authentication'}
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">{tmpl_var name='le_caa_autocreate_options_txt'}</label>
+            <div class="col-sm-9">
+                {tmpl_var name='le_caa_autocreate_options'}
+            </div>
         </div>
-      </div>
-
 
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
 

interface/web/client/client_del.php

@@ -62,12 +62,12 @@ class page_action extends tform_actions {
 		'ftp_user' => 'username', 
 		'mail_access' => 'source', 
 		'mail_content_filter' => '', 
-		'mail_domain' => 'domain', 
 		'mail_forwarding' => '', 
 		'mail_get' => '', 
 		'mail_mailinglist' => 'listname',
 		'mail_user' => 'email', 
 		'mail_user_filter' => '', 
+		'mail_domain' => 'domain',
 		'shell_user' => 'username', 
 		'spamfilter_users' => '',
 		'spamfilter_wblist' => '',
@@ -76,6 +76,7 @@ class page_action extends tform_actions {
 		'web_folder' => 'path', 
 		'web_folder_user' => 'username', 
 		'web_database_user' => 'database_user', 
+		'web_database' => 'database_name',
 	);
 
 	function onDelete() {
@@ -110,6 +111,11 @@ class page_action extends tform_actions {
 			$table_list = array();
 			$client_group_id = $app->functions->intval($client_group['groupid']);
 			if($client_group_id > 1) {
+
+				$client = $app->db->queryOneRecord("SELECT CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), IF(client.contact_firstname != '', CONCAT(client.contact_firstname, ' '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
+
+				$app->tpl->setVar('contactname', $client['contactname']);
+
 				foreach($this->tables as $table => $field) {
 					if($table != '') {
 						$records = $app->db->queryAllRecords("SELECT * FROM ?? WHERE sys_groupid = ?", $table, $client_group_id);
@@ -151,6 +157,8 @@ class page_action extends tform_actions {
 	function onBeforeDelete() {
 		global $app, $conf;
 
+		// DUPLICATE CODE IN interface/lib/classes/remote.d/client.inc.php
+
 		$client_id = $app->functions->intval($this->dataRecord['client_id']);
 
 		if($client_id > 0) {

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

@@ -318,7 +318,7 @@ $form["tabs"]['address'] = array (
 		'country' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'SELECT',
-			'default' => (isset($conf['language']) ? strtoupper($conf['language']) : ''),
+                       'default' => (isset($conf['default_country'])) ? strtoupper($conf['default_country']) : ((isset($conf['language'])) ? strtoupper($conf['language']) : ''),
 			'datasource' => array (  'type'          => 'SQL',
 				'querystring'   => 'SELECT iso,printable_name FROM country ORDER BY printable_name ASC',
 				'keyfield'      => 'iso',

interface/web/client/templates/client_del.htm

-<div class='page-header'><h1><tmpl_var name="list_head_txt"></h1></div>
+<div class='page-header'><h1><tmpl_var name="list_head_txt"> <tmpl_var name="contactname"></h1></div>
 <tmpl_if name='number_records'>
 	<tmpl_var name="delete_explanation">:<br /><br />
 	<div class="table-wrapper marginTop15">

interface/web/dashboard/lib/lang/de_dashlet_limits.lng

@@ -27,8 +27,8 @@ $wb['limit_client_txt'] = 'Anzahl der Kunden';
 $wb['limit_database_txt'] = 'Anzahl der Datenbanken';
 $wb['limit_mailmailinglist_txt'] = 'Anzahl der Mailinglisten';
 $wb['limit_domain_txt'] = 'Anzahl der Domains';
-$wb['limit_mailquota_txt'] = 'Assigned mailbox quota';
-$wb['limit_web_quota_txt'] = 'Assigned web quota';
-$wb['limit_database_quota_txt'] = 'Assigned database quota';
-$wb['limit_mail_wblist_txt'] = 'Number of email white / blacklist entries';
-?>
+$wb['limit_mailquota_txt'] = 'Zugewiesenes Postfach-Speicherkontingent';
+$wb['limit_web_quota_txt'] = 'Zugewiesenes Webspace-Speicherkontingent';
+$wb['limit_database_quota_txt'] = 'Zugewiesenes Datenbank-Speicherkontingent';
+$wb['limit_mail_wblist_txt'] = 'Anzahl der Email white / blacklist Einträge';
+

interface/web/dns/form/dns_txt.tform.php

@@ -170,7 +170,7 @@ $form["tabs"]['dns'] = array (
 	)
 );
 
-if($_SESSION["s"]["user"]["typ"] == 'admin') {
+if($app->auth->is_admin()) {
 	unset($form["tabs"]['dns']['fields']['data']['validators']);
 	$form["tabs"]['dns']['fields']['data']['validators'][0]['type'] = 'NOTEMPTY';
 	$form["tabs"]['dns']['fields']['data']['validators'][0]['errmsg'] = 'data_error_empty';

interface/web/dns/templates/dns_spf_edit.htm

@@ -53,7 +53,9 @@
             
         <div class="clear"><div class="right">
             <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="dns/dns_spf_edit.php">{tmpl_var name='btn_save_txt'}</button>
+            <tmpl_if name="is_admin">
             <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_edit_as_txt_record_txt'}" data-load-content="dns/dns_txt_edit.php?id={tmpl_var name='id'}&zone={tmpl_var name='zone'}&edit_raw=1">{tmpl_var name='btn_edit_as_txt_record_txt'}</button>
+            </tmpl_if>
             <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}&next_tab=dns_records">{tmpl_var name='btn_cancel_txt'}</button>
         </div></div>