X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/cf630f0cd1366036ae201702b177bfe95de3d03f..1026ef92d84821603bd865adb10a518238f33e0e:/RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index a5df6725..a2f21dfb 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -12,7 +12,7 @@ from Screens.SubserviceSelection import SubserviceSelection
 import NavigationInstance
 from time import localtime
 
-from Tools.XMLTools import elementsWithTag, mergeText
+from Tools.XMLTools import elementsWithTag, mergeText, stringToXML
 from ServiceReference import ServiceReference
 
 # ok, for descriptions etc we have:
@@ -238,9 +238,6 @@ class RecordTimer(timer.Timer):
 		for timer in elementsWithTag(root.childNodes, "timer"):
 			self.record(createTimer(timer))
 
-	def strToXML(self, str):
-		return str.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;').replace("'", '&apos;'). replace('"', '&quot;')
-
 	def saveTimer(self):
 		#doc = xml.dom.minidom.Document()
 		#root_element = doc.createElement('timers')
@@ -294,10 +291,10 @@ class RecordTimer(timer.Timer):
 			list.append('<timer')
 			list.append(' begin="' + str(int(timer.begin)) + '"')
 			list.append(' end="' + str(int(timer.end)) + '"')
-			list.append(' serviceref="' + str(timer.service_ref) + '"')
+			list.append(' serviceref="' + str(stringToXML(timer.service_ref)) + '"')
 			list.append(' repeated="' + str(int(timer.repeated)) + '"')
-			list.append(' name="' + str(self.strToXML(timer.name)) + '"')
-			list.append(' description="' + str(self.strToXML(timer.description)) + '"')
+			list.append(' name="' + str(stringToXML(timer.name)) + '"')
+			list.append(' description="' + str(stringToXML(timer.description)) + '"')
 			if timer.eit is not None:
 				list.append(' eit="' + str(timer.eit) + '"')
 			list.append(' disabled="' + str(int(timer.disabled)) + '"')
@@ -345,7 +342,7 @@ class RecordTimer(timer.Timer):
 								time_match = ((timecmp + ((x.end - x.begin) / 60)) - chktimecmp) * 60
 							elif chktimecmp <= timecmp < (chktimecmp + (duration / 60)):
 								time_match = ((chktimecmp + (duration / 60)) - timecmp) * 60
-				elif x.eit is None:
+				else: #if x.eit is None:
 					end = begin + duration
 					if begin <= x.begin <= end:
 						diff = end - x.begin