3 commits - lib/api lib/Auth lib/Auth.php
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Sat Sep 1 16:36:35 CEST 2012
lib/Auth.php | 6 ++----
lib/Auth/LDAP.php | 2 ++
lib/api/kolab_api_service_domains.php | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 14f5ec246fa3b053a94b516f611ec86467dbfaf2
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Sat Sep 1 15:36:15 2012 +0100
Correctly pass on attributes, search and parameters
Fix type in list_attribs
diff --git a/lib/api/kolab_api_service_domains.php b/lib/api/kolab_api_service_domains.php
index b16c409..fe9804e 100644
--- a/lib/api/kolab_api_service_domains.php
+++ b/lib/api/kolab_api_service_domains.php
@@ -30,7 +30,7 @@ class kolab_api_service_domains extends kolab_api_service
{
public $list_attribs = array(
- 'associatedomain',
+ 'associateddomain',
'objectclass',
'entrydn',
);
@@ -94,7 +94,7 @@ class kolab_api_service_domains extends kolab_api_service
$params = $this->parse_list_params($post);
$search = $this->parse_list_search($post);
- $domains = $auth->list_domains(null, $attributes, $search, $params);
+ $domains = $auth->list_domains($attributes, $search, $params);
return $domains;
}
commit 9689831ce863927da2f916b03f08c91c09d609bf
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Sat Sep 1 15:35:35 2012 +0100
Return regular, unsorted, unpaginated entries when no parameters are specified to sort_and_slice()
diff --git a/lib/Auth/LDAP.php b/lib/Auth/LDAP.php
index df4f960..7f1c034 100644
--- a/lib/Auth/LDAP.php
+++ b/lib/Auth/LDAP.php
@@ -1002,6 +1002,8 @@ class LDAP extends Net_LDAP3 {
$entries = array_reverse($entries, TRUE);
}
}
+ } else {
+ $entries = $result->entries(TRUE);
}
return $entries;
commit b5700f7590634354fc1dd9cebffd6c54d2d328c6
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Sat Sep 1 15:33:38 2012 +0100
Pass on the domain list/search attributes and parameters
diff --git a/lib/Auth.php b/lib/Auth.php
index 0576b33..91c7bba 100644
--- a/lib/Auth.php
+++ b/lib/Auth.php
@@ -310,11 +310,9 @@ class Auth {
return $this->auth_instance()->group_members_list($groupdata, $recurse);
}
- public function list_domains()
+ public function list_domains($attributes = array(), $search = array(), $params = array())
{
- // TODO: Consider a normal user does not have privileges on
- // the base_dn where domain names and configuration is stored.
- return $this->auth_instance($this->domain)->list_domains();
+ return $this->auth_instance()->list_domains($attributes, $search, $params);
}
public function list_rights($subject)
More information about the commits
mailing list