check the setting before deciding whether to append or to prepend

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

diff --git a/forum/views/auth.py b/forum/views/auth.py
index c0fecc1d5c0a315cfde32af24a0ec85705fc4aeb..c9f3111109b5397411a8f603a738d40509018366 100644 (file)
--- a/forum/views/auth.py
+++ b/forum/views/auth.py
@@ -1,36 +1,32 @@
+# -*- coding: utf-8 -*-
+
+import datetime
+import logging
+
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 from django.core.urlresolvers import reverse
-from forum.models import User
 from django.http import HttpResponseRedirect, Http404
-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.utils.encoding import smart_unicode
-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
-from forum.utils import html
-from forum import settings
+
 from writers import manage_pending_data
-import types
-import datetime
-import logging
 
-from forum.forms import SimpleRegistrationForm, TemporaryLoginRequestForm, \
-        ChangePasswordForm, SetPasswordForm
+from forum.actions import EmailValidationAction
+from forum.utils import html
+from forum.views.decorators import login_required
+from forum.modules import decorate
+from forum.forms import SimpleRegistrationForm, TemporaryLoginRequestForm, ChangePasswordForm, SetPasswordForm
+from forum.http_responses import HttpResponseUnauthorized
 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, UserLoginAction
+from forum import settings
 
-from forum.models import AuthKeyUserAssociation, ValidationHash, Question, Answer
-from forum.actions import UserJoinsAction
-
-from forum.settings import REP_GAIN_BY_EMAIL_VALIDATION
 from vars import ON_SIGNIN_SESSION_ATTR, PENDING_SUBMISSION_SESSION_ATTR
 
 def signin_page(request):
@@ -301,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))
@@ -379,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)