Merge branch 'master' into 'master'

Marius Cramer

2015-09-24 9f557ddc325b64fd8e01d987cdc28e505d9434d5

Merge branch 'master' into 'master'

fixed shown public-dns record for dkim

See merge request !232

 interface/web/mail/mail_domain_edit.php

@@ -210,7 +210,7 @@
        $sql = "SELECT domain, dkim_private, dkim_public, dkim_selector FROM mail_domain WHERE domain_id = ?";
        $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']);
        $dns_record = '.' . $rec['dkim_selector'] . '_domainkey._' . $rec['domain'] . '. 3600   TXT   v=DKIM1; t=s; p=' . $dns_key;
        $dns_record = $rec['dkim_selector'] . '._domainkey.' . $rec['domain'] . '. 3600   TXT   v=DKIM1; t=s; p=' . $dns_key;
        $app->tpl->setVar('dkim_selector', $rec['dkim_selector']);
        $app->tpl->setVar('dkim_private', $rec['dkim_private']);
        $app->tpl->setVar('dkim_public', $rec['dkim_public']);