X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/631688575ca2c0a4bdfdf99bdd2470ee9630bc25..f6f8274ec87a79bfbcf6af6a998e9ff79e64d160:/contrib/waldo/forms.py?ds=sidebyside

diff --git a/contrib/waldo/forms.py b/contrib/waldo/forms.py
index 615d302..6f2b59b 100644
--- a/contrib/waldo/forms.py
+++ b/contrib/waldo/forms.py
@@ -1,6 +1,7 @@
 from datetime import date
 from django import forms
 from django.conf import settings
+from django.contrib.auth import authenticate
 from django.contrib.auth.forms import AuthenticationForm, UserCreationForm
 from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError
@@ -8,12 +9,6 @@ from django.utils.translation import ugettext_lazy as _
 from philo.contrib.waldo.tokens import REGISTRATION_TIMEOUT_DAYS
 
 
-LOGIN_FORM_KEY = 'this_is_the_login_form'
-LoginForm = type('LoginForm', (AuthenticationForm,), {
-	LOGIN_FORM_KEY: forms.BooleanField(widget=forms.HiddenInput, initial=True)
-})
-
-
 class EmailInput(forms.TextInput):
 	input_type = 'email'
 
@@ -70,4 +65,38 @@ class UserAccountForm(forms.ModelForm):
 	
 	class Meta:
 		model = User
-		fields = ('first_name', 'last_name', 'email')
\ No newline at end of file
+		fields = ('first_name', 'last_name', 'email')
+
+
+class WaldoAuthenticationForm(AuthenticationForm):
+	ERROR_MESSAGE = _("Please enter a correct username and password. Note that both fields are case-sensitive.")
+	
+	def clean(self):
+		username = self.cleaned_data['username']
+		password = self.cleaned_data['password']
+		message = self.ERROR_MESSAGE
+		
+		if username and password:
+			self.user_cache = authenticate(username=username, password=password)
+			if self.user_cache is None:
+				if u'@' in username:
+					# Maybe they entered their email? Look it up, but still raise a ValidationError.
+					try:
+						user = User.objects.get(email=username)
+					except (User.DoesNotExist, User.MultipleObjectsReturned):
+						pass
+					else:
+						if user.check_password(password):
+							message = _("Your e-mail address is not your username. Try '%s' instead.") % user.username
+				raise ValidationError(message)
+			elif not self.user_cache.is_active:
+				raise ValidationError(message)
+		self.check_for_test_cookie()
+		return self.cleaned_data
+	
+	def check_for_test_cookie(self):
+		# This method duplicates the Django 1.3 AuthenticationForm method.
+		if self.request and not self.request.session.test_cookie_worked():
+			raise forms.ValidationError(
+				_("Your Web browser doesn't appear to have cookies enabled. "
+				  "Cookies are required for logging in."))
\ No newline at end of file