Merge branch '6454-show-dkim-key-in-unsplit-format' into 'develop'

Resolve "Show DKIM key in unsplit format"

Closes #6454

See merge request ispconfig/ispconfig3!1711

Author: Till Brehm

interface/web/mail/mail_domain_edit.php

@@ -245,9 +245,12 @@ function onShowEnd() {
 		$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;
 

interface/web/mail/templates/mail_domain_edit.htm

@@ -162,7 +162,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);