gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-18 02:59:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make autoLogin and enableGuestAutoLogin work together

Browse Source
This commit is contained in:
Uwe Steinmann 2016-02-02 10:02:13 +01:00
parent 76f5a89f92
commit c45f88ce3d
1 changed files with 38 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
inc/inc.Authentication.php
View File

@ -31,26 +31,8 @@ if (!isset($_COOKIE["mydms_session"])) {
exit; exit;
} }
$resArr = $session->load($dms_session); $resArr = $session->load($dms_session);
} else { } elseif($settings->_autoLoginUser) {
header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer); require_once("../inc/inc.ClassSession.php");
exit;
}
} else {
/* Load session */
$dms_session = $_COOKIE["mydms_session"];
$session = new SeedDMS_Session($db);
if(!$resArr = $session->load($dms_session)) {
setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot); //delete cookie
header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
exit;
}
}
/* Update last access time */
$session->updateAccess($dms_session);
if (!isset($_COOKIE["mydms_session"])) {
if($settings->_autoLoginUser) {
if(!($user = $dms->getUser($settings->_autoLoginUser))/* || !$user->isGuest()*/) { if(!($user = $dms->getUser($settings->_autoLoginUser))/* || !$user->isGuest()*/) {
header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer); header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
exit; exit;
@ -66,17 +48,11 @@ if (!isset($_COOKIE["mydms_session"])) {
$user->setLanguage($lang); $user->setLanguage($lang);
} }
$session = new SeedDMS_Session($db); $session = new SeedDMS_Session($db);
if(!$id = $session->create(array('userid'=>$user->getID(), 'theme'=>$theme, 'lang'=>$lang))) { if(!$dms_session = $session->create(array('userid'=>$user->getID(), 'theme'=>$theme, 'lang'=>$lang))) {
header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer); header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
exit; exit;
} }
/* $resArr = $session->load($dms_session);
if($settings->_cookieLifetime)
$lifetime = time() + intval($settings->_cookieLifetime);
else
$lifetime = 0;
setcookie("mydms_session", $id, $lifetime, $settings->_httpRoot, null, null, !$settings->_enableLargeFileUpload);
*/
} else { } else {
header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer); header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
exit; exit;
@ -90,10 +66,12 @@ if (!isset($_COOKIE["mydms_session"])) {
header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer); header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
exit; exit;
} }
}
/* Update last access time */ /* Update last access time */
$session->updateAccess($dms_session); $session->updateAccess($dms_session);
/* Load user data */
/* Load user data */
$user = $dms->getUser($resArr["userID"]); $user = $dms->getUser($resArr["userID"]);
if (!is_object($user)) { if (!is_object($user)) {
setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot); //delete cookie setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot); //delete cookie
@ -110,7 +88,6 @@ if (!isset($_COOKIE["mydms_session"])) {
} }
$theme = $resArr["theme"]; $theme = $resArr["theme"];
$lang = $resArr["language"]; $lang = $resArr["language"];
}
$dms->setUser($user); $dms->setUser($user);
if($settings->_enableEmail) { if($settings->_enableEmail) {