[Svn] [roundcube/roundcubemail] 6ccfca: Searching in both contacts and groups when LDAP ad...

GitHub noreply at github.com
Wed Nov 23 20:45:11 CET 2016


  Branch: refs/heads/release-1.2
  Home:   https://github.com/roundcube/roundcubemail
  Commit: 6ccfcab17aed3673297b56c1455fcaf12be372f3
      https://github.com/roundcube/roundcubemail/commit/6ccfcab17aed3673297b56c1455fcaf12be372f3
  Author: Aleksander Machniak <alec at alec.pl>
  Date:   2016-11-23 (Wed, 23 Nov 2016)

  Changed paths:
    M CHANGELOG
    M program/js/app.js
    M program/lib/Roundcube/rcube_ldap.php
    M program/steps/addressbook/list.inc
    M program/steps/addressbook/search.inc

  Log Message:
  -----------
  Searching in both contacts and groups when LDAP addressbook with group_filters option is used

Conflicts:

	CHANGELOG
	program/steps/addressbook/search.inc


  Commit: 53ede465e38650237482752c29440a67a9579335
      https://github.com/roundcube/roundcubemail/commit/53ede465e38650237482752c29440a67a9579335
  Author: dsoares <diana.soares at gmail.com>
  Date:   2016-11-23 (Wed, 23 Nov 2016)

  Changed paths:
    M program/lib/Roundcube/rcube_ldap.php

  Log Message:
  -----------
  Avoid PHP fatal error

After last change to file `rcube_ldap.php`, my roundcube instance was getting this error:
```
PHP Fatal error:  Cannot use object of type Net_LDAP3_Result as array in ...
```
In
```php
protected function extended_search($count = false)
```
`$result = $this->ldap->search()` returns a LDAP object (whatever package we use).
If the search returns no results (and if `$is_extended_search` is false), then it gets to line 971 trying to do a `usort()` and then a `count()` on an object, instead of an array.


  Commit: 31df33d4e000a17c2cf5176899850a8e115d1579
      https://github.com/roundcube/roundcubemail/commit/31df33d4e000a17c2cf5176899850a8e115d1579
  Author: Aleksander Machniak <alec at alec.pl>
  Date:   2016-11-23 (Wed, 23 Nov 2016)

  Changed paths:
    M program/lib/Roundcube/rcube_ldap.php

  Log Message:
  -----------
  Fix regression where LDAP results could be counted incorrectly when using VLV

... broken by d08bd0a51f9 where we added searching in users+groups in one request


  Commit: e8fc8888a6f5ecd07698509e946cabf95b69c951
      https://github.com/roundcube/roundcubemail/commit/e8fc8888a6f5ecd07698509e946cabf95b69c951
  Author: Aleksander Machniak <alec at alec.pl>
  Date:   2016-11-23 (Wed, 23 Nov 2016)

  Changed paths:
    M program/lib/Roundcube/rcube_ldap.php

  Log Message:
  -----------
  Remove leftower code from last few backports


Compare: https://github.com/roundcube/roundcubemail/compare/86b329b1faee...e8fc8888a6f5


More information about the svn mailing list