Renamed `apply_inline_css` to `style_message` as suggested

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 766ab37d1396e437c4826b8d02b78b8e923c9fe8..197b2891404c599046311e3a8ff5e48fd6c77023 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -131,6 +131,10 @@ class UserController < ApplicationController
         session[:new_user_settings] = params
         redirect_to auth_url(params[:user][:auth_provider], params[:user][:auth_uid])
       end
         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|
+        @user.errors.add(attribute, error)
+      end

     end
   end
 
     end
   end
 


@@ -138,14 +142,14 @@ class UserController < ApplicationController
     @user.data_public = true
     @user.save
     flash[:notice] = t "user.go_public.flash success"
     @user.data_public = true
     @user.save
     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 => @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,7 +172,7 @@ 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
         @user = token.user
 
       if token
         @user = token.user


@@ -266,7 +270,7 @@ class UserController < ApplicationController
 
     if params[:session] == request.session_options[:id]
       if session[:token]
 
     if params[:session] == request.session_options[:id]
       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 +286,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 +297,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 +321,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,14 +343,19 @@ 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?
         @user = token.user
         @user.email = @user.new_email
         @user.new_email = nil
         @user.email_valid = true
       if token && token.user.new_email?
         @user = token.user
         @user.email = @user.new_email
         @user.new_email = nil
         @user.email_valid = true

+        gravatar_enabled = gravatar_enable(@user)

         if @user.save
         if @user.save

-          flash[:notice] = t "user.confirm_email.success"
+          flash[:notice] = if gravatar_enabled
+                             t("user.confirm_email.success") + " " + gravatar_status_message(@user)
+                           else
+                             t("user.confirm_email.success")
+                           end

         else
           flash[:errors] = @user.errors
         end
         else
           flash[:errors] = @user.errors
         end


@@ -383,7 +393,7 @@ class UserController < ApplicationController
   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 &&
        (@this_user.visible? || (@user && @user.administrator?))
 
     if @this_user &&
        (@this_user.visible? || (@user && @user.administrator?))


@@ -394,7 +404,7 @@ 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?
 
     if @new_friend
       if request.post?


@@ -413,7 +423,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


@@ -422,7 +432,7 @@ 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?


@@ -436,7 +446,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


@@ -449,14 +459,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
 
   ##


@@ -501,31 +511,14 @@ class UserController < ApplicationController
       email_verified = false
     end
 
       email_verified = false
     end
 

-    user = User.find_by_auth_provider_and_auth_uid(provider, 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, env["omniauth.params"]["referer"])
-      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)
+    if settings = session.delete(:new_user_settings)

       @user.auth_provider = provider
       @user.auth_uid = uid
 
       update_user(@user, settings)
 
       @user.auth_provider = provider
       @user.auth_uid = uid
 
       update_user(@user, settings)
 

+      session[:user_errors] = @user.errors.as_json
+

       redirect_to :action => "account", :display_name => @user.display_name
     elsif session[:new_user]
       session[:new_user].auth_provider = provider
       redirect_to :action => "account", :display_name => @user.display_name
     elsif session[:new_user]
       session[:new_user].auth_provider = provider


@@ -537,8 +530,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, env["omniauth.params"]["referer"])
+        when "suspended" then
+          failed_login t("user.login.account is suspended", :webmaster => "mailto:#{SUPPORT_EMAIL}")
+        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
 


@@ -559,7 +573,7 @@ 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"), username
+      failed_login t("user.login.account is suspended", :webmaster => "mailto:#{SUPPORT_EMAIL}"), username

     else
       failed_login t("user.login.auth failure"), username
     end
     else
       failed_login t("user.login.auth failure"), username
     end


@@ -587,15 +601,15 @@ 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
 
     end
   end
 


@@ -614,7 +628,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


@@ -726,12 +740,12 @@ class UserController < ApplicationController
       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
     elsif !@user
       end
     elsif !@user

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

     end
   end
 
     end
   end
 


@@ -752,9 +766,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
 
   ##


@@ -791,4 +805,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