diff options
Diffstat (limited to 'hyperkitty/views/accounts.py')
-rw-r--r-- | hyperkitty/views/accounts.py | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/hyperkitty/views/accounts.py b/hyperkitty/views/accounts.py index 4f3d96b..b81583f 100644 --- a/hyperkitty/views/accounts.py +++ b/hyperkitty/views/accounts.py @@ -47,8 +47,8 @@ def user_logout(request): return redirect('user_login') def user_login(request, template='login.html'): - - parse_r = urlparse(request.META.get('HTTP_REFERER', 'index')) + + parse_r = urlparse(request.META.get('HTTP_REFERER', 'index')) previous = '%s%s' % (parse_r.path, parse_r.query) next_var = request.POST.get('next', request.GET.get('next', previous)) @@ -57,12 +57,12 @@ def user_login(request, template='login.html'): form = AuthenticationForm(request.POST) user = authenticate(username=request.POST.get('username'), password=request.POST.get('password')) - - if user is not None: - log('debug', user) - if user.is_active: - login(request, user) - return redirect(next_var) + + if user is not None: + log('debug', user) + if user.is_active: + login(request, user) + return redirect(next_var) else: form = AuthenticationForm() @@ -73,20 +73,20 @@ def user_login(request, template='login.html'): def user_profile(request, user_email=None): if not request.user.is_authenticated(): return redirect('user_login') - + # try to render the user profile. try: - user_profile = request.user.get_profile() - # @TODO: Include the error name e.g, ProfileDoesNotExist? + user_profile = request.user.get_profile() + # @TODO: Include the error name e.g, ProfileDoesNotExist? except: - user_profile = UserProfile.objects.create(user=request.user) + user_profile = UserProfile.objects.create(user=request.user) t = loader.get_template('user_profile.html') c = RequestContext(request, { 'user_profile' : user_profile, }) - + return HttpResponse(t.render(c)) @@ -94,22 +94,22 @@ def user_registration(request): if request.user.is_authenticated(): # Already registered, redirect back to index page return redirect('index') - + if request.POST: form = RegistrationForm(request.POST) if form.is_valid(): - # Save the user data. - form.save(form.cleaned_data) - user = authenticate(username=form.cleaned_data['username'], - password=form.cleaned_data['password1']) + # Save the user data. + form.save(form.cleaned_data) + user = authenticate(username=form.cleaned_data['username'], + password=form.cleaned_data['password1']) if user is not None: - log('debug', user) - if user.is_active: - login(request, user) - return redirect('index') + log('debug', user) + if user.is_active: + login(request, user) + return redirect('index') else: form = RegistrationForm() - + return render_to_response('register.html', {'form': form}, context_instance=RequestContext(request)) |