Merge remote-tracking branch 'upstream/pull/3141'

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

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index dce0099e5b68caeceb12f1f5fa41865d4c3db0b9..dea5c3b075eb41502c9185b4b96d02a3988b0b3c 100644 (file)
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -26,14 +26,15 @@ class MessagesController < ApplicationController
     @message.sender = current_user
     @message.sent_on = Time.now.getutc
 
     @message.sender = current_user
     @message.sent_on = Time.now.getutc
 

-    if current_user.sent_messages.where("sent_on >= ?", Time.now.getutc - 1.hour).count >= MAX_MESSAGES_PER_HOUR
-      flash[:error] = t ".limit_exceeded"
+    if current_user.sent_messages.where("sent_on >= ?", Time.now.getutc - 1.hour).count >= Settings.max_messages_per_hour
+      flash.now[:error] = t ".limit_exceeded"

       render :action => "new"
     elsif @message.save
       flash[:notice] = t ".message_sent"
       render :action => "new"
     elsif @message.save
       flash[:notice] = t ".message_sent"

-      Notifier.message_notification(@message).deliver_later
+      UserMailer.message_notification(@message).deliver_later

       redirect_to :action => :inbox
     else
       redirect_to :action => :inbox
     else

+      @title = t "messages.new.title"

       render :action => "new"
     end
   end
       render :action => "new"
     end
   end


@@ -56,7 +57,7 @@ class MessagesController < ApplicationController
       render :action => "new"
     else
       flash[:notice] = t ".wrong_user", :user => current_user.display_name
       render :action => "new"
     else
       flash[:notice] = t ".wrong_user", :user => current_user.display_name

-      redirect_to :controller => "users", :action => "login", :referer => request.fullpath
+      redirect_to login_path(:referer => request.fullpath)

     end
   rescue ActiveRecord::RecordNotFound
     @title = t "messages.no_such_message.title"
     end
   rescue ActiveRecord::RecordNotFound
     @title = t "messages.no_such_message.title"


@@ -73,7 +74,7 @@ class MessagesController < ApplicationController
       @message.save
     else
       flash[:notice] = t ".wrong_user", :user => current_user.display_name
       @message.save
     else
       flash[:notice] = t ".wrong_user", :user => current_user.display_name

-      redirect_to :controller => "users", :action => "login", :referer => request.fullpath
+      redirect_to login_path(:referer => request.fullpath)

     end
   rescue ActiveRecord::RecordNotFound
     @title = t "messages.no_such_message.title"
     end
   rescue ActiveRecord::RecordNotFound
     @title = t "messages.no_such_message.title"


@@ -119,7 +120,7 @@ class MessagesController < ApplicationController
       flash[:notice] = t ".destroyed"
 
       if params[:referer]
       flash[:notice] = t ".destroyed"
 
       if params[:referer]

-        redirect_to params[:referer]
+        redirect_to safe_referer(params[:referer])

       else
         redirect_to :action => :inbox
       end
       else
         redirect_to :action => :inbox
       end