diff --git a/partnerbox/src/PartnerboxEPGSelection.py b/partnerbox/src/PartnerboxEPGSelection.py index 6995f4e..794388a 100644 --- a/partnerbox/src/PartnerboxEPGSelection.py +++ b/partnerbox/src/PartnerboxEPGSelection.py @@ -136,12 +136,13 @@ def GetPartnerboxTimerlist(self): ip = "%d.%d.%d.%d" % tuple(self.partnerboxentry.ip.value) port = self.partnerboxentry.port.value http = "http://%s:%d" % (ip,port) + user = self.partnerboxentry.user.value if int(self.partnerboxentry.enigma.value) == 0: sCommand = http + "/web/timerlist" else: sCommand = http + "/xml/timers" print "[Partnerbox] %s"%sCommand - sendPartnerBoxWebCommand(sCommand, None,3, "root", self.partnerboxentry.password.value).addCallback(self.GetPartnerboxTimerlistCallback).addErrback(GetPartnerboxTimerlistCallbackError) + sendPartnerBoxWebCommand(sCommand, None,3, user, self.partnerboxentry.password.value).addCallback(self.GetPartnerboxTimerlistCallback).addErrback(GetPartnerboxTimerlistCallbackError) def GetPartnerboxTimerlistCallback(self, sxml = None): @@ -179,11 +180,12 @@ def DeleteTimerConfirmed (self, timerentry, answer): ip = "%d.%d.%d.%d" % tuple(self.partnerboxentry.ip.value) port = self.partnerboxentry.port.value http = "http://%s:%d" % (ip,port) + user = self.partnerboxentry.user.value if int(self.partnerboxentry.enigma.value) == 0: sCommand = http + "/web/timerdelete?sRef=" + timerentry.servicereference + "&begin=" + ("%s"%(timerentry.timebegin)) + "&end=" +("%s"%(timerentry.timeend)) else: sCommand = http + "/deleteTimerEvent?ref=" + timerentry.servicereference + "&start=" + ("%s"%(timerentry.timebegin)) + "&type=" +("%s"%(timerentry.type)) + "&force=yes" - sendPartnerBoxWebCommand(sCommand, None,3, "root", self.partnerboxentry.password.value).addCallback(self.DeleteTimerCallback).addErrback(DeleteTimerCallbackError) + sendPartnerBoxWebCommand(sCommand, None,3, user, self.partnerboxentry.password.value).addCallback(self.DeleteTimerCallback).addErrback(DeleteTimerCallbackError) def DeleteTimerCallback(self, callback = None): curService = None diff --git a/partnerbox/src/PartnerboxFunctions.py b/partnerbox/src/PartnerboxFunctions.py index 12fe059..cef7343 100644 --- a/partnerbox/src/PartnerboxFunctions.py +++ b/partnerbox/src/PartnerboxFunctions.py @@ -272,7 +272,7 @@ def SetPartnerboxTimerlist(partnerboxentry = None, sreference = None): return try: password = partnerboxentry.password.value - username = "root" + username = partnerboxentry.user.value CurrentIP = partnerboxentry.ip.value ip = "%d.%d.%d.%d" % tuple(partnerboxentry.ip.value) port = partnerboxentry.port.value diff --git a/partnerbox/src/PartnerboxSetup.py b/partnerbox/src/PartnerboxSetup.py index 7d9f3d0..7226cf8 100644 --- a/partnerbox/src/PartnerboxSetup.py +++ b/partnerbox/src/PartnerboxSetup.py @@ -38,6 +38,7 @@ def initPartnerboxEntryConfig(): config.plugins.Partnerbox.Entries[i].ip = ConfigIP(default = [192,168,0,98]) config.plugins.Partnerbox.Entries[i].port = ConfigInteger(default=80, limits=(1, 65555)) config.plugins.Partnerbox.Entries[i].enigma = ConfigSelection(default="0", choices = [("0", _("Enigma 2")),("1", _("Enigma 1"))]) + config.plugins.Partnerbox.Entries[i].user = ConfigText(default = "root", visible_width = 50, fixed_size = False) config.plugins.Partnerbox.Entries[i].password = ConfigText(default = "dreambox", visible_width = 50, fixed_size = False) config.plugins.Partnerbox.Entries[i].useinternal = ConfigSelection(default="1", choices = [("0", _("use external")),("1", _("use internal"))]) config.plugins.Partnerbox.Entries[i].zaptoservicewhenstreaming = ConfigYesNo(default = True) @@ -252,6 +253,7 @@ class PartnerboxEntryConfigScreen(ConfigListScreen, Screen): getConfigListEntry(_("IP"), self.current.ip), getConfigListEntry(_("Port"), self.current.port), getConfigListEntry(_("Enigma Type"), self.current.enigma), + getConfigListEntry(_("User"), self.current.user), getConfigListEntry(_("Password"), self.current.password), getConfigListEntry(_("Servicelists/EPG"), self.current.useinternal), getConfigListEntry(_("Zap to service when streaming"), self.current.zaptoservicewhenstreaming) diff --git a/partnerbox/src/RemoteTimerEntry.py b/partnerbox/src/RemoteTimerEntry.py index 4203512..73c1920 100644 --- a/partnerbox/src/RemoteTimerEntry.py +++ b/partnerbox/src/RemoteTimerEntry.py @@ -346,7 +346,8 @@ def RemoteTimernewConfig(self): ip = "%d.%d.%d.%d" % tuple(self.entryguilist[int(self.timerentry_remote.value)][2].ip.value) port = self.entryguilist[int(self.timerentry_remote.value)][2].port.value http_ = "%s:%d" % (ip,port) - sCommand = "http://root:" + self.entryguilist[int(self.timerentry_remote.value)][2].password.value + "@" + http_ + "/web/getlocations" + user = self.entryguilist[int(self.timerentry_remote.value)][2].user.value + sCommand = "http://"+ user + ":" + self.entryguilist[int(self.timerentry_remote.value)][2].password.value + "@" + http_ + "/web/getlocations" #sCommand = self.http + "/web/getlocations" #sendPartnerBoxWebCommand(sCommand, None,3, self.username, self.password).addCallback(boundFunction(getLocationsCallback,self)).addErrback(boundFunction(getLocationsError,self)) # ich mach das besser synchron, falls die Partnerbox aus ist ( dann koennte man hier schon abbrechen und eine Meldung bringen...) @@ -477,6 +478,7 @@ def RemoteTimerGo(self): ip = "%d.%d.%d.%d" % tuple(self.entryguilist[int(self.timerentry_remote.value)][2].ip.value) port = self.entryguilist[int(self.timerentry_remote.value)][2].port.value http = "http://%s:%d" % (ip,port) + user = self.entryguilist[int(self.timerentry_remote.value)][2].user.value if int(self.entryguilist[int(self.timerentry_remote.value)][2].enigma.value) == 1: # E1 afterevent = self.timerentry_afterevent.value @@ -495,7 +497,7 @@ def RemoteTimerGo(self): pass channel = urllib.quote(servicename) sCommand = "%s/addTimerEvent?ref=%s&start=%d&duration=%d&descr=%s&channel=%s&after_event=%s&action=%s" % (http, service_ref , begin, end - begin, descr, channel, afterevent, action) - sendPartnerBoxWebCommand(sCommand, None,3, "root", str(self.entryguilist[int(self.timerentry_remote.value)][2].password.value)).addCallback(boundFunction(AddTimerE1Callback,self, self.session)).addErrback(boundFunction(AddTimerError,self, self.session)) + sendPartnerBoxWebCommand(sCommand, None,3, user, str(self.entryguilist[int(self.timerentry_remote.value)][2].password.value)).addCallback(boundFunction(AddTimerE1Callback,self, self.session)).addErrback(boundFunction(AddTimerError,self, self.session)) else: # E2 name = urllib.quote(self.timerentry_name.value) @@ -511,7 +513,7 @@ def RemoteTimerGo(self): "standby": AFTEREVENT.STANDBY, }.get(self.timerentry_afterevent.value, AFTEREVENT.NONE) sCommand = "%s/web/timeradd?sRef=%s&begin=%d&end=%d&name=%s&description=%s&dirname=%s&eit=0&justplay=%d&afterevent=%s" % (http, service_ref,begin,end,name,descr,dirname,justplay,afterevent) - sendPartnerBoxWebCommand(sCommand, None,3, "root", str(self.entryguilist[int(self.timerentry_remote.value)][2].password.value)).addCallback(boundFunction(AddTimerE2Callback,self, self.session)).addErrback(boundFunction(AddTimerError,self,self.session)) + sendPartnerBoxWebCommand(sCommand, None,3, user, str(self.entryguilist[int(self.timerentry_remote.value)][2].password.value)).addCallback(boundFunction(AddTimerE2Callback,self, self.session)).addErrback(boundFunction(AddTimerError,self,self.session)) def AddTimerE2Callback(self, session, answer): text = "" diff --git a/partnerbox/src/plugin.py b/partnerbox/src/plugin.py index 56af609..bda4c9c 100644 --- a/partnerbox/src/plugin.py +++ b/partnerbox/src/plugin.py @@ -165,7 +165,7 @@ class CurrentRemoteTV(Screen): self.CurrentService = self.session.nav.getCurrentlyPlayingServiceReference() self.PartnerboxEntry = partnerboxentry self.password = partnerboxentry.password.value - self.username = "root" + self.username = partnerboxentry.user.value self.ip = "%d.%d.%d.%d" % tuple(partnerboxentry.ip.value) port = partnerboxentry.port.value self.http = "http://%s:%d" % (self.ip,port) @@ -249,7 +249,7 @@ class RemoteTimer(Screen): self.PartnerboxEntry = partnerboxentry self.password = partnerboxentry.password.value - self.username = "root" + self.username = partnerboxentry.user.value self.ip = "%d.%d.%d.%d" % tuple(partnerboxentry.ip.value) self.port = partnerboxentry.port.value self.http = "http://%s:%d" % (self.ip,self.port) @@ -410,7 +410,7 @@ class RemoteTimerBouquetList(Screen): }, -1) self.PartnerboxEntry = partnerboxentry self.password = partnerboxentry.password.value - self.username = "root" + self.username = partnerboxentry.user.value ip = "%d.%d.%d.%d" % tuple(partnerboxentry.ip.value) port = partnerboxentry.port.value self.http = "http://%s:%d" % (ip,port) @@ -530,7 +530,7 @@ class RemoteTimerChannelList(Screen): self.PartnerboxEntry = partnerboxentry self.password = partnerboxentry.password.value - self.username = "root" + self.username = partnerboxentry.user.value self.ip = "%d.%d.%d.%d" % tuple(partnerboxentry.ip.value) self.port = partnerboxentry.port.value self.http = "http://%s:%d" % (self.ip,self.port) @@ -840,7 +840,7 @@ class RemotePlayer(Screen, InfoBarAudioSelection): "left": self.previousChannel, }, -1) self.password = partnerboxentry.password.value - self.username = "root" + self.username = partnerboxentry.user.value self.servicereference = servicereference self.onLayoutFinish.append(self.startRun) self.onClose.append(self.__onClose) @@ -988,7 +988,7 @@ class RemoteTimerEPGList(Screen): self.PartnerboxEntry = partnerboxentry self.password = partnerboxentry.password.value - self.username = "root" + self.username = partnerboxentry.user.value self.ip = "%d.%d.%d.%d" % tuple(partnerboxentry.ip.value) port = partnerboxentry.port.value self.http = "http://%s:%d" % (self.ip,port) @@ -1601,7 +1601,7 @@ class RemoteTimerEventView(Screen): self.PartnerboxEntry = partnerboxentry self.password = partnerboxentry.password.value - self.username = "root" + self.username = partnerboxentry.user.value self.ip = "%d.%d.%d.%d" % tuple(partnerboxentry.ip.value) port = partnerboxentry.port.value self.http = "http://%s:%d" % (self.ip,port)