diff options
| -rw-r--r-- | module/config/default.conf | 2 | ||||
| -rw-r--r-- | module/network/Browser.py | 5 | ||||
| -rw-r--r-- | module/web/pyload/views.py | 5 | ||||
| -rwxr-xr-x | pyLoadCore.py | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/module/config/default.conf b/module/config/default.conf index 1c0d935ab..454a52abe 100644 --- a/module/config/default.conf +++ b/module/config/default.conf @@ -7,7 +7,7 @@ remote - "Remote": str password : "Password" = pwhere
ssl - "SSL":
bool activated : "Activated"= False
- file cert : "SSL Certificate" = ssl.srt
+ file cert : "SSL Certificate" = ssl.crt
file key : "SSL Key" = ssl.key
webinterface - "Webinterface":
bool activated : "Activated" = True
diff --git a/module/network/Browser.py b/module/network/Browser.py index ab0a0951d..6d8488b6a 100644 --- a/module/network/Browser.py +++ b/module/network/Browser.py @@ -22,9 +22,12 @@ class Browser(object): self.http = HTTPRequest(self.cj, interface, proxies) self.dl = None + def setLastURL(self, val): + self.http.lastURL = val + # tunnel some attributes from HTTP Request to Browser lastEffectiveURL = property(lambda self: self.http.lastEffectiveURL) - lastURL = property(lambda self: self.http.lastURL) + lastURL = property(lambda self: self.http.lastURL, setLastURL) code = property(lambda self: self.http.code) def setCookieJar(self, cj): diff --git a/module/web/pyload/views.py b/module/web/pyload/views.py index 0da21f556..8246f3547 100644 --- a/module/web/pyload/views.py +++ b/module/web/pyload/views.py @@ -384,7 +384,10 @@ def config(request): data["validuntil"] = strftime("%d.%m.%Y",t) if data["options"].has_key("time"): - data["time"] = data["options"]["time"][0] + try: + data["time"] = data["options"]["time"][0] + except: + data["time"] = "invalid" return render_to_response(join(settings.TEMPLATE, 'settings.html'), RequestContext(request, {'conf': {'Plugin':plugin, 'General':conf, 'Accounts': accs}, 'errors': messages}, [status_proc])) diff --git a/pyLoadCore.py b/pyLoadCore.py index f3c9bef6c..d1dffb6c7 100755 --- a/pyLoadCore.py +++ b/pyLoadCore.py @@ -904,7 +904,7 @@ def deamon(): pyload_core.start() -# And so it begins... +# And so it begins... if __name__ == "__main__": if "--daemon" in sys.argv: |