More warning fixes.

[rails.git] / app / controllers / message_controller.rb

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index a712931c554f8343a74d1e17e8d281100c126501..85c0ac328f2fc0349bd733518f51dd343410a825 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -7,33 +7,38 @@ class MessageController < ApplicationController
   def new
     @title = 'send message'
     if params[:message]
   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_display_name = to_user.display_name
-      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'
         flash[:notice] = 'Message sent'

+        Notifier::deliver_message_notification(@message)

         redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
         redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name

-      else
-        @message.errors.add("Sending message failed")

       end
       end

-
+    else
+      @title = params[:title]

     end
   end
 
     end
   end
 

+  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
+

   def read
     @title = 'read 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
 
   def inbox
   end
 
   def inbox


@@ -44,13 +49,28 @@ class MessageController < ApplicationController
     end
   end
 
     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]
       message = Message.find_by_id(id)
   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
       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
         redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
       end
     end