diff --git a/handlers/PublicHandlers.py b/handlers/PublicHandlers.py index ef0ab0ab..8b20cfe3 100644 --- a/handlers/PublicHandlers.py +++ b/handlers/PublicHandlers.py @@ -133,7 +133,7 @@ def successful_login(self, user): def failed_login(self): """ Called if username/password is invalid """ ip = self.request.remote_ip - logging.info("[BAN HAMMER] Failed login attempt from: %s" % ip) + logging.info("*** Failed login attempt from: %s" % ip) failed_logins = self.application.settings["failed_logins"] if ip in failed_logins: failed_logins[ip] += 1 diff --git a/models/RegistrationToken.py b/models/RegistrationToken.py index abf92b64..03c84037 100644 --- a/models/RegistrationToken.py +++ b/models/RegistrationToken.py @@ -56,4 +56,4 @@ def count(cls): @classmethod def by_value(cls, value): """ Returns a the object with value of value """ - return dbsession.query(cls).filter_by(value=str(value)).first() + return dbsession.query(cls).filter_by(value=encode(value)).first() diff --git a/setup/__init__.py b/setup/__init__.py index 28ff9bbc..0dc66ae7 100644 --- a/setup/__init__.py +++ b/setup/__init__.py @@ -1,2 +1,2 @@ # -*- coding: utf-8 -*- -__version__ = "3.3.6" +__version__ = "3.3.7" diff --git a/templates/admin/home.html b/templates/admin/home.html index f912cac9..4429a73a 100644 --- a/templates/admin/home.html +++ b/templates/admin/home.html @@ -192,7 +192,7 @@