##// END OF EJS Templates
jro_apps » redmine
RSS
remove trailing white space from test/fixtures/workflows.yml...
remove trailing white space from test/fixtures/workflows.yml git-svn-id: http://svn.redmine.org/redmine/trunk@16339 e93f8b46-1217-0410-a6f0-8f06a7374b81
Jean-Philippe Lang - - Load All Authors

File last commit:

r15905:9e1723c537fe
r15957:7816a4025a03 master
Show More
account_controller.rb
370 lines | 11.7 KiB | text/x-ruby | RubyLexer
/ app / controllers / account_controller.rb
History | Source | Raw |Copy content |Copy permalink
Jean-Philippe Lang
Display latest user's activity on account/show view....
 r2064 # Redmine - project management software
Jean-Philippe Lang
Updates copyright for 2016....
 r14856 # Copyright (C) 2006-2016 Jean-Philippe Lang
Jean-Philippe Lang
added svn:eol-style native property on /app files...
 r330 #
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
Toshi MARUYAMA
remove trailing white-spaces from app/controllers/account_controller.rb....
 r6780 #
Jean-Philippe Lang
added svn:eol-style native property on /app files...
 r330 # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
Toshi MARUYAMA
remove trailing white-spaces from app/controllers/account_controller.rb....
 r6780 #
Jean-Philippe Lang
added svn:eol-style native property on /app files...
 r330 # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
class AccountController < ApplicationController
helper :custom_fields
Toshi MARUYAMA
remove trailing white-spaces from app/controllers/account_controller.rb....
 r6780 include CustomFieldsHelper
Jean-Philippe Lang
Use the main menu for project related actions that support cross-project display....
 r15601 self.main_menu = false
Jean-Philippe Lang
added svn:eol-style native property on /app files...
 r330 # prevents login action to be filtered by check_if_login_required application scope filter
Jean-Philippe Lang
Use .skip_before_action instead of .skip_before_filter....
 r15274 skip_before_action :check_if_login_required, :check_password_change
Jean-Philippe Lang
added svn:eol-style native property on /app files...
 r330
