diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2010-03-09 18:22:41 +0100 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2010-03-09 18:22:41 +0100 |
| commit | 0aaa4f998211e8c63d6b43d3a36fe7d6b561a36f (patch) | |
| tree | ecd879a022d52c152cd73238eecb0a51ba51e36e /module/web | |
| parent | fix (diff) | |
| download | pyload-0aaa4f998211e8c63d6b43d3a36fe7d6b561a36f.tar.xz | |
several fixes, closed #84
Diffstat (limited to 'module/web')
| -rw-r--r-- | module/web/ServerThread.py | 3 | ||||
| -rw-r--r-- | module/web/templates/default/login.html | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/module/web/ServerThread.py b/module/web/ServerThread.py index ffd6a2d35..49fd9b055 100644 --- a/module/web/ServerThread.py +++ b/module/web/ServerThread.py @@ -38,7 +38,7 @@ class WebServer(threading.Thread): except Exception: self.lighttpd = False - if self.lighttpd and self.pycore.config['webinterface']['lighttpd']: + if self.lighttpd: self.pycore.logger.info("Starting lighttpd Webserver: %s:%s" % (host, port)) config = file(join(path, "lighttpd", "lighttpd_default.conf"), "rb") content = config.readlines() @@ -79,6 +79,7 @@ class WebServer(threading.Thread): else: self.p.kill() + return True except: pass diff --git a/module/web/templates/default/login.html b/module/web/templates/default/login.html index 185245f67..2f93e5aab 100644 --- a/module/web/templates/default/login.html +++ b/module/web/templates/default/login.html @@ -27,7 +27,7 @@ </form> {% if form.errors %} -<p{% trans "Your username and password didn't match. Please try again." %}</p> +<p>{% trans "Your username and password didn't match. Please try again." %}</p> {% endif %} </div> |