Add Bootstrap styling to changeset node/way/relation page links

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 94cc647543c0ff526d4a5cc4d93a6b6b014f278c..5fb8aa111183455586693a2f601024e40e674d55 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,62 +1,97 @@
 class SiteController < ApplicationController
 class SiteController < ApplicationController

-  layout 'site', :except => [:key, :permalink]
-  layout false, :only => [:key, :permalink]
+  layout "site"
+  layout :map_layout, :only => [:index, :export]

 
 

-  before_filter :authorize_web
-  before_filter :set_locale
-  before_filter :redirect_map_params, :only => [:index, :edit, :export]
-  before_filter :require_user, :only => [:edit, :welcome]
-  before_filter :require_oauth, :only => [:index]
+  before_action :authorize_web
+  before_action :set_locale
+  before_action :redirect_browse_params, :only => :index
+  before_action :redirect_map_params, :only => [:index, :edit, :export]
+  before_action :require_oauth, :only => [:index]
+  before_action :require_user, :only => [:id]
+  before_action :update_totp, :only => [:index]
+
+  authorize_resource :class => false

 
   def index
 
   def index

-    unless STATUS == :database_readonly or STATUS == :database_offline
-      session[:location] ||= OSM::IPLocation(request.env['REMOTE_ADDR'])
-    end
+    session[:location] ||= OSM.ip_location(request.env["REMOTE_ADDR"]) unless Settings.status == "database_readonly" || Settings.status == "database_offline"

   end
 
   def permalink
   end
 
   def permalink

-    lon, lat, zoom = ShortLink::decode(params[:code])
-    new_params = params.except(:code, :lon, :lat, :zoom)
+    lon, lat, zoom = ShortLink.decode(params[:code])
+    new_params = params.except(:host, :controller, :action, :code, :lon, :lat, :zoom, :layers, :node, :way, :relation, :changeset)

 
 

-    if new_params.has_key? :m
+    if new_params.key? :m

       new_params.delete :m
       new_params[:mlat] = lat
       new_params[:mlon] = lon
     end
 
       new_params.delete :m
       new_params[:mlat] = lat
       new_params[:mlon] = lon
     end
 

-    new_params[:controller] = 'site'
-    new_params[:action] = 'index'

     new_params[:anchor] = "map=#{zoom}/#{lat}/#{lon}"
     new_params[:anchor] = "map=#{zoom}/#{lat}/#{lon}"

-
-    redirect_to new_params
+    new_params[:anchor] += "&layers=#{params[:layers]}" if params.key? :layers
+
+    options = new_params.to_unsafe_h.to_options
+
+    path = if params.key? :node
+             node_path(params[:node], options)
+           elsif params.key? :way
+             way_path(params[:way], options)
+           elsif params.key? :relation
+             relation_path(params[:relation], options)
+           elsif params.key? :changeset
+             changeset_path(params[:changeset], options)
+           else
+             root_url(options)
+           end
+
+    redirect_to path

   end
 
   def key
     expires_in 7.days, :public => true
   end
 
   def key
     expires_in 7.days, :public => true

+    render :layout => false

   end
 
   def edit
     editor = preferred_editor
 
     if editor == "remote"
   end
 
   def edit
     editor = preferred_editor
 
     if editor == "remote"

-      render :action => :index
+      require_oauth
+      render :action => :index, :layout => map_layout

       return
       return

+    else
+      require_user

     end
 
     end
 

-    @extra_body_class = "site-edit-#{editor}"
+    if %w[id].include?(editor)
+      append_content_security_policy_directives(
+        :frame_src => %w[blob:]
+      )
+    end

 
 

