Merge pull request #3889 from tomhughes/distances

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d18cf188cf669ef002fbc975f6f08d091f697d6f..abd998030eda898c28d439f82d6156c219c701c9 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,205 +1,64 @@
 class UsersController < ApplicationController
 class UsersController < ApplicationController

-  layout "site", :except => [:api_details]
-
-  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 :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 :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_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_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 :allow_thirdparty_images, :only => [:show, :account]
+  include SessionMethods
+  include UserMethods

 
 

-  def terms
-    @legale = params[:legale] || OSM.ip_to_country(request.remote_ip) || DEFAULT_LEGALE
-    @text = OSM.legal_text_for_country(@legale)
-
-    if request.xhr?
-      render :partial => "terms"
-    else
-      @title = t "users.terms.title"
-
-      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?
-        redirect_to :action => :login, :referer => request.fullpath
-      end
-    end
-  end
+  layout "site"

 
 

-  def save
-    @title = t "users.new.title"
+  skip_before_action :verify_authenticity_token, :only => [:auth_success]
+  before_action :disable_terms_redirect, :only => [:terms, :save]
+  before_action :authorize_web
+  before_action :set_locale
+  before_action :check_database_readable

 
 

-    if params[:decline]
-      if current_user
-        current_user.terms_seen = true
+  authorize_resource

 
 

-        flash[:notice] = t("users.new.terms declined", :url => t("users.new.terms declined url")).html_safe if current_user.save
+  before_action :check_database_writable, :only => [:new, :go_public]
+  before_action :require_cookies, :only => [:new]
+  before_action :lookup_user_by_name, :only => [:set_status, :destroy]
+  before_action :allow_thirdparty_images, :only => [:show]

 
 

-        if params[:referer]
-          redirect_to params[:referer]
-        else
-          redirect_to :action => :account, :display_name => current_user.display_name
-        end
-      else
-        redirect_to t("users.terms.declined")
-      end
-    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
+  ##
+  # display a list of users matching specified criteria
+  def index
+    if request.post?
+      ids = params[:user].keys.collect(&:to_i)

 
 

-        flash[:notice] = t "users.new.terms accepted" if current_user.save
-      end
+      User.where(:id => ids).update_all(:status => "confirmed") if params[:confirm]
+      User.where(:id => ids).update_all(:status => "deleted") if params[:hide]

 
 

-      if params[:referer]
-        redirect_to params[:referer]
-      else
-        redirect_to :action => :account, :display_name => current_user.display_name
-      end
+      redirect_to url_for(:status => params[:status], :ip => params[:ip], :page => params[:page])

     else
     else

-      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
-
-        if current_user.save
-          flash[:piwik_goal] = PIWIK["goals"]["signup"] if defined?(PIWIK)
-
-          referer = welcome_path
-
-          begin
-            uri = URI(session[:referer])
-            %r{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 StandardError
-            # Use default
-          end
-
-          if current_user.status == "active"
-            session[:referer] = referer
-            successful_login(current_user)
-          else
-            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
-      end
-    end
-  end
-
-  def account
-    @tokens = current_user.oauth_tokens.authorized
-
-    if params[:user] && params[:user][:display_name] && params[:user][:description]
-      if params[:user][:auth_provider].blank? ||
-         (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
-    elsif errors = session.delete(:user_errors)
-      errors.each do |attribute, error|
-        current_user.errors.add(attribute, error)
-      end
-    end
-    @title = t "users.account.title"
-  end
-
-  def go_public
-    current_user.data_public = true
-    current_user.save
-    flash[:notice] = t "users.go_public.flash success"
-    redirect_to :action => "account", :display_name => current_user.display_name
-  end
-
-  def lost_password
-    @title = t "users.lost_password.title"
-
-    if params[:user] && 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])
+      @params = params.permit(:status, :ip)

 
 

-        user = users.first if users.count == 1
-      end
+      conditions = {}
+      conditions[:status] = @params[:status] if @params[:status]
+      conditions[:creation_ip] = @params[:ip] if @params[:ip]

 
 

-      if user
-        token = user.tokens.create
-        Notifier.lost_password(user, token).deliver_now
-        flash[:notice] = t "users.lost_password.notice email on way"
-        redirect_to :action => "login"
-      else
-        flash.now[:error] = t "users.lost_password.notice email cannot find"
-      end
+      @user_pages, @users = paginate(:users,
+                                     :conditions => conditions,
+                                     :order => :id,
+                                     :per_page => 50)

     end
   end
 
     end
   end
 

