X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dc2a2c8ebd1a11e4a64555fda22c6859a51defff..c3ad6aa2923c03aeeea0b57033b0a9238d262aa2:/app/controllers/trace_controller.rb diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb index 9d6dad600..60b5a4585 100644 --- a/app/controllers/trace_controller.rb +++ b/app/controllers/trace_controller.rb @@ -1,20 +1,20 @@ class TraceController < ApplicationController - layout "site" - - skip_before_filter :verify_authenticity_token, :only => [:api_create, :api_read, :api_update, :api_delete, :api_data] - before_filter :authorize_web - before_filter :set_locale - before_filter :require_user, :only => [:mine, :create, :edit, :delete] - before_filter :authorize, :only => [:api_create, :api_read, :api_update, :api_delete, :api_data] - before_filter :check_database_readable, :except => [:api_read, :api_data] - before_filter :check_database_writable, :only => [:create, :edit, :delete, :api_create, :api_update, :api_delete] - before_filter :check_api_readable, :only => [:api_read, :api_data] - before_filter :check_api_writable, :only => [:api_create, :api_update, :api_delete] - before_filter :require_allow_read_gpx, :only => [:api_read, :api_data] - before_filter :require_allow_write_gpx, :only => [:api_create, :api_update, :api_delete] - before_filter :offline_warning, :only => [:mine, :view] - before_filter :offline_redirect, :only => [:create, :edit, :delete, :data, :api_create, :api_delete, :api_data] - around_filter :api_call_handle_error, :only => [:api_create, :api_read, :api_update, :api_delete, :api_data] + layout "site", :except => :georss + + skip_before_action :verify_authenticity_token, :only => [:api_create, :api_read, :api_update, :api_delete, :api_data] + before_action :authorize_web + before_action :set_locale + before_action :require_user, :only => [:mine, :create, :edit, :delete] + before_action :authorize, :only => [:api_create, :api_read, :api_update, :api_delete, :api_data] + before_action :check_database_readable, :except => [:api_read, :api_data] + before_action :check_database_writable, :only => [:create, :edit, :delete, :api_create, :api_update, :api_delete] + before_action :check_api_readable, :only => [:api_read, :api_data] + before_action :check_api_writable, :only => [:api_create, :api_update, :api_delete] + before_action :require_allow_read_gpx, :only => [:api_read, :api_data] + before_action :require_allow_write_gpx, :only => [:api_create, :api_update, :api_delete] + before_action :offline_warning, :only => [:mine, :view] + before_action :offline_redirect, :only => [:create, :edit, :delete, :data, :api_create, :api_delete, :api_data] + around_action :api_call_handle_error, :only => [:api_create, :api_read, :api_update, :api_delete, :api_data] # Counts and selects pages of GPX traces for various criteria (by user, tags, public etc.). # target_user - if set, specifies the user to fetch traces for. if not set will fetch all traces @@ -30,13 +30,13 @@ class TraceController < ApplicationController end # set title - if target_user.nil? - @title = t "trace.list.public_traces" - elsif @user && @user == target_user - @title = t "trace.list.your_traces" - else - @title = t "trace.list.public_traces_from", :user => target_user.display_name - end + @title = if target_user.nil? + t "trace.list.public_traces" + elsif @user && @user == target_user + t "trace.list.your_traces" + else + t "trace.list.public_traces_from", :user => target_user.display_name + end @title += t "trace.list.tagged_with", :tags => params[:tag] if params[:tag] @@ -45,19 +45,17 @@ class TraceController < ApplicationController # 2 - all traces, not logged in = all public traces # 3 - user's traces, logged in as same user = all user's traces # 4 - user's traces, not logged in as that user = all user's public traces - if target_user.nil? # all traces - if @user - @traces = Trace.visible_to(@user) # 1 - else - @traces = Trace.visible_to_all # 2 - end - else - if @user && @user == target_user - @traces = @user.traces # 3 (check vs user id, so no join + can't pick up non-public traces by changing name) - else - @traces = target_user.traces.visible_to_all # 4 - end - end + @traces = if target_user.nil? # all traces + if @user + Trace.visible_to(@user) # 1 + else + Trace.visible_to_all # 2 + end + elsif @user && @user == target_user + @user.traces # 3 (check vs user id, so no join + can't pick up non-public traces by changing name) + else + target_user.traces.visible_to_all # 4 + end @traces = @traces.tagged(params[:tag]) if params[:tag] @@ -117,7 +115,6 @@ class TraceController < ApplicationController end if @trace.id - logger.info("id is #{@trace.id}") flash[:notice] = t "trace.create.trace_uploaded" if @user.traces.where(:inserted => false).count > 4 @@ -219,7 +216,7 @@ class TraceController < ApplicationController def picture trace = Trace.find(params[:id]) - if trace.inserted? + if trace.visible? && trace.inserted? if trace.public? || (@user && @user == trace.user) expires_in 7.days, :private => !trace.public?, :public => trace.public? send_file(trace.large_picture_name, :filename => "#{trace.id}.gif", :type => "image/gif", :disposition => "inline") @@ -236,7 +233,7 @@ class TraceController < ApplicationController def icon trace = Trace.find(params[:id]) - if trace.inserted? + if trace.visible? && trace.inserted? if trace.public? || (@user && @user == trace.user) expires_in 7.days, :private => !trace.public?, :public => trace.public? send_file(trace.icon_picture_name, :filename => "#{trace.id}_icon.gif", :type => "image/gif", :disposition => "inline") @@ -267,7 +264,7 @@ class TraceController < ApplicationController new_trace = Trace.from_xml(request.raw_post) unless new_trace && new_trace.id == trace.id - fail OSM::APIBadUserInput.new("The id in the url (#{trace.id}) is not the same as provided in the xml (#{new_trace.id})") + raise OSM::APIBadUserInput.new("The id in the url (#{trace.id}) is not the same as provided in the xml (#{new_trace.id})") end trace.description = new_trace.description @@ -295,11 +292,13 @@ class TraceController < ApplicationController end def api_data - trace = Trace.find(params[:id]) + trace = Trace.visible.find(params[:id]) if trace.public? || trace.user == @user - if request.format == Mime::XML || request.format == Mime::GPX + if request.format == Mime::XML send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => "attachment") + elsif request.format == Mime::GPX + send_file(trace.xml_file, :filename => "#{trace.id}.gpx", :type => request.format.to_s, :disposition => "attachment") else send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => "attachment") end @@ -314,11 +313,11 @@ class TraceController < ApplicationController visibility = params[:visibility] if visibility.nil? - if params[:public] && params[:public].to_i.nonzero? - visibility = "public" - else - visibility = "private" - end + visibility = if params[:public] && params[:public].to_i.nonzero? + "public" + else + "private" + end end if params[:file].respond_to?(:read)