summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2015-01-07 10:29:14 (GMT)
committerAleksander Machniak <machniak@kolabsys.com>2015-01-07 10:29:14 (GMT)
commitb19bca278af8c73b48f8687cb85fa6ab74730b07 (patch)
treeef89a92e9439e4ba07e89d1080cb1fb1230dc99f
parent73234b2f33ad1d94b178e6767469d3cbf6f1b029 (diff)
parent74430ecfb06acf62c4b4ca25b316e8aa2ec1980e (diff)
downloadNet_LDAP3-b19bca278af8c73b48f8687cb85fa6ab74730b07.tar.gz
Merge branch 'master' of ssh://git.kolabsys.com/git/pear/Net_LDAP3
-rw-r--r--lib/Net/LDAP3.php33
1 files changed, 33 insertions, 0 deletions
diff --git a/lib/Net/LDAP3.php b/lib/Net/LDAP3.php
index fb81671..0ff28e4 100644
--- a/lib/Net/LDAP3.php
+++ b/lib/Net/LDAP3.php
@@ -1985,14 +1985,47 @@ class Net_LDAP3
*/
protected function find_vlv_indexes_and_searches()
{
+ // Use of Virtual List View control has been specifically disabled.
if ($this->config['vlv'] === false) {
return false;
}
+ // Virtual List View control has been configured in kolab.conf, for example;
+ //
+ // [ldap]
+ // vlv = [
+ // {
+ // 'ou=People,dc=example,dc=org': {
+ // 'scope': 'sub',
+ // 'filter': '(objectclass=inetorgperson)',
+ // 'sort' : [
+ // [
+ // 'displayname',
+ // 'sn',
+ // 'givenname',
+ // 'cn'
+ // ]
+ // ]
+ // }
+ // },
+ // {
+ // 'ou=Groups,dc=example,dc=org': {
+ // 'scope': 'sub',
+ // 'filter': '(objectclass=groupofuniquenames)',
+ // 'sort' : [
+ // [
+ // 'cn'
+ // ]
+ // ]
+ // }
+ // },
+ // ]
+ //
if (is_array($this->config['vlv'])) {
return $this->config['vlv'];
}
+ // We have done this dance before.
if ($this->_vlv_indexes_and_searches !== null) {
return $this->_vlv_indexes_and_searches;
}