Skip to content

Commit c91b5fb

Browse files
committed
Do not show DKIM key in split format
1 parent f8923da commit c91b5fb

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

interface/web/mail/mail_domain_edit.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,12 @@ function onShowEnd() {
245245
$rec = $app->db->queryOneRecord($sql, $app->functions->intval($_GET['id']));
246246
$dns_key = str_replace(array('-----BEGIN PUBLIC KEY-----','-----END PUBLIC KEY-----',"\r","\n"),'',$rec['dkim_public']);
247247

248-
$keyparts = str_split('v=DKIM1; t=s; p=' . $dns_key, 200);
249-
array_walk($keyparts, function(&$value, $key) { $value = '"'.$value.'"'; } );
250-
$dkim_txt = implode('', $keyparts);
248+
/* we do not show split DKIM key anymore
249+
$keyparts = str_split('v=DKIM1; t=s; p=' . $dns_key, 200);
250+
array_walk($keyparts, function(&$value, $key) { $value = '"'.$value.'"'; } );
251+
$dkim_txt = implode('', $keyparts);
252+
*/
253+
$dkim_txt = '"v=DKIM1; t=s; p=' . $dns_key . '"';
251254

252255
$dns_record = $rec['dkim_selector'] . '._domainkey.' . $rec['domain'] . '. 3600 IN TXT '.$dkim_txt;
253256

interface/web/mail/templates/mail_domain_edit.htm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,8 @@
157157
type : "create_dkim"
158158
}, function(data) {
159159
var dkim_txt = 'v=DKIM1; t=s; p=' + data['dns_record'].replace(/(\r\n|\n|\r)/gm, "");
160-
var dns=data['dkim_selector'] + '._domainkey.' + data['domain'] + '. 3600 IN TXT ' + dkim_txt.match(new RegExp('.{1,' + '200' + '}', 'g')).map(chunk => '"' + chunk + '"').join('');
160+
//var dns=data['dkim_selector'] + '._domainkey.' + data['domain'] + '. 3600 IN TXT ' + dkim_txt.match(new RegExp('.{1,' + '200' + '}', 'g')).map(chunk => '"' + chunk + '"').join('');
161+
var dns=data['dkim_selector'] + '._domainkey.' + data['domain'] + '. 3600 IN TXT "' + dkim_txt + '"';
161162

162163
$("#dkim_selector").val(data.dkim_selector);
163164
$("#dkim_public").val(data.dkim_public);

0 commit comments

Comments
 (0)