X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cfbdd3f7e1c688e2c875ded9fd847fcc1c3a4caf..0c061a6f655b4ab49e299a8e19d289aae846aa40:/app/controllers/message_controller.rb

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index 52f38e9f6..9dc1d6922 100644
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -20,10 +20,18 @@ class MessageController < ApplicationController
     end
   end
 
+  def reply
+    message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ])
+    title = message.title.sub(/^Re:\s*/, "Re: ")
+    redirect_to :action => 'new', :user_id => message.from_user_id, :title => title
+  rescue ActiveRecord::RecordNotFound
+    render :nothing => true, :status => :not_found
+  end
+
   def read
     @title = 'read message'
-    @message = Message.find(params[:message_id], :conditions => ["to_user_id = ?", @user.id])
-    @message.message_read = 1
+    @message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ])
+    @message.message_read = 1 if @message.to_user_id == @user.id
     @message.save
   rescue ActiveRecord::RecordNotFound
     render :nothing => true, :status => :not_found
@@ -37,6 +45,14 @@ class MessageController < ApplicationController
     end
   end
 
+  def outbox
+    @title = 'outbox'
+    if @user and params[:display_name] == @user.display_name
+    else
+      redirect_to :controller => 'message', :action => 'outbox', :display_name => @user.display_name
+    end
+  end
+
   def mark
     if params[:message_id]
       id = params[:message_id]