-    if params[:node]
-      bbox = Node.find(params[:node]).bbox.to_unscaled
-      @lat = bbox.centre_lat
-      @lon = bbox.centre_lon
-    elsif params[:way]
-      bbox = Way.find(params[:way]).bbox.to_unscaled
-      @lat = bbox.centre_lat
-      @lon = bbox.centre_lon
-    elsif params[:gpx]
-      trace = Trace.visible_to(@user).find(params[:gpx])
-      @lat = trace.latitude
-      @lon = trace.longitude
+    begin
+      if params[:node]
+        bbox = Node.visible.find(params[:node]).bbox.to_unscaled
+        @lat = bbox.centre_lat
+        @lon = bbox.centre_lon
+        @zoom = 18
+      elsif params[:way]
+        bbox = Way.visible.find(params[:way]).bbox.to_unscaled
+        @lat = bbox.centre_lat
+        @lon = bbox.centre_lon
+        @zoom = 17
+      elsif params[:note]
+        note = Note.visible.find(params[:note])
+        @lat = note.lat
+        @lon = note.lon
+        @zoom = 17
+      elsif params[:gpx] && current_user
+        trace = Trace.visible_to(current_user).find(params[:gpx])
+        @lat = trace.latitude
+        @lon = trace.longitude
+        @zoom = 16
+      end
+    rescue ActiveRecord::RecordNotFound
+      # don't try and derive a location from a missing/deleted object

     end
   end
 
     end
   end
 


@@ -64,34 +99,71 @@ class SiteController < ApplicationController
     @locale = params[:copyright_locale] || I18n.locale
   end
 
     @locale = params[:copyright_locale] || I18n.locale
   end
 

-  def welcome
+  def welcome; end
+
+  def help; end
+
+  def about
+    @locale = params[:about_locale] || I18n.locale
+  end
+
+  def communities
+    @local_chapters = Community.where(:type => "osm-lc").where.not(:id => "OSMF")
+  end
+
+  def export; end
+
+  def offline
+    flash.now[:warning] = if Settings.status == "database_offline"
+                            t("layouts.osm_offline")
+                          else
+                            t("layouts.osm_read_only")
+                          end
+    render :html => nil, :layout => true

   end
 
   def preview
   end
 
   def preview

-    render :text => RichText.new(params[:format], params[:text]).to_html
+    render :html => RichText.new(params[:type], params[:text]).to_html

   end
 
   def id
   end
 
   def id

-    render "id", :layout => false
+    append_content_security_policy_directives(
+      :connect_src => %w[*],
+      :img_src => %w[* blob:],
+      :script_src => %w[dev.virtualearth.net 'unsafe-eval'],
+      :style_src => %w['unsafe-inline']
+    )
+
+    render :layout => false

   end
 
   private
 
   end
 
   private
 

+  def redirect_browse_params
+    if params[:node]
+      redirect_to node_path(params[:node])
+    elsif params[:way]
+      redirect_to way_path(params[:way])
+    elsif params[:relation]
+      redirect_to relation_path(params[:relation])
+    elsif params[:note]
+      redirect_to note_path(params[:note])
+    elsif params[:query]
+      redirect_to search_path(:query => params[:query])
+    end
+  end
+

   def redirect_map_params
     anchor = []
 
   def redirect_map_params
     anchor = []
 

-    if params[:lat] && params[:lon]
-      anchor << "map=#{params.delete(:zoom) || 5}/#{params.delete(:lat)}/#{params.delete(:lon)}"
-    end
+    anchor << "map=#{params.delete(:zoom) || 5}/#{params.delete(:lat)}/#{params.delete(:lon)}" if params[:lat] && params[:lon]

 
     if params[:layers]
       anchor << "layers=#{params.delete(:layers)}"
 
     if params[:layers]
       anchor << "layers=#{params.delete(:layers)}"

-    elsif params.delete(:notes) == 'yes'
+    elsif params.delete(:notes) == "yes"

       anchor << "layers=N"
     end
 
       anchor << "layers=N"
     end
 

-    if anchor.present?
-      redirect_to params.merge(:anchor => anchor.join('&'))
-    end
+    redirect_to params.to_unsafe_h.merge(:only_path => true, :anchor => anchor.join("&")) if anchor.present?

   end
 end
   end
 end