From: Michael Kaply <consulting@kaply.com>
Date: Fri, 31 Aug 2018 20:42:38 +0000 (-0500)
Subject: Bug 1466484 - Add support for removing search engines
X-Git-Tag: v1.2~9^2~1
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/9d2b2bb420e9f3fe1e681a729874099e4aba20f9?ds=inline;hp=f7bcc751ad94b921dde261df10293b65caa02af2

Bug 1466484 - Add support for removing search engines
---

diff --git a/README.md b/README.md
index 9e54f14..fd61719 100644
--- a/README.md
+++ b/README.md
@@ -495,7 +495,7 @@ This policy blocks websites from being visited. The parameters take an array of
 }
 ```
 ### Search Engines (Machine only)
-This policy allows you to add new search engines, as well as set the default and prevent the install of search engines from web pages. Only Name and URLTemplate is required.
+This policy allows you to add new search engines, remove or hide search engines, as well as set the default and prevent the install of search engines from web pages. Only Name and URLTemplate is required.
 ```
 {
   "policies": {
@@ -512,7 +512,8 @@ This policy allows you to add new search engines, as well as set the default and
         }
       ],
       "Default": "Name of engine",
-      "PreventInstalls": [true|false]
+      "PreventInstalls": [true|false],
+      "Remove": ["Twitter", "Wikipedia (en)"]
     }
   }
 }
diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 08b42f1..8b4d574 100644
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -329,6 +329,10 @@ Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, wird
       <string id="SearchEngines_PreventInstalls_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, können Benutzer keine Suchmaschinen hinzufügen.
 
 Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, können Suchmaschinen hinzugefügt werden.</string>
+      <string id="SearchEngines_Remove">Remove Search Engines</string>
+      <string id="SearchEngines_Remove_Explain">If this policy is enabled, you can specify the names of engines to be removed or hidden.
+
+If this policy is disabled or not configured, search engines will not be removed or hidden.</string>
     </stringTable>
     <presentationTable>
       <presentation id="Authentication">
@@ -417,6 +421,9 @@ Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, könn
           <label/>
         </textBox>
       </presentation>
+      <presentation id="SearchEngines_Remove">
+        <listBox refId="SearchEngines_Remove"/>
+      </presentation>
       <presentation id="Proxy">
         <checkBox refId="ProxyLocked">Ändern der Proxy-Einstellungen nicht erlauben</checkBox>
         <text>Verbindungs-Einstellungen</text>
diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 18b353c..7952876 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -329,6 +329,10 @@ If this policy is disabled or not configured, the Firefox default engine is used
       <string id="SearchEngines_PreventInstalls_Explain">If this policy is enabled, the user cannot install search engines from web page.
 
 If this policy is disabled or not configured, search engines can be installed from web pages.</string>
+      <string id="SearchEngines_Remove">Remove Search Engines</string>
+      <string id="SearchEngines_Remove_Explain">If this policy is enabled, you can specify the names of engines to be removed or hidden.
+
+If this policy is disabled or not configured, search engines will not be removed or hidden.</string>
     </stringTable>
     <presentationTable>
       <presentation id="Authentication">
@@ -417,6 +421,9 @@ If this policy is disabled or not configured, search engines can be installed fr
           <label/>
         </textBox>
       </presentation>
+      <presentation id="SearchEngines_Remove">
+        <listBox refId="SearchEngines_Remove"/>
+      </presentation>
       <presentation id="Proxy">
         <checkBox refId="ProxyLocked">Don't allow proxy settings to be changed.</checkBox>
         <text>Connection Type:</text>
diff --git a/windows/firefox.admx b/windows/firefox.admx
index 1be3b6e..4ce9e40 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -991,5 +991,12 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="SearchEngines_Remove" class="Both" displayName="$(string.SearchEngines_Remove)" explainText="$(string.SearchEngines_Remove_Explain)" key="Software\Policies\Mozilla\Firefox\SearchEngines\Remove" presentation="$(presentation.SearchEngines_Remove)" >
+      <parentCategory ref="Search" />
+      <supportedOn ref="SUPPORTED_FF62ESR" />
+      <elements >
+        <list id="SearchEngines_Remove" key="Software\Policies\Mozilla\Firefox\SearchEngines\Remove" valuePrefix=""/>
+      </elements>
+    </policy>
   </policies>
 </policyDefinitions>
diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index f7e3834..9e01911 100644
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -329,6 +329,10 @@ Se questo criterio è disabilitato o non configurato, verrà utilizzato il motor
       <string id="SearchEngines_PreventInstalls_Explain">Se questo criterio è abilitato, l'utente non potrà installare motori di ricerca dalle pagine Web.
 
 Se questo criterio è disabilitato o non configurato, i motori di ricerca potranno essere installati dalle pagine Web.</string>
+      <string id="SearchEngines_Remove">Remove Search Engines</string>
+      <string id="SearchEngines_Remove_Explain">If this policy is enabled, you can specify the names of engines to be removed or hidden.
+
+If this policy is disabled or not configured, search engines will not be removed or hidden.</string>
     </stringTable>
     <presentationTable>
       <presentation id="Authentication">
@@ -417,6 +421,9 @@ Se questo criterio è disabilitato o non configurato, i motori di ricerca potran
           <label/>
         </textBox>
       </presentation>
+      <presentation id="SearchEngines_Remove">
+        <listBox refId="SearchEngines_Remove"/>
+      </presentation>
       <presentation id="Proxy">
         <checkBox refId="ProxyLocked">Non consentire la modifica delle impostazioni del proxy.</checkBox>
         <text>Tipo connessione:</text>