diff --git a/install/tpl/debian_postfix.conf.master b/install/tpl/debian_postfix.conf.master index 027e27ef6db944ac08c1d0683469b15ff9e9048e..b7dbea6300a8cc251c64e2b2a2b4e25748f737b1 100644 --- a/install/tpl/debian_postfix.conf.master +++ b/install/tpl/debian_postfix.conf.master @@ -9,6 +9,7 @@ virtual_uid_maps = mysql:/etc/postfix/mysql-virtual_uids.cf virtual_gid_maps = mysql:/etc/postfix/mysql-virtual_gids.cf sender_bcc_maps = proxy:mysql:{config_dir}/mysql-virtual_outgoing_bcc.cf inet_protocols=all +inet_interfaces = all smtpd_sasl_auth_enable = yes broken_sasl_auth_clients = yes smtpd_sasl_authenticated_header = yes diff --git a/interface/web/dns/dns_dmarc_edit.php b/interface/web/dns/dns_dmarc_edit.php index 49bf69909d3eecdf54f00ecfb9c5dec740d00dcf..c806c7c20e4a44c35f4866c3a5b93dc2531b2288 100644 --- a/interface/web/dns/dns_dmarc_edit.php +++ b/interface/web/dns/dns_dmarc_edit.php @@ -94,7 +94,7 @@ class page_action extends tform_actions { $this->id = 1; $old_data = strtolower($rec['data']); $app->tpl->setVar("data", $old_data); - if ($rec['active'] == 'Y') $app->tpl->setVar("active", "CHECKED"); + if ($rec['active'] == 'Y') $app->tpl->setVar("active", "CHECKED"); else $app->tpl->setVar("active", "UNCHECKED"); $dmarc_rua = ''; $dmarc_ruf = ''; $dmac_rf = ''; diff --git a/interface/web/dns/templates/dns_dmarc_edit.htm b/interface/web/dns/templates/dns_dmarc_edit.htm index c47be675ef993f7afeec1668c1816d4af4db75a5..50b6f2406d392e2eabc8cfe601dbaa0e27b6176e 100644 --- a/interface/web/dns/templates/dns_dmarc_edit.htm +++ b/interface/web/dns/templates/dns_dmarc_edit.htm @@ -51,7 +51,7 @@
- +
{tmpl_var name='dmarc_fo1_txt'} @@ -97,7 +97,7 @@
- +
{tmpl_var name='dmarc_rf_afrf_txt'} @@ -136,17 +136,11 @@
-
- -
- -
-
- {tmpl_var name='active'} +