mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-11-27 18:10:42 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
75f47b0d73
|
|
@ -135,7 +135,7 @@ class SeedDMS_Controller_Login extends SeedDMS_Controller_Common {
|
||||||
$dms_session = $_COOKIE["mydms_session"];
|
$dms_session = $_COOKIE["mydms_session"];
|
||||||
if(!$resArr = $session->load($dms_session)) {
|
if(!$resArr = $session->load($dms_session)) {
|
||||||
/* Turn off http only cookies if jumploader is enabled */
|
/* Turn off http only cookies if jumploader is enabled */
|
||||||
setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot, null, false, true); //delete cookie
|
setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot, '', false, true); //delete cookie
|
||||||
header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$referuri);
|
header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$referuri);
|
||||||
exit;
|
exit;
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -154,7 +154,7 @@ class SeedDMS_Controller_Login extends SeedDMS_Controller_Common {
|
||||||
$lifetime = time() + intval($settings->_cookieLifetime);
|
$lifetime = time() + intval($settings->_cookieLifetime);
|
||||||
else
|
else
|
||||||
$lifetime = 0;
|
$lifetime = 0;
|
||||||
setcookie("mydms_session", $id, $lifetime, $settings->_httpRoot, null, false, true);
|
setcookie("mydms_session", $id, $lifetime, $settings->_httpRoot, '', false, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user