Fix typo that means fe0f4543c1 has never worked

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 6390ff19ed914c731a8f12b1394b397696203822..e418e103fdcd0cca186cd572c50b6ebb46779c83 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -28,10 +28,10 @@ class UserController < ApplicationController
     else
       @title = t "user.terms.title"
 
     else
       @title = t "user.terms.title"
 

-      if @user && @user.terms_agreed?
+      if current_user && current_user.terms_agreed?

         # Already agreed to terms, so just show settings
         # Already agreed to terms, so just show settings

-        redirect_to :action => :account, :display_name => @user.display_name
-      elsif @user.nil? && session[:new_user].nil?
+        redirect_to :action => :account, :display_name => current_user.display_name
+      elsif current_user.nil? && session[:new_user].nil?

         redirect_to :action => :login, :referer => request.fullpath
       end
     end
         redirect_to :action => :login, :referer => request.fullpath
       end
     end


@@ -41,52 +41,52 @@ class UserController < ApplicationController
     @title = t "user.new.title"
 
     if params[:decline]
     @title = t "user.new.title"
 
     if params[:decline]

-      if @user
-        @user.terms_seen = true
+      if current_user
+        current_user.terms_seen = true

 
 

-        if @user.save
+        if current_user.save

           flash[:notice] = t("user.new.terms declined", :url => t("user.new.terms declined url")).html_safe
         end
 
         if params[:referer]
           redirect_to params[:referer]
         else
           flash[:notice] = t("user.new.terms declined", :url => t("user.new.terms declined url")).html_safe
         end
 
         if params[:referer]
           redirect_to params[:referer]
         else

-          redirect_to :action => :account, :display_name => @user.display_name
+          redirect_to :action => :account, :display_name => current_user.display_name

         end
       else
         redirect_to t("user.terms.declined")
       end
         end
       else
         redirect_to t("user.terms.declined")
       end

-    elsif @user
-      unless @user.terms_agreed?
-        @user.consider_pd = params[:user][:consider_pd]
-        @user.terms_agreed = Time.now.getutc
-        @user.terms_seen = true
+    elsif current_user
+      unless current_user.terms_agreed?
+        current_user.consider_pd = params[:user][:consider_pd]
+        current_user.terms_agreed = Time.now.getutc
+        current_user.terms_seen = true

 
 

-        flash[:notice] = t "user.new.terms accepted" if @user.save
+        flash[:notice] = t "user.new.terms accepted" if current_user.save

       end
 
       if params[:referer]
         redirect_to params[:referer]
       else
       end
 
       if params[:referer]
         redirect_to params[:referer]
       else

-        redirect_to :action => :account, :display_name => @user.display_name
+        redirect_to :action => :account, :display_name => current_user.display_name

       end
     else
       end
     else

-      @user = session.delete(:new_user)
-
-      if check_signup_allowed(@user.email)
-        @user.data_public = true
-        @user.description = "" if @user.description.nil?
-        @user.creation_ip = request.remote_ip
-        @user.languages = http_accept_language.user_preferred_languages
-        @user.terms_agreed = Time.now.getutc
-        @user.terms_seen = true
-
-        if @user.auth_uid.nil? || @user.auth_uid.empty?
-          @user.auth_provider = nil
-          @user.auth_uid = nil
+      self.current_user = session.delete(:new_user)
+
+      if check_signup_allowed(current_user.email)
+        current_user.data_public = true
+        current_user.description = "" if current_user.description.nil?
+        current_user.creation_ip = request.remote_ip
+        current_user.languages = http_accept_language.user_preferred_languages
+        current_user.terms_agreed = Time.now.getutc
+        current_user.terms_seen = true
+
+        if current_user.auth_uid.blank?
+          current_user.auth_provider = nil
+          current_user.auth_uid = nil

         end
 
         end
 

-        if @user.save
+        if current_user.save

           flash[:piwik_goal] = PIWIK["goals"]["signup"] if defined?(PIWIK)
 
           referer = welcome_path
           flash[:piwik_goal] = PIWIK["goals"]["signup"] if defined?(PIWIK)
 
           referer = welcome_path


@@ -99,17 +99,17 @@ class UserController < ApplicationController
                                        "lat" => m[2],
                                        "lon" => m[3] }.merge(editor))
             end
                                        "lat" => m[2],
                                        "lon" => m[3] }.merge(editor))
             end

-          rescue
+          rescue StandardError

             # Use default
           end
 
             # Use default
           end
 

-          if @user.status == "active"
+          if current_user.status == "active"

             session[:referer] = referer
             session[:referer] = referer

-            successful_login(@user)
+            successful_login(current_user)

           else
           else

