From b4275af32a6d1e158fecdb2712fa9e82a8360be5 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Wed, 21 Jun 2023 15:31:59 +0200
Subject: [PATCH 1/4] Mark that the zone is managed, thus dkim can be auto
 added

---
 .../web/mail/lib/lang/en_mail_domain.lng      |  1 +
 interface/web/mail/mail_domain_edit.php       | 37 +++++++++++++------
 .../web/mail/templates/mail_domain_edit.htm   |  2 +-
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/interface/web/mail/lib/lang/en_mail_domain.lng b/interface/web/mail/lib/lang/en_mail_domain.lng
index 39e22f75b6..c27b674c85 100644
--- a/interface/web/mail/lib/lang/en_mail_domain.lng
+++ b/interface/web/mail/lib/lang/en_mail_domain.lng
@@ -20,6 +20,7 @@ $wb['no_policy'] = '- not enabled -';
 $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
+$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically';
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost User';
 $wb['relayhost_password_txt'] = 'Relayhost Password';
diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php
index f5697b4f1c..ab9fc88a65 100644
--- a/interface/web/mail/mail_domain_edit.php
+++ b/interface/web/mail/mail_domain_edit.php
@@ -259,6 +259,13 @@ class page_action extends tform_actions {
 		$app->tpl->setVar('dkim_public', $rec['dkim_public'], true);
 		if (!empty($rec['dkim_public'])) $app->tpl->setVar('dns_record', $dns_record, true);
 
+		if($this->id > 0) {
+			$soa = $this->find_soa_domain($this->dataRecord['domain']);
+			if ( !empty($soa) ) {
+				$app->tpl->setVar('dkim_auto_dns', $app->tform->lng('dkim_auto_dns_txt'), true);
+			}
+		}
+
 		$csrf_token = $app->auth->csrf_token_get('mail_domain_del');
 		$app->tpl->setVar('_csrf_id', $csrf_token['csrf_id']);
 		$app->tpl->setVar('_csrf_key', $csrf_token['csrf_key']);
@@ -372,12 +379,8 @@ class page_action extends tform_actions {
 
 		//* create dns-record with dkim-values if the zone exists
 		if ( $this->dataRecord['active'] == 'y' && $this->dataRecord['dkim'] == 'y' ) {
-			$soaDomain = $this->dataRecord['domain'].'.';
- 			while ((!isset($soa) && (substr_count($soaDomain,'.') > 1))) {
-				$soa = $app->db->queryOneRecord("SELECT id AS zone, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, server_id, ttl, serial FROM dns_soa WHERE active = 'Y' AND origin = ?", $soaDomain);
-				$soaDomain = preg_replace("/^[^\.]+\./","",$soaDomain);
-			}
-			if ( isset($soa) && !empty($soa) ) $this->update_dns($this->dataRecord, $soa);
+			$soa = $this->find_soa_domain($this->dataRecord['domain']);
+			if ( !empty($soa) ) $this->update_dns($this->dataRecord, $soa);
 		}
 
 	}
@@ -690,15 +693,11 @@ class page_action extends tform_actions {
 			$selector = @($this->dataRecord['dkim_selector'] != $this->oldDataRecord['dkim_selector']) ? true : false;
 			$dkim_private = @($this->dataRecord['dkim_private'] != $this->oldDataRecord['dkim_private']) ? true : false;
 
-			$soaDomain = $domain.'.';
-			while ((!isset($soa) && (substr_count($soaDomain,'.') > 1))) {
-				$soa = $app->db->queryOneRecord("SELECT id AS zone, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, server_id, ttl, serial FROM dns_soa WHERE active = 'Y' AND origin = ?", $soaDomain);
-				$soaDomain = preg_replace("/^[^\.]+\./","",$soaDomain);
-			}
+			$soa = $this->find_soa_domain($this->dataRecord['domain']);
 
 			if ( ($selector || $dkim_private || $dkim_active) && $dkim_active )
 				//* create a new record only if the dns-zone exists
-				if ( isset($soa) && !empty($soa) ) {
+				if ( !empty($soa) ) {
 					$this->update_dns($this->dataRecord, $soa);
 				}
 			if (! $dkim_active) {
@@ -718,6 +717,20 @@ class page_action extends tform_actions {
 
 	}
 
+	/**
+	 * Lookup if we host a dns zone for this domain.
+	 */
+	private function find_soa_domain($domain) {
+		global $app;
+		$soaDomain = $domain . '.';
+		$soa = null;
+		while ((!isset($soa) && (substr_count($soaDomain,'.') > 1))) {
+			$soa = $app->db->queryOneRecord("SELECT id AS zone, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, server_id, ttl, serial FROM dns_soa WHERE active = 'Y' AND origin = ?", $soaDomain);
+			$soaDomain = preg_replace("/^[^\.]+\./","",$soaDomain);
+		}
+		return $soa;
+	}
+
 	private function update_dns($dataRecord, $new_rr) {
 		global $app, $conf;
 
diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm
index 9b9bf683c2..88082d1b8c 100644
--- a/interface/web/mail/templates/mail_domain_edit.htm
+++ b/interface/web/mail/templates/mail_domain_edit.htm
@@ -129,7 +129,7 @@
               </div>
 
               <div class="form-group">
-                <label for="dns_record" class="col-sm-3 control-label">{tmpl_var name='dkim_dns_txt'}</label>
+                <label for="dns_record" class="col-sm-3 control-label">{tmpl_var name='dkim_dns_txt'}<tmpl_if name='dkim_auto_dns'><br />{tmpl_var name='dkim_auto_dns'}</tmpl_if></label>
                 <div class="col-sm-9"><textarea class="form-control" name="dns_record" id="dns_record" rows='10' cols='30' readonly>{tmpl_var name='dns_record'}</textarea></div>
               </div>
 
-- 
GitLab


From d67fe7a923f5221981732dda8cf29f670a0d6620 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Sun, 3 Dec 2023 21:44:36 +0100
Subject: [PATCH 2/4] Convert text to icon with on hover title

---
 interface/web/mail/templates/mail_domain_edit.htm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm
index fc2132b209..6b078b98a3 100644
--- a/interface/web/mail/templates/mail_domain_edit.htm
+++ b/interface/web/mail/templates/mail_domain_edit.htm
@@ -129,7 +129,7 @@
               </div>
 
               <div class="form-group">
-                <label for="dns_record" class="col-sm-3 control-label">{tmpl_var name='dkim_dns_txt'}<tmpl_if name='dkim_auto_dns'><br />{tmpl_var name='dkim_auto_dns'}</tmpl_if></label>
+                <label for="dns_record" class="col-sm-3 control-label">{tmpl_var name='dkim_dns_txt'}<tmpl_if name='dkim_auto_dns'> <span class="fa fa-asterisk" aria-hidden="false" title="{tmpl_var name='dkim_auto_dns'}"</span></tmpl_if></label>
                 <div class="col-sm-9"><textarea class="form-control" name="dns_record" id="dns_record" rows='10' cols='30' readonly>{tmpl_var name='dns_record'}</textarea></div>
               </div>
 
-- 
GitLab


From a115471d6b8fd47ff895b8bdbebe49850c959a72 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Sun, 3 Dec 2023 21:46:33 +0100
Subject: [PATCH 3/4] Add translation strings

---
 interface/web/mail/lib/lang/ar_mail_domain.lng | 1 +
 interface/web/mail/lib/lang/bg_mail_domain.lng | 1 +
 interface/web/mail/lib/lang/br_mail_domain.lng | 1 +
 interface/web/mail/lib/lang/ca_mail_domain.lng | 1 +
 interface/web/mail/lib/lang/cn_mail_domain.lng | 1 +
 interface/web/mail/lib/lang/cz_mail_domain.lng | 1 +
 interface/web/mail/lib/lang/de_mail_domain.lng | 1 +
 interface/web/mail/lib/lang/dk_mail_domain.lng | 1 +
 interface/web/mail/lib/lang/el_mail_domain.lng | 1 +
 interface/web/mail/lib/lang/es_mail_domain.lng | 1 +
 interface/web/mail/lib/lang/fi_mail_domain.lng | 1 +
 interface/web/mail/lib/lang/fr_mail_domain.lng | 1 +
 interface/web/mail/lib/lang/hr_mail_domain.lng | 1 +
 interface/web/mail/lib/lang/hu_mail_domain.lng | 1 +
 interface/web/mail/lib/lang/id_mail_domain.lng | 1 +
 interface/web/mail/lib/lang/it_mail_domain.lng | 1 +
 interface/web/mail/lib/lang/ja_mail_domain.lng | 1 +
 interface/web/mail/lib/lang/nl_mail_domain.lng | 1 +
 interface/web/mail/lib/lang/pl_mail_domain.lng | 1 +
 interface/web/mail/lib/lang/pt_mail_domain.lng | 1 +
 interface/web/mail/lib/lang/ro_mail_domain.lng | 1 +
 interface/web/mail/lib/lang/ru_mail_domain.lng | 1 +
 interface/web/mail/lib/lang/se_mail_domain.lng | 1 +
 interface/web/mail/lib/lang/sk_mail_domain.lng | 1 +
 interface/web/mail/lib/lang/tr_mail_domain.lng | 1 +
 25 files changed, 25 insertions(+)

diff --git a/interface/web/mail/lib/lang/ar_mail_domain.lng b/interface/web/mail/lib/lang/ar_mail_domain.lng
index e53c5d9ec2..aec7f401e5 100644
--- a/interface/web/mail/lib/lang/ar_mail_domain.lng
+++ b/interface/web/mail/lib/lang/ar_mail_domain.lng
@@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this acco
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost User';
 $wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically';
diff --git a/interface/web/mail/lib/lang/bg_mail_domain.lng b/interface/web/mail/lib/lang/bg_mail_domain.lng
index f2d329a62e..003d54de71 100644
--- a/interface/web/mail/lib/lang/bg_mail_domain.lng
+++ b/interface/web/mail/lib/lang/bg_mail_domain.lng
@@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this acco
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost User';
 $wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically';
diff --git a/interface/web/mail/lib/lang/br_mail_domain.lng b/interface/web/mail/lib/lang/br_mail_domain.lng
index 7371f51894..48cb66f57b 100644
--- a/interface/web/mail/lib/lang/br_mail_domain.lng
+++ b/interface/web/mail/lib/lang/br_mail_domain.lng
@@ -23,3 +23,4 @@ $wb['dkim_selector_error'] = 'Seletor DKIM é inválido. Utilize apenas caracter
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost User';
 $wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically';
diff --git a/interface/web/mail/lib/lang/ca_mail_domain.lng b/interface/web/mail/lib/lang/ca_mail_domain.lng
index 0b701a16c3..a22ce61178 100644
--- a/interface/web/mail/lib/lang/ca_mail_domain.lng
+++ b/interface/web/mail/lib/lang/ca_mail_domain.lng
@@ -23,3 +23,4 @@ $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanu
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost User';
 $wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically';
diff --git a/interface/web/mail/lib/lang/cn_mail_domain.lng b/interface/web/mail/lib/lang/cn_mail_domain.lng
index 279e9a3bf7..59c60340b3 100644
--- a/interface/web/mail/lib/lang/cn_mail_domain.lng
+++ b/interface/web/mail/lib/lang/cn_mail_domain.lng
@@ -23,3 +23,4 @@ $wb['dkim_selector_error'] = '无效的 DKIM 选择器。仅使用小写字母
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost 用户';
 $wb['relayhost_password_txt'] = 'Relayhost 密码';
+$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically';
diff --git a/interface/web/mail/lib/lang/cz_mail_domain.lng b/interface/web/mail/lib/lang/cz_mail_domain.lng
index 0c648a68f3..546e27cfbe 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain.lng
@@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Zvolený server není povolen pro tento ú
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost User';
 $wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically';
diff --git a/interface/web/mail/lib/lang/de_mail_domain.lng b/interface/web/mail/lib/lang/de_mail_domain.lng
index 0a972caa42..e49b66358a 100644
--- a/interface/web/mail/lib/lang/de_mail_domain.lng
+++ b/interface/web/mail/lib/lang/de_mail_domain.lng
@@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this acco
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost User';
 $wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically';
diff --git a/interface/web/mail/lib/lang/dk_mail_domain.lng b/interface/web/mail/lib/lang/dk_mail_domain.lng
index fcced58e1a..64058ef18a 100644
--- a/interface/web/mail/lib/lang/dk_mail_domain.lng
+++ b/interface/web/mail/lib/lang/dk_mail_domain.lng
@@ -23,3 +23,4 @@ $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanu
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost User';
 $wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically';
diff --git a/interface/web/mail/lib/lang/el_mail_domain.lng b/interface/web/mail/lib/lang/el_mail_domain.lng
index 3909576a3c..1086651b16 100644
--- a/interface/web/mail/lib/lang/el_mail_domain.lng
+++ b/interface/web/mail/lib/lang/el_mail_domain.lng
@@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this acco
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost User';
 $wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically';
diff --git a/interface/web/mail/lib/lang/es_mail_domain.lng b/interface/web/mail/lib/lang/es_mail_domain.lng
index 4a3feb7c8b..81d0939b89 100644
--- a/interface/web/mail/lib/lang/es_mail_domain.lng
+++ b/interface/web/mail/lib/lang/es_mail_domain.lng
@@ -23,3 +23,4 @@ $wb['type_txt'] = 'Tipo';
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost User';
 $wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically';
diff --git a/interface/web/mail/lib/lang/fi_mail_domain.lng b/interface/web/mail/lib/lang/fi_mail_domain.lng
index d77fe32500..8ecd3f6718 100644
--- a/interface/web/mail/lib/lang/fi_mail_domain.lng
+++ b/interface/web/mail/lib/lang/fi_mail_domain.lng
@@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this acco
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost User';
 $wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically';
diff --git a/interface/web/mail/lib/lang/fr_mail_domain.lng b/interface/web/mail/lib/lang/fr_mail_domain.lng
index 56efb88aae..6cf3e060f8 100644
--- a/interface/web/mail/lib/lang/fr_mail_domain.lng
+++ b/interface/web/mail/lib/lang/fr_mail_domain.lng
@@ -23,3 +23,4 @@ $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanu
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost User';
 $wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically';
diff --git a/interface/web/mail/lib/lang/hr_mail_domain.lng b/interface/web/mail/lib/lang/hr_mail_domain.lng
index 2f53c694c8..2404324f04 100644
--- a/interface/web/mail/lib/lang/hr_mail_domain.lng
+++ b/interface/web/mail/lib/lang/hr_mail_domain.lng
@@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this acco
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost User';
 $wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically';
diff --git a/interface/web/mail/lib/lang/hu_mail_domain.lng b/interface/web/mail/lib/lang/hu_mail_domain.lng
index 96a5dc03a5..faf5eae4ae 100644
--- a/interface/web/mail/lib/lang/hu_mail_domain.lng
+++ b/interface/web/mail/lib/lang/hu_mail_domain.lng
@@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this acco
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost User';
 $wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically';
diff --git a/interface/web/mail/lib/lang/id_mail_domain.lng b/interface/web/mail/lib/lang/id_mail_domain.lng
index 2979773e8c..f8c2d7c516 100644
--- a/interface/web/mail/lib/lang/id_mail_domain.lng
+++ b/interface/web/mail/lib/lang/id_mail_domain.lng
@@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this acco
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost User';
 $wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically';
diff --git a/interface/web/mail/lib/lang/it_mail_domain.lng b/interface/web/mail/lib/lang/it_mail_domain.lng
index 13af4beb97..75c8a7b6a4 100644
--- a/interface/web/mail/lib/lang/it_mail_domain.lng
+++ b/interface/web/mail/lib/lang/it_mail_domain.lng
@@ -23,4 +23,5 @@ $wb['dkim_selector_error'] = 'Selettore di chiave DKIM invalido. Usare solo cara
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Utente Relayhost';
 $wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically';
 ?>
diff --git a/interface/web/mail/lib/lang/ja_mail_domain.lng b/interface/web/mail/lib/lang/ja_mail_domain.lng
index a96faaa367..9713c8d734 100644
--- a/interface/web/mail/lib/lang/ja_mail_domain.lng
+++ b/interface/web/mail/lib/lang/ja_mail_domain.lng
@@ -23,3 +23,4 @@ $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanu
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost User';
 $wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically';
diff --git a/interface/web/mail/lib/lang/nl_mail_domain.lng b/interface/web/mail/lib/lang/nl_mail_domain.lng
index 0e8a912a71..97ecca773d 100644
--- a/interface/web/mail/lib/lang/nl_mail_domain.lng
+++ b/interface/web/mail/lib/lang/nl_mail_domain.lng
@@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this acco
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost User';
 $wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['dkim_auto_dns_txt'] = 'Beheerde zone, dns update automatisch';
diff --git a/interface/web/mail/lib/lang/pl_mail_domain.lng b/interface/web/mail/lib/lang/pl_mail_domain.lng
index 7ff3c297ff..cba78dc309 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain.lng
@@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this acco
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost User';
 $wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically';
diff --git a/interface/web/mail/lib/lang/pt_mail_domain.lng b/interface/web/mail/lib/lang/pt_mail_domain.lng
index 092f83f1ca..16ff402ded 100644
--- a/interface/web/mail/lib/lang/pt_mail_domain.lng
+++ b/interface/web/mail/lib/lang/pt_mail_domain.lng
@@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this acco
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost User';
 $wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically';
diff --git a/interface/web/mail/lib/lang/ro_mail_domain.lng b/interface/web/mail/lib/lang/ro_mail_domain.lng
index e0543f36ec..dce3c99ceb 100644
--- a/interface/web/mail/lib/lang/ro_mail_domain.lng
+++ b/interface/web/mail/lib/lang/ro_mail_domain.lng
@@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this acco
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost User';
 $wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically';
diff --git a/interface/web/mail/lib/lang/ru_mail_domain.lng b/interface/web/mail/lib/lang/ru_mail_domain.lng
index 7567e3c670..af76a508fb 100644
--- a/interface/web/mail/lib/lang/ru_mail_domain.lng
+++ b/interface/web/mail/lib/lang/ru_mail_domain.lng
@@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Выбранный сервер не до
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost User';
 $wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically';
diff --git a/interface/web/mail/lib/lang/se_mail_domain.lng b/interface/web/mail/lib/lang/se_mail_domain.lng
index 7f192224e6..ec787116f6 100644
--- a/interface/web/mail/lib/lang/se_mail_domain.lng
+++ b/interface/web/mail/lib/lang/se_mail_domain.lng
@@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this acco
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost User';
 $wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically';
diff --git a/interface/web/mail/lib/lang/sk_mail_domain.lng b/interface/web/mail/lib/lang/sk_mail_domain.lng
index ed67d20044..7527ba1d65 100644
--- a/interface/web/mail/lib/lang/sk_mail_domain.lng
+++ b/interface/web/mail/lib/lang/sk_mail_domain.lng
@@ -23,3 +23,4 @@ $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost User';
 $wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically';
diff --git a/interface/web/mail/lib/lang/tr_mail_domain.lng b/interface/web/mail/lib/lang/tr_mail_domain.lng
index 802fdcf94b..8ada2139b0 100644
--- a/interface/web/mail/lib/lang/tr_mail_domain.lng
+++ b/interface/web/mail/lib/lang/tr_mail_domain.lng
@@ -23,3 +23,4 @@ $wb['dkim_selector_error'] = 'DKIM seçici geçersiz. En fazla 63 karakter uzunl
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost User';
 $wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically';
-- 
GitLab


From 3004c05b365ce87f6e84111267f2ec2c5eee6c86 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Sun, 3 Dec 2023 23:29:02 +0100
Subject: [PATCH 4/4] Change to link icoc

---
 interface/web/mail/templates/mail_domain_edit.htm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm
index 6b078b98a3..2d8d14536c 100644
--- a/interface/web/mail/templates/mail_domain_edit.htm
+++ b/interface/web/mail/templates/mail_domain_edit.htm
@@ -129,7 +129,7 @@
               </div>
 
               <div class="form-group">
-                <label for="dns_record" class="col-sm-3 control-label">{tmpl_var name='dkim_dns_txt'}<tmpl_if name='dkim_auto_dns'> <span class="fa fa-asterisk" aria-hidden="false" title="{tmpl_var name='dkim_auto_dns'}"</span></tmpl_if></label>
+                <label for="dns_record" class="col-sm-3 control-label">{tmpl_var name='dkim_dns_txt'}<tmpl_if name='dkim_auto_dns'> <span class="fa fa-link" aria-hidden="false" title="{tmpl_var name='dkim_auto_dns'}"</span></tmpl_if></label>
                 <div class="col-sm-9"><textarea class="form-control" name="dns_record" id="dns_record" rows='10' cols='30' readonly>{tmpl_var name='dns_record'}</textarea></div>
               </div>
 
-- 
GitLab