IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix order in which to check for session_id

Browse Source
This commit is contained in:
Dario Rekowski on RockPI 2021-04-13 11:18:07 +00:00
parent 993b0e0e3a
commit 4c025d348b
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
community_server/src/Controller/AppController.php
View File

@ -156,18 +156,23 @@ class AppController extends Controller
}
}
protected function requestLogin($session_id = 0, $redirect = true)
protected function requestLogin($sessionId = 0, $redirect = true)
{
$session = $this->getRequest()->getSession();
// check login
// disable encryption for cookies
//$this->Cookie->configKey('User', 'encryption', false);
if(!$session_id) {
$session_id = intval($this->request->getCookie('GRADIDO_LOGIN', ''));
// TODO: This is unclear if correct
if($session_id == 0 && $session->check('session_id')) {
$session_id = intval($session->read('session_id'));
}
$session_id = 0;
$php_session_id = 0;
if($session->check('session_id')) {
$php_session_id = intval($session->read('session_id'));
}
$cookie_session_id = intval($this->request->getCookie('GRADIDO_LOGIN', ''));
if($php_session_id != 0) {
$session_id = $php_session_id;
} else if($cookie_session_id != 0) {
$session_id = $cookie_session_id;
} else {
$session_id = $sessionId;
}
$ip = $this->request->clientIp();
if (!$session->check('client_ip')) {