X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=mediagoblin%2Fauth%2Fforms.py;h=599b2576d562156dfafc94c54754c488f16152b9;hb=7cb7653c64fbbe1407843074056f6a3b0228015d;hp=4cd3e9d82db7d51076bf9b790b4ee7c4f8ca2595;hpb=8d52214f1e7b6d446fdf34fbfc8328f08eafbb1e;p=mediagoblin.git

diff --git a/mediagoblin/auth/forms.py b/mediagoblin/auth/forms.py
index 4cd3e9d8..599b2576 100644
--- a/mediagoblin/auth/forms.py
+++ b/mediagoblin/auth/forms.py
@@ -1,5 +1,5 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 MediaGoblin contributors.  See AUTHORS.
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -15,60 +15,50 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import wtforms
-import re
 
-from mediagoblin.tools.translate import fake_ugettext_passthrough as _
+from mediagoblin.tools.mail import normalize_email
+from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
+from mediagoblin.auth.tools import normalize_user_or_email_field
 
 
 class RegistrationForm(wtforms.Form):
     username = wtforms.TextField(
         _('Username'),
         [wtforms.validators.Required(),
-         wtforms.validators.Length(min=3, max=30),
-         wtforms.validators.Regexp(r'^\w+$')])
+         normalize_user_or_email_field(allow_email=False)])
     password = wtforms.PasswordField(
         _('Password'),
         [wtforms.validators.Required(),
-         wtforms.validators.Length(min=6, max=30)])
+         wtforms.validators.Length(min=5, max=1024)])
     email = wtforms.TextField(
         _('Email address'),
         [wtforms.validators.Required(),
-         wtforms.validators.Email()])
+         normalize_user_or_email_field(allow_user=False)])
 
 
 class LoginForm(wtforms.Form):
     username = wtforms.TextField(
-        _('Username'),
+        _('Username or Email'),
         [wtforms.validators.Required(),
-         wtforms.validators.Regexp(r'^\w+$')])
+         normalize_user_or_email_field()])
     password = wtforms.PasswordField(
         _('Password'),
-        [wtforms.validators.Required()])
+        [wtforms.validators.Required(),
+         wtforms.validators.Length(min=5, max=1024)])
 
 
 class ForgotPassForm(wtforms.Form):
     username = wtforms.TextField(
-        'Username or email',
-        [wtforms.validators.Required()])
-
-    def validate_username(form, field):
-        if not (re.match(r'^\w+$', field.data) or
-               re.match(r'^.+@[^.].*\.[a-z]{2,10}$', field.data,
-                        re.IGNORECASE)):
-            raise wtforms.ValidationError(u'Incorrect input')
+        _('Username or email'),
+        [wtforms.validators.Required(),
+         normalize_user_or_email_field()])
 
 
 class ChangePassForm(wtforms.Form):
     password = wtforms.PasswordField(
         'Password',
         [wtforms.validators.Required(),
-         wtforms.validators.Length(min=6, max=30),
-         wtforms.validators.EqualTo(
-                'confirm_password',
-                'Passwords must match.')])
-    confirm_password = wtforms.PasswordField(
-        'Confirm password',
-        [wtforms.validators.Required()])
+         wtforms.validators.Length(min=5, max=1024)])
     userid = wtforms.HiddenField(
         '',
         [wtforms.validators.Required()])