Browse Source

Small bug fixes

sh4nks 9 years ago
parent
commit
a7a8cd34a1

+ 1 - 1
flaskbb/auth/views.py

@@ -26,7 +26,7 @@ from flaskbb.auth.forms import (LoginForm, ReauthForm, ForgotPasswordForm,
 from flaskbb.user.models import User
 from flaskbb.user.models import User
 from flaskbb.fixtures.settings import available_languages
 from flaskbb.fixtures.settings import available_languages
 from flaskbb.utils.settings import flaskbb_config
 from flaskbb.utils.settings import flaskbb_config
-from flaskbb.utils.tokens import get_token_status, make_token
+from flaskbb.utils.tokens import get_token_status
 
 
 auth = Blueprint("auth", __name__)
 auth = Blueprint("auth", __name__)
 
 

+ 1 - 1
flaskbb/templates/email/activate_account.html

@@ -4,7 +4,7 @@
 
 
 <p>{% trans %}Click the link below to activate your account:{% endtrans %}</p>
 <p>{% trans %}Click the link below to activate your account:{% endtrans %}</p>
 
 
-<p><a href="{{ link }}"</a></p>
+<p><a href="{{ link }}">{{ link }}</a></p>
 
 
 <p>{% trans %}Sincerely,{% endtrans %}</p>
 <p>{% trans %}Sincerely,{% endtrans %}</p>
 <p>{% trans %}The Administration{% endtrans %}</p>
 <p>{% trans %}The Administration{% endtrans %}</p>

+ 1 - 1
flaskbb/templates/email/reset_password.html

@@ -3,7 +3,7 @@
 
 
 <p>{% trans %}Click the link below to reset your password:{% endtrans %}</p>
 <p>{% trans %}Click the link below to reset your password:{% endtrans %}</p>
 
 
-<p><a href="{{ link }}"</a></p>
+<p><a href="{{ link }}">{{ link }}</a></p>
 
 
 <p>{% trans %}Sincerely,{% endtrans %}</p>
 <p>{% trans %}Sincerely,{% endtrans %}</p>
 <p>{% trans %}The Administration{% endtrans %}</p>
 <p>{% trans %}The Administration{% endtrans %}</p>

+ 1 - 1
flaskbb/utils/tokens.py

@@ -38,7 +38,7 @@ def make_token(user, operation, expire=3600):
     return s.dumps(data)
     return s.dumps(data)
 
 
 
 
-def get_token_status(token, operation, return_data):
+def get_token_status(token, operation, return_data=False):
     """Returns the expired status, invalid status, the user and optionally
     """Returns the expired status, invalid status, the user and optionally
     the content of the JSON Web Signature token.
     the content of the JSON Web Signature token.