Remove robots.txt block for /user/*/diary

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

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index c6a269a06ac080f3d1d20335eee21c48f1515640..38c9b2f3db05b2594a9fe43a100a1e0b6f3dc6c8 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -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
       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
         @message.to_user_id = @this_user.id
         @message.from_user_id = @user.id
         @message.sent_on = Time.now.getutc


@@ -100,11 +100,9 @@ class MessageController < ApplicationController
       notice = t 'message.mark.as_read'
     end
     @message.message_read = message_read
       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
+    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'
     end
   rescue ActiveRecord::RecordNotFound
     @title = t'message.no_such_message.title'


@@ -113,10 +111,10 @@ class MessageController < ApplicationController
 
   # Delete the message.
   def delete
 
   # Delete the message.
   def delete

-    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
+    @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]
       flash[:notice] = t 'message.delete.deleted'
 
       if params[:referer]


@@ -129,4 +127,10 @@ class MessageController < ApplicationController
     @title = t'message.no_such_message.title'
     render :action => 'no_such_message', :status => :not_found
   end
     @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
 end