summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--www/admin/administrator/index.php.in2
-rw-r--r--www/admin/domainmaintainer/index.php.in2
-rw-r--r--www/admin/maintainer/index.php.in2
4 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 762dad0..aad56c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-03-07 Thomas Arendsen Hein <thomas@intevation.de>
+
+ * www/admin/administrator/index.php.in,
+ www/admin/domainmaintainer/index.php.in,
+ www/admin/maintainer/index.php.in: Modify LDAP filter to require
+ uid attribute to not return e.g. address book entries.
+ Prevents "PHP Notice: Undefined index: uid".
+
2008-03-06 Richard Bos <richard@radoeka.nl>
* kolab/issue2507
diff --git a/www/admin/administrator/index.php.in b/www/admin/administrator/index.php.in
index 6344d71..6f5ee6f 100644
--- a/www/admin/administrator/index.php.in
+++ b/www/admin/administrator/index.php.in
@@ -54,7 +54,7 @@ if( !$errors ) {
$maintainers = $ldap->groupMembers( "cn=internal,$base_dn", 'admin' );
- $filter = "(&(cn=*)(objectclass=inetOrgPerson)(!(uid=manager))(sn=*))";
+ $filter = "(&(cn=*)(objectclass=inetOrgPerson)(!(uid=manager))(sn=*)(uid=*))";
$result = ldap_search($ldap->connection, $base_dn, $filter, array( 'uid', 'sn', 'cn', 'kolabDeleteflag' ));
if( $result ) {
diff --git a/www/admin/domainmaintainer/index.php.in b/www/admin/domainmaintainer/index.php.in
index 29f6f92..0939321 100644
--- a/www/admin/domainmaintainer/index.php.in
+++ b/www/admin/domainmaintainer/index.php.in
@@ -54,7 +54,7 @@ if( !$errors ) {
$maintainers = $ldap->groupMembers( "cn=internal,$base_dn", 'domain-maintainer' );
- $filter = "(&(cn=*)(objectclass=inetOrgPerson)(!(uid=manager))(sn=*))";
+ $filter = "(&(cn=*)(objectclass=inetOrgPerson)(!(uid=manager))(sn=*)(uid=*))";
$result = ldap_search($ldap->connection, $base_dn, $filter, array( 'uid', 'sn', 'cn', 'kolabDeleteflag' ));
if( $result ) {
diff --git a/www/admin/maintainer/index.php.in b/www/admin/maintainer/index.php.in
index 8ea7cb2..5334e92 100644
--- a/www/admin/maintainer/index.php.in
+++ b/www/admin/maintainer/index.php.in
@@ -54,7 +54,7 @@ if( !$errors ) {
$maintainers = $ldap->groupMembers( "cn=internal,$base_dn", 'maintainer' );
- $filter = "(&(cn=*)(objectclass=inetOrgPerson)(!(uid=manager))(sn=*))";
+ $filter = "(&(cn=*)(objectclass=inetOrgPerson)(!(uid=manager))(sn=*)(uid=*))";
$result = ldap_search($ldap->connection, $base_dn, $filter, array( 'uid', 'sn', 'cn', 'kolabDeleteflag' ));
if( $result ) {