Merge branch 'stable-3.1' into 'stable-3.1'

Incorrect names of fields in DNS DMARC form (Fixes #4316)

See merge request !633

Author: Till Brehm

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

interface/web/dns/dns_dmarc_edit.php

@@ -94,7 +94,7 @@ function onShowEnd() {
 			$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 = '';

interface/web/dns/templates/dns_dmarc_edit.htm

@@ -51,7 +51,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
             <div class="form-group">
 				<label class="col-sm-2 control-label control-label-plain"></label>
 				<div class="col-sm-1">
-					<input type="checkbox" value="1" id="dmarc_fo0" name="dmarc_fo0" {tmpl_var name='dmarc_fo1'}/>
+					<input type="checkbox" value="1" id="dmarc_fo1" name="dmarc_fo1" {tmpl_var name='dmarc_fo1'}/>
 				</div>
 				<div class="col-sm-3 input-sm">
 					{tmpl_var name='dmarc_fo1_txt'}
@@ -97,7 +97,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
             <div class="form-group">
                 <label class="col-sm-2 control-label">{tmpl_var name='dmarc_rf_txt'}</label>
                  <div class="col-sm-1">
-                    <input type="checkbox" value="1" id="dmarc_rf_afrf" name="dmarc_fo0" {tmpl_var name='dmarc_rf_afrf'}/>
+                    <input type="checkbox" value="1" id="dmarc_rf_afrf" name="dmarc_rf_afrf" {tmpl_var name='dmarc_rf_afrf'}/>
                 </div>
                 <div class="col-sm-3 input-sm">
                     {tmpl_var name='dmarc_rf_afrf_txt'}
@@ -136,17 +136,11 @@ <h1><tmpl_var name="list_head_txt"></h1>
 					<select name="dmarc_sp" id="dmarc_sp" class="form-control">{tmpl_var name='dmarc_sp'}</select>
 				</div>
             </div>
-            <div class="form-group">
-                <label for="ttl" class="col-sm-2 control-label">{tmpl_var name='ttl_txt'}</label>
-                <div class="col-sm-3">
-					<input type="text" name="ttl" id="ttl" value="{tmpl_var name='ttl'}" class="form-control" />
-				</div>
-			</div>
 
             <div class="form-group">
                 <label class="col-sm-2 control-label">{tmpl_var name='active_txt'}</label>
                 <div class="col-sm-3">
-                    {tmpl_var name='active'}
+                    <input type="checkbox" value="1" id="active" name="active" {tmpl_var name='active'} />
                 </div>
             </div>