lib: Fix LdapConnection::encodeSortRules()

- Fix reverseOrder encoding
- Support PHP < 5.4
This commit is contained in:
Eric Lippmann 2015-09-08 14:29:31 +02:00
parent 3bf8725b6a
commit a4fec6f42e

View File

@ -939,8 +939,8 @@ class LdapConnection implements Selectable, Inspectable
$sequenceOf = ''; $sequenceOf = '';
foreach ($sortRules as $rule) { foreach ($sortRules as $rule) {
if (false && $rule[1] === Sortable::SORT_DESC) { if ($rule[1] === Sortable::SORT_DESC) {
$reversed = '0101ff'; $reversed = '8101ff';
} else { } else {
$reversed = ''; $reversed = '';
} }
@ -974,7 +974,11 @@ class LdapConnection implements Selectable, Inspectable
$sequenceOf = '30' . str_pad(dechex($sequenceOfOctets), 2, '0', STR_PAD_LEFT) . $sequenceOf; $sequenceOf = '30' . str_pad(dechex($sequenceOfOctets), 2, '0', STR_PAD_LEFT) . $sequenceOf;
} }
return hex2bin($sequenceOf); if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
return hex2bin($sequenceOf);
} else {
return pack('H*', $sequenceOf);
}
} }
/** /**