Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-03 07:04:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

* [FIX] Some view's variables weren't set when user wasn't logged in. Thanks to @vmario89 for the notice. Closes #1094

Browse Source 
Signed-off-by: nuxsmin <nuxsmin@syspass.org>
This commit is contained in:
nuxsmin
2018-11-07 00:06:32 +01:00
parent f0959f0e9c
commit 5e1ed32d76
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/modules/web/Controllers/ControllerBase.php
View File

@@ -98,19 +98,20 @@ abstract class ControllerBase
$this->setUp($container);
$this->view = $this->dic->get(Template::class);
$this->view->setBase(strtolower($this->controllerName));
$this->isAjax = $this->request->isAjax();
$this->previousSk = $this->session->getSecurityKey();
if ($this->session->isLoggedIn()) {
$loggedIn = $this->session->isLoggedIn();
if ($loggedIn) {
$this->userData = clone $this->session->getUserData();
$this->userProfileData = clone $this->session->getUserProfile();
$this->setViewVars();
}
$this->setViewVars($loggedIn);
if (method_exists($this, 'initialize')) {
$this->initialize();
}
@@ -118,19 +119,25 @@ abstract class ControllerBase
/**
* Set view variables
*
* @param bool $loggedIn
*/
private function setViewVars()
private function setViewVars($loggedIn = false)
{
$this->view->assign('timeStart', $this->request->getServer('REQUEST_TIME_FLOAT'));
$this->view->assign('queryTimeStart', microtime());
$this->view->assign('ctx_userId', $this->userData->getId());
$this->view->assign('ctx_userGroupId', $this->userData->getUserGroupId());
$this->view->assign('ctx_userIsAdminApp', $this->userData->getIsAdminApp());
$this->view->assign('ctx_userIsAdminAcc', $this->userData->getIsAdminAcc());
$this->view->assign('themeUri', $this->view->getTheme()->getThemeUri());
if ($loggedIn) {
$this->view->assign('ctx_userId', $this->userData->getId());
$this->view->assign('ctx_userGroupId', $this->userData->getUserGroupId());
$this->view->assign('ctx_userIsAdminApp', $this->userData->getIsAdminApp());
$this->view->assign('ctx_userIsAdminAcc', $this->userData->getIsAdminAcc());
}
$this->view->assign('isDemo', $this->configData->isDemoEnabled());
$this->view->assign('themeUri', $this->view->getTheme()->getThemeUri());
$this->view->assign('configData', $this->configData);
$this->view->assign('sk', $this->session->isLoggedIn() ? $this->session->generateSecurityKey() : '');
$this->view->assign('sk', $loggedIn ? $this->session->generateSecurityKey() : '');
// Pass the action name to the template as a variable
$this->view->assign($this->actionName, true);