From e9044ac811972c3bdac163dddd404d1c5611e2c3 Mon Sep 17 00:00:00 2001
From: Evgeny Grin <k2k@narod.ru>
Date: Thu, 22 Dec 2022 15:14:51 +0300
Subject: [PATCH] dns/dnscrypt-proxy: fix GUI with more than one disabled
 server

---
 dns/dnscrypt-proxy/pkg-descr                               | 4 ++++
 .../mvc/app/models/OPNsense/Dnscryptproxy/General.xml      | 7 +++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dns/dnscrypt-proxy/pkg-descr b/dns/dnscrypt-proxy/pkg-descr
index 660be17e3..aec6d08b1 100644
--- a/dns/dnscrypt-proxy/pkg-descr
+++ b/dns/dnscrypt-proxy/pkg-descr
@@ -5,6 +5,10 @@ such as DNSCrypt v2 and DNS-over-HTTPS.
 Plugin Changelog
 ================
 
+1.14
+
+* Fix display of the config with more than one disabled server in GUI (contributed by Evgeny Grin (karlson2k))
+
 1.13
 
 * Add necessary hooks to allow the plugin to be used as a standalone core DNS server
diff --git a/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/General.xml b/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/General.xml
index 0978e7a5a..f7a64b907 100644
--- a/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/General.xml
+++ b/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/General.xml
@@ -140,12 +140,11 @@
             <default>1</default>
             <Required>Y</Required>
         </query_logs>
-        <disabled_serverlist type="TextField">
-            <mask>/^([a-z0-9.,\-]{1,70})$/</mask>
+        <disabled_serverlist type="CSVListField">
+            <mask>/^[A-Za-z0-9\._\-]{1,70}(,[A-Za-z0-9\._\-]{1,70})*$/</mask>
             <default></default>
             <Required>N</Required>
-            <FieldSeparator>,</FieldSeparator>
-            <asList>Y</asList>
+            <ValidationMessage>Please use valid server names.</ValidationMessage>
         </disabled_serverlist>
         <relaylist type="CSVListField">
             <Required>N</Required>