Merge 14059:14394 from trunk.

diff --combined app/controllers/trace_controller.rb
index c0a0b36b53274809f365638a9f4378bba2bba15c,0c4fc9e58f33f6612565a60e15a01f78864b7e3d..b52be7f349bbb83af740eae7b48a0d5c315919b7
--- 1/app/controllers/trace_controller.rb
--- 2/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@@ -1,8 -1,8 +1,8 @@@
  class TraceController < ApplicationController
    layout 'site'
  
 -  before_filter :authorize_web  
 -  before_filter :require_user, :only => [:mine, :edit, :delete, :make_public]
 +  before_filter :authorize_web
 +  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]
@@@ -13,7 -13,7 +13,7 @@@
      # from display name, pick up user id if one user's traces only
      display_name = params[:display_name]
      if target_user.nil? and !display_name.blank?
 -      target_user = User.find(:first, :conditions => [ "visible = 1 and display_name = ?", display_name])
 +      target_user = User.find(:first, :conditions => [ "visible = ? and display_name = ?", true, display_name])
      end
  
      # set title
@@@ -34,15 -34,15 +34,15 @@@
      # 4 - user's traces, not logged in as that user = all user's public traces
      if target_user.nil? # all traces
        if @user
 -        conditions = ["(gpx_files.public = 1 OR gpx_files.user_id = ?)", @user.id] #1
 +        conditions = ["(gpx_files.public = ? OR gpx_files.user_id = ?)", true, @user.id] #1
        else
 -        conditions  = ["gpx_files.public = 1"] #2
 +        conditions  = ["gpx_files.public = ?", true] #2
        end
      else
        if @user and @user == target_user
          conditions = ["gpx_files.user_id = ?", @user.id] #3 (check vs user id, so no join + can't pick up non-public traces by changing name)
        else
 -        conditions = ["gpx_files.public = 1 AND gpx_files.user_id = ?", target_user.id] #4
 +        conditions = ["gpx_files.public = ? AND gpx_files.user_id = ?", true, target_user.id] #4
        end
      end
      
@@@ -53,8 -53,7 +53,8 @@@
        conditions[0] += " AND gpx_files.id IN (#{files.join(',')})"
      end
      
 -    conditions[0] += " AND gpx_files.visible = 1"
 +    conditions[0] += " AND gpx_files.visible = ?"
 +    conditions << true
  
      @trace_pages, @traces = paginate(:traces,
                                       :include => [:user, :tags],
@@@ -99,28 -98,26 +99,28 @@@
    end
  
    def create
 -    logger.info(params[:trace][:gpx_file].class.name)
 -    if params[:trace][:gpx_file].respond_to?(:read)
 -      do_create(params[:trace][:gpx_file], params[:trace][:tagstring],
 -                params[:trace][:description], params[:trace][:public])
 +    if params[:trace]
 +      logger.info(params[:trace][:gpx_file].class.name)
 +      if params[:trace][:gpx_file].respond_to?(:read)
 +        do_create(params[:trace][:gpx_file], params[:trace][:tagstring],
 +                  params[:trace][:description], params[:trace][:public])
  
 -      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."
 +        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."
  
 -        redirect_to :action => 'mine'
 +          redirect_to :action => 'mine'
 +        end
 +      else
 +        @trace = Trace.new({:name => "Dummy",
 +                            :tagstring => params[:trace][:tagstring],
 +                            :description => params[:trace][:description],
 +                            :public => params[:trace][:public],
 +                            :inserted => false, :user => @user,
 +                            :timestamp => Time.now.getutc})
 +        @trace.valid?
 +        @trace.errors.add(:gpx_file, "can't be blank")
        end
 -    else
 -      @trace = Trace.new({:name => "Dummy",
 -                          :tagstring => params[:trace][:tagstring],
 -                          :description => params[:trace][:description],
 -                          :public => params[:trace][:public],
 -                          :inserted => false, :user => @user,
 -                          :timestamp => Time.now})
 -      @trace.valid?
 -      @trace.errors.add(:gpx_file, "can't be blank")
      end
    end
  
@@@ -197,7 -194,7 +197,7 @@@
    end
  
    def georss
 -    conditions = ["gpx_files.public = 1"]
 +    conditions = ["gpx_files.public = ?", true]
  
      if params[:display_name]
        conditions[0] += " AND users.display_name = ?"
@@@ -279,20 -276,12 +279,20 @@@
  
    def api_create
      if request.post?
 -      do_create(params[:file], params[:tags], params[:description], params[:public])
 -
 -      if @trace.id
 -        render :text => @trace.id.to_s, :content_type => "text/plain"
 -      elsif @trace.valid?
 -        render :nothing => true, :status => :internal_server_error
 +      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
 +        else
 +          render :nothing => true, :status => :bad_request
 +        end
        else
          render :nothing => true, :status => :bad_request
        end
@@@ -304,33 -293,39 +304,50 @@@
  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.getutc
- 
+     # 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
++      :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
 +    
 +    # Finally save whether the user marked the trace as being public
 +    if @trace.public?
 +      if @user.trace_public_default.nil?
 +        @user.preferences.create(:k => "gps.trace.public", :v => "default")
 +      end
 +    else
 +      pref = @user.trace_public_default
 +      pref.destroy unless pref.nil?
 +    end
 +    
    end
  
  end

diff --combined app/views/layouts/site.rhtml
index 49c0ae3769f4bd0ca7b3f7e625a30931baf3aeeb,d1d3bba7931878a22644057f5cb9ba8aeb0d25e1..bc51fa98b3a576eaee6ec6d89ead45607f271da7
--- 1/app/views/layouts/site.rhtml
--- 2/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@@ -7,7 -7,6 +7,7 @@@
      <%= stylesheet_link_tag 'site' %>
      <%= stylesheet_link_tag 'print', :media => "print" %>
      <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => "/opensearch/osm.xml" }) %>
 +    <%= tag("meta", { :name => "description", :content => "OpenStreetMap is the free wiki world map." }) %>
      <%= yield :head %>
      <title>OpenStreetMap<%= ' | '+ h(@title) if @title %></title>
    </head>
