caboose-cms 0.2.93 → 0.2.94
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
NGUwMmFkNzY5NTVlYWJkYmNlMmUyZmQzMjc4NTk2NmFhN2Q0NTZjZA==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
ZmNlNjg1OTgzOWMyYmZiMmFjNGNkY2I5MTllMzM4OGEyZmY3MmQwNA==
|
7
7
|
!binary "U0hBNTEy":
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
NThiN2FlNjM5M2Q5YzIyOGFjN2RlZGM2Y2FlZjFkMTBiYzVmZTQ5NjY3Zjdm
|
10
|
+
YWYwYmMxYmFiMmIzNTdmNTkwY2ZkOGQ1MTk0ZWFiOGJjOTI0MjAyOGMwODkw
|
11
|
+
ZjU4MWQxZTA4MjYxMzUwYzMwYmJmOWQzZDNkMDU5ZDIzMmFkNGQ=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
YmY4OGNkODZkZWRhOTIzODRkZmJhNWUxOWI2NGU3NDNhYWExMDRiMDRiNTVm
|
14
|
+
YmJmOWVhNjRjNjUyODg5M2UwNmJhMmUxYTI4NTMwOGIxZTEwY2U4Y2IwMzRm
|
15
|
+
NjdjNDc0MTk0OTQ3ZGJiZTIzYWRhZDU2M2I0MmE4NWE5ZjQwMjY=
|
@@ -29,13 +29,17 @@ module Caboose
|
|
29
29
|
end
|
30
30
|
|
31
31
|
# Logs in a user
|
32
|
-
def login_user(user)
|
32
|
+
def login_user(user, remember = false)
|
33
33
|
session["app_user"] = user
|
34
|
+
cookies.permanent[:caboose_user_id] = user.id if remember
|
35
|
+
Caboose.log("remember = #{remember}")
|
36
|
+
Caboose.log(cookies[:caboose_user_id])
|
34
37
|
end
|
35
38
|
|
36
39
|
# Returns whether or not a user is logged in
|
37
40
|
def logged_in?
|
38
41
|
validate_token
|
42
|
+
validate_cookie
|
39
43
|
return true if !session["app_user"].nil? && session["app_user"] != false && session["app_user"].id != -1
|
40
44
|
return false
|
41
45
|
end
|
@@ -53,6 +57,16 @@ module Caboose
|
|
53
57
|
return true
|
54
58
|
end
|
55
59
|
|
60
|
+
# Checks to see if a remember me cookie value is present.
|
61
|
+
def validate_cookie
|
62
|
+
if cookies[:caboose_user_id] && User.exists?(cookies[:caboose_user_id])
|
63
|
+
user = User.find(cookies[:caboose_user_id])
|
64
|
+
login_user(user)
|
65
|
+
return true
|
66
|
+
end
|
67
|
+
return false
|
68
|
+
end
|
69
|
+
|
56
70
|
# Returns the currently logged in user
|
57
71
|
def logged_in_user
|
58
72
|
if (!logged_in?)
|
@@ -31,7 +31,8 @@ module Caboose
|
|
31
31
|
if (user.nil? || user == false)
|
32
32
|
resp.error = "Invalid credentials"
|
33
33
|
else
|
34
|
-
|
34
|
+
remember = params[:remember] && (params[:remember] == 1 || params[:remember] == "1")
|
35
|
+
login_user(user, remember)
|
35
36
|
resp.redirect = return_url
|
36
37
|
end
|
37
38
|
end
|
@@ -7,6 +7,7 @@
|
|
7
7
|
<input type='hidden' name='return_url' value='<%= @return_url %>' />
|
8
8
|
<input type='text' name='username' id='username' placeholder='Login or email' />
|
9
9
|
<input type='password' name='password' id='password' placeholder='Password' />
|
10
|
+
<input type='checkbox' name='remember' id='remember' value='1' checked='true' /> Remember me
|
10
11
|
<div id='message'></div>
|
11
12
|
<p>
|
12
13
|
<input type='button' id='btn_cancel' value='Cancel' onclick="parent.$.fn.colorbox.close();" />
|
data/lib/caboose/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: caboose-cms
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.
|
4
|
+
version: 0.2.94
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- William Barry
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2013-11-
|
11
|
+
date: 2013-11-27 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|