Format block details more nicely.

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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 012ba2446787d5d313c983f59371ba5850789386..66ab92a5cf379fa374d986a99261c72f170ee5d1 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)


@@ -80,9 +93,9 @@ class ApplicationController < ActionController::Base
     end
 
     # check if the user has been banned
     end
 
     # check if the user has been banned

-    unless @user.nil? or @user.blocks.empty?
+    unless @user.nil? or @user.active_blocks.empty?

       # NOTE: need slightly more helpful message than this.
       # NOTE: need slightly more helpful message than this.

-      render :text => "You got banned!", :status => :forbidden
+      render :text => t('application.setup_user_auth.blocked'), :status => :forbidden

     end
   end
 
     end
   end