diff options
author | Chris Koying Browet <cbro@semperpax.com> | 2017-01-18 18:11:04 +0100 |
---|---|---|
committer | Chris "Koying" Browet <cbro@semperpax.com> | 2017-06-29 21:04:16 +0200 |
commit | def43e8abdf3cf7266443a5c0293701cfa41dc38 (patch) | |
tree | ad4b9cd7af8d0b022fd502f5d2d19aae98a79e43 /system | |
parent | 4461f46f965c3ea38e43e0daed636895ebfb26a9 (diff) |
CHG: Allow to (really) disable upnp altogether
Diffstat (limited to 'system')
-rwxr-xr-x | system/settings/settings.xml | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/system/settings/settings.xml b/system/settings/settings.xml index 7efda42919..37cc1edc3d 100755 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -1821,16 +1821,29 @@ <category id="upnp" label="20187" help="36322"> <requirement>HAS_UPNP</requirement> <group id="1" label="16000"> - <setting id="services.upnpserver" type="boolean" label="21360" help="36323"> + <setting id="services.upnp" type="boolean" label="21358" help="39017"> <level>0</level> <default>false</default> <control type="toggle" /> </setting> + <setting id="services.upnpserver" type="boolean" parent="services.upnp" label="21360" help="36323"> + <level>0</level> + <default>false</default> + <dependencies> + <dependency type="enable" setting="services.upnp">true</dependency> + </dependencies> + <control type="toggle" /> + </setting> <setting id="services.upnpannounce" type="boolean" parent="services.upnpserver" label="20188" help="36324"> <level>2</level> <default>true</default> <dependencies> - <dependency type="enable" setting="services.upnpserver">true</dependency> + <dependency type="enable"> + <and> + <condition setting="services.upnp" operator="is">true</condition> + <condition setting="services.upnpserver" operator="is">true</condition> + </and> + </dependency> </dependencies> <control type="toggle" /> </setting> @@ -1838,7 +1851,12 @@ <level>2</level> <default>false</default> <dependencies> - <dependency type="enable" setting="services.upnpserver">true</dependency> + <dependency type="enable"> + <and> + <condition setting="services.upnp" operator="is">true</condition> + <condition setting="services.upnpserver" operator="is">true</condition> + </and> + </dependency> </dependencies> <control type="toggle" /> </setting> @@ -1846,13 +1864,21 @@ <level>2</level> <default>false</default> <dependencies> - <dependency type="enable" setting="services.upnpserver">true</dependency> + <dependency type="enable"> + <and> + <condition setting="services.upnp" operator="is">true</condition> + <condition setting="services.upnpserver" operator="is">true</condition> + </and> + </dependency> </dependencies> <control type="toggle" /> </setting> <setting id="services.upnprenderer" type="boolean" label="21881" help="36325"> <level>1</level> <default>false</default> + <dependencies> + <dependency type="enable" setting="services.upnp">true</dependency> + </dependencies> <control type="toggle" /> </setting> </group> |