Merge pull request hestiacp#2022 from myrevery/fix/list-mail-dns-dkim

[Bug Fix] List mail dns DKIM issue

Author: jaapmarcus

bin/v-list-mail-domain-dkim-dns

@@ -30,7 +30,7 @@ json_list() {
     echo -e "\t},"
     echo -e "\n\t\"mail._domainkey\": {"
     echo "            \"TTL\": \"3600\","
-    echo "            \"TXT\": \"\\\"$pub\\\"\""
+    echo "            \"TXT\": \"'v=DKIM1; k=rsa; p=$pub'\""
     echo -e "\t}\n}"
 }
 
@@ -39,20 +39,20 @@ shell_list() {
     echo "RECORD            TTL         TYPE      VALUE"
     echo "------            ---         ----      -----"
     echo "_domainkey        3600   IN   TXT      \"t=y; o=~;\""
-    echo "mail._domainkey   3600   IN   TXT      \"k=rsa; p=$pub\""
+    echo "mail._domainkey   3600   IN   TXT      \"v=DKIM1; k=rsa; p=$pub\""
 }
 
 # PLAIN list function
 plain_list() {
     echo -e "_domainkey\t3600\tIN\tTXT\t\"t=y; o=~;\""
-    echo -e "mail._domainkey\t3600\tIN\tTXT\t\"k=rsa; p=$pub\""
+    echo -e "mail._domainkey\t3600\tIN\tTXT\t\"v=DKIM1; k=rsa; p=$pub\""
 }
 
 # CSV list function
 csv_list() {
     echo "RECORD,TTL,IN,TYPE,VALUE"
     echo "_domainkey,3600,IN,TXT,\"\"t=y; o=~;\"\""
-    echo "mail._domainkey,3600,IN,TXT,\"\"k=rsa; p=$pub\"\""
+    echo "mail._domainkey,3600,IN,TXT,\"\"v=DKIM1; k=rsa; p=$pub\"\""
 }
 
 

web/templates/pages/list_mail_dns.html

@@ -87,7 +87,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="v=DKIM1; k=rsa; p=<?=htmlspecialchars(str_replace(array('"',"'"),'',$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 } ?>
@@ -104,4 +104,4 @@
 			</div>
 		</div>
 	</div>
-</div>
+</div>