extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-28 10:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

small change in session-handler to be able to set a session-id for Collabora

Browse Source
This commit is contained in:
Ralf Becker 2020-09-25 13:33:12 +02:00
parent 0d9849657c
commit 8c30429d53
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/Session.php
View File

@ -2019,10 +2019,11 @@ class Session
/** /**
* Initialise the used session handler * Initialise the used session handler
* *
* @param string? $sessionid =null default use self::get_sessionid()
* @return boolean true if we have a session, false otherwise * @return boolean true if we have a session, false otherwise
* @throws \ErrorException if there is no PHP session support * @throws \ErrorException if there is no PHP session support
*/ */
public static function init_handler() public static function init_handler($sessionid=null)
{ {
switch(session_status()) switch(session_status())
{ {
@ -2032,7 +2033,7 @@ class Session
if (headers_sent()) return false; // only gives warnings if (headers_sent()) return false; // only gives warnings
ini_set('session.use_cookies',0); // disable the automatic use of cookies, as it uses the path / by default ini_set('session.use_cookies',0); // disable the automatic use of cookies, as it uses the path / by default
session_name(self::EGW_SESSION_NAME); session_name(self::EGW_SESSION_NAME);
if (($sessionid = self::get_sessionid())) if (isset($sessionid) || ($sessionid = self::get_sessionid()))
{ {
session_id($sessionid); session_id($sessionid);
self::cache_control(); self::cache_control();