X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/40ec4734fb1e4d23a0a0f468e66dde1e180fb0ca..746bfd0a4838268eaf745e85e0e27b5acf9cf64a:/app/controllers/sessions_controller.rb?ds=sidebyside diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 9489553a8..3c2084a5b 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -20,11 +20,11 @@ class SessionsController < ApplicationController def create session[:remember_me] ||= params[:remember_me] session[:referer] = safe_referer(params[:referer]) if params[:referer] - password_authentication(params[:username], params[:password]) + password_authentication(params[:username].strip, params[:password]) end def destroy - @title = t "sessions.destroy.title" + @title = t ".title" if request.post? if session[:token] @@ -52,7 +52,7 @@ class SessionsController < ApplicationController elsif (user = User.authenticate(:username => username, :password => password, :pending => true)) unconfirmed_login(user) elsif User.authenticate(:username => username, :password => password, :suspended => true) - failed_login t("sessions.new.account is suspended", :webmaster => "mailto:#{Settings.support_email}").html_safe, username + failed_login({ :partial => "sessions/suspended_flash" }, username) else failed_login t("sessions.new.auth failure"), username end