interface/lib/lang/fr.lng

@@ -174,4 +174,18 @@ $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be
 $wb['datalog_changes_close_txt'] = 'Close';
 $wb['non_admin_error'] = 'Requires administrator level permissions';
 $wb['copy_to_clipboard_txt'] = 'Copy to clipboard';
+$wb['datalog_status_i_client'] = 'Create new client';
+$wb['datalog_status_u_client'] = 'Update client';
+$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';
+$wb['datalog_status_i_sys_group'] = 'Create new client group';
+$wb['datalog_status_u_sys_ini'] = 'Update main config';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>

interface/lib/lang/hr.lng

@@ -174,4 +174,18 @@ $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be
 $wb['datalog_changes_close_txt'] = 'Close';
 $wb['non_admin_error'] = 'Requires administrator level permissions';
 $wb['copy_to_clipboard_txt'] = 'Copy to clipboard';
+$wb['datalog_status_i_client'] = 'Create new client';
+$wb['datalog_status_u_client'] = 'Update client';
+$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';
+$wb['datalog_status_i_sys_group'] = 'Create new client group';
+$wb['datalog_status_u_sys_ini'] = 'Update main config';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>

interface/lib/lang/hu.lng

@@ -174,4 +174,18 @@ $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be
 $wb['datalog_changes_close_txt'] = 'Close';
 $wb['non_admin_error'] = 'Requires administrator level permissions';
 $wb['copy_to_clipboard_txt'] = 'Copy to clipboard';
+$wb['datalog_status_i_client'] = 'Create new client';
+$wb['datalog_status_u_client'] = 'Update client';
+$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';
+$wb['datalog_status_i_sys_group'] = 'Create new client group';
+$wb['datalog_status_u_sys_ini'] = 'Update main config';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>

interface/lib/lang/id.lng

@@ -174,4 +174,18 @@ $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be
 $wb['datalog_changes_close_txt'] = 'Close';
 $wb['non_admin_error'] = 'Requires administrator level permissions';
 $wb['copy_to_clipboard_txt'] = 'Copy to clipboard';
+$wb['datalog_status_i_client'] = 'Create new client';
+$wb['datalog_status_u_client'] = 'Update client';
+$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';
+$wb['datalog_status_i_sys_group'] = 'Create new client group';
+$wb['datalog_status_u_sys_ini'] = 'Update main config';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>

interface/lib/lang/it.lng

@@ -174,4 +174,18 @@ $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be
 $wb['datalog_changes_close_txt'] = 'Chiudi';
 $wb['non_admin_error'] = 'Requires administrator level permissions';
 $wb['copy_to_clipboard_txt'] = 'Copy to clipboard';
+$wb['datalog_status_i_client'] = 'Create new client';
+$wb['datalog_status_u_client'] = 'Update client';
+$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';
+$wb['datalog_status_i_sys_group'] = 'Create new client group';
+$wb['datalog_status_u_sys_ini'] = 'Update main config';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>

interface/lib/lang/ja.lng

@@ -174,4 +174,18 @@ $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be
 $wb['datalog_changes_close_txt'] = 'Close';
 $wb['non_admin_error'] = 'Requires administrator level permissions';
 $wb['copy_to_clipboard_txt'] = 'Copy to clipboard';
+$wb['datalog_status_i_client'] = 'Create new client';
+$wb['datalog_status_u_client'] = 'Update client';
+$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';
+$wb['datalog_status_i_sys_group'] = 'Create new client group';
+$wb['datalog_status_u_sys_ini'] = 'Update main config';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>

interface/lib/lang/nl.lng

@@ -163,15 +163,29 @@ $wb['security_check2_txt'] = 'failed.';
 $wb['err_csrf_attempt_blocked'] = 'CSRF attempt blocked.';
 $wb['select_directive_snippet_txt'] = 'Directive Snippets';
 $wb['select_master_directive_snippet_txt'] = 'Master Directive Snippets';
