AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Store PHP sessions in the database

Browse Source
This commit is contained in:
Frédéric Guillot
2017-12-06 16:19:11 -08:00
committed by Frédéric Guillot
parent 421531bd4f
commit ccd177ada6
58 changed files with 405 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Model/LanguageModel.php
View File

@@ -174,11 +174,7 @@ class LanguageModel extends Base
*/
public function getCurrentLanguage()
{
if ($this->userSession->isLogged() && ! empty($this->sessionStorage->user['language'])) {
return $this->sessionStorage->user['language'];
}
return $this->configModel->get('application_language', 'en_US');
return $this->userSession->getLanguage() ?: $this->configModel->get('application_language', 'en_US');
}
/**

6
app/Model/TimezoneModel.php
View File

@@ -39,11 +39,7 @@ class TimezoneModel extends Base
*/
public function getCurrentTimezone()
{
if ($this->userSession->isLogged() && ! empty($this->sessionStorage->user['timezone'])) {
return $this->sessionStorage->user['timezone'];
}
return $this->configModel->get('application_timezone', 'UTC');
return $this->userSession->getTimezone() ?: $this->configModel->get('application_timezone', 'UTC');
}
/**