-  def reset_password
-    @title = t "users.reset_password.title"
-
-    if params[:token]
-      token = UserToken.find_by(:token => params[:token])
-
-      if token
-        self.current_user = token.user
-
-        if params[:user]
-          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
+  def show
+    @user = User.find_by(:display_name => params[:display_name])

 
 

-          if current_user.save
-            token.destroy
-            flash[:notice] = t "users.reset_password.flash changed"
-            successful_login(current_user)
-          end
-        end
-      else
-        flash[:error] = t "users.reset_password.flash token bad"
-        redirect_to :action => "lost_password"
-      end
+    if @user &&
+       (@user.visible? || current_user&.administrator?)
+      @title = @user.display_name

     else
     else

-      head :bad_request
+      render_unknown_user params[:display_name]

     end
   end
 
   def new
     end
   end
 
   def new

-    @title = t "users.new.title"
-    @referer = params[:referer] || session[:referer]
+    @title = t ".title"
+    @referer = if params[:referer]
+                 safe_referer(params[:referer])
+               else
+                 session[:referer]
+               end

 
     append_content_security_policy_directives(
       :form_action => %w[accounts.google.com *.facebook.com login.live.com github.com meta.wikimedia.org]
 
     append_content_security_policy_directives(
       :form_action => %w[accounts.google.com *.facebook.com login.live.com github.com meta.wikimedia.org]


@@ -208,11 +67,7 @@ class UsersController < ApplicationController
     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 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
-        redirect_to @referer
-      else
-        redirect_to :controller => "site", :action => "index"
-      end
+      redirect_to @referer || { :controller => "site", :action => "index" }

     elsif params.key?(:auth_provider) && params.key?(:auth_uid)
       self.current_user = User.new(:email => params[:email],
                                    :email_confirmation => params[:email],
     elsif params.key?(:auth_provider) && params.key?(:auth_uid)
       self.current_user = User.new(:email => params[:email],
                                    :email_confirmation => params[:email],


@@ -232,9 +87,9 @@ class UsersController < ApplicationController
     self.current_user = User.new(user_params)
 
     if check_signup_allowed(current_user.email)
     self.current_user = User.new(user_params)
 
     if check_signup_allowed(current_user.email)

-      session[:referer] = params[:referer]
+      session[:referer] = safe_referer(params[:referer]) if params[:referer]

 
 

-      current_user.status = "pending"
+      Rails.logger.info "create: #{session[:referer]}"

 
       if current_user.auth_provider.present? && current_user.pass_crypt.empty?
         # We are creating an account with external authentication and
 
       if current_user.auth_provider.present? && current_user.pass_crypt.empty?
         # We are creating an account with external authentication and


@@ -249,7 +104,7 @@ class UsersController < ApplicationController
       elsif current_user.auth_provider.present?
         # Verify external authenticator before moving on
         session[:new_user] = current_user
       elsif current_user.auth_provider.present?
         # Verify external authenticator before moving on
         session[:new_user] = current_user

-        redirect_to auth_url(current_user.auth_provider, current_user.auth_uid)
+        redirect_to auth_url(current_user.auth_provider, current_user.auth_uid), :status => :temporary_redirect

       else
         # Save the user record
         session[:new_user] = current_user
       else
         # Save the user record
         session[:new_user] = current_user


@@ -258,258 +113,129 @@ class UsersController < ApplicationController
     end
   end
 
     end
   end
 

-  def login
-    session[:referer] = params[:referer] if params[:referer]
-
-    if params[:username].present? && params[:password].present?
-      session[:remember_me] ||= params[:remember_me]
-      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], params[:referer])
-    end
-  end
-
-  def logout
-    @title = t "users.logout.title"
-
-    if params[:session] == session.id
-      if session[:token]
-        token = UserToken.find_by(:token => session[:token])
-        token&.destroy
-        session.delete(:token)
-      end
-      session.delete(:user)
-      session_expires_automatically
-      if params[:referer]
-        redirect_to params[:referer]
-      else
-        redirect_to :controller => "site", :action => "index"
-      end
-    end
+  ##
+  # destroy a user, marking them as deleted and removing personal data
+  def destroy
+    @user.soft_destroy!
+    redirect_to user_path(:display_name => params[:display_name])

   end
 
   end
 

-  def confirm
-    if request.post?
-      token = UserToken.find_by(:token => params[:confirm_string])
-      if token&.user&.active?
-        flash[:error] = t("users.confirm.already active")
-        redirect_to :action => "login"
-      elsif !token || token.expired?
-        flash[:error] = t("users.confirm.unknown token")
-        redirect_to :action => "confirm"
-      else
-        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]
-          token = UserToken.find_by(:token => session[:token])
-          session.delete(:token)
-        else
-          token = nil
-        end
-
-        if token.nil? || token.user != user
-          flash[:notice] = t("users.confirm.success")
-          redirect_to :action => :login, :referer => referer
-        else
-          token.destroy
-
-          session[:user] = user.id
+  def terms
+    @legale = params[:legale] || OSM.ip_to_country(request.remote_ip) || Settings.default_legale
+    @text = OSM.legal_text_for_country(@legale)

 
 

-          redirect_to referer || welcome_path
-        end
-      end
+    if request.xhr?
+      render :partial => "terms"

     else
     else

-      user = User.find_by(:display_name => params[:display_name])
+      @title = t ".title"

 
 

-      redirect_to root_path if user.nil? || user.active?
+      if current_user&.terms_agreed?
+        # Already agreed to terms, so just show settings
+        redirect_to edit_account_path
+      elsif current_user.nil? && session[:new_user].nil?
+        redirect_to login_path(:referer => request.fullpath)
+      end

     end
   end
 
     end
   end
 

-  def confirm_resend
-    user = User.find_by(:display_name => params[:display_name])
-    token = UserToken.find_by(:token => session[:token])
+  def save
+    @title = t "users.new.title"

 
 

-    if user.nil? || token.nil? || token.user != user
-      flash[:error] = t "users.confirm_resend.failure", :name => params[:display_name]
-    else
-      Notifier.signup_confirm(user, user.tokens.create).deliver_now
-      flash[:notice] = t("users.confirm_resend.success", :email => user.email, :sender => SUPPORT_EMAIL).html_safe
-    end
+    if params[:decline] || !(params[:read_tou] && params[:read_ct])
+      if current_user
+        current_user.terms_seen = true

 
 

-    redirect_to :action => "login"
-  end
+        flash[:notice] = { :partial => "users/terms_declined_flash" } if current_user.save

 
 

-  def confirm_email
-    if request.post?
-      token = UserToken.find_by(:token => params[:confirm_string])
-      if token&.user&.new_email?
-        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("users.confirm_email.success") + " " + gravatar_status_message(current_user)
-                           else
-                             t("users.confirm_email.success")
-                           end
-        else
-          flash[:errors] = current_user.errors
-        end
-        token.destroy
-        session[:user] = current_user.id
-        redirect_to :action => "account", :display_name => current_user.display_name
-      elsif token
-        flash[:error] = t "users.confirm_email.failure"
-        redirect_to :action => "account", :display_name => token.user.display_name
+        referer = safe_referer(params[:referer]) if params[:referer]
+
+        redirect_to referer || edit_account_path
+      elsif params[:decline]
+        redirect_to t("users.terms.declined"), :allow_other_host => true

       else
       else

-        flash[:error] = t "users.confirm_email.unknown_token"
+        redirect_to :action => :terms

       end
       end

-    end
-  end
-
-  def api_read
-    if @user.visible?
-      render :action => :api_read, :content_type => "text/xml"
-    else
-      head :gone
-    end
-  end
-
-  def api_details
-    @user = current_user
-    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"]
+    elsif current_user
+      unless current_user.terms_agreed?
+        current_user.consider_pd = params[:user][:consider_pd]
+        current_user.tou_agreed = Time.now.utc
+        current_user.terms_agreed = Time.now.utc
+        current_user.terms_seen = true

 
 

-    ids = params["users"].split(",").collect(&:to_i)
+        flash[:notice] = t "users.new.terms accepted" if current_user.save
+      end

 
 

-    raise OSM::APIBadUserInput, "No users were given to search for" if ids.empty?
+      referer = safe_referer(params[:referer]) if params[:referer]

 
 

-    @users = User.visible.find(ids)
+      redirect_to referer || edit_account_path
+    else
+      self.current_user = session.delete(:new_user)

 
 

-    render :action => :api_users, :content_type => "text/xml"
-  end
+      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.utc
+        current_user.tou_agreed = Time.now.utc
+        current_user.terms_seen = true

 
 

-  def api_gpx_files
-    doc = OSM::API.new.get_xml_doc
-    current_user.traces.reload.each do |trace|
-      doc.root << trace.to_xml_node
-    end
-    render :xml => doc.to_s
-  end
+        if current_user.auth_uid.blank?
+          current_user.auth_provider = nil
+          current_user.auth_uid = nil
+        end

 
 

-  def show
-    @user = User.find_by(:display_name => params[:display_name])
+        if current_user.save
+          flash[:matomo_goal] = Settings.matomo["goals"]["signup"] if defined?(Settings.matomo)

 
 

-    if @user &&
-       (@user.visible? || (current_user&.administrator?))
-      @title = @user.display_name
-    else
-      render_unknown_user params[:display_name]
-    end
-  end
+          referer = welcome_path

 
 

-  def make_friend
-    @new_friend = User.find_by(:display_name => params[:display_name])
-
-    if @new_friend
-      if request.post?
-        friend = Friend.new
-        friend.befriender = current_user
-        friend.befriendee = @new_friend
-        if current_user.is_friends_with?(@new_friend)
-          flash[:warning] = t "users.make_friend.already_a_friend", :name => @new_friend.display_name
-        elsif friend.save
-          flash[:notice] = t "users.make_friend.success", :name => @new_friend.display_name
-          Notifier.friend_notification(friend).deliver_now
-        else
-          friend.add_error(t("users.make_friend.failed", :name => @new_friend.display_name))
-        end
+          begin
+            uri = URI(session[:referer])
+            %r{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 StandardError
+            # Use default
+          end

 
 

-        if params[:referer]
-          redirect_to params[:referer]
+          if current_user.status == "active"
+            session[:referer] = referer
+            successful_login(current_user)
+          else
+            session[:token] = current_user.tokens.create.token
+            UserMailer.signup_confirm(current_user, current_user.tokens.create(:referer => referer)).deliver_later
+            redirect_to :controller => :confirmations, :action => :confirm, :display_name => current_user.display_name
+          end

         else
         else

-          redirect_to :action => "show"
+          render :action => "new", :referer => params[:referer]

         end
       end
         end
       end

-    else
-      render_unknown_user params[:display_name]

     end
   end
 
     end
   end
 

-  def remove_friend
-    @friend = User.find_by(:display_name => params[:display_name])
-
-    if @friend
-      if request.post?
-        if current_user.is_friends_with?(@friend)
-          Friend.where(:user_id => current_user.id, :friend_user_id => @friend.id).delete_all
-          flash[:notice] = t "users.remove_friend.success", :name => @friend.display_name
-        else
-          flash[:error] = t "users.remove_friend.not_a_friend", :name => @friend.display_name
-        end
-
-        if params[:referer]
-          redirect_to params[:referer]
-        else
-          redirect_to :action => "show"
-        end
-      end
-    else
-      render_unknown_user params[:display_name]
-    end
+  def go_public
+    current_user.data_public = true
+    current_user.save
+    flash[:notice] = t ".flash success"
+    redirect_to edit_account_path

   end
 
   ##
   # sets a user's status
   def set_status
   end
 
   ##
   # sets a user's status
   def set_status

-    @user.status = params[:status]
-    @user.save
+    @user.activate! if params[:event] == "activate"
+    @user.confirm! if params[:event] == "confirm"
+    @user.unconfirm! if params[:event] == "unconfirm"
+    @user.hide! if params[:event] == "hide"
+    @user.unhide! if params[:event] == "unhide"
+    @user.unsuspend! if params[:event] == "unsuspend"

     redirect_to user_path(:display_name => params[:display_name])
   end
 
     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
-    redirect_to user_path(:display_name => params[:display_name])
-  end
-
-  ##
-  # display a list of users matching specified criteria
-  def index
-    if request.post?
-      ids = params[:user].keys.collect(&:to_i)
-
-      User.where(:id => ids).update_all(:status => "confirmed") if params[:confirm]
-      User.where(:id => ids).update_all(:status => "deleted") if params[:hide]
-
-      redirect_to url_for(:status => params[:status], :ip => params[:ip], :page => params[:page])
-    else
-      @params = params.permit(:status, :ip)
-
-      conditions = {}
-      conditions[:status] = @params[:status] if @params[:status]
-      conditions[:creation_ip] = @params[:ip] if @params[:ip]
-
-      @user_pages, @users = paginate(:users,
-                                     :conditions => conditions,
-                                     :order => :id,
-                                     :per_page => 50)
-    end
-  end
-

   ##
   # omniauth success callback
   def auth_success
   ##
   # omniauth success callback
   def auth_success


@@ -520,15 +246,15 @@ class UsersController < ApplicationController
     name = auth_info[:info][:name]
     email = auth_info[:info][:email]
 
     name = auth_info[:info][:name]
     email = auth_info[:info][:email]
 

-    case provider
-    when "openid"
-      email_verified = uid.match(%r{https://www.google.com/accounts/o8/id?(.*)}) ||
+    email_verified = case provider
+                     when "openid"
+                       uid.match(%r{https://www.google.com/accounts/o8/id?(.*)}) ||

                        uid.match(%r{https://me.yahoo.com/(.*)})
                        uid.match(%r{https://me.yahoo.com/(.*)})

-    when "google", "facebook"
-      email_verified = true
-    else
-      email_verified = false
-    end
+                     when "google", "facebook"
+                       true
+                     else
+                       false
+                     end

 
     if settings = session.delete(:new_user_settings)
       current_user.auth_provider = provider
 
     if settings = session.delete(:new_user_settings)
       current_user.auth_provider = provider


@@ -536,14 +262,16 @@ class UsersController < ApplicationController
 
       update_user(current_user, settings)
 
 
       update_user(current_user, settings)
 

+      flash.discard
+

       session[:user_errors] = current_user.errors.as_json
 
       session[:user_errors] = current_user.errors.as_json
 

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

     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
 

-      session[:new_user].status = "active" if email_verified && email == session[:new_user].email
+      session[:new_user].activate if email_verified && email == session[:new_user].email

 
       redirect_to :action => "terms"
     else
 
       redirect_to :action => "terms"
     else


@@ -557,14 +285,14 @@ class UsersController < ApplicationController
 
       if user
         case user.status
 
       if user
         case user.status

-        when "pending" then
+        when "pending"

           unconfirmed_login(user)
           unconfirmed_login(user)

-        when "active", "confirmed" then
+        when "active", "confirmed"

           successful_login(user, request.env["omniauth.params"]["referer"])
           successful_login(user, request.env["omniauth.params"]["referer"])

-        when "suspended" then
-          failed_login t("users.login.account is suspended", :webmaster => "mailto:#{SUPPORT_EMAIL}").html_safe
+        when "suspended"
+          failed_login({ :partial => "sessions/suspended_flash" })

         else
         else

-          failed_login t("users.login.auth failure")
+          failed_login t("sessions.new.auth failure")

         end
       else
         redirect_to :action => "new", :nickname => name, :email => email,
         end
       else
         redirect_to :action => "new", :nickname => name, :email => email,


@@ -576,207 +304,14 @@ class UsersController < ApplicationController
   ##
   # omniauth failure callback
   def auth_failure
   ##
   # omniauth failure callback
   def auth_failure

-    flash[:error] = t("users.auth_failure." + params[:message])
-    redirect_to params[:origin] || login_url
-  end
-
-  private
-
-  ##
-  # handle password authentication
-  def password_authentication(username, password)
-    if user = User.authenticate(:username => username, :password => password)
-      successful_login(user)
-    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("users.login.account is suspended", :webmaster => "mailto:#{SUPPORT_EMAIL}").html_safe, username
-    else
-      failed_login t("users.login.auth failure"), username
-    end
-  end
-
-  ##
-  # return the URL to use for authentication
-  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
-      params[:origin] = request.path + "?referer=" + CGI.escape(referer)
-      params[:referer] = referer
-    end
-
-    auth_path(params)
-  end
-
-  ##
-  # special case some common OpenID providers by applying heuristics to
-  # try and come up with the correct URL based on what the user entered
-  def openid_expand_url(openid_url)
-    if openid_url.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.
-      "https://www.google.com/accounts/o8/id"
-    else
-      openid_url
-    end
-  end
-
-  ##
-  # process a successful login
-  def successful_login(user, referer = nil)
-    session[:user] = user.id
-    session_expires_after 28.days if session[:remember_me]
-
-    target = referer || session[:referer] || url_for(:controller => :site, :action => :index)
-
-    # The user is logged in, so decide where to send them:
-    #
-    # - If they haven't seen the contributor terms, send them there.
-    # - If they have a block on them, show them that.
-    # - 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 :action => :terms, :referer => target
-    elsif user.blocked_on_view
-      redirect_to user.blocked_on_view, :referer => target
-    else
-      redirect_to target
-    end
-
-    session.delete(:remember_me)
-    session.delete(:referer)
-  end
-
-  ##
-  # process a failed login
-  def failed_login(message, username = nil)
-    flash[:error] = message
+    flash[:error] = t(params[:message], :scope => "users.auth_failure", :default => t(".unknown_error"))

 
 

-    redirect_to :action => "login", :referer => session[:referer],
-                :username => username, :remember_me => session[:remember_me]
+    origin = safe_referer(params[:origin]) if params[:origin]

 
 

-    session.delete(:remember_me)
-    session.delete(:referer)
+    redirect_to origin || login_url

   end
 
   end
 

-  ##
-  #
-  def unconfirmed_login(user)
-    session[:token] = user.tokens.create.token
-
-    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)
-    user.display_name = params[:user][:display_name]
-    user.new_email = params[:user][:new_email]
-
-    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
-
-    if params[:user][:description] != user.description
-      user.description = params[:user][:description]
-      user.description_format = "markdown"
-    end
-
-    user.languages = params[:user][:languages].split(",")
-
-    case params[:image_action]
-    when "new" then
-      user.image = params[:user][:image]
-      user.image_use_gravatar = false
-    when "delete" then
-      user.image = nil
-      user.image_use_gravatar = false
-    when "gravatar" then
-      user.image = nil
-      user.image_use_gravatar = true
-    end
-
-    user.home_lat = params[:user][:home_lat]
-    user.home_lon = params[:user][:home_lon]
-
-    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
-      user.auth_uid = nil
-    end
-
-    if user.save
-      set_locale(true)
-
-      if user.new_email.blank? || user.new_email == user.email
-        flash.now[:notice] = t "users.account.flash update success"
-      else
-        user.email = user.new_email
-
-        if user.valid?
-          flash.now[:notice] = t "users.account.flash update success confirm needed"
-
-          begin
-            Notifier.email_confirm(user, user.tokens.create).deliver_now
-          rescue StandardError
-            # Ignore errors sending email
-          end
-        else
-          current_user.errors.add(:new_email, current_user.errors[:email])
-          current_user.errors.add(:email, [])
-        end
-
-        user.restore_email!
-      end
-    end
-  end
-
-  ##
-  # 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 current_user && !current_user.administrator?
-      flash[:error] = t("users.filter.not_an_administrator")
-
-      if params[:display_name]
-        redirect_to user_path(:display_name => params[:display_name])
-      else
-        redirect_to :action => "login", :referer => request.fullpath
-      end
-    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
-    head :forbidden if params[:display_name] != current_user.display_name
-  end
-
-  ##
-  # ensure that there is a "user" instance variable
-  def lookup_user_by_id
-    @user = User.find(params[:id])
-  end
+  private

 
   ##
   # ensure that there is a "user" instance variable
 
   ##
   # ensure that there is a "user" instance variable


@@ -786,15 +321,6 @@ class UsersController < ApplicationController
     redirect_to :action => "view", :display_name => params[:display_name] unless @user
   end
 
     redirect_to :action => "view", :display_name => params[:display_name] unless @user
   end
 

-  ##
-  #
-  def disable_terms_redirect
-    # this is necessary otherwise going to the user terms page, when
-    # having not agreed already would cause an infinite redirect loop.
-    # it's .now so that this doesn't propagate to other pages.
-    flash.now[:skip_terms] = true
-  end
-

   ##
   # return permitted user parameters
   def user_params
   ##
   # return permitted user parameters
   def user_params


@@ -812,7 +338,13 @@ class UsersController < ApplicationController
                email.split("@").last
              end
 
                email.split("@").last
              end
 

-    if blocked = Acl.no_account_creation(request.remote_ip, domain)
+    mx_servers = if domain.nil?
+                   nil
+                 else
+                   domain_mx_servers(domain)
+                 end
+
+    if blocked = Acl.no_account_creation(request.remote_ip, :domain => domain, :mx => mx_servers)

       logger.info "Blocked signup from #{request.remote_ip} for #{email}"
 
       render :action => "blocked"
       logger.info "Blocked signup from #{request.remote_ip} for #{email}"
 
       render :action => "blocked"


@@ -822,26 +354,10 @@ class UsersController < ApplicationController
   end
 
   ##
   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 "users.account.gravatar.enabled"
-    else
-      t "users.account.gravatar.disabled"
+  # get list of MX servers for a domains
+  def domain_mx_servers(domain)
+    Resolv::DNS.open do |dns|
+      dns.getresources(domain, Resolv::DNS::Resource::IN::MX).collect(&:exchange).collect(&:to_s)

     end
   end
 end
     end
   end
 end