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

* [MOD] Improved template rendering

Browse Source 
* [MOD] Improved variable errors on templates
* [MOD] Improved security token behavior
* [MOD] Code refactoring

Signed-off-by: nuxsmin <nuxsmin@syspass.org>
This commit is contained in:
nuxsmin
2018-10-23 00:56:05 +02:00
parent e322563a66
commit e49526e594
147 changed files with 2613 additions and 1751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,9 +73,13 @@ abstract class ControllerBase
*/
protected $dic;
/**
* @var
* @var bool
*/
protected $isAjax = false;
/**
* @var string
*/
protected $previousSk;
/**
* Constructor
@@ -98,6 +102,7 @@ abstract class ControllerBase
$this->view->setBase(strtolower($this->controllerName));
$this->isAjax = $this->request->isAjax();
$this->previousSk = $this->session->getSecurityKey();
if ($this->session->isLoggedIn()) {
$this->userData = clone $this->session->getUserData();
@@ -116,7 +121,7 @@ abstract class ControllerBase
*/
private function setViewVars()
{
$this->view->assign('timeStart', $this->router->request()->server()->get('REQUEST_TIME_FLOAT'));
$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());
@@ -126,9 +131,10 @@ abstract class ControllerBase
$this->view->assign('isDemo', $this->configData->isDemoEnabled());
$this->view->assign('icons', $this->theme->getIcons());
$this->view->assign('configData', $this->configData);
$this->view->assign('sk', $this->session->isLoggedIn() ? $this->session->generateSecurityKey() : '');
// Pass the action name to the template as a variable
$this->view->assign($this->actionName);
$this->view->assign($this->actionName, true);
}
/**