tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AuthenticationController: use Auth() helper function

This commit is contained in:
Thomas Gelf 2014-06-22 20:08:55 +02:00
parent 23ed744747
commit 3fc1205175
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/controllers/AuthenticationController.php
View File

@ -32,7 +32,6 @@
use Icinga\Authentication\Backend\AutoLoginBackend; use Icinga\Authentication\Backend\AutoLoginBackend;
use Icinga\Web\Controller\ActionController; use Icinga\Web\Controller\ActionController;
use Icinga\Authentication\Manager as AuthManager;
use Icinga\Form\Authentication\LoginForm; use Icinga\Form\Authentication\LoginForm;
use Icinga\Authentication\AuthChain; use Icinga\Authentication\AuthChain;
use Icinga\Application\Config; use Icinga\Application\Config;
@ -60,14 +59,13 @@ class AuthenticationController extends ActionController
*/ */
public function loginAction() public function loginAction()
{ {
$auth = $this->Auth();
$this->view->form = new LoginForm(); $this->view->form = new LoginForm();
$this->view->form->setRequest($this->_request); $this->view->form->setRequest($this->_request);
$this->view->title = $this->translate('Icingaweb Login'); $this->view->title = $this->translate('Icingaweb Login');
try { try {
$redirectUrl = Url::fromPath($this->params->get('redirect', 'dashboard')); $redirectUrl = Url::fromPath($this->params->get('redirect', 'dashboard'));
$auth = AuthManager::getInstance();
if ($auth->isAuthenticated()) { if ($auth->isAuthenticated()) {
$this->rerenderLayout()->redirectNow($redirectUrl); $this->rerenderLayout()->redirectNow($redirectUrl);
@ -150,7 +148,7 @@ class AuthenticationController extends ActionController
*/ */
public function logoutAction() public function logoutAction()
{ {
$auth = AuthManager::getInstance(); $auth = $this->Auth();
$auth->removeAuthorization(); $auth->removeAuthorization();
if ($auth->isAuthenticatedFromRemoteUser()) { if ($auth->isAuthenticatedFromRemoteUser()) {