X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/461bf3802df857c51a4ba8bc08bd311418cf72ed..9b5f875a15b18459c705d93574786069252201e9:/app/controllers/user_controller.rb diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index cf1a176f1..b1a37872b 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -2,15 +2,16 @@ 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, :make_friend] - before_filter :require_user, :only => [:edit, :set_home, :account, :go_public, :make_friend] + before_filter :authorize_web, :only => [:account, :go_public, :view, :diary, :make_friend] + before_filter :require_user, :only => [:set_home, :account, :go_public, :make_friend] def save + @title = 'create account' @user = User.new(params[:user]) @user.set_defaults if @user.save - flash[:notice] = 'User was successfully created. Check your email for a confirmation note, and you\'ll be mapping in no time :-)' + 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) redirect_to :action => 'login' else @@ -18,18 +19,24 @@ class UserController < ApplicationController end end - def edit + def account + @title = 'edit account' if params[:user] and params[:user][:display_name] and params[:user][:description] home_lat = params[:user][:home_lat] home_lon = params[:user][:home_lon] @user.display_name = params[:user][:display_name] + if params[:user][:pass_crypt].length > 0 or params[:user][:pass_crypt_confirmation].length > 0 + @user.pass_crypt = params[:user][:pass_crypt] + @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 if @user.save - flash[:notice] = "User edited OK." - redirect_to :controller => 'user', :action => 'account' + flash[:notice] = "User information updated successfully." + else + flash.delete(:notice) end end end @@ -39,7 +46,7 @@ class UserController < ApplicationController @user.home_lat = params[:user][:home_lat].to_f @user.home_lon = params[:user][:home_lon].to_f if @user.save - flash[:notice] = "User home saved." + flash[:notice] = "Home location saved successfully." redirect_to :controller => 'user', :action => 'account' end end @@ -48,18 +55,19 @@ class UserController < ApplicationController def go_public @user.data_public = true @user.save - flash[:notice] = 'All your edits are now public' + flash[:notice] = 'All your edits are now public.' redirect_to :controller => 'user', :action => 'account', :display_name => @user.display_name end def lost_password + @title = 'lost password' if params[:user] and 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) - flash[:notice] = "Sorry you lost it :-( but an email is on it's way so you can reset it soon." + 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." end @@ -69,14 +77,17 @@ class UserController < ApplicationController end def reset_password + @title = 'reset password' if params['token'] user = User.find_by_token(params['token']) if user pass = User.make_token(8) user.pass_crypt = pass + user.pass_crypt_confirmation = pass + user.active = true user.save Notifier::deliver_reset_password(user, pass) - flash[:notice] = "You're password has been changed and is on the way to your mailbox :-)" + flash[:notice] = "Your password has been changed and is on its way to your mailbox :-)" else flash[:notice] = "Didn't find that token, check the URL maybe?" end @@ -85,9 +96,11 @@ class UserController < ApplicationController end def new + @title = 'create account' end def login + @title = 'login' if params[:user] email = params[:user][:email] pass = params[:user][:password] @@ -97,10 +110,16 @@ class UserController < ApplicationController u.timeout = 1.day.from_now u.save session[:token] = u.token - redirect_to :controller => 'site', :action => 'index' + if params[:referer] + redirect_to params[:referer] + else + redirect_to :controller => 'site', :action => 'index' + end return + elsif User.authenticate(email, pass, false) + 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] = "Couldn't log in with those details" + flash[:notice] = "Sorry, couldn't log in with those details." end end end @@ -115,25 +134,30 @@ class UserController < ApplicationController end end session[:token] = nil - redirect_to :controller => 'site', :action => 'index' + if params[:referer] + redirect_to params[:referer] + else + redirect_to :controller => 'site', :action => 'index' + end end def confirm @user = User.find_by_token(params[:confirm_string]) if @user && @user.active == 0 @user.active = true + @user.token = User.make_token + @user.timeout = 1.day.from_now @user.save flash[:notice] = 'Confirmed your account, thanks for signing up!' - - #FIXME: login the person magically - - redirect_to :action => 'login' + session[:token] = @user.token + redirect_to :action => 'account', :display_name => @user.display_name else - flash[:notice] = 'Something went wrong confirming that user' + flash[:notice] = 'Something went wrong confirming that user.' end end def preferences + @title = 'preferences' if request.get? render_text @user.preferences elsif request.post? or request.put? @@ -159,10 +183,7 @@ class UserController < ApplicationController def view @this_user = User.find_by_display_name(params[:display_name]) - end - - def diary - @this_user = User.find_by_display_name(params[:display_name]) + @title = @this_user.display_name end def make_friend @@ -174,14 +195,14 @@ class UserController < ApplicationController 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" + flash[:notice] = "#{name} is now your friend." else - friend.add_error("adding a friend failed") + friend.add_error("Sorry, failed to add #{name} as a friend.") end else - flash[:notice] = "Your are already friends" + flash[:notice] = "You are already friends with #{name}." end - redirect_to :controller => 'user', :action => 'view' + redirect_to :controller => 'user', :action => 'view' end end