##// END OF EJS Templates
Fixed: private projects name are displayed on account/show even if the current user doesn't have access to these private projects....
Jean-Philippe Lang -
r1023:860ff9345fdd
parent child
Show More
@@ -1,175 +1,175
1 # redMine - project management software
1 # redMine - project management software
2 # Copyright (C) 2006-2007 Jean-Philippe Lang
2 # Copyright (C) 2006-2007 Jean-Philippe Lang
3 #
3 #
4 # This program is free software; you can redistribute it and/or
4 # This program is free software; you can redistribute it and/or
5 # modify it under the terms of the GNU General Public License
5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2
6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version.
7 # of the License, or (at your option) any later version.
8 #
8 #
9 # This program is distributed in the hope that it will be useful,
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
12 # GNU General Public License for more details.
13 #
13 #
14 # You should have received a copy of the GNU General Public License
14 # You should have received a copy of the GNU General Public License
15 # along with this program; if not, write to the Free Software
15 # along with this program; if not, write to the Free Software
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17
17
18 class AccountController < ApplicationController
18 class AccountController < ApplicationController
19 layout 'base'
19 layout 'base'
20 helper :custom_fields
20 helper :custom_fields
21 include CustomFieldsHelper
21 include CustomFieldsHelper
22
22
23 # prevents login action to be filtered by check_if_login_required application scope filter
23 # prevents login action to be filtered by check_if_login_required application scope filter
24 skip_before_filter :check_if_login_required, :only => [:login, :lost_password, :register, :activate]
24 skip_before_filter :check_if_login_required, :only => [:login, :lost_password, :register, :activate]
25
25
26 # Show user's account
26 # Show user's account
27 def show
27 def show
28 @user = User.find_active(params[:id])
28 @user = User.find_active(params[:id])
29 @custom_values = @user.custom_values.find(:all, :include => :custom_field)
29 @custom_values = @user.custom_values.find(:all, :include => :custom_field)
30
30
31 # show only public projects and private projects that the logged in user is also a member of
31 # show only public projects and private projects that the logged in user is also a member of
32 @memberships = @user.memberships.select do |membership|
32 @memberships = @user.memberships.select do |membership|
33 membership.project.is_public? || (User.current.role_for_project(membership.project))
33 membership.project.is_public? || (User.current.member_of?(membership.project))
34 end
34 end
35 rescue ActiveRecord::RecordNotFound
35 rescue ActiveRecord::RecordNotFound
36 render_404
36 render_404
37 end
37 end
38
38
39 # Login request and validation
39 # Login request and validation
40 def login
40 def login
41 if request.get?
41 if request.get?
42 # Logout user
42 # Logout user
43 self.logged_user = nil
43 self.logged_user = nil
44 else
44 else
45 # Authenticate user
45 # Authenticate user
46 user = User.try_to_login(params[:login], params[:password])
46 user = User.try_to_login(params[:login], params[:password])
47 if user
47 if user
48 self.logged_user = user
48 self.logged_user = user
49 # generate a key and set cookie if autologin
49 # generate a key and set cookie if autologin
50 if params[:autologin] && Setting.autologin?
50 if params[:autologin] && Setting.autologin?
51 token = Token.create(:user => user, :action => 'autologin')
51 token = Token.create(:user => user, :action => 'autologin')
52 cookies[:autologin] = { :value => token.value, :expires => 1.year.from_now }
52 cookies[:autologin] = { :value => token.value, :expires => 1.year.from_now }
53 end
53 end
54 redirect_back_or_default :controller => 'my', :action => 'page'
54 redirect_back_or_default :controller => 'my', :action => 'page'
55 else
55 else
56 flash.now[:error] = l(:notice_account_invalid_creditentials)
56 flash.now[:error] = l(:notice_account_invalid_creditentials)
57 end
57 end
58 end
58 end
59 end
59 end
60
60
61 # Log out current user and redirect to welcome page
61 # Log out current user and redirect to welcome page
62 def logout
62 def logout
63 cookies.delete :autologin
63 cookies.delete :autologin
64 Token.delete_all(["user_id = ? AND action = ?", User.current.id, 'autologin']) if User.current.logged?
64 Token.delete_all(["user_id = ? AND action = ?", User.current.id, 'autologin']) if User.current.logged?
65 self.logged_user = nil
65 self.logged_user = nil
66 redirect_to home_url
66 redirect_to home_url
67 end
67 end
68
68
69 # Enable user to choose a new password
69 # Enable user to choose a new password
70 def lost_password
70 def lost_password
71 redirect_to(home_url) && return unless Setting.lost_password?
71 redirect_to(home_url) && return unless Setting.lost_password?
72 if params[:token]
72 if params[:token]
73 @token = Token.find_by_action_and_value("recovery", params[:token])
73 @token = Token.find_by_action_and_value("recovery", params[:token])
74 redirect_to(home_url) && return unless @token and !@token.expired?
74 redirect_to(home_url) && return unless @token and !@token.expired?
75 @user = @token.user
75 @user = @token.user
76 if request.post?
76 if request.post?
77 @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
77 @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
78 if @user.save
78 if @user.save
79 @token.destroy
79 @token.destroy
80 flash[:notice] = l(:notice_account_password_updated)
80 flash[:notice] = l(:notice_account_password_updated)
81 redirect_to :action => 'login'
81 redirect_to :action => 'login'
82 return
82 return
83 end
83 end
84 end
84 end
85 render :template => "account/password_recovery"
85 render :template => "account/password_recovery"
86 return
86 return
87 else
87 else
88 if request.post?
88 if request.post?
89 user = User.find_by_mail(params[:mail])
89 user = User.find_by_mail(params[:mail])
90 # user not found in db
90 # user not found in db
91 flash.now[:error] = l(:notice_account_unknown_email) and return unless user
91 flash.now[:error] = l(:notice_account_unknown_email) and return unless user
92 # user uses an external authentification
92 # user uses an external authentification
93 flash.now[:error] = l(:notice_can_t_change_password) and return if user.auth_source_id
93 flash.now[:error] = l(:notice_can_t_change_password) and return if user.auth_source_id
94 # create a new token for password recovery
94 # create a new token for password recovery
95 token = Token.new(:user => user, :action => "recovery")
95 token = Token.new(:user => user, :action => "recovery")
96 if token.save
96 if token.save
97 Mailer.deliver_lost_password(token)
97 Mailer.deliver_lost_password(token)
98 flash[:notice] = l(:notice_account_lost_email_sent)
98 flash[:notice] = l(:notice_account_lost_email_sent)
99 redirect_to :action => 'login'
99 redirect_to :action => 'login'
100 return
100 return
101 end
101 end
102 end
102 end
103 end
103 end
104 end
104 end
105
105
106 # User self-registration
106 # User self-registration
107 def register
107 def register
108 redirect_to(home_url) && return unless Setting.self_registration?
108 redirect_to(home_url) && return unless Setting.self_registration?
109 if request.get?
109 if request.get?
110 @user = User.new(:language => Setting.default_language)
110 @user = User.new(:language => Setting.default_language)
111 @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user) }
111 @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user) }
112 else
112 else
113 @user = User.new(params[:user])
113 @user = User.new(params[:user])
114 @user.admin = false
114 @user.admin = false
115 @user.login = params[:user][:login]
115 @user.login = params[:user][:login]
116 @user.status = User::STATUS_REGISTERED
116 @user.status = User::STATUS_REGISTERED
117 @user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
117 @user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
118 @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x,
118 @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x,
119 :customized => @user,
119 :customized => @user,
120 :value => (params["custom_fields"] ? params["custom_fields"][x.id.to_s] : nil)) }
120 :value => (params["custom_fields"] ? params["custom_fields"][x.id.to_s] : nil)) }
121 @user.custom_values = @custom_values
121 @user.custom_values = @custom_values
122 case Setting.self_registration
122 case Setting.self_registration
123 when '1'
123 when '1'
124 # Email activation
124 # Email activation
125 token = Token.new(:user => @user, :action => "register")
125 token = Token.new(:user => @user, :action => "register")
126 if @user.save and token.save
126 if @user.save and token.save
127 Mailer.deliver_register(token)
127 Mailer.deliver_register(token)
128 flash[:notice] = l(:notice_account_register_done)
128 flash[:notice] = l(:notice_account_register_done)
129 redirect_to :action => 'login'
129 redirect_to :action => 'login'
130 end
130 end
131 when '3'
131 when '3'
132 # Automatic activation
132 # Automatic activation
133 @user.status = User::STATUS_ACTIVE
133 @user.status = User::STATUS_ACTIVE
134 if @user.save
134 if @user.save
135 flash[:notice] = l(:notice_account_activated)
135 flash[:notice] = l(:notice_account_activated)
136 redirect_to :action => 'login'
136 redirect_to :action => 'login'
137 end
137 end
138 else
138 else
139 # Manual activation by the administrator
139 # Manual activation by the administrator
140 if @user.save
140 if @user.save
141 # Sends an email to the administrators
141 # Sends an email to the administrators
142 Mailer.deliver_account_activation_request(@user)
142 Mailer.deliver_account_activation_request(@user)
143 flash[:notice] = l(:notice_account_pending)
143 flash[:notice] = l(:notice_account_pending)
144 redirect_to :action => 'login'
144 redirect_to :action => 'login'
145 end
145 end
146 end
146 end
147 end
147 end
148 end
148 end
149
149
150 # Token based account activation
150 # Token based account activation
151 def activate
151 def activate
152 redirect_to(home_url) && return unless Setting.self_registration? && params[:token]
152 redirect_to(home_url) && return unless Setting.self_registration? && params[:token]
153 token = Token.find_by_action_and_value('register', params[:token])
153 token = Token.find_by_action_and_value('register', params[:token])
154 redirect_to(home_url) && return unless token and !token.expired?
154 redirect_to(home_url) && return unless token and !token.expired?
155 user = token.user
155 user = token.user
156 redirect_to(home_url) && return unless user.status == User::STATUS_REGISTERED
156 redirect_to(home_url) && return unless user.status == User::STATUS_REGISTERED
157 user.status = User::STATUS_ACTIVE
157 user.status = User::STATUS_ACTIVE
158 if user.save
158 if user.save
159 token.destroy
159 token.destroy
160 flash[:notice] = l(:notice_account_activated)
160 flash[:notice] = l(:notice_account_activated)
161 end
161 end
162 redirect_to :action => 'login'
162 redirect_to :action => 'login'
163 end
163 end
164
164
165 private
165 private
166 def logged_user=(user)
166 def logged_user=(user)
167 if user && user.is_a?(User)
167 if user && user.is_a?(User)
168 User.current = user
168 User.current = user
169 session[:user_id] = user.id
169 session[:user_id] = user.id
170 else
170 else
171 User.current = User.anonymous
171 User.current = User.anonymous
172 session[:user_id] = nil
172 session[:user_id] = nil
173 end
173 end
174 end
174 end
175 end
175 end
General Comments 0
You need to be logged in to leave comments. Login now