bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #2437 from annando/1604-session

Browse source 
"remember me" in session does work now
This commit is contained in:
Tobias Diekershoff 2016-04-06 08:08:21 +02:00
commit 9d2864fc58
2 changed files with 8 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
include/auth.php
View file

@ -5,35 +5,14 @@ require_once('include/security.php');
require_once('include/datetime.php'); require_once('include/datetime.php');
function nuke_session() { function nuke_session() {
if (get_config('system', 'disable_database_session')) {
session_unset();
return;
}
new_cookie(0); // make sure cookie is deleted on browser close, as a security measure new_cookie(0); // make sure cookie is deleted on browser close, as a security measure
session_unset();
unset($_SESSION['authenticated']);
unset($_SESSION['uid']);
unset($_SESSION['visitor_id']);
unset($_SESSION['administrator']);
unset($_SESSION['cid']);
unset($_SESSION['theme']);
unset($_SESSION['mobile-theme']);
unset($_SESSION['page_flags']);
unset($_SESSION['submanage']);
unset($_SESSION['my_url']);
unset($_SESSION['my_address']);
unset($_SESSION['addr']);
unset($_SESSION['return_url']);
} }
// login/logout // login/logout
if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-params'))) || ($_POST['auth-params'] !== 'login'))) { if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-params'))) || ($_POST['auth-params'] !== 'login'))) {
if(((x($_POST,'auth-params')) && ($_POST['auth-params'] === 'logout')) || ($a->module === 'logout')) { if(((x($_POST,'auth-params')) && ($_POST['auth-params'] === 'logout')) || ($a->module === 'logout')) {
@ -41,6 +20,7 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
// process logout request // process logout request
call_hooks("logging_out"); call_hooks("logging_out");
nuke_session(); nuke_session();
new_cookie(-1);
info( t('Logged out.') . EOL); info( t('Logged out.') . EOL);
goaway(z_root()); goaway(z_root());
} }
@ -90,8 +70,7 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
} }
authenticate_success($r[0], false, false, $login_refresh); authenticate_success($r[0], false, false, $login_refresh);
} }
} } else {
else {
if(isset($_SESSION)) { if(isset($_SESSION)) {
nuke_session(); nuke_session();
@ -209,13 +188,11 @@ else {
} }
function new_cookie($time) { function new_cookie($time) {
if (!get_config('system', 'disable_database_session'))
$old_sid = session_id();
session_set_cookie_params($time); if ($time != 0)
$time = $time + time();
if (!get_config('system', 'disable_database_session')) { $params = session_get_cookie_params();
session_regenerate_id(false); setcookie(session_name(), session_id(), $time, $params['path'], $params['domain'], $params['secure'], isset($params['httponly']));
q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid)); return;
}
} }

1
include/session.php
View file

@ -69,7 +69,6 @@ function ref_session_destroy ($id) {
if(! function_exists('ref_session_gc')) { if(! function_exists('ref_session_gc')) {
function ref_session_gc($expire) { function ref_session_gc($expire) {
q("DELETE FROM `session` WHERE `expire` < %d", dbesc(time())); q("DELETE FROM `session` WHERE `expire` < %d", dbesc(time()));
//q("OPTIMIZE TABLE `sess_data`");
return true; return true;
}} }}