On hover, change border to a subtle darker orange, increase strokeWidth

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 54e2fa9c0bff45d3dffafba422bd74e81b77064e..78299dccf2abe5342c4f82f7bc76acf1aca52f66 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -1,24 +1,24 @@
 class UserController < ApplicationController
   layout "site", :except => [:api_details]
 
 class UserController < ApplicationController
   layout "site", :except => [:api_details]
 

-  skip_before_action :verify_authenticity_token, :only => [:api_read, :api_details, :api_gpx_files, :auth_success]
+  skip_before_action :verify_authenticity_token, :only => [:api_read, :api_users, :api_details, :api_gpx_files, :auth_success]

   before_action :disable_terms_redirect, :only => [:terms, :save, :logout, :api_details]
   before_action :authorize, :only => [:api_details, :api_gpx_files]
   before_action :disable_terms_redirect, :only => [:terms, :save, :logout, :api_details]
   before_action :authorize, :only => [:api_details, :api_gpx_files]

-  before_action :authorize_web, :except => [:api_read, :api_details, :api_gpx_files]
-  before_action :set_locale, :except => [:api_read, :api_details, :api_gpx_files]
+  before_action :authorize_web, :except => [:api_read, :api_users, :api_details, :api_gpx_files]
+  before_action :set_locale, :except => [:api_read, :api_users, :api_details, :api_gpx_files]

   before_action :require_user, :only => [:account, :go_public, :make_friend, :remove_friend]
   before_action :require_self, :only => [:account]
   before_action :require_user, :only => [:account, :go_public, :make_friend, :remove_friend]
   before_action :require_self, :only => [:account]

-  before_action :check_database_readable, :except => [:login, :api_read, :api_details, :api_gpx_files]
+  before_action :check_database_readable, :except => [:login, :api_read, :api_users, :api_details, :api_gpx_files]

   before_action :check_database_writable, :only => [:new, :account, :confirm, :confirm_email, :lost_password, :reset_password, :go_public, :make_friend, :remove_friend]
   before_action :check_database_writable, :only => [:new, :account, :confirm, :confirm_email, :lost_password, :reset_password, :go_public, :make_friend, :remove_friend]

-  before_action :check_api_readable, :only => [:api_read, :api_details, :api_gpx_files]
+  before_action :check_api_readable, :only => [:api_read, :api_users, :api_details, :api_gpx_files]

   before_action :require_allow_read_prefs, :only => [:api_details]
   before_action :require_allow_read_gpx, :only => [:api_gpx_files]
   before_action :require_cookies, :only => [:new, :login, :confirm]
   before_action :require_allow_read_prefs, :only => [:api_details]
   before_action :require_allow_read_gpx, :only => [:api_gpx_files]
   before_action :require_cookies, :only => [:new, :login, :confirm]

-  before_action :require_administrator, :only => [:set_status, :delete, :list]
-  around_action :api_call_handle_error, :only => [:api_read, :api_details, :api_gpx_files]
+  before_action :require_administrator, :only => [:set_status, :delete, :index]
+  around_action :api_call_handle_error, :only => [:api_read, :api_users, :api_details, :api_gpx_files]

   before_action :lookup_user_by_id, :only => [:api_read]
   before_action :lookup_user_by_name, :only => [:set_status, :delete]
   before_action :lookup_user_by_id, :only => [:api_read]
   before_action :lookup_user_by_name, :only => [:set_status, :delete]

-  before_action :allow_thirdparty_images, :only => [:view, :account]
+  before_action :allow_thirdparty_images, :only => [:show, :account]

 
   def terms
     @legale = params[:legale] || OSM.ip_to_country(request.remote_ip) || DEFAULT_LEGALE
 
   def terms
     @legale = params[:legale] || OSM.ip_to_country(request.remote_ip) || DEFAULT_LEGALE


@@ -29,7 +29,7 @@ class UserController < ApplicationController
     else
       @title = t "user.terms.title"
 
     else
       @title = t "user.terms.title"
 

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

         # Already agreed to terms, so just show settings
         redirect_to :action => :account, :display_name => current_user.display_name
       elsif current_user.nil? && session[:new_user].nil?
         # Already agreed to terms, so just show settings
         redirect_to :action => :account, :display_name => current_user.display_name
       elsif current_user.nil? && session[:new_user].nil?


@@ -118,7 +118,6 @@ class UserController < ApplicationController
   end
 
   def account
   end
 
   def account

-    @title = t "user.account.title"

     @tokens = current_user.oauth_tokens.authorized
 
     if params[:user] && params[:user][:display_name] && params[:user][:description]
     @tokens = current_user.oauth_tokens.authorized
 
     if params[:user] && params[:user][:display_name] && params[:user][:description]


@@ -135,6 +134,7 @@ class UserController < ApplicationController
         current_user.errors.add(attribute, error)
       end
     end
         current_user.errors.add(attribute, error)
       end
     end

