Simplify margins when showing diary entries

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

diff --git a/app/controllers/friendships_controller.rb b/app/controllers/friendships_controller.rb
index 034173e61ea222201676e8ad1348294ce9a8879a..93dffb4a366f6d3965aca3614147a57e54f65260 100644 (file)
--- a/app/controllers/friendships_controller.rb
+++ b/app/controllers/friendships_controller.rb
@@ -19,18 +19,18 @@ class FriendshipsController < ApplicationController
         friendship.befriendee = @new_friend
         if current_user.is_friends_with?(@new_friend)
           flash[:warning] = t "friendships.make_friend.already_a_friend", :name => @new_friend.display_name
         friendship.befriendee = @new_friend
         if current_user.is_friends_with?(@new_friend)
           flash[:warning] = t "friendships.make_friend.already_a_friend", :name => @new_friend.display_name

+        elsif current_user.friendships.where("created_at >= ?", Time.now.getutc - 1.hour).count >= current_user.max_friends_per_hour
+          flash.now[:error] = t "friendships.make_friend.limit_exceeded"

         elsif friendship.save
           flash[:notice] = t "friendships.make_friend.success", :name => @new_friend.display_name
         elsif friendship.save
           flash[:notice] = t "friendships.make_friend.success", :name => @new_friend.display_name

-          Notifier.friend_notification(friendship).deliver_later
+          UserMailer.friendship_notification(friendship).deliver_later

         else
           friendship.add_error(t("friendships.make_friend.failed", :name => @new_friend.display_name))
         end
 
         else
           friendship.add_error(t("friendships.make_friend.failed", :name => @new_friend.display_name))
         end
 

-        if params[:referer]
-          redirect_to params[:referer]
-        else
-          redirect_to user_path
-        end
+        referer = safe_referer(params[:referer]) if params[:referer]
+
+        redirect_to referer || user_path

       end
     else
       render_unknown_user params[:display_name]
       end
     else
       render_unknown_user params[:display_name]


@@ -49,11 +49,9 @@ class FriendshipsController < ApplicationController
           flash[:error] = t "friendships.remove_friend.not_a_friend", :name => @friend.display_name
         end
 
           flash[:error] = t "friendships.remove_friend.not_a_friend", :name => @friend.display_name
         end
 

-        if params[:referer]
-          redirect_to params[:referer]
-        else
-          redirect_to user_path
-        end
+        referer = safe_referer(params[:referer]) if params[:referer]
+
+        redirect_to referer || user_path

       end
     else
       render_unknown_user params[:display_name]
       end
     else
       render_unknown_user params[:display_name]