X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5cbd4038edb32b0304bd766e70fc680ea447b52b..93a617fec9febfb74040cab5bda0891075703ab1:/app/controllers/trace_controller.rb diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb index 538cf10d2..07a6fe210 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" + + 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 @@ -31,14 +31,14 @@ class TraceController < ApplicationController # set title if target_user.nil? - @title = t 'trace.list.public_traces' + @title = t "trace.list.public_traces" elsif @user && @user == target_user - @title = t 'trace.list.your_traces' + @title = t "trace.list.your_traces" else - @title = t 'trace.list.public_traces_from', :user => target_user.display_name + @title = t "trace.list.public_traces_from", :user => target_user.display_name end - @title += t 'trace.list.tagged_with', :tags => params[:tag] if params[:tag] + @title += t "trace.list.tagged_with", :tags => params[:tag] if params[:tag] # four main cases: # 1 - all traces, logged in = all public traces + all user's (i.e + all mine) @@ -94,14 +94,14 @@ class TraceController < ApplicationController if @trace && @trace.visible? && (@trace.public? || @trace.user == @user) - @title = t 'trace.view.title', :name => @trace.name + @title = t "trace.view.title", :name => @trace.name else - flash[:error] = t 'trace.view.trace_not_found' - redirect_to :controller => 'trace', :action => 'list' + flash[:error] = t "trace.view.trace_not_found" + redirect_to :controller => "trace", :action => "list" end rescue ActiveRecord::RecordNotFound - flash[:error] = t 'trace.view.trace_not_found' - redirect_to :controller => 'trace', :action => 'list' + flash[:error] = t "trace.view.trace_not_found" + redirect_to :controller => "trace", :action => "list" end def create @@ -117,11 +117,10 @@ class TraceController < ApplicationController end if @trace.id - logger.info("id is #{@trace.id}") - flash[:notice] = t 'trace.create.trace_uploaded' + flash[:notice] = t "trace.create.trace_uploaded" if @user.traces.where(:inserted => false).count > 4 - flash[:warning] = t 'trace.trace_header.traces_waiting', :count => @user.traces.where(:inserted => false).count + flash[:warning] = t "trace.trace_header.traces_waiting", :count => @user.traces.where(:inserted => false).count end redirect_to :action => :list, :display_name => @user.display_name @@ -140,7 +139,7 @@ class TraceController < ApplicationController @trace = Trace.new(:visibility => default_visibility) end - @title = t 'trace.create.upload_trace' + @title = t "trace.create.upload_trace" end def data @@ -150,11 +149,11 @@ class TraceController < ApplicationController if Acl.no_trace_download(request.remote_ip) render :text => "", :status => :forbidden elsif request.format == Mime::XML - send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => 'attachment') + 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') + 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') + send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => "attachment") end else render :text => "", :status => :not_found @@ -171,14 +170,14 @@ class TraceController < ApplicationController elsif @user.nil? || @trace.user != @user render :text => "", :status => :forbidden else - @title = t 'trace.edit.title', :name => @trace.name + @title = t "trace.edit.title", :name => @trace.name if params[:trace] @trace.description = params[:trace][:description] @trace.tagstring = params[:trace][:tagstring] @trace.visibility = params[:trace][:visibility] if @trace.save - redirect_to :action => 'view', :display_name => @user.display_name + redirect_to :action => "view", :display_name => @user.display_name end end end @@ -196,7 +195,7 @@ class TraceController < ApplicationController else trace.visible = false trace.save - flash[:notice] = t 'trace.delete.scheduled_for_deletion' + flash[:notice] = t "trace.delete.scheduled_for_deletion" redirect_to :action => :list, :display_name => @user.display_name end rescue ActiveRecord::RecordNotFound @@ -219,10 +218,10 @@ 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') + send_file(trace.large_picture_name, :filename => "#{trace.id}.gif", :type => "image/gif", :disposition => "inline") else render :text => "", :status => :forbidden end @@ -236,10 +235,10 @@ 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') + send_file(trace.icon_picture_name, :filename => "#{trace.id}_icon.gif", :type => "image/gif", :disposition => "inline") else render :text => "", :status => :forbidden end @@ -295,13 +294,15 @@ 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 - send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => 'attachment') + 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') + send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => "attachment") end else render :text => "", :status => :forbidden @@ -340,7 +341,7 @@ class TraceController < ApplicationController def do_create(file, tags, description, visibility) # Sanitise the user's filename - name = file.original_filename.gsub(/[^a-zA-Z0-9.]/, '_') + name = file.original_filename.gsub(/[^a-zA-Z0-9.]/, "_") # Get a temporary filename... filename = "/tmp/#{rand}" @@ -398,7 +399,7 @@ class TraceController < ApplicationController end def offline_warning - flash.now[:warning] = t 'trace.offline_warning.message' if STATUS == :gpx_offline + flash.now[:warning] = t "trace.offline_warning.message" if STATUS == :gpx_offline end def offline_redirect