| @@ -293,7 +293,7 class AccountController < ApplicationController | |||||
| 293 | token = Token.new(:user => user, :action => "register") |
|
293 | token = Token.new(:user => user, :action => "register") | |
| 294 | if user.save and token.save |
|
294 | if user.save and token.save | |
| 295 | Mailer.register(token).deliver |
|
295 | Mailer.register(token).deliver | |
| 296 | flash[:notice] = l(:notice_account_register_done, :email => user.mail) |
|
296 | flash[:notice] = l(:notice_account_register_done, :email => ERB::Util.h(user.mail)) | |
| 297 | redirect_to signin_path |
|
297 | redirect_to signin_path | |
| 298 | else |
|
298 | else | |
| 299 | yield if block_given? |
|
299 | yield if block_given? | |
| @@ -51,7 +51,7 class AdminController < ApplicationController | |||||
| 51 | Redmine::DefaultData::Loader::load(params[:lang]) |
|
51 | Redmine::DefaultData::Loader::load(params[:lang]) | |
| 52 | flash[:notice] = l(:notice_default_data_loaded) |
|
52 | flash[:notice] = l(:notice_default_data_loaded) | |
| 53 | rescue Exception => e |
|
53 | rescue Exception => e | |
| 54 | flash[:error] = l(:error_can_t_load_default_data, e.message) |
|
54 | flash[:error] = l(:error_can_t_load_default_data, ERB::Util.h(e.message)) | |
| 55 | end |
|
55 | end | |
| 56 | end |
|
56 | end | |
| 57 | redirect_to admin_path |
|
57 | redirect_to admin_path | |
| @@ -63,9 +63,9 class AdminController < ApplicationController | |||||
| 63 | ActionMailer::Base.raise_delivery_errors = true |
|
63 | ActionMailer::Base.raise_delivery_errors = true | |
| 64 | begin |
|
64 | begin | |
| 65 | @test = Mailer.test_email(User.current).deliver |
|
65 | @test = Mailer.test_email(User.current).deliver | |
| 66 | flash[:notice] = l(:notice_email_sent, User.current.mail) |
|
66 | flash[:notice] = l(:notice_email_sent, ERB::Util.h(User.current.mail)) | |
| 67 | rescue Exception => e |
|
67 | rescue Exception => e | |
| 68 | flash[:error] = l(:notice_email_error, Redmine::CodesetUtil.replace_invalid_utf8(e.message.dup)) |
|
68 | flash[:error] = l(:notice_email_error, ERB::Util.h(Redmine::CodesetUtil.replace_invalid_utf8(e.message.dup))) | |
| 69 | end |
|
69 | end | |
| 70 | ActionMailer::Base.raise_delivery_errors = raise_delivery_errors |
|
70 | ActionMailer::Base.raise_delivery_errors = raise_delivery_errors | |
| 71 | redirect_to settings_path(:tab => 'notifications') |
|
71 | redirect_to settings_path(:tab => 'notifications') | |
General Comments 0
You need to be logged in to leave comments.
Login now