Localisation updates from https://translatewiki.net.

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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index a809139cec656e2f0142790b3e7b3a1c862c5404..a24df48e08b0dcc8da6b2d54fb7c078ff3da4172 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -5,6 +5,9 @@ class ApplicationController < ActionController::Base
 
   before_action :fetch_body
 
 
   before_action :fetch_body
 

+  attr_accessor :current_user
+  helper_method :current_user
+

   def authorize_web
     if session[:user]
       self.current_user = User.where(:id => session[:user]).where("status IN ('active', 'confirmed', 'suspended')").first
   def authorize_web
     if session[:user]
       self.current_user = User.where(:id => session[:user]).where("status IN ('active', 'confirmed', 'suspended')").first


@@ -26,9 +29,7 @@ class ApplicationController < ActionController::Base
         end
       end
     elsif session[:token]
         end
       end
     elsif session[:token]

-      if self.current_user = User.authenticate(:token => session[:token])
-        session[:user] = current_user.id
-      end
+      session[:user] = current_user.id if self.current_user = User.authenticate(:token => session[:token])

     end
   rescue StandardError => ex
     logger.info("Exception authorizing user: #{ex}")
     end
   rescue StandardError => ex
     logger.info("Exception authorizing user: #{ex}")


@@ -47,7 +48,7 @@ class ApplicationController < ActionController::Base
   end
 
   def require_oauth
   end
 
   def require_oauth

-    @oauth = @user.access_token(OAUTH_KEY) if current_user && defined? OAUTH_KEY
+    @oauth = current_user.access_token(OAUTH_KEY) if current_user && defined? OAUTH_KEY

   end
 
   ##
   end
 
   ##


@@ -343,7 +344,7 @@ class ApplicationController < ActionController::Base
   # or raises a suitable error. +method+ should be a symbol, e.g: :put or :get.
   def assert_method(method)
     ok = request.send((method.to_s.downcase + "?").to_sym)
   # or raises a suitable error. +method+ should be a symbol, e.g: :put or :get.
   def assert_method(method)
     ok = request.send((method.to_s.downcase + "?").to_sym)

-    raise OSM::APIBadMethodError.new(method) unless ok
+    raise OSM::APIBadMethodError, method unless ok

   end
 
   ##
   end
 
   ##


@@ -363,7 +364,7 @@ class ApplicationController < ActionController::Base
       yield
     end
   rescue ActionView::Template::Error => ex
       yield
     end
   rescue ActionView::Template::Error => ex

-    ex = ex.original_exception
+    ex = ex.cause

 
     if ex.is_a?(Timeout::Error) ||
        (ex.is_a?(ActiveRecord::StatementInvalid) && ex.message =~ /execution expired/)
 
     if ex.is_a?(Timeout::Error) ||
        (ex.is_a?(ActiveRecord::StatementInvalid) && ex.message =~ /execution expired/)


@@ -378,9 +379,7 @@ class ApplicationController < ActionController::Base
   ##
   # 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

-    unless @this_user = User.active.find_by(:display_name => params[:display_name])
-      render_unknown_user params[:display_name]
-    end
+    render_unknown_user params[:display_name] unless @this_user = User.active.find_by(:display_name => params[:display_name])

   end
 
   ##
   end
 
   ##


@@ -410,7 +409,9 @@ class ApplicationController < ActionController::Base
 
   def map_layout
     append_content_security_policy_directives(
 
   def map_layout
     append_content_security_policy_directives(

-      :connect_src => %w[nominatim.openstreetmap.org overpass-api.de router.project-osrm.org valhalla.mapzen.com],
+      :child_src => %w[127.0.0.1:8111],
+      :connect_src => %w[nominatim.openstreetmap.org overpass-api.de router.project-osrm.org],
+      :form_action => %w[render.openstreetmap.org],

       :script_src => %w[graphhopper.com open.mapquestapi.com],
       :img_src => %w[developer.mapquest.com]
     )
       :script_src => %w[graphhopper.com open.mapquestapi.com],
       :img_src => %w[developer.mapquest.com]
     )


@@ -424,6 +425,10 @@ class ApplicationController < ActionController::Base
     request.xhr? ? "xhr" : "map"
   end
 
     request.xhr? ? "xhr" : "map"
   end
 

+  def allow_thirdparty_images
+    append_content_security_policy_directives(:img_src => %w[*])
+  end
+

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


@@ -460,22 +465,10 @@ class ApplicationController < ActionController::Base
       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

-    if authdata && authdata[0] == "Basic"
-      user, pass = Base64.decode64(authdata[1]).split(":", 2)
-    end
+    user, pass = Base64.decode64(authdata[1]).split(":", 2) if authdata && authdata[0] == "Basic"

     [user, pass]
   end
 
     [user, pass]
   end
 

-  # used to get the current logged in user
-  def current_user
-    @user
-  end
-
-  # used to set the current logged in user
-  def current_user=(user)
-    @user = user
-  end
-

   # override to stop oauth plugin sending errors
   def invalid_oauth_response; end
 end
   # override to stop oauth plugin sending errors
   def invalid_oauth_response; end
 end