From 4dd13200d0bcaf0c22f99f277e8f68137aa2c685 Mon Sep 17 00:00:00 2001
From: Udo Waechter <udo@maketank.net>
Date: Wed, 3 Sep 2025 12:16:59 +0200
Subject: [PATCH] updated dmarc entry

---
 lib/Froxlor/Dns/Dns.php |  2 +-
 lib/config.inc.php      | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 lib/config.inc.php

diff --git a/lib/Froxlor/Dns/Dns.php b/lib/Froxlor/Dns/Dns.php
index 2f5b168a..47c4c0bc 100644
--- a/lib/Froxlor/Dns/Dns.php
+++ b/lib/Froxlor/Dns/Dns.php
@@ -412,7 +412,7 @@ class Dns
 		//_dmarc 18000   IN      TXT     ("v=DMARC1; p=reject; fo=1; adkim=r; aspf=r; pct=100; rf=afrf; r"
 		//                               "i=86400; rua=mailto:dmarc@zweiseitendergeschichte.de;")
 		if ($domain['isemaildomain'] == '1') {
-		    $dmarc_txt = '("v=DMARC1; p=reject; fo=1; adkim=r; aspf=r; pct=100; rf=afrf; ri=86400; rua=mailto:dmarc@'.$domain['domain'].';")';
+		    $dmarc_txt = '("v=DMARC1; p=reject; fo=1; adkim=r; aspf=r; pct=100; rf=afrf; ri=86400; ruf=mailto:dmarc@'.$domain['domain'].'; rua=mailto:dmarc@'.$domain['domain'].';")';
 		    $dmarc_record = new DnsEntry('_dmarc', 'TXT',$dmarc_txt );
 		    array_unshift($zonerecords,$dmarc_record);
 		}
diff --git a/lib/config.inc.php b/lib/config.inc.php
new file mode 100644
index 00000000..7185f6c0
--- /dev/null
+++ b/lib/config.inc.php
@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * change the options below to either true or false
+ */
+return [
+	/**
+	 * enable/disable the possibility to update froxlor from within the web-interface,
+	 * recommended value for debian/ubuntu package users is false to rely on apt and not have version mixup.
+	 * This is also useful for providers that manage the servers but give admin access to froxlor to handle
+	 * updates the way the providers does it (e.g. automation, etc.)
+	 */
+	'enable_webupdate' => true,
+];