Jean-Philippe Lang
Fixed that OpenID authentication fails with 422 error due to token verification (#15735)....
 r12163 # Overrides ApplicationController#verify_authenticity_token to disable
# token verification on openid callbacks
def verify_authenticity_token
unless using_open_id?
super
end
end
Jean-Philippe Lang
added svn:eol-style native property on /app files...
 r330 # Login request and validation
def login
if request.get?
Jean-Philippe Lang
Login link unexpected logs you out (#12611)....
 r10892 if User.current.logged?
Jean-Philippe Lang
Redirect to back_url or referer when clicking "Sign in" while already logged-in (#15926)....
 r12430 redirect_back_or_default home_url, :referer => true
Jean-Philippe Lang
Login link unexpected logs you out (#12611)....
 r10892 end
Jean-Philippe Lang
added svn:eol-style native property on /app files...
 r330 else
Eric Davis
Refactor: Extract method...
 r3424 authenticate_user
Jean-Philippe Lang
added svn:eol-style native property on /app files...
 r330 end
Jean-Philippe Lang
Friendly response when the LDAP connection fails....
 r8791 rescue AuthSourceException => e
logger.error "An error occured when authenticating #{params[:username]}: #{e.message}"
render_error :message => e.message
Jean-Philippe Lang
added svn:eol-style native property on /app files...
 r330 end
# Log out current user and redirect to welcome page
def logout
Jean-Philippe Lang
Use POST instead of GET for logging out (#13022)....
 r11059 if User.current.anonymous?
redirect_to home_url
elsif request.post?
logout_user
redirect_to home_url
end
# display the logout form
Jean-Philippe Lang
added svn:eol-style native property on /app files...
 r330 end
Toshi MARUYAMA
remove trailing white-spaces from app/controllers/account_controller.rb....
 r6780
Jean-Philippe Lang
Code cleanup....
 r9759 # Lets user choose a new password
Jean-Philippe Lang
added svn:eol-style native property on /app files...
 r330 def lost_password
Jean-Philippe Lang
Don't use && return....
 r10991 (redirect_to(home_url); return) unless Setting.lost_password?
Jean-Philippe Lang
Redirect with token in session (#24416)....
 r15905 if prt = (params[:token] || session[:password_recovery_token])
@token = Token.find_token("recovery", prt.to_s)
Jean-Philippe Lang
Code cleanup....
 r9759 if @token.nil? || @token.expired?
redirect_to home_url
return
end
Jean-Philippe Lang
Redirect with token in session (#24416)....
 r15905
# redirect to remove the token query parameter from the URL and add it to the session
if request.query_parameters[:token].present?
session[:password_recovery_token] = @token.value
redirect_to lost_password_url
return
end
Jean-Philippe Lang
added svn:eol-style native property on /app files...
 r330 @user = @token.user
Jean-Philippe Lang
Code cleanup....
 r9763 unless @user && @user.active?
redirect_to home_url
return
end
Jean-Philippe Lang
added svn:eol-style native property on /app files...
 r330 if request.post?
@user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
if @user.save
@token.destroy
Jean-Philippe Lang
Let the mailer set the email content (#21421)....
 r14885 Mailer.password_updated(@user)
Jean-Philippe Lang
added svn:eol-style native property on /app files...
 r330 flash[:notice] = l(:notice_account_password_updated)
Jean-Philippe Lang
Code cleanup....
 r9759 redirect_to signin_path
Jean-Philippe Lang
added svn:eol-style native property on /app files...
 r330 return
Toshi MARUYAMA
remove trailing white-spaces from app/controllers/account_controller.rb....
 r6780 end
Jean-Philippe Lang
added svn:eol-style native property on /app files...
 r330 end
render :template => "account/password_recovery"
return
else
if request.post?
Jean-Philippe Lang
Send password reset email to the email used in lost password form (#4244)....
 r13506 email = params[:mail].to_s
user = User.find_by_mail(email)
Jean-Philippe Lang
Adds a way for a registered user to get a new action email (#14228)....
 r11716 # user not found
unless user
Jean-Philippe Lang
Code cleanup....
 r9760 flash.now[:error] = l(:notice_account_unknown_email)
return
end
Jean-Philippe Lang
Adds a way for a registered user to get a new action email (#14228)....
 r11716 unless user.active?
handle_inactive_user(user, lost_password_path)
return
end
Jean-Philippe Lang
Code cleanup....
 r9760 # user cannot change its password
unless user.change_password_allowed?
flash.now[:error] = l(:notice_can_t_change_password)
return
end
Jean-Philippe Lang
added svn:eol-style native property on /app files...
 r330 # create a new token for password recovery
token = Token.new(:user => user, :action => "recovery")
if token.save
Jean-Philippe Lang
Send password reset email to the email used in lost password form (#4244)....
 r13506 # Don't use the param to send the email
Toshi MARUYAMA
use String#casecmp for case insensitive comparison (#20369)...
 r14102 recipent = user.mails.detect {|e| email.casecmp(e) == 0} || user.mail
Jean-Philippe Lang
Send password reset email to the email used in lost password form (#4244)....
 r13506 Mailer.lost_password(token, recipent).deliver
Jean-Philippe Lang
added svn:eol-style native property on /app files...
 r330 flash[:notice] = l(:notice_account_lost_email_sent)
Jean-Philippe Lang
Use named routes....
 r9757 redirect_to signin_path
Jean-Philippe Lang
added svn:eol-style native property on /app files...
 r330 return
end
end
end
end
Toshi MARUYAMA
remove trailing white-spaces from app/controllers/account_controller.rb....
 r6780
Jean-Philippe Lang
added svn:eol-style native property on /app files...
 r330 # User self-registration
def register
Jean-Philippe Lang
Don't use && return....
 r10991 (redirect_to(home_url); return) unless Setting.self_registration? || session[:auth_source_registration]
Jean-Philippe Lang
There's now 3 account activation strategies (available in application settings):...
 r902 if request.get?
Jean-Philippe Lang
Improved on-the-fly account creation. If some attributes are missing (eg. not present in the LDAP) or are invalid, the registration form is displayed so that the user is able to fill or fix these attributes....
 r1661 session[:auth_source_registration] = nil
Jean-Philippe Lang
Use browser language as default when registering....
 r10759 @user = User.new(:language => current_language.to_s)
Jean-Philippe Lang
added svn:eol-style native property on /app files...
 r330 else
Jean-Philippe Lang
Fixed: Openid registration form should not require user to enter password (#11331)....
 r9746 user_params = params[:user] || {}
Jean-Philippe Lang
Removed unsafe attributes assignment....
 r8664 @user = User.new
Jean-Philippe Lang
Fixed: Openid registration form should not require user to enter password (#11331)....
 r9746 @user.safe_attributes = user_params
Jean-Philippe Lang
Use safe_attributes for user preferences....
 r15306 @user.pref.safe_attributes = params[:pref]
Jean-Philippe Lang
There's now 3 account activation strategies (available in application settings):...
 r902 @user.admin = false
Eric Davis
Refactor: Add methods to User to edit the encapsulate the status field....
 r3792 @user.register
Jean-Philippe Lang
Improved on-the-fly account creation. If some attributes are missing (eg. not present in the LDAP) or are invalid, the registration form is displayed so that the user is able to fill or fix these attributes....
 r1661 if session[:auth_source_registration]
Eric Davis
Refactor: Add methods to User to edit the encapsulate the status field....
 r3792 @user.activate
Jean-Philippe Lang
Improved on-the-fly account creation. If some attributes are missing (eg. not present in the LDAP) or are invalid, the registration form is displayed so that the user is able to fill or fix these attributes....
 r1661 @user.login = session[:auth_source_registration][:login]
@user.auth_source_id = session[:auth_source_registration][:auth_source_id]
Jean-Philippe Lang
There's now 3 account activation strategies (available in application settings):...
 r902 if @user.save
Jean-Philippe Lang
Improved on-the-fly account creation. If some attributes are missing (eg. not present in the LDAP) or are invalid, the registration form is displayed so that the user is able to fill or fix these attributes....
 r1661 session[:auth_source_registration] = nil
Jean-Philippe Lang
Log the user in after registration if account activation is not needed....
 r1507 self.logged_user = @user
Jean-Philippe Lang
There's now 3 account activation strategies (available in application settings):...
 r902 flash[:notice] = l(:notice_account_activated)
Jean-Philippe Lang
Use named routes in controllers....
 r10752 redirect_to my_account_path
Jean-Philippe Lang
There's now 3 account activation strategies (available in application settings):...
 r902 end
else
Jean-Philippe Lang
Fixed: Openid registration form should not require user to enter password (#11331)....
 r9746 unless user_params[:identity_url].present? && user_params[:password].blank? && user_params[:password_confirmation].blank?
@user.password, @user.password_confirmation = user_params[:password], user_params[:password_confirmation]
end
Eric Davis
Refactored common methods out of register and open_id_authenticate...
 r2386
Jean-Philippe Lang
Improved on-the-fly account creation. If some attributes are missing (eg. not present in the LDAP) or are invalid, the registration form is displayed so that the user is able to fill or fix these attributes....
 r1661 case Setting.self_registration
when '1'
Eric Davis
Refactored common methods out of register and open_id_authenticate...
 r2386 register_by_email_activation(@user)
Jean-Philippe Lang
Improved on-the-fly account creation. If some attributes are missing (eg. not present in the LDAP) or are invalid, the registration form is displayed so that the user is able to fill or fix these attributes....
 r1661 when '3'
Eric Davis
Refactored common methods out of register and open_id_authenticate...
 r2386 register_automatically(@user)
Jean-Philippe Lang
Improved on-the-fly account creation. If some attributes are missing (eg. not present in the LDAP) or are invalid, the registration form is displayed so that the user is able to fill or fix these attributes....
 r1661 else
Eric Davis
Refactored common methods out of register and open_id_authenticate...
 r2386 register_manually_by_administrator(@user)
Jean-Philippe Lang
added svn:eol-style native property on /app files...
 r330 end
end
end
end
Toshi MARUYAMA
remove trailing white-spaces from app/controllers/account_controller.rb....
 r6780
Jean-Philippe Lang
There's now 3 account activation strategies (available in application settings):...
 r902 # Token based account activation
def activate
Jean-Philippe Lang
Don't use && return....
 r10990 (redirect_to(home_url); return) unless Setting.self_registration? && params[:token].present?
Jean-Philippe Lang
Adds token finder methods....
 r11144 token = Token.find_token('register', params[:token].to_s)
Jean-Philippe Lang
Don't use && return....
 r10990 (redirect_to(home_url); return) unless token and !token.expired?
Jean-Philippe Lang
There's now 3 account activation strategies (available in application settings):...
 r902 user = token.user
Jean-Philippe Lang
Don't use && return....
 r10990 (redirect_to(home_url); return) unless user.registered?
Eric Davis
Refactor: Add methods to User to edit the encapsulate the status field....
 r3792 user.activate
Jean-Philippe Lang
There's now 3 account activation strategies (available in application settings):...
 r902 if user.save
token.destroy
flash[:notice] = l(:notice_account_activated)
end
Jean-Philippe Lang
Use named routes....
 r9757 redirect_to signin_path
Jean-Philippe Lang
There's now 3 account activation strategies (available in application settings):...
 r902 end
Toshi MARUYAMA
remove trailing white-spaces from app/controllers/account_controller.rb....
 r6780
Jean-Philippe Lang
Adds a way for a registered user to get a new action email (#14228)....
 r11716 # Sends a new account activation email
def activation_email
if session[:registered_user_id] && Setting.self_registration == '1'
user_id = session.delete(:registered_user_id).to_i
user = User.find_by_id(user_id)
if user && user.registered?
register_by_email_activation(user)
return
end
end
redirect_to(home_url)
end
Jean-Philippe Lang
Fixed: When logging in via an autologin cookie the user's last_login_on should be updated (#2820)....
 r2460 private
Toshi MARUYAMA
remove trailing white-spaces from app/controllers/account_controller.rb....
 r6780
Eric Davis
Refactor: Extract method...
 r3424 def authenticate_user
if Setting.openid? && using_open_id?
open_id_authenticate(params[:openid_url])
else
password_authentication
end
end
Eric Davis
Added the ability to login via OpenID....
 r2381 def password_authentication
Jean-Philippe Lang
Adds a way for a registered user to get a new action email (#14228)....
 r11716 user = User.try_to_login(params[:username], params[:password], false)
Eric Davis
Extract method...
 r3095
Eric Davis
Added the ability to login via OpenID....
 r2381 if user.nil?
Eric Davis
Extract method...
 r3095 invalid_credentials
Eric Davis
Added the ability to login via OpenID....
 r2381 elsif user.new_record?
Eric Davis
Refactor: Use the existing method for failing onthefly creations....
 r3094 onthefly_creation_failed(user, {:login => user.login, :auth_source_id => user.auth_source_id })
Eric Davis
Added the ability to login via OpenID....
 r2381 else
# Valid user
Jean-Philippe Lang
Adds a way for a registered user to get a new action email (#14228)....
 r11716 if user.active?
successful_authentication(user)
Jean-Philippe Lang
Activate sudo mode after password based login (#20589)....
 r14253 update_sudo_timestamp! # activate Sudo Mode
Jean-Philippe Lang
Adds a way for a registered user to get a new action email (#14228)....
 r11716 else
handle_inactive_user(user)
end
Eric Davis
Added the ability to login via OpenID....
 r2381 end
end
def open_id_authenticate(openid_url)
Jean-Philippe Lang
Adds autologin param in openid return_to url (#3371)....
 r11291 back_url = signin_url(:autologin => params[:autologin])
Toshi MARUYAMA
code layout cleanup AccountController#open_id_authenticate...
 r11309 authenticate_with_open_id(
openid_url, :required => [:nickname, :fullname, :email],
:return_to => back_url, :method => :post
) do |result, identity_url, registration|
Eric Davis
Added the ability to login via OpenID....
 r2381 if result.successful?
user = User.find_or_initialize_by_identity_url(identity_url)
if user.new_record?
Eric Davis
Prevent registration via OpenID if self registration is off. #699...
 r2387 # Self-registration off
Jean-Philippe Lang
Don't use && return....
 r10991 (redirect_to(home_url); return) unless Setting.self_registration?
Eric Davis
Added the ability to login via OpenID....
 r2381 # Create on the fly
Eric Davis
Added tests for the other OpenID authentication cases. #699...
 r2384 user.login = registration['nickname'] unless registration['nickname'].nil?
user.mail = registration['email'] unless registration['email'].nil?
user.firstname, user.lastname = registration['fullname'].split(' ') unless registration['fullname'].nil?
Eric Davis
Hooked up on the fly OpenID user creation....
 r2382 user.random_password
Eric Davis
Refactor: Add methods to User to edit the encapsulate the status field....
 r3792 user.register
Eric Davis
Added user setup needed based on the system's registration settings...
 r2385 case Setting.self_registration
when '1'
Eric Davis
Refactored common methods out of register and open_id_authenticate...
 r2386 register_by_email_activation(user) do
Eric Davis
Fixed the bug in the OpenID registration where the form wouldn't take a login...
 r2421 onthefly_creation_failed(user)
Eric Davis
Added user setup needed based on the system's registration settings...
 r2385 end
when '3'
Eric Davis
Refactored common methods out of register and open_id_authenticate...
 r2386 register_automatically(user) do
Eric Davis
Fixed the bug in the OpenID registration where the form wouldn't take a login...
 r2421 onthefly_creation_failed(user)
Eric Davis
Added user setup needed based on the system's registration settings...
 r2385 end
Eric Davis
Hooked up on the fly OpenID user creation....
 r2382 else
Eric Davis
Refactored common methods out of register and open_id_authenticate...
 r2386 register_manually_by_administrator(user) do
Eric Davis
Fixed the bug in the OpenID registration where the form wouldn't take a login...
 r2421 onthefly_creation_failed(user)
Eric Davis
Added user setup needed based on the system's registration settings...
 r2385 end
Toshi MARUYAMA
remove trailing white-spaces from app/controllers/account_controller.rb....
 r6780 end
Eric Davis
Added the ability to login via OpenID....
 r2381 else
Eric Davis
Hooked up on the fly OpenID user creation....
 r2382 # Existing record
Eric Davis
Fixed a bug in the OpenID login when a user signed up with OpenID but hasn't...
 r2420 if user.active?
successful_authentication(user)
else
Jean-Philippe Lang
Adds a way for a registered user to get a new action email (#14228)....
 r11716 handle_inactive_user(user)
Eric Davis
Fixed a bug in the OpenID login when a user signed up with OpenID but hasn't...
 r2420 end
Eric Davis
Added the ability to login via OpenID....
 r2381 end
end
end
end
Toshi MARUYAMA
remove trailing white-spaces from app/controllers/account_controller.rb....
 r6780
Eric Davis
Added the ability to login via OpenID....
 r2381 def successful_authentication(user)
Jean-Philippe Lang
Log successful authentications....
 r9983 logger.info "Successful authentication for '#{user.login}' from #{request.remote_ip} at #{Time.now.utc}"
Eric Davis
Added the ability to login via OpenID....
 r2381 # Valid user
self.logged_user = user
# generate a key and set cookie if autologin
if params[:autologin] && Setting.autologin?
Jean-Philippe Lang
Makes the autologin cookie configurable (#1763)....
 r4636 set_autologin_cookie(user)
Eric Davis
Added the ability to login via OpenID....
 r2381 end
Eric Davis
Added a plugin hook for :controller_account_success_authentication_after...
 r2533 call_hook(:controller_account_success_authentication_after, {:user => user })
Jean-Philippe Lang
Use named routes in controllers....
 r10752 redirect_back_or_default my_page_path
Eric Davis
Added the ability to login via OpenID....
 r2381 end
Toshi MARUYAMA
remove trailing white-spaces from app/controllers/account_controller.rb....
 r6780
Jean-Philippe Lang
Makes the autologin cookie configurable (#1763)....
 r4636 def set_autologin_cookie(user)
token = Token.create(:user => user, :action => 'autologin')
Jean-Philippe Lang
Set autologin cookie as secure by default when using https (#20935)....
 r14266 secure = Redmine::Configuration['autologin_cookie_secure']
if secure.nil?
secure = request.ssl?
end
Jean-Philippe Lang
Makes the autologin cookie configurable (#1763)....
 r4636 cookie_options = {
:value => token.value,
:expires => 1.year.from_now,
Jean-Philippe Lang
Use config.relative_url_root as the default path for session and autologin cookies (#21169)....
 r14494 :path => (Redmine::Configuration['autologin_cookie_path'] || RedmineApp::Application.config.relative_url_root || '/'),
Jean-Philippe Lang
Set autologin cookie as secure by default when using https (#20935)....
 r14266 :secure => secure,
Jean-Philippe Lang
Set the httponly flag on the autologin cookie....
 r4637 :httponly => true
Jean-Philippe Lang
Makes the autologin cookie configurable (#1763)....
 r4636 }
Jean-Philippe Lang
Fixed that autologin is broken when using a custom cookie name (#13335)....
 r11289 cookies[autologin_cookie_name] = cookie_options
Jean-Philippe Lang
Makes the autologin cookie configurable (#1763)....
 r4636 end
Eric Davis
Added the ability to login via OpenID....
 r2381
Eric Davis
Added user setup needed based on the system's registration settings...
 r2385 # Onthefly creation failed, display the registration form to fill/fix attributes
def onthefly_creation_failed(user, auth_source_options = { })
@user = user
session[:auth_source_registration] = auth_source_options unless auth_source_options.empty?
Jean-Philippe Lang
Fixed #onthefly_creation_failed broken by r9940 (#11850)....
 r10229 render :action => 'register'
Eric Davis
Added user setup needed based on the system's registration settings...
 r2385 end
Eric Davis
Extract method...
 r3095 def invalid_credentials
Eric Davis
Log failed user logins to the Rails logger...
 r3297 logger.warn "Failed login for '#{params[:username]}' from #{request.remote_ip} at #{Time.now.utc}"
Jean-Philippe Lang
Typo: s/creditentials/credentials/ (#21861)....
 r14750 flash.now[:error] = l(:notice_account_invalid_credentials)
Eric Davis
Extract method...
 r3095 end
Eric Davis
Refactored common methods out of register and open_id_authenticate...
 r2386 # Register a user for email activation.
#
# Pass a block for behavior when a user fails to save
def register_by_email_activation(user, &block)
token = Token.new(:user => user, :action => "register")
if user.save and token.save
Toshi MARUYAMA
replace Mailer deliver syntax to Rails3 style...
 r9455 Mailer.register(token).deliver
Jean-Philippe Lang
Escape flash messages (#19117)....
 r13634 flash[:notice] = l(:notice_account_register_done, :email => ERB::Util.h(user.mail))
Jean-Philippe Lang
Use named routes....
 r9757 redirect_to signin_path
Eric Davis
Refactored common methods out of register and open_id_authenticate...
 r2386 else
yield if block_given?
end
end
Toshi MARUYAMA
remove trailing white-spaces from app/controllers/account_controller.rb....
 r6780
Eric Davis
Refactored common methods out of register and open_id_authenticate...
 r2386 # Automatically register a user
#
# Pass a block for behavior when a user fails to save
def register_automatically(user, &block)
# Automatic activation
Eric Davis
Refactor: Add methods to User to edit the encapsulate the status field....
 r3792 user.activate
Jean-Philippe Lang
Fixes that user's last_login_on was not set when using registration with automatic activation....
 r2526 user.last_login_on = Time.now
Eric Davis
Refactored common methods out of register and open_id_authenticate...
 r2386 if user.save
self.logged_user = user
flash[:notice] = l(:notice_account_activated)
Jean-Philippe Lang
Use named routes in controllers....
 r10752 redirect_to my_account_path
Eric Davis
Refactored common methods out of register and open_id_authenticate...
 r2386 else
yield if block_given?
end
end
Toshi MARUYAMA
remove trailing white-spaces from app/controllers/account_controller.rb....
 r6780
Eric Davis
Refactored common methods out of register and open_id_authenticate...
 r2386 # Manual activation by the administrator
#
# Pass a block for behavior when a user fails to save
def register_manually_by_administrator(user, &block)
if user.save
# Sends an email to the administrators
Toshi MARUYAMA
replace Mailer deliver syntax to Rails3 style...
 r9455 Mailer.account_activation_request(user).deliver
Jean-Philippe Lang
Adds a way for a registered user to get a new action email (#14228)....
 r11716 account_pending(user)
Eric Davis
Refactored common methods out of register and open_id_authenticate...
 r2386 else
yield if block_given?
end
end
Eric Davis
Fixed a bug in the OpenID login when a user signed up with OpenID but hasn't...
 r2420
Jean-Philippe Lang
Adds a way for a registered user to get a new action email (#14228)....
 r11716 def handle_inactive_user(user, redirect_path=signin_path)
if user.registered?
account_pending(user, redirect_path)
else
account_locked(user, redirect_path)
end
end
def account_pending(user, redirect_path=signin_path)
if Setting.self_registration == '1'
flash[:error] = l(:notice_account_not_activated_yet, :url => activation_email_path)
session[:registered_user_id] = user.id
else
flash[:error] = l(:notice_account_pending)
end
redirect_to redirect_path
end
def account_locked(user, redirect_path=signin_path)
flash[:error] = l(:notice_account_locked)
redirect_to redirect_path
Eric Davis
Fixed a bug in the OpenID login when a user signed up with OpenID but hasn't...
 r2420 end
Jean-Philippe Lang
Initial commit...
 r2 end