Mark yet more methods as needing write access to the database

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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0412080fa3a9109faf02dc2e27fe7b0fc297332d..7ac9e6402bc64236d80aeac26f28e1a36554060e 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,15 +1,9 @@
 class ApplicationController < ActionController::Base
 class ApplicationController < ActionController::Base

+  include SessionPersistence

 
   protect_from_forgery
 
   if STATUS == :database_readonly or STATUS == :database_offline
 
   protect_from_forgery
 
   if STATUS == :database_readonly or STATUS == :database_offline

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

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


@@ -19,6 +13,7 @@ class ApplicationController < ActionController::Base
       @user = User.where(:id => session[:user]).where("status IN ('active', 'confirmed', 'suspended')").first
 
       if @user.display_name != cookies["_osm_username"]
       @user = User.where(:id => session[:user]).where("status IN ('active', 'confirmed', 'suspended')").first
 
       if @user.display_name != cookies["_osm_username"]

+        logger.info "Session user '#{@user.display_name}' does not match cookie user '#{cookies['_osm_username']}'"

         reset_session
         @user = nil
       elsif @user.status == "suspended"
         reset_session
         @user = nil
       elsif @user.status == "suspended"


@@ -49,7 +44,13 @@ class ApplicationController < ActionController::Base
   end
 
   def require_user
   end
 
   def require_user

-    redirect_to :controller => 'user', :action => 'login', :referer => request.fullpath unless @user
+    unless @user
+      if request.get?
+        redirect_to :controller => 'user', :action => 'login', :referer => request.fullpath
+      else
+        render :nothing => true, :status => :forbidden
+      end
+    end

   end
 
   ##
   end
 
   ##


@@ -247,9 +248,7 @@ class ApplicationController < ActionController::Base
       end
     end
 
       end
     end
 

-    I18n.locale = request.compatible_language_from(I18n.available_locales)
-
-    logger.info "Selected locale #{I18n.locale} from #{request.user_preferred_languages.inspect}"
+    I18n.locale = request.compatible_language_from(I18n.available_locales) || I18n.default_locale

 
     response.headers['Content-Language'] = I18n.locale.to_s
   end
 
     response.headers['Content-Language'] = I18n.locale.to_s
   end


@@ -267,7 +266,7 @@ class ApplicationController < ActionController::Base
       report_error message, :bad_request
     rescue OSM::APIError => ex
       report_error ex.message, ex.status
       report_error message, :bad_request
     rescue OSM::APIError => ex
       report_error ex.message, ex.status

-    rescue ActionController::UnknownAction => ex
+    rescue AbstractController::ActionNotFound => ex

       raise
     rescue Exception => ex
       logger.info("API threw unexpected #{ex.class} exception: #{ex.message}")
       raise
     rescue Exception => ex
       logger.info("API threw unexpected #{ex.class} exception: #{ex.message}")


@@ -287,7 +286,7 @@ class ApplicationController < ActionController::Base
   ##
   # wrap an api call in a timeout
   def api_call_timeout
   ##
   # wrap an api call in a timeout
   def api_call_timeout

-    SystemTimer.timeout_after(API_TIMEOUT) do
+    OSM::Timer.timeout(API_TIMEOUT) do

       yield
     end
   rescue Timeout::Error
       yield
     end
   rescue Timeout::Error


@@ -297,11 +296,17 @@ class ApplicationController < ActionController::Base
   ##
   # wrap a web page in a timeout
   def web_timeout
   ##
   # wrap a web page in a timeout
   def web_timeout

-    SystemTimer.timeout_after(WEB_TIMEOUT) do
+    OSM::Timer.timeout(WEB_TIMEOUT) do

       yield
     end
       yield
     end

-  rescue ActionView::TemplateError => ex
-    if ex.original_exception.is_a?(Timeout::Error)
+  rescue ActionView::Template::Error => ex
+    ex = ex.original_exception
+
+    if ex.is_a?(ActiveRecord::StatementInvalid) and ex.message =~ /^Timeout::Error/
+      ex = Timeout::Error.new
+    end
+
+    if ex.is_a?(Timeout::Error)

       render :action => "timeout"
     else
       raise
       render :action => "timeout"
     else
       raise


@@ -328,7 +333,7 @@ class ApplicationController < ActionController::Base
     end)
 
     options[:cache_path] = Proc.new do |controller|
     end)
 
     options[:cache_path] = Proc.new do |controller|

-      cache_path.merge(controller.params).merge(:locale => I18n.locale)
+      cache_path.merge(controller.params).merge(:host => SERVER_URL, :locale => I18n.locale)

     end
 
     actions.push(options)
     end
 
     actions.push(options)


@@ -340,7 +345,7 @@ class ApplicationController < ActionController::Base
   # extend expire_action to expire all variants
   def expire_action(options = {})
     I18n.available_locales.each do |locale|
   # extend expire_action to expire all variants
   def expire_action(options = {})
     I18n.available_locales.each do |locale|

-      super options.merge(:locale => locale)
+      super options.merge(:host => SERVER_URL, :locale => locale)

     end
   end
 
     end
   end
 


@@ -350,6 +355,23 @@ class ApplicationController < ActionController::Base
     !@user.nil?
   end
 
     !@user.nil?
   end
 

+  ##
+  # ensure that there is a "this_user" instance variable
+  def lookup_this_user
+    unless @this_user = User.active.find_by_display_name(params[:display_name])
+      render_unknown_user params[:display_name]
+    end
+  end
+
+  ##
+  # render a "no such user" page
+  def render_unknown_user(name)
+    @title = t "user.no_such_user.title"
+    @not_found_user = name
+
+    render :template => "user/no_such_user", :status => :not_found
+  end
+  

 private 
 
   # extract authorisation credentials from headers, returns user = nil if none
 private 
 
   # extract authorisation credentials from headers, returns user = nil if none


@@ -368,6 +390,11 @@ private
     return [user, pass] 
   end 
 
     return [user, pass] 
   end 
 

+  # used by oauth plugin to get the current user
+  def current_user
+    @user
+  end
+

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