X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8bd09c082897d808c4641f94836f5cfa4cbbf95c..a0e8c35c1b3bfba11a755d9f8e282fc0773d953f:/app/controllers/user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 354e8c66f..fd8fff4dc 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -2,8 +2,8 @@ class UserController < ApplicationController
   layout 'site'
 
   before_filter :authorize, :only => [:preferences, :api_details, :api_gpx_files]
-  before_filter :authorize_web, :only => [:edit, :account, :go_public, :view, :diary]
-  before_filter :require_user, :only => [:edit, :set_home, :account, :go_public]
+  before_filter :authorize_web, :only => [:edit, :account, :go_public, :view, :diary, :make_friend]
+  before_filter :require_user, :only => [:edit, :set_home, :account, :go_public, :make_friend]
 
   def save
     @user = User.new(params[:user])
@@ -49,11 +49,11 @@ class UserController < ApplicationController
     @user.data_public = true
     @user.save
     flash[:notice] = 'All your edits are now public'
-    redirect_to :controller => 'user', :action => 'account'
+    redirect_to :controller => 'user', :action => 'account', :display_name => @user.display_name
   end
 
   def lost_password
-    if params['user']['email']
+    if params[:user] and params[:user][:email]
       user = User.find_by_email(params['user']['email'])
       if user
         user.token = User.make_token
@@ -63,6 +63,8 @@ class UserController < ApplicationController
       else
         flash[:notice] = "Couldn't find that email address, sorry."
       end
+    else
+      render :action => 'lost_password'
     end
   end
 
@@ -95,7 +97,11 @@ class UserController < ApplicationController
         u.timeout = 1.day.from_now
         u.save
         session[:token] = u.token
-        redirect_to :controller => 'site', :action => 'index'
+        if params[:next_controller] and params[:next_action]
+          redirect_to :controller => params[:next_controller], :action => params[:next_action]
+        else
+          redirect_to :controller => 'site', :action => 'index'
+        end
         return
       else
         flash[:notice] = "Couldn't log in with those details"
@@ -113,7 +119,11 @@ class UserController < ApplicationController
       end
     end
     session[:token] = nil
-    redirect_to :controller => 'site', :action => 'index'
+    if params[:next_controller] and params[:next_action]
+      redirect_to :controller => params[:next_controller], :action => params[:next_action]
+    else
+      redirect_to :controller => 'site', :action => 'index'
+    end
   end
 
   def confirm
@@ -162,15 +172,25 @@ 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]     
+      name = params[:display_name]
+      friend = Friend.new
+      friend.user_id = @user.id
+      friend.friend_user_id = User.find_by_display_name(name).id 
+      unless @user.is_friends_with?(friend)
+        if friend.save
+          flash[:notice] = "#{name} is now your friend"
+        else
+          friend.add_error("adding a friend failed")
+        end
+      else
+        flash[:notice] = "Your are already friends"  
+      end
+        redirect_to :controller => 'user', :action => 'view'
     end
-    
-    #Send a message to other users - maybe there's a rails messaging plugin
   end
 
 end