Login sempre minusculo
This commit is contained in:
@@ -40,6 +40,7 @@ class UsersController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def update
|
def update
|
||||||
|
params[:user][:login].downcase!
|
||||||
raise AccessDenied.new unless (params[:user][:login] == @user.login)
|
raise AccessDenied.new unless (params[:user][:login] == @user.login)
|
||||||
raise AccessDenied.new unless (params[:user][:admin].nil? or @current_user.admin?)
|
raise AccessDenied.new unless (params[:user][:admin].nil? or @current_user.admin?)
|
||||||
@user.admin = !params[:user][:admin].nil?
|
@user.admin = !params[:user][:admin].nil?
|
||||||
@@ -67,6 +68,7 @@ class UsersController < ApplicationController
|
|||||||
def signup
|
def signup
|
||||||
if request.post?
|
if request.post?
|
||||||
begin
|
begin
|
||||||
|
@user.login.downcase!
|
||||||
@user.last_seen = Time.now.utc
|
@user.last_seen = Time.now.utc
|
||||||
@user.save!
|
@user.save!
|
||||||
setup_session(@user)
|
setup_session(@user)
|
||||||
@@ -81,6 +83,7 @@ class UsersController < ApplicationController
|
|||||||
def settings
|
def settings
|
||||||
@user = @current_user
|
@user = @current_user
|
||||||
if request.post?
|
if request.post?
|
||||||
|
params[:user][:login].downcase!
|
||||||
@user.attributes = params[:user]
|
@user.attributes = params[:user]
|
||||||
@user.save!
|
@user.save!
|
||||||
@color = @user.pref_color
|
@color = @user.pref_color
|
||||||
@@ -91,6 +94,7 @@ class UsersController < ApplicationController
|
|||||||
|
|
||||||
def login
|
def login
|
||||||
if request.post?
|
if request.post?
|
||||||
|
params[:user][:login].downcase!
|
||||||
@user = User.find_by_login_and_pass(params[:user][:login], params[:user][:password])
|
@user = User.find_by_login_and_pass(params[:user][:login], params[:user][:password])
|
||||||
if !@user.nil?
|
if !@user.nil?
|
||||||
setup_session(@user, (params[:remember_me] == "1"))
|
setup_session(@user, (params[:remember_me] == "1"))
|
||||||
|
|||||||
@@ -27,7 +27,9 @@ class User < ActiveRecord::Base
|
|||||||
validates_presence_of :login, :email, :display_name
|
validates_presence_of :login, :email, :display_name
|
||||||
validates_uniqueness_of :login, :email, :display_name
|
validates_uniqueness_of :login, :email, :display_name
|
||||||
|
|
||||||
|
validates_format_of :login, :with => /^[^0-9]/
|
||||||
validates_format_of :display_name, :with => /^[^0-9]/
|
validates_format_of :display_name, :with => /^[^0-9]/
|
||||||
|
|
||||||
validates_format_of :email,
|
validates_format_of :email,
|
||||||
:with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
|
:with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user