Use secondary body color for export inputs background

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

diff --git a/app/controllers/traces_controller.rb b/app/controllers/traces_controller.rb
index b6982894d2812c00d519f05932444c0de6e18b90..5bee44886716448fbcd715dc893c981341b5984b 100644 (file)
--- a/app/controllers/traces_controller.rb
+++ b/app/controllers/traces_controller.rb
@@ -1,28 +1,26 @@
 class TracesController < ApplicationController
 class TracesController < ApplicationController

+  include UserMethods
+  include PaginationMethods
+

   layout "site", :except => :georss
 
   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 :authorize_web
   before_action :set_locale

-  before_action :require_user, :only => [:mine, :new, :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 => [:new, :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 :check_database_readable
+
+  authorize_resource
+
+  before_action :check_database_writable, :only => [:new, :create, :edit, :destroy]

   before_action :offline_warning, :only => [:mine, :show]
   before_action :offline_warning, :only => [:mine, :show]

-  before_action :offline_redirect, :only => [:new, :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]
+  before_action :offline_redirect, :only => [:new, :create, :edit, :destroy, :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
 
   # 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

-  def list
+  def index

     # from display name, pick up user id if one user's traces only
     display_name = params[:display_name]
     if display_name.present?
     # from display name, pick up user id if one user's traces only
     display_name = params[:display_name]
     if display_name.present?

-      target_user = User.active.where(:display_name => display_name).first
+      target_user = User.active.find_by(:display_name => display_name)

       if target_user.nil?
         render_unknown_user display_name
         return
       if target_user.nil?
         render_unknown_user display_name
         return


@@ -33,7 +31,7 @@ class TracesController < ApplicationController
     @title = if target_user.nil?
                t ".public_traces"
              elsif current_user && current_user == target_user
     @title = if target_user.nil?
                t ".public_traces"
              elsif current_user && current_user == target_user

-               t ".my_traces"
+               t ".my_gps_traces"

              else
                t ".public_traces_from", :user => target_user.display_name
              end
              else
                t ".public_traces_from", :user => target_user.display_name
              end


@@ -45,63 +43,42 @@ class TracesController < 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
     # 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

-    @traces = if target_user.nil? # all traces
-                if current_user
-                  Trace.visible_to(current_user) # 1
-                else
-                  Trace.visible_to_all # 2
-                end
-              elsif current_user && current_user == target_user
-                current_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]
+    traces = if target_user.nil? # all traces
+               if current_user
+                 Trace.visible_to(current_user) # 1
+               else
+                 Trace.visible_to_all # 2
+               end
+             elsif current_user && current_user == target_user
+               current_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

 
 

-    @params = params.permit(:display_name, :tag)
+    traces = traces.tagged(params[:tag]) if params[:tag]

 
 

-    @page = (params[:page] || 1).to_i
-    @page_size = 20
+    traces = traces.visible

 
 

-    @traces = @traces.visible
-    @traces = @traces.order(:id => :desc)
-    @traces = @traces.offset((@page - 1) * @page_size)
-    @traces = @traces.limit(@page_size)
-    @traces = @traces.includes(:user, :tags)
+    @params = params.permit(:display_name, :tag, :before, :after)

 
 

-    # put together SET of tags across traces, for related links
-    tagset = {}
-    @traces.each do |trace|
-      trace.tags.reload if params[:tag] # if searched by tag, ActiveRecord won't bring back other tags, so do explicitly here
-      trace.tags.each do |tag|
-        tagset[tag.tag] = tag.tag
-      end
-    end
+    @traces, @newer_traces_id, @older_traces_id = get_page_items(traces, :includes => [:user, :tags])

 
     # final helper vars for view
     @target_user = target_user
 
     # final helper vars for view
     @target_user = target_user

-    @display_name = target_user.display_name if target_user
-    @all_tags = tagset.values
-  end
-
-  def mine
-    redirect_to :action => :list, :display_name => current_user.display_name

   end
 
   def show
   end
 
   def show

-    @trace = Trace.find(params[:id])
+    @trace = Trace.visible.find(params[:id])

 
 

-    if @trace && @trace.visible? &&
-       (@trace.public? || @trace.user == current_user)
+    if @trace.public? || @trace.user == current_user

       @title = t ".title", :name => @trace.name
     else
       flash[:error] = t ".trace_not_found"
       @title = t ".title", :name => @trace.name
     else
       flash[:error] = t ".trace_not_found"

-      redirect_to :action => "list"
+      redirect_to :action => "index"

     end
   rescue ActiveRecord::RecordNotFound
     flash[:error] = t ".trace_not_found"
     end
   rescue ActiveRecord::RecordNotFound
     flash[:error] = t ".trace_not_found"

-    redirect_to :action => "list"
+    redirect_to :action => "index"

   end
 
   def new
   end
 
   def new


@@ -109,26 +86,35 @@ class TracesController < ApplicationController
     @trace = Trace.new(:visibility => default_visibility)
   end
 
     @trace = Trace.new(:visibility => default_visibility)
   end
 

+  def edit
+    @trace = Trace.visible.find(params[:id])
+
+    if current_user.nil? || @trace.user != current_user
+      head :forbidden
+    else
+      @title = t ".title", :name => @trace.name
+    end
+  rescue ActiveRecord::RecordNotFound
+    head :not_found
+  end
+

   def create
     @title = t ".upload_trace"
 
     logger.info(params[:trace][:gpx_file].class.name)
 
     if params[:trace][:gpx_file].respond_to?(:read)
   def create
     @title = t ".upload_trace"
 
     logger.info(params[:trace][:gpx_file].class.name)
 
     if params[:trace][:gpx_file].respond_to?(:read)

-      begin
-        @trace = do_create(params[:trace][:gpx_file], params[:trace][:tagstring],
-                           params[:trace][:description], params[:trace][:visibility])
-      rescue StandardError => ex
-        logger.debug ex
-      end
+      @trace = do_create(params[:trace][:gpx_file], params[:trace][:tagstring],
+                         params[:trace][:description], params[:trace][:visibility])

 
       if @trace.id
         flash[:notice] = t ".trace_uploaded"
         flash[:warning] = t ".traces_waiting", :count => current_user.traces.where(:inserted => false).count if current_user.traces.where(:inserted => false).count > 4
 
 
       if @trace.id
         flash[:notice] = t ".trace_uploaded"
         flash[:warning] = t ".traces_waiting", :count => current_user.traces.where(:inserted => false).count if current_user.traces.where(:inserted => false).count > 4
 

-        redirect_to :action => :list, :display_name => current_user.display_name
+        @trace.schedule_import
+        redirect_to :action => :index, :display_name => current_user.display_name

       else
       else

-        flash[:error] = t("traces.create.upload_failed") if @trace.valid?
+        flash[:error] = t(".upload_failed") if @trace.valid?

 
         render :action => "new"
       end
 
         render :action => "new"
       end


@@ -138,7 +124,7 @@ class TracesController < ApplicationController
                          :description => params[:trace][:description],
                          :visibility => params[:trace][:visibility],
                          :inserted => false, :user => current_user,
                          :description => params[:trace][:description],
                          :visibility => params[:trace][:visibility],
                          :inserted => false, :user => current_user,

-                         :timestamp => Time.now.getutc)
+                         :timestamp => Time.now.utc)

       @trace.valid?
       @trace.errors.add(:gpx_file, "can't be blank")
 
       @trace.valid?
       @trace.errors.add(:gpx_file, "can't be blank")
 


