summaryrefslogtreecommitdiffstats
path: root/module/web
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-01-08 23:22:30 +0100
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-01-08 23:22:30 +0100
commit8d9a3826facc7f828265d5dbd036db863bfb4fc2 (patch)
treebaf7e0034ac5278f2370d615a0d41da94affd676 /module/web
parentpy 2.5 compability (diff)
downloadpyload-8d9a3826facc7f828265d5dbd036db863bfb4fc2.tar.xz
encoding fix
Diffstat (limited to 'module/web')
-rw-r--r--module/web/ServerThread.py2
-rw-r--r--module/web/pyload/views.py2
-rw-r--r--module/web/templates/default/collector.html4
3 files changed, 4 insertions, 4 deletions
diff --git a/module/web/ServerThread.py b/module/web/ServerThread.py
index ef70babe6..db5e3be05 100644
--- a/module/web/ServerThread.py
+++ b/module/web/ServerThread.py
@@ -94,8 +94,8 @@ class WebServer(threading.Thread):
if not self.server in avail:
- self.server = "builtin"
log.warning(_("Can't use %(server)s, either python-flup or %(server)s is not installed!") % {"server": self.server})
+ self.server = "builtin"
if self.server == "nginx":
diff --git a/module/web/pyload/views.py b/module/web/pyload/views.py
index 8246f3547..29ad90867 100644
--- a/module/web/pyload/views.py
+++ b/module/web/pyload/views.py
@@ -354,7 +354,7 @@ def config(request):
newpw = request.POST.get("Accounts|%s|password;%s" % (pluginname, data["login"]), "").strip()
time = request.POST.get("Accounts|%s|time;%s" % (pluginname, data["login"]), "").strip()
- if newpw or (time and (not data["options"].has_key("time") or time != data["options"]["time"][0])):
+ if newpw or (time and (not data["options"].has_key("time") or [time] != data["options"]["time"])):
settings.PYLOAD.update_account(pluginname, data["login"], newpw, {"time": [time]})
diff --git a/module/web/templates/default/collector.html b/module/web/templates/default/collector.html
index c0ac78202..8dddd488e 100644
--- a/module/web/templates/default/collector.html
+++ b/module/web/templates/default/collector.html
@@ -38,8 +38,8 @@ document.addEvent("domready", function(){
{% block pageactions %}
<ul id="page-actions-more">
- <li id="del-finished"><a style="padding: 0; font-weight: bold;" href="#">{% trans "Delete Finished" %}</a></li>
- <li id="restart-failed"><a style="padding: 0; font-weight: bold;" href="#">{% trans "Restart Failed" %}</a></li>
+ <li id="del_finished"><a style="padding: 0; font-weight: bold;" href="#">{% trans "Delete Finished" %}</a></li>
+ <li id="restart_failed"><a style="padding: 0; font-weight: bold;" href="#">{% trans "Restart Failed" %}</a></li>
</ul>
{% endblock %}