Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

This commit is contained in:
Uwe Steinmann 2020-05-26 14:53:41 +02:00
commit 88a3359a9e

View File

@ -70,7 +70,7 @@ if (!isset($_COOKIE["mydms_session"])) {
$dms_session = $_COOKIE["mydms_session"];
$session = new SeedDMS_Session($db);
if(!$resArr = $session->load($dms_session)) {
setcookie("mydms_session", $dms_session, array('expires'=>time()-3600, 'path'=>$settings->_httpRoot)); //delete cookie
setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot); //delete cookie
if(!$isajax)
header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
exit;
@ -84,7 +84,7 @@ if((int)$resArr['lastAccess']+60 < time())
/* Load user data */
$user = $dms->getUser($resArr["userID"]);
if (!is_object($user)) {
setcookie("mydms_session", $dms_session, array('expires'=>time()-3600, 'path'=>$settings->_httpRoot)); //delete cookie
setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot); //delete cookie
if(!$isajax)
header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
exit;
@ -175,5 +175,5 @@ if($settings->_enable2FactorAuthentication && $settings->_guestID != $user->getI
if($settings->_cookieLifetime) {
$lifetime = time() + intval($settings->_cookieLifetime);
/* Turn off http only cookies if jumploader is enabled */
setcookie("mydms_session", $dms_session, array('expires'=>$lifetime, 'path'=>$settings->_httpRoot, 'httponly'=>!$settings->_enableLargeFileUpload));
setcookie("mydms_session", $dms_session, $lifetime, $settings->_httpRoot, null, null, !$settings->_enableLargeFileUpload);
}