X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4769eec5aab27cdb0ae6ac1b7bb713da720feb93..ef40b61ff40881966ae4280cfdcb9f92965e9d10:/app/controllers/user_controller.rb diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index fd8fff4dc..df6ca164c 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -1,35 +1,75 @@ class UserController < ApplicationController - layout 'site' + layout 'site', :except => :api_details - 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, :only => [:api_details, :api_gpx_files] + before_filter :authorize_web, :except => [:api_details, :api_gpx_files] + before_filter :set_locale, :except => [:api_details, :api_gpx_files] + before_filter :require_user, :only => [:set_home, :account, :go_public, :make_friend, :remove_friend, :upload_image, :delete_image] + before_filter :check_database_readable, :except => [:api_details, :api_gpx_files] + before_filter :check_database_writable, :only => [:login, :new, :set_home, :account, :go_public, :make_friend, :remove_friend, :upload_image, :delete_image] + before_filter :check_api_readable, :only => [:api_details, :api_gpx_files] + before_filter :require_allow_read_prefs, :only => [:api_details] + before_filter :require_allow_read_gpx, :only => [:api_gpx_files] + before_filter :require_cookies, :only => [:login, :confirm] + before_filter :require_administrator, :only => [:activate, :deactivate, :hide, :unhide, :delete] + before_filter :lookup_this_user, :only => [:activate, :deactivate, :hide, :unhide, :delete] + + filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation def save - @user = User.new(params[:user]) - @user.set_defaults + @title = t 'user.new.title' - if @user.save - flash[:notice] = 'User was successfully created. Check your email for a confirmation note, and you\'ll be mapping in no time :-)' - Notifier::deliver_signup_confirm(@user) - redirect_to :action => 'login' - else + if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"}) render :action => 'new' + else + @user = User.new(params[:user]) + + @user.visible = true + @user.data_public = true + @user.description = "" if @user.description.nil? + @user.creation_ip = request.remote_ip + @user.languages = request.user_preferred_languages + + if @user.save + flash[:notice] = t 'user.new.flash create success message' + Notifier.deliver_signup_confirm(@user, @user.tokens.create(:referer => params[:referer])) + redirect_to :action => 'login' + else + render :action => 'new' + end end end - def edit + def account + @title = t 'user.account.title' + @tokens = @user.oauth_tokens.find :all, :conditions => 'oauth_tokens.invalidated_at is null and oauth_tokens.authorized_at is not null' + if params[:user] and params[:user][:display_name] and params[:user][:description] - home_lat = params[:user][:home_lat] - home_lon = params[:user][:home_lon] + if params[:user][:email] != @user.email + @user.new_email = params[:user][:email] + end @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 + @user.languages = params[:user][:languages].split(",") + @user.home_lat = params[:user][:home_lat] + @user.home_lon = params[:user][:home_lon] + if @user.save - flash[:notice] = "User edited OK." - redirect_to :controller => 'user', :action => 'account' + set_locale + + if params[:user][:email] == @user.new_email + flash[:notice] = t 'user.account.flash update success confirm needed' + Notifier.deliver_email_confirm(@user, @user.tokens.create) + else + flash[:notice] = t 'user.account.flash update success' + end end end end @@ -39,7 +79,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] = t 'user.set_home.flash success' redirect_to :controller => 'user', :action => 'account' end end @@ -48,113 +88,164 @@ class UserController < ApplicationController def go_public @user.data_public = true @user.save - flash[:notice] = 'All your edits are now public' + flash[:notice] = t 'user.go_public.flash success' redirect_to :controller => 'user', :action => 'account', :display_name => @user.display_name end def lost_password + @title = t 'user.lost_password.title' + if params[:user] and params[:user][:email] - user = User.find_by_email(params['user']['email']) + user = User.find_by_email(params[:user][:email], :conditions => {:visible => true}) + 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." + token = user.tokens.create + Notifier.deliver_lost_password(user, token) + @notice = t 'user.lost_password.notice email on way' else - flash[:notice] = "Couldn't find that email address, sorry." + @notice = t 'user.lost_password.notice email cannot find' end - else - render :action => 'lost_password' end end def reset_password - if params['token'] - user = User.find_by_token(params['token']) - if user - pass = User.make_token(8) - user.pass_crypt = pass - user.save - Notifier::deliver_reset_password(user, pass) - flash[:notice] = "You're password has been changed and is on the way to your mailbox :-)" + @title = t 'user.reset_password.title' + + if params[:token] + token = UserToken.find_by_token(params[:token]) + + if token + @user = token.user + + if params[:user] + @user.pass_crypt = params[:user][:pass_crypt] + @user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation] + @user.active = true + @user.email_valid = true + + if @user.save + token.destroy + flash[:notice] = t 'user.reset_password.flash changed' + redirect_to :action => 'login' + end + end else - flash[:notice] = "Didn't find that token, check the URL maybe?" + flash[:notice] = t 'user.reset_password.flash token bad' + redirect_to :action => 'lost_password' end end - redirect_to :action => 'login' end def new + @title = t 'user.new.title' + + # The user is logged in already, so don't show them the signup page, instead + # send them to the home page + redirect_to :controller => 'site', :action => 'index' if session[:user] end def login - if params[:user] - email = params[:user][:email] + if params[:user] and session[:user].nil? + 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 - if params[:next_controller] and params[:next_action] - redirect_to :controller => params[:next_controller], :action => params[:next_action] - else - redirect_to :controller => 'site', :action => 'index' - end - return + user = User.authenticate(:username => email_or_display_name, :password => pass) + if user + session[:user] = user.id + elsif User.authenticate(:username => email_or_display_name, :password => pass, :inactive => true) + @notice = t 'user.login.account not active' else - flash[:notice] = "Couldn't log in with those details" + @notice = t 'user.login.auth failure' end end + + if session[:user] + # The user is logged in, if the referer param exists, redirect them to that + # unless they've also got a block on them, in which case redirect them to + # the block so they can clear it. + user = User.find(session[:user]) + block = user.blocked_on_view + if block + redirect_to block, :referrer => params[:referrer] + elsif params[:referer] + redirect_to params[:referer] + else + redirect_to :controller => 'site', :action => 'index' + end + return + end + + @title = t 'user.login.title' 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 - if params[:next_controller] and params[:next_action] - redirect_to :controller => params[:next_controller], :action => params[:next_action] + session[:user] = nil + 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.save - flash[:notice] = 'Confirmed your account, thanks for signing up!' - - #FIXME: login the person magically - - redirect_to :action => 'login' - else - flash[:notice] = 'Something went wrong confirming that user' + if params[:confirm_action] + token = UserToken.find_by_token(params[:confirm_string]) + if token and !token.user.active? + @user = token.user + @user.active = true + @user.email_valid = true + @user.save! + referer = token.referer + token.destroy + flash[:notice] = t 'user.confirm.success' + session[:user] = @user.id + unless referer.nil? + redirect_to referer + else + redirect_to :action => 'account', :display_name => @user.display_name + end + else + @notice = t 'user.confirm.failure' + end 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 + def confirm_email + if params[:confirm_action] + token = UserToken.find_by_token(params[:confirm_string]) + if token and token.user.new_email? + @user = token.user + @user.email = @user.new_email + @user.new_email = nil + @user.active = true + @user.email_valid = true + @user.save! + token.destroy + flash[:notice] = t 'user.confirm_email.success' + session[:user] = @user.id + redirect_to :action => 'account', :display_name => @user.display_name + else + @notice = t 'user.confirm_email.failure' + end end end - def api_details - render :text => @user.to_xml.to_s + def upload_image + @user.image = params[:user][:image] + @user.save! + redirect_to :controller => 'user', :action => 'view', :display_name => @user.display_name + end + + def delete_image + @user.image = nil + @user.save! + redirect_to :controller => 'user', :action => 'view', :display_name => @user.display_name end def api_gpx_files @@ -162,36 +253,109 @@ 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]) + if @this_user and + (@this_user.visible? or (@user and @user.administrator?)) + @title = @this_user.display_name + else + @title = t 'user.no_such_user.title' + @not_found_user = params[:display_name] + render :action => 'no_such_user', :status => :not_found + end end def make_friend - - if params[:display_name] + if params[:display_name] name = params[:display_name] + new_friend = User.find_by_display_name(name, :conditions => {:visible => true}) 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" + flash[:notice] = t 'user.make_friend.success', :name => name + Notifier.deliver_friend_notification(friend) else - friend.add_error("adding a friend failed") + friend.add_error(t('user.make_friend.failed', :name => name)) end else - flash[:notice] = "Your are already friends" + flash[:notice] = t 'user.make_friend.already_a_friend', :name => name end - redirect_to :controller => 'user', :action => 'view' + + redirect_to :controller => 'user', :action => 'view' end end -end + def remove_friend + if params[:display_name] + name = params[:display_name] + friend = User.find_by_display_name(name, :conditions => {:visible => true}) + if @user.is_friends_with?(friend) + Friend.delete_all "user_id = #{@user.id} AND friend_user_id = #{friend.id}" + flash[:notice] = t 'user.remove_friend.success', :name => friend.display_name + else + flash[:notice] = t 'user.remove_friend.not_a_friend', :name => friend.display_name + end + + redirect_to :controller => 'user', :action => 'view' + end + end + + ## + # activate a user, allowing them to log in + def activate + @this_user.update_attributes(:active => true) + redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] + end + + ## + # deactivate a user, preventing them from logging in + def deactivate + @this_user.update_attributes(:active => false) + redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] + end + + ## + # hide a user, marking them as logically deleted + def hide + @this_user.update_attributes(:visible => false) + redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] + end + ## + # unhide a user, clearing the logically deleted flag + def unhide + @this_user.update_attributes(:visible => true) + redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] + end + + ## + # delete a user, marking them as deleted and removing personal data + def delete + @this_user.delete + redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] + end +private + ## + # require that the user is a administrator, or fill out a helpful error message + # and return them to the user page. + def require_administrator + unless @user.administrator? + flash[:notice] = t('user.filter.not_an_administrator') + redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] + end + end + + ## + # ensure that there is a "this_user" instance variable + def lookup_this_user + @this_user = User.find_by_display_name(params[:display_name]) + rescue ActiveRecord::RecordNotFound + redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] unless @this_user + end +end