jro_apps/redmine Commit - r511:7eb64715595a

Added autologin feature (disabled by default)....

Jean-Philippe Lang -

r511:7eb64715595a

parent child

Context file:

r511:7eb64715595a

Collapse all files

app/controllers/account_controller.rb +7 0

                   user = User.try_to_login(params[:login], params[:password])
                   if user
                     self.logged_in_user = user
+                    # generate a key and set cookie if autologin
+                    if params[:autologin] && Setting.autologin?
+                      token = Token.create(:user => user, :action => 'autologin')
+                      cookies[:autologin] = { :value => token.value, :expires => 1.year.from_now }
+                    end
                     redirect_back_or_default :controller => 'my', :action => 'page'
                   else
                     flash.now[:notice] = l(:notice_account_invalid_creditentials)
               # Log out current user and redirect to welcome page
               def logout
+                cookies.delete :autologin
+                Token.delete_all(["user_id = ? AND action = ?", logged_in_user.id, "autologin"]) if logged_in_user
                 self.logged_in_user = nil
                 redirect_to :controller => 'welcome'
               end

app/controllers/application.rb +7 0

               # check if login is globally required to access the application
               def check_if_login_required
+                # no check needed if user is already logged in
+                return true if logged_in_user
+                # auto-login feature
+                autologin_key = cookies[:autologin]
+                if autologin_key && Setting.autologin?
+                  self.logged_in_user = User.find_by_autologin_key(autologin_key)
+                end
                 require_login if Setting.login_required?
               end

app/models/setting.rb +1 -1

                 end
                 def self.#{name}?
