Add interface to change email addr; fix bugs

Author: 910JQK

forms.py

@@ -106,6 +106,13 @@ class GetTokenForm(FlaskForm):
 
 
 class PasswordResetForm(FlaskForm):    
+    new_mail = StringField(
+        _('[Optional] New Email'),
+        validators = [
+            Optional(), Email(_('Invalid Email Address.'))
+        ],
+        description = _('New email address (optional).')
+    )
     password = PasswordField(
         _('New Password'),
         validators = [

templates/user/password_reset.html

@@ -6,6 +6,7 @@
 {% block form_title %}{{ _('Reset Your Password') }}{% endblock %}
 
 {% block form %}
+  {{ field(form.new_mail) }}
   {{ field(form.password) }}
   {{ field(form.confirm) }}
   {{ field(form.token) }}

user.py

@@ -178,7 +178,7 @@ def login():
 def get_token():
     form = GetTokenForm()
     if form.validate_on_submit():
-        mail = form.mail.data
+        mail = form.mail.data.lower()
         user = find_record(User, mail=mail)
         if user:
             old_token_record = find_record(PasswordResetToken, user=user)
@@ -209,7 +209,14 @@ def password_reset(uid):
         user = find_record(User, id=uid)
         if user:
             token_record = find_record(PasswordResetToken, user=user)
+            new_mail = form.new_mail.data.lower()
+            if new_mail:
+                if find_record(User, mail=new_mail):
+                    flash(_('New email address already is use.'), 'err')
+                    return redirect(url_for('.password_reset', uid=uid))
             if token_record and token_record.check_token(token):
+                if new_mail:
+                    user.mail = new_mail
                 user.set_password(form.password.data)
                 user.save()
                 flash(_('Password reset successfully.'), 'ok')