X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6bf2f1a4c1980a402631713a53268fa2da8d916a..9131c8c5c9f2b137a0fc766e7497e0e5ccbddd38:/lib/python/Components/ParentalControl.py

diff --git a/lib/python/Components/ParentalControl.py b/lib/python/Components/ParentalControl.py
index 4bf18067..c3238804 100644
--- 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 or not config.ParentalControl.setuppinactive.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