-                  self[:#{name}].to_s == "1"
+                  self[:#{name}].to_i > 0
                 end
                 def self.#{name}=(value)

app/models/user.rb +5 0

                 token = Token.find_by_value(key)
                 token && token.user.active? ? token.user : nil
               end
+              def self.find_by_autologin_key(key)
+                token = Token.find_by_action_and_value('autologin', key)
+                token && (token.created_on > Setting.autologin.to_i.day.ago) && token.user.active? ? token.user : nil
+              end
               def <=>(user)
                 lastname == user.lastname ? firstname <=> user.firstname : lastname <=> user.lastname

app/views/account/login.rhtml +6 -3

             <h2 class="icon22 icon22-authent"><%=l(:label_please_login)%></h2>
             <% form_tag({:action=> "login"}, :class => "tabular") do %>
             <p><label for="login"><%=l(:field_login)%>:</label>
             <%= text_field_tag 'login', nil, :size => 25 %></p>
             <p><label for="password"><%=l(:field_password)%>:</label>
             <%= password_field_tag 'password', nil, :size => 25 %></p>
-            <p><center><input type="submit" name="login" value="<%=l(:button_login)%> &#187;" class="primary" /></center>
+            <% if Setting.autologin? %>
+            <p><label for="autologin"><%= check_box_tag 'autologin' %> <%= l(:label_stay_logged_in) %></label></p>
+            <% end %>
+            <p><input type="submit" name="login" value="<%=l(:button_login)%> &#187;" class="primary" /></p>
             <% end %>
             <%= javascript_tag "Form.Element.focus('login');" %>
-            <br>
             <% links = []
                links << link_to(l(:label_register), :action => 'register') if Setting.self_registration?
                links << link_to(l(:label_password_lost), :action => 'lost_password') if Setting.lost_password?
             %>
             <%= links.join(" | ") %>
-            </p>
             </div>
             </center>

app/views/settings/edit.rhtml +14 -9

@@ -15,15 +15,6
15	<p><label><%= l(:setting_default_language) %></label>	15	<p><label><%= l(:setting_default_language) %></label>
16	<%= select_tag 'settings[default_language]', options_for_select( lang_options_for_select(false), Setting.default_language) %></p>	16	<%= select_tag 'settings[default_language]', options_for_select( lang_options_for_select(false), Setting.default_language) %></p>
17		17
18	<p><label><%= l(:setting_login_required) %></label>
19	<%= check_box_tag 'settings[login_required]', 1, Setting.login_required? %><%= hidden_field_tag 'settings[login_required]', 0 %></p>
20
21	<p><label><%= l(:setting_self_registration) %></label>
22	<%= check_box_tag 'settings[self_registration]', 1, Setting.self_registration? %><%= hidden_field_tag 'settings[self_registration]', 0 %></p>
23
24	<p><label><%= l(:label_password_lost) %></label>
25	<%= check_box_tag 'settings[lost_password]', 1, Setting.lost_password? %><%= hidden_field_tag 'settings[lost_password]', 0 %></p>
26
27	<p><label><%= l(:setting_attachment_max_size) %></label>	18	<p><label><%= l(:setting_attachment_max_size) %></label>
28	<%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %> KB</p>	19	<%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %> KB</p>
29		20
@@ -52,6 +43,20
52	<%= check_box_tag 'settings[sys_api_enabled]', 1, Setting.sys_api_enabled? %><%= hidden_field_tag 'settings[sys_api_enabled]', 0 %></p>	43	<%= check_box_tag 'settings[sys_api_enabled]', 1, Setting.sys_api_enabled? %><%= hidden_field_tag 'settings[sys_api_enabled]', 0 %></p>
53	</div>	44	</div>
54		45
		46	<fieldset class="box"><legend><%= l(:label_authentication) %></legend>
		47	<p><label><%= l(:setting_login_required) %></label>
		48	<%= check_box_tag 'settings[login_required]', 1, Setting.login_required? %><%= hidden_field_tag 'settings[login_required]', 0 %></p>
		49
		50	<p><label><%= l(:setting_autologin) %></label>
		51	<%= select_tag 'settings[autologin]', options_for_select( [[l(:label_disabled), "0"]] + [1, 7, 30, 365].collect{\|days\| [lwr(:actionview_datehelper_time_in_words_day, days), days.to_s]}, Setting.autologin) %></p>
		52
		53	<p><label><%= l(:setting_self_registration) %></label>
		54	<%= check_box_tag 'settings[self_registration]', 1, Setting.self_registration? %><%= hidden_field_tag 'settings[self_registration]', 0 %></p>
		55
		56	<p><label><%= l(:label_password_lost) %></label>
		57	<%= check_box_tag 'settings[lost_password]', 1, Setting.lost_password? %><%= hidden_field_tag 'settings[lost_password]', 0 %></p>
		58	</fieldset>
		59
55	<fieldset class="box"><legend><%= l(:text_issues_ref_in_commit_messages) %></legend>	60	<fieldset class="box"><legend><%= l(:text_issues_ref_in_commit_messages) %></legend>
56	<p><label><%= l(:setting_commit_ref_keywords) %></label>	61	<p><label><%= l(:setting_commit_ref_keywords) %></label>
57	<%= text_field_tag 'settings[commit_ref_keywords]', Setting.commit_ref_keywords, :size => 30 %><br /><em><%= l(:text_coma_separated) %></em></p>	62	<%= text_field_tag 'settings[commit_ref_keywords]', Setting.commit_ref_keywords, :size => 30 %><br /><em><%= l(:text_coma_separated) %></em></p>

config/settings.yml +5 -1

@@ -61,4 +61,8 commit_fix_keywords:
61	commit_fix_status_id:	61	commit_fix_status_id:
62	format: int	62	format: int
63	default: 0	63	default: 0
64	No newline at end of file	64	# autologin duration in days
		65	# 0 means autologin is disabled
		66	autologin:
		67	format: int
		68	default: 0

lang/bg.yml +3 0

             setting_sys_api_enabled: Разрешаване на WS за управление на SVN склада
             setting_commit_ref_keywords: Отбелязващи ключови думи
             setting_commit_fix_keywords: Приключващи ключови думи
+            setting_autologin: Autologin
             label_user: Потребител
             label_user_plural: Потребители
             label_end_to_end: end to end
             label_start_to_start: start to start
             label_start_to_end: start to end
+            label_stay_logged_in: Stay logged in
+            label_disabled: disabled
             button_login: Вход
             button_submit: Изпращане

lang/de.yml +3 0

             setting_sys_api_enabled: Enable WS for repository management
             setting_commit_ref_keywords: Referencing keywords
             setting_commit_fix_keywords: Fixing keywords
+            setting_autologin: Autologin
             label_user: Benutzer
             label_user_plural: Benutzer
             label_end_to_end: end to end
             label_start_to_start: start to start
             label_start_to_end: start to end
+            label_stay_logged_in: Stay logged in
+            label_disabled: disabled
             button_login: Einloggen
             button_submit: OK

lang/en.yml +3 0

             setting_sys_api_enabled: Enable WS for repository management
             setting_commit_ref_keywords: Referencing keywords
             setting_commit_fix_keywords: Fixing keywords
+            setting_autologin: Autologin
             label_user: User
             label_user_plural: Users
             label_end_to_end: end to end
             label_start_to_start: start to start
             label_start_to_end: start to end
+            label_stay_logged_in: Stay logged in
+            label_disabled: disabled
             button_login: Login
             button_submit: Submit

lang/es.yml +3 0

             setting_sys_api_enabled: Enable WS for repository management
             setting_commit_ref_keywords: Referencing keywords
             setting_commit_fix_keywords: Fixing keywords
+            setting_autologin: Autologin
             label_user: Usuario
             label_user_plural: Usuarios
             label_end_to_end: end to end
             label_start_to_start: start to start
             label_start_to_end: start to end
+            label_stay_logged_in: Stay logged in
+            label_disabled: disabled
             button_login: Conexión
             button_submit: Someter

lang/fr.yml +3 0

             setting_sys_api_enabled: Activer les WS pour la gestion des dépôts
             setting_commit_ref_keywords: Mot-clés de référencement
             setting_commit_fix_keywords: Mot-clés de résolution
+            setting_autologin: Autologin
             label_user: Utilisateur
             label_user_plural: Utilisateurs
             label_end_to_end: fin à fin
             label_start_to_start: début à début
             label_start_to_end: début à fin
+            label_stay_logged_in: Rester connecté
+            label_disabled: désactivé
             button_login: Connexion
             button_submit: Soumettre

lang/it.yml +3 0

             setting_sys_api_enabled: Abilita WS per la gestione del repository
             setting_commit_ref_keywords: Referencing keywords
             setting_commit_fix_keywords: Fixing keywords
+            setting_autologin: Autologin
             label_user: Utente
             label_user_plural: Utenti
             label_end_to_end: end to end
             label_start_to_start: start to start
             label_start_to_end: start to end
+            label_stay_logged_in: Stay logged in
+            label_disabled: disabled
             button_login: Login
             button_submit: Invia

lang/ja.yml +3 0

             setting_sys_api_enabled: リポジトリ管理用のWeb Serviceを有効化する
             setting_commit_ref_keywords: Referencing keywords
             setting_commit_fix_keywords: Fixing keywords
+            setting_autologin: Autologin
             label_user: ユーザ
             label_user_plural: ユーザ
             label_end_to_end: end to end
             label_start_to_start: start to start
             label_start_to_end: start to end
+            label_stay_logged_in: Stay logged in
+            label_disabled: disabled
             button_login: ログイン
             button_submit: 変更

lang/pt.yml +3 0

             setting_sys_api_enabled: Ativa WS para gerenciamento do repositorio
             setting_commit_ref_keywords: Referencing keywords
             setting_commit_fix_keywords: Fixing keywords
+            setting_autologin: Autologin
             label_user: Usuario
             label_user_plural: Usuarios
             label_end_to_end: end to end
             label_start_to_start: start to start
             label_start_to_end: start to end
+            label_stay_logged_in: Stay logged in
+            label_disabled: disabled
             button_login: Login
             button_submit: Enviar

lang/zh.yml +3 0

             setting_sys_api_enabled: Enable WS for repository management
             setting_commit_ref_keywords: Referencing keywords
             setting_commit_fix_keywords: Fixing keywords
+            setting_autologin: Autologin
             label_user: 用户
             label_user_plural: 用户列表
             label_end_to_end: end to end
             label_start_to_start: start to start
             label_start_to_end: start to end
+            label_stay_logged_in: Stay logged in
+            label_disabled: disabled
             button_login: 登录
             button_submit: 提交

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages