X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/3de45a52d2189bf50f4f243efaf470d47f07c070..c32f404cd51bb4032a5b28474a4004ddc76c558d:/forum/views/auth.py

diff --git a/forum/views/auth.py b/forum/views/auth.py
index 08013f9..abbbc31 100644
--- a/forum/views/auth.py
+++ b/forum/views/auth.py
@@ -7,7 +7,8 @@ from forum.http_responses import HttpResponseUnauthorized
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext as _
 from django.utils.http import urlquote_plus
-from django.contrib.auth.decorators import login_required
+from forum.views.decorators import login_required
+from forum.modules import decorate
 from django.contrib.auth import login, logout
 from django.http import get_host
 from forum.actions import SuspendAction
@@ -270,9 +271,7 @@ def send_validation_email(request):
     else:
         try:
             hash = ValidationHash.objects.get(user=request.user, type='email')
-            if hash.expiration < datetime.datetime.now():
-                hash.delete()
-                return send_validation_email(request)
+            hash.delete()
         except:
             hash = ValidationHash.objects.create_new(request.user, 'email', [request.user.email])
 
@@ -288,11 +287,10 @@ def validate_email(request, user, code):
     if (ValidationHash.objects.validate(code, user, 'email', [user.email])):
         user.email_isvalid = True
         user.save()
-        return login_and_forward(request, user, None, _("Thank you, your email is now validated."))
+        return login_and_forward(request, user, reverse('index'), _("Thank you, your email is now validated."))
     else:
         raise Http404()
 
-@login_required
 def auth_settings(request, id):
     user_ = get_object_or_404(User, id=id)
 
@@ -404,7 +402,7 @@ def forward_suspended_user(request, user, show_private_msg=True):
     request.user.message_set.create(message)
     return HttpResponseRedirect(reverse('index'))
 
-@login_required
+@decorate.withfn(login_required)
 def signout(request):
     logout(request)
     return HttpResponseRedirect(reverse('index'))
\ No newline at end of file