Remove fp_email_sent.html and refs to it

[mediagoblin.git] / mediagoblin / auth / forms.py

diff --git a/mediagoblin/auth/forms.py b/mediagoblin/auth/forms.py
index d1f3c5dc24c91d2824abf239ecc43b1ab7726727..5a707c7baba59772adb1d9421e65a31cfcfbc757 100644 (file)
--- a/mediagoblin/auth/forms.py
+++ b/mediagoblin/auth/forms.py
@@ -1,5 +1,5 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
+# Copyright (C) 2011 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,8 +15,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import wtforms
+import re
 
-from mediagoblin.util import fake_ugettext_passthrough as _
+from mediagoblin.tools.translate import fake_ugettext_passthrough as _
 
 
 class RegistrationForm(wtforms.Form):
@@ -24,29 +25,15 @@ class RegistrationForm(wtforms.Form):
         _('Username'),
         [wtforms.validators.Required(),
          wtforms.validators.Length(min=3, max=30),
-         wtforms.validators.Regexp(r'^\w+$')],
-        description=_(
-            u"This is the name other users will identify you with."))
+         wtforms.validators.Regexp(r'^\w+$')])
     password = wtforms.PasswordField(
         _('Password'),
         [wtforms.validators.Required(),
-         wtforms.validators.Length(min=6, max=30),
-         wtforms.validators.EqualTo(
-                'confirm_password',
-                _('Passwords must match.'))],
-        description=_(
-            u"Try to use a strong password!"))
-    confirm_password = wtforms.PasswordField(
-        _('Confirm password'),
-        [wtforms.validators.Required()],
-        description=_(
-            u"Type it again here to make sure there are no spelling mistakes."))
+         wtforms.validators.Length(min=6, max=30)])
     email = wtforms.TextField(
         _('Email address'),
         [wtforms.validators.Required(),
-         wtforms.validators.Email()],
-        description=_(
-            u"Your email will never be published."))
+         wtforms.validators.Email()])
 
 
 class LoginForm(wtforms.Form):
@@ -57,3 +44,28 @@ class LoginForm(wtforms.Form):
     password = wtforms.PasswordField(
         _('Password'),
         [wtforms.validators.Required()])
+
+
+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')
+
+
+class ChangePassForm(wtforms.Form):
+    password = wtforms.PasswordField(
+        'Password',
+        [wtforms.validators.Required(),
+         wtforms.validators.Length(min=6, max=30)])
+    userid = wtforms.HiddenField(
+        '',
+        [wtforms.validators.Required()])
+    token = wtforms.HiddenField(
+        '',
+        [wtforms.validators.Required()])