X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/c6c168511f18d8984901b2c828a47310a2d54d64..8a6bfd84137635211aa15f3991aa681c37d4cb6e:/forum/views/auth.py?ds=inline diff --git a/forum/views/auth.py b/forum/views/auth.py index f8eb897..db8cc32 100644 --- a/forum/views/auth.py +++ b/forum/views/auth.py @@ -19,18 +19,18 @@ import types import datetime import logging -from forum.forms import SimpleRegistrationForm, SimpleEmailSubscribeForm, \ - TemporaryLoginRequestForm, ChangePasswordForm, SetPasswordForm +from forum.forms import SimpleRegistrationForm, TemporaryLoginRequestForm, \ + ChangePasswordForm, SetPasswordForm from forum.utils.mail import send_template_email from forum.authentication.base import InvalidAuthentication from forum.authentication import AUTH_PROVIDERS from forum.models import AuthKeyUserAssociation, ValidationHash, Question, Answer -from forum.actions import UserJoinsAction, EmailValidationAction -from forum.models.action import ActionRepute +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): referer = request.META.get('HTTP_REFERER', '/') @@ -38,9 +38,9 @@ def signin_page(request): # If the referer is equal to the sign up page, e. g. if the previous login attempt was not successful we do not # change the sign in URL. The user should go to the same page. if not referer.replace(settings.APP_URL, '') == reverse('auth_signin'): - request.session['on_signin_url'] = referer + request.session[ON_SIGNIN_SESSION_ATTR] = referer - all_providers = [provider.context for provider in AUTH_PROVIDERS.values()] + all_providers = [provider.context for provider in AUTH_PROVIDERS.values() if provider.context] sort = lambda c1, c2: c1.weight - c2.weight can_show = lambda c: not request.user.is_authenticated() or c.show_to_logged_in_user @@ -146,7 +146,7 @@ def process_provider_signin(request, provider): assoc = AuthKeyUserAssociation.objects.get(key=assoc_key) user_ = assoc.user return login_and_forward(request, user_) - except: + except AuthKeyUserAssociation.DoesNotExist: request.session['assoc_key'] = assoc_key request.session['auth_provider'] = provider return HttpResponseRedirect(reverse('auth_external_register')) @@ -156,9 +156,8 @@ def process_provider_signin(request, provider): def external_register(request): if request.method == 'POST' and 'bnewaccount' in request.POST: form1 = SimpleRegistrationForm(request.POST) - email_feeds_form = SimpleEmailSubscribeForm(request.POST) - if (form1.is_valid() and email_feeds_form.is_valid()): + if form1.is_valid(): user_ = User(username=form1.cleaned_data['username'], email=form1.cleaned_data['email']) user_.email_isvalid = request.session.get('auth_validated_email', '') == form1.cleaned_data['email'] user_.set_unusable_password() @@ -184,10 +183,6 @@ def external_register(request): uassoc = AuthKeyUserAssociation(user=user_, key=assoc_key, provider=auth_provider) uassoc.save() - if email_feeds_form.cleaned_data['subscribe'] == 'n': - user_.subscription_settings.enable_notifications = False - user_.subscription_settings.save() - del request.session['assoc_key'] del request.session['auth_provider'] @@ -218,14 +213,12 @@ def external_register(request): 'username': username, 'email': email, }) - email_feeds_form = SimpleEmailSubscribeForm() provider_context = AUTH_PROVIDERS[request.session['auth_provider']].context return render_to_response('auth/complete.html', { 'form1': form1, - 'email_feeds_form': email_feeds_form, - 'provider':mark_safe(provider_context.human_name), + 'provider':provider_context and mark_safe(provider_context.human_name) or _('unknown'), 'login_type':provider_context.id, 'gravatar_faq_url':reverse('faq') + '#gravatar', }, context_instance=RequestContext(request)) @@ -302,14 +295,9 @@ def validate_email(request, user, code): user = get_object_or_404(User, id=user) if (ValidationHash.objects.validate(code, user, 'email', [user.email])): - EmailValidationAction(user=user, ip=request.META['REMOTE_ADDR']).save() - if REP_GAIN_BY_EMAIL_VALIDATION > 0: - message = _("Thank you, your email is now validated and you've got %d points." % int(REP_GAIN_BY_EMAIL_VALIDATION)) - - else: - message = _("Thank you, your email is now validated.") - - return login_and_forward(request, user, reverse('index'), message) + user.email_isvalid = True + user.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)) @@ -391,14 +379,14 @@ def login_and_forward(request, user, forward=None, message=None): request.user.message_set.create(message=message) if not forward: - forward = request.session.get('on_signin_url', reverse('index')) + forward = request.session.get(ON_SIGNIN_SESSION_ATTR, reverse('index')) - pending_data = request.session.get('pending_submission_data', None) + pending_data = request.session.get(PENDING_SUBMISSION_SESSION_ATTR, None) if pending_data and (user.email_isvalid or pending_data['type'] not in settings.REQUIRE_EMAIL_VALIDATION_TO): submission_time = pending_data['time'] if submission_time < datetime.datetime.now() - datetime.timedelta(minutes=int(settings.HOLD_PENDING_POSTS_MINUTES)): - del request.session['pending_submission_data'] + del request.session[PENDING_SUBMISSION_SESSION_ATTR] elif submission_time < datetime.datetime.now() - datetime.timedelta(minutes=int(settings.WARN_PENDING_POSTS_MINUTES)): user.message_set.create(message=(_("You have a %s pending submission.") % pending_data['data_name']) + " %s, %s, %s" % ( html.hyperlink(reverse('manage_pending_data', kwargs={'action': _('save')}), _("save it")),