authorize_resource
before_action :require_self, :only => [:account]
- before_action :check_database_writable, :only => [:new, :account, :confirm, :confirm_email, :lost_password, :reset_password, :go_public, :make_friend, :remove_friend]
+ before_action :check_database_writable, :only => [:new, :account, :confirm, :confirm_email, :lost_password, :reset_password, :go_public]
before_action :require_cookies, :only => [:new, :login, :confirm]
before_action :lookup_user_by_name, :only => [:set_status, :delete]
before_action :allow_thirdparty_images, :only => [:show, :account]
def save
@title = t "users.new.title"
- if params[:decline]
+ if params[:decline] || !(params[:read_tou] && params[:read_ct])
if current_user
current_user.terms_seen = true
else
redirect_to :action => :account, :display_name => current_user.display_name
end
- else
+ elsif params[:decline]
redirect_to t("users.terms.declined")
+ else
+ redirect_to :action => :terms
end
elsif current_user
unless current_user.terms_agreed?
current_user.consider_pd = params[:user][:consider_pd]
+ current_user.tou_agreed = Time.now.getutc
current_user.terms_agreed = Time.now.getutc
current_user.terms_seen = true
current_user.creation_ip = request.remote_ip
current_user.languages = http_accept_language.user_preferred_languages
current_user.terms_agreed = Time.now.getutc
+ current_user.tou_agreed = Time.now.getutc
current_user.terms_seen = true
if current_user.auth_uid.blank?
def logout
@title = t "users.logout.title"
- if params[:session] == session.id
+ if request.post?
if session[:token]
token = UserToken.find_by(:token => session[:token])
token&.destroy
@user = User.find_by(:display_name => params[:display_name])
if @user &&
- (@user.visible? || (current_user&.administrator?))
+ (@user.visible? || current_user&.administrator?)
@title = @user.display_name
else
render_unknown_user params[:display_name]
end
end
- def make_friend
- @new_friend = User.find_by(:display_name => params[:display_name])
-
- if @new_friend
- if request.post?
- friend = Friend.new
- friend.befriender = current_user
- friend.befriendee = @new_friend
- if current_user.is_friends_with?(@new_friend)
- flash[:warning] = t "users.make_friend.already_a_friend", :name => @new_friend.display_name
- elsif friend.save
- flash[:notice] = t "users.make_friend.success", :name => @new_friend.display_name
- Notifier.friend_notification(friend).deliver_later
- else
- friend.add_error(t("users.make_friend.failed", :name => @new_friend.display_name))
- end
-
- if params[:referer]
- redirect_to params[:referer]
- else
- redirect_to :action => "show"
- end
- end
- else
- render_unknown_user params[:display_name]
- end
- end
-
- def remove_friend
- @friend = User.find_by(:display_name => params[:display_name])
-
- if @friend
- if request.post?
- if current_user.is_friends_with?(@friend)
- Friend.where(:user_id => current_user.id, :friend_user_id => @friend.id).delete_all
- flash[:notice] = t "users.remove_friend.success", :name => @friend.display_name
- else
- flash[:error] = t "users.remove_friend.not_a_friend", :name => @friend.display_name
- end
-
- if params[:referer]
- redirect_to params[:referer]
- else
- redirect_to :action => "show"
- end
- end
- else
- render_unknown_user params[:display_name]
- end
- end
-
##
# sets a user's status
def set_status
if user
case user.status
- when "pending" then
+ when "pending"
unconfirmed_login(user)
- when "active", "confirmed" then
+ when "active", "confirmed"
successful_login(user, request.env["omniauth.params"]["referer"])
- when "suspended" then
+ when "suspended"
failed_login t("users.login.account is suspended", :webmaster => "mailto:#{Settings.support_email}").html_safe
else
failed_login t("users.login.auth failure")
user.languages = params[:user][:languages].split(",")
- case params[:image_action]
+ case params[:avatar_action]
when "new" then
- user.image = params[:user][:image]
+ user.avatar.attach(params[:user][:avatar])
user.image_use_gravatar = false
when "delete" then
- user.image = nil
+ user.avatar.purge_later
user.image_use_gravatar = false
when "gravatar" then
- user.image = nil
+ user.avatar.purge_later
user.image_use_gravatar = true
end
email.split("@").last
end
- if blocked = Acl.no_account_creation(request.remote_ip, domain)
+ mx_servers = if domain.nil?
+ nil
+ else
+ domain_mx_servers(domain)
+ end
+
+ if blocked = Acl.no_account_creation(request.remote_ip, :domain => domain, :mx => mx_servers)
logger.info "Blocked signup from #{request.remote_ip} for #{email}"
render :action => "blocked"
!blocked
end
+ ##
+ # get list of MX servers for a domains
+ def domain_mx_servers(domain)
+ Resolv::DNS.open do |dns|
+ dns.getresources(domain, Resolv::DNS::Resource::IN::MX).collect(&:exchange).collect(&:to_s)
+ end
+ end
+
##
# check if this user has a gravatar and set the user pref is true
def gravatar_enable(user)
# code from example https://en.gravatar.com/site/implement/images/ruby/
- return false if user.image.present?
+ return false if user.avatar.attached?
hash = Digest::MD5.hexdigest(user.email.downcase)
url = "https://www.gravatar.com/avatar/#{hash}?d=404" # without d=404 we will always get an image back
projects / rails.git / blobdiff