Ignore the compiled asset directory

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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 5018dcc42b3c00201613608050da92f4c3c7173b..b9f98071cccf216f0ad272a6296ddfb0bc9ae168 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -11,7 +11,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)


@@ -106,7 +106,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 oauthenticate
+    if Authenticator.new(self, [:token]).allow?

       @user = current_token.user
     else
       username, passwd = get_auth_data # parse from headers
       @user = current_token.user
     else
       username, passwd = get_auth_data # parse from headers


@@ -199,7 +199,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,4 +358,8 @@ private
     return [user, pass] 
   end 
 
     return [user, pass] 
   end 
 

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

 end
 end