Fixed merge fail - this branch doesn't have javascript_strings.

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

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index 0fc5f212bdf3705dea3edaf98ddc285ea2d2bfd6..db40cc03f7922b33625eb7ed9f17391e3b86b6a0 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -1,53 +1,129 @@
 class MessageController < ApplicationController
   layout 'site'
 class MessageController < ApplicationController
   layout 'site'

-  #  before_filter :authorize
+

   before_filter :authorize_web
   before_filter :authorize_web

+  before_filter :set_locale

   before_filter :require_user
   before_filter :require_user

+  before_filter :check_database_readable
+  before_filter :check_database_writable, :only => [:new, :reply, :mark]

 
 

+  # 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.
+  # The display_name param is the display name of the user that the message is being sent to.

   def new
   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
-   
-      if message.save
-        flash[:notice] = 'Message sent'
-        redirect_to :controller => 'user', :action => 'view', :display_name => @user.display_name
+    @to_user = User.find_by_display_name(params[:display_name])
+    if @to_user
+      if params[:message]
+        @message = Message.new(params[:message])
+        @message.to_user_id = @to_user.id
+        @message.from_user_id = @user.id
+        @message.sent_on = Time.now.getutc
+
+        if @message.save
+          flash[:notice] = t 'message.new.message_sent'
+          Notifier::deliver_message_notification(@message)
+          redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
+        end

       else
       else

-        @message.errors.add("Sending message failed")
+        if params[:title]
+          # ?title= is set when someone reponds to this user's diary
+          # entry. Then we pre-fill out the subject and the <title>
+          @title = @subject = params[:title]
+        else
+          # The default /message/new/$user view
+          @title = t 'message.new.title'
+        end

       end
       end

-
+    else
+      @title = t'message.no_such_user.title'
+      render :action => 'no_such_user', :status => :not_found

     end
   end
 
     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 = @subject = "Re: #{message.title.sub(/^Re:\s*/, '')}"
+    @to_user = User.find(message.from_user_id)
+    render :action => 'new'
+  rescue ActiveRecord::RecordNotFound
+    @title = t'message.no_such_user.title'
+    render :action => 'no_such_user', :status => :not_found
+  end
+
+  # Show a message

   def read
   def read

-    @title = 'read message'
-    if params[:message_id]
-      id = params[:message_id]
-      @message = Message.find_by_id(id)
-    end
+    @title = t 'message.read.title'
+    @message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ])
+    @message.message_read = true if @message.to_user_id == @user.id
+    @message.save
+  rescue ActiveRecord::RecordNotFound
+    @title = t'message.no_such_user.title'
+    render :action => 'no_such_user', :status => :not_found

   end
 
   end
 

+  # Display the list of messages that have been sent to the user.

   def inbox
   def inbox

+    @title = t 'message.inbox.title'
+    if @user and params[:display_name] == @user.display_name
+    else
+      redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
+    end
+  end
+
+  # Display the list of messages that the user has sent to other users.
+  def outbox
+    @title = t 'message.outbox.title'
+    if @user and params[:display_name] == @user.display_name
+    else
+      redirect_to :controller => 'message', :action => 'outbox', :display_name => @user.display_name
+    end

   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)
   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 = false 
+        notice = t 'message.mark.as_unread'
+      else
+        message_read = true
+        notice = t 'message.mark.as_read'
+      end
+      message.message_read = message_read
+      if message.save
+        flash[:notice] = notice
+        redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
+      end
+    end
+  rescue ActiveRecord::RecordNotFound
+    @title = t'message.no_such_user.title'
+    render :action => 'no_such_user', :status => :not_found
+  end
+
+  # Delete the message.
+  def delete
+    if params[:message_id]
+      id = params[:message_id]
+      message = Message.find_by_id(id)
+      message.from_user_visible = false if message.sender == @user
+      message.to_user_visible = false if message.recipient == @user

       if message.save
       if message.save

-        flash[:notice] = 'Message Marked as read'
-        redirect_to :controller => 'user', :action => 'view', :display_name => @user.display_name
+        flash[:notice] = t 'message.delete.deleted'
+
+        if params[:referer]
+          redirect_to params[:referer]
+        else
+          redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
+        end

       end
     end
       end
     end

+  rescue ActiveRecord::RecordNotFound
+    @title = t'message.no_such_user.title'
+    render :action => 'no_such_user', :status => :not_found

   end
 end
   end
 end