From 5db55c0e46100e7881f7a647a0ced6faf563ea3a Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Sun, 3 Sep 2017 12:32:13 +0200
Subject: [PATCH] Incorrect names of fields in DNS DMARC form (Fixes #4316)

---
 interface/web/dns/dns_dmarc_edit.php           |  2 +-
 interface/web/dns/templates/dns_dmarc_edit.htm | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/interface/web/dns/dns_dmarc_edit.php b/interface/web/dns/dns_dmarc_edit.php
index 49bf69909d..c806c7c20e 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 c47be675ef..50b6f2406d 100644
--- a/interface/web/dns/templates/dns_dmarc_edit.htm
+++ b/interface/web/dns/templates/dns_dmarc_edit.htm
@@ -51,7 +51,7 @@
             <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 @@
             <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 @@
 					<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>
 
-- 
GitLab