From c91b5fb836d9b1963cfa910a0616e6fe2a77a4a3 Mon Sep 17 00:00:00 2001
From: Till <t.brehm@ispconfig.org>
Date: Thu, 25 May 2023 20:10:45 +0200
Subject: [PATCH] Do not show DKIM key in split format
---
interface/web/mail/mail_domain_edit.php | 9 ++++++---
interface/web/mail/templates/mail_domain_edit.htm | 3 ++-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php
index f17f74e012..badeb67d45 100644
--- a/interface/web/mail/mail_domain_edit.php
+++ b/interface/web/mail/mail_domain_edit.php
@@ -245,9 +245,12 @@ class page_action extends tform_actions {
$rec = $app->db->queryOneRecord($sql, $app->functions->intval($_GET['id']));
$dns_key = str_replace(array('-----BEGIN PUBLIC KEY-----','-----END PUBLIC KEY-----',"\r","\n"),'',$rec['dkim_public']);
- $keyparts = str_split('v=DKIM1; t=s; p=' . $dns_key, 200);
- array_walk($keyparts, function(&$value, $key) { $value = '"'.$value.'"'; } );
- $dkim_txt = implode('', $keyparts);
+ /* we do not show split DKIM key anymore
+ $keyparts = str_split('v=DKIM1; t=s; p=' . $dns_key, 200);
+ array_walk($keyparts, function(&$value, $key) { $value = '"'.$value.'"'; } );
+ $dkim_txt = implode('', $keyparts);
+ */
+ $dkim_txt = '"v=DKIM1; t=s; p=' . $dns_key . '"';
$dns_record = $rec['dkim_selector'] . '._domainkey.' . $rec['domain'] . '. 3600 IN TXT '.$dkim_txt;
diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm
index 3486dcfff2..9e69bd723a 100644
--- a/interface/web/mail/templates/mail_domain_edit.htm
+++ b/interface/web/mail/templates/mail_domain_edit.htm
@@ -157,7 +157,8 @@
type : "create_dkim"
}, function(data) {
var dkim_txt = 'v=DKIM1; t=s; p=' + data['dns_record'].replace(/(\r\n|\n|\r)/gm, "");
- var dns=data['dkim_selector'] + '._domainkey.' + data['domain'] + '. 3600 IN TXT ' + dkim_txt.match(new RegExp('.{1,' + '200' + '}', 'g')).map(chunk => '"' + chunk + '"').join('');
+ //var dns=data['dkim_selector'] + '._domainkey.' + data['domain'] + '. 3600 IN TXT ' + dkim_txt.match(new RegExp('.{1,' + '200' + '}', 'g')).map(chunk => '"' + chunk + '"').join('');
+ var dns=data['dkim_selector'] + '._domainkey.' + data['domain'] + '. 3600 IN TXT "' + dkim_txt + '"';
$("#dkim_selector").val(data.dkim_selector);
$("#dkim_public").val(data.dkim_public);
--
GitLab