+    @title = t "user.account.title"

   end
 
   def go_public
   end
 
   def go_public


@@ -276,7 +276,7 @@ class UserController < ApplicationController
     if params[:session] == session.id
       if session[:token]
         token = UserToken.find_by(:token => session[:token])
     if params[:session] == session.id
       if session[:token]
         token = UserToken.find_by(:token => session[:token])

-        token.destroy if token
+        token&.destroy

         session.delete(:token)
       end
       session.delete(:user)
         session.delete(:token)
       end
       session.delete(:user)


@@ -292,7 +292,7 @@ class UserController < ApplicationController
   def confirm
     if request.post?
       token = UserToken.find_by(:token => params[:confirm_string])
   def confirm
     if request.post?
       token = UserToken.find_by(:token => params[:confirm_string])

-      if token && token.user.active?
+      if token&.user&.active?

         flash[:error] = t("user.confirm.already active")
         redirect_to :action => "login"
       elsif !token || token.expired?
         flash[:error] = t("user.confirm.already active")
         redirect_to :action => "login"
       elsif !token || token.expired?


@@ -349,7 +349,7 @@ class UserController < ApplicationController
   def confirm_email
     if request.post?
       token = UserToken.find_by(:token => params[:confirm_string])
   def confirm_email
     if request.post?
       token = UserToken.find_by(:token => params[:confirm_string])

-      if token && token.user.new_email?
+      if token&.user&.new_email?

         self.current_user = token.user
         current_user.email = current_user.new_email
         current_user.new_email = nil
         self.current_user = token.user
         current_user.email = current_user.new_email
         current_user.new_email = nil


@@ -389,6 +389,18 @@ class UserController < ApplicationController
     render :action => :api_read, :content_type => "text/xml"
   end
 
     render :action => :api_read, :content_type => "text/xml"
   end
 

+  def api_users
+    raise OSM::APIBadUserInput, "The parameter users is required, and must be of the form users=id[,id[,id...]]" unless params["users"]
+
+    ids = params["users"].split(",").collect(&:to_i)
+
+    raise OSM::APIBadUserInput, "No users were given to search for" if ids.empty?
+
+    @users = User.visible.find(ids)
+
+    render :action => :api_users, :content_type => "text/xml"
+  end
+

   def api_gpx_files
     doc = OSM::API.new.get_xml_doc
     current_user.traces.reload.each do |trace|
   def api_gpx_files
     doc = OSM::API.new.get_xml_doc
     current_user.traces.reload.each do |trace|


@@ -397,11 +409,11 @@ class UserController < ApplicationController
     render :xml => doc.to_s
   end
 
     render :xml => doc.to_s
   end
 

-  def view
+  def show

     @user = User.find_by(:display_name => params[:display_name])
 
     if @user &&
     @user = User.find_by(:display_name => params[:display_name])
 
     if @user &&

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

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


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

-          redirect_to :action => "view"
+          redirect_to :action => "show"

         end
       end
     else
         end
       end
     else


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

-          redirect_to :action => "view"
+          redirect_to :action => "show"

         end
       end
     else
         end
       end
     else


@@ -464,19 +476,19 @@ class UserController < ApplicationController
   def set_status
     @user.status = params[:status]
     @user.save
   def set_status
     @user.status = params[:status]
     @user.save

-    redirect_to :action => "view", :display_name => params[:display_name]
+    redirect_to user_path(:display_name => params[:display_name])

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

-    redirect_to :action => "view", :display_name => params[:display_name]
+    redirect_to user_path(:display_name => params[:display_name])

   end
 
   ##
   # display a list of users matching specified criteria
   end
 
   ##
   # display a list of users matching specified criteria

-  def list
+  def index

     if request.post?
       ids = params[:user].keys.collect(&:to_i)
 
     if request.post?
       ids = params[:user].keys.collect(&:to_i)
 


@@ -540,7 +552,7 @@ class UserController < ApplicationController
       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
       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
+        user&.update(:auth_provider => provider, :auth_uid => uid)

       end
 
       if user
       end
 
       if user


@@ -712,7 +724,7 @@ class UserController < ApplicationController
     end
 
     if user.save
     end
 
     if user.save

-      set_locale
+      set_locale(true)

 
       if user.new_email.blank? || user.new_email == user.email
         flash.now[:notice] = t "user.account.flash update success"
 
       if user.new_email.blank? || user.new_email == user.email
         flash.now[:notice] = t "user.account.flash update success"


@@ -745,7 +757,7 @@ 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 :action => "view", :display_name => params[:display_name]
+        redirect_to user_path(:display_name => params[:display_name])

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


@@ -814,6 +826,7 @@ class UserController < ApplicationController
   def gravatar_enable(user)
     # code from example https://en.gravatar.com/site/implement/images/ruby/
     return false if user.image.present?
   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))
     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))