-$wb['datalog_status_i_xmpp_domain'] = 'Create XMPP domain';
-$wb['datalog_status_u_xmpp_domain'] = 'Update XMPP domain';
-$wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
-$wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
-$wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
-$wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['datalog_status_i_xmpp_domain'] = 'Aanmaken XMPP domain';
+$wb['datalog_status_u_xmpp_domain'] = 'Bijwerken XMPP domain';
+$wb['datalog_status_d_xmpp_domain'] = 'Verwijderen XMPP domain';
+$wb['datalog_status_i_xmpp_user'] = 'Aanmaken XMPP user';
+$wb['datalog_status_u_xmpp_user'] = 'Bijwerken XMPP user';
+$wb['datalog_status_d_xmpp_user'] = 'Verwijderen XMPP user';
+$wb['datalog_status_i_client'] = 'Aanmaken client';
+$wb['datalog_status_u_client'] = 'Bijwerken client';
+$wb['datalog_status_d_client'] = 'Verwijderen client';
+$wb['datalog_status_i_domain'] = 'Aanmaken domain';
+$wb['datalog_status_u_domain'] = 'Bijwerken domain';
+$wb['datalog_status_d_domain'] = 'Verwijderen domain';
 $wb['unlimited_txt'] = 'Ongelimiteerd';
 $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.';
 $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';
+$wb['datalog_status_i_sys_group'] = 'Create new client group';
+$wb['datalog_status_u_sys_ini'] = 'Update main config';
+$wb['last_accessed_txt'] = 'Laatst gebruikt';
+$wb['never_accessed_txt'] = 'Niet of onbekend';
 ?>

interface/lib/lang/pl.lng

@@ -174,4 +174,18 @@ $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be
 $wb['datalog_changes_close_txt'] = 'Close';
 $wb['non_admin_error'] = 'Requires administrator level permissions';
 $wb['copy_to_clipboard_txt'] = 'Copy to clipboard';
+$wb['datalog_status_i_client'] = 'Create new client';
+$wb['datalog_status_u_client'] = 'Update client';
+$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';
+$wb['datalog_status_i_sys_group'] = 'Create new client group';
+$wb['datalog_status_u_sys_ini'] = 'Update main config';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>

interface/lib/lang/pt.lng

@@ -174,4 +174,18 @@ $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be
 $wb['datalog_changes_close_txt'] = 'Close';
 $wb['non_admin_error'] = 'Requires administrator level permissions';
 $wb['copy_to_clipboard_txt'] = 'Copy to clipboard';
+$wb['datalog_status_i_client'] = 'Create new client';
+$wb['datalog_status_u_client'] = 'Update client';
+$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';
+$wb['datalog_status_i_sys_group'] = 'Create new client group';
+$wb['datalog_status_u_sys_ini'] = 'Update main config';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>

interface/lib/lang/ro.lng

@@ -174,4 +174,18 @@ $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be
 $wb['datalog_changes_close_txt'] = 'Close';
 $wb['non_admin_error'] = 'Requires administrator level permissions';
 $wb['copy_to_clipboard_txt'] = 'Copy to clipboard';
+$wb['datalog_status_i_client'] = 'Create new client';
+$wb['datalog_status_u_client'] = 'Update client';
+$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';
+$wb['datalog_status_i_sys_group'] = 'Create new client group';
+$wb['datalog_status_u_sys_ini'] = 'Update main config';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>

interface/lib/lang/ru.lng

@@ -174,4 +174,18 @@ $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be
 $wb['datalog_changes_close_txt'] = 'Close';
 $wb['non_admin_error'] = 'Requires administrator level permissions';
 $wb['copy_to_clipboard_txt'] = 'Copy to clipboard';
+$wb['datalog_status_i_client'] = 'Create new client';
+$wb['datalog_status_u_client'] = 'Update client';
+$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';
+$wb['datalog_status_i_sys_group'] = 'Create new client group';
+$wb['datalog_status_u_sys_ini'] = 'Update main config';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>

interface/lib/lang/se.lng

@@ -174,4 +174,18 @@ $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be
 $wb['datalog_changes_close_txt'] = 'Close';
 $wb['non_admin_error'] = 'Requires administrator level permissions';
 $wb['copy_to_clipboard_txt'] = 'Copy to clipboard';