-            session[:token] = @user.tokens.create.token
-            Notifier.signup_confirm(@user, @user.tokens.create(:referer => referer)).deliver_now
-            redirect_to :action => "confirm", :display_name => @user.display_name
+            session[:token] = current_user.tokens.create.token
+            Notifier.signup_confirm(current_user, current_user.tokens.create(:referer => referer)).deliver_now
+            redirect_to :action => "confirm", :display_name => current_user.display_name

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


@@ -120,32 +120,36 @@ class UserController < ApplicationController
 
   def account
     @title = t "user.account.title"
 
   def account
     @title = t "user.account.title"

-    @tokens = @user.oauth_tokens.authorized
+    @tokens = current_user.oauth_tokens.authorized

 
     if params[:user] && params[:user][:display_name] && params[:user][:description]
       if params[:user][:auth_provider].blank? ||
 
     if params[:user] && params[:user][:display_name] && params[:user][:description]
       if params[:user][:auth_provider].blank? ||

-         (params[:user][:auth_provider] == @user.auth_provider &&
-          params[:user][:auth_uid] == @user.auth_uid)
-        update_user(@user, params)
+         (params[:user][:auth_provider] == current_user.auth_provider &&
+          params[:user][:auth_uid] == current_user.auth_uid)
+        update_user(current_user, params)

       else
         session[:new_user_settings] = params
         redirect_to auth_url(params[:user][:auth_provider], params[:user][:auth_uid])
       end
       else
         session[:new_user_settings] = params
         redirect_to auth_url(params[:user][:auth_provider], params[:user][:auth_uid])
       end

+    elsif errors = session.delete(:user_errors)
+      errors.each do |attribute, error|
+        current_user.errors.add(attribute, error)
+      end

     end
   end
 
   def go_public
     end
   end
 
   def go_public

-    @user.data_public = true
-    @user.save
+    current_user.data_public = true
+    current_user.save

     flash[:notice] = t "user.go_public.flash success"
     flash[:notice] = t "user.go_public.flash success"

-    redirect_to :controller => "user", :action => "account", :display_name => @user.display_name
+    redirect_to :action => "account", :display_name => current_user.display_name

   end
 
   def lost_password
     @title = t "user.lost_password.title"
 
     if params[:user] && params[:user][:email]
   end
 
   def lost_password
     @title = t "user.lost_password.title"
 
     if params[:user] && params[:user][:email]

-      user = User.visible.find_by_email(params[:user][:email])
+      user = User.visible.find_by(:email => params[:user][:email])

 
       if user.nil?
         users = User.visible.where("LOWER(email) = LOWER(?)", params[:user][:email])
 
       if user.nil?
         users = User.visible.where("LOWER(email) = LOWER(?)", params[:user][:email])


@@ -168,21 +172,21 @@ class UserController < ApplicationController
     @title = t "user.reset_password.title"
 
     if params[:token]
     @title = t "user.reset_password.title"
 
     if params[:token]

-      token = UserToken.find_by_token(params[:token])
+      token = UserToken.find_by(:token => params[:token])

 
       if token
 
       if token

-        @user = token.user
+        self.current_user = token.user

 
         if params[:user]
 
         if params[:user]

-          @user.pass_crypt = params[:user][:pass_crypt]
-          @user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
-          @user.status = "active" if @user.status == "pending"
-          @user.email_valid = true
+          current_user.pass_crypt = params[:user][:pass_crypt]
+          current_user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
+          current_user.status = "active" if current_user.status == "pending"
+          current_user.email_valid = true

 
 

-          if @user.save
+          if current_user.save

             token.destroy
             flash[:notice] = t "user.reset_password.flash changed"
             token.destroy
             flash[:notice] = t "user.reset_password.flash changed"

-            redirect_to :action => "login"
+            successful_login(current_user)

           end
         end
       else
           end
         end
       else


@@ -190,7 +194,7 @@ class UserController < ApplicationController
         redirect_to :action => "lost_password"
       end
     else
         redirect_to :action => "lost_password"
       end
     else

-      render :text => "", :status => :bad_request
+      head :bad_request

     end
   end
 
     end
   end
 


@@ -198,7 +202,7 @@ class UserController < ApplicationController
     @title = t "user.new.title"
     @referer = params[:referer] || session[:referer]
 
     @title = t "user.new.title"
     @referer = params[:referer] || session[:referer]
 

-    if @user
+    if current_user

       # The user is logged in already, so don't show them the signup
       # page, instead send them to the home page
       if @referer
       # The user is logged in already, so don't show them the signup
       # page, instead send them to the home page
       if @referer


