Merge remote-tracking branch 'ispc/master' into new-layout-3.1

Marius Cramer

2014-11-27 b553b2bf146cf20bd3ddfeba52ec5cc5b70a1da9

 interface/web/mail/mail_domain_dkim_create.php

@@ -163,7 +163,7 @@
echo "<privatekey>".$private_key."</privatekey>\n";
echo "<publickey>".$public_key."</publickey>\n";
if ( validate_domain($_POST['domain']) ) {
   echo '<dns_record>'.$selector.'_domainkey.'.$_POST['domain'].'. 3600   TXT   "v=DKIM1; t=s; p='.$dns_record.'"</dns_record>';
   echo '<dns_record>'.$selector.'._domainkey.'.$_POST['domain'].'. 3600   TXT   "v=DKIM1; t=s; p='.$dns_record.'"</dns_record>';
}
echo "</formatname>\n";
?>