start awarding users who validate their emails with a badge, include email validation...

[osqa.git] / forum / views / auth.py

diff --git a/forum/views/auth.py b/forum/views/auth.py
index c64aa1d513428d387a20cf61090cd3160a934bb5..c9f3111109b5397411a8f603a738d40509018366 100644 (file)
--- a/forum/views/auth.py
+++ b/forum/views/auth.py
@@ -14,6 +14,7 @@ from django.contrib.auth import login, logout
 
 from writers import manage_pending_data
 
+from forum.actions import EmailValidationAction
 from forum.utils import html
 from forum.views.decorators import login_required
 from forum.modules import decorate
@@ -23,7 +24,7 @@ from forum.utils.mail import send_template_email
 from forum.authentication.base import InvalidAuthentication
 from forum.authentication import AUTH_PROVIDERS
 from forum.models import User, AuthKeyUserAssociation, ValidationHash
-from forum.actions import UserJoinsAction
+from forum.actions import UserJoinsAction, UserLoginAction
 from forum import settings
 
 from vars import ON_SIGNIN_SESSION_ATTR, PENDING_SUBMISSION_SESSION_ATTR
@@ -296,8 +297,7 @@ def validate_email(request, user, code):
     user = get_object_or_404(User, id=user)
 
     if (ValidationHash.objects.validate(code, user, 'email', [user.email])):
-        user.email_isvalid = True
-        user.save()
+        EmailValidationAction(user=user, ip=request.META['REMOTE_ADDR']).save()
         return login_and_forward(request, user, reverse('index'), _("Thank you, your email is now validated."))
     else:
         return render_to_response('auth/mail_already_validated.html', { 'user' : user }, RequestContext(request))
@@ -374,6 +374,9 @@ def login_and_forward(request, user, forward=None, message=None):
     user.backend = "django.contrib.auth.backends.ModelBackend"
     login(request, user)
 
+    # Store the login action
+    UserLoginAction(user=user, ip=request.META['REMOTE_ADDR']).save()
+
     if message is None:
         message = _("Welcome back %s, you are now logged in") % smart_unicode(user.username)