Merge pull request #24 from zerebubuth/routing-merge

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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 12cdb15d4ebbc85c19bdcc353df7900044ec0427..90a9672760755a6ee060e8540cb6fc71ea041d5d 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -9,11 +9,7 @@ class ApplicationController < ActionController::Base
     if session[:user]
       @user = User.where(:id => session[:user]).where("status IN ('active', 'confirmed', 'suspended')").first
 
     if session[:user]
       @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"
+    if @user.status == "suspended"

         session.delete(:user)
         session_expires_automatically
 
         session.delete(:user)
         session_expires_automatically
 


@@ -77,7 +73,7 @@ class ApplicationController < ActionController::Base
     if request.cookies["_osm_session"].to_s == ""
       if params[:cookie_test].nil?
         session[:cookie_test] = true
     if request.cookies["_osm_session"].to_s == ""
       if params[:cookie_test].nil?
         session[:cookie_test] = true

-        redirect_to params.merge(:cookie_test => "true")
+        redirect_to Hash[params].merge(:cookie_test => "true")

         return false
       else
         flash.now[:warning] = t 'application.require_cookies.cookies_needed'
         return false
       else
         flash.now[:warning] = t 'application.require_cookies.cookies_needed'


@@ -422,6 +418,10 @@ class ApplicationController < ActionController::Base
     request.body.rewind
   end
 
     request.body.rewind
   end
 

+  def map_layout
+    request.xhr? ? 'xhr' : 'map'
+  end
+

   def preferred_editor
     editor = if params[:editor]
       params[:editor]
   def preferred_editor
     editor = if params[:editor]
       params[:editor]


@@ -431,7 +431,7 @@ class ApplicationController < ActionController::Base
       DEFAULT_EDITOR
     end
 
       DEFAULT_EDITOR
     end
 

-    if request.env['HTTP_USER_AGENT'] =~ /MSIE/ and editor == 'id'
+    if request.env['HTTP_USER_AGENT'] =~ /MSIE|Trident/ and editor == 'id'

       editor = 'potlatch2'
     end
 
       editor = 'potlatch2'
     end