class UserController < ApplicationController
layout "site", :except => [:api_details]
- skip_before_action :verify_authenticity_token, :only => [:api_read, :api_details, :api_gpx_files, :auth_success]
+ skip_before_action :verify_authenticity_token, :only => [:api_read, :api_users, :api_details, :api_gpx_files, :auth_success]
before_action :disable_terms_redirect, :only => [:terms, :save, :logout, :api_details]
before_action :authorize, :only => [:api_details, :api_gpx_files]
- before_action :authorize_web, :except => [:api_read, :api_details, :api_gpx_files]
- before_action :set_locale, :except => [:api_read, :api_details, :api_gpx_files]
+ before_action :authorize_web, :except => [:api_read, :api_users, :api_details, :api_gpx_files]
+ before_action :set_locale, :except => [:api_read, :api_users, :api_details, :api_gpx_files]
before_action :require_user, :only => [:account, :go_public, :make_friend, :remove_friend]
before_action :require_self, :only => [:account]
- before_action :check_database_readable, :except => [:login, :api_read, :api_details, :api_gpx_files]
+ before_action :check_database_readable, :except => [:login, :api_read, :api_users, :api_details, :api_gpx_files]
before_action :check_database_writable, :only => [:new, :account, :confirm, :confirm_email, :lost_password, :reset_password, :go_public, :make_friend, :remove_friend]
- before_action :check_api_readable, :only => [:api_read, :api_details, :api_gpx_files]
+ before_action :check_api_readable, :only => [:api_read, :api_users, :api_details, :api_gpx_files]
before_action :require_allow_read_prefs, :only => [:api_details]
before_action :require_allow_read_gpx, :only => [:api_gpx_files]
before_action :require_cookies, :only => [:new, :login, :confirm]
before_action :require_administrator, :only => [:set_status, :delete, :list]
- around_action :api_call_handle_error, :only => [:api_read, :api_details, :api_gpx_files]
+ around_action :api_call_handle_error, :only => [:api_read, :api_users, :api_details, :api_gpx_files]
before_action :lookup_user_by_id, :only => [:api_read]
before_action :lookup_user_by_name, :only => [:set_status, :delete]
+ before_action :allow_thirdparty_images, :only => [:view, :account]
def terms
@legale = params[:legale] || OSM.ip_to_country(request.remote_ip) || DEFAULT_LEGALE
if current_user
current_user.terms_seen = true
- if current_user.save
- flash[:notice] = t("user.new.terms declined", :url => t("user.new.terms declined url")).html_safe
- end
+ flash[:notice] = t("user.new.terms declined", :url => t("user.new.terms declined url")).html_safe if current_user.save
if params[:referer]
redirect_to params[:referer]
end
def account
- @title = t "user.account.title"
@tokens = current_user.oauth_tokens.authorized
if params[:user] && params[:user][:display_name] && params[:user][:description]
current_user.errors.add(attribute, error)
end
end
+ @title = t "user.account.title"
end
def go_public
@title = t "user.new.title"
@referer = params[:referer] || session[:referer]
+ append_content_security_policy_directives(
+ :form_action => %w[accounts.google.com *.facebook.com login.live.com github.com meta.wikimedia.org]
+ )
+
if current_user
# The user is logged in already, so don't show them the signup
# page, instead send them to the home page
end
def api_read
- if @this_user.visible?
+ if @user.visible?
render :action => :api_read, :content_type => "text/xml"
else
head :gone
end
def api_details
- @this_user = current_user
+ @user = current_user
render :action => :api_read, :content_type => "text/xml"
end
+ def api_users
+ raise OSM::APIBadUserInput, "The parameter users is required, and must be of the form users=id[,id[,id...]]" unless params["users"]
+
+ ids = params["users"].split(",").collect(&:to_i)
+
+ raise OSM::APIBadUserInput, "No users were given to search for" if ids.empty?
+
+ @users = User.visible.find(ids)
+
+ render :action => :api_users, :content_type => "text/xml"
+ end
+
def api_gpx_files
doc = OSM::API.new.get_xml_doc
current_user.traces.reload.each do |trace|
end
def view
- @this_user = User.find_by(:display_name => params[:display_name])
+ @user = User.find_by(:display_name => params[:display_name])
- if @this_user &&
- (@this_user.visible? || (current_user && current_user.administrator?))
- @title = @this_user.display_name
+ if @user &&
+ (@user.visible? || (current_user && current_user.administrator?))
+ @title = @user.display_name
else
render_unknown_user params[:display_name]
end
if @new_friend
if request.post?
friend = Friend.new
- friend.user_id = current_user.id
- friend.friend_user_id = @new_friend.id
+ friend.befriender = current_user
+ friend.befriendee = @new_friend
if current_user.is_friends_with?(@new_friend)
flash[:warning] = t "user.make_friend.already_a_friend", :name => @new_friend.display_name
elsif friend.save
##
# sets a user's status
def set_status
- @this_user.status = params[:status]
- @this_user.save
+ @user.status = params[:status]
+ @user.save
redirect_to :action => "view", :display_name => params[:display_name]
end
##
# delete a user, marking them as deleted and removing personal data
def delete
- @this_user.delete
+ @user.delete
redirect_to :action => "view", :display_name => params[:display_name]
end
session[:new_user].auth_provider = provider
session[:new_user].auth_uid = uid
- if email_verified && email == session[:new_user].email
- session[:new_user].status = "active"
- end
+ session[:new_user].status = "active" if email_verified && email == session[:new_user].email
redirect_to :action => "terms"
else
end
if user.save
- set_locale
+ set_locale(true)
if user.new_email.blank? || user.new_email == user.email
flash.now[:notice] = t "user.account.flash update success"
end
##
- # ensure that there is a "this_user" instance variable
+ # ensure that there is a "user" instance variable
def lookup_user_by_id
- @this_user = User.find(params[:id])
+ @user = User.find(params[:id])
end
##
- # ensure that there is a "this_user" instance variable
+ # ensure that there is a "user" instance variable
def lookup_user_by_name
- @this_user = User.find_by(:display_name => params[:display_name])
+ @user = User.find_by(:display_name => params[:display_name])
rescue ActiveRecord::RecordNotFound
- redirect_to :action => "view", :display_name => params[:display_name] unless @this_user
+ redirect_to :action => "view", :display_name => params[:display_name] unless @user
end
##
projects / rails.git / blobdiff