+$wb['datalog_status_i_client'] = 'Create new client';
+$wb['datalog_status_u_client'] = 'Update client';
+$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';
+$wb['datalog_status_i_sys_group'] = 'Create new client group';
+$wb['datalog_status_u_sys_ini'] = 'Update main config';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>

interface/lib/lang/sk.lng

@@ -174,4 +174,18 @@ $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be
 $wb['datalog_changes_close_txt'] = 'Close';
 $wb['non_admin_error'] = 'Requires administrator level permissions';
 $wb['copy_to_clipboard_txt'] = 'Copy to clipboard';
+$wb['datalog_status_i_client'] = 'Create new client';
+$wb['datalog_status_u_client'] = 'Update client';
+$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';
+$wb['datalog_status_i_sys_group'] = 'Create new client group';
+$wb['datalog_status_u_sys_ini'] = 'Update main config';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>

interface/lib/lang/tr.lng

@@ -175,4 +175,18 @@ $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be
 $wb['datalog_changes_close_txt'] = 'Close';
 $wb['non_admin_error'] = 'Requires administrator level permissions';
 $wb['copy_to_clipboard_txt'] = 'Copy to clipboard';
+$wb['datalog_status_i_client'] = 'Create new client';
+$wb['datalog_status_u_client'] = 'Update client';
+$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';
+$wb['datalog_status_i_sys_group'] = 'Create new client group';
+$wb['datalog_status_u_sys_ini'] = 'Update main config';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>

interface/lib/plugins/mail_mail_domain_plugin.inc.php

@@ -60,7 +60,7 @@ class mail_mail_domain_plugin {
 		}
 
 		//** If the domain name or owner has been changed, change the domain and owner in all mailbox records
