From b83dcd1595a586e76e1e8a57ad25f0cfb457e3ff Mon Sep 17 00:00:00 2001
From: blue <playbynumbers@gmail.com>
Date: Mon, 4 Apr 2022 19:16:53 +0100
Subject: [PATCH] Change Firefox sz policies to multi_sz

https://bugzilla.mozilla.org/show_bug.cgi?id=1762253#c12
---
 tools/GroupPolicy/en-US/uBlock.adml | 15 +++++++++++++++
 tools/GroupPolicy/uBlock.admx       | 20 ++++++++++----------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/tools/GroupPolicy/en-US/uBlock.adml b/tools/GroupPolicy/en-US/uBlock.adml
index 645323a2c..2defb1c61 100644
--- a/tools/GroupPolicy/en-US/uBlock.adml
+++ b/tools/GroupPolicy/en-US/uBlock.adml
@@ -122,6 +122,21 @@ https://github.com/gorhill/uBlock/wiki/Deploying-uBlock-Origin:-configuration#to
                     <label>Properties to overwrite:</label>
                 </textBox>
             </presentation>
+            <presentation id="advancedSettingsMulti">
+                <multiTextBox refId="advancedSettingsDialogMulti" />
+            </presentation>
+            <presentation id="userSettingsMulti">
+                <multiTextBox refId="userSettingsDialogMulti" />
+            </presentation>
+            <presentation id="disabledPopupPanelPartsMulti">
+                <multiTextBox refId="disabledPopupPanelPartsDialogMulti" />
+            </presentation>
+            <presentation id="toAddMulti">
+                <multiTextBox refId="toAddDialogMulti" />
+            </presentation>
+            <presentation id="toOverwriteMulti">
+                <multiTextBox refId="toOverwriteDialogMulti" />
+            </presentation>
         </presentationTable>
     </resources>
 </policyDefinitionResources>
diff --git a/tools/GroupPolicy/uBlock.admx b/tools/GroupPolicy/uBlock.admx
index 7447e6f3a..38f62d036 100644
--- a/tools/GroupPolicy/uBlock.admx
+++ b/tools/GroupPolicy/uBlock.admx
@@ -122,43 +122,43 @@
                 <text id="adminSettingsDialog" valueName="adminSettings" required="true" />
             </elements>
         </policy>
-        <policy name="firefoxAdvancedSettings" class="Both" displayName="$(string.advancedSettings)" explainText="$(string.advancedSettings_Help)" presentation="$(presentation.advancedSettings)" key="Software\Policies\Mozilla\Firefox\3rdparty\Extensions\uBlock0@raymondhill.net">
+        <policy name="firefoxAdvancedSettings" class="Both" displayName="$(string.advancedSettings)" explainText="$(string.advancedSettings_Help)" presentation="$(presentation.advancedSettingsMulti)" key="Software\Policies\Mozilla\Firefox\3rdparty\Extensions\uBlock0@raymondhill.net">
             <parentCategory ref="MozillaFirefox" />
             <supportedOn ref="V1_33_0" />
             <elements>
-                <text id="advancedSettingsDialog" valueName="advancedSettings" required="true" />
+                <multiText id="advancedSettingsDialogMulti" valueName="advancedSettings" required="true" maxStrings="1" />
             </elements>
         </policy>
-        <policy name="firefoxUserSettings" class="Both" displayName="$(string.userSettings)" explainText="$(string.userSettings_Help)" presentation="$(presentation.userSettings)" key="Software\Policies\Mozilla\Firefox\3rdparty\Extensions\uBlock0@raymondhill.net">
+        <policy name="firefoxUserSettings" class="Both" displayName="$(string.userSettings)" explainText="$(string.userSettings_Help)" presentation="$(presentation.userSettingsMulti)" key="Software\Policies\Mozilla\Firefox\3rdparty\Extensions\uBlock0@raymondhill.net">
             <parentCategory ref="MozillaFirefox" />
             <supportedOn ref="V1_33_0" />
             <elements>
-                <text id="userSettingsDialog" valueName="userSettings" required="true" />
+                <multiText id="userSettingsDialogMulti" valueName="userSettings" required="true" maxStrings="1" />
             </elements>
         </policy>
         <policy name="firefoxDisableDashboard" class="Both" displayName="$(string.disableDashboard)" explainText="$(string.disableDashboard_Help)" key="Software\Policies\Mozilla\Firefox\3rdparty\Extensions\uBlock0@raymondhill.net" valueName="disableDashboard">
             <parentCategory ref="MozillaFirefox" />
             <supportedOn ref="V1_33_0" />
         </policy>
-        <policy name="firefoxDisabledPopupPanelParts" class="Both" displayName="$(string.disabledPopupPanelParts)" explainText="$(string.disabledPopupPanelParts_Help)" presentation="$(presentation.disabledPopupPanelParts)" key="Software\Policies\Mozilla\Firefox\3rdparty\Extensions\uBlock0@raymondhill.net">
+        <policy name="firefoxDisabledPopupPanelParts" class="Both" displayName="$(string.disabledPopupPanelParts)" explainText="$(string.disabledPopupPanelParts_Help)" presentation="$(presentation.disabledPopupPanelPartsMulti)" key="Software\Policies\Mozilla\Firefox\3rdparty\Extensions\uBlock0@raymondhill.net">
             <parentCategory ref="MozillaFirefox" />
             <supportedOn ref="V1_33_0" />
             <elements>
-                <text id="disabledPopupPanelPartsDialog" valueName="disabledPopupPanelParts" required="true" />
+                <multiText id="disabledPopupPanelPartsDialogMulti" valueName="disabledPopupPanelParts" required="true" maxStrings="1" />
             </elements>
         </policy>
-        <policy name="firefoxToAdd" class="Both" displayName="$(string.toAdd)" explainText="$(string.toAdd_Help)" presentation="$(presentation.toAdd)" key="Software\Policies\Mozilla\Firefox\3rdparty\Extensions\uBlock0@raymondhill.net">
+        <policy name="firefoxToAdd" class="Both" displayName="$(string.toAdd)" explainText="$(string.toAdd_Help)" presentation="$(presentation.toAddMulti)" key="Software\Policies\Mozilla\Firefox\3rdparty\Extensions\uBlock0@raymondhill.net">
             <parentCategory ref="MozillaFirefox" />
             <supportedOn ref="V1_33_0" />
             <elements>
-                <text id="toAddDialog" valueName="toAdd" required="true" />
+                <multiText id="toAddDialogMulti" valueName="toAdd" required="true" maxStrings="1" />
             </elements>
         </policy>
-        <policy name="firefoxToOverwrite" class="Both" displayName="$(string.toOverwrite)" explainText="$(string.toOverwrite_Help)" presentation="$(presentation.toOverwrite)" key="Software\Policies\Mozilla\Firefox\3rdparty\Extensions\uBlock0@raymondhill.net">
+        <policy name="firefoxToOverwrite" class="Both" displayName="$(string.toOverwrite)" explainText="$(string.toOverwrite_Help)" presentation="$(presentation.toOverwriteMulti)" key="Software\Policies\Mozilla\Firefox\3rdparty\Extensions\uBlock0@raymondhill.net">
             <parentCategory ref="MozillaFirefox" />
             <supportedOn ref="V1_33_0" />
             <elements>
-                <text id="toOverwriteDialog" valueName="toOverwrite" required="true" />
+                <multiText id="toOverwriteDialogMulti" valueName="toOverwrite" required="true" maxStrings="1" />
             </elements>
         </policy>
     </policies>