Convert richtext edit/preview buttons into tabs

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 1ea3f7cb0ac6f8fb4adb34d044a2841f2d9656d0..5d63e79fd3937fc178791920477b3668129e92ce 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,68 +1,177 @@
 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 :require_user, :only => [:edit]
-  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
+
+  content_security_policy(:only => :edit) do |policy|
+    policy.frame_src(*policy.frame_src, :blob)
+  end
+
+  content_security_policy(:only => :id) do |policy|
+    policy.connect_src("*")
+    policy.img_src(*policy.img_src, "*", :blob)
+    policy.script_src(*policy.script_src, :unsafe_eval)
+    policy.style_src(*policy.style_src, :unsafe_inline)
+  end

 
   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.clone
-    new_params.delete :code
-    if new_params.has_key? :m
+    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.key? :m

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

-    else
-      new_params[:lat] = lat
-      new_params[:lon] = lon

     end
     end

-    new_params[:zoom] = zoom
-    new_params[:controller] = 'site'
-    new_params[:action] = 'index'
-    redirect_to new_params
+
+    new_params[:anchor] = "map=#{zoom}/#{lat}/#{lon}"
+    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

+    @key = YAML.load_file(Rails.root.join("config/key.yml"))
+    @key.each_value do |layer_data|
+      layer_data.each do |entry|
+        entry["name"] = Array(entry["name"])
+      end
+      layer_data.each_cons(2) do |entry, next_entry|
+        entry["max_zoom"] = next_entry["min_zoom"] - 1 if entry["name"] == next_entry["name"] && !entry["max_zoom"] && next_entry["min_zoom"]
+      end
+    end
+    render :layout => false

   end
 
   def edit
   end
 
   def edit

-    editor = params[:editor] || @user.preferred_editor || DEFAULT_EDITOR
+    editor = preferred_editor

 
     if editor == "remote"
 
     if editor == "remote"

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

       return
       return

+    else
+      require_user

     end
 
     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
 
   def copyright
     end
   end
 
   def copyright

+    @title = t ".title"

     @locale = params[:copyright_locale] || I18n.locale
   end
 
     @locale = params[:copyright_locale] || I18n.locale
   end
 

+  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
   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
+    render :layout => false
+  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 = []
+
+    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)}"
+    elsif params.delete(:notes) == "yes"
+      anchor << "layers=N"
+    end
+
+    redirect_to params.to_unsafe_h.merge(:only_path => true, :anchor => anchor.join("&")) if anchor.present?

   end
 end
   end
 end