From 4f9b63759c3973ae4e4d149e5b5c8be54e5fe308 Mon Sep 17 00:00:00 2001 From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Thu, 23 Apr 2020 15:55:53 -0500 Subject: [PATCH] Initial checkin of Autoplay->Default/Locked --- README.md | 28 +++++++++++++++++++--------- mac/org.mozilla.firefox.plist | 4 ++++ windows/de-DE/firefox.adml | 16 ++++++++++++++++ windows/en-US/firefox.adml | 16 ++++++++++++++++ windows/es-ES/firefox.adml | 16 ++++++++++++++++ windows/firefox.admx | 33 +++++++++++++++++++++++++++++++++ windows/fr-FR/firefox.adml | 16 ++++++++++++++++ windows/it-IT/firefox.adml | 16 ++++++++++++++++ windows/zh-TW/firefox.adml | 16 ++++++++++++++++ 9 files changed, 152 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index d143a3f..7152523 100644 --- a/README.md +++ b/README.md @@ -2117,9 +2117,11 @@ Set permissions associated with camera, microphone, location, notifications, and `Locked` prevents the user from changing preferences for the feature. -**Compatibility:** Firefox 62, Firefox ESR 60.2 (Autoplay added in Firefox 74, Firefox ESR 68.6\ +`Default` specifies the default value for Autoplay. block-audio-video is not supported on Firefox ESR 68. + +**Compatibility:** Firefox 62, Firefox ESR 60.2 (Autoplay added in Firefox 74, Firefox ESR 68.6, Autoplay Default/Locked added in Firefox 76, Firefox ESR 68.8)\ **CCK2 Equivalent:** N/A\ -**Preferences Affected:** `permissions.default.camera`,`permissions.default.microphone`,`permissions.default.geo`,`permissions.default.desktop-notification` +**Preferences Affected:** `permissions.default.camera`,`permissions.default.microphone`,`permissions.default.geo`,`permissions.default.desktop-notification`,`media.autoplay.default` #### Windows (GPO) ``` @@ -2142,6 +2144,8 @@ Software\Policies\Mozilla\Firefox\Permissions\Notifications\BlockNewRequests = 0 Software\Policies\Mozilla\Firefox\Permissions\Notifications\Locked = 0x1 | 0x0 Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Allow\1 = "https://example.org" Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Block\1 = "https://example.edu" +Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Default = "allow-audio-video" | "block-audio" | "block-audio-video" +Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Locked = 0x1 | 0x0 ``` #### macOS ``` @@ -2160,9 +2164,9 @@ Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Block\1 = "https://exampl https://example.edu BlockNewRequests - + | Locked - + | Microphone @@ -2175,9 +2179,9 @@ Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Block\1 = "https://exampl https://example.edu BlockNewRequests - + | Locked - + | Location @@ -2190,9 +2194,9 @@ Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Block\1 = "https://exampl https://example.edu BlockNewRequests - + | Locked - + | Notifications @@ -2219,6 +2223,10 @@ Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Block\1 = "https://exampl https://example.edu + Default + allow-audio-video | block-audio | block-audio-video + Locked + | @@ -2254,7 +2262,9 @@ Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Block\1 = "https://exampl }, "Autoplay": { "Allow": ["https://example.org"], - "Block": ["https://example.edu"] + "Block": ["https://example.edu"], + "Default": "allow-audio-video" | "block-audio" | "block-audio-video", + "Locked": true | false } } } diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist index 7d57042..3aa4b0f 100644 --- a/mac/org.mozilla.firefox.plist +++ b/mac/org.mozilla.firefox.plist @@ -377,6 +377,10 @@ https://example.edu + Default + block-audio + Locked + PopupBlocking diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml index 95aba1a..9ca80fc 100644 --- a/windows/de-DE/firefox.adml +++ b/windows/de-DE/firefox.adml @@ -422,6 +422,19 @@ Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, wird Wenn diese Richtlinieneinstellung aktiviert ist, ist die Automatische Wiedergabe für die genannten Quellen immer deaktiviert. Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert, wird die Standardeinstellung zur Automatischen Wiedergabe von Medien befolgt. + Default autoplay level + If this policy is enabled, you can choose the default autoplay level. + +If this policy is disabled or not configured, audio is blocked by default. + +Note: Blocking audio and video does not work on the ESR. + Do not allow preferences to be changed + If this policy is enabled, autoplay preferences cannot be changed by the user. + +If this policy is disabled or not configured, the user can change autoplay preferences. + Allow Audio and Video + Block Audio + Block Audio and Video Firefox Home anpassen Wenn diese Richtlinieneinstellung aktiviert ist, können die Sektionen festgelegt werden, die der Anwender sieht und der Anwender kann diese nicht mehr anpassen. @@ -1006,6 +1019,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences (E + + + diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index ab98ec6..6458473 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -422,6 +422,19 @@ If this policy is disabled or not configured, the default autoplay policy is fol If this policy is enabled, autoplay is always blocked for the origins indicated. If this policy is disabled or not configured, the default autoplay policy is followed. + Default autoplay level + If this policy is enabled, you can choose the default autoplay level. + +If this policy is disabled or not configured, audio is blocked by default. + +Note: Blocking audio and video does not work on the ESR. + Do not allow preferences to be changed + If this policy is enabled, autoplay preferences cannot be changed by the user. + +If this policy is disabled or not configured, the user can change autoplay preferences. + Allow Audio and Video + Block Audio + Block Audio and Video Customize Firefox Home If this policy is enabled, you can choose the sections displayed on Firefox Home and prevent the user from changing them. @@ -1007,6 +1020,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences. + + + diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml index c450a0f..5c9d896 100644 --- a/windows/es-ES/firefox.adml +++ b/windows/es-ES/firefox.adml @@ -422,6 +422,19 @@ Si esta política está deshabilitada o no está configurada, se seguirá la pol Si esta política está habilitada, la reproducción automática siempre se bloqueará para los orígenes indicados. Si esta política está deshabilitada o no está configurada, se seguirá la política predeterminada de reproducción automática. + Default autoplay level + If this policy is enabled, you can choose the default autoplay level. + +If this policy is disabled or not configured, audio is blocked by default. + +Note: Blocking audio and video does not work on the ESR. + Do not allow preferences to be changed + If this policy is enabled, autoplay preferences cannot be changed by the user. + +If this policy is disabled or not configured, the user can change autoplay preferences. + Allow Audio and Video + Block Audio + Block Audio and Video Personalizar inicio de Firefox Si esta política está habilitada, podrá elegir las secciones que se muestran en la página de inicio de Firefox e impedir que el usuario las cambie. @@ -1007,6 +1020,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences + + + diff --git a/windows/firefox.admx b/windows/firefox.admx index 4b03aab..6a007d9 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -478,6 +478,39 @@ + + + + + + + + + + + + + + + + + + allow-audio-video + + + + + block-audio + + + + + block-audio-video + + + + + diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml index 18ff353..a684fbc 100644 --- a/windows/fr-FR/firefox.adml +++ b/windows/fr-FR/firefox.adml @@ -422,6 +422,19 @@ If this policy is disabled or not configured, the default autoplay policy is fol If this policy is enabled, autoplay is always blocked for the origins indicated. If this policy is disabled or not configured, the default autoplay policy is followed. + Default autoplay level + If this policy is enabled, you can choose the default autoplay level. + +If this policy is disabled or not configured, audio is blocked by default. + +Note: Blocking audio and video does not work on the ESR. + Do not allow preferences to be changed + If this policy is enabled, autoplay preferences cannot be changed by the user. + +If this policy is disabled or not configured, the user can change autoplay preferences. + Allow Audio and Video + Block Audio + Block Audio and Video Customize Firefox Home If this policy is enabled, you can choose the sections displayed on Firefox Home and prevent the user from changing them. @@ -1007,6 +1020,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences + + + diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml index 1e753c3..50bc666 100644 --- a/windows/it-IT/firefox.adml +++ b/windows/it-IT/firefox.adml @@ -422,6 +422,19 @@ Se questo criterio è disabilitato o non configurato, viene seguito il criterio Se questo criterio è abilitato, la riproduzione automatica sarà sempre bloccata per le origini indicate. Se questo criterio è disabilitato o non configurato, viene seguito il criterio predefinito per la riproduzione automatica. + Default autoplay level + If this policy is enabled, you can choose the default autoplay level. + +If this policy is disabled or not configured, audio is blocked by default. + +Note: Blocking audio and video does not work on the ESR. + Do not allow preferences to be changed + If this policy is enabled, autoplay preferences cannot be changed by the user. + +If this policy is disabled or not configured, the user can change autoplay preferences. + Allow Audio and Video + Block Audio + Block Audio and Video Personalizza pagina iniziale di Firefox Se questo criterio è abilitato, è possibile scegliere le sezioni visualizzate nella pagina iniziale di Firefox e impedire all'utente di modificarle. @@ -1007,6 +1020,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences + + + diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml index ce0e5b2..e38eb94 100644 --- a/windows/zh-TW/firefox.adml +++ b/windows/zh-TW/firefox.adml @@ -420,6 +420,19 @@ Mozilla 建議您不要停用 Telemetry。透過 Telemetry 收集到的資訊可 若啟用此原則，將永遠針對指定的來源封鎖自動播放。 若停用或不設定此原則，將遵循預設自動播放原則。 + Default autoplay level + If this policy is enabled, you can choose the default autoplay level. + +If this policy is disabled or not configured, audio is blocked by default. + +Note: Blocking audio and video does not work on the ESR. + Do not allow preferences to be changed + If this policy is enabled, autoplay preferences cannot be changed by the user. + +If this policy is disabled or not configured, the user can change autoplay preferences. + Allow Audio and Video + Block Audio + Block Audio and Video 自訂 Firefox 首頁 若啟用此原則，將可以設定要在 Firefox 首頁顯示哪些段落，並防止使用者更改設定。 @@ -1005,6 +1018,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。 + + + \ No newline at end of file -- 2.34.1