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

Merge pull request #4046 from Icinga/fix/error-on-incomplete-inspection-4026

Browse Source 
Fix error on incomplete ldap inspection
This commit is contained in:
Johannes Meyer 2020-01-14 11:11:53 +01:00 committed by GitHub
commit b8975b256a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/forms/Config/ResourceConfigForm.php
View File

@ -321,7 +321,7 @@ class ResourceConfigForm extends ConfigForm
$inspection = static::inspectResource($this); $inspection = static::inspectResource($this);
if ($inspection !== null) { if ($inspection !== null) {
$join = function ($e) use (&$join) { $join = function ($e) use (&$join) {
return is_string($e) ? $e : join("\n", array_map($join, $e)); return is_array($e) ? join("\n", array_map($join, $e)) : $e;
}; };
$this->addElement( $this->addElement(
'note', 'note',

2
application/forms/Config/UserBackendConfigForm.php
View File

@ -398,7 +398,7 @@ class UserBackendConfigForm extends ConfigForm
$inspection = static::inspectUserBackend($this); $inspection = static::inspectUserBackend($this);
if ($inspection !== null) { if ($inspection !== null) {
$join = function ($e) use (&$join) { $join = function ($e) use (&$join) {
return is_string($e) ? $e : join("\n", array_map($join, $e)); return is_array($e) ? join("\n", array_map($join, $e)) : $e;
}; };
$this->addElement( $this->addElement(
'note', 'note',

2
application/forms/Config/UserGroup/UserGroupBackendForm.php
View File

@ -230,7 +230,7 @@ class UserGroupBackendForm extends ConfigForm
$inspection = static::inspectUserBackend($this); $inspection = static::inspectUserBackend($this);
if ($inspection !== null) { if ($inspection !== null) {
$join = function ($e) use (&$join) { $join = function ($e) use (&$join) {
return is_string($e) ? $e : join("\n", array_map($join, $e)); return is_array($e) ? join("\n", array_map($join, $e)) : $e;
}; };
$this->addElement( $this->addElement(
'note', 'note',

5
library/Icinga/Protocol/Ldap/LdapConnection.php
View File

@ -1533,7 +1533,10 @@ class LdapConnection implements Selectable, Inspectable
try { try {
$cap = LdapCapabilities::discoverCapabilities($this); $cap = LdapCapabilities::discoverCapabilities($this);
$discovery = new Inspection('Discovery Results'); $discovery = new Inspection('Discovery Results');
$discovery->write($cap->getVendor()); $vendor = $cap->getVendor();
if (isset($vendor)) {
$discovery->write($vendor);
}
$version = $cap->getVersion(); $version = $cap->getVersion();
if (isset($version)) { if (isset($version)) {
$discovery->write($version); $discovery->write($version);