enablel/disable zapping via config

diff --git a/webinterface/src/WebIfConfig.py b/webinterface/src/WebIfConfig.py
index fcc60a0..9237026 100644 (file)
--- a/webinterface/src/WebIfConfig.py
+++ b/webinterface/src/WebIfConfig.py
@@ -33,6 +33,7 @@ class WebIfConfigScreen(ConfigListScreen,Screen):
         self.list = []
         self.list.append(getConfigListEntry(_("start Webinterface"), config.plugins.Webinterface.enable))
         self.list.append(getConfigListEntry(_("enable /hdd"), config.plugins.Webinterface.includehdd))
+        self.list.append(getConfigListEntry(_("allow zapping via webif"), config.plugins.Webinterface.allowzapping))
         self.list.append(getConfigListEntry(_("autowrite timer"), config.plugins.Webinterface.autowritetimer))
         self.list.append(getConfigListEntry(_("load movie-length"), config.plugins.Webinterface.loadmovielength))
         

diff --git a/webinterface/src/__init__.py b/webinterface/src/__init__.py
index 71ceefa..957bf88 100644 (file)
--- a/webinterface/src/__init__.py
+++ b/webinterface/src/__init__.py
@@ -14,6 +14,7 @@ __version__ = "0.99"
 
 config.plugins.Webinterface = ConfigSubsection()
 config.plugins.Webinterface.enable = ConfigYesNo(default = True)
+config.plugins.Webinterface.allowzapping = ConfigYesNo(default = True)
 config.plugins.Webinterface.includehdd = ConfigYesNo(default = False)
 config.plugins.Webinterface.autowritetimer = ConfigYesNo(default = False)
 config.plugins.Webinterface.loadmovielength = ConfigYesNo(default = False)

diff --git a/webinterface/src/webif.py b/webinterface/src/webif.py
index c9d0f26..97712e7 100644 (file)
--- a/webinterface/src/webif.py
+++ b/webinterface/src/webif.py
@@ -123,7 +123,8 @@ class ServiceWebScreen(WebScreen):
                pc = config.ParentalControl.configured.value
                if pc:
                        config.ParentalControl.configured.value = False
-               self.session.nav.playService(reftozap)
+               if config.plugins.Webinterface.allowzapping.value:
+                       self.session.nav.playService(reftozap)
                if pc:
                        config.ParentalControl.configured.value = pc
                """