X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2afcb4b222b6a5ef11e537e3fb33e7cc7246b966..4ac48d2cb5cd2197d8f2702bdc7b17072b2fdc85:/app/controllers/user_controller.rb diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index cc934fc32..0042be316 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -1,16 +1,19 @@ 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 - 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 @@ -19,6 +22,7 @@ class UserController < ApplicationController end 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] @@ -58,6 +62,7 @@ class UserController < ApplicationController end def lost_password + @title = 'lost password' if params[:user] and params[:user][:email] user = User.find_by_email(params['user']['email']) if user @@ -74,6 +79,7 @@ class UserController < ApplicationController end def reset_password + @title = 'reset password' if params['token'] user = User.find_by_token(params['token']) if user @@ -92,9 +98,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] @@ -110,6 +118,8 @@ class UserController < ApplicationController 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] = "Sorry, couldn't log in with those details." end @@ -137,31 +147,19 @@ class UserController < ApplicationController @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.' end end - def 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 @@ -169,15 +167,12 @@ class UserController < ApplicationController @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]) - end - - def diary - @this_user = User.find_by_display_name(params[:display_name]) + @title = @this_user.display_name end def make_friend @@ -196,7 +191,7 @@ class UserController < ApplicationController else flash[:notice] = "You are already friends with #{name}." end - redirect_to :controller => 'user', :action => 'view' + redirect_to :controller => 'user', :action => 'view' end end