X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/dad36f2fca68142c53875cdacc55192d1561effd..8d207e7de0d540afbfd45381f23c5f9378026009:/app/controllers/application_controller.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index c5545c068..8ccd77060 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -12,6 +12,8 @@ class ApplicationController < ActionController::Base attr_accessor :current_user helper_method :current_user + private + def authorize_web if session[:user] self.current_user = User.where(:id => session[:user]).where("status IN ('active', 'confirmed', 'suspended')").first @@ -402,8 +404,6 @@ class ApplicationController < ActionController::Base end end - private - # extract authorisation credentials from headers, returns user = nil if none def get_auth_data if request.env.key? "X-HTTP_AUTHORIZATION" # where mod_rewrite might have put it