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

Fix retrieving a user's data from the database

This commit is contained in:
Johannes Meyer 2014-11-04 13:03:12 +01:00
parent cad8f7538e
commit 99277383b9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/Icinga/Authentication/Backend/DbUserBackend.php
View File

@ -81,13 +81,13 @@ class DbUserBackend extends UserBackend
*
* @param string $username The name of the user to fetch
*
* @return array|null NULL in case the user does not exist
* @return stdClass|null NULL in case the user does not exist
*/
public function getUser($username)
{
$select = new Zend_Db_Select($this->conn->getConnection());
$row = $select->from('icingaweb_user')->where('name = ?', $username)->query()->fetch();
return empty($row) ? null : $row;
$row = $select->from('icingaweb_user')->where('name = ?', $username)->query()->fetchObject();
return $row === false ? null : $row;
}
/**
@ -104,12 +104,12 @@ class DbUserBackend extends UserBackend
{
try {
$userData = $this->getUser($user->getUsername());
if ($userData === null || ! $userData['active']) {
if ($userData === null || ! $userData->active) {
return false;
}
$hashToCompare = $this->hashPassword($password, $this->getSalt($userData['password_hash']));
return $hashToCompare === $userData['password_hash'];
$hashToCompare = $this->hashPassword($password, $this->getSalt($userData->password_hash));
return $hashToCompare === $userData->password_hash;
} catch (Exception $e) {
throw new AuthenticationException(
'Failed to authenticate user "%s" against backend "%s". An exception was thrown:',