layout 'site'
before_filter :authorize_web
+ before_filter :set_locale
before_filter :require_user, :only => [:mine, :create, :edit, :delete, :make_public]
before_filter :authorize, :only => [:api_details, :api_data, :api_create]
- before_filter :check_database_availability, :except => [:api_details, :api_data, :api_create]
- before_filter :check_read_availability, :only => [:api_details, :api_data, :api_create]
+ before_filter :check_database_readable, :except => [:api_details, :api_data, :api_create]
+ before_filter :check_database_writable, :only => [:create, :edit, :delete, :make_public]
+ before_filter :check_api_readable, :only => [:api_details, :api_data]
+ before_filter :check_api_writable, :only => [:api_create]
# 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
display_name = params[:display_name]
if target_user.nil? and !display_name.blank?
target_user = User.find(:first, :conditions => [ "visible = ? and display_name = ?", true, display_name])
+ if target_user.nil?
+ @title = t'trace.no_such_user.title'
+ @not_found_user = display_name
+ render :action => 'no_such_user', :status => :not_found
+ return
+ end
end
# set title
if target_user.nil?
- @title = "Public GPS traces"
+ @title = t 'trace.list.public_traces'
elsif @user and @user == target_user
- @title = "Your GPS traces"
+ @title = t 'trace.list.your_traces'
else
- @title = "Public GPS traces from #{target_user.display_name}"
+ @title = t 'trace.list.public_traces_from', :user => target_user.display_name
end
- @title += " tagged with #{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)
@tag = params[:tag]
files = Tracetag.find_all_by_tag(params[:tag]).collect { |tt| tt.gpx_id }
- conditions[0] += " AND gpx_files.id IN (#{files.join(',')})"
+
+ if files.length > 0
+ conditions[0] += " AND gpx_files.id IN (#{files.join(',')})"
+ else
+ conditions[0] += " AND 0 = 1"
+ end
end
conditions[0] += " AND gpx_files.visible = ?"
end
def mine
+ # Load the preference of whether the user set the trace public the last time
+ @trace = Trace.new
+ if @user.preferences.find(:first, :conditions => {:k => "gps.trace.public", :v => "default"}).nil?
+ @trace.public = false
+ else
+ @trace.public = true
+ end
list(@user, "mine")
end
if @trace and @trace.visible? and
(@trace.public? or @trace.user == @user)
- @title = "Viewing trace #{@trace.name}"
+ @title = t 'trace.view.title', :name => @trace.name
else
- flash[:notice] = "Trace not found!"
+ flash[:notice] = t 'trace.view.trace_not_found'
redirect_to :controller => 'trace', :action => 'list'
end
rescue ActiveRecord::RecordNotFound
- flash[:notice] = "Trace not found!"
+ flash[:notice] = t 'trace.view.trace_not_found'
redirect_to :controller => 'trace', :action => 'list'
end
if @trace.id
logger.info("id is #{@trace.id}")
- flash[:notice] = "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
+ flash[:notice] = t 'trace.create.trace_uploaded'
redirect_to :action => 'mine'
end
:description => params[:trace][:description],
:public => params[:trace][:public],
:inserted => false, :user => @user,
- :timestamp => Time.now})
+ :timestamp => Time.now.getutc})
@trace.valid?
@trace.errors.add(:gpx_file, "can't be blank")
end
end
+ @title = t 'trace.create.upload_trace'
end
def data
@trace = Trace.find(params[:id])
if @user and @trace.user == @user
+ @title = t 'trace.edit.title', :name => @trace.name
if params[:trace]
@trace.description = params[:trace][:description]
@trace.tagstring = params[:trace][:tagstring]
if request.post? and trace.visible?
trace.visible = false
trace.save
- flash[:notice] = 'Track scheduled for deletion'
+ flash[:notice] = t 'trace.delete.scheduled_for_deletion'
redirect_to :controller => 'traces', :action => 'mine'
else
render :nothing => true, :status => :bad_request
if request.post? and !trace.public?
trace.public = true
trace.save
- flash[:notice] = 'Track made public'
+ flash[:notice] = t 'trace.make_public.made_public'
redirect_to :controller => 'trace', :action => 'view', :id => params[:id]
else
render :nothing => true, :status => :bad_request
if trace.inserted?
if trace.public? or (@user and @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')
else
render :nothing => true, :status => :forbidden
if trace.inserted?
if trace.public? or (@user and @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')
else
render :nothing => true, :status => :forbidden
def api_create
if request.post?
- do_create(params[:file], params[:tags], params[:description], params[:public])
+ tags = params[:tags] || ""
+ description = params[:description] || ""
+ pub = params[:public] || false
+
+ if params[:file].respond_to?(:read)
+ do_create(params[:file], tags, description, pub)
- if @trace.id
- render :text => @trace.id.to_s, :content_type => "text/plain"
- elsif @trace.valid?
- render :nothing => true, :status => :internal_server_error
+ if @trace.id
+ render :text => @trace.id.to_s, :content_type => "text/plain"
+ elsif @trace.valid?
+ render :nothing => true, :status => :internal_server_error
+ else
+ render :nothing => true, :status => :bad_request
+ end
else
render :nothing => true, :status => :bad_request
end
private
def do_create(file, tags, description, public)
+ # Sanitise the user's filename
name = file.original_filename.gsub(/[^a-zA-Z0-9.]/, '_')
+
+ # Get a temporary filename...
filename = "/tmp/#{rand}"
+ # ...and save the uploaded file to that location
File.open(filename, "w") { |f| f.write(file.read) }
- @trace = Trace.new({:name => name, :tagstring => tags,
- :description => description, :public => public})
- @trace.inserted = false
- @trace.user = @user
- @trace.timestamp = Time.now
-
+ # Create the trace object, falsely marked as already
+ # inserted to stop the import daemon trying to load it
+ @trace = Trace.new({
+ :name => name,
+ :tagstring => tags,
+ :description => description,
+ :public => public,
+ :inserted => true,
+ :user => @user,
+ :timestamp => Time.now.getutc
+ })
+
+ # Save the trace object
if @trace.save
+ # Rename the temporary file to the final name
FileUtils.mv(filename, @trace.trace_name)
+
+ # Clear the inserted flag to make the import daemon load the trace
+ @trace.inserted = false
+ @trace.save!
else
+ # Remove the file as we have failed to update the database
FileUtils.rm_f(filename)
end
projects / rails.git / blobdiff