Validate email addresses before confirming them

[rails.git] / app / controllers / user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 07b4f597588b884c9973d39bf8122bc2dcb25ce4..3f5eef831be43329199f9d48a25753f11686b207 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -186,13 +186,6 @@ class UserController < ApplicationController
       openid_verify(nil, @user) do |user|
         update_user(user)
       end
       openid_verify(nil, @user) do |user|
         update_user(user)
       end

-    else
-      if flash[:errors]
-        flash[:errors].each do |attr,msg|
-          attr = "new_email" if attr == "email" and !@user.new_email.nil?
-          @user.errors.add(attr,msg)
-        end
-      end

     end
   end
 
     end
   end
 


@@ -657,16 +650,25 @@ private
     if user.save
       set_locale
 
     if user.save
       set_locale
 

-      if user.new_email.nil? or user.new_email.empty?
+      if user.new_email.blank?

         flash.now[:notice] = t 'user.account.flash update success'
       else
         flash.now[:notice] = t 'user.account.flash update success'
       else

-        flash.now[:notice] = t 'user.account.flash update success confirm needed'
+        user.email = user.new_email
+
+        if user.valid?
+          flash.now[:notice] = t 'user.account.flash update success confirm needed'

 
 

-        begin
-          Notifier.email_confirm(user, user.tokens.create).deliver
-        rescue
-          # Ignore errors sending email
+          begin
+            Notifier.email_confirm(user, user.tokens.create).deliver
+          rescue
+            # Ignore errors sending email
+          end
+        else
+          @user.errors.set(:new_email, @user.errors.get(:email))
+          @user.errors.set(:email, [])

         end
         end

+
+        user.reset_email!

       end
     end
   end
       end
     end
   end