Split comment field out of map bugs table

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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c701d8adde71093f37b9f927c1e8b228e4d5bbc6..0c41170470c3d9b1054be5cb8e4c61a55e3a3b77 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -39,6 +39,19 @@ class ApplicationController < ActionController::Base
     end
   end
 
     end
   end
 

+  ##
+  # require the user to have cookies enabled in their browser
+  def require_cookies
+    if request.cookies["_osm_session"].to_s == ""
+      if params[:cookie_test].nil?
+        redirect_to params.merge(:cookie_test => "true")
+        return false
+      else
+        flash.now[:warning] = t 'application.require_cookies.cookies_needed'
+      end
+    end
+  end
+

   # Utility methods to make the controller filter methods easier to read and write.
   def require_allow_read_prefs
     require_capability(:allow_read_prefs)
   # Utility methods to make the controller filter methods easier to read and write.
   def require_allow_read_prefs
     require_capability(:allow_read_prefs)


@@ -179,6 +192,8 @@ 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
+      raise

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


@@ -195,12 +210,54 @@ class ApplicationController < ActionController::Base
   end
 
   def api_call_timeout
   end
 
   def api_call_timeout

-    Timeout::timeout(APP_CONFIG['api_timeout'], OSM::APITimeoutError) do
+    SystemTimer.timeout_after(APP_CONFIG['api_timeout']) do

       yield
     end
       yield
     end

+  rescue Timeout::Error
+    raise OSM::APITimeoutError
+  end
+
+  ##
+  # extend caches_action to include the parameters, locale and logged in
+  # status in all cache keys
+  def self.caches_action(*actions)
+    options = actions.extract_options!
+    cache_path = options[:cache_path] || Hash.new
+
+    options[:cache_path] = Proc.new do |controller|
+      user = controller.instance_variable_get("@user")
+
+      case
+      when user.nil? then user = :none
+      when user.display_name == controller.params[:display_name] then user = :self
+      when user.administrator? then user = :administrator
+      when user.moderator? then user = :moderator
+      else user = :other
+      end
+
+      cache_path.merge(controller.params).merge(:locale => I18n.locale, :user => user)
+    end
+
+    actions.push(options)
+
+    super *actions
+  end
+
+  ##
+  # extend expire_action to expire all variants
+  def expire_action(options = {})
+    path = ActionCachePath.path_for(self, options, false).gsub('?', '.').gsub(':', '.')
+    expire_fragment(Regexp.new(Regexp.escape(path) + "\\..*"))
+  end
+
+  ##
+  # is the requestor logged in?
+  def logged_in?
+    !@user.nil?

   end
 
 private 
   end
 
 private 

+

   # extract authorisation credentials from headers, returns user = nil if none
   def get_auth_data 
     if request.env.has_key? 'X-HTTP_AUTHORIZATION'          # where mod_rewrite might have put it 
   # extract authorisation credentials from headers, returns user = nil if none
   def get_auth_data 
     if request.env.has_key? 'X-HTTP_AUTHORIZATION'          # where mod_rewrite might have put it