convert parental black/whitelist to uppercase on file read

[enigma2.git] / lib / python / Components / ParentalControl.py

diff --git a/lib/python/Components/ParentalControl.py b/lib/python/Components/ParentalControl.py
index b9c31c4b9eccbe11aa78703e92818df5029f98c8..c32388044d473d29965f4c43531b39438c1bd0b8 100644 (file)
--- a/lib/python/Components/ParentalControl.py
+++ b/lib/python/Components/ParentalControl.py
@@ -63,7 +63,7 @@ class ParentalControl:
                        self.serviceLevel.remove(service)
                                
        def isServicePlayable(self, service, callback):
-               if not config.ParentalControl.configured.value:
+               if not config.ParentalControl.configured.value or not config.ParentalControl.servicepinactive.value:
                        return True
                #print "whitelist:", self.whitelist
                #print "blacklist:", self.blacklist
@@ -153,7 +153,7 @@ class ParentalControl:
                        file = open(resolveFilename(SCOPE_CONFIG, "whitelist"), 'r')
                        lines = file.readlines()
                        for x in lines:
-                               self.whitelist.append(x.strip())
+                               self.whitelist.append(x.strip().upper())
                        file.close
                except:
                        pass
@@ -170,7 +170,7 @@ class ParentalControl:
                        file = open(resolveFilename(SCOPE_CONFIG, "blacklist"), 'r')
                        lines = file.readlines()
                        for x in lines:
-                               self.blacklist.append(x.strip())
+                               self.blacklist.append(x.strip().upper())
                        file.close
                except:
                        pass