-		if($page_form->oldDataRecord && ($page_form->oldDataRecord['domain'] != $domain ||
+		if($page_form->oldDataRecord && !empty($page_form->oldDataRecord['domain']) && ($page_form->oldDataRecord['domain'] != $domain ||
 				(isset($page_form->dataRecord['client_group_id']) && $page_form->oldDataRecord['sys_groupid'] != $page_form->dataRecord['client_group_id']))) {
 			$app->uses('getconf');
 			$mail_config = $app->getconf->get_server_config($page_form->dataRecord["server_id"], 'mail');
@@ -255,7 +255,7 @@ class mail_mail_domain_plugin {
 			// If domain changes, update spamfilter_users
 			// and fire spamfilter_wblist_update events so rspamd files are rewritten
 			if ($old_domain != $domain) {
-				$tmp_users = $app->db->queryOneRecord("SELECT id,fullname FROM spamfilter_users WHERE email LIKE ?", '%@' . $old_domain);
+				$tmp_users = $app->db->queryAllRecords("SELECT id,fullname FROM spamfilter_users WHERE email LIKE ?", '%@' . $old_domain);
 				if(is_array($tmp_users)) {
 					foreach ($tmp_users as $tmp_old) {
 						$tmp_new = $app->db->queryOneRecord("SELECT id,fullname FROM spamfilter_users WHERE email = ?", '@' . $domain);

interface/lib/plugins/system_config_dns_ca_plugin.inc.php

@@ -79,7 +79,7 @@ class system_config_dns_ca_plugin {
 				if(is_array($caa) && is_array($soa)) {
 					$records = array();
 					$records[] = $domain.'.';;
-					if($subdomain != '' && $subdomain != 'www') $records[] = $subdomain.'.'.$domain;
+					if($subdomain != '' && $subdomain != 'www' && $subdomain != 'none') $records[] = $subdomain.'.'.$domain;
 					foreach($records as $record) {
 						$new_rr = $app->db->queryOneRecord("SELECT * FROM dns_rr WHERE name = ?", $soa['origin']);
 						unset($new_rr['id']);

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

@@ -321,6 +321,20 @@ $form["tabs"]['server'] = array(
 			'default' => 'y',
 			'value' => array(0 => 'n', 1 => 'y')
 		),
+		'sysbackup_copies' => array(
+			'datatype' => 'VARCHAR',
+			'formtype' => 'TEXT',
+			'default' => '3',
+			'validators' => array(	0 => array('type' => 'NOTEMPTY',
+										'errmsg' => 'sysbackup_copies_error_empty'),
+									1 => array ( 	'type' => 'REGEX',
+										'regex' => "/^[0-9]{1,3}$/",
+										'errmsg'=> 'sysbackup_copies_error_regex'),
+			),
+			'value' => '',
+			'width' => '40',
+			'maxlength' => '255'
+		),
 		'monit_url' => array(
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
@@ -560,15 +574,6 @@ $form["tabs"]['mail'] = array(
 			'default' => '2048',
 			'value' => array('1024' => 'weak (1024)', '2048' => 'normal (2048)', '4096' => 'strong (4096)')
 		),
-        'relayhost_password' => array(
-            'datatype' => 'VARCHAR',
-            'formtype' => 'TEXT',
-            'default' => '',
-            'value' => '',
-            'width' => '40',
-            'maxlength' => '255'
-        ),
-
 		'pop3_imap_daemon' => array(
 			'datatype' => 'VARCHAR',
 			'formtype' => 'SELECT',
@@ -1074,6 +1079,16 @@ $form["tabs"]['web'] = array(
 			'default' => 'n',
 			'value' => array(0 => 'n', 1 => 'y')
 		),
+		'web_folder_permission' => array(
+			'datatype' => 'VARCHAR',
+			'formtype' => 'SELECT',
+			'default' => '0710',
+			'maxlength' => '4',
+			'value' => array('0710' => '0710', '0711' => '0711', '0750' => '0750', '0751' => '0751'),
+			'validators' => array(	0 => array ('type' => 'REGEX',
+										'regex' => '/^0[0-7]{3}$/',
+										'errmsg'=> 'incorrect_permissions_regex')),
+		),
 		'web_folder_protection' => array(
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
@@ -1618,6 +1633,49 @@ $form["tabs"]['web'] = array(
 			'width' => '40',
 			'maxlength' => '255'
 		),
+		'le_signature_type' => array(
+			'datatype' => 'VARCHAR',
+			'formtype' => 'SELECT',
+			'default' => 'ECDSA',
+			'value' => array('RSA' => 'RSA (RSA encryption with SHA-256)', 'ECDSA' => 'ECDSA (Elliptic Curve Digital Signature Algorithm)')
+		),
+		'le_delete_on_site_remove' => array(
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'y',
+			'value' => array(0 => 'n', 1 => 'y')
+		),
+		'le_auto_cleanup' => array(
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'y',
+			'value' => array(0 => 'n', 1 => 'y')
+		),
+		'le_auto_cleanup_denylist' => array(
+			'validators' => array(
+				array (
+					'type' => 'CUSTOM',
+					'class' => 'validate_domain',
+					'function' => 'domain_glob_list',
+					'allowempty' => 'y',
+					'exceptions' => array('[server_name]'),
+					'allow_exception_as_substring' => 'n',
+					'errmsg'=> 'le_auto_cleanup_denylist_error_custom'
+				),
+			),
+			'datatype' => 'VARCHAR',
+			'formtype' => 'TEXT',
+			'default' => '[server_name]',
+			'value' => '',
+			'width' => '40',
+			'maxlength' => '255'
+		),
+		'le_revoke_before_delete' => array(
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'y',
+			'value' => array(0 => 'n', 1 => 'y')
+		),
 		//#################################
 		// END Datatable fields
 		//#################################

interface/web/admin/language_edit.php

@@ -64,6 +64,7 @@ if(isset($_POST['records']) && is_array($_POST['records'])) {
 		$val = stripslashes($val);
 		$val = preg_replace('/(^|[^\\\\])((\\\\\\\\)*)"/', '$1$2\\"', $val);
 		$val = str_replace('$', '', $val);
+		if(!preg_match("/^[a-z0-9_]+$/", $key)) die('Invalid language file key.');
 		$file_content .= '$wb['."'$key'".'] = "'.$val.'";'."\n";
 		$msg = 'File saved.';
 	}