diff --git a/gui/slick/interfaces/default/config_general.tmpl b/gui/slick/interfaces/default/config_general.tmpl index ad41cb8b..3e12a774 100644 --- a/gui/slick/interfaces/default/config_general.tmpl +++ b/gui/slick/interfaces/default/config_general.tmpl @@ -346,7 +346,7 @@ Username -

blank = disable SickGear login

+

blank for none

 @@ -356,7 +356,7 @@ Password -

blank = no authentication

+

blank for none

check autoProcessTV.cfg is set up for external apps to use post processing scripts diff --git a/gui/slick/interfaces/default/login.tmpl b/gui/slick/interfaces/default/login.tmpl index 6a717621..2ec5cfb1 100644 --- a/gui/slick/interfaces/default/login.tmpl +++ b/gui/slick/interfaces/default/login.tmpl @@ -46,7 +46,7 @@ \ No newline at end of file diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index a4e0e5d2..f768db4c 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -174,12 +174,9 @@ class LoginHandler(BaseHandler): username = sickbeard.WEB_USERNAME password = sickbeard.WEB_PASSWORD - if (self.get_argument('username') == username or not username) \ - and (self.get_argument('password') == password or not password): - + if (self.get_argument('username') == username) and (self.get_argument('password') == password): remember_me = int(self.get_argument('remember_me', default=0) or 0) self.set_secure_cookie('sickgear-session', sickbeard.COOKIE_SECRET, expires_days=30 if remember_me > 0 else None) - self.redirect(self.get_argument('next', '/home/')) else: next_arg = '&next=' + self.get_argument('next', '/home/') @@ -4653,4 +4650,4 @@ class Cache(MainHandler): t = PageTemplate(headers=self.request.headers, file='cache.tmpl') t.cacheResults = results - return t.respond() \ No newline at end of file + return t.respond()