Merge 14394:14533 from trunk.

diff --cc app/controllers/amf_controller.rb
index 1ee5e9cee2b14beacc1552c409694583dd1075c4,7f85280b79d29d5b320460d01f028f14727a3fd0..de3c7583b42d9977f255a581afbc5fe9265121b2
--- 1/app/controllers/amf_controller.rb
--- 2/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@@ -37,11 -28,8 +37,11 @@@ class AmfController < ApplicationContro
  
    include Potlatch
  
 +  # Help methods for checking boundary sanity and area size
 +  include MapBoundary
 +
    session :off
-   before_filter :check_write_availability
+   before_filter :check_api_writable
  
    # Main AMF handlers: process the raw AMF string (using AMF library) and
    # calls each action (private method) accordingly.

diff --cc app/controllers/api_controller.rb
Simple merge

diff --cc app/controllers/application.rb
Simple merge

diff --cc app/controllers/browse_controller.rb
Simple merge

diff --cc app/controllers/diary_entry_controller.rb
Simple merge

diff --cc app/controllers/message_controller.rb
index a04aa82c0c7959e0b504d2a7f0da211a1fde99b7,d6e5d7fdadc4b86c326bc06217530fc76a169f48..8f866e512c388fda530304d0da6a84f793268f73
--- 1/app/controllers/message_controller.rb
--- 2/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@@ -3,19 -3,16 +3,21 @@@ class MessageController < ApplicationCo
  
    before_filter :authorize_web
    before_filter :require_user
+   before_filter :check_database_readable
+   before_filter :check_database_writable, :only => [:new, :reply, :mark]
  
 +  # Allow the user to write a new message to another user. This action also 
 +  # deals with the sending of that message to the other user when the user
 +  # clicks send.
 +  # The user_id param is the id of the user that the message is being sent to.
    def new
      @title = 'send message'
 +    @to_user = User.find(params[:user_id])
      if params[:message]
        @message = Message.new(params[:message])
 -      @message.to_user_id = params[:user_id]
 +      @message.to_user_id = @to_user.id
        @message.from_user_id = @user.id
 -      @message.sent_on = Time.now
 +      @message.sent_on = Time.now.getutc
     
        if @message.save
          flash[:notice] = 'Message sent'

diff --cc app/controllers/node_controller.rb
Simple merge

diff --cc app/controllers/old_node_controller.rb
Simple merge

diff --cc app/controllers/old_way_controller.rb
Simple merge

diff --cc app/controllers/relation_controller.rb
Simple merge

diff --cc app/controllers/trace_controller.rb
index b52be7f349bbb83af740eae7b48a0d5c315919b7,3942cb7fe3d8964eb80eb7733eacee0f9c490de3..0603567c45a2310291374aa3b7cb4cb460014281
--- 1/app/controllers/trace_controller.rb
--- 2/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@@ -1,11 -1,13 +1,13 @@@
  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]
+   before_filter :check_database_readable, :except => [:api_details, :api_data, :api_create]
+   before_filter :check_database_writable, :only => [:create, :edit, :delete, :make_public]
+   before_filter :check_api_readable, :only => [:api_details, :api_data]
+   before_filter :check_api_writable, :only => [:api_create]
   
    # 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

diff --cc app/controllers/user_controller.rb
Simple merge

diff --cc app/controllers/way_controller.rb
Simple merge

diff --cc app/views/layouts/site.rhtml
Simple merge

diff --cc app/views/site/edit.rhtml
Simple merge

diff --cc config/environment.rb
Simple merge