X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0a8c26e596b40da6d428a5c91db0d815d13c89e4..15d5997067226af7f0067e0c1899dc0f30f640be:/app/controllers/user_controller.rb?ds=sidebyside

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 5c95de0c9..bd0c143c0 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 => [:api_details, :api_gpx_files]
-  before_filter :authorize_web, :only => [:account, :go_public, :view, :diary, :make_friend]
-  before_filter :require_user, :only => [:set_home, :account, :go_public, :make_friend]
+  before_filter :authorize_web, :only => [:account, :go_public, :view, :diary, :make_friend, :remove_friend, :upload_image]
+  before_filter :require_user, :only => [:set_home, :account, :go_public, :make_friend, :remove_friend, :upload_image]
 
   filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation
 
@@ -33,8 +33,8 @@ class UserController < ApplicationController
         @user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
       end
       @user.description = params[:user][:description]
-      @user.home_lat = home_lat.to_f
-      @user.home_lon = home_lon.to_f
+      @user.home_lat = home_lat
+      @user.home_lon = home_lon
       if @user.save
         flash[:notice] = "User information updated successfully."
       else
@@ -105,9 +105,9 @@ class UserController < ApplicationController
   def login
     @title = 'login'
     if params[:user]
-      email = params[:user][:email]
+      email_or_display_name = params[:user][:email]
       pass = params[:user][:password]
-      user = User.authenticate(:username => email, :password => pass)
+      user = User.authenticate(:username => email_or_display_name, :password => pass)
       if user
         session[:user] = user.id
         if params[:referer]
@@ -116,7 +116,7 @@ class UserController < ApplicationController
           redirect_to :controller => 'site', :action => 'index'
         end
         return
-      elsif User.authenticate(:username => email, :password => pass, :invalid => true)
+      elsif User.authenticate(:username => email_or_display_name, :password => pass, :inactive => true)
         flash[:notice] = "Sorry, your account is not active yet.<br>Please click on the link in the account confirmation email to activate your account."
       else
         flash[:notice] = "Sorry, couldn't log in with those details."
@@ -155,6 +155,12 @@ class UserController < ApplicationController
     end
   end
 
+  def upload_image
+    @user.image = params[:user][:image]
+    @user.save!
+    redirect_to :controller => 'user', :action => 'view', :display_name => @user.display_name
+  end
+
   def api_details
     render :text => @user.to_xml.to_s, :content_type => "text/xml"
   end
@@ -178,15 +184,16 @@ class UserController < ApplicationController
   end
 
   def make_friend
-
     if params[:display_name]     
       name = params[:display_name]
+      new_friend = User.find_by_display_name(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)
+      friend.friend_user_id = new_friend.id
+      unless @user.is_friends_with?(new_friend)
         if friend.save
           flash[:notice] = "#{name} is now your friend."
+          Notifier::deliver_friend_notification(friend)
         else
           friend.add_error("Sorry, failed to add #{name} as a friend.")
         end
@@ -197,5 +204,19 @@ class UserController < ApplicationController
     end
   end
 
+  def remove_friend
+    if params[:display_name]     
+      name = params[:display_name]
+      friend = User.find_by_display_name(name)
+      if @user.is_friends_with?(friend)
+        Friend.delete_all "user_id = #{@user.id} AND friend_user_id = #{friend.id}"
+        flash[:notice] = "#{friend.display_name} was removed from your friends."
+      else
+        flash[:notice] = "#{friend.display_name} was not already one of your friends."
+      end
+      redirect_to :controller => 'user', :action => 'view'
+    end
+  end
+
 end