tweak lat lon decision logic for the edit tab. made it more similar to logic in index...

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

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 7570fd82a072d2af2d2e70dd0e33cd2d83df391d..f5ea0063db38b76c7d9cdb74b536b1c8f25cd182 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -8,7 +8,7 @@ class ApplicationController < ActionController::Base
 
   def authorize_web
     if session[:user]
 
   def authorize_web
     if session[:user]

-      @user = User.find(session[:user])
+      @user = User.find(session[:user], :conditions => {:visible => true})

     elsif session[:token]
       @user = User.authenticate(:token => session[:token])
       session[:user] = @user.id
     elsif session[:token]
       @user = User.authenticate(:token => session[:token])
       session[:user] = @user.id


@@ -22,7 +22,11 @@ class ApplicationController < ActionController::Base
     redirect_to :controller => 'user', :action => 'login', :referer => request.request_uri unless @user
   end
 
     redirect_to :controller => 'user', :action => 'login', :referer => request.request_uri unless @user
   end
 

-  def authorize(realm='Web Password', errormessage="Couldn't authenticate you") 
+  ##
+  # sets up the @user object for use by other methods. this is mostly called
+  # from the authorize method, but can be called elsewhere if authorisation
+  # is optional.
+  def setup_user_auth

     username, passwd = get_auth_data # parse from headers
     # authenticate per-scheme
     if username.nil?
     username, passwd = get_auth_data # parse from headers
     # authenticate per-scheme
     if username.nil?


@@ -32,6 +36,11 @@ class ApplicationController < ActionController::Base
     else
       @user = User.authenticate(:username => username, :password => passwd) # basic auth
     end
     else
       @user = User.authenticate(:username => username, :password => passwd) # basic auth
     end

+  end
+
+  def authorize(realm='Web Password', errormessage="Couldn't authenticate you") 
+    # make the @user object from any auth sources we have
+    setup_user_auth

 
     # handle authenticate pass/fail
     unless @user
 
     # handle authenticate pass/fail
     unless @user


@@ -43,8 +52,8 @@ class ApplicationController < ActionController::Base
     end 
   end 
 
     end 
   end 
 

-  def check_database_availability
-    if OSM_STATUS == :database_offline
+  def check_database_availability(need_api = false)
+    if OSM_STATUS == :database_offline or (need_api and OSM_STATUS == :api_offline)

       redirect_to :controller => 'site', :action => 'offline'
     end
   end
       redirect_to :controller => 'site', :action => 'offline'
     end
   end


@@ -71,7 +80,7 @@ class ApplicationController < ActionController::Base
   #  phrase from that, we can also put the error message into the status
   #  message. For now, rails won't let us)
   def report_error(message)
   #  phrase from that, we can also put the error message into the status
   #  message. For now, rails won't let us)
   def report_error(message)

-    render :nothing => true, :status => :bad_request
+    render :text => message, :status => :bad_request

     # Todo: some sort of escaping of problem characters in the message
     response.headers['Error'] = message
   end
     # Todo: some sort of escaping of problem characters in the message
     response.headers['Error'] = message
   end


@@ -82,6 +91,8 @@ private
   def get_auth_data 
     if request.env.has_key? 'X-HTTP_AUTHORIZATION'          # where mod_rewrite might have put it 
       authdata = request.env['X-HTTP_AUTHORIZATION'].to_s.split 
   def get_auth_data 
     if request.env.has_key? 'X-HTTP_AUTHORIZATION'          # where mod_rewrite might have put it 
       authdata = request.env['X-HTTP_AUTHORIZATION'].to_s.split 

+    elsif request.env.has_key? 'REDIRECT_X_HTTP_AUTHORIZATION'          # mod_fcgi 
+      authdata = request.env['REDIRECT_X_HTTP_AUTHORIZATION'].to_s.split 

     elsif request.env.has_key? 'HTTP_AUTHORIZATION'         # regular location
       authdata = request.env['HTTP_AUTHORIZATION'].to_s.split
     end 
     elsif request.env.has_key? 'HTTP_AUTHORIZATION'         # regular location
       authdata = request.env['HTTP_AUTHORIZATION'].to_s.split
     end