tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-29 16:54:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix coding style

Browse Source
This commit is contained in:
Matthias Jentsch 2014-07-03 16:20:45 +02:00
parent 86ad5f738b
commit 57f3023ec4
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,7 +160,7 @@ class LdapBackendForm extends BaseBackendForm
*/ */
public function isValidAuthenticationBackend() public function isValidAuthenticationBackend()
{ {
if (!ResourceFactory::ldapAvailable()) { if (! ResourceFactory::ldapAvailable()) {
/* /*
* It should be possible to run icingaweb without the php ldap extension, when * It should be possible to run icingaweb without the php ldap extension, when
* no ldap backends are needed. When the user tries to create an ldap backend * no ldap backends are needed. When the user tries to create an ldap backend
@ -187,7 +187,7 @@ class LdapBackendForm extends BaseBackendForm
*/ */
} catch (Exception $exc) { } catch (Exception $exc) {
$this->addErrorMessage( $this->addErrorMessage(
t('Connection Validation Failed: ' . $exc->getMessage()) t('Connection Validation Failed: ' . $exc->getMessage())
); );
return false; return false;
} }

20
library/Icinga/Authentication/Backend/LdapUserBackend.php
View File

@ -91,20 +91,24 @@ class LdapUserBackend extends UserBackend
{ {
$q = $this->conn->select()->from($this->userClass); $q = $this->conn->select()->from($this->userClass);
$result = $q->fetchRow(); $result = $q->fetchRow();
if (!isset($result)) { if (! isset($result)) {
throw new AuthenticationException( throw new AuthenticationException(
sprintf('No objects with objectClass="%s" in DN="%s" found.', sprintf(
$this->userClass, 'No objects with objectClass="%s" in DN="%s" found.',
$this->conn->getDN() $this->userClass,
)); $this->conn->getDN()
)
);
} }
if (!isset($result->{$this->userNameAttribute})) { if (! isset($result->{$this->userNameAttribute})) {
throw new AuthenticationException( throw new AuthenticationException(
sprintf('UserNameAttribute "%s" not existing in objectClass="%s"', sprintf(
'UserNameAttribute "%s" not existing in objectClass="%s"',
$this->userNameAttribute, $this->userNameAttribute,
$this->userClass $this->userClass
)); )
);
} }
} }