mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

[ticket/16207] Add session.force_sid parameter to allow fixing settings

Browse Source 
PHPBB3-16207
This commit is contained in:
Marc Alexander
2021-07-17 21:30:42 +02:00
parent 5b68527eec
commit fe1b9d5384
4 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/phpbb/di/extension/container_configuration.php
View File

@@ -62,6 +62,7 @@ class container_configuration implements ConfigurationInterface
->arrayNode('session')
->addDefaultsIfNotSet()
->children()
->booleanNode('force_sid')->defaultValue(false)->end()
->booleanNode('log_errors')->defaultValue(false)->end()
->end()
->end()

15
phpBB/phpbb/session.php
View File

@@ -478,7 +478,7 @@ class session
*/
function session_create($user_id = false, $set_admin = false, $persist_login = false, $viewonline = true)
{
global $db, $config, $cache, $phpbb_container, $phpbb_dispatcher;
global $SID, $_SID, $db, $config, $cache, $phpbb_container, $phpbb_dispatcher;
$this->data = array();
@@ -689,6 +689,8 @@ class session
$db->sql_query($sql);
}
$SID = '?sid=';
$_SID = '';
return true;
}
else
@@ -781,6 +783,11 @@ class session
}
// refresh data
if ($phpbb_container->getParameter('session.force_sid'))
{
$SID = '?sid=' . $this->session_id;
$_SID = $this->session_id;
}
$this->data = array_merge($this->data, $sql_ary);
if (!$bot)
@@ -820,6 +827,12 @@ class session
SET user_lastvisit = ' . (int) $this->data['session_time'] . '
WHERE user_id = ' . (int) $this->data['user_id'];
$db->sql_query($sql);
if ($phpbb_container->getParameter('session.force_sid'))
{
$SID = '?sid=';
$_SID = '';
}
}
$session_data = $sql_ary;