refresh login time every 12 hours for 'Remember me'
This commit is contained in:
parent
e116712bf5
commit
ac164cfca8
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
|
|
||||||
require_once('include/security.php');
|
require_once('include/security.php');
|
||||||
|
require_once('include/datetime.php');
|
||||||
|
|
||||||
function nuke_session() {
|
function nuke_session() {
|
||||||
unset($_SESSION['authenticated']);
|
unset($_SESSION['authenticated']);
|
||||||
|
@ -68,7 +69,18 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
|
||||||
goaway(z_root());
|
goaway(z_root());
|
||||||
}
|
}
|
||||||
|
|
||||||
authenticate_success($r[0]);
|
// Make sure to refresh the last login time for the user if the user
|
||||||
|
// stays logged in for a long time, e.g. with "Remember Me"
|
||||||
|
$login_refresh = false;
|
||||||
|
if(! x($_SESSION['last_login_date'])) {
|
||||||
|
$_SESSION['last_login_date'] = datetime_convert('UTC','UTC');
|
||||||
|
}
|
||||||
|
if( strcmp(datetime_convert('UTC','UTC','now - 12 hours'), $_SESSION['last_login_date']) > 0 ) {
|
||||||
|
|
||||||
|
$_SESSION['last_login_date'] = datetime_convert('UTC','UTC');
|
||||||
|
$login_refresh = true;
|
||||||
|
}
|
||||||
|
authenticate_success($r[0], false, false, $login_refresh);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -191,6 +203,7 @@ else {
|
||||||
|
|
||||||
// if we haven't failed up this point, log them in.
|
// if we haven't failed up this point, log them in.
|
||||||
|
|
||||||
|
$_SESSION['last_login_date'] = datetime_convert('UTC','UTC');
|
||||||
authenticate_success($record, true, true);
|
authenticate_success($record, true, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
function authenticate_success($user_record, $login_initial = false, $interactive = false) {
|
function authenticate_success($user_record, $login_initial = false, $interactive = false, $login_refresh = false) {
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
||||||
|
@ -65,6 +65,8 @@ function authenticate_success($user_record, $login_initial = false, $interactive
|
||||||
|
|
||||||
if($login_initial)
|
if($login_initial)
|
||||||
logger('auth_identities: ' . print_r($a->identities,true), LOGGER_DEBUG);
|
logger('auth_identities: ' . print_r($a->identities,true), LOGGER_DEBUG);
|
||||||
|
if($login_refresh)
|
||||||
|
logger('auth_identities refresh: ' . print_r($a->identities,true), LOGGER_DEBUG);
|
||||||
|
|
||||||
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
|
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
|
||||||
intval($_SESSION['uid']));
|
intval($_SESSION['uid']));
|
||||||
|
@ -76,7 +78,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
|
||||||
|
|
||||||
header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
|
header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
|
||||||
|
|
||||||
if($login_initial) {
|
if($login_initial || $login_refresh) {
|
||||||
$l = get_browser_language();
|
$l = get_browser_language();
|
||||||
|
|
||||||
q("UPDATE `user` SET `login_date` = '%s', `language` = '%s' WHERE `uid` = %d LIMIT 1",
|
q("UPDATE `user` SET `login_date` = '%s', `language` = '%s' WHERE `uid` = %d LIMIT 1",
|
||||||
|
@ -84,7 +86,8 @@ function authenticate_success($user_record, $login_initial = false, $interactive
|
||||||
dbesc($l),
|
dbesc($l),
|
||||||
intval($_SESSION['uid'])
|
intval($_SESSION['uid'])
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
if($login_initial) {
|
||||||
call_hooks('logged_in', $a->user);
|
call_hooks('logged_in', $a->user);
|
||||||
|
|
||||||
if(($a->module !== 'home') && isset($_SESSION['return_url']))
|
if(($a->module !== 'home') && isset($_SESSION['return_url']))
|
||||||
|
|
Loading…
Reference in New Issue
Block a user