mirror of
https://github.com/Icinga/icingaweb2.git
synced 2025-07-27 15:54:03 +02:00
commit
d86ede517f
@ -11,6 +11,7 @@ use Icinga\Exception\AuthenticationException;
|
||||
use Icinga\Repository\DbRepository;
|
||||
use Icinga\User;
|
||||
use PDO;
|
||||
use Zend_Db_Expr;
|
||||
|
||||
class DbUserBackend extends DbRepository implements UserBackendInterface, Inspectable
|
||||
{
|
||||
@ -179,23 +180,24 @@ class DbUserBackend extends DbRepository implements UserBackendInterface, Inspec
|
||||
{
|
||||
if ($this->ds->getDbType() === 'pgsql') {
|
||||
// Since PostgreSQL version 9.0 the default value for bytea_output is 'hex' instead of 'escape'
|
||||
$columns = array('password_hash' => 'ENCODE(password_hash, \'escape\')');
|
||||
$columns = ['password_hash' => new Zend_Db_Expr('ENCODE(password_hash, \'escape\')')];
|
||||
} else {
|
||||
$columns = array('password_hash');
|
||||
$columns = ['password_hash'];
|
||||
}
|
||||
|
||||
$nameColumn = 'name';
|
||||
$nameColumn = 'user';
|
||||
if ($this->ds->getDbType() === 'mysql') {
|
||||
$username = strtolower($username);
|
||||
$nameColumn = 'BINARY LOWER(name)';
|
||||
$nameColumn = new Zend_Db_Expr('BINARY LOWER(name)');
|
||||
}
|
||||
|
||||
$query = $this->ds->select()
|
||||
->from($this->prependTablePrefix('user'), $columns)
|
||||
$query = $this
|
||||
->select()
|
||||
->from('user', $columns)
|
||||
->where($nameColumn, $username)
|
||||
->where('active', true);
|
||||
|
||||
$statement = $this->ds->getDbAdapter()->prepare($query->getSelectQuery());
|
||||
$statement = $this->ds->getDbAdapter()->prepare($query->getQuery()->getSelectQuery());
|
||||
$statement->execute();
|
||||
$statement->bindColumn(1, $lob, PDO::PARAM_LOB);
|
||||
$statement->fetch(PDO::FETCH_BOUND);
|
||||
|
@ -204,7 +204,7 @@ class DbUserGroupBackend extends DbRepository implements Inspectable, UserGroupB
|
||||
$membershipQuery = $this
|
||||
->select()
|
||||
->from('group_membership', array('group_name'))
|
||||
->where('user_name', $user->getUsername());
|
||||
->where('user', $user->getUsername());
|
||||
|
||||
$memberships = array();
|
||||
foreach ($membershipQuery as $membership) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user