@@ -207,43 +211,45 @@ class UserController < ApplicationController
         redirect_to :controller => "site", :action => "index"
       end
     elsif params.key?(:auth_provider) && params.key?(:auth_uid)
         redirect_to :controller => "site", :action => "index"
       end
     elsif params.key?(:auth_provider) && params.key?(:auth_uid)

-      @user = User.new(:email => params[:email],
-                       :email_confirmation => params[:email],
-                       :display_name => params[:nickname],
-                       :auth_provider => params[:auth_provider],
-                       :auth_uid => params[:auth_uid])
+      self.current_user = User.new(:email => params[:email],
+                                   :email_confirmation => params[:email],
+                                   :display_name => params[:nickname],
+                                   :auth_provider => params[:auth_provider],
+                                   :auth_uid => params[:auth_uid])

 
       flash.now[:notice] = render_to_string :partial => "auth_association"
     else
       check_signup_allowed
 
       flash.now[:notice] = render_to_string :partial => "auth_association"
     else
       check_signup_allowed

+
+      self.current_user = User.new

     end
   end
 
   def create
     end
   end
 
   def create

-    @user = User.new(user_params)
+    self.current_user = User.new(user_params)

 
 

-    if check_signup_allowed(@user.email)
+    if check_signup_allowed(current_user.email)

       session[:referer] = params[:referer]
 
       session[:referer] = params[:referer]
 

-      @user.status = "pending"
+      current_user.status = "pending"

 
 

-      if @user.auth_provider.present? && @user.pass_crypt.empty?
+      if current_user.auth_provider.present? && current_user.pass_crypt.empty?

         # We are creating an account with external authentication and
         # no password was specified so create a random one
         # We are creating an account with external authentication and
         # no password was specified so create a random one

-        @user.pass_crypt = SecureRandom.base64(16)
-        @user.pass_crypt_confirmation = @user.pass_crypt
+        current_user.pass_crypt = SecureRandom.base64(16)
+        current_user.pass_crypt_confirmation = current_user.pass_crypt

       end
 
       end
 

-      if @user.invalid?
+      if current_user.invalid?

         # Something is wrong with a new user, so rerender the form
         render :action => "new"
         # Something is wrong with a new user, so rerender the form
         render :action => "new"

-      elsif @user.auth_provider.present?
+      elsif current_user.auth_provider.present?

         # Verify external authenticator before moving on
         # Verify external authenticator before moving on

-        session[:new_user] = @user
-        redirect_to auth_url(@user.auth_provider, @user.auth_uid)
+        session[:new_user] = current_user
+        redirect_to auth_url(current_user.auth_provider, current_user.auth_uid)

       else
         # Save the user record
       else
         # Save the user record

-        session[:new_user] = @user
+        session[:new_user] = current_user

         redirect_to :action => :terms
       end
     end
         redirect_to :action => :terms
       end
     end


@@ -257,16 +263,16 @@ class UserController < ApplicationController
       password_authentication(params[:username], params[:password])
     elsif params[:openid_url].present?
       session[:remember_me] ||= params[:remember_me_openid]
       password_authentication(params[:username], params[:password])
     elsif params[:openid_url].present?
       session[:remember_me] ||= params[:remember_me_openid]

-      redirect_to auth_url("openid", params[:openid_url])
+      redirect_to auth_url("openid", params[:openid_url], params[:referer])

     end
   end
 
   def logout
     @title = t "user.logout.title"
 
     end
   end
 
   def logout
     @title = t "user.logout.title"
 

-    if params[:session] == request.session_options[:id]
+    if params[:session] == session.id

       if session[:token]
       if session[:token]

-        token = UserToken.find_by_token(session[:token])
+        token = UserToken.find_by(:token => session[:token])

         token.destroy if token
         session.delete(:token)
       end
         token.destroy if token
         session.delete(:token)
       end


@@ -282,7 +288,7 @@ class UserController < ApplicationController
 
   def confirm
     if request.post?
 
   def confirm
     if request.post?

-      token = UserToken.find_by_token(params[:confirm_string])
+      token = UserToken.find_by(:token => params[:confirm_string])

       if token && token.user.active?
         flash[:error] = t("user.confirm.already active")
         redirect_to :action => "login"
       if token && token.user.active?
         flash[:error] = t("user.confirm.already active")
         redirect_to :action => "login"


@@ -293,12 +299,13 @@ class UserController < ApplicationController
         user = token.user
         user.status = "active"
         user.email_valid = true
         user = token.user
         user.status = "active"
         user.email_valid = true

+        flash[:notice] = gravatar_status_message(user) if gravatar_enable(user)

         user.save!
         referer = token.referer
         token.destroy
 
         if session[:token]
         user.save!
         referer = token.referer
         token.destroy
 
         if session[:token]

