X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/311f7ddd6e6516232d3884e9765b966190814882..dedd87da28b291db044318c1c114df8266b6c181:/app/controllers/message_controller.rb

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index 79a0b861a..fd638e4e7 100644
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -8,7 +8,7 @@ class MessageController < ApplicationController
   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 
+  # 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.
@@ -17,7 +17,7 @@ class MessageController < ApplicationController
       if @user.sent_messages.where("sent_on >= ?", Time.now.getutc - 1.hour).count >= MAX_MESSAGES_PER_HOUR
         flash[:error] = t 'message.new.limit_exceeded'
       else
-        @message = Message.new(params[:message])
+        @message = Message.new(message_params)
         @message.to_user_id = @this_user.id
         @message.from_user_id = @user.id
         @message.sent_on = Time.now.getutc
@@ -29,14 +29,8 @@ class MessageController < ApplicationController
         end
       end
     else
-      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
+      @message = Message.new(:recipient => @this_user)
+      @title = t 'message.new.title'
     end
   end
 
@@ -45,9 +39,15 @@ class MessageController < ApplicationController
     message = Message.find(params[:message_id])
 
     if message.to_user_id == @user.id then
-      @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)
+      message.update_attribute(:message_read, true)
+
+      @message = Message.new(
+        :recipient => message.sender,
+        :title => "Re: #{message.title.sub(/^Re:\s*/, '')}",
+        :body => "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}",
+      )
+
+      @title = @message.title
 
       render :action => 'new'
     else
@@ -96,23 +96,18 @@ class MessageController < ApplicationController
 
   # Set the message as being read or unread.
   def mark
-    if params[:message_id]
-      id = params[:message_id]
-      @message = Message.where(:id => id).where("to_user_id = ? OR from_user_id = ?", @user.id, @user.id).first
-      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
-        if not request.xhr?
-          flash[:notice] = notice
-          redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
-        end
-      end
+    @message = Message.where("to_user_id = ? OR from_user_id = ?", @user.id, @user.id).find(params[:message_id])
+    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 and not request.xhr?
+      flash[:notice] = notice
+      redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
     end
   rescue ActiveRecord::RecordNotFound
     @title = t'message.no_such_message.title'
@@ -121,23 +116,26 @@ class MessageController < ApplicationController
 
   # Delete the message.
   def delete
-    if params[:message_id]
-      id = params[:message_id]
-      message = Message.where(:id => id).where("to_user_id = ? OR from_user_id = ?", @user.id, @user.id).first
-      message.from_user_visible = false if message.sender == @user
-      message.to_user_visible = false if message.recipient == @user
-      if message.save
-        flash[:notice] = t 'message.delete.deleted'
+    @message = Message.where("to_user_id = ? OR from_user_id = ?", @user.id, @user.id).find(params[:message_id])
+    @message.from_user_visible = false if @message.sender == @user
+    @message.to_user_visible = false if @message.recipient == @user
+    if @message.save and not request.xhr?
+      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
+      if params[:referer]
+        redirect_to params[:referer]
+      else
+        redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
       end
     end
   rescue ActiveRecord::RecordNotFound
     @title = t'message.no_such_message.title'
     render :action => 'no_such_message', :status => :not_found
   end
+private
+  ##
+  # return permitted message parameters
+  def message_params
+    params.require(:message).permit(:title, :body)
+  end
 end