From 4d15cda89967afe40b64e10899885a20b7d1663e Mon Sep 17 00:00:00 2001
From: einhornimmond <dario.rekowski@gmx.de>
Date: Thu, 29 Apr 2021 20:09:37 +0200
Subject: [PATCH] change order of session_id

---
 community_server/src/Controller/AppController.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/community_server/src/Controller/AppController.php b/community_server/src/Controller/AppController.php
index 98a690bd1..1cdcf4418 100644
--- a/community_server/src/Controller/AppController.php
+++ b/community_server/src/Controller/AppController.php
@@ -167,13 +167,15 @@ class AppController extends Controller
             $php_session_id = intval($session->read('session_id'));
         }
         $cookie_session_id = intval($this->request->getCookie('GRADIDO_LOGIN', ''));
-        if($php_session_id != 0) {
+        // decide in which order session_ids are tried
+        if($sessionId != 0) {
+            $session_id = $sessionId;
+        } else 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')) {
             $session->write('client_ip', $ip);