Make the text direction style come before the screen size style

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

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index 18b286973cc0513f3bec72c8d9d78b1ca961bb81..6e0c717b527600c02d208f0d12517e1275dabb79 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -15,8 +15,8 @@ class MessageController < ApplicationController
     @to_user = User.find_by_display_name(params[:display_name])
     if @to_user
       if params[:message]
     @to_user = User.find_by_display_name(params[:display_name])
     if @to_user
       if params[:message]

-        if @user.sent_messages.count(:conditions => ["sent_on >= ?", Time.now.getutc - 1.hour]) >= APP_CONFIG['max_messages_per_hour']
-          flash[:notice] = t 'message.new.limit_exceeded'
+        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.to_user_id = @to_user.id
         else
           @message = Message.new(params[:message])
           @message.to_user_id = @to_user.id


@@ -25,7 +25,7 @@ class MessageController < ApplicationController
 
           if @message.save
             flash[:notice] = t 'message.new.message_sent'
 
           if @message.save
             flash[:notice] = t 'message.new.message_sent'

-            Notifier::deliver_message_notification(@message)
+            Notifier.message_notification(@message).deliver

             redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
           end
         end
             redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
           end
         end


@@ -47,25 +47,38 @@ class MessageController < ApplicationController
 
   # Allow the user to reply to another message.
   def reply
 
   # 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'
+    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)
+
+      render :action => 'new'
+    else
+      flash[:notice] = t 'message.reply.wrong_user', :user => @user.display_name
+      redirect_to :controller => "user", :action => "login", :referer => request.fullpath
+    end

   rescue ActiveRecord::RecordNotFound
   rescue ActiveRecord::RecordNotFound

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

   end
 
   # Show a message
   def read
     @title = t 'message.read.title'
   end
 
   # Show a message
   def read
     @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
+    @message = Message.find(params[:message_id])
+
+    if @message.to_user_id == @user.id or @message.from_user_id == @user.id then
+      @message.message_read = true if @message.to_user_id == @user.id
+      @message.save
+    else
+      flash[:notice] = t 'message.read.wrong_user', :user => @user.display_name
+      redirect_to :controller => "user", :action => "login", :referer => request.fullpath
+    end

   rescue ActiveRecord::RecordNotFound
   rescue ActiveRecord::RecordNotFound

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

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


@@ -90,7 +103,7 @@ class MessageController < ApplicationController
   def mark
     if params[:message_id]
       id = params[:message_id]
   def mark
     if params[:message_id]
       id = params[:message_id]

-      message = Message.find_by_id(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'
       if params[:mark] == 'unread'
         message_read = false 
         notice = t 'message.mark.as_unread'


@@ -100,20 +113,28 @@ class MessageController < ApplicationController
       end
       message.message_read = message_read
       if message.save
       end
       message.message_read = message_read
       if message.save

-        flash[:notice] = notice
-        redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
+        if request.xhr?
+          render :update do |page|
+            page.replace "inboxanchor", :partial => "layouts/inbox"
+            page.replace "inbox-count", :partial => "message_count"
+            page.replace "inbox-#{message.id}", :partial => "message_summary", :object => message
+          end
+        else
+          flash[:notice] = notice
+          redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
+        end

       end
     end
   rescue ActiveRecord::RecordNotFound
       end
     end
   rescue ActiveRecord::RecordNotFound

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

   end
 
   # Delete the message.
   def delete
     if params[:message_id]
       id = params[:message_id]
   end
 
   # Delete the message.
   def delete
     if params[:message_id]
       id = params[:message_id]

-      message = Message.find_by_id(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
       message.from_user_visible = false if message.sender == @user
       message.to_user_visible = false if message.recipient == @user
       if message.save


@@ -127,7 +148,7 @@ class MessageController < ApplicationController
       end
     end
   rescue ActiveRecord::RecordNotFound
       end
     end
   rescue ActiveRecord::RecordNotFound

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

   end
 end
   end
 end