From c4cf9d5e0cd53fbe56ed76fcd7b528ac42014b64 Mon Sep 17 00:00:00 2001
From: JtheBAB <42135332+JtheBAB@users.noreply.github.com>
Date: Fri, 8 Mar 2019 12:27:19 +0100
Subject: [PATCH] Update syntax for GPO DefaultServerList (#944)

---
 resources/windows/gpo/en-US/mattermost.adml |  8 +-------
 resources/windows/gpo/mattermost.admx       | 12 ++++++------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/resources/windows/gpo/en-US/mattermost.adml b/resources/windows/gpo/en-US/mattermost.adml
index 1e4ffd2c..cd5573ba 100644
--- a/resources/windows/gpo/en-US/mattermost.adml
+++ b/resources/windows/gpo/en-US/mattermost.adml
@@ -5,7 +5,6 @@
 	<resources >
 		<stringTable >
 			<string id="SUPPORTED_MMD43">Mattermost Desktop Application 4.3 or later</string>
-			<string id="SUPPORTED_MMD44">Mattermost Desktop Application 4.4 or later</string>
 			<string id="mattermost">Mattermost</string>
 			<string id="DisableAutoUpdate">Disable Auto Updater</string>
 			<string id="DisableAutoUpdate_Explain">If this policy is enabled, the Mattermost Desktop Application does not receive udpates.
@@ -17,8 +16,6 @@ If this policy is disabled or not configured, the Mattermost Desktop Application
 If this policy is disabled or not configured, it is possible to add new servers.</string>
 			<string id="ServerURL">Server addresses</string>
 			<string id="ServerURL_Explain">If this policy is enabled, you can set one or more Mattermost server addresses.
-Use the syntax:
-Servername,https://server.com|Servername2,https://server2.com
 
 If this policy is disabled or not configured, no servers are preconfigured.</string>
 			<string id="PreventGPU">Disable GPU hardware acceleration</string>
@@ -28,10 +25,7 @@ If this policy is disabled or not configured, the Mattermost Desktop Application
 		</stringTable>
 		<presentationTable>
 			<presentation id="ServerURL">
-				<text>URL:</text>
-				<textBox refId="ServerURL">
-					<label/>
-				</textBox>
+				<listBox refId="ServerURL">List of servers:</listBox>
 			</presentation>
 		</presentationTable>
 	</resources>
diff --git a/resources/windows/gpo/mattermost.admx b/resources/windows/gpo/mattermost.admx
index b6259a4b..55f138e6 100644
--- a/resources/windows/gpo/mattermost.admx
+++ b/resources/windows/gpo/mattermost.admx
@@ -33,16 +33,16 @@
 				<decimal value="0"/>
 			</disabledValue>
 		</policy>
-		<policy name="ServerURL" class="Both" displayName="$(string.ServerURL)" explainText="$(string.ServerURL_Explain)" key="Software\Policies\Mattermost" presentation="$(presentation.ServerURL)" >
-			<parentCategory ref="mattermost"/>
-			<supportedOn ref="SUPPORTED_MMD43"/>
-			<elements >
-				<text id="ServerURL" valueName="URL" required="true" />
+		<policy name="ServerURL" class="Both" displayName="$(string.ServerURL)" explainText="$(string.ServerURL_Explain)" presentation="$(presentation.ServerURL)" key="Software\Policies\Mattermost">
+			<parentCategory ref="mattermost" />
+			<supportedOn ref="SUPPORTED_MMD43" />
+			<elements>
+				<list id="ServerURL" key="Software\Policies\Mattermost\DefaultServerList" additive="true" explicitValue="true" />
 			</elements>
 		</policy>
 		<policy name="PreventGPU" class="Machine" displayName="$(string.PreventGPU)" explainText="$(string.PreventGPU_Explain)" key="Software\Policies\Mattermost" valueName="PreventGPU">
 			<parentCategory ref="mattermost"/>
-			<supportedOn ref="SUPPORTED_MMD44"/>
+			<supportedOn ref="SUPPORTED_MMD43"/>
 			<enabledValue>
 				<decimal value="1"/>
 			</enabledValue>