X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f0f111aced146d78b4c31a6175c0150bc6497c50..7253c38234f44d65f8d70f8fcad36e0035e841e4:/app/controllers/message_controller.rb

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index 155e619d7..6c7be5e0f 100644
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -10,26 +10,34 @@ class MessageController < ApplicationController
   # 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 user_id param is the id of the user that the message is being sent to.
+  # The display_name param is the display name of the user that the message is being sent to.
   def new
-    @title = t 'message.new.title'
-    @to_user = User.find(params[:user_id])
-    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
+    @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
+        if params[:title]
+          # ?title= is set when someone reponds to this user's diary entry
+          @title = params[:title]
+        else
+          # The default /message/new/$user view
+          @title = t 'message.new.title'
+        end
       end
     else
-      @title = params[:title]
+      @title = t'message.no_such_user.title'
+      render :action => 'no_such_user', :status => :not_found
     end
-  rescue ActiveRecord::RecordNotFound
-    render :action => 'no_such_user', :status => :not_found
   end
 
   # Allow the user to reply to another message.
@@ -40,6 +48,7 @@ class MessageController < ApplicationController
     @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
 
@@ -50,6 +59,7 @@ class MessageController < ApplicationController
     @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
 
@@ -90,6 +100,7 @@ class MessageController < ApplicationController
       end
     end
   rescue ActiveRecord::RecordNotFound
+    @title = t'message.no_such_user.title'
     render :action => 'no_such_user', :status => :not_found
   end
 end