Include DMARC record in DNS record list #1836

Plus minor bug fixes

CHANGELOG.md

@@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file.
 
 ### Features
 
+- Include DMARC record in DNS record list #1836
+
 ### Bugfixes
 
 - Improve the calculated disk size of a new backup estimated by excluding the exclude folders, mail accounts and database in backups (#1616) @Myself5

web/templates/pages/list_mail_dns.html

@@ -36,11 +36,20 @@
 		<div class="l-unit__col l-unit__col--right">
 			<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" style="width:200px !important;" value="mail.<?=htmlspecialchars($_GET['domain']);?>" /></b> </div>
 			<div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>A</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>10</b></div>
+			<div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>0</b></div>
 			<div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>14400</b></div>
 			<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" value="<?=array_key_first($ips);?>" /></b></div>
 		</div>
 	</div>
+    <div class="l-unit animated fadeIn">
+        <div class="l-unit__col l-unit__col--right">
+            <div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" style="width:200px !important;" value="mail.<?=htmlspecialchars($_GET['domain']);?>" /></b> </div>
+            <div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>MX</b></div>
+            <div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>10</b></div>
+            <div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>14400</b></div>
+            <div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" value="<?=htmlspecialchars($_GET['domain']);?>." /></b></div>
+        </div>
+    </div>
 	<?php if($_SESSION['WEBMAIL_SYSTEM']){?>
 		<div class="l-unit animated fadeIn">
 			<div class="l-unit__col l-unit__col--right">
@@ -58,9 +67,18 @@
 			<div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>TXT</b></div>
 			<div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>&nbsp;</b></div>
 			<div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>14400</b></div>
-			<div class="clearfix l-unit__stat-col--left  wide-3 "><b><input type="text" class="vst-input" value="<?=htmlspecialchars('"v=spf1 a mx ip4:'.array_key_first($ips).'; -all"');?>" /></b></div>
+			<div class="clearfix l-unit__stat-col--left  wide-3 "><b><input type="text" class="vst-input" value="<?=htmlspecialchars('v=spf1 a mx ip4:'.array_key_first($ips).'; -all');?>" /></b></div>
 		</div>
 	</div>
+    <div class="l-unit animated fadeIn">
+        <div class="l-unit__col l-unit__col--right">
+            <div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" style="width:200px !important;" value="_dmarc" /></b> </div>
+            <div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>TXT</b></div>
+            <div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>&nbsp;</b></div>
+            <div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>14400</b></div>
+            <div class="clearfix l-unit__stat-col--left  wide-3 "><b><input type="text" class="vst-input" value="<?=htmlspecialchars('v=DMARC1; p=quarantine; pct=100');?>" /></b></div>
+        </div>
+    </div>
 	<?php foreach($dkim as $key => $value){ ?>
 		<div class="l-unit animated fadeIn">
 			<div class="l-unit__col l-unit__col--right">
@@ -68,7 +86,7 @@
 				<div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>TXT</b></div>
 				<div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>&nbsp;</b></div>
 				<div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>3600</b></div>
-				<div class="clearfix l-unit__stat-col--left  wide-3 "><b><input type="text" class="vst-input" value="<?=htmlspecialchars(str_replace("'",'"',$dkim[$key]['TXT']));?>" </b></div>
+				<div class="clearfix l-unit__stat-col--left  wide-3 "><b><input type="text" class="vst-input" value="<?=htmlspecialchars(str_replace(array('"',"'"),'',$dkim[$key]['TXT']));?>" </b></div>
 			</div>
 		</div>
 	<?php } ?>