Revert Potlatch 0.10 from the trunk - we will keep it on the potlatch_010

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

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index 8521d76b3f5cf326604aac6b634e84ab1b411379..85c0ac328f2fc0349bd733518f51dd343410a825 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -14,15 +14,28 @@ class MessageController < ApplicationController
    
       if @message.save
         flash[:notice] = 'Message sent'
    
       if @message.save
         flash[:notice] = 'Message sent'

+        Notifier::deliver_message_notification(@message)

         redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
       end
         redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
       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'

-    @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
     @message.save
   rescue ActiveRecord::RecordNotFound
     render :nothing => true, :status => :not_found


@@ -36,6 +49,14 @@ 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]
   def mark
     if params[:message_id]
       id = params[:message_id]