tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-27 07:44:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

ImportSourceLdap: allow to fetch dn as a column

Browse Source
This commit is contained in:
Thomas Gelf 2016-02-17 10:00:40 +01:00
parent 5b3b5cbfb8
commit 2a173b7cd3
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
library/Director/Import/ImportSourceLdap.php
View File

@ -13,7 +13,9 @@ class ImportSourceLdap extends ImportSourceHook
public function fetchData() public function fetchData()
{ {
$query = $this->connection()->select()->from($this->settings['objectclass'], $this->listColumns()); $columns = $this->listColumns();
$query = $this->connection()->select()->from($this->settings['objectclass'], $columns);
if ($base = $this->settings['base']) { if ($base = $this->settings['base']) {
$query->setBase($base); $query->setBase($base);
} }
@ -21,7 +23,16 @@ class ImportSourceLdap extends ImportSourceHook
$query->setNativeFilter($filter); $query->setNativeFilter($filter);
} }
return $query->fetchAll(); if (in_array('dn', $columns)) {
$result = $query->fetchAll();
foreach ($result as $dn => $row) {
$row->dn = $dn;
}
return $result;
} else {
return $query->fetchAll();
}
} }
public function listColumns() public function listColumns()