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

LdapConnection: Prefer strict checks when utilizing in_array()

Browse Source
This commit is contained in:
Johannes Meyer 2015-11-10 13:17:30 +01:00
parent 6c07881466
commit 666e67b405
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -695,7 +695,7 @@ class LdapConnection implements Selectable, Inspectable
)); ));
} else { } else {
foreach ($query->getOrder() as $rule) { foreach ($query->getOrder() as $rule) {
if (! in_array($rule[0], $fields)) { if (! in_array($rule[0], $fields, true)) {
$fields[] = $rule[0]; $fields[] = $rule[0];
} }
} }
@ -812,7 +812,7 @@ class LdapConnection implements Selectable, Inspectable
$serverSorting = false;//$this->getCapabilities()->hasOid(LdapCapabilities::LDAP_SERVER_SORT_OID); $serverSorting = false;//$this->getCapabilities()->hasOid(LdapCapabilities::LDAP_SERVER_SORT_OID);
if (! $serverSorting && $query->hasOrder()) { if (! $serverSorting && $query->hasOrder()) {
foreach ($query->getOrder() as $rule) { foreach ($query->getOrder() as $rule) {
if (! in_array($rule[0], $fields)) { if (! in_array($rule[0], $fields, true)) {
$fields[] = $rule[0]; $fields[] = $rule[0];
} }
} }
@ -858,7 +858,8 @@ class LdapConnection implements Selectable, Inspectable
} elseif (ldap_count_entries($ds, $results) === 0) { } elseif (ldap_count_entries($ds, $results) === 0) {
if (in_array( if (in_array(
ldap_errno($ds), ldap_errno($ds),
array(static::LDAP_SIZELIMIT_EXCEEDED, static::LDAP_ADMINLIMIT_EXCEEDED) array(static::LDAP_SIZELIMIT_EXCEEDED, static::LDAP_ADMINLIMIT_EXCEEDED),
true
)) { )) {
Logger::warning( Logger::warning(
'Unable to request more than %u results. Does the server allow paged search requests? (%s)', 'Unable to request more than %u results. Does the server allow paged search requests? (%s)',