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

* [FIX] Fixed search grid behavior

Browse Source
This commit is contained in:
nuxsmin
2018-03-03 11:08:21 +01:00
parent 68b7b0ab31
commit 7ec589a6fe
20 changed files with 273 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,6 +153,8 @@ abstract class ControllerBase
$this->view->setBase(strtolower($this->controllerName));
$this->icons = $this->theme->getIcons();
$this->userData = clone $this->session->getUserData();
$this->userProfileData = clone $this->session->getUserProfile();
$this->setViewVars();
@@ -166,9 +168,6 @@ abstract class ControllerBase
*/
private function setViewVars()
{
$this->userData = $this->session->getUserData();
$this->userProfileData = $this->session->getUserProfile();
$this->view->assign('timeStart', $this->router->request()->server()->get('REQUEST_TIME_FLOAT'));
$this->view->assign('queryTimeStart', microtime());
$this->view->assign('userId', $this->userData->getId());
@@ -240,8 +239,8 @@ abstract class ControllerBase
$browser = $this->dic->get(Browser::class);
// Comprobar si se ha identificado mediante el servidor web y el usuario coincide
if ($browser->checkServerAuthUser($this->session->getUserData()->getLogin()) === false
&& $browser->checkServerAuthUser($this->session->getUserData()->getSsoLogin()) === false
if ($browser->checkServerAuthUser($this->userData->getLogin()) === false
&& $browser->checkServerAuthUser($this->userData->getSsoLogin()) === false
) {
throw new AuthException('Invalid browser auth');
}
@@ -258,6 +257,6 @@ abstract class ControllerBase
*/
protected function checkAccess($action)
{
return $this->session->getUserData()->getIsAdminApp() || $this->acl->checkUserAccess($action);
return $this->userData->getIsAdminApp() || $this->acl->checkUserAccess($action);
}
}