Don't bother verifying an email address that hasn't changed

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index df0c8d841ba65e3a115b31e881923ea9709b5cc9..db37d113105fb1373df80a882021e70e0046f61a 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -86,20 +86,29 @@ class UserController < ApplicationController
         @user.openid_url = nil if @user.openid_url and @user.openid_url.empty?
 
         if @user.save
         @user.openid_url = nil if @user.openid_url and @user.openid_url.empty?
 
         if @user.save

-          flash[:piwik_goal] = PIWIK_SIGNUP_GOAL if defined?(PIWIK_SIGNUP_GOAL)
+          flash[:piwik_goal] = PIWIK["goals"]["signup"] if defined?(PIWIK)

 
 

-          if @user.status == "active"
-            flash[:notice] = t 'user.new.flash welcome', :email => @user.email
-            session[:referer] = welcome_path
+          referer = welcome_path
+
+          begin
+            uri = URI(session[:referer])
+            /map=(.*)\/(.*)\/(.*)/.match(uri.fragment) do |m|
+              editor = Rack::Utils.parse_query(uri.query).slice('editor')
+              referer = welcome_path({'zoom' => m[1],
+                                      'lat' => m[2],
+                                      'lon' => m[3]}.merge(editor))
+            end
+          rescue
+            # Use default
+          end

 
 

+          if @user.status == "active"
+            session[:referer] = referer

             successful_login(@user)
           else
             successful_login(@user)
           else

-            flash[:notice] = t 'user.new.flash create success message', :email => @user.email

             session[:token] = @user.tokens.create.token
             session[:token] = @user.tokens.create.token

-
-            Notifier.signup_confirm(@user, @user.tokens.create(:referer => welcome_path)).deliver
-
-            redirect_to :action => 'login', :referer => params[:referer]
+            Notifier.signup_confirm(@user, @user.tokens.create(:referer => referer)).deliver
+            redirect_to :action => 'confirm', :display_name => @user.display_name

           end
         else
           render :action => 'new', :referer => params[:referer]
           end
         else
           render :action => 'new', :referer => params[:referer]


@@ -303,55 +312,44 @@ class UserController < ApplicationController
 
   def confirm
     if request.post?
 
   def confirm
     if request.post?

-      if token = UserToken.find_by_token(params[:confirm_string])
-        if token.user.active?
-          flash[:error] = t('user.confirm.already active')
-          redirect_to :action => 'login'
-        else
-          user = token.user
-          user.status = "active"
-          user.email_valid = true
-          user.save!
-          referer = token.referer
-          token.destroy
-
-          if session[:token]
-            token = UserToken.find_by_token(session[:token])
-            session.delete(:token)
-          else
-            token = nil
-          end
-
-          if token.nil? or token.user != user
-            flash[:notice] = t('user.confirm.success')
-            redirect_to :action => :login, :referer => referer
-          else
-            token.destroy
-
-            session[:user] = user.id
-            cookies.permanent["_osm_username"] = user.display_name
-
-            if referer.nil?
-              flash[:notice] = t('user.confirm.success') + "<br /><br />" + t('user.confirm.before you start')
-              redirect_to :action => :account, :display_name => user.display_name
-            else
-              flash[:notice] = t('user.confirm.success')
-              redirect_to referer
-            end
-          end
-        end
+      token = UserToken.find_by_token(params[:confirm_string])
+      if token && token.user.active?
+        flash[:error] = t('user.confirm.already active')
+        redirect_to :action => 'login'
+      elsif !token || token.expired?
+        flash[:error] = t('user.confirm.unknown token')
+        redirect_to :action => 'confirm'

       else
       else

-        user = User.find_by_display_name(params[:display_name])
+        user = token.user
+        user.status = "active"
+        user.email_valid = true
+        user.save!
+        referer = token.referer
+        token.destroy

 
 

-        if user and user.active?
-          flash[:error] = t('user.confirm.already active')
-        elsif user
-          flash[:error] = t('user.confirm.unknown token') + t('user.confirm.reconfirm', :reconfirm => url_for(:action => 'confirm_resend', :display_name => params[:display_name]))
+        if session[:token]
+          token = UserToken.find_by_token(session[:token])
+          session.delete(:token)

         else
         else

-          flash[:error] = t('user.confirm.unknown token')
+          token = nil

         end
 
         end
 

-        redirect_to :action => 'login'
+        if token.nil? or token.user != user
+          flash[:notice] = t('user.confirm.success')
+          redirect_to :action => :login, :referer => referer
+        else
+          token.destroy
+
+          session[:user] = user.id
+          cookies.permanent["_osm_username"] = user.display_name
+
+          redirect_to referer || welcome_path
+        end
+      end
+    else
+      user = User.find_by_display_name(params[:display_name])
+      if !user || user.active?
+        redirect_to root_path

       end
     end
   end
       end
     end
   end


@@ -517,7 +515,7 @@ private
     if user = User.authenticate(:username => username, :password => password)
       successful_login(user)
     elsif user = User.authenticate(:username => username, :password => password, :pending => true)
     if user = User.authenticate(:username => username, :password => password)
       successful_login(user)
     elsif user = User.authenticate(:username => username, :password => password, :pending => true)

-      failed_login t('user.login.account not active', :reconfirm => url_for(:action => 'confirm_resend', :display_name => user.display_name))
+      unconfirmed_login(user)

     elsif User.authenticate(:username => username, :password => password, :suspended => true)
       failed_login t('user.login.account is suspended', :webmaster => "mailto:webmaster@openstreetmap.org")
     else
     elsif User.authenticate(:username => username, :password => password, :suspended => true)
       failed_login t('user.login.account is suspended', :webmaster => "mailto:webmaster@openstreetmap.org")
     else


@@ -548,7 +546,7 @@ private
         if user = User.find_by_openid_url(identity_url)
           case user.status
             when "pending" then
         if user = User.find_by_openid_url(identity_url)
           case user.status
             when "pending" then

-              failed_login t('user.login.account not active', :reconfirm => url_for(:action => 'confirm_resend', :display_name => user.display_name))
+              unconfirmed_login(user)

             when "active", "confirmed" then
               successful_login(user)
             when "suspended" then
             when "active", "confirmed" then
               successful_login(user)
             when "suspended" then


@@ -679,6 +677,15 @@ private
     session.delete(:referer)
   end
 
     session.delete(:referer)
   end
 

+  ##
+  #
+  def unconfirmed_login(user)
+    redirect_to :action => 'confirm', :display_name => user.display_name
+
+    session.delete(:remember_me)
+    session.delete(:referer)
+  end
+

   ##
   # update a user's details
   def update_user(user, params)
   ##
   # update a user's details
   def update_user(user, params)


@@ -725,7 +732,7 @@ private
 
       cookies.permanent["_osm_username"] = user.display_name
 
 
       cookies.permanent["_osm_username"] = user.display_name
 

-      if user.new_email.blank?
+      if user.new_email.blank? or user.new_email == user.email

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