-          token = UserToken.find_by_token(session[:token])
+          token = UserToken.find_by(:token => session[:token])

           session.delete(:token)
         else
           token = nil
           session.delete(:token)
         else
           token = nil


@@ -316,21 +323,21 @@ class UserController < ApplicationController
         end
       end
     else
         end
       end
     else

-      user = User.find_by_display_name(params[:display_name])
+      user = User.find_by(:display_name => params[:display_name])

 
       redirect_to root_path if user.nil? || user.active?
     end
   end
 
   def confirm_resend
 
       redirect_to root_path if user.nil? || user.active?
     end
   end
 
   def confirm_resend

-    user = User.find_by_display_name(params[:display_name])
-    token = UserToken.find_by_token(session[:token])
+    user = User.find_by(:display_name => params[:display_name])
+    token = UserToken.find_by(:token => session[:token])

 
     if user.nil? || token.nil? || token.user != user
       flash[:error] = t "user.confirm_resend.failure", :name => params[:display_name]
     else
       Notifier.signup_confirm(user, user.tokens.create).deliver_now
 
     if user.nil? || token.nil? || token.user != user
       flash[:error] = t "user.confirm_resend.failure", :name => params[:display_name]
     else
       Notifier.signup_confirm(user, user.tokens.create).deliver_now

-      flash[:notice] = t("user.confirm_resend.success", :email => user.email).html_safe
+      flash[:notice] = t("user.confirm_resend.success", :email => user.email, :sender => SUPPORT_EMAIL).html_safe

     end
 
     redirect_to :action => "login"
     end
 
     redirect_to :action => "login"


@@ -338,20 +345,25 @@ class UserController < ApplicationController
 
   def confirm_email
     if request.post?
 
   def confirm_email
     if request.post?

-      token = UserToken.find_by_token(params[:confirm_string])
+      token = UserToken.find_by(:token => params[:confirm_string])

       if token && token.user.new_email?
       if token && token.user.new_email?

-        @user = token.user
-        @user.email = @user.new_email
-        @user.new_email = nil
-        @user.email_valid = true
-        if @user.save
-          flash[:notice] = t "user.confirm_email.success"
+        self.current_user = token.user
+        current_user.email = current_user.new_email
+        current_user.new_email = nil
+        current_user.email_valid = true
+        gravatar_enabled = gravatar_enable(current_user)
+        if current_user.save
+          flash[:notice] = if gravatar_enabled
+                             t("user.confirm_email.success") + " " + gravatar_status_message(current_user)
+                           else
+                             t("user.confirm_email.success")
+                           end

         else
         else

-          flash[:errors] = @user.errors
+          flash[:errors] = current_user.errors

         end
         token.destroy
         end
         token.destroy

-        session[:user] = @user.id
-        redirect_to :action => "account", :display_name => @user.display_name
+        session[:user] = current_user.id
+        redirect_to :action => "account", :display_name => current_user.display_name

       elsif token
         flash[:error] = t "user.confirm_email.failure"
         redirect_to :action => "account", :display_name => token.user.display_name
       elsif token
         flash[:error] = t "user.confirm_email.failure"
         redirect_to :action => "account", :display_name => token.user.display_name


@@ -365,28 +377,28 @@ class UserController < ApplicationController
     if @this_user.visible?
       render :action => :api_read, :content_type => "text/xml"
     else
     if @this_user.visible?
       render :action => :api_read, :content_type => "text/xml"
     else

-      render :text => "", :status => :gone
+      head :gone

     end
   end
 
   def api_details
     end
   end
 
   def api_details

-    @this_user = @user
+    @this_user = current_user

     render :action => :api_read, :content_type => "text/xml"
   end
 
   def api_gpx_files
     doc = OSM::API.new.get_xml_doc
     render :action => :api_read, :content_type => "text/xml"
   end
 
   def api_gpx_files
     doc = OSM::API.new.get_xml_doc

-    @user.traces.reload.each do |trace|
+    current_user.traces.reload.each do |trace|

       doc.root << trace.to_xml_node
     end
       doc.root << trace.to_xml_node
     end

-    render :text => doc.to_s, :content_type => "text/xml"
+    render :xml => doc.to_s

   end
 
   def view
   end
 
   def view

-    @this_user = User.find_by_display_name(params[:display_name])
+    @this_user = User.find_by(:display_name => params[:display_name])

 
     if @this_user &&
 
     if @this_user &&

