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

A few little code cleanups

This commit is contained in:
Thomas Gelf 2014-03-31 16:35:28 +00:00
parent 056b8d5395
commit 1beb837783
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/Icinga/Application/Cli.php
View File

@ -37,10 +37,7 @@ use Icinga\Cli\Screen;
use Icinga\Application\Benchmark; use Icinga\Application\Benchmark;
use Icinga\Exception\ProgrammingError; use Icinga\Exception\ProgrammingError;
// @codingStandardsIgnoreStart require_once __DIR__ . '/ApplicationBootstrap.php';
require_once dirname(__FILE__) . '/ApplicationBootstrap.php';
require_once dirname(__FILE__). '/../Exception/ProgrammingError.php';
// @codingStandardsIgnoreStop
class Cli extends ApplicationBootstrap class Cli extends ApplicationBootstrap
{ {

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

@ -29,30 +29,27 @@
namespace Icinga\Application; namespace Icinga\Application;
// @codingStandardsIgnoreStart require_once __DIR__ . '/ApplicationBootstrap.php';
require_once dirname(__FILE__) . '/ApplicationBootstrap.php';
// @codingStandardsIgnoreStop
use \DateTimeZone;
use \Exception;
use \Zend_Layout;
use \Zend_Paginator;
use \Zend_View_Helper_PaginationControl;
use \Zend_Controller_Action_HelperBroker;
use \Zend_Controller_Router_Route;
use \Zend_Controller_Front;
use Icinga\Logger\Logger;
use Icinga\Authentication\Manager as AuthenticationManager; use Icinga\Authentication\Manager as AuthenticationManager;
use Icinga\Exception\ConfigurationError; use Icinga\Exception\ConfigurationError;
use Icinga\Exception\NotReadableError; use Icinga\Exception\NotReadableError;
use Icinga\User; use Icinga\Logger\Logger;
use Icinga\Web\Request; use Icinga\Web\Request;
use Icinga\Web\View; use Icinga\Web\View;
use Icinga\Util\DateTimeFactory;
use Icinga\Web\Session\Session as BaseSession; use Icinga\Web\Session\Session as BaseSession;
use Icinga\Web\Session; use Icinga\Web\Session;
use Icinga\User;
use Icinga\Util\Translator; use Icinga\Util\Translator;
use Icinga\Util\DateTimeFactory;
use DateTimeZone;
use Exception;
use Zend_Layout;
use Zend_Paginator;
use Zend_View_Helper_PaginationControl;
use Zend_Controller_Action_HelperBroker;
use Zend_Controller_Router_Route;
use Zend_Controller_Front;
/** /**
* Use this if you want to make use of Icinga functionality in other web projects * Use this if you want to make use of Icinga functionality in other web projects
@ -219,7 +216,9 @@ class Web extends ApplicationBootstrap
$config = null; $config = null;
} }
$authenticationManager = AuthenticationManager::getInstance($config); $authenticationManager = AuthenticationManager::getInstance($config);
if ($config !== null && $config->global !== null && $config->global->get('authenticationMode', 'internal') === 'external') { if ($config !== null && $config->global !== null &&
$config->global->get('authenticationMode', 'internal') === 'external'
) {
$authenticationManager->authenticateFromRemoteUser(); $authenticationManager->authenticateFromRemoteUser();
} }
if ($authenticationManager->isAuthenticated() === true) { if ($authenticationManager->isAuthenticated() === true) {