X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/078301a780ebb9e624cf11d2f5d2d2b72ce03e78..e6af088dda8e85f53b11ffbaddb11edf08e4a046:/app/controllers/message_controller.rb

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index c266582f5..e9ad1968c 100644
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -5,21 +5,54 @@ class MessageController < ApplicationController
   before_filter :require_user
 
   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 = User.find_by_display_name(params[:display_name]).id
+      message.to_user_id = params[:user_id]
+      message.from_display_name = to_user.display_name
       message.from_user_id = @user.id
       message.sent_on = Time.now
+   
       if message.save
         flash[:notice] = 'Message sent'
+        redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
       else
         @message.errors.add("Sending message failed")
       end
-      
-   end
+
+    end
+  end
+
+  def read
+    @title = 'read message'
+    if params[:message_id]
+      id = params[:message_id]
+      @message = Message.find_by_id(id)
+    end
+  end
+
+  def inbox
+    @title = 'inbox'
+    if @user and params[:display_name] == @user.display_name
+    else
+      redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
+    end
+  end
+
+  def mark
+    if params[:message_id]
+      id = params[:message_id]
+      message = Message.find_by_id(id)
+      message.message_read = 1
+      if message.save
+        flash[:notice] = 'Message marked as read'
+        redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
+      end
+    end
   end
 end