-       (@this_user.visible? || (@user && @user.administrator?))
+       (@this_user.visible? || (current_user && current_user.administrator?))

       @title = @this_user.display_name
     else
       render_unknown_user params[:display_name]
       @title = @this_user.display_name
     else
       render_unknown_user params[:display_name]


@@ -394,28 +406,26 @@ class UserController < ApplicationController
   end
 
   def make_friend
   end
 
   def make_friend

-    @new_friend = User.find_by_display_name(params[:display_name])
+    @new_friend = User.find_by(:display_name => params[:display_name])

 
     if @new_friend
       if request.post?
         friend = Friend.new
 
     if @new_friend
       if request.post?
         friend = Friend.new

-        friend.user_id = @user.id
+        friend.user_id = current_user.id

         friend.friend_user_id = @new_friend.id
         friend.friend_user_id = @new_friend.id

-        if @user.is_friends_with?(@new_friend)
+        if current_user.is_friends_with?(@new_friend)

           flash[:warning] = t "user.make_friend.already_a_friend", :name => @new_friend.display_name
           flash[:warning] = t "user.make_friend.already_a_friend", :name => @new_friend.display_name

+        elsif friend.save
+          flash[:notice] = t "user.make_friend.success", :name => @new_friend.display_name
+          Notifier.friend_notification(friend).deliver_now

         else
         else

-          if friend.save
-            flash[:notice] = t "user.make_friend.success", :name => @new_friend.display_name
-            Notifier.friend_notification(friend).deliver_now
-          else
-            friend.add_error(t("user.make_friend.failed", :name => @new_friend.display_name))
-          end
+          friend.add_error(t("user.make_friend.failed", :name => @new_friend.display_name))

         end
 
         if params[:referer]
           redirect_to params[:referer]
         else
         end
 
         if params[:referer]
           redirect_to params[:referer]
         else

-          redirect_to :controller => "user", :action => "view"
+          redirect_to :action => "view"

         end
       end
     else
         end
       end
     else


@@ -424,12 +434,12 @@ class UserController < ApplicationController
   end
 
   def remove_friend
   end
 
   def remove_friend

-    @friend = User.find_by_display_name(params[:display_name])
+    @friend = User.find_by(:display_name => params[:display_name])

 
     if @friend
       if request.post?
 
     if @friend
       if request.post?

-        if @user.is_friends_with?(@friend)
-          Friend.delete_all "user_id = #{@user.id} AND friend_user_id = #{@friend.id}"
+        if current_user.is_friends_with?(@friend)
+          Friend.where(:user_id => current_user.id, :friend_user_id => @friend.id).delete_all

           flash[:notice] = t "user.remove_friend.success", :name => @friend.display_name
         else
           flash[:error] = t "user.remove_friend.not_a_friend", :name => @friend.display_name
           flash[:notice] = t "user.remove_friend.success", :name => @friend.display_name
         else
           flash[:error] = t "user.remove_friend.not_a_friend", :name => @friend.display_name


@@ -438,7 +448,7 @@ class UserController < ApplicationController
         if params[:referer]
           redirect_to params[:referer]
         else
         if params[:referer]
           redirect_to params[:referer]
         else

-          redirect_to :controller => "user", :action => "view"
+          redirect_to :action => "view"

         end
       end
     else
         end
       end
     else


@@ -451,14 +461,14 @@ class UserController < ApplicationController
   def set_status
     @this_user.status = params[:status]
     @this_user.save
   def set_status
     @this_user.status = params[:status]
     @this_user.save

-    redirect_to :controller => "user", :action => "view", :display_name => params[:display_name]
+    redirect_to :action => "view", :display_name => params[:display_name]

   end
 
   ##
   # delete a user, marking them as deleted and removing personal data
   def delete
     @this_user.delete
   end
 
   ##
   # delete a user, marking them as deleted and removing personal data
   def delete
     @this_user.delete

-    redirect_to :controller => "user", :action => "view", :display_name => params[:display_name]
+    redirect_to :action => "view", :display_name => params[:display_name]

   end
 
   ##
   end
 
   ##


@@ -472,9 +482,11 @@ class UserController < ApplicationController
 
       redirect_to url_for(:status => params[:status], :ip => params[:ip], :page => params[:page])
     else
 
       redirect_to url_for(:status => params[:status], :ip => params[:ip], :page => params[:page])
     else

+      @params = params.permit(:status, :ip)
+

       conditions = {}
       conditions = {}

