class UserController < ApplicationController
layout 'site'
- before_filter :authorize, :only => [:preferences, :api_details, :api_gpx_files]
+ 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]
+ 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 :-)<br>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'
@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
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."
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
if params[:user]
email = 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, :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(:username => email, :password => pass, :invalid => 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."
end
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
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 preferences
- @title = 'preferences'
- if request.get?
- render_text @user.preferences
- elsif request.post? or request.put?
- @user.preferences = request.raw_post
- @user.save!
- render :nothing => true
- else
- render :status => 400, :nothing => true
- end
- end
-
def api_details
- render :text => @user.to_xml.to_s
+ render :text => @user.to_xml.to_s, :content_type => "text/xml"
end
def api_gpx_files
@user.traces.each do |trace|
doc.root << trace.to_xml_node() if trace.public? or trace.user == @user
end
- render :text => doc.to_s
+ render :text => doc.to_s, :content_type => "text/xml"
end
def view
@this_user = User.find_by_display_name(params[:display_name])
- @title = @this_user.display_name
- end
- def diary
- @this_user = User.find_by_display_name(params[:display_name])
- @title = @this_user.display_name + "'s diary"
+ if @this_user
+ @title = @this_user.display_name
+ else
+ render :nothing => true, :status => :not_found
+ end
end
def make_friend
projects / rails.git / blobdiff