Fix object_id warning

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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e22f64c76a60cb06f1927111d0472cc4268e1b8c..d58bc8922146b32e48144e18a274ab038a6b37be 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,7 +3,12 @@ class ApplicationController < ActionController::Base
   protect_from_forgery
 
   if STATUS == :database_readonly or STATUS == :database_offline
   protect_from_forgery
 
   if STATUS == :database_readonly or STATUS == :database_offline

-    session :off
+    after_filter :clear_session
+    wrap_parameters false
+
+    def clear_session
+      session.clear
+    end

 
     def self.cache_sweeper(*sweepers)
     end
 
     def self.cache_sweeper(*sweepers)
     end


@@ -11,7 +16,7 @@ class ApplicationController < ActionController::Base
 
   def authorize_web
     if session[:user]
 
   def authorize_web
     if session[:user]

-      @user = User.where(:status => ["active", "confirmed", "suspended"]).find(session[:user])
+      @user = User.where(:id => session[:user]).where("status IN ('active', 'confirmed', 'suspended')").first

 
       if @user.status == "suspended"
         session.delete(:user)
 
       if @user.status == "suspended"
         session.delete(:user)


@@ -30,8 +35,9 @@ class ApplicationController < ActionController::Base
         end
       end
     elsif session[:token]
         end
       end
     elsif session[:token]

-      @user = User.authenticate(:token => session[:token])
-      session[:user] = @user.id
+      if @user = User.authenticate(:token => session[:token])
+        session[:user] = @user.id
+      end

     end
   rescue Exception => ex
     logger.info("Exception authorizing user: #{ex.to_s}")
     end
   rescue Exception => ex
     logger.info("Exception authorizing user: #{ex.to_s}")


@@ -106,9 +112,7 @@ class ApplicationController < ActionController::Base
   # is optional.
   def setup_user_auth
     # try and setup using OAuth
   # is optional.
   def setup_user_auth
     # try and setup using OAuth

-    if Authenticator.new(self, [:token]).allow?
-      @user = current_token.user
-    else
+    if not Authenticator.new(self, [:token]).allow?

       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?


@@ -199,7 +203,7 @@ class ApplicationController < ActionController::Base
        request.headers['X-Error-Format'].downcase == "xml"
       result = OSM::API.new.get_xml_doc
       result.root.name = "osmError"
        request.headers['X-Error-Format'].downcase == "xml"
       result = OSM::API.new.get_xml_doc
       result.root.name = "osmError"

-      result.root << (XML::Node.new("status") << interpret_status(status))
+      result.root << (XML::Node.new("status") << "#{Rack::Utils.status_code(status)} #{Rack::Utils::HTTP_STATUS_CODES[status]}")

       result.root << (XML::Node.new("message") << message)
 
       render :text => result.to_s, :content_type => "text/xml"
       result.root << (XML::Node.new("message") << message)
 
       render :text => result.to_s, :content_type => "text/xml"


@@ -358,6 +362,11 @@ private
     return [user, pass] 
   end 
 
     return [user, pass] 
   end 
 

+  # used by oauth plugin to set the current user
+  def current_user=(user)
+    @user=user
+  end
+

   # override to stop oauth plugin sending errors
   def invalid_oauth_response
   end
   # override to stop oauth plugin sending errors
   def invalid_oauth_response
   end