remove trailing white-spaces from app/controllers/account_controller.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6900 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
43eb8c3455
commit
10f2e70dba
|
@ -1,24 +1,24 @@
|
||||||
# Redmine - project management software
|
# Redmine - project management software
|
||||||
# Copyright (C) 2006-2009 Jean-Philippe Lang
|
# Copyright (C) 2006-2011 Jean-Philippe Lang
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or
|
# This program is free software; you can redistribute it and/or
|
||||||
# modify it under the terms of the GNU General Public License
|
# modify it under the terms of the GNU General Public License
|
||||||
# as published by the Free Software Foundation; either version 2
|
# as published by the Free Software Foundation; either version 2
|
||||||
# of the License, or (at your option) any later version.
|
# of the License, or (at your option) any later version.
|
||||||
#
|
#
|
||||||
# This program is distributed in the hope that it will be useful,
|
# This program is distributed in the hope that it will be useful,
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
||||||
class AccountController < ApplicationController
|
class AccountController < ApplicationController
|
||||||
helper :custom_fields
|
helper :custom_fields
|
||||||
include CustomFieldsHelper
|
include CustomFieldsHelper
|
||||||
|
|
||||||
# prevents login action to be filtered by check_if_login_required application scope filter
|
# prevents login action to be filtered by check_if_login_required application scope filter
|
||||||
skip_before_filter :check_if_login_required
|
skip_before_filter :check_if_login_required
|
||||||
|
|
||||||
|
@ -36,7 +36,7 @@ class AccountController < ApplicationController
|
||||||
logout_user
|
logout_user
|
||||||
redirect_to home_url
|
redirect_to home_url
|
||||||
end
|
end
|
||||||
|
|
||||||
# Enable user to choose a new password
|
# Enable user to choose a new password
|
||||||
def lost_password
|
def lost_password
|
||||||
redirect_to(home_url) && return unless Setting.lost_password?
|
redirect_to(home_url) && return unless Setting.lost_password?
|
||||||
|
@ -51,7 +51,7 @@ class AccountController < ApplicationController
|
||||||
flash[:notice] = l(:notice_account_password_updated)
|
flash[:notice] = l(:notice_account_password_updated)
|
||||||
redirect_to :action => 'login'
|
redirect_to :action => 'login'
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
render :template => "account/password_recovery"
|
render :template => "account/password_recovery"
|
||||||
return
|
return
|
||||||
|
@ -73,7 +73,7 @@ class AccountController < ApplicationController
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# User self-registration
|
# User self-registration
|
||||||
def register
|
def register
|
||||||
redirect_to(home_url) && return unless Setting.self_registration? || session[:auth_source_registration]
|
redirect_to(home_url) && return unless Setting.self_registration? || session[:auth_source_registration]
|
||||||
|
@ -109,7 +109,7 @@ class AccountController < ApplicationController
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Token based account activation
|
# Token based account activation
|
||||||
def activate
|
def activate
|
||||||
redirect_to(home_url) && return unless Setting.self_registration? && params[:token]
|
redirect_to(home_url) && return unless Setting.self_registration? && params[:token]
|
||||||
|
@ -124,9 +124,9 @@ class AccountController < ApplicationController
|
||||||
end
|
end
|
||||||
redirect_to :action => 'login'
|
redirect_to :action => 'login'
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def logout_user
|
def logout_user
|
||||||
if User.current.logged?
|
if User.current.logged?
|
||||||
cookies.delete :autologin
|
cookies.delete :autologin
|
||||||
|
@ -134,7 +134,7 @@ class AccountController < ApplicationController
|
||||||
self.logged_user = nil
|
self.logged_user = nil
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def authenticate_user
|
def authenticate_user
|
||||||
if Setting.openid? && using_open_id?
|
if Setting.openid? && using_open_id?
|
||||||
open_id_authenticate(params[:openid_url])
|
open_id_authenticate(params[:openid_url])
|
||||||
|
@ -156,7 +156,6 @@ class AccountController < ApplicationController
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
def open_id_authenticate(openid_url)
|
def open_id_authenticate(openid_url)
|
||||||
authenticate_with_open_id(openid_url, :required => [:nickname, :fullname, :email], :return_to => signin_url) do |result, identity_url, registration|
|
authenticate_with_open_id(openid_url, :required => [:nickname, :fullname, :email], :return_to => signin_url) do |result, identity_url, registration|
|
||||||
if result.successful?
|
if result.successful?
|
||||||
|
@ -185,7 +184,7 @@ class AccountController < ApplicationController
|
||||||
register_manually_by_administrator(user) do
|
register_manually_by_administrator(user) do
|
||||||
onthefly_creation_failed(user)
|
onthefly_creation_failed(user)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
# Existing record
|
# Existing record
|
||||||
if user.active?
|
if user.active?
|
||||||
|
@ -197,7 +196,7 @@ class AccountController < ApplicationController
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def successful_authentication(user)
|
def successful_authentication(user)
|
||||||
# Valid user
|
# Valid user
|
||||||
self.logged_user = user
|
self.logged_user = user
|
||||||
|
@ -208,7 +207,7 @@ class AccountController < ApplicationController
|
||||||
call_hook(:controller_account_success_authentication_after, {:user => user })
|
call_hook(:controller_account_success_authentication_after, {:user => user })
|
||||||
redirect_back_or_default :controller => 'my', :action => 'page'
|
redirect_back_or_default :controller => 'my', :action => 'page'
|
||||||
end
|
end
|
||||||
|
|
||||||
def set_autologin_cookie(user)
|
def set_autologin_cookie(user)
|
||||||
token = Token.create(:user => user, :action => 'autologin')
|
token = Token.create(:user => user, :action => 'autologin')
|
||||||
cookie_name = Redmine::Configuration['autologin_cookie_name'] || 'autologin'
|
cookie_name = Redmine::Configuration['autologin_cookie_name'] || 'autologin'
|
||||||
|
@ -247,7 +246,7 @@ class AccountController < ApplicationController
|
||||||
yield if block_given?
|
yield if block_given?
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Automatically register a user
|
# Automatically register a user
|
||||||
#
|
#
|
||||||
# Pass a block for behavior when a user fails to save
|
# Pass a block for behavior when a user fails to save
|
||||||
|
@ -263,7 +262,7 @@ class AccountController < ApplicationController
|
||||||
yield if block_given?
|
yield if block_given?
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Manual activation by the administrator
|
# Manual activation by the administrator
|
||||||
#
|
#
|
||||||
# Pass a block for behavior when a user fails to save
|
# Pass a block for behavior when a user fails to save
|
||||||
|
|
Loading…
Reference in New Issue