Merge remote-tracking branch 'openstreetmap/pull/1117'

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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 8322201ff16437a7f5806e506c4f1d3254574108..2ee701e9ceeb5c74e42f020d8676b2747a40cdb5 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -389,12 +389,6 @@ class ApplicationController < ActionController::Base
     render :action => "timeout"
   end
 
     render :action => "timeout"
   end
 

-  ##
-  # is the requestor logged in?
-  def logged_in?
-    !@user.nil?
-  end
-

   ##
   # ensure that there is a "this_user" instance variable
   def lookup_this_user
   ##
   # ensure that there is a "this_user" instance variable
   def lookup_this_user


@@ -441,10 +435,6 @@ class ApplicationController < ActionController::Base
                DEFAULT_EDITOR
              end
 
                DEFAULT_EDITOR
              end
 

-    if request.env["HTTP_USER_AGENT"] =~ /MSIE|Trident/ && editor == "id"
-      editor = "potlatch2"
-    end
-

     editor
   end
 
     editor
   end
 


@@ -454,11 +444,11 @@ class ApplicationController < ActionController::Base
 
   # extract authorisation credentials from headers, returns user = nil if none
   def get_auth_data
 
   # extract authorisation credentials from headers, returns user = nil if none
   def get_auth_data

-    if request.env.key? "X-HTTP_AUTHORIZATION"          # where mod_rewrite might have put it
+    if request.env.key? "X-HTTP_AUTHORIZATION" # where mod_rewrite might have put it

       authdata = request.env["X-HTTP_AUTHORIZATION"].to_s.split
       authdata = request.env["X-HTTP_AUTHORIZATION"].to_s.split

-    elsif request.env.key? "REDIRECT_X_HTTP_AUTHORIZATION"          # mod_fcgi
+    elsif request.env.key? "REDIRECT_X_HTTP_AUTHORIZATION" # mod_fcgi

       authdata = request.env["REDIRECT_X_HTTP_AUTHORIZATION"].to_s.split
       authdata = request.env["REDIRECT_X_HTTP_AUTHORIZATION"].to_s.split

-    elsif request.env.key? "HTTP_AUTHORIZATION"         # regular location
+    elsif request.env.key? "HTTP_AUTHORIZATION" # regular location

       authdata = request.env["HTTP_AUTHORIZATION"].to_s.split
     end
     # only basic authentication supported
       authdata = request.env["HTTP_AUTHORIZATION"].to_s.split
     end
     # only basic authentication supported