Merge remote-tracking branch 'upstream/pull/1796'

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

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index 00eba741f578b5acbfa79d57045b4d1d88c3db31..afdf4d8d7e38005f89c310d2f8bf9f0033d84cbb 100644 (file)
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -1,28 +1,27 @@
 class ExportController < ApplicationController
-
-  before_filter :authorize_web
-  before_filter :set_locale
+  before_action :authorize_web
+  before_action :set_locale
+  before_action :update_totp, :only => [:finish]
 
   caches_page :embed
 
-  #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]
 
     if format == "osm"
-      #redirect to API map get
-      redirect_to "http://api.openstreetmap.org/api/#{API_VERSION}/map?bbox=#{bbox}"
+      # redirect to API map get
+      redirect_to :controller => "api", :action => "map", :bbox => bbox
 
     elsif format == "mapnik"
-      #redirect to a special 'export' cgi script
+      # redirect to a special 'export' cgi script
       format = params[:mapnik_format]
       scale = params[:mapnik_scale]
 
-      redirect_to "http://render.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
 
-  def embed
-  end
+  def embed; end
 end