IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove trailing whitespaces ❤️

Browse Source
This commit is contained in:
Gosha Arinich
2013-02-25 19:42:20 +03:00
parent b50e0536c7
commit cafc75b238
383 changed files with 4220 additions and 2221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/current_user.rb
View File

@@ -7,7 +7,7 @@ module CurrentUser
def self.lookup_from_auth_token(auth_token)
if auth_token && auth_token.length == 32
User.where(auth_token: auth_token).first
User.where(auth_token: auth_token).first
end
end
@@ -28,12 +28,12 @@ module CurrentUser
return @current_user if @current_user || @not_logged_in
if session[:current_user_id].blank?
# maybe we have a cookie?
# maybe we have a cookie?
@current_user = CurrentUser.lookup_from_auth_token(cookies["_t"])
session[:current_user_id] = @current_user.id if @current_user
else
@current_user ||= User.where(id: session[:current_user_id]).first
# I have flip flopped on this (sam), if our permanent cookie
# conflicts with our current session assume session is bust
# kill it
@@ -43,13 +43,13 @@ module CurrentUser
end
if @current_user && @current_user.is_banned?
if @current_user && @current_user.is_banned?
@current_user = nil
end
@not_logged_in = session[:current_user_id].blank?
if @current_user
@current_user.update_last_seen!
@current_user.update_last_seen!
@current_user.update_ip_address!(request.remote_ip)
end
@current_user