Ensure richtext editing style rules are only applied on standard forms

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

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index 2102a5704f4b29560387f2a4a2c2e5c84639a4fb..d901dccc9e9a721570c1d91360e9e9ce420c1bf5 100644 (file)
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -1,26 +1,33 @@
 class ExportController < ApplicationController
 class ExportController < ApplicationController

+  before_action :authorize_web
+  before_action :set_locale
+  before_action :update_totp, :only => [:finish]
+  authorize_resource :class => false

 
 

-  before_filter :authorize_web
-  before_filter :set_locale
+  caches_page :embed

 
 

-  def start
-  end
-
-  #When the user clicks 'Export' we redirect to a URL which generates the export download
+  # When the user clicks 'Export' we redirect to a URL which generates the export download

   def finish
     bbox = BoundingBox.from_lon_lat_params(params)
     format = params[:format]
 
   def finish
     bbox = BoundingBox.from_lon_lat_params(params)
     format = params[:format]
 

-    if format == "osm"
-      #redirect to API map get
-      redirect_to "http://api.openstreetmap.org/api/#{API_VERSION}/map?bbox=#{bbox}"
+    case format
+    when "osm"
+      # redirect to API map get
+      redirect_to :controller => "api/map", :action => "index", :bbox => bbox

 
 

-    elsif format == "mapnik"
-      #redirect to a special 'export' cgi script
+    when "mapnik"
+      # redirect to a special 'export' cgi script

       format = params[:mapnik_format]
       scale = params[:mapnik_scale]
 
       format = params[:mapnik_format]
       scale = params[:mapnik_scale]
 

-      redirect_to "http://parent.tile.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}"
+      redirect_to "https://render.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}"

     end
   end
     end
   end

+
+  def embed
+    append_content_security_policy_directives(
+      :frame_ancestors => %w[*]
+    )
+  end

 end
 end