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

Move concrete UserBackend classes to Icinga\Authentication\User 

refs #8826
This commit is contained in:
Johannes Meyer 2015-04-21 12:51:31 +02:00
parent 39473e8939
commit 6ca68f438d
9 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/AuthenticationController.php
View File

@ -7,7 +7,7 @@ use Icinga\Application\Config;
use Icinga\Application\Icinga; use Icinga\Application\Icinga;
use Icinga\Application\Logger; use Icinga\Application\Logger;
use Icinga\Authentication\AuthChain; use Icinga\Authentication\AuthChain;
use Icinga\Authentication\Backend\ExternalBackend; use Icinga\Authentication\User\ExternalBackend;
use Icinga\Exception\AuthenticationException; use Icinga\Exception\AuthenticationException;
use Icinga\Exception\ConfigurationError; use Icinga\Exception\ConfigurationError;
use Icinga\Exception\NotReadableError; use Icinga\Exception\NotReadableError;

2
application/forms/Config/Authentication/DbBackendForm.php
View File

@ -7,7 +7,7 @@ use Exception;
use Icinga\Web\Form; use Icinga\Web\Form;
use Icinga\Data\ConfigObject; use Icinga\Data\ConfigObject;
use Icinga\Data\ResourceFactory; use Icinga\Data\ResourceFactory;
use Icinga\Authentication\Backend\DbUserBackend; use Icinga\Authentication\User\DbUserBackend;
/** /**
* Form class for adding/modifying database authentication backends * Form class for adding/modifying database authentication backends

2
application/forms/Config/Authentication/LdapBackendForm.php
View File

@ -8,7 +8,7 @@ use Icinga\Web\Form;
use Icinga\Data\ConfigObject; use Icinga\Data\ConfigObject;
use Icinga\Data\ResourceFactory; use Icinga\Data\ResourceFactory;
use Icinga\Exception\AuthenticationException; use Icinga\Exception\AuthenticationException;
use Icinga\Authentication\Backend\LdapUserBackend; use Icinga\Authentication\User\LdapUserBackend;
/** /**
* Form class for adding/modifying LDAP authentication backends * Form class for adding/modifying LDAP authentication backends

3
library/Icinga/Authentication/Backend/DbUserBackend.php → library/Icinga/Authentication/User/DbUserBackend.php
View File

@ -1,10 +1,9 @@
<?php <?php
/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */ /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
namespace Icinga\Authentication\Backend; namespace Icinga\Authentication\User;
use PDO; use PDO;
use Icinga\Authentication\User\UserBackend;
use Icinga\Data\Db\DbConnection; use Icinga\Data\Db\DbConnection;
use Icinga\User; use Icinga\User;
use Icinga\Exception\AuthenticationException; use Icinga\Exception\AuthenticationException;

3
library/Icinga/Authentication/Backend/ExternalBackend.php → library/Icinga/Authentication/User/ExternalBackend.php
View File

@ -1,9 +1,8 @@
<?php <?php
/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */ /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
namespace Icinga\Authentication\Backend; namespace Icinga\Authentication\User;
use Icinga\Authentication\User\UserBackend;
use Icinga\Data\ConfigObject; use Icinga\Data\ConfigObject;
use Icinga\User; use Icinga\User;

3
library/Icinga/Authentication/Backend/LdapUserBackend.php → library/Icinga/Authentication/User/LdapUserBackend.php
View File

@ -1,10 +1,9 @@
<?php <?php
/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */ /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
namespace Icinga\Authentication\Backend; namespace Icinga\Authentication\User;
use Icinga\User; use Icinga\User;
use Icinga\Authentication\User\UserBackend;
use Icinga\Protocol\Ldap\Query; use Icinga\Protocol\Ldap\Query;
use Icinga\Protocol\Ldap\Connection; use Icinga\Protocol\Ldap\Connection;
use Icinga\Exception\AuthenticationException; use Icinga\Exception\AuthenticationException;

3
library/Icinga/Authentication/User/UserBackend.php
View File

@ -4,9 +4,6 @@
namespace Icinga\Authentication\User; namespace Icinga\Authentication\User;
use Countable; use Countable;
use Icinga\Authentication\Backend\ExternalBackend;
use Icinga\Authentication\Backend\DbUserBackend;
use Icinga\Authentication\Backend\LdapUserBackend;
use Icinga\Data\ConfigObject; use Icinga\Data\ConfigObject;
use Icinga\Data\ResourceFactory; use Icinga\Data\ResourceFactory;
use Icinga\Exception\ConfigurationError; use Icinga\Exception\ConfigurationError;

4
modules/setup/application/forms/AdminAccountPage.php
View File

@ -8,8 +8,8 @@ use LogicException;
use Icinga\Web\Form; use Icinga\Web\Form;
use Icinga\Data\ConfigObject; use Icinga\Data\ConfigObject;
use Icinga\Data\ResourceFactory; use Icinga\Data\ResourceFactory;
use Icinga\Authentication\Backend\DbUserBackend; use Icinga\Authentication\User\DbUserBackend;
use Icinga\Authentication\Backend\LdapUserBackend; use Icinga\Authentication\User\LdapUserBackend;
/** /**
* Wizard page to define the initial administrative account * Wizard page to define the initial administrative account

2
modules/setup/library/Setup/Steps/AuthenticationStep.php
View File

@ -7,7 +7,7 @@ use Exception;
use Icinga\Application\Config; use Icinga\Application\Config;
use Icinga\Data\ConfigObject; use Icinga\Data\ConfigObject;
use Icinga\Data\ResourceFactory; use Icinga\Data\ResourceFactory;
use Icinga\Authentication\Backend\DbUserBackend; use Icinga\Authentication\User\DbUserBackend;
use Icinga\Module\Setup\Step; use Icinga\Module\Setup\Step;
class AuthenticationStep extends Step class AuthenticationStep extends Step