X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9866a7ec45fdc650a17229aabb8147e430cc5433..32b280eb8dfd11d03646cb89c339d2b938f06a6e:/app/controllers/message_controller.rb?ds=sidebyside

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index 26102cc63..f3f3bf9ea 100644
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -4,37 +4,49 @@ class MessageController < ApplicationController
   before_filter :authorize_web
   before_filter :require_user
 
+  # 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.
   def new
     @title = 'send message'
     if params[:message]
-      to_user = User.find(params[:user_id])
-      body = params[:message][:body]
-      title = params[:message][:title]
-      message = Message.new
-      message.body = body
-      message.title = title
-      message.to_user_id = params[:user_id]
-      message.from_user_id = @user.id
-      message.sent_on = Time.now
+      @message = Message.new(params[:message])
+      @message.to_user_id = params[:user_id]
+      @message.from_user_id = @user.id
+      @message.sent_on = Time.now
    
-      if message.save
+      if @message.save
         flash[:notice] = 'Message sent'
+        Notifier::deliver_message_notification(@message)
         redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
-      else
-        @message.errors.add("Sending message failed")
       end
-
+    else
+      @title = params[:title]
     end
   end
 
+  # Allow the user to reply to another message.
+  def reply
+    message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ])
+    @body = "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}" 
+    @title = "Re: #{message.title.sub(/^Re:\s*/, '')}"
+    @user_id = message.from_user_id
+    render :action => 'new'
+  rescue ActiveRecord::RecordNotFound
+    render :nothing => true, :status => :not_found
+  end
+
+  # Show a message
   def read
     @title = 'read message'
-    if params[:message_id]
-      id = params[:message_id]
-      @message = Message.find_by_id(id)
-    end
+    @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
   end
 
+  # Display the list of messages that have been sent to the user.
   def inbox
     @title = 'inbox'
     if @user and params[:display_name] == @user.display_name
@@ -43,13 +55,30 @@ class MessageController < ApplicationController
     end
   end
 
+  # Display the list of messages that the user has sent to other users.
+  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
+
+  # Set the message as being read or unread.
   def mark
     if params[:message_id]
       id = params[:message_id]
       message = Message.find_by_id(id)
-      message.message_read = 1
+      if params[:mark] == 'unread'
+        message_read = 0 
+        mark_type = 'unread'
+      else
+        message_read = 1
+        mark_type = 'read'
+      end
+      message.message_read = message_read
       if message.save
-        flash[:notice] = 'Message marked as read'
+        flash[:notice] = "Message marked as #{mark_type}"
         redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
       end
     end