@@ -146,46 +132,10 @@ class TracesController < ApplicationController
     end
   end
 
     end
   end
 

-  def data
-    trace = Trace.find(params[:id])
-
-    if trace.visible? && (trace.public? || (current_user && current_user == trace.user))
-      if Acl.no_trace_download(request.remote_ip)
-        head :forbidden
-      elsif request.format == Mime[:xml]
-        send_data(trace.xml_file.read, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => "attachment")
-      elsif request.format == Mime[:gpx]
-        send_data(trace.xml_file.read, :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
-    else
-      head :not_found
-    end
-  rescue ActiveRecord::RecordNotFound
-    head :not_found
-  end
-
-  def edit
-    @trace = Trace.find(params[:id])
-
-    if !@trace.visible?
-      head :not_found
-    elsif current_user.nil? || @trace.user != current_user
-      head :forbidden
-    else
-      @title = t ".title", :name => @trace.name
-    end
-  rescue ActiveRecord::RecordNotFound
-    head :not_found
-  end
-

   def update
   def update

-    @trace = Trace.find(params[:id])
+    @trace = Trace.visible.find(params[:id])

 
 

-    if !@trace.visible?
-      head :not_found
-    elsif current_user.nil? || @trace.user != current_user
+    if current_user.nil? || @trace.user != current_user

       head :forbidden
     elsif @trace.update(trace_params)
       flash[:notice] = t ".updated"
       head :forbidden
     elsif @trace.update(trace_params)
       flash[:notice] = t ".updated"


@@ -198,146 +148,57 @@ class TracesController < ApplicationController
     head :not_found
   end
 
     head :not_found
   end
 

-  def delete
-    trace = Trace.find(params[:id])
+  def destroy
+    trace = Trace.visible.find(params[:id])

 
 

-    if !trace.visible?
-      head :not_found
-    elsif current_user.nil? || (trace.user != current_user && !current_user.administrator? && !current_user.moderator?)
+    if current_user.nil? || (trace.user != current_user && !current_user.administrator? && !current_user.moderator?)

       head :forbidden
     else
       trace.visible = false
       trace.save
       flash[:notice] = t ".scheduled_for_deletion"
       head :forbidden
     else
       trace.visible = false
       trace.save
       flash[:notice] = t ".scheduled_for_deletion"

-      redirect_to :action => :list, :display_name => trace.user.display_name
-    end
-  rescue ActiveRecord::RecordNotFound
-    head :not_found
-  end
-
-  def georss
-    @traces = Trace.visible_to_all.visible
-
-    @traces = @traces.joins(:user).where(:users => { :display_name => params[:display_name] }) if params[:display_name]
-
-    @traces = @traces.tagged(params[:tag]) if params[:tag]
-    @traces = @traces.order("timestamp DESC")
-    @traces = @traces.limit(20)
-    @traces = @traces.includes(:user)
-  end
-
-  def picture
-    trace = Trace.find(params[:id])
-
-    if trace.visible? && trace.inserted?
-      if trace.public? || (current_user && current_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
-        head :forbidden
-      end
-    else
-      head :not_found
+      trace.schedule_destruction
+      redirect_to :action => :index, :display_name => trace.user.display_name

     end
   rescue ActiveRecord::RecordNotFound
     head :not_found
   end
 
     end
   rescue ActiveRecord::RecordNotFound
     head :not_found
   end
 

-  def icon
-    trace = Trace.find(params[:id])
-
-    if trace.visible? && trace.inserted?
-      if trace.public? || (current_user && current_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
-        head :forbidden
-      end
-    else
-      head :not_found
-    end
-  rescue ActiveRecord::RecordNotFound
-    head :not_found
-  end
-
-  def api_read
-    trace = Trace.visible.find(params[:id])
-
-    if trace.public? || trace.user == current_user
-      render :xml => trace.to_xml.to_s
-    else
-      head :forbidden
-    end
-  end
-
-  def api_update
-    trace = Trace.visible.find(params[:id])
-
-    if trace.user == current_user
-      trace.update_from_xml(request.raw_post)
-      trace.save!
-
-      head :ok
-    else
-      head :forbidden
-    end
-  end
-
-  def api_delete
-    trace = Trace.visible.find(params[:id])
-
-    if trace.user == current_user
-      trace.visible = false
-      trace.save!
-
-      head :ok
-    else
-      head :forbidden
-    end
+  def mine
+    redirect_to :action => :index, :display_name => current_user.display_name

   end
 
   end
 

-  def api_data
+  def data

     trace = Trace.visible.find(params[:id])
 
     trace = Trace.visible.find(params[:id])
 

-    if trace.public? || trace.user == current_user
-      if request.format == Mime[:xml]
+    if trace.public? || (current_user && current_user == trace.user)
+      if Acl.no_trace_download(request.remote_ip)
+        head :forbidden
+      elsif request.format == Mime[:xml]

         send_data(trace.xml_file.read, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => "attachment")
       elsif request.format == Mime[:gpx]
         send_data(trace.xml_file.read, :filename => "#{trace.id}.gpx", :type => request.format.to_s, :disposition => "attachment")
         send_data(trace.xml_file.read, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => "attachment")
       elsif request.format == Mime[:gpx]
         send_data(trace.xml_file.read, :filename => "#{trace.id}.gpx", :type => request.format.to_s, :disposition => "attachment")

+      elsif trace.file.attached?
+        redirect_to rails_blob_path(trace.file, :disposition => "attachment")

       else
         send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => "attachment")
       end
     else
       else
         send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => "attachment")
       end
     else

-      head :forbidden
+      head :not_found

     end
     end

+  rescue ActiveRecord::RecordNotFound
+    head :not_found

   end
 
   end
 

-  def api_create
-    tags = params[:tags] || ""
-    description = params[:description] || ""
-    visibility = params[:visibility]
-
-    if visibility.nil?
-      visibility = if params[:public] && params[:public].to_i.nonzero?
-                     "public"
-                   else
-                     "private"
-                   end
-    end
+  def georss
+    @traces = Trace.visible_to_all.visible

 
 

-    if params[:file].respond_to?(:read)
-      trace = do_create(params[:file], tags, description, visibility)
+    @traces = @traces.joins(:user).where(:users => { :display_name => params[:display_name] }) if params[:display_name]

 
 

-      if trace.id
-        render :plain => trace.id.to_s
-      elsif trace.valid?
-        head :internal_server_error
-      else
-        head :bad_request
-      end
-    else
-      head :bad_request
-    end
+    @traces = @traces.tagged(params[:tag]) if params[:tag]
+    @traces = @traces.order("timestamp DESC")
+    @traces = @traces.limit(20)
+    @traces = @traces.includes(:user)

   end
 
   private
   end
 
   private


@@ -346,79 +207,46 @@ class TracesController < ApplicationController
     # Sanitise the user's filename
     name = file.original_filename.gsub(/[^a-zA-Z0-9.]/, "_")
 
     # 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, "wb") { |f| f.write(file.read) }
-
-    # Create the trace object, falsely marked as already
-    # inserted to stop the import daemon trying to load it
+    # Create the trace object

     trace = Trace.new(
       :name => name,
       :tagstring => tags,
       :description => description,
       :visibility => visibility,
     trace = Trace.new(
       :name => name,
       :tagstring => tags,
       :description => description,
       :visibility => visibility,

-      :inserted => true,
+      :inserted => false,

       :user => current_user,
       :user => current_user,

-      :timestamp => Time.now.getutc
+      :timestamp => Time.now.utc,
+      :file => file

     )
 
     )
 

-    if trace.valid?
-      Trace.transaction do
-        begin
-          # Save the trace object
-          trace.save!
-
-          # Rename the temporary file to the final name
-          FileUtils.mv(filename, trace.trace_name)
-        rescue StandardError
-          # Remove the file as we have failed to update the database
-          FileUtils.rm_f(filename)
-
-          # Pass the exception on
-          raise
-        end
-
-        begin
-          # Clear the inserted flag to make the import daemon load the trace
-          trace.inserted = false
-          trace.save!
-        rescue StandardError
-          # Remove the file as we have failed to update the database
-          FileUtils.rm_f(trace.trace_name)
-
-          # Pass the exception on
-          raise
-        end
+    # Save the trace object
+    if trace.save
+      # Finally save the user's preferred privacy level
+      if pref = current_user.preferences.find_by(:k => "gps.trace.visibility")
+        pref.v = visibility
+        pref.save
+      else
+        current_user.preferences.create(:k => "gps.trace.visibility", :v => visibility)

       end
     end
 
       end
     end
 

-    # Finally save the user's preferred privacy level
-    if pref = current_user.preferences.where(:k => "gps.trace.visibility").first
-      pref.v = visibility
-      pref.save
-    else
-      current_user.preferences.create(:k => "gps.trace.visibility", :v => visibility)
-    end
-

     trace
   end
 
   def offline_warning
     trace
   end
 
   def offline_warning

-    flash.now[:warning] = t "traces.offline_warning.message" if STATUS == :gpx_offline
+    flash.now[:warning] = t "traces.offline_warning.message" if Settings.status == "gpx_offline"

   end
 
   def offline_redirect
   end
 
   def offline_redirect

-    redirect_to :action => :offline if STATUS == :gpx_offline
+    render :action => :offline if Settings.status == "gpx_offline"

   end
 
   def default_visibility
   end
 
   def default_visibility

-    visibility = current_user.preferences.where(:k => "gps.trace.visibility").first
+    visibility = current_user.preferences.find_by(:k => "gps.trace.visibility")

 
     if visibility
       visibility.v
 
     if visibility
       visibility.v

-    elsif current_user.preferences.where(:k => "gps.trace.public", :v => "default").first.nil?
+    elsif current_user.preferences.find_by(:k => "gps.trace.public", :v => "default").nil?

       "private"
     else
       "public"
       "private"
     else
       "public"