- Fix LDAP partial result warning (#1485536)

release-0.6
alecpl 15 years ago
parent b85fce1a78
commit 71047326fa

@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail CHANGELOG RoundCube Webmail
=========================== ===========================
- Fix LDAP partial result warning (#1485536)
- Fix delete in message view deletes permanently with flag_for_deletion=true (#1486101) - Fix delete in message view deletes permanently with flag_for_deletion=true (#1486101)
- Use faster/secure mt_rand() (#1486094) - Use faster/secure mt_rand() (#1486094)
- Fix roundcube hangs on empty inbox with bincimapd (#1486093) - Fix roundcube hangs on empty inbox with bincimapd (#1486093)

@ -388,7 +388,7 @@ class rcube_ldap extends rcube_addressbook
$res = null; $res = null;
if ($this->conn && $dn) if ($this->conn && $dn)
{ {
$this->ldap_result = ldap_read($this->conn, base64_decode($dn), '(objectclass=*)', array_values($this->fieldmap)); $this->ldap_result = @ldap_read($this->conn, base64_decode($dn), '(objectclass=*)', array_values($this->fieldmap));
$entry = @ldap_first_entry($this->conn, $this->ldap_result); $entry = @ldap_first_entry($this->conn, $this->ldap_result);
if ($entry && ($rec = ldap_get_attributes($this->conn, $entry))) if ($entry && ($rec = ldap_get_attributes($this->conn, $entry)))
@ -565,7 +565,7 @@ class rcube_ldap extends rcube_addressbook
{ {
$filter = $this->filter ? $this->filter : '(objectclass=*)'; $filter = $this->filter ? $this->filter : '(objectclass=*)';
$function = $this->prop['scope'] == 'sub' ? 'ldap_search' : ($this->prop['scope'] == 'base' ? 'ldap_read' : 'ldap_list'); $function = $this->prop['scope'] == 'sub' ? 'ldap_search' : ($this->prop['scope'] == 'base' ? 'ldap_read' : 'ldap_list');
$this->ldap_result = $function($this->conn, $this->prop['base_dn'], $filter, array_values($this->fieldmap), 0, 0); $this->ldap_result = @$function($this->conn, $this->prop['base_dn'], $filter, array_values($this->fieldmap), 0, 0);
return true; return true;
} }
else else

Loading…
Cancel
Save