From 9754fffbc410706d41ce33baa5bac3747608eb9c Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Sun, 10 Sep 2017 19:35:31 +0200
Subject: [PATCH] Simplify the details page for RUA/RUF

---
 admin/mailu/admin/templates/domain/details.html | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/admin/mailu/admin/templates/domain/details.html b/admin/mailu/admin/templates/domain/details.html
index ba77201f..1ae45e16 100644
--- a/admin/mailu/admin/templates/domain/details.html
+++ b/admin/mailu/admin/templates/domain/details.html
@@ -42,15 +42,7 @@
     </tr>
     <tr>
       <th>{% trans %}DNS DMARC entry{% endtrans %}</th>
-      {% if config["DMARC_RUA"] != "" and config["DMARC_RUF"] != "" %}
-      <td><pre>_dmarc.{{ domain.name }}. 600 IN TXT "v=DMARC1; p=reject; rua=mailto:{{ config["DMARC_RUA"] }}@{{ config["DOMAIN"] }}; ruf=mailto:{{ config["DMARC_RUF"] }}@{{ config["DOMAIN"] }}; adkim=s; aspf=s"</pre></td>
-      {% elif config["DMARC_RUA"] != "" %}
-      <td><pre>_dmarc.{{ domain.name }}. 600 IN TXT "v=DMARC1; p=reject; rua=mailto:{{ config["DMARC_RUA"] }}@{{ config["DOMAIN"] }}; adkim=s; aspf=s"</pre></td>
-      {% elif config["DMARC_RUF"] != "" %}
-      <td><pre>_dmarc.{{ domain.name }}. 600 IN TXT "v=DMARC1; p=reject; ruf=mailto:{{ config["DMARC_RUF"] }}@{{ config["DOMAIN"] }}; adkim=s; aspf=s"</pre></td>
-      {% else %}
-      <td><pre>_dmarc.{{ domain.name }}. 600 IN TXT "v=DMARC1; p=reject; rua=mailto:{{ config["POSTMASTER"] }}@{{ config["DOMAIN"] }}; adkim=s; aspf=s"</pre></td>
-      {% endif %}
+      <td><pre>_dmarc.{{ domain.name }}. 600 IN TXT "v=DMARC1; p=reject;{% if config["DMARC_RUA"] %} rua=mailto:{{ config["DMARC_RUA"] }}@{{ config["DOMAIN"] }};{% endif %}{% if config["DMARC_RUF"] %} ruf=mailto:{{ config["DMARC_RUF"] }}@{{ config["DOMAIN"] }};{% endif %} adkim=s; aspf=s"</pre></td>
     </tr>
     {% endif %}
   </tbody>