X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8b0e3c15152c58a42b75d92e8a93e02ee2c367b4..373a3b05776bfbfaed1087089289583bc9543798:/app/controllers/user_controller.rb diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 0042be316..bd0c143c0 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -2,19 +2,19 @@ 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 def save @title = 'create account' @user = User.new(params[:user]) - @user.set_defaults if @user.save + token = @user.tokens.create flash[:notice] = "User was successfully created. Check your email for a confirmation note, and you\'ll be mapping in no time :-)
Please note that you won't be able to login until you've received and confirmed your email address." - Notifier::deliver_signup_confirm(@user) + Notifier::deliver_signup_confirm(@user, token) redirect_to :action => 'login' else render :action => 'new' @@ -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 @@ -64,11 +64,10 @@ class UserController < ApplicationController def lost_password @title = 'lost password' if params[:user] and params[:user][:email] - user = User.find_by_email(params['user']['email']) + user = User.find_by_email(params[:user][:email]) if user - user.token = User.make_token - user.save - Notifier::deliver_lost_password(user) + token = user.tokens.create + Notifier::deliver_lost_password(user, token) flash[:notice] = "Sorry you lost it :-( but an email is on its way so you can reset it soon." else flash[:notice] = "Couldn't find that email address, sorry." @@ -81,13 +80,15 @@ class UserController < ApplicationController def reset_password @title = 'reset password' if params['token'] - user = User.find_by_token(params['token']) - if user - pass = User.make_token(8) + token = UserToken.find_by_token(params[:token]) + if token + pass = OSM::make_token(8) + user = token.user user.pass_crypt = pass user.pass_crypt_confirmation = pass user.active = true - user.save + user.save! + token.destroy Notifier::deliver_reset_password(user, pass) flash[:notice] = "Your password has been changed and is on its way to your mailbox :-)" else @@ -104,21 +105,18 @@ 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] - u = User.authenticate(email, pass) - if u - u.token = User.make_token - u.timeout = 1.day.from_now - u.save - session[:token] = u.token + user = User.authenticate(:username => email_or_display_name, :password => pass) + if user + session[:user] = user.id if params[:referer] redirect_to params[:referer] else redirect_to :controller => 'site', :action => 'index' end return - elsif User.authenticate(email, pass, false) + elsif User.authenticate(:username => email_or_display_name, :password => pass, :inactive => true) flash[:notice] = "Sorry, your account is not active yet.
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." @@ -128,14 +126,13 @@ class UserController < ApplicationController def logout if session[:token] - u = User.find_by_token(session[:token]) - if u - u.token = User.make_token - u.timeout = Time.now - u.save + token = UserToken.find_by_token(session[:token]) + if token + token.destroy end + session[:token] = nil end - session[:token] = nil + session[:user] = nil if params[:referer] redirect_to params[:referer] else @@ -144,20 +141,26 @@ class UserController < ApplicationController end def confirm - @user = User.find_by_token(params[:confirm_string]) - if @user && @user.active == 0 + token = UserToken.find_by_token(params[:confirm_string]) + if token and !token.user.active? + @user = token.user @user.active = true - @user.token = User.make_token - @user.timeout = 1.day.from_now - @user.save + @user.save! + token.destroy flash[:notice] = 'Confirmed your account, thanks for signing up!' - session[:token] = @user.token + session[:user] = @user.id redirect_to :action => 'account', :display_name => @user.display_name else flash[:notice] = 'Something went wrong confirming that user.' 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 @@ -172,19 +175,25 @@ class UserController < ApplicationController def view @this_user = User.find_by_display_name(params[:display_name]) - @title = @this_user.display_name + + if @this_user + @title = @this_user.display_name + else + render :nothing => true, :status => :not_found + end 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 @@ -195,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