Don't try and store a user record in the session

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 2a826770d4144b2eafa680ebdd0f189f56de0b79..fa33deeeeead9b95cca0368de32886529bf557ff 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,5 +1,6 @@
 class SiteController < ApplicationController
 class SiteController < ApplicationController

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

 
   before_filter :authorize_web
   before_filter :set_locale
 
   before_filter :authorize_web
   before_filter :set_locale


@@ -9,7 +10,83 @@ class SiteController < ApplicationController
     render :action => 'index'
   end
 
     render :action => 'index'
   end
 

+  def permalink
+    lon, lat, zoom = ShortLink::decode(params[:code])
+    new_params = params.clone
+    new_params.delete :code
+    if new_params.has_key? :m
+      new_params.delete :m
+      new_params[:mlat] = lat
+      new_params[:mlon] = lon
+    else
+      new_params[:lat] = lat
+      new_params[:lon] = lon
+    end
+    new_params[:zoom] = zoom
+    new_params[:controller] = 'site'
+    new_params[:action] = 'index'
+    redirect_to new_params
+  end
+

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

+
+  def edit
+    editor = params[:editor] || @user.preferred_editor || DEFAULT_EDITOR
+
+    if editor == "remote"
+      render :action => :index
+    else
+      # Decide on a lat lon to initialise potlatch with. Various ways of doing this
+      if params['lon'] and params['lat']
+        @lon = params['lon'].to_f
+        @lat = params['lat'].to_f
+        @zoom = params['zoom'].to_i
+
+      elsif params['mlon'] and params['mlat']
+        @lon = params['mlon'].to_f
+        @lat = params['mlat'].to_f
+        @zoom = params['zoom'].to_i
+
+      elsif params['bbox']
+        bbox = BoundingBox.from_bbox_params(params)
+
+        @lon = bbox.centre_lon
+        @lat = bbox.centre_lat
+        @zoom = 16
+      elsif params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat']
+        bbox = BoundingBox.from_lon_lat_params(params)
+
+        @lon = bbox.centre_lon
+        @lat = bbox.centre_lat
+        @zoom = 16
+
+      elsif params['gpx']
+        @lon = Trace.find(params['gpx']).longitude
+        @lat = Trace.find(params['gpx']).latitude
+
+      elsif cookies.key?("_osm_location")
+        @lon, @lat, @zoom, layers = cookies["_osm_location"].split("|")
+
+      elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil?
+        @lon = @user.home_lon
+        @lat = @user.home_lat
+
+      else
+        #catch all.  Do nothing.  lat=nil, lon=nil
+        #Currently this results in potlatch starting up at 0,0 (Atlantic ocean).
+      end
+
+      @zoom = '17' if @zoom.nil?
+    end
+  end
+
+  def copyright
+    @locale = params[:copyright_locale] || I18n.locale
+  end
+
+  def preview
+    render :text => RichText.new(params[:format], params[:text]).to_html
+  end

 end
 end