messaging stuff

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 354e8c66f2ea6b252b53cbd7899589253f98f8c8..6895d0f9cfe7588b4e52d818a8ad2c2c581ae6d4 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -53,7 +53,7 @@ class UserController < ApplicationController
   end
 
   def lost_password
-    if params['user']['email']
+    if params[:user][:email]
       user = User.find_by_email(params['user']['email'])
       if user
         user.token = User.make_token
@@ -162,15 +162,10 @@ class UserController < ApplicationController
   def diary
     @this_user = User.find_by_display_name(params[:display_name])
   end
-  
-  def contact_others(user_id, message_body)
-    @to = User.find_by_id(user_id)
-    @to.messages.new = body
-    if @to.save
-      flash[:notice] = Message sent
+
+  def make_friend
+    if params[:display_name]      
     end
-    
-    #Send a message to other users - maybe there's a rails messaging plugin
   end
 
 end