@@@ -38,19 -37,16 +38,19 @@@
          <%
          viewclass = ''
          editclass = ''
 +        historyclass = ''
          exportclass = ''
          traceclass = ''
          viewclass = 'active' if params['controller'] == 'site' and params['action'] == 'index' 
          editclass = 'active' if params['controller'] == 'site' and params['action'] == 'edit' 
 +        historyclass = 'active' if params['controller'] == 'changeset' and params['action'] == 'list_bbox' 
          exportclass = 'active' if params['controller'] == 'site' and params['action'] == 'export'
          traceclass = 'active' if params['controller'] == 'trace'
          diaryclass = 'active' if params['controller'] == 'diary_entry'
          %>
          <li><%= link_to 'View', {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => 'view maps', :class => viewclass} %></li>
          <li><%= link_to 'Edit', {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => 'edit maps', :class => editclass} %></li>
 +        <li><%= link_to 'History', {:controller => 'history' }, {:id => 'historyanchor', :title => 'changeset history', :class => historyclass} %></li>
          <% if params['controller'] == 'site' and (params['action'] == 'index' or params['action'] == 'export') %>
          <li><%= link_to_remote 'Export', {:url => {:controller => 'export', :action => 'start'}}, {:id => 'exportanchor', :title => 'export map data', :class => exportclass, :href => url_for(:controller => 'site', :action => 'export')} %></li>
          <% else %>
@@@ -102,7 -98,7 +102,7 @@@
        <% end %>
  
        <% if false %>
-       <div id="donate">
+       <div id="donate" class="notice">
          Support OpenStreetMap by
          <a href="http://donate.openstreetmap.org/">donating</a>
          to the Hardware Upgrade Fund.
@@@ -116,6 -112,12 +116,12 @@@
          <%= yield :left_menu %>
        </div>
  
+       <div id="sotm" class="notice">
+         Come to the 2009 OpenStreetMap
+         Conference, <a href="http://www.stateofthemap.org">The State
+         of the Map</a>, July 10-12 in Amsterdam!
+       </div>
+ 
        <%= yield :optionals %>
  
        <center>
@@@ -124,7 -126,7 +130,7 @@@
          </div>
  
          <div id="cclogo" class="button" style="width: 88px">
 -          <a href="http://creativecommons.org/licenses/by-sa/2.0/"><img src="/images/cc_button.png" border="0" alt="" /></a>
 +          <%= link_to image_tag("cc_button.png", :alt => "CC by-sa 2.0", :border => "0"), "http://creativecommons.org/licenses/by-sa/2.0/" %>
          </div>
        </center>
      </div>

diff --combined public/stylesheets/site.css
index 87d325ddb0c4437445461ead3816be3d0797c505,8fc05b01770ecefc28e80de7ec9f229900413327..0bab9c57ff4232d3f8a68638edfe0a75a0f587a3
--- 1/public/stylesheets/site.css
--- 2/public/stylesheets/site.css
+++ b/public/stylesheets/site.css
@@@ -83,7 -83,7 +83,7 @@@ body 
    font-size: 14px;
  }
  
- #donate {
+ .notice {
    width: 150px;
    margin: 10px;
    padding: 10px;
@@@ -91,7 -91,7 +91,7 @@@
    background: #ea0;
    line-height: 1.2em;
    text-align: left;
-   font-size: 12px;
+   font-size: 14px;
  }
  
  .left_menu {
@@@ -289,12 -289,6 +289,12 @@@ hides rule from IE5-Mac \*
    font-size: 10px;
  }
  
 +hr {
 +  border: none;
 +  background-color: #ccc;
 +  color: #ccc;
 +  height: 1px;
 +}
  
  .gpxsummary {
    font-size: 12px;
@@@ -537,16 -531,6 +537,16 @@@ input[type="submit"] 
    border: 1px solid black;
  }
  
 +#accountForm td {
 +      padding-bottom:10px;
 +}
 +
 +.fieldName {
 +      text-align:right;
 +      font-weight:bold;
 +}
 +
 +
  .nohome .location {
    display: none;
  }
@@@ -559,8 -543,9 +559,8 @@@
    display: inline !important;
  }
  
 -.editDescription {
 -  height: 10ex;
 -  width: 30em;
 +.minorNote {
 +      font-size:0.8em;
  }
  
  .nowrap {
@@@ -572,28 -557,6 +572,6 @@@
    padding: 2px;
  }
  
- /**State of the Map */
-     
- #sotminfo {
-   background: #99F;
-   font-size: 11px;
-   margin: 0px;
-   padding: 0px;
-   border: 1px solid #ccc;
-   left: 0px;
-   line-height: 1.2em;
-   text-align: Left;
-   font-weight: normal;
- }
- 
- #sotminfo a:link {
-   text-decoration: underline;
- }
- 
- #sotminfo a:visited {
-   text-decoration: underline;
- }
- 
  #permalink {
    z-index:10000;
    position:absolute;