-      conditions[:status] = params[:status] if params[:status]
-      conditions[:creation_ip] = params[:ip] if params[:ip]
+      conditions[:status] = @params[:status] if @params[:status]
+      conditions[:creation_ip] = @params[:ip] if @params[:ip]

 
       @user_pages, @users = paginate(:users,
                                      :conditions => conditions,
 
       @user_pages, @users = paginate(:users,
                                      :conditions => conditions,


@@ -486,7 +498,7 @@ class UserController < ApplicationController
   ##
   # omniauth success callback
   def auth_success
   ##
   # omniauth success callback
   def auth_success

-    auth_info = env["omniauth.auth"]
+    auth_info = request.env["omniauth.auth"]

 
     provider = auth_info[:provider]
     uid = auth_info[:uid]
 
     provider = auth_info[:provider]
     uid = auth_info[:uid]


@@ -503,32 +515,15 @@ class UserController < ApplicationController
       email_verified = false
     end
 
       email_verified = false
     end
 

-    user = User.find_by_auth_provider_and_auth_uid(provider, uid)
+    if settings = session.delete(:new_user_settings)
+      current_user.auth_provider = provider
+      current_user.auth_uid = uid

 
 

-    if user.nil? && provider == "google"
-      openid_url = auth_info[:extra][:id_info]["openid_id"]
-      user = User.find_by_auth_provider_and_auth_uid("openid", openid_url) if openid_url
-      user.update(:auth_provider => provider, :auth_uid => uid) if user
-    end
-
-    if user
-      case user.status
-      when "pending" then
-        unconfirmed_login(user)
-      when "active", "confirmed" then
-        successful_login(user)
-      when "suspended" then
-        failed_login t("user.login.account is suspended", :webmaster => "mailto:webmaster@openstreetmap.org")
-      else
-        failed_login t("user.login.auth failure")
-      end
-    elsif settings = session.delete(:new_user_settings)
-      @user.auth_provider = provider
-      @user.auth_uid = uid
+      update_user(current_user, settings)

 
 

-      update_user(@user, settings)
+      session[:user_errors] = current_user.errors.as_json

 
 

-      redirect_to :action => "account", :display_name => @user.display_name
+      redirect_to :action => "account", :display_name => current_user.display_name

     elsif session[:new_user]
       session[:new_user].auth_provider = provider
       session[:new_user].auth_uid = uid
     elsif session[:new_user]
       session[:new_user].auth_provider = provider
       session[:new_user].auth_uid = uid


@@ -539,8 +534,29 @@ class UserController < ApplicationController
 
       redirect_to :action => "terms"
     else
 
       redirect_to :action => "terms"
     else

-      redirect_to :action => "new", :nickname => name, :email => email,
-                  :auth_provider => provider, :auth_uid => uid
+      user = User.find_by(:auth_provider => provider, :auth_uid => uid)
+
+      if user.nil? && provider == "google"
+        openid_url = auth_info[:extra][:id_info]["openid_id"]
+        user = User.find_by(:auth_provider => "openid", :auth_uid => openid_url) if openid_url
+        user.update(:auth_provider => provider, :auth_uid => uid) if user
+      end
+
+      if user
+        case user.status
+        when "pending" then
+          unconfirmed_login(user)
+        when "active", "confirmed" then
+          successful_login(user, request.env["omniauth.params"]["referer"])
+        when "suspended" then
+          failed_login t("user.login.account is suspended", :webmaster => "mailto:#{SUPPORT_EMAIL}").html_safe
+        else
+          failed_login t("user.login.auth failure")
+        end
+      else
+        redirect_to :action => "new", :nickname => name, :email => email,
+                    :auth_provider => provider, :auth_uid => uid
+      end

     end
   end
 
     end
   end
 


@@ -561,20 +577,27 @@ class UserController < ApplicationController
     elsif user = User.authenticate(:username => username, :password => password, :pending => true)
       unconfirmed_login(user)
     elsif User.authenticate(:username => username, :password => password, :suspended => true)
     elsif user = User.authenticate(:username => username, :password => password, :pending => true)
       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")
+      failed_login t("user.login.account is suspended", :webmaster => "mailto:#{SUPPORT_EMAIL}").html_safe, username

     else
     else

-      failed_login t("user.login.auth failure")
+      failed_login t("user.login.auth failure"), username

     end
   end
 
   ##
   # return the URL to use for authentication
     end
   end
 
   ##
   # return the URL to use for authentication

-  def auth_url(provider, uid)
-    if provider == "openid"
-      auth_path(:provider => "openid", :openid_url => openid_expand_url(uid), :origin => request.path)
+  def auth_url(provider, uid, referer = nil)
+    params = { :provider => provider }
+
+    params[:openid_url] = openid_expand_url(uid) if provider == "openid"
+
+    if referer.nil?
+      params[:origin] = request.path

     else
     else

-      auth_path(:provider => provider, :origin => request.path)
+      params[:origin] = request.path + "?referer=" + CGI.escape(referer)
+      params[:referer] = referer

     end
     end

+
+    auth_path(params)

   end
 
   ##
   end
 
   ##


@@ -582,25 +605,25 @@ class UserController < ApplicationController
   # try and come up with the correct URL based on what the user entered
   def openid_expand_url(openid_url)
     if openid_url.nil?
   # try and come up with the correct URL based on what the user entered
   def openid_expand_url(openid_url)
     if openid_url.nil?

-      return nil
+      nil

     elsif openid_url.match(%r{(.*)gmail.com(/?)$}) || openid_url.match(%r{(.*)googlemail.com(/?)$})
       # Special case gmail.com as it is potentially a popular OpenID
       # provider and, unlike yahoo.com, where it works automatically, Google
       # have hidden their OpenID endpoint somewhere obscure this making it
       # somewhat less user friendly.
     elsif openid_url.match(%r{(.*)gmail.com(/?)$}) || openid_url.match(%r{(.*)googlemail.com(/?)$})
       # Special case gmail.com as it is potentially a popular OpenID
       # provider and, unlike yahoo.com, where it works automatically, Google
       # have hidden their OpenID endpoint somewhere obscure this making it
       # somewhat less user friendly.

-      return "https://www.google.com/accounts/o8/id"
+      "https://www.google.com/accounts/o8/id"

     else
     else

-      return openid_url
+      openid_url

     end
   end
 
   ##
   # process a successful login
     end
   end
 
   ##
   # process a successful login

-  def successful_login(user)
+  def successful_login(user, referer = nil)

     session[:user] = user.id
     session_expires_after 28.days if session[:remember_me]
 
     session[:user] = user.id
     session_expires_after 28.days if session[:remember_me]
 

-    target = session[:referer] || url_for(:controller => :site, :action => :index)
+    target = referer || session[:referer] || url_for(:controller => :site, :action => :index)

 
     # The user is logged in, so decide where to send them:
     #
 
     # The user is logged in, so decide where to send them:
     #


@@ -609,7 +632,7 @@ class UserController < ApplicationController
     # - If they were referred to the login, send them back there.
     # - Otherwise, send them to the home page.
     if REQUIRE_TERMS_SEEN && !user.terms_seen
     # - If they were referred to the login, send them back there.
     # - Otherwise, send them to the home page.
     if REQUIRE_TERMS_SEEN && !user.terms_seen

-      redirect_to :controller => :user, :action => :terms, :referer => target
+      redirect_to :action => :terms, :referer => target

     elsif user.blocked_on_view
       redirect_to user.blocked_on_view, :referer => target
     else
     elsif user.blocked_on_view
       redirect_to user.blocked_on_view, :referer => target
     else


@@ -622,10 +645,11 @@ class UserController < ApplicationController
 
   ##
   # process a failed login
 
   ##
   # process a failed login

-  def failed_login(message)
+  def failed_login(message, username = nil)

     flash[:error] = message
 
     flash[:error] = message
 

-    redirect_to :action => "login", :referer => session[:referer]
+    redirect_to :action => "login", :referer => session[:referer],
+                :username => username, :remember_me => session[:remember_me]

 
     session.delete(:remember_me)
     session.delete(:referer)
 
     session.delete(:remember_me)
     session.delete(:referer)


@@ -648,7 +672,7 @@ class UserController < ApplicationController
     user.display_name = params[:user][:display_name]
     user.new_email = params[:user][:new_email]
 
     user.display_name = params[:user][:display_name]
     user.new_email = params[:user][:new_email]
 

-    if params[:user][:pass_crypt].length > 0 || params[:user][:pass_crypt_confirmation].length > 0
+    unless params[:user][:pass_crypt].empty? && params[:user][:pass_crypt_confirmation].empty?

       user.pass_crypt = params[:user][:pass_crypt]
       user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
     end
       user.pass_crypt = params[:user][:pass_crypt]
       user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
     end


@@ -675,11 +699,11 @@ class UserController < ApplicationController
     user.home_lat = params[:user][:home_lat]
     user.home_lon = params[:user][:home_lon]
 
     user.home_lat = params[:user][:home_lat]
     user.home_lon = params[:user][:home_lon]
 

-    if params[:user][:preferred_editor] == "default"
-      user.preferred_editor = nil
-    else
-      user.preferred_editor = params[:user][:preferred_editor]
-    end
+    user.preferred_editor = if params[:user][:preferred_editor] == "default"
+                              nil
+                            else
+                              params[:user][:preferred_editor]
+                            end

 
     if params[:user][:auth_provider].nil? || params[:user][:auth_provider].blank?
       user.auth_provider = nil
 
     if params[:user][:auth_provider].nil? || params[:user][:auth_provider].blank?
       user.auth_provider = nil


@@ -699,12 +723,12 @@ class UserController < ApplicationController
 
           begin
             Notifier.email_confirm(user, user.tokens.create).deliver_now
 
           begin
             Notifier.email_confirm(user, user.tokens.create).deliver_now

-          rescue
+          rescue StandardError

             # Ignore errors sending email
           end
         else
             # Ignore errors sending email
           end
         else

-          @user.errors.set(:new_email, @user.errors.get(:email))
-          @user.errors.set(:email, [])
+          current_user.errors.add(:new_email, current_user.errors[:email])
+          current_user.errors.add(:email, [])

         end
 
         user.restore_email!
         end
 
         user.restore_email!


@@ -716,25 +740,23 @@ class UserController < ApplicationController
   # require that the user is a administrator, or fill out a helpful error message
   # and return them to the user page.
   def require_administrator
   # require that the user is a administrator, or fill out a helpful error message
   # and return them to the user page.
   def require_administrator

-    if @user && !@user.administrator?
+    if current_user && !current_user.administrator?

       flash[:error] = t("user.filter.not_an_administrator")
 
       if params[:display_name]
       flash[:error] = t("user.filter.not_an_administrator")
 
       if params[:display_name]

-        redirect_to :controller => "user", :action => "view", :display_name => params[:display_name]
+        redirect_to :action => "view", :display_name => params[:display_name]

       else
       else

-        redirect_to :controller => "user", :action => "login", :referer => request.fullpath
+        redirect_to :action => "login", :referer => request.fullpath

       end
       end

-    elsif !@user
-      redirect_to :controller => "user", :action => "login", :referer => request.fullpath
+    elsif !current_user
+      redirect_to :action => "login", :referer => request.fullpath

     end
   end
 
   ##
   # require that the user in the URL is the logged in user
   def require_self
     end
   end
 
   ##
   # require that the user in the URL is the logged in user
   def require_self

-    if params[:display_name] != @user.display_name
-      render :text => "", :status => :forbidden
-    end
+    head :forbidden if params[:display_name] != current_user.display_name

   end
 
   ##
   end
 
   ##


@@ -746,9 +768,9 @@ class UserController < ApplicationController
   ##
   # ensure that there is a "this_user" instance variable
   def lookup_user_by_name
   ##
   # ensure that there is a "this_user" instance variable
   def lookup_user_by_name

-    @this_user = User.find_by_display_name(params[:display_name])
+    @this_user = User.find_by(:display_name => params[:display_name])

   rescue ActiveRecord::RecordNotFound
   rescue ActiveRecord::RecordNotFound

-    redirect_to :controller => "user", :action => "view", :display_name => params[:display_name] unless @this_user
+    redirect_to :action => "view", :display_name => params[:display_name] unless @this_user

   end
 
   ##
   end
 
   ##


@@ -771,11 +793,11 @@ class UserController < ApplicationController
   ##
   # check signup acls
   def check_signup_allowed(email = nil)
   ##
   # check signup acls
   def check_signup_allowed(email = nil)

-    if email.nil?
-      domain = nil
-    else
-      domain = email.split("@").last
-    end
+    domain = if email.nil?
+               nil
+             else
+               email.split("@").last
+             end

 
     if blocked = Acl.no_account_creation(request.remote_ip, domain)
       logger.info "Blocked signup from #{request.remote_ip} for #{email}"
 
     if blocked = Acl.no_account_creation(request.remote_ip, domain)
       logger.info "Blocked signup from #{request.remote_ip} for #{email}"


@@ -785,4 +807,27 @@ class UserController < ApplicationController
 
     !blocked
   end
 
     !blocked
   end

+
+  ##
+  # check if this user has a gravatar and set the user pref is true
+  def gravatar_enable(user)
+    # code from example https://en.gravatar.com/site/implement/images/ruby/
+    return false if user.image.present?
+    hash = Digest::MD5.hexdigest(user.email.downcase)
+    url = "https://www.gravatar.com/avatar/#{hash}?d=404" # without d=404 we will always get an image back
+    response = OSM.http_client.get(URI.parse(url))
+    oldsetting = user.image_use_gravatar
+    user.image_use_gravatar = response.success?
+    oldsetting != user.image_use_gravatar
+  end
+
+  ##
+  # display a message about th current status of the gravatar setting
+  def gravatar_status_message(user)
+    if user.image_use_gravatar
+      t "user.account.gravatar.enabled"
+    else
+      t "user.account.gravatar.disabled"
+    end
+  end

 end
 end