@user.terms_seen = true
if @user.save
- flash[:notice] = t "user.new.terms declined", :url => t("user.new.terms declined url")
+ flash[:notice] = t("user.new.terms declined", :url => t("user.new.terms declined url")).html_safe
end
if params[:referer]
:auth_provider => params[:auth_provider],
:auth_uid => params[:auth_uid])
- flash.now[:notice] = t "user.new.auth association"
+ flash.now[:notice] = render_to_string :partial => "auth_association"
else
check_signup_allowed
end
password_authentication(params[:username], params[:password])
elsif params[:openid_url].present?
session[:remember_me] ||= params[:remember_me_openid]
- redirect_to auth_url("openid", params[:openid_url])
+ redirect_to auth_url("openid", params[:openid_url], params[:referer])
end
end
flash[:error] = t "user.confirm_resend.failure", :name => params[:display_name]
else
Notifier.signup_confirm(user, user.tokens.create).deliver_now
- flash[:notice] = t "user.confirm_resend.success", :email => user.email
+ flash[:notice] = t("user.confirm_resend.success", :email => user.email).html_safe
end
redirect_to :action => "login"
friend.friend_user_id = @new_friend.id
if @user.is_friends_with?(@new_friend)
flash[:warning] = t "user.make_friend.already_a_friend", :name => @new_friend.display_name
+ elsif friend.save
+ flash[:notice] = t "user.make_friend.success", :name => @new_friend.display_name
+ Notifier.friend_notification(friend).deliver_now
else
- if friend.save
- flash[:notice] = t "user.make_friend.success", :name => @new_friend.display_name
- Notifier.friend_notification(friend).deliver_now
- else
- friend.add_error(t("user.make_friend.failed", :name => @new_friend.display_name))
- end
+ friend.add_error(t("user.make_friend.failed", :name => @new_friend.display_name))
end
if params[:referer]
when "openid"
email_verified = uid.match(%r{https://www.google.com/accounts/o8/id?(.*)}) ||
uid.match(%r{https://me.yahoo.com/(.*)})
- when "google"
+ when "google", "facebook"
email_verified = true
else
email_verified = false
when "pending" then
unconfirmed_login(user)
when "active", "confirmed" then
- successful_login(user)
+ successful_login(user, env["omniauth.params"]["referer"])
when "suspended" then
failed_login t("user.login.account is suspended", :webmaster => "mailto:webmaster@openstreetmap.org")
else
elsif user = User.authenticate(:username => username, :password => password, :pending => true)
unconfirmed_login(user)
elsif User.authenticate(:username => username, :password => password, :suspended => true)
- failed_login t("user.login.account is suspended", :webmaster => "mailto:webmaster@openstreetmap.org")
+ failed_login t("user.login.account is suspended", :webmaster => "mailto:webmaster@openstreetmap.org"), username
else
- failed_login t("user.login.auth failure")
+ failed_login t("user.login.auth failure"), username
end
end
##
# return the URL to use for authentication
- def auth_url(provider, uid)
- if provider == "openid"
- auth_path(:provider => "openid", :openid_url => openid_expand_url(uid), :origin => request.path)
+ def auth_url(provider, uid, referer = nil)
+ params = { :provider => provider }
+
+ params[:openid_url] = openid_expand_url(uid) if provider == "openid"
+
+ if referer.nil?
+ params[:origin] = request.path
else
- auth_path(:provider => provider, :origin => request.path)
+ params[:origin] = request.path + "?referer=" + CGI.escape(referer)
+ params[:referer] = referer
end
+
+ auth_path(params)
end
##
##
# process a successful login
- def successful_login(user)
+ def successful_login(user, referer = nil)
session[:user] = user.id
session_expires_after 28.days if session[:remember_me]
- target = session[:referer] || url_for(:controller => :site, :action => :index)
+ target = referer || session[:referer] || url_for(:controller => :site, :action => :index)
# The user is logged in, so decide where to send them:
#
##
# process a failed login
- def failed_login(message)
+ def failed_login(message, username = nil)
flash[:error] = message
- redirect_to :action => "login", :referer => session[:referer]
+ redirect_to :action => "login", :referer => session[:referer],
+ :username => username, :remember_me => session[:remember_me]
session.delete(:remember_me)
session.delete(:referer)
user.display_name = params[:user][:display_name]
user.new_email = params[:user][:new_email]
- if params[:user][:pass_crypt].length > 0 || params[:user][:pass_crypt_confirmation].length > 0
+ unless params[:user][:pass_crypt].empty? && params[:user][:pass_crypt_confirmation].empty?
user.pass_crypt = params[:user][:pass_crypt]
user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
end
user.home_lat = params[:user][:home_lat]
user.home_lon = params[:user][:home_lon]
- if params[:user][:preferred_editor] == "default"
- user.preferred_editor = nil
- else
- user.preferred_editor = params[:user][:preferred_editor]
- end
+ user.preferred_editor = if params[:user][:preferred_editor] == "default"
+ nil
+ else
+ params[:user][:preferred_editor]
+ end
if params[:user][:auth_provider].nil? || params[:user][:auth_provider].blank?
user.auth_provider = nil
##
# check signup acls
def check_signup_allowed(email = nil)
- if email.nil?
- domain = nil
- else
- domain = email.split("@").last
- end
+ domain = if email.nil?
+ nil
+ else
+ email.split("@").last
+ end
if blocked = Acl.no_account_creation(request.remote_ip, domain)
logger.info "Blocked signup from #{request.remote_ip} for #{email}"
projects / rails.git / blobdiff