X-Git-Url: https://git.p6c8.net/policy-templates.git/blobdiff_plain/40964cf7f38281bbaec6d49e955172055071822f..8a394f33ab020a980a653bf79eeacb7c3599f9ab:/windows/firefox.admx?ds=sidebyside

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 14df4c5..a18a28f 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -19,13 +19,13 @@
       <parentCategory ref="firefox"/>
     </category>
     <category displayName="$(string.Popups_group)" name="Popups">
-      <parentCategory ref="Permissions"/>
+      <parentCategory ref="firefox"/>
     </category>
     <category displayName="$(string.Cookies_group)" name="Cookies">
       <parentCategory ref="firefox"/>
     </category>
     <category displayName="$(string.Addons_group)" name="Addons">
-      <parentCategory ref="Permissions"/>
+      <parentCategory ref="addons"/>
     </category>
     <category displayName="$(string.Flash_group)" name="Flash">
       <parentCategory ref="firefox"/>
@@ -108,7 +108,7 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
-    <policy name="BlockSetDesktopBackground" class="Both" displayName="$(string.BlockSetDesktopBackground)" explainText="$(string.BlockSetDesktopBackground_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="BlockSetDesktopBackground">
+    <policy name="DisableSetDesktopBackground" class="Both" displayName="$(string.DisableSetDesktopBackground)" explainText="$(string.DisableSetDesktopBackground_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableSetDesktopBackground">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>
       <enabledValue>
@@ -159,12 +159,12 @@
         <enum id="Cookies_AcceptThirdParty" valueName="Cookies_AcceptThirdParty">
           <item displayName="$(string.Cookies_AcceptThirdParty_All)">
             <value>
-              <string>all</string>
+              <string>always</string>
             </value>
           </item>
           <item displayName="$(string.Cookies_AcceptThirdParty_None)">
             <value>
-              <string>none</string>
+              <string>never</string>
             </value>
           </item>
           <item displayName="$(string.Cookies_AcceptThirdParty_FromVisited)">
@@ -466,22 +466,42 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
-    <policy class="Both" displayName="$(string.Allow)" explainText="$(string.PopupsAllow_Explain)" key="Software\Policies\Mozilla\Firefox" name="PopupsAllow" presentation="$(presentation.PopupsAllow)">
+    <policy name="PopupBlocking_Allow" class="Both" displayName="$(string.Allow)" explainText="$(string.PopupBlocking_Allow_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.Permissions)">
       <parentCategory ref="Popups"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>
       <elements>
-        <list id="PopupsAllowDesc" key="Software\Policies\Mozilla\Firefox\Popups\Allow" valuePrefix=""/>
+        <list id="Permissions" key="Software\Policies\Mozilla\Firefox\PopupBlocking\Allow" valuePrefix=""/>
       </elements>
     </policy>
+    <policy name="PopupBlocking_Default" class="Both" displayName="$(string.PopupBlocking_Default)" explainText="$(string.PopupBlocking_Default_Explain)" key="Software\Policies\Mozilla\Firefox\PopupBlocking" valueName="Default">
+      <parentCategory ref="Popups"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="PopupBlocking_Locked" class="Both" displayName="$(string.PopupBlocking_Locked)" explainText="$(string.PopupBlocking_Locked_Explain)" key="Software\Policies\Mozilla\Firefox\PopupBlocking" valueName="Locked">
+      <parentCategory ref="Popups"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
     <policy name="InstallAddons_Allow" class="Both" displayName="$(string.Allow)" explainText="$(string.InstallAddons_Allow_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.Permissions)">
-      <parentCategory ref="firefox"/>
+      <parentCategory ref="Addons"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>
       <elements>
         <list id="Permissions" key="Software\Policies\Mozilla\Firefox\InstallAddons\Allow" valuePrefix=""/>
       </elements>
     </policy>
     <policy name="InstallAddons_Default" class="Both" displayName="$(string.InstallAddons_Default)" explainText="$(string.InstallAddons_Default_Explain)" key="Software\Policies\Mozilla\Firefox\InstallAddons" valueName="Default">
-      <parentCategory ref="firefox"/>
+      <parentCategory ref="Addons"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>
       <enabledValue>
         <decimal value="1"/>
@@ -524,6 +544,30 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="OverrideFirstRunPage" class="Both" displayName="$(string.OverrideFirstRunPage)" explainText="$(string.OverrideFirstRunPage_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.OverridePage)" >
+      <parentCategory ref="firefox" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements>
+        <text id="OverridePage" valueName="OverrideFirstRunPage"/>
+      </elements>
+    </policy>
+    <policy name="OverridePostUpdatePage" class="Both" displayName="$(string.OverridePostUpdatePage)" explainText="$(string.OverridePostUpdatePage_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.OverridePage)" >
+      <parentCategory ref="firefox" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements>
+        <text id="OverridePage" valueName="OverridePostUpdatePage"/>
+      </elements>
+    </policy>
+    <policy name="SanitizeOnShutdown" class="Both" displayName="$(string.SanitizeOnShutdown)" explainText="$(string.SanitizeOnShutdown_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="SanitizeOnShutdown">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
     <policy class="Both" displayName="$(string.HomepageURL)" name="HomepageURL" explainText="$(string.HomepageURL_Explain)" key="Software\Policies\Mozilla\Firefox\Homepage" presentation="$(presentation.HomepageURL)" >
       <parentCategory ref="Homepage" />
       <supportedOn ref="SUPPORTED_WINXPSP2" />
@@ -739,5 +783,23 @@
         </boolean>
       </elements>
     </policy>
+    <policy name="SearchBar" class="Both" displayName="$(string.SearchBar)" explainText="$(string.SearchBar_Explain)" key="Software\Policies\Mozilla\Firefox"  presentation="$(presentation.SearchBar)">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <elements>
+        <enum id="SearchBar" valueName="SearchBar">
+          <item displayName="$(string.SearchBar_Unified)">
+            <value>
+              <string>unified</string>
+            </value>
+          </item>
+          <item displayName="$(string.SearchBar_Separate)">
+            <value>
+              <string>separate</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>
   </policies>
 </policyDefinitions>