Fix post-filtering vlv results, fixes warning "mb_strtolower() expects parameter 1 to be a string, array given"

Conflicts:

	program/include/rcube_ldap.php
release-0.7
Aleksander Machniak 12 years ago
parent 9bfaf5f070
commit 639a825b2e

@ -772,24 +772,26 @@ class rcube_ldap extends rcube_addressbook
for ($i = 0; $i < $entries['count']; $i++) {
$rec = $this->_ldap2result($entries[$i]);
foreach (array('email', 'name') as $f) {
$val = mb_strtolower($rec[$f]);
switch ($mode) {
case 1:
$got = ($val == $search);
break;
case 2:
$got = ($search == substr($val, 0, strlen($search)));
break;
default:
$got = (strpos($val, $search) !== false);
break;
}
foreach ($fields as $f) {
foreach ((array)$rec[$f] as $val) {
$val = mb_strtolower($val);
switch ($mode) {
case 1:
$got = ($val == $search);
break;
case 2:
$got = ($search == substr($val, 0, strlen($search)));
break;
default:
$got = (strpos($val, $search) !== false);
break;
}
if ($got) {
$this->result->add($rec);
$this->result->count++;
break;
if ($got) {
$this->result->add($rec);
$this->result->count++;
break 2;
}
}
}
}

Loading…
Cancel
Save