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
@user = User.new(params[:user])
end
end
- def edit
+ def 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 information updated successfully."
- redirect_to :controller => 'user', :action => 'account'
+ else
+ flash.delete(:notice)
end
end
end
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] = "Your password has been changed and is on its way to your mailbox :-)"
u.timeout = 1.day.from_now
u.save
session[:token] = u.token
- if params[:next_controller] and params[:next_action]
- redirect_to :controller => params[:next_controller], :action => params[:next_action]
+ if params[:referer]
+ redirect_to params[:referer]
else
redirect_to :controller => 'site', :action => 'index'
end
end
end
session[:token] = nil
- if params[:next_controller] and params[:next_action]
- redirect_to :controller => params[:next_controller], :action => params[:next_action]
+ if params[:referer]
+ redirect_to params[:referer]
else
redirect_to :controller => 'site', :action => 'index'
end