From f0c460d787c62d64e881061edd7293497cecf1ae Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Sun, 3 Dec 2023 23:24:42 +0100 Subject: [PATCH 1/5] Show DKIM status when editing mail_domain, #6617 --- interface/web/mail/mail_domain_edit.php | 20 +++++++++++++++++-- .../web/mail/templates/mail_domain_edit.htm | 5 ++++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php index f5697b4f1c..7b8c01dd6c 100644 --- a/interface/web/mail/mail_domain_edit.php +++ b/interface/web/mail/mail_domain_edit.php @@ -250,15 +250,31 @@ class page_action extends tform_actions { array_walk($keyparts, function(&$value, $key) { $value = '"'.$value.'"'; } ); $dkim_txt = implode('', $keyparts); */ - $dkim_txt = '"v=DKIM1; t=s; p=' . $dns_key . '"'; + $dkim_txt = 'v=DKIM1; t=s; p=' . $dns_key; - $dns_record = $rec['dkim_selector'] . '._domainkey.' . $rec['domain'] . '. 3600 IN TXT '.$dkim_txt; + $dns_record = $rec['dkim_selector'] . '._domainkey.' . $rec['domain'] . '. 3600 IN TXT "' . $dkim_txt . '"'; $app->tpl->setVar('dkim_selector', $rec['dkim_selector'], true); $app->tpl->setVar('dkim_private', $rec['dkim_private'], true); $app->tpl->setVar('dkim_public', $rec['dkim_public'], true); if (!empty($rec['dkim_public'])) $app->tpl->setVar('dns_record', $dns_record, true); + if ($this->dataRecord['dkim'] == 'y') { + $dns_record_status = dns_get_record($rec['dkim_selector'] . '._domainkey.' . $rec['domain'], DNS_TXT); + if (empty($dns_record_status) || empty($dns_record_status[0]['txt'])) { + // Record not found + $app->tpl->setVar('dkim_status', "DKIM enabled, record not found in DNS yet.", true); + } + elseif ($dns_record_status[0]['txt'] == $dkim_txt) { + $app->tpl->setVar('dkim_status', "", false); + } + else { + // Mismatch in record! + $app->tpl->setVar('dkim_status', "DKIM enabled, mismatched record", true); + //$app->tpl->setVar('dkim_auto_dns', "XX" . print_r($dns_record_status, 1) . "--", 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']); diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm index cc7031b787..f437f0e4b3 100644 --- a/interface/web/mail/templates/mail_domain_edit.htm +++ b/interface/web/mail/templates/mail_domain_edit.htm @@ -108,7 +108,10 @@ -
+
+ + {tmpl_var name='dkim_status'} +
-- GitLab From 2961950a93eeebac396f17fc0ac10db8e61339eb Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Mon, 25 Mar 2024 22:56:30 +0100 Subject: [PATCH 2/5] Add translation --- interface/web/mail/lib/lang/ar_mail_domain.lng | 3 +++ interface/web/mail/lib/lang/bg_mail_domain.lng | 3 +++ interface/web/mail/lib/lang/br_mail_domain.lng | 3 +++ interface/web/mail/lib/lang/ca_mail_domain.lng | 3 +++ interface/web/mail/lib/lang/cn_mail_domain.lng | 3 +++ interface/web/mail/lib/lang/cz_mail_domain.lng | 3 +++ interface/web/mail/lib/lang/de_mail_domain.lng | 3 +++ interface/web/mail/lib/lang/dk_mail_domain.lng | 3 +++ interface/web/mail/lib/lang/el_mail_domain.lng | 3 +++ interface/web/mail/lib/lang/es_mail_domain.lng | 3 +++ interface/web/mail/lib/lang/fi_mail_domain.lng | 3 +++ interface/web/mail/lib/lang/fr_mail_domain.lng | 3 +++ interface/web/mail/lib/lang/hr_mail_domain.lng | 3 +++ interface/web/mail/lib/lang/hu_mail_domain.lng | 3 +++ interface/web/mail/lib/lang/id_mail_domain.lng | 3 +++ interface/web/mail/lib/lang/it_mail_domain.lng | 3 +++ interface/web/mail/lib/lang/ja_mail_domain.lng | 3 +++ interface/web/mail/lib/lang/nl_mail_domain.lng | 3 +++ interface/web/mail/lib/lang/pl_mail_domain.lng | 3 +++ interface/web/mail/lib/lang/pt_mail_domain.lng | 3 +++ interface/web/mail/lib/lang/ro_mail_domain.lng | 3 +++ interface/web/mail/lib/lang/ru_mail_domain.lng | 3 +++ interface/web/mail/lib/lang/se_mail_domain.lng | 3 +++ interface/web/mail/lib/lang/sk_mail_domain.lng | 3 +++ interface/web/mail/lib/lang/tr_mail_domain.lng | 3 +++ interface/web/mail/mail_domain_edit.php | 7 +++---- 26 files changed, 78 insertions(+), 4 deletions(-) diff --git a/interface/web/mail/lib/lang/ar_mail_domain.lng b/interface/web/mail/lib/lang/ar_mail_domain.lng index e53c5d9ec2..d73911ca09 100644 --- a/interface/web/mail/lib/lang/ar_mail_domain.lng +++ b/interface/web/mail/lib/lang/ar_mail_domain.lng @@ -23,3 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/bg_mail_domain.lng b/interface/web/mail/lib/lang/bg_mail_domain.lng index f2d329a62e..827b1b8158 100644 --- a/interface/web/mail/lib/lang/bg_mail_domain.lng +++ b/interface/web/mail/lib/lang/bg_mail_domain.lng @@ -23,3 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/br_mail_domain.lng b/interface/web/mail/lib/lang/br_mail_domain.lng index 7371f51894..a5fd4db5ba 100644 --- a/interface/web/mail/lib/lang/br_mail_domain.lng +++ b/interface/web/mail/lib/lang/br_mail_domain.lng @@ -23,3 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/ca_mail_domain.lng b/interface/web/mail/lib/lang/ca_mail_domain.lng index 0b701a16c3..3c9c8a044f 100644 --- a/interface/web/mail/lib/lang/ca_mail_domain.lng +++ b/interface/web/mail/lib/lang/ca_mail_domain.lng @@ -23,3 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/cn_mail_domain.lng b/interface/web/mail/lib/lang/cn_mail_domain.lng index 279e9a3bf7..a08854c9cb 100644 --- a/interface/web/mail/lib/lang/cn_mail_domain.lng +++ b/interface/web/mail/lib/lang/cn_mail_domain.lng @@ -23,3 +23,6 @@ $wb['dkim_selector_error'] = '无效的 DKIM 选择器。仅使用小写字母 $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost 用户'; $wb['relayhost_password_txt'] = 'Relayhost 密码'; +$wb['dkim_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/cz_mail_domain.lng b/interface/web/mail/lib/lang/cz_mail_domain.lng index 0c648a68f3..1a5e36c538 100644 --- a/interface/web/mail/lib/lang/cz_mail_domain.lng +++ b/interface/web/mail/lib/lang/cz_mail_domain.lng @@ -23,3 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/de_mail_domain.lng b/interface/web/mail/lib/lang/de_mail_domain.lng index 0a972caa42..323307f87d 100644 --- a/interface/web/mail/lib/lang/de_mail_domain.lng +++ b/interface/web/mail/lib/lang/de_mail_domain.lng @@ -23,3 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/dk_mail_domain.lng b/interface/web/mail/lib/lang/dk_mail_domain.lng index fcced58e1a..33f4487e88 100644 --- a/interface/web/mail/lib/lang/dk_mail_domain.lng +++ b/interface/web/mail/lib/lang/dk_mail_domain.lng @@ -23,3 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/el_mail_domain.lng b/interface/web/mail/lib/lang/el_mail_domain.lng index 3909576a3c..003e037495 100644 --- a/interface/web/mail/lib/lang/el_mail_domain.lng +++ b/interface/web/mail/lib/lang/el_mail_domain.lng @@ -23,3 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/es_mail_domain.lng b/interface/web/mail/lib/lang/es_mail_domain.lng index 4a3feb7c8b..30a8fbc615 100644 --- a/interface/web/mail/lib/lang/es_mail_domain.lng +++ b/interface/web/mail/lib/lang/es_mail_domain.lng @@ -23,3 +23,6 @@ $wb['type_txt'] = 'Tipo'; $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; +$wb['dkim_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/fi_mail_domain.lng b/interface/web/mail/lib/lang/fi_mail_domain.lng index d77fe32500..a11a6dbae5 100644 --- a/interface/web/mail/lib/lang/fi_mail_domain.lng +++ b/interface/web/mail/lib/lang/fi_mail_domain.lng @@ -23,3 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/fr_mail_domain.lng b/interface/web/mail/lib/lang/fr_mail_domain.lng index 56efb88aae..0375edb08f 100644 --- a/interface/web/mail/lib/lang/fr_mail_domain.lng +++ b/interface/web/mail/lib/lang/fr_mail_domain.lng @@ -23,3 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/hr_mail_domain.lng b/interface/web/mail/lib/lang/hr_mail_domain.lng index 2f53c694c8..3ce8b08186 100644 --- a/interface/web/mail/lib/lang/hr_mail_domain.lng +++ b/interface/web/mail/lib/lang/hr_mail_domain.lng @@ -23,3 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/hu_mail_domain.lng b/interface/web/mail/lib/lang/hu_mail_domain.lng index 96a5dc03a5..ffae2c9011 100644 --- a/interface/web/mail/lib/lang/hu_mail_domain.lng +++ b/interface/web/mail/lib/lang/hu_mail_domain.lng @@ -23,3 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/id_mail_domain.lng b/interface/web/mail/lib/lang/id_mail_domain.lng index 2979773e8c..62de562afa 100644 --- a/interface/web/mail/lib/lang/id_mail_domain.lng +++ b/interface/web/mail/lib/lang/id_mail_domain.lng @@ -23,3 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/it_mail_domain.lng b/interface/web/mail/lib/lang/it_mail_domain.lng index 13af4beb97..743f8f556a 100644 --- a/interface/web/mail/lib/lang/it_mail_domain.lng +++ b/interface/web/mail/lib/lang/it_mail_domain.lng @@ -23,4 +23,7 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; ?> diff --git a/interface/web/mail/lib/lang/ja_mail_domain.lng b/interface/web/mail/lib/lang/ja_mail_domain.lng index a96faaa367..c312fcb9f2 100644 --- a/interface/web/mail/lib/lang/ja_mail_domain.lng +++ b/interface/web/mail/lib/lang/ja_mail_domain.lng @@ -23,3 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/nl_mail_domain.lng b/interface/web/mail/lib/lang/nl_mail_domain.lng index 0e8a912a71..45d21fad88 100644 --- a/interface/web/mail/lib/lang/nl_mail_domain.lng +++ b/interface/web/mail/lib/lang/nl_mail_domain.lng @@ -23,3 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/pl_mail_domain.lng b/interface/web/mail/lib/lang/pl_mail_domain.lng index 7ff3c297ff..6c4d8a8e5d 100644 --- a/interface/web/mail/lib/lang/pl_mail_domain.lng +++ b/interface/web/mail/lib/lang/pl_mail_domain.lng @@ -23,3 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/pt_mail_domain.lng b/interface/web/mail/lib/lang/pt_mail_domain.lng index 092f83f1ca..20fe0c004c 100644 --- a/interface/web/mail/lib/lang/pt_mail_domain.lng +++ b/interface/web/mail/lib/lang/pt_mail_domain.lng @@ -23,3 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/ro_mail_domain.lng b/interface/web/mail/lib/lang/ro_mail_domain.lng index e0543f36ec..f17ba25230 100644 --- a/interface/web/mail/lib/lang/ro_mail_domain.lng +++ b/interface/web/mail/lib/lang/ro_mail_domain.lng @@ -23,3 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/ru_mail_domain.lng b/interface/web/mail/lib/lang/ru_mail_domain.lng index 7567e3c670..6c92d2d2e9 100644 --- a/interface/web/mail/lib/lang/ru_mail_domain.lng +++ b/interface/web/mail/lib/lang/ru_mail_domain.lng @@ -23,3 +23,6 @@ $wb['error_not_allowed_server_id'] = 'Выбранный сервер не до $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; +$wb['dkim_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/se_mail_domain.lng b/interface/web/mail/lib/lang/se_mail_domain.lng index 7f192224e6..641451eb04 100644 --- a/interface/web/mail/lib/lang/se_mail_domain.lng +++ b/interface/web/mail/lib/lang/se_mail_domain.lng @@ -23,3 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/sk_mail_domain.lng b/interface/web/mail/lib/lang/sk_mail_domain.lng index ed67d20044..56c05d8c6a 100644 --- a/interface/web/mail/lib/lang/sk_mail_domain.lng +++ b/interface/web/mail/lib/lang/sk_mail_domain.lng @@ -23,3 +23,6 @@ $wb['dkim_selector_txt'] = 'DKIM-Selector'; $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; +$wb['dkim_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/tr_mail_domain.lng b/interface/web/mail/lib/lang/tr_mail_domain.lng index 802fdcf94b..d2df3a212f 100644 --- a/interface/web/mail/lib/lang/tr_mail_domain.lng +++ b/interface/web/mail/lib/lang/tr_mail_domain.lng @@ -23,3 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php index 7b8c01dd6c..73499c949c 100644 --- a/interface/web/mail/mail_domain_edit.php +++ b/interface/web/mail/mail_domain_edit.php @@ -263,15 +263,14 @@ class page_action extends tform_actions { $dns_record_status = dns_get_record($rec['dkim_selector'] . '._domainkey.' . $rec['domain'], DNS_TXT); if (empty($dns_record_status) || empty($dns_record_status[0]['txt'])) { // Record not found - $app->tpl->setVar('dkim_status', "DKIM enabled, record not found in DNS yet.", true); + $app->tpl->setVar('dkim_status', $app->lng('dkim_enabled_dns_not_found'), true); } elseif ($dns_record_status[0]['txt'] == $dkim_txt) { - $app->tpl->setVar('dkim_status', "", false); + $app->tpl->setVar('dkim_status', '', false); } else { // Mismatch in record! - $app->tpl->setVar('dkim_status', "DKIM enabled, mismatched record", true); - //$app->tpl->setVar('dkim_auto_dns', "XX" . print_r($dns_record_status, 1) . "--", true); + $app->tpl->setVar('dkim_status', $app->lng('dkim_enabled_mismatched_record'), true); } } -- GitLab From f8ff6fea7d74f20625e770743fe7ee6b3853f0f6 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Thu, 2 May 2024 22:34:11 +0200 Subject: [PATCH 3/5] Add missing English language strings --- interface/web/mail/lib/lang/en_mail_domain.lng | 3 +++ 1 file changed, 3 insertions(+) diff --git a/interface/web/mail/lib/lang/en_mail_domain.lng b/interface/web/mail/lib/lang/en_mail_domain.lng index fe4cad303f..3295bf1455 100644 --- a/interface/web/mail/lib/lang/en_mail_domain.lng +++ b/interface/web/mail/lib/lang/en_mail_domain.lng @@ -23,3 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; -- GitLab From e18846306693fd1e1219228926e6039220e0387c Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Thu, 2 May 2024 22:34:28 +0200 Subject: [PATCH 4/5] Use wordbook instead of lng --- interface/web/mail/mail_domain_edit.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php index 73499c949c..1589f6d2e9 100644 --- a/interface/web/mail/mail_domain_edit.php +++ b/interface/web/mail/mail_domain_edit.php @@ -263,14 +263,14 @@ class page_action extends tform_actions { $dns_record_status = dns_get_record($rec['dkim_selector'] . '._domainkey.' . $rec['domain'], DNS_TXT); if (empty($dns_record_status) || empty($dns_record_status[0]['txt'])) { // Record not found - $app->tpl->setVar('dkim_status', $app->lng('dkim_enabled_dns_not_found'), true); + $app->tpl->setVar('dkim_status', $app->tform->wordbook['dkim_enabled_dns_not_found'], true); } elseif ($dns_record_status[0]['txt'] == $dkim_txt) { - $app->tpl->setVar('dkim_status', '', false); + $app->tpl->setVar('dkim_status', '', false); } else { // Mismatch in record! - $app->tpl->setVar('dkim_status', $app->lng('dkim_enabled_mismatched_record'), true); + $app->tpl->setVar('dkim_status', $app->tform->wordbook['dkim_enabled_mismatched_record'], true); } } -- GitLab From b2c7dcabb3b5cd8f75f80c42024c78cd7729f469 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Thu, 2 May 2024 22:36:42 +0200 Subject: [PATCH 5/5] Add _txt suffix --- interface/web/mail/lib/lang/ar_mail_domain.lng | 6 +++--- interface/web/mail/lib/lang/bg_mail_domain.lng | 6 +++--- interface/web/mail/lib/lang/br_mail_domain.lng | 6 +++--- interface/web/mail/lib/lang/ca_mail_domain.lng | 6 +++--- interface/web/mail/lib/lang/cn_mail_domain.lng | 6 +++--- interface/web/mail/lib/lang/cz_mail_domain.lng | 6 +++--- interface/web/mail/lib/lang/de_mail_domain.lng | 6 +++--- interface/web/mail/lib/lang/dk_mail_domain.lng | 6 +++--- interface/web/mail/lib/lang/el_mail_domain.lng | 6 +++--- interface/web/mail/lib/lang/en_mail_domain.lng | 6 +++--- interface/web/mail/lib/lang/es_mail_domain.lng | 6 +++--- interface/web/mail/lib/lang/fi_mail_domain.lng | 6 +++--- interface/web/mail/lib/lang/fr_mail_domain.lng | 6 +++--- interface/web/mail/lib/lang/hr_mail_domain.lng | 6 +++--- interface/web/mail/lib/lang/hu_mail_domain.lng | 6 +++--- interface/web/mail/lib/lang/id_mail_domain.lng | 6 +++--- interface/web/mail/lib/lang/it_mail_domain.lng | 6 +++--- interface/web/mail/lib/lang/ja_mail_domain.lng | 6 +++--- interface/web/mail/lib/lang/nl_mail_domain.lng | 6 +++--- interface/web/mail/lib/lang/pl_mail_domain.lng | 6 +++--- interface/web/mail/lib/lang/pt_mail_domain.lng | 6 +++--- interface/web/mail/lib/lang/ro_mail_domain.lng | 6 +++--- interface/web/mail/lib/lang/ru_mail_domain.lng | 6 +++--- interface/web/mail/lib/lang/se_mail_domain.lng | 6 +++--- interface/web/mail/lib/lang/sk_mail_domain.lng | 6 +++--- interface/web/mail/lib/lang/tr_mail_domain.lng | 6 +++--- interface/web/mail/mail_domain_edit.php | 6 +++--- 27 files changed, 81 insertions(+), 81 deletions(-) diff --git a/interface/web/mail/lib/lang/ar_mail_domain.lng b/interface/web/mail/lib/lang/ar_mail_domain.lng index d73911ca09..9caa9e79d1 100644 --- a/interface/web/mail/lib/lang/ar_mail_domain.lng +++ b/interface/web/mail/lib/lang/ar_mail_domain.lng @@ -23,6 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; -$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; -$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; +$wb['dkim_enabled_dns_not_found_txt'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok_txt'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record_txt'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/bg_mail_domain.lng b/interface/web/mail/lib/lang/bg_mail_domain.lng index 827b1b8158..a5a3a57a92 100644 --- a/interface/web/mail/lib/lang/bg_mail_domain.lng +++ b/interface/web/mail/lib/lang/bg_mail_domain.lng @@ -23,6 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; -$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; -$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; +$wb['dkim_enabled_dns_not_found_txt'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok_txt'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record_txt'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/br_mail_domain.lng b/interface/web/mail/lib/lang/br_mail_domain.lng index a5fd4db5ba..25fc643632 100644 --- a/interface/web/mail/lib/lang/br_mail_domain.lng +++ b/interface/web/mail/lib/lang/br_mail_domain.lng @@ -23,6 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; -$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; -$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; +$wb['dkim_enabled_dns_not_found_txt'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok_txt'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record_txt'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/ca_mail_domain.lng b/interface/web/mail/lib/lang/ca_mail_domain.lng index 3c9c8a044f..64df62d0bc 100644 --- a/interface/web/mail/lib/lang/ca_mail_domain.lng +++ b/interface/web/mail/lib/lang/ca_mail_domain.lng @@ -23,6 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; -$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; -$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; +$wb['dkim_enabled_dns_not_found_txt'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok_txt'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record_txt'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/cn_mail_domain.lng b/interface/web/mail/lib/lang/cn_mail_domain.lng index a08854c9cb..3fc71fa580 100644 --- a/interface/web/mail/lib/lang/cn_mail_domain.lng +++ b/interface/web/mail/lib/lang/cn_mail_domain.lng @@ -23,6 +23,6 @@ $wb['dkim_selector_error'] = '无效的 DKIM 选择器。仅使用小写字母 $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost 用户'; $wb['relayhost_password_txt'] = 'Relayhost 密码'; -$wb['dkim_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; -$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; -$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; +$wb['dkim_enabled_dns_not_found_txt'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok_txt'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record_txt'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/cz_mail_domain.lng b/interface/web/mail/lib/lang/cz_mail_domain.lng index 1a5e36c538..b547f962cb 100644 --- a/interface/web/mail/lib/lang/cz_mail_domain.lng +++ b/interface/web/mail/lib/lang/cz_mail_domain.lng @@ -23,6 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; -$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; -$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; +$wb['dkim_enabled_dns_not_found_txt'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok_txt'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record_txt'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/de_mail_domain.lng b/interface/web/mail/lib/lang/de_mail_domain.lng index d6680ddb3c..284768ec07 100644 --- a/interface/web/mail/lib/lang/de_mail_domain.lng +++ b/interface/web/mail/lib/lang/de_mail_domain.lng @@ -23,6 +23,6 @@ $wb['error_not_allowed_server_id'] = 'Der gewählte Server ist für dieses Konto $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost-Benutzer'; $wb['relayhost_password_txt'] = 'Relayhost-Passwort'; -$wb['dkim_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; -$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; -$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; +$wb['dkim_enabled_dns_not_found_txt'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok_txt'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record_txt'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/dk_mail_domain.lng b/interface/web/mail/lib/lang/dk_mail_domain.lng index 33f4487e88..58c035ca1e 100644 --- a/interface/web/mail/lib/lang/dk_mail_domain.lng +++ b/interface/web/mail/lib/lang/dk_mail_domain.lng @@ -23,6 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; -$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; -$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; +$wb['dkim_enabled_dns_not_found_txt'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok_txt'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record_txt'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/el_mail_domain.lng b/interface/web/mail/lib/lang/el_mail_domain.lng index 003e037495..41dd655e5c 100644 --- a/interface/web/mail/lib/lang/el_mail_domain.lng +++ b/interface/web/mail/lib/lang/el_mail_domain.lng @@ -23,6 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; -$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; -$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; +$wb['dkim_enabled_dns_not_found_txt'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok_txt'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record_txt'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/en_mail_domain.lng b/interface/web/mail/lib/lang/en_mail_domain.lng index 3295bf1455..4094d31cd7 100644 --- a/interface/web/mail/lib/lang/en_mail_domain.lng +++ b/interface/web/mail/lib/lang/en_mail_domain.lng @@ -23,6 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; -$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; -$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; +$wb['dkim_enabled_dns_not_found_txt'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok_txt'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record_txt'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/es_mail_domain.lng b/interface/web/mail/lib/lang/es_mail_domain.lng index 30a8fbc615..799f64f12c 100644 --- a/interface/web/mail/lib/lang/es_mail_domain.lng +++ b/interface/web/mail/lib/lang/es_mail_domain.lng @@ -23,6 +23,6 @@ $wb['type_txt'] = 'Tipo'; $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; -$wb['dkim_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; -$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; -$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; +$wb['dkim_enabled_dns_not_found_txt'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok_txt'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record_txt'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/fi_mail_domain.lng b/interface/web/mail/lib/lang/fi_mail_domain.lng index a11a6dbae5..4c69d1a4f1 100644 --- a/interface/web/mail/lib/lang/fi_mail_domain.lng +++ b/interface/web/mail/lib/lang/fi_mail_domain.lng @@ -23,6 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; -$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; -$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; +$wb['dkim_enabled_dns_not_found_txt'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok_txt'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record_txt'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/fr_mail_domain.lng b/interface/web/mail/lib/lang/fr_mail_domain.lng index 0375edb08f..9d71206dd5 100644 --- a/interface/web/mail/lib/lang/fr_mail_domain.lng +++ b/interface/web/mail/lib/lang/fr_mail_domain.lng @@ -23,6 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; -$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; -$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; +$wb['dkim_enabled_dns_not_found_txt'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok_txt'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record_txt'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/hr_mail_domain.lng b/interface/web/mail/lib/lang/hr_mail_domain.lng index 3ce8b08186..721a487c19 100644 --- a/interface/web/mail/lib/lang/hr_mail_domain.lng +++ b/interface/web/mail/lib/lang/hr_mail_domain.lng @@ -23,6 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; -$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; -$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; +$wb['dkim_enabled_dns_not_found_txt'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok_txt'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record_txt'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/hu_mail_domain.lng b/interface/web/mail/lib/lang/hu_mail_domain.lng index ffae2c9011..de89b17d04 100644 --- a/interface/web/mail/lib/lang/hu_mail_domain.lng +++ b/interface/web/mail/lib/lang/hu_mail_domain.lng @@ -23,6 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; -$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; -$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; +$wb['dkim_enabled_dns_not_found_txt'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok_txt'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record_txt'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/id_mail_domain.lng b/interface/web/mail/lib/lang/id_mail_domain.lng index 62de562afa..33b46e0bd6 100644 --- a/interface/web/mail/lib/lang/id_mail_domain.lng +++ b/interface/web/mail/lib/lang/id_mail_domain.lng @@ -23,6 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; -$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; -$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; +$wb['dkim_enabled_dns_not_found_txt'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok_txt'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record_txt'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/it_mail_domain.lng b/interface/web/mail/lib/lang/it_mail_domain.lng index 743f8f556a..99b360123e 100644 --- a/interface/web/mail/lib/lang/it_mail_domain.lng +++ b/interface/web/mail/lib/lang/it_mail_domain.lng @@ -23,7 +23,7 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; -$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; -$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; +$wb['dkim_enabled_dns_not_found_txt'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok_txt'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record_txt'] = 'DKIM enabled, mismatched record.'; ?> diff --git a/interface/web/mail/lib/lang/ja_mail_domain.lng b/interface/web/mail/lib/lang/ja_mail_domain.lng index c312fcb9f2..a3ec7df65e 100644 --- a/interface/web/mail/lib/lang/ja_mail_domain.lng +++ b/interface/web/mail/lib/lang/ja_mail_domain.lng @@ -23,6 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; -$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; -$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; +$wb['dkim_enabled_dns_not_found_txt'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok_txt'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record_txt'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/nl_mail_domain.lng b/interface/web/mail/lib/lang/nl_mail_domain.lng index 45d21fad88..9f196aeca6 100644 --- a/interface/web/mail/lib/lang/nl_mail_domain.lng +++ b/interface/web/mail/lib/lang/nl_mail_domain.lng @@ -23,6 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; -$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; -$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; +$wb['dkim_enabled_dns_not_found_txt'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok_txt'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record_txt'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/pl_mail_domain.lng b/interface/web/mail/lib/lang/pl_mail_domain.lng index 6c4d8a8e5d..9dbf8d281b 100644 --- a/interface/web/mail/lib/lang/pl_mail_domain.lng +++ b/interface/web/mail/lib/lang/pl_mail_domain.lng @@ -23,6 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; -$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; -$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; +$wb['dkim_enabled_dns_not_found_txt'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok_txt'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record_txt'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/pt_mail_domain.lng b/interface/web/mail/lib/lang/pt_mail_domain.lng index 20fe0c004c..7b0111b61d 100644 --- a/interface/web/mail/lib/lang/pt_mail_domain.lng +++ b/interface/web/mail/lib/lang/pt_mail_domain.lng @@ -23,6 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; -$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; -$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; +$wb['dkim_enabled_dns_not_found_txt'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok_txt'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record_txt'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/ro_mail_domain.lng b/interface/web/mail/lib/lang/ro_mail_domain.lng index f17ba25230..67e104aaa2 100644 --- a/interface/web/mail/lib/lang/ro_mail_domain.lng +++ b/interface/web/mail/lib/lang/ro_mail_domain.lng @@ -23,6 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; -$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; -$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; +$wb['dkim_enabled_dns_not_found_txt'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok_txt'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record_txt'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/ru_mail_domain.lng b/interface/web/mail/lib/lang/ru_mail_domain.lng index 6c92d2d2e9..f3c6ccd417 100644 --- a/interface/web/mail/lib/lang/ru_mail_domain.lng +++ b/interface/web/mail/lib/lang/ru_mail_domain.lng @@ -23,6 +23,6 @@ $wb['error_not_allowed_server_id'] = 'Выбранный сервер не до $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; -$wb['dkim_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; -$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; -$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; +$wb['dkim_enabled_dns_not_found_txt'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok_txt'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record_txt'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/se_mail_domain.lng b/interface/web/mail/lib/lang/se_mail_domain.lng index 641451eb04..6dddcad0ff 100644 --- a/interface/web/mail/lib/lang/se_mail_domain.lng +++ b/interface/web/mail/lib/lang/se_mail_domain.lng @@ -23,6 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; -$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; -$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; +$wb['dkim_enabled_dns_not_found_txt'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok_txt'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record_txt'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/sk_mail_domain.lng b/interface/web/mail/lib/lang/sk_mail_domain.lng index 56c05d8c6a..ef3810ba16 100644 --- a/interface/web/mail/lib/lang/sk_mail_domain.lng +++ b/interface/web/mail/lib/lang/sk_mail_domain.lng @@ -23,6 +23,6 @@ $wb['dkim_selector_txt'] = 'DKIM-Selector'; $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; -$wb['dkim_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; -$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; -$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; +$wb['dkim_enabled_dns_not_found_txt'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok_txt'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record_txt'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/lib/lang/tr_mail_domain.lng b/interface/web/mail/lib/lang/tr_mail_domain.lng index d2df3a212f..4b2f5e39ae 100644 --- a/interface/web/mail/lib/lang/tr_mail_domain.lng +++ b/interface/web/mail/lib/lang/tr_mail_domain.lng @@ -23,6 +23,6 @@ $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_enabled_dns_not_found'] = 'DKIM enabled, record not found in DNS yet.'; -$wb['dkim_enabled_resolving_ok'] = 'DKIM enabled, DNS resolving OK.'; -$wb['dkim_enabled_mismatched_record'] = 'DKIM enabled, mismatched record.'; +$wb['dkim_enabled_dns_not_found_txt'] = 'DKIM enabled, record not found in DNS yet.'; +$wb['dkim_enabled_resolving_ok_txt'] = 'DKIM enabled, DNS resolving OK.'; +$wb['dkim_enabled_mismatched_record_txt'] = 'DKIM enabled, mismatched record.'; diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php index 1589f6d2e9..5560585a09 100644 --- a/interface/web/mail/mail_domain_edit.php +++ b/interface/web/mail/mail_domain_edit.php @@ -263,14 +263,14 @@ class page_action extends tform_actions { $dns_record_status = dns_get_record($rec['dkim_selector'] . '._domainkey.' . $rec['domain'], DNS_TXT); if (empty($dns_record_status) || empty($dns_record_status[0]['txt'])) { // Record not found - $app->tpl->setVar('dkim_status', $app->tform->wordbook['dkim_enabled_dns_not_found'], true); + $app->tpl->setVar('dkim_status', $app->tform->wordbook['dkim_enabled_dns_not_found_txt'], true); } elseif ($dns_record_status[0]['txt'] == $dkim_txt) { - $app->tpl->setVar('dkim_status', '', false); + $app->tpl->setVar('dkim_status', '', false); } else { // Mismatch in record! - $app->tpl->setVar('dkim_status', $app->tform->wordbook['dkim_enabled_mismatched_record'], true); + $app->tpl->setVar('dkim_status', $app->tform->wordbook['dkim_enabled_mismatched_record_txt'], true); } } -- GitLab