tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-28 08:14:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

lib/Web: Set up request before setting up the user

Browse Source 
refs #9660
This commit is contained in:
Eric Lippmann 2015-07-29 17:22:10 +02:00
parent db48a944e3
commit ce2a196c4a
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
library/Icinga/Application/Web.php
View File

@ -91,11 +91,11 @@ class Web extends ApplicationBootstrap
->setupResourceFactory() ->setupResourceFactory()
->setupSession() ->setupSession()
->setupNotifications() ->setupNotifications()
->setupRequest()
->setupUser() ->setupUser()
->setupTimezone() ->setupTimezone()
->setupLogger() ->setupLogger()
->setupInternationalization() ->setupInternationalization()
->setupRequest()
->setupZendMvc() ->setupZendMvc()
->setupFormNamespace() ->setupFormNamespace()
->setupModuleManager() ->setupModuleManager()
@ -191,7 +191,9 @@ class Web extends ApplicationBootstrap
{ {
$auth = Auth::getInstance(); $auth = Auth::getInstance();
if ($auth->isAuthenticated()) { if ($auth->isAuthenticated()) {
$this->user = $auth->getUser(); $user = $auth->getUser();
$this->request->setUser($user);
$this->user = $user;
} }
return $this; return $this;
} }
@ -219,16 +221,13 @@ class Web extends ApplicationBootstrap
} }
/** /**
* Inject dependencies into request * Set the request
* *
* @return $this * @return $this
*/ */
private function setupRequest() private function setupRequest()
{ {
$this->request = new Request(); $this->request = new Request();
if ($this->user instanceof User) {
$this->request->setUser($this->user);
}
return $this; return $this;
} }