Fixes on the login form

1 files changed, 4 insertions, 27 deletions

diff --git a/hyperkitty/views/accounts.py b/hyperkitty/views/accounts.py
index f06a242..69db991 100644
--- a/hyperkitty/views/accounts.py
+++ b/hyperkitty/views/accounts.py
@@ -22,6 +22,8 @@
 import re
 import sys
 import logging
+from urllib2 import HTTPError
+from urlparse import urlparse
 
 from django.conf import settings
 from django.contrib import messages
@@ -30,17 +32,15 @@ from django.contrib.auth.decorators import (login_required,
                                             permission_required,
                                             user_passes_test)
 from django.contrib.auth.forms import AuthenticationForm
-from hyperkitty.models import UserProfile, Rating
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render_to_response, redirect
 from django.template import Context, loader, RequestContext
 from django.utils.translation import gettext as _
-from urllib2 import HTTPError
-from urlparse import urlparse
 
-from forms import RegistrationForm
+from hyperkitty.models import UserProfile, Rating
+from hyperkitty.views.forms import RegistrationForm
 from hyperkitty.lib import get_store
 
 
@@ -51,29 +51,6 @@ def user_logout(request):
     logout(request)
     return redirect('user_login')
 
-def user_login(request, template='login.html'):
-
-    user = None
-    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))
-
-    if request.method == 'POST':
-        form = AuthenticationForm(request.POST)
-        user = authenticate(username=request.POST.get('username'),
-                            password=request.POST.get('password'))
-
-    if user is not None:
-        logger.debug(user)
-        if user.is_active:
-            login(request, user)
-            return redirect(next_var)
-
-    else:
-        form = AuthenticationForm()
-    return render_to_response(template, {'form': form, 'next' : next_var},
-                              context_instance=RequestContext(request))
 
 @login_required
 